From b57c1def9a907b81a49aa91eeb39c9321763c276 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Jul 2011 23:13:01 +0000 Subject: Fri Jul 22 23:13:01 UTC 2011 --- core/gmp/538dfce27f41.patch | 38 +++++++ core/gmp/PKGBUILD | 12 +- core/inetutils/PKGBUILD | 8 +- core/iproute2/PKGBUILD | 11 +- core/iptables/PKGBUILD | 6 +- core/libgcrypt/PKGBUILD | 13 ++- core/libgcrypt/libgcrypt.install | 2 +- core/nfs-utils/PKGBUILD | 11 +- core/openldap/PKGBUILD | 102 +++++++++++++++++ core/openldap/ntlm.patch | 230 +++++++++++++++++++++++++++++++++++++++ core/openldap/openldap.install | 20 ++++ core/openldap/slapd | 48 ++++++++ core/openldap/slapd.default | 6 + core/openssh/PKGBUILD | 7 +- core/syslog-ng/PKGBUILD | 7 +- core/xinetd/PKGBUILD | 9 +- 16 files changed, 491 insertions(+), 39 deletions(-) create mode 100644 core/gmp/538dfce27f41.patch create mode 100644 core/openldap/PKGBUILD create mode 100644 core/openldap/ntlm.patch create mode 100644 core/openldap/openldap.install create mode 100755 core/openldap/slapd create mode 100644 core/openldap/slapd.default (limited to 'core') diff --git a/core/gmp/538dfce27f41.patch b/core/gmp/538dfce27f41.patch new file mode 100644 index 000000000..2e0a1af50 --- /dev/null +++ b/core/gmp/538dfce27f41.patch @@ -0,0 +1,38 @@ + +# HG changeset patch +# User Torbjorn Granlund +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -7,7 +7,7 @@ + SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST + GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. + +-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -28,7 +28,6 @@ + #include "gmp-impl.h" + + +- + mp_size_t + mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) + { +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 6092809d9..c8b486dec 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123886 2011-05-14 03:40:36Z allan $ +# $Id: PKGBUILD 131961 2011-07-18 11:43:05Z allan $ # Maintainer: Allan McRae # Maintainer: Jan de Groot pkgname=gmp pkgver=5.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64') url="http://gmplib.org/" @@ -12,11 +12,15 @@ depends=('gcc-libs' 'sh') license=('LGPL3') options=(!libtool) install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3') +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 + 538dfce27f41.patch) +md5sums=('0bbaedc82fb30315b06b1588b9077cd3' + 'a769be9c41618ca9c35d83375e7097d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/538dfce27f41.patch + [ "${CARCH}" = "i686" ] && export ABI="32" ./configure --build=${CHOST} \ --prefix=/usr --infodir=/usr/share/info \ diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 4e8debe7d..19feb931e 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102693 2010-12-09 22:50:13Z eric $ +# $Id: PKGBUILD 131824 2011-07-15 23:53:22Z dan $ # Maintainer: Eric Belanger pkgname=inetutils pkgver=1.8 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL') -depends=('readline' 'ncurses' 'pam' 'tcp_wrappers') +depends=('readline' 'ncurses' 'pam') provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') @@ -31,7 +31,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-wrap --with-pam \ + --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ --enable-talk --enable-talkd \ diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 57089f2c0..68f05ebac 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ +# $Id: PKGBUILD 131999 2011-07-18 20:47:01Z ronald $ # Maintainer: Ronald van Haren # Contributor: Judd Vinet pkgname=iproute2 -pkgver=2.6.38 -pkgrel=4 +pkgver=2.6.39 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -18,11 +18,12 @@ replaces=('iproute') options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 +source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz 'iproute2-fhs.patch') -sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' +sha1sums=('9044ad0b4a34a377a54197724373330294d743c7' '2416b11252364d7a6c742eabb4a6924a75637a46') + build() { cd $srcdir/iproute2-${pkgver} diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index c2b812f85..b4d6939b4 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102057 2010-12-04 09:52:03Z allan $ +# $Id: PKGBUILD 131995 2011-07-18 20:27:00Z ronald $ # Maintainer: Ronald van Haren # Contributor: Thomas Baechler pkgname=iptables -pkgver=1.4.10 +pkgver=1.4.11.1 pkgrel=1 pkgdesc="A Linux kernel packet control tool" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar simple_firewall.rules iptables.conf.d) backup=(etc/conf.d/iptables) -sha1sums=('8190b8c9714a3eec825317e8ac1deeb3d11c6d29' +sha1sums=('2aa0d215485133f2817973b0914a132f628d9f3a' 'd7540316581bb66c5594885882a14ba394e95098' '70d70113e3a23f0fe99404c5536507a887a4ca5c' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index 2ccdf36fd..974f69b8a 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $ +# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $ # Maintainer: Andreas Radke pkgname=libgcrypt -pkgver=1.4.6 -pkgrel=3 +pkgver=1.5.0 +pkgrel=1 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -14,19 +14,20 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('dbf99425a4fe9217c84ce3a35d938634') +sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') build() { cd ${srcdir}/${pkgname}-${pkgver} + [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support" ./configure --prefix=/usr \ --disable-static \ - --disable-padlock-support + --disable-padlock-support $EXTRAFLAGS make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make check + make -k check } package() { diff --git a/core/libgcrypt/libgcrypt.install b/core/libgcrypt/libgcrypt.install index 83e0dcb27..79b878201 100644 --- a/core/libgcrypt/libgcrypt.install +++ b/core/libgcrypt/libgcrypt.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(gcrypt.info.gz) +filelist=(gcrypt.info.gz gcrypt.info-1.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index e732cfa27..3adca96d4 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $ +# $Id: PKGBUILD 131837 2011-07-16 00:22:48Z dreisner $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -7,13 +7,13 @@ pkgname=nfs-utils pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common @@ -46,7 +46,7 @@ build() { patch -Np0 -i $srcdir/start-statd.patch ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc + --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc make } @@ -55,6 +55,9 @@ package() { cd $srcdir/${pkgname}-${pkgver} make DESTDIR=$pkgdir install + # support python2 (FS#25120) + sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + # NFS & NFSv4 init scripts install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD new file mode 100644 index 000000000..636e9a3ac --- /dev/null +++ b/core/openldap/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 132145 2011-07-21 04:31:17Z eric $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.26 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default ntlm.patch) +md5sums=('f36f3086031dd56ae94f722ffae8df5e' + '7ea596cc1d6cbcfe1deea29ec66ab317' + '6be69f6b7e522cb64cce8703da81ed32' + '4258ddbef923d1f29f2843bc050f8c56') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}"/ntlm.patch + sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in + sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in + + LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" + ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --enable-ipv6 --enable-syslog --enable-local \ + --enable-bdb --enable-hdb \ + --enable-crypt --enable-dynamic \ + --with-threads --disable-wrappers \ + --enable-spasswd --with-cyrus-sasl \ + --enable-overlays=mod --enable-modules=yes + make +} + +check() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make test +} + +package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" + depends=('libsasl' 'libfetch' 'e2fsprogs') + backup=('etc/openldap/ldap.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in include libraries doc/man/man3 ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 + ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_openldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" + depends=("libldap>=${pkgver}" 'libtool' 'util-linux') + backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') + options=('!libtool' 'emptydirs') + install=openldap.install + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8} ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + + install -dm700 "${pkgdir}"/var/lib/openldap + chown -R 439:439 "${pkgdir}"/var/lib/openldap + + install -dm755 "${pkgdir}"/run/openldap + chown 439:439 "${pkgdir}"/run/openldap + + chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + + install -dm700 "${pkgdir}"/etc/openldap/slapd.d + chown 439:439 "${pkgdir}"/etc/openldap/slapd.d + + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/core/openldap/ntlm.patch b/core/openldap/ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/core/openldap/ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + 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 ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + 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 ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + 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 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 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + 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 ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/core/openldap/openldap.install b/core/openldap/openldap.install new file mode 100644 index 000000000..cf3cb9f25 --- /dev/null +++ b/core/openldap/openldap.install @@ -0,0 +1,20 @@ +post_install(){ + groupadd -g 439 ldap &>/dev/null + useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_upgrade(){ + getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null + getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_remove(){ + if getent passwd ldap >/dev/null 2>&1; then + userdel ldap + fi + if getent group ldap >/dev/null 2>&1; then + groupdel ldap + fi +} diff --git a/core/openldap/slapd b/core/openldap/slapd new file mode 100755 index 000000000..5156b4d61 --- /dev/null +++ b/core/openldap/slapd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS + else + /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/openldap/slapd.pid + rm -f /run/openldap/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/core/openldap/slapd.default b/core/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/core/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 76f144bcc..bf45e6396 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $ +# $Id: PKGBUILD 131644 2011-07-13 07:48:58Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh pkgver=5.8p2 -pkgrel=8 +pkgrel=9 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') url='http://www.openssh.org/portable.html' backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit') +depends=('krb5' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" 'authfile.c.patch' 'sshd.confd' @@ -32,7 +32,6 @@ build() { --prefix=/usr \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ - --with-tcp-wrappers \ --with-privsep-user=nobody \ --with-md5-passwords \ --with-pam \ diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index c54007652..3c4bc0767 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $ +# $Id: PKGBUILD 131638 2011-07-13 03:09:27Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Eric Bélanger # Maintainer: Aaron Griffin pkgname=syslog-ng pkgver=3.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') groups=('base') url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk') +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') makedepends=('flex' 'pkg-config') optdepends=('logrotate: for rotating log files') provides=('logger') @@ -49,6 +49,7 @@ build() { --enable-tcp-wrapper \ --with-pidfile-dir=/var/run \ --disable-spoof-source \ + --disable-tcp-wrapper \ --enable-systemd make diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 395cad6f1..27bf3b2a0 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 99899 2010-11-19 13:00:23Z allan $ +# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ # Maintainer: # Contributor: Judd pkgname=xinetd pkgver=2.3.14 -pkgrel=6 -pkgdesc="a secure replacement for inetd" +pkgrel=7 +pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64') url="http://www.xinetd.org/" license=('custom') -depends=('tcp_wrappers') optdepends=('perl: for xconv.pl script') backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz @@ -26,7 +25,7 @@ md5sums=('567382d7972613090215c6c54f9b82d9' build() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --with-libwrap + ./configure --prefix=/usr --without-libwrap make } -- cgit v1.2.3-54-g00ecf