mirror of
https://gitdl.cn/https://github.com/chakralinux/lib32.git
synced 2025-01-23 09:22:17 +08:00
Sync
This commit is contained in:
Manuel
parent
cc5eae1d42
commit
cdf0249b9f
@ -6,7 +6,7 @@
|
||||
_pkgbasename=gdk-pixbuf2
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.26.4
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="An image loading library for gtk2 (32-bit)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.gtk.org/"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
_pkgbasename=gtk2
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.24.12
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
|
||||
arch=('x86_64')
|
||||
url="http://www.gtk.org/"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
_pkgbasename=keyutils
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=1.4
|
||||
pkgver=1.5.5
|
||||
pkgrel=1
|
||||
pkgdesc="Linux Key Management Utilities (32-bit)"
|
||||
arch=(x86_64)
|
||||
@ -14,7 +14,7 @@ license=('GPL2' 'LGPL2.1')
|
||||
depends=(lib32-glibc $_pkgbasename=$pkgver)
|
||||
makedepends=(gcc-multilib)
|
||||
source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2)
|
||||
md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
|
||||
md5sums=('d759680b2f23c99af95938f5026f25fb')
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$_pkgbasename-$pkgver"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
_pkgbasename=krb5
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=1.9.3
|
||||
pkgver=1.10.3
|
||||
pkgrel=1
|
||||
pkgdesc="The Kerberos network authentication system (32-bit)"
|
||||
arch=('x86_64')
|
||||
@ -16,14 +16,23 @@ makedepends=('perl' gcc-multilib)
|
||||
provides=('lib32-heimdal')
|
||||
replaces=('lib32-heimdal')
|
||||
conflicts=('lib32-heimdal')
|
||||
source=(http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.9/${_pkgbasename}-${pkgver}-signed.tar)
|
||||
sha1sums=('01a14c0cb59ae558451772d6700ea420ae8b0ab0')
|
||||
source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.10/${_pkgbasename}-${pkgver}-signed.tar"
|
||||
'krb5-1.10.1-gcc47.patch')
|
||||
sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb'
|
||||
'36ac2f3a4541f2afbc4625a8ce7fb7c7936a76a7')
|
||||
|
||||
options=('!emptydirs')
|
||||
|
||||
build() {
|
||||
tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
|
||||
cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
|
||||
|
||||
# With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
|
||||
# in this function [-Werror=maybe-uninitialized]
|
||||
# As this is generated code, just ignore the complaint.
|
||||
patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
|
||||
rm lib/krb5/krb/deltat.c
|
||||
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
|
||||
|
||||
11
lib32-krb5/krb5-1.10.1-gcc47.patch
Normal file
11
lib32-krb5/krb5-1.10.1-gcc47.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
|
||||
--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400
|
||||
+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400
|
||||
@@ -44,6 +44,7 @@
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wuninitialized"
|
||||
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
|
||||
index f46cad3..102fbaa 100644
|
||||
--- a/src/kdc/Makefile.in
|
||||
+++ b/src/kdc/Makefile.in
|
||||
@@ -67,6 +67,7 @@ check-unix:: rtest
|
||||
|
||||
check-pytests::
|
||||
$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
|
||||
+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
|
||||
|
||||
install::
|
||||
$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
|
||||
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
|
||||
index c169c54..840a2ef 100644
|
||||
--- a/src/kdc/do_tgs_req.c
|
||||
+++ b/src/kdc/do_tgs_req.c
|
||||
@@ -243,7 +243,8 @@ tgt_again:
|
||||
if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
|
||||
errcode = find_alternate_tgs(request, &server);
|
||||
firstpass = 0;
|
||||
- goto tgt_again;
|
||||
+ if (errcode == 0)
|
||||
+ goto tgt_again;
|
||||
}
|
||||
}
|
||||
status = "UNKNOWN_SERVER";
|
||||
diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
|
||||
new file mode 100644
|
||||
index 0000000..1760bcd
|
||||
--- /dev/null
|
||||
+++ b/src/kdc/t_emptytgt.py
|
||||
@@ -0,0 +1,8 @@
|
||||
+#!/usr/bin/python
|
||||
+from k5test import *
|
||||
+
|
||||
+realm = K5Realm(start_kadmind=False, create_host=False)
|
||||
+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
|
||||
+if 'not found in Kerberos database' not in output:
|
||||
+ fail('TGT lookup for empty realm failed in unexpected way')
|
||||
+success('Empty tgt lookup.')
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
_pkgbasename=libldap
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.4.23
|
||||
pkgver=2.4.33
|
||||
pkgrel=1
|
||||
pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)"
|
||||
arch=('x86_64')
|
||||
@ -16,8 +16,8 @@ makedepends=(gcc-multilib)
|
||||
options=('!libtool')
|
||||
source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz"
|
||||
'ntlm.patch')
|
||||
md5sums=('90150b8c0d0192e10b30157e68844ddf'
|
||||
'dfa9eb6f2fd9d0a3dab0e1860923489e')
|
||||
md5sums=('5adae44897647c15ce5abbff313bc85a'
|
||||
'b75109064236048da33c7bbd5b48196f')
|
||||
|
||||
build() {
|
||||
export CC="gcc -m32"
|
||||
|
||||
@ -194,7 +194,7 @@ Index: trunk/libraries/libldap/Makefile.in
|
||||
tls2.c tls_o.c tls_g.c tls_m.c \
|
||||
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
|
||||
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
|
||||
assertion.c deref.c
|
||||
assertion.c deref.c ldif.c fetch.c
|
||||
|
||||
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
|
||||
@@ -40,7 +40,7 @@
|
||||
@ -203,7 +203,7 @@ Index: trunk/libraries/libldap/Makefile.in
|
||||
tls2.lo tls_o.lo tls_g.lo tls_m.lo \
|
||||
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
|
||||
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
|
||||
assertion.lo deref.lo
|
||||
assertion.lo deref.lo ldif.lo fetch.lo
|
||||
|
||||
LDAP_INCDIR= ../../include
|
||||
Index: trunk/libraries/libldap_r/Makefile.in
|
||||
@ -216,7 +216,7 @@ Index: trunk/libraries/libldap_r/Makefile.in
|
||||
tls2.c tls_o.c tls_g.c tls_m.c \
|
||||
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
|
||||
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
|
||||
assertion.c deref.c
|
||||
assertion.c deref.c ldif.c fetch.c
|
||||
SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
|
||||
thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
|
||||
@@ -47,7 +47,7 @@
|
||||
@ -225,6 +225,6 @@ Index: trunk/libraries/libldap_r/Makefile.in
|
||||
tls2.lo tls_o.lo tls_g.lo tls_m.lo \
|
||||
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
|
||||
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
|
||||
assertion.lo deref.lo
|
||||
assertion.lo deref.lo ldif.lo fetch.lo
|
||||
|
||||
LDAP_INCDIR= ../../include
|
||||
LDAP_INCDIR= ../../include
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
_pkgbasename=openssl
|
||||
pkgname=lib32-$_pkgbasename
|
||||
_ver=1.0.0d
|
||||
_ver=1.0.1c
|
||||
# use a pacman compatible version scheme
|
||||
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
|
||||
pkgrel=1
|
||||
@ -19,12 +19,10 @@ options=('!makeflags')
|
||||
source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
|
||||
'no-rpath.patch'
|
||||
'ca-dir.patch')
|
||||
md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e'
|
||||
md5sums=('ae412727c8c15b67880aef7bd2999b2e'
|
||||
'dc78d3d06baffc16217519242ce92478'
|
||||
'3bf51be3a1bbd262be46dc619f92aa90')
|
||||
|
||||
# keep an upgrade path for older installations
|
||||
|
||||
build() {
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user