diff --git a/app-admin/mds-doc-core/ChangeLog b/app-admin/mds-doc-core/ChangeLog deleted file mode 100644 index 60fe8d6..0000000 --- a/app-admin/mds-doc-core/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -# ChangeLog for app-admin/mds-doc-core -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 01 May 2010; Mario Fetka +metadata.xml: - initial checkin of doc - diff --git a/app-admin/mds-doc-core/Manifest b/app-admin/mds-doc-core/Manifest deleted file mode 100644 index a1616d6..0000000 --- a/app-admin/mds-doc-core/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST mds-2.4.0.tar.gz 987981 RMD160 31775873932c2f988699c85b9b0ef46caab2da5c SHA1 cb57e3519c0672580b120a8bacae86c3e44b9dbc SHA256 c2c61f39626517feeeec74792b73fd5661b7f241a4aa73b5fe057d1e599dfbc0 -EBUILD mds-doc-core-2.4.0.ebuild 599 RMD160 c0336384d6276e96dcc54a5a0fb3e6a9678918cb SHA1 5a0ba51697ad0d3cf399c918dc1cbd2144e4451a SHA256 4d33116130e7338c198262b95d391379efc454057bd09b572526a8e1e42c303f -MISC ChangeLog 215 RMD160 845cc993c93995dbc4f1f5a0430e7074c99340b3 SHA1 0fc42b07eee83f236c26f6ab6b7204dcf7194ef9 SHA256 09e2565bda07f48e6deb44fded515be5150cd46b5eb6312c08f2ae1dd3f436b6 -MISC metadata.xml 226 RMD160 bebcbe7a5e3d2be83c25e006192f71ebf45abb14 SHA1 ec2b713fc2363b8c51e9c164d0802eeb59d9d296 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 diff --git a/app-admin/mds-doc-core/mds-doc-core-2.4.0.ebuild b/app-admin/mds-doc-core/mds-doc-core-2.4.0.ebuild deleted file mode 100644 index 490ce83..0000000 --- a/app-admin/mds-doc-core/mds-doc-core-2.4.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils - -MY_P="${P/_p/-}" -MY_PV="${PV/_p*/}" - -DESCRIPTION="Mandriva Directory Server - Identity and network services management made easy !" -HOMEPAGE="http://mds.mandriva.org/" -SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/mds-${PV}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd" -IUSE="" -DEPEND="app-text/xmlto - app-text/htmltidy" -SLOT="0" - -S="${WORKDIR}/mds-${MY_PV}/doc" - -src_install() { - dohtml -r build/* || die "install failed" -} diff --git a/app-admin/mds-doc-core/metadata.xml b/app-admin/mds-doc-core/metadata.xml deleted file mode 100644 index 6589d3b..0000000 --- a/app-admin/mds-doc-core/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -no-herd - - mario.fetka@gmail.com - - diff --git a/app-admin/mmc-web-kerberos/ChangeLog b/app-admin/mmc-web-kerberos/ChangeLog deleted file mode 100644 index 427603f..0000000 --- a/app-admin/mmc-web-kerberos/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -# ChangeLog for app-admin/mmc-web-kerberos -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 01 May 2010; Mario Fetka - -mmc-web-kerberos-2.1.0.ebuild, -mmc-web-kerberos-2.1.0-r1.ebuild, - -mmc-web-kerberos-2.1.0-r2.ebuild, +mmc-web-kerberos-2.1.0-r3.ebuild: - delete old and depend on new mmc-web-core package - - 18 Feb 2010; Mario Fetka - mmc-web-kerberos-2.1.0.ebuild, mmc-web-kerberos-2.1.0-r1.ebuild, - mmc-web-kerberos-2.1.0-r2.ebuild: - add arm keyword - - 21 Dec 2009; Mario Fetka - mmc-web-kerberos-2.1.0-r2.ebuild: - add mit-krb5 as a possibilty - -*mmc-web-kerberos-2.1.0-r2 (03 Sep 2009) - - 03 Sep 2009; Mario Fetka - +mmc-web-kerberos-2.1.0-r2.ebuild: - add missing dependencies - -* mmc-web-kerberos-2.1.0-r1 (17 Apr 2009) - - 17 Apr 2009; Mario Fetka - mmc-web-kerberos-2.1.0-r1: - make it EAPI2 - - 08 Apr 2009; Mario Fetka - mmc-web-kerberos-2.1.0.ebuild: - correct KEYWORDS - - 13 Mar 2009; Mario Fetka - mmc-web-kerberos-2.1.0.ebuild: - new dependencies on gettext - - 17 Feb 2009; Mario Fetka Manifest: - Downgrade to correct version - - 02 Nov 2008; Mario Fetka - +files/postinstall-en-2.3.txt, +metadata.xml, - +mmc-web-kerberos-2.3.1.ebuild: - initial checkin - diff --git a/app-admin/mmc-web-kerberos/Manifest b/app-admin/mmc-web-kerberos/Manifest deleted file mode 100644 index 9392c84..0000000 --- a/app-admin/mmc-web-kerberos/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST mmc-web-kerberos-2.1.0.tar.gz 5625 RMD160 7d35adf61bbaf759bc3b8ded3e3ec63c75ceef01 SHA1 cad38d756dc172029e59048a38e9274b3f869849 SHA256 5e23f80b25d648d82c163a69747308f0bd28333ba18aa78cc98948bf74ccad28 -EBUILD mmc-web-kerberos-2.1.0-r3.ebuild 747 RMD160 991b4a13dfe63decf3e3150e35e2c75cc4970cb0 SHA1 d264f2983d95f1952622671fb0d6c63be9c20d84 SHA256 bb111fa349d78b36616265829be10ba5e0a9a3e3f5918c2dcbc359362c607f09 -MISC ChangeLog 1426 RMD160 1210578aa0a715040c65401ce85e45d25ecef7d9 SHA1 ac5170bee94c90a1b0dd3795c2797262b0c3cddc SHA256 1d385a9c47a19c78b17498b3031c9a872bf5cdea4181c7bddee0df658d5bc146 -MISC metadata.xml 226 RMD160 bebcbe7a5e3d2be83c25e006192f71ebf45abb14 SHA1 ec2b713fc2363b8c51e9c164d0802eeb59d9d296 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 diff --git a/app-admin/mmc-web-kerberos/metadata.xml b/app-admin/mmc-web-kerberos/metadata.xml deleted file mode 100644 index 6589d3b..0000000 --- a/app-admin/mmc-web-kerberos/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -no-herd - - mario.fetka@gmail.com - - diff --git a/app-admin/mmc-web-kerberos/mmc-web-kerberos-2.1.0-r3.ebuild b/app-admin/mmc-web-kerberos/mmc-web-kerberos-2.1.0-r3.ebuild deleted file mode 100644 index b4b390c..0000000 --- a/app-admin/mmc-web-kerberos/mmc-web-kerberos-2.1.0-r3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils depend.apache depend.php - -DESCRIPTION="Mandriva Directory Server - Identity and network services management made easy !" -HOMEPAGE="http://mds.mandriva.org/" -SRC_URI="http://mds.mandriva.org/pub/mds/sources/${PV}/${P}.tar.gz - http://ftp.disconnected-by-peer.at/mds/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd" -IUSE="" -DEPEND="sys-apps/lsb-release - sys-devel/gettext" -RDEPEND=">=app-admin/mmc-web-core-${PV} - || ( app-crypt/heimdal[hdb-ldap] app-crypt/mit-krb5[ldap] )" -SLOT="0" - -need_php_httpd - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install || die "install failed" -} diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog deleted file mode 100644 index e008206..0000000 --- a/dev-libs/apr/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -# ChangeLog for dev-libs/apr -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*apr-1.4.5 (21 Nov 2011) - - 21 Nov 2011; Mario Fetka +apr-1.4.5.ebuild, - +files/apr-1.4.x-apr_common-m4.patch, +files/apr-1.4.5-xattr-build-1.patch, - +files/apr-xattr-build.patch, +files/apr-xattr-headers.patch, - +files/apr-xattr-impl.patch, +files/apr-xattr-tests.patch, - +files/config.layout.patch, +metadata.xml: - add privsep patch & Multilib Patch - diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest deleted file mode 100644 index 055405e..0000000 --- a/dev-libs/apr/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX apr-1.4.5-xattr-build-1.patch 5932 RMD160 c9c33e9f9c13e21a05131c52865f91603e6d6791 SHA1 856d0333c7295c0ff5d80fe3967d678294fb6e7a SHA256 f1d4cfe011c0e0e507f5bda965f78cbe2884249b06f231d8c7b7252be49ab0ff -AUX apr-1.4.x-apr_common-m4.patch 844 RMD160 2e27c63fde2c014379b1a57e84c497d3c00a7acb SHA1 fd9911cfcc18428cc65cd519768372df8268082a SHA256 cc7f7d91bd81753ae77e5807588d205eb7ae647f3ed05e4ce7e5bf9edc0dfa6d -AUX apr-xattr-build.patch 5530 RMD160 f1846815ee32366e51ef7b765f7cb8d1f10642ed SHA1 f61d3f8618e8faf7426125be4147542f2db11787 SHA256 ccda7d84d0a4c95507e82bcbf157dca91e420e7825c80cbd60894d2b047b2b1d -AUX apr-xattr-headers.patch 13791 RMD160 b6a71fcdea238bf8bc10cc43b5d346a6c54f11ae SHA1 431051e2bcc23776786453e329bbfd467fc8da4b SHA256 0d7068d1738dd2bedd8fffe7e95f0089e70b9730a81d35b2688c50e506f718ee -AUX apr-xattr-impl.patch 38289 RMD160 41c2de08ff8ab4e94222ee49679da3a9ae0b78a9 SHA1 143c7054f040acd55ca3bedc9fac410f6ed37204 SHA256 3998baaad273f88bf3d82cf6522d7da88a5d03ffbc75bd5c781e1142b010fa13 -AUX apr-xattr-tests.patch 17458 RMD160 b314abc82368a9a69e35082d8117c7361866699a SHA1 ca51974638a1b7cd0e3c1e957dd792c26587a4cb SHA256 14b0b7750c795734a1e71688e084c08e8af6db83acab0f8b135f08cfa92c080e -AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 -DIST apr-1.4.5.tar.bz2 754763 RMD160 d2a966c1b143416cd3655cf849cb5d3cb1ca2c5f SHA1 517de5e3cc1e3be810d9bc95508ab66bb8ebe7cb SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e -EBUILD apr-1.4.5.ebuild 2369 RMD160 8c916a247bbcb575ea7c82e4c9234a976847aa1e SHA1 c63b2cdfb4b7f0b551c86add38f88aa0da510c08 SHA256 f9da2d933aa22f791dddc4760b500c53e25b6732d4e776efb2437f681e42a621 -MISC ChangeLog 495 RMD160 2e037d1d581df1836b2192687df15bc63c7968fb SHA1 823623e6b05563ef89e3c8605e8196c282562f47 SHA256 fa0aab5930faea0e8d567ce5e9981d593240dfdd5734fe603ad2ab6bd192bd08 -MISC metadata.xml 453 RMD160 44be42dfd9fe4c26f5655b4a8b78446ae1c073e7 SHA1 d7378602457f126b8448744b2f965853b4a17188 SHA256 c089c114bb8c838899abeb5c1f1c19a495039b30e106363c14e5de83b7e9a1f4 diff --git a/dev-libs/apr/apr-1.4.5.ebuild b/dev-libs/apr/apr-1.4.5.ebuild deleted file mode 100644 index 146cccf..0000000 --- a/dev-libs/apr/apr-1.4.5.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.5.ebuild,v 1.8 2011/11/11 19:17:50 hwoarang Exp $ - -EAPI="4" - -inherit autotools eutils libtool multilib - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid" -RESTRICT="test" - -RDEPEND="uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}/apr-1.4.x-apr_common-m4.patch" - epatch "${FILESDIR}/apr-1.4.5-xattr-build-1.patch" - epatch "${FILESDIR}/apr-xattr-headers.patch" - epatch "${FILESDIR}/apr-xattr-impl.patch" - epatch "${FILESDIR}/apr-xattr-tests.patch" - - # Ensure that system libtool is used. - sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed" - sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed" - - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - - if use urandom; then - myconf+=" --with-devrandom=/dev/urandom" - else - myconf+=" --with-devrandom=/dev/random" - fi - - if ! use uuid; then - local apr_cv_osuuid - export apr_cv_osuuid="no" - fi - - CONFIG_SHELL="/bin/bash" econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-threads \ - ${myconf} - - rm -f libtool -} - -src_compile() { - emake - - if use doc; then - emake dox - fi -} - -src_install() { - default - - find "${ED}" -name "*.la" -exec rm -f {} + - - if use doc; then - dohtml -r docs/dox/html/* - fi - - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} diff --git a/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch b/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch deleted file mode 100644 index 856b67f..0000000 --- a/dev-libs/apr/files/apr-1.4.5-xattr-build-1.patch +++ /dev/null @@ -1,159 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2011-11-21 -Initial Package Version: 1.4.5 -Origin: http://privsep.org/patches/2.3.0-dev/xattr-patches/apr-xattr-build.patch -Upstream Status: unknown -Description: build infrastructure - -diff -Naur apr-1.4.5.orig/build.conf apr-1.4.5/build.conf ---- apr-1.4.5.orig/build.conf 2011-11-21 18:38:28.659217726 +0000 -+++ apr-1.4.5/build.conf 2011-11-21 18:39:17.735760998 +0000 -@@ -13,7 +13,7 @@ - # directories that have platform-specific code in them. the resulting - # pattern will be: SUBDIR/PLATFORM/*.c - platform_dirs = -- dso file_io locks memory misc mmap network_io poll random -+ dso file_io locks memory misc mmap network_io poll random xattr - shmem support threadproc time user atomic - - # all the public headers -diff -Naur apr-1.4.5.orig/configure.in apr-1.4.5/configure.in ---- apr-1.4.5.orig/configure.in 2011-11-21 18:38:28.985607639 +0000 -+++ apr-1.4.5/configure.in 2011-11-21 18:43:25.981912296 +0000 -@@ -197,7 +197,7 @@ - DEFAULT_OSDIR="unix" - echo "(Default will be ${DEFAULT_OSDIR})" - --apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random" -+apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random xattr" - - dnl Checks for programs. - AC_PROG_MAKE_SET -@@ -1466,7 +1466,9 @@ - sys/types.h \ - sys/uio.h \ - sys/un.h \ -- sys/wait.h) -+ sys/wait.h \ -+ sys/xattr.h \ -+ sys/extattr.h) - - # IRIX 6.5 has a problem in which prevents it from - # being included by itself. Check for manually, -@@ -1518,6 +1520,8 @@ - AC_SUBST(unistdh) - AC_SUBST(signalh) - AC_SUBST(sys_waith) -+AC_SUBST(sys_xattrh) -+AC_SUBST(sys_extattrh) - AC_SUBST(processh) - AC_SUBST(pthreadh) - AC_SUBST(semaphoreh) -@@ -2472,6 +2476,87 @@ - APR_CHECK_DIRENT_INODE - APR_CHECK_DIRENT_TYPE - -+dnl ----------------------------- Checking for Extended Attributes Support -+echo "${nl}Checking for Extended Attributes Support..." -+ -+# Check whether Extended Attributes have explicitly been disabled -+AC_ARG_ENABLE(xattr, -+ [ --disable-xattr Disable Extended Attributes support in APR.], -+ [ if test "$enableval" = "no"; then -+ user_disabled_xattr=1 -+ fi ], -+ [ user_disabled_xattr=0 ] ) -+ -+xattrdarwin="0" -+xattrlinux="0" -+xattrfreebsd="0" -+xattrsolaris="0" -+if test "$user_disabled_xattr" = 1; then -+ echo "no -- disabled by user" -+else -+ AC_CHECK_FUNCS([fgetxattr fsetxattr flistxattr fremovexattr lgetxattr \ -+ extattr_get_fd extattr_set_fd extattr_list_fd \ -+ extattr_delete_fd openat unlinkat]) -+ APR_CHECK_DEFINE(O_XATTR, sys/fcntl.h) -+ APR_CHECK_DEFINE(XATTR_NOFOLLOW, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_CREATE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_REPLACE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_NAME_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_SIZE_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_LIST_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_MAXNAMELEN, sys/xattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_USER, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_SYSTEM, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_MAXNAMELEN, sys/extattr.h) -+ -+ APR_BEGIN_DECISION([xattr attribute system interface]) -+ APR_IFALLYES(header:sys/xattr.h dnl -+ define:XATTR_NOFOLLOW dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrdarwin="1" -+ APR_DECIDE(USE_XATTR_DARWIN, [xattr (Darwin)])]) -+ -+ APR_IFALLYES(header:sys/xattr.h dnl -+ func:lgetxattr dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrlinux="1" -+ APR_DECIDE(USE_XATTR_LINUX, [xattr (Linux)])]) -+ -+ APR_IFALLYES(header:sys/extattr.h dnl -+ func:extattr_set_fd dnl -+ func:func:extattr_get_fd dnl -+ func:extattr_list_fd dnl -+ func:func:extattr_delete_fd, -+ [xattrfreebsd="1" -+ APR_DECIDE(USE_XATTR_FREEBSD, [extattr (FreeBSD)])]) -+ -+ APR_IFALLYES(define:O_XATTR dnl -+ func:openat dnl -+ func:unlinkat, -+ [xattrsolaris="1" -+ APR_DECIDE(USE_XATTR_SOLARIS, [attropen (Solaris)])]) -+ -+ if test "x$ac_decision" = "x"; then -+ ac_decision="USE_XATTR_NONE" -+ ac_decision_msg="no xattr interface available" -+ fi -+ APR_END_DECISION -+ AC_DEFINE_UNQUOTED($ac_decision) -+fi -+ -+if test "$xattrdarwin$xattrlinux$xattrfreebsd$xattrsolaris" = "0000"; then -+ xattr="0" -+else -+ xattr="1" -+fi -+AC_SUBST(xattr) -+ - dnl ----------------------------- Checking for UUID Support - echo "${nl}Checking for OS UUID Support..." - -diff -Naur apr-1.4.5.orig/include/apr.h.in apr-1.4.5/include/apr.h.in ---- apr-1.4.5.orig/include/apr.h.in 2011-11-21 18:38:28.661532544 +0000 -+++ apr-1.4.5/include/apr.h.in 2011-11-21 18:40:23.666523955 +0000 -@@ -104,6 +104,8 @@ - #define APR_HAVE_SYS_UIO_H @sys_uioh@ - #define APR_HAVE_SYS_UN_H @sys_unh@ - #define APR_HAVE_SYS_WAIT_H @sys_waith@ -+#define APR_HAVE_SYS_XATTR_H @sys_xattrh@ -+#define APR_HAVE_SYS_EXTATTR_H @sys_extattrh@ - #define APR_HAVE_TIME_H @timeh@ - #define APR_HAVE_UNISTD_H @unistdh@ - #define APR_HAVE_WINDOWS_H @windowsh@ -@@ -276,6 +278,7 @@ - #define APR_HAS_UNICODE_FS @have_unicode_fs@ - #define APR_HAS_PROC_INVOKED @have_proc_invoked@ - #define APR_HAS_USER @apr_has_user@ -+#define APR_HAS_XATTR @xattr@ - #define APR_HAS_LARGE_FILES @aprlfs@ - #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ - #define APR_HAS_OS_UUID @osuuid@ diff --git a/dev-libs/apr/files/apr-1.4.x-apr_common-m4.patch b/dev-libs/apr/files/apr-1.4.x-apr_common-m4.patch deleted file mode 100644 index bab895b..0000000 --- a/dev-libs/apr/files/apr-1.4.x-apr_common-m4.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr apr-1.4.5.orig/build/apr_common.m4 apr-1.4.5/build/apr_common.m4 ---- apr-1.4.5.orig/build/apr_common.m4 2011-11-21 19:58:38.341263862 +0100 -+++ apr-1.4.5/build/apr_common.m4 2011-11-21 20:07:28.368394177 +0100 -@@ -202,14 +202,18 @@ - dnl for a user to override configure when it does something stupid. - dnl - AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT], [ --if test "x$apr_ste_save_$1" = "x"; then -+dnl Check whether $apr_ste_save_$1 is empty or -+dnl only whitespace. The verbatim "X" is token number 1, -+dnl the following whitespace will be ignored. -+set X $apr_ste_save_$1 -+if test ${#} -eq 1; then - $2$1="$$1" - $1= - else - if test "x$apr_ste_save_$1" = "x$$1"; then - $2$1= - else -- $2$1=`echo $$1 | sed -e "s%${apr_ste_save_$1}%%"` -+ $2$1=`echo "$$1" | sed -e "s%${apr_ste_save_$1}%%"` - $1="$apr_ste_save_$1" - fi - fi diff --git a/dev-libs/apr/files/apr-xattr-build.patch b/dev-libs/apr/files/apr-xattr-build.patch deleted file mode 100644 index f815acd..0000000 --- a/dev-libs/apr/files/apr-xattr-build.patch +++ /dev/null @@ -1,155 +0,0 @@ -Index: include/apr.h.in -=================================================================== ---- include/apr.h.in (revision 606453) -+++ include/apr.h.in (working copy) -@@ -103,6 +103,8 @@ - #define APR_HAVE_SYS_UIO_H @sys_uioh@ - #define APR_HAVE_SYS_UN_H @sys_unh@ - #define APR_HAVE_SYS_WAIT_H @sys_waith@ -+#define APR_HAVE_SYS_XATTR_H @sys_xattrh@ -+#define APR_HAVE_SYS_EXTATTR_H @sys_extattrh@ - #define APR_HAVE_TIME_H @timeh@ - #define APR_HAVE_UNISTD_H @unistdh@ - #define APR_HAVE_WINDOWS_H @windowsh@ -@@ -238,6 +240,7 @@ - #define APR_HAS_UNICODE_FS @have_unicode_fs@ - #define APR_HAS_PROC_INVOKED @have_proc_invoked@ - #define APR_HAS_USER 1 -+#define APR_HAS_XATTR @xattr@ - #define APR_HAS_LARGE_FILES @aprlfs@ - #define APR_HAS_XTHREAD_FILES 0 - #define APR_HAS_OS_UUID @osuuid@ -Index: configure.in -=================================================================== ---- configure.in (revision 606453) -+++ configure.in (working copy) -@@ -124,7 +124,7 @@ - DEFAULT_OSDIR="unix" - echo "(Default will be ${DEFAULT_OSDIR})" - --apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random" -+apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random xattr" - - dnl Checks for programs. - AC_PROG_MAKE_SET -@@ -1135,7 +1135,9 @@ - sys/types.h \ - sys/uio.h \ - sys/un.h \ -- sys/wait.h) -+ sys/wait.h \ -+ sys/xattr.h \ -+ sys/extattr.h) - - # IRIX 6.5 has a problem in which prevents it from - # being included by itself. Check for manually, -@@ -1187,6 +1189,8 @@ - AC_SUBST(unistdh) - AC_SUBST(signalh) - AC_SUBST(sys_waith) -+AC_SUBST(sys_xattrh) -+AC_SUBST(sys_extattrh) - AC_SUBST(pthreadh) - AC_SUBST(semaphoreh) - AC_SUBST(windowsh) -@@ -2030,6 +2034,87 @@ - APR_CHECK_DIRENT_INODE - APR_CHECK_DIRENT_TYPE - -+dnl ----------------------------- Checking for Extended Attributes Support -+echo "${nl}Checking for Extended Attributes Support..." -+ -+# Check whether Extended Attributes have explicitly been disabled -+AC_ARG_ENABLE(xattr, -+ [ --disable-xattr Disable Extended Attributes support in APR.], -+ [ if test "$enableval" = "no"; then -+ user_disabled_xattr=1 -+ fi ], -+ [ user_disabled_xattr=0 ] ) -+ -+xattrdarwin="0" -+xattrlinux="0" -+xattrfreebsd="0" -+xattrsolaris="0" -+if test "$user_disabled_xattr" = 1; then -+ echo "no -- disabled by user" -+else -+ AC_CHECK_FUNCS([fgetxattr fsetxattr flistxattr fremovexattr lgetxattr \ -+ extattr_get_fd extattr_set_fd extattr_list_fd \ -+ extattr_delete_fd openat unlinkat]) -+ APR_CHECK_DEFINE(O_XATTR, sys/fcntl.h) -+ APR_CHECK_DEFINE(XATTR_NOFOLLOW, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_CREATE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_REPLACE, sys/xattr.h) -+ APR_CHECK_DEFINE(XATTR_NAME_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_SIZE_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_LIST_MAX, linux/limits.h) -+ APR_CHECK_DEFINE(XATTR_MAXNAMELEN, sys/xattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_USER, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_NAMESPACE_SYSTEM, sys/extattr.h) -+ APR_CHECK_DEFINE(EXTATTR_MAXNAMELEN, sys/extattr.h) -+ -+ APR_BEGIN_DECISION([xattr attribute system interface]) -+ APR_IFALLYES(header:sys/xattr.h dnl -+ define:XATTR_NOFOLLOW dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrdarwin="1" -+ APR_DECIDE(USE_XATTR_DARWIN, [xattr (Darwin)])]) -+ -+ APR_IFALLYES(header:sys/xattr.h dnl -+ func:lgetxattr dnl -+ func:fgetxattr dnl -+ func:fsetxattr dnl -+ func:flistxattr dnl -+ func:fremovexattr, -+ [xattrlinux="1" -+ APR_DECIDE(USE_XATTR_LINUX, [xattr (Linux)])]) -+ -+ APR_IFALLYES(header:sys/extattr.h dnl -+ func:extattr_set_fd dnl -+ func:func:extattr_get_fd dnl -+ func:extattr_list_fd dnl -+ func:func:extattr_delete_fd, -+ [xattrfreebsd="1" -+ APR_DECIDE(USE_XATTR_FREEBSD, [extattr (FreeBSD)])]) -+ -+ APR_IFALLYES(define:O_XATTR dnl -+ func:openat dnl -+ func:unlinkat, -+ [xattrsolaris="1" -+ APR_DECIDE(USE_XATTR_SOLARIS, [attropen (Solaris)])]) -+ -+ if test "x$ac_decision" = "x"; then -+ ac_decision="USE_XATTR_NONE" -+ ac_decision_msg="no xattr interface available" -+ fi -+ APR_END_DECISION -+ AC_DEFINE_UNQUOTED($ac_decision) -+fi -+ -+if test "$xattrdarwin$xattrlinux$xattrfreebsd$xattrsolaris" = "0000"; then -+ xattr="0" -+else -+ xattr="1" -+fi -+AC_SUBST(xattr) -+ - dnl ----------------------------- Checking for UUID Support - echo "${nl}Checking for OS UUID Support..." - -Index: build.conf -=================================================================== ---- build.conf (revision 606453) -+++ build.conf (working copy) -@@ -13,7 +13,7 @@ - # directories that have platform-specific code in them. the resulting - # pattern will be: SUBDIR/PLATFORM/*.c - platform_dirs = -- dso file_io locks memory misc mmap network_io poll random -+ dso file_io locks memory misc mmap network_io poll random xattr - shmem support threadproc time user atomic - - # all the public headers diff --git a/dev-libs/apr/files/apr-xattr-headers.patch b/dev-libs/apr/files/apr-xattr-headers.patch deleted file mode 100644 index 329d7a8..0000000 --- a/dev-libs/apr/files/apr-xattr-headers.patch +++ /dev/null @@ -1,366 +0,0 @@ -Index: include/apr_file_xattr.h -=================================================================== ---- include/apr_file_xattr.h (revision 0) -+++ include/apr_file_xattr.h (revision 0) -@@ -0,0 +1,249 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef APR_FILE_XATTR_H -+#define APR_FILE_XATTR_H -+ -+/** -+ * @file apr_file_xattr.h -+ * @brief APR File Extended Attributes -+ */ -+ -+#include "apr.h" -+#include "apr_pools.h" -+#include "apr_tables.h" -+#include "apr_file_io.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+/** -+ * @defgroup apr_xattr File Extended Attribute Functions -+ * @ingroup APR -+ * @{ -+ */ -+ -+/** When setting values, fail if the attribute already exists */ -+#define APR_XATTR_CREATE 1 -+ -+/** When setting values, fail if the attribute does not already exist */ -+#define APR_XATTR_REPLACE 2 -+ -+typedef struct apr_xattr_t apr_xattr_t; -+ -+/** -+ * Open a context for access to the extended attributes of a file or -+ * directory specified by a path name -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param pathname the path name of the file or directory -+ * @param p the pool to allocate any memory from -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the path was opened for attribute access
-+ *        APR_STATUS_IS_ENOENT()  the file or directory does not exist
-+ *
-+ * Other operating system dependant error codes may be returned. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p); -+ -+/** -+ * Open a context for access to the extended attributes of an open file -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param file the open file to access the extended attributes on -+ * @param p the pool to allocate any memory from -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the file was opened for attribute access
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p); -+ -+/** -+ * Open a context for access to the extended attributes of an open directory -+ * -+ * @param new the context allocated for access to extended attributes -+ * @param dir the open directory to access the extended attributes on -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the directory was opened for attribute access
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p); -+ -+/** -+ * Destroy a context used for access to extended attributes -+ * -+ * @param xattr the context to destroy -+ * 
-+ *        APR_SUCCESS             the context was destroyed
-+ *
-+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr); -+ -+/** -+ * Set an extended attribute on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the attribute name to set -+ * @param value the attribute value -+ * @param size the size in bytes of the attribute value -+ * @param flags to control how the attribute is set -+ * 
-+ *         APR_XATTR_CREATE       return an error if the attribute name
-+ *                                already exists.
-+ *         APR_XATTR_REPLACE      return an error if the attribute name
-+ *                                does not already exist.
-+ *
-+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was set
-+ *        APR_STATUS_IS_EEXIST()  create flag and the attribute exists
-+ *        APR_STATUS_IS_ENOATTR() replace flag and the attribute doesn't exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @remark if neither flag APR_XATTR_CREATE or APR_XATTR_REPLACE are -+ * given then the attribute will either be created if it does not -+ * already exist or replaced if it does exist. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags); -+ -+/** -+ * Get an extended attribute from a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the name of the attribute to get -+ * @param value the returned attribute value allocated from the pool -+ * @param size the returned size of the attribute value -+ * @param flags to control how the attribute is got (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was retrieved
-+ *        APR_STATUS_IS_ENOATTR() the attribute does not exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags); -+ -+/** -+ * Check for the existence of an extended attribute on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the name of the attribute to get -+ * @param exists the returned value indicating whether the attribute exists -+ * @param flags to control how the attribute is got (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the existence was successfully tested
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags); -+ -+/** -+ * List the extended attributes on a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param list the returned array of attributes names -+ * @param flags to control how the file is listed (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attributes were listed
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @remark list is an array containing simple null terminated strings. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags); -+ -+/** -+ * Remove an extended attribute from a file or directory -+ * @param xattr the opened extended attribute file or directory context -+ * @param name the attribute name to remove -+ * @param flags to control how the attribute is removed (reserved for future use) -+ * @param p the pool to allocate any memory from if required -+ * @return the status of the operation: -+ * 
-+ *        APR_SUCCESS             the attribute was removed
-+ *        APR_STATUS_IS_ENOATTR() the attribute does not exist
-+ *
-+ * Other operating system dependant error codes may be returned -+ * in the cases not listed above. -+ * -+ * @warning Platforms which do not implement this feature will return -+ * APR_ENOTIMPL. -+ */ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags); -+/** @} */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* ! APR_FILE_XATTR_H */ -Index: include/arch/unix/apr_arch_xattr.h -=================================================================== ---- include/arch/unix/apr_arch_xattr.h (revision 0) -+++ include/arch/unix/apr_arch_xattr.h (revision 0) -@@ -0,0 +1,51 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef FILE_XATTR_H -+#define FILE_XATTR_H -+ -+#if APR_HAVE_CTYPE_H -+#include -+#endif -+#if APR_HAVA_ERRNO_H -+#include -+#endif -+#if APR_HAVE_SYS_XATTR_H -+#include -+#endif -+#if APR_HAVE_SYS_EXTATTR_H -+#include -+#endif -+#if APR_HAVE_FCNTL_H -+#include -+#endif -+#if APR_HAVE_DIRENT_H -+#include -+#endif -+ -+#ifdef _LARGEFILE64_SOURCE -+#define XATTR_OPEN_FLAGS O_RDONLY | O_LARGEFILE -+#else -+#define XATTR_OPEN_FLAGS O_RDONLY -+#endif -+ -+struct apr_xattr_t { -+ int fd; -+ apr_uint32_t flags; -+ apr_pool_t *pool; -+}; -+ -+#endif -Index: include/apr_errno.h -=================================================================== ---- include/apr_errno.h (revision 606453) -+++ include/apr_errno.h (working copy) -@@ -851,6 +851,13 @@ - #define APR_EAFNOSUPPORT (APR_OS_START_CANONERR + 27) - #endif - -+/** @see APR_STATUS_IS_ENOATTR */ -+#ifdef ENOATTR -+#define APR_ENOATTR ENOATTR -+#else -+#define APR_ENOATTR (APR_OS_START_CANONERR + 28) -+#endif -+ - /** @} */ - - #if defined(OS2) && !defined(DOXYGEN) -@@ -995,6 +1002,7 @@ - || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_AFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - /* - Sorry, too tired to wrap this up for OS2... feel free to -@@ -1139,6 +1147,7 @@ - || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - #elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */ - -@@ -1200,6 +1209,7 @@ - #define APR_STATUS_IS_ENOTEMPTY(s) ((s) == APR_ENOTEMPTY) - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ - || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) - - #else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ - -@@ -1319,6 +1329,13 @@ - (s) == APR_EEXIST) - /** Address Family not supported */ - #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT) -+/** Attribute does not exists */ -+#ifdef ENODATA -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR \ -+ || (s) == ENODATA) -+#else -+#define APR_STATUS_IS_ENOATTR(s) ((s) == APR_ENOATTR) -+#endif - /** @} */ - - #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ diff --git a/dev-libs/apr/files/apr-xattr-impl.patch b/dev-libs/apr/files/apr-xattr-impl.patch deleted file mode 100644 index 47628c9..0000000 --- a/dev-libs/apr/files/apr-xattr-impl.patch +++ /dev/null @@ -1,1233 +0,0 @@ -Index: xattr/unix/xattr.c -=================================================================== ---- xattr/unix/xattr.c (revision 0) -+++ xattr/unix/xattr.c (revision 0) -@@ -0,0 +1,165 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+#include "apr_tables.h" -+ -+#if USE_XATTR_DARWIN || USE_XATTR_FREEBSD || USE_XATTR_LINUX || \ -+ USE_XATTR_SOLARIS -+ -+#include "apr_arch_file_io.h" -+#include "apr_arch_xattr.h" -+ -+#include "apr_file_xattr.h" -+ -+ -+static apr_status_t xattr_cleanup(void *xattr) -+{ -+ close(((apr_xattr_t*)xattr)->fd); -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ int fd; -+ int osflags = 0; -+ -+ fd = open(pathname, XATTR_OPEN_FLAGS); -+ if (fd < 0) { -+ return errno; -+ } -+ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = fd; -+ (*new)->flags = 0; -+ (*new)->pool = p; -+ -+ apr_pool_cleanup_register((*new)->pool, (void *)(*new), -+ xattr_cleanup, xattr_cleanup); -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = file->filedes; -+ (*new)->flags = APR_FILE_NOCLEANUP; -+ (*new)->pool = p; -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = apr_palloc(p, sizeof(apr_xattr_t)); -+ (*new)->fd = dirfd(dir->dirstruct); -+ (*new)->flags = APR_FILE_NOCLEANUP; -+ (*new)->pool = p; -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ if (!(xattr->flags & APR_FILE_NOCLEANUP)) { -+ return apr_pool_cleanup_run(xattr->pool, xattr, xattr_cleanup); -+ } -+ return APR_SUCCESS; -+} -+ -+#else -+ -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+#endif -Index: xattr/unix/darwin.c -=================================================================== ---- xattr/unix/darwin.c (revision 0) -+++ xattr/unix/darwin.c (revision 0) -@@ -0,0 +1,143 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_DARWIN -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ int osflags = 0; -+ -+ if (flags & APR_XATTR_CREATE) { -+ osflags |= XATTR_CREATE; -+ } -+ if (flags & APR_XATTR_REPLACE) { -+ osflags |= XATTR_REPLACE; -+ } -+ -+ ret = fsetxattr(xattr->fd, name, value, size, 0, osflags); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ -+ ret = fgetxattr(xattr->fd, name, NULL, 0, 0, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = fgetxattr(xattr->fd, name, *value, ret, 0, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ -+ ret = fgetxattr(xattr->fd, name, NULL, 0, 0, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENOATTR) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t lsize; -+ char *listbuf, *listp; -+ -+ lsize = flistxattr(xattr->fd, NULL, 0, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = flistxattr(xattr->fd, listbuf, lsize, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while (listp < listbuf + lsize) { -+ int attrlen = strlen(listp) + 1; -+ *(char**)apr_array_push(*list) = listp; -+ listp += attrlen; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = fremovexattr(xattr->fd, name, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_DARWIN */ -Index: xattr/unix/linux.c -=================================================================== ---- xattr/unix/linux.c (revision 0) -+++ xattr/unix/linux.c (revision 0) -@@ -0,0 +1,156 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_LINUX -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+static const char* user_ns_prefix = "user."; -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ int osflags = 0; -+ -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ if (flags & APR_XATTR_CREATE) { -+ osflags |= XATTR_CREATE; -+ } -+ if (flags & APR_XATTR_REPLACE) { -+ osflags |= XATTR_REPLACE; -+ } -+ -+ ret = fsetxattr(xattr->fd, tmpname, value, size, osflags); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fgetxattr(xattr->fd, tmpname, NULL, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = fgetxattr(xattr->fd, tmpname, *value, ret); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fgetxattr(xattr->fd, tmpname, NULL, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENODATA) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ apr_ssize_t lsize; -+ char *listbuf, *listp; -+ -+ lsize = flistxattr(xattr->fd, NULL, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = flistxattr(xattr->fd, listbuf, lsize); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while (listp < listbuf + lsize) { -+ int attrlen = strlen(listp) + 1; -+ int user_ns_prefix_len = strlen(user_ns_prefix); -+ if (strncmp(listp, user_ns_prefix, user_ns_prefix_len) != 0) { -+ continue; -+ } -+ listp += user_ns_prefix_len; -+ attrlen -= user_ns_prefix_len; -+ *(char**)apr_array_push(*list) = listp; -+ listp += attrlen; -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ char *tmpname = apr_pstrcat(xattr->pool, user_ns_prefix, name, NULL); -+ -+ ret = fremovexattr(xattr->fd, tmpname); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_LINUX */ -Index: xattr/unix/freebsd.c -=================================================================== ---- xattr/unix/freebsd.c (revision 0) -+++ xattr/unix/freebsd.c (revision 0) -@@ -0,0 +1,162 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_FREEBSD -+ -+#include "apr_arch_xattr.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ if ((flags & APR_XATTR_CREATE) && (flags & APR_XATTR_REPLACE)) { -+ return APR_EINVAL; -+ } -+ -+ if ((flags & APR_XATTR_CREATE) || (flags & APR_XATTR_REPLACE)) { -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret >= 0 && (flags & APR_XATTR_CREATE)) { -+ return APR_EEXIST; -+ } -+ else if (ret == -1 && errno == ENOATTR) { -+ if (flags & APR_XATTR_REPLACE) { -+ return APR_ENOATTR; -+ } -+ } -+ else if (ret == -1) { -+ return errno; -+ } -+ } -+ -+ ret = extattr_set_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, value, size); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *value = apr_palloc(xattr->pool, ret); -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, *value, ret); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ *size = ret; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_get_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name, NULL, 0); -+ -+ if (ret < 0) { -+ *exists = 0; -+ if (errno == ENOATTR) { -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ int lsize; -+ char *listbuf, *listp; -+ -+ lsize = extattr_list_fd(xattr->fd, EXTATTR_NAMESPACE_USER, NULL, 0); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ if (lsize == 0) { -+ *list = apr_array_make(xattr->pool, 0, sizeof(char*)); -+ return APR_SUCCESS; -+ } -+ listbuf = apr_palloc(xattr->pool, lsize); -+ -+ lsize = extattr_list_fd(xattr->fd, EXTATTR_NAMESPACE_USER, listbuf, lsize); -+ -+ if (lsize < 0) { -+ return errno; -+ } -+ -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ listp = listbuf; -+ while(listp < listbuf + lsize) { -+ /* first byte is the length of the attribute name and the -+ strings are not null terminated, so we copy them */ -+ int attrlen = (int)*listp; -+ *(char**)apr_array_push(*list) = apr_pstrndup(xattr->pool, listp+1, -+ attrlen); -+ listp += (attrlen + 1); -+ } -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret; -+ -+ ret = extattr_delete_fd(xattr->fd, EXTATTR_NAMESPACE_USER, name); -+ -+ if (ret < 0) { -+ return errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+#endif /* USE_XATTR_FREEBSD */ -Index: xattr/unix/solaris.c -=================================================================== ---- xattr/unix/solaris.c (revision 0) -+++ xattr/unix/solaris.c (revision 0) -@@ -0,0 +1,300 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_private.h" -+ -+#if USE_XATTR_SOLARIS -+ -+#include "apr_arch_xattr.h" -+#include "apr_arch_file_io.h" -+ -+#include "apr_strings.h" -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+/* The following code is for escaping and unescaping '/' chars -+ (and '%' as it is used as an escape character) in attribute names. -+ -+ This is because '/' can't be used in Solaris subfile names and doing -+ so could present a security risk as files could be opened elsewhere. -+*/ -+ -+static char nibble_to_hex(register char c) -+{ -+ if (c >= 0 && c <= 9) return '0' + c; -+ if (c >= 10 && c <= 15) return 'a' + c - 10; -+ else return 0; -+} -+ -+static char hex_to_nibble(register char c) -+{ -+ if (c >= '0' && c <= '9') return c - '0'; -+ if (c >= 'a' && c <= 'f') return c - 'a' + 10; -+ else if(c >= 'A' && c <= 'F') return c - 'A' + 10; -+ else return 0; -+} -+ -+static const char* escape_attr_name(const char *name, apr_pool_t *p) -+{ -+ const char *namep; -+ int hasspecial = 0; -+ apr_array_header_t *arr; -+ -+ /* fastpath if atttrname contains no characters that need escaping */ -+ if(strchr(name, '/') == NULL && strchr(name, '%') == NULL) { -+ return name; -+ } -+ -+ /* start with a conservative amount of additional space */ -+ arr = apr_array_make(p, strlen(name) + 16, sizeof(char)); -+ namep = name; -+ while (*namep) { -+ if(*namep == '/' || *namep == '%') { -+ *(char*)apr_array_push(arr) = '%'; -+ *(char*)apr_array_push(arr) = nibble_to_hex(*namep >> 4); -+ *(char*)apr_array_push(arr) = nibble_to_hex(*namep & 0x0f); -+ } else { -+ *(char*)apr_array_push(arr) = *namep; -+ } -+ namep++; -+ } -+ *(char*)apr_array_push(arr) = '\0'; -+ -+ return arr->elts; -+} -+ -+static const char* unescape_attr_name(const char *name, apr_pool_t *p) -+{ -+ const char *namep; -+ int hasspecial = 0; -+ apr_array_header_t *arr; -+ -+ /* fastpath if atttrname contains no escaped characters */ -+ if(strchr(name, '%') == NULL) { -+ return name; -+ } -+ -+ /* start with a conservative amount of additional space */ -+ arr = apr_array_make(p, strlen(name) + 16, sizeof(char)); -+ namep = name; -+ while (*namep) { -+ if(*namep == '%' && *(namep+1) != 0 && *(namep+2) != 0) { -+ namep++; -+ *(char*)apr_array_push(arr) = -+ hex_to_nibble(*namep++) << 4 | hex_to_nibble(*namep++); -+ } else { -+ *(char*)apr_array_push(arr) = *namep++; -+ } -+ } -+ *(char*)apr_array_push(arr) = '\0'; -+ -+ return arr->elts; -+} -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ int ret, fd, osflags; -+ struct_stat statbuf; -+ -+ if (strncmp(name, "SUNW", 4) == 0) { -+ /* don't clash with sun namespace */ -+ return EINVAL; -+ } else if (flags & APR_XATTR_CREATE && flags & APR_XATTR_REPLACE) { -+ return EINVAL; -+ } else if (flags & APR_XATTR_CREATE) { -+ osflags = O_CREAT | O_EXCL; -+ } else if (flags & APR_XATTR_REPLACE) { -+ osflags = 0; -+ } else { -+ osflags = O_CREAT; -+ } -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ osflags | O_XATTR | O_TRUNC | O_WRONLY, 0666); -+ -+ if (fd < 0) { -+ if(errno == ENOENT) { -+ return APR_ENOATTR; -+ } -+ return errno; -+ } -+ -+ do { -+ ret = write(fd, value, size); -+ } while(ret < 0 && errno == EINTR); -+ -+ if (ret < 0) { -+ ret = errno; -+ } -+ else if (ret != size) { -+ ret = APR_EGENERAL; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ close(fd); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ ssize_t rsize; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ O_RDONLY | O_XATTR); -+ if (fd < 0) { -+ if(errno == ENOENT) { -+ return APR_ENOATTR; -+ } -+ return errno; -+ } -+ -+ ret = fstat(fd, &statbuf); -+ -+ if (ret < 0) { -+ ret = errno; -+ close(fd); -+ return ret; -+ } -+ *value = apr_palloc(xattr->pool, statbuf.st_size); -+ -+ do { -+ rsize = read(fd, *value, statbuf.st_size); -+ } while(rsize < 0 && errno == EINTR); -+ -+ if (rsize < 0) { -+ ret = errno; -+ } -+ else if (rsize != statbuf.st_size) { -+ ret = APR_EGENERAL; -+ } -+ else { -+ ret = APR_SUCCESS; -+ *size = rsize; -+ } -+ close(fd); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ ssize_t rsize; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, escape_attr_name(name, xattr->pool), -+ O_RDONLY | O_XATTR); -+ if (fd < 0) { -+ *exists = 0; -+ if(errno == ENOENT) { -+ /* non-existant attribute does not return an error */ -+ return APR_SUCCESS; -+ } -+ return errno; -+ } -+ *exists = 1; -+ return APR_SUCCESS; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ DIR *dirp; -+ struct dirent *ent, *retent; -+ apr_size_t dirent_size = -+ sizeof(*ent) + (sizeof(ent->d_name) > 1 ? 0 : 255); -+ -+ fd = openat(xattr->fd, ".", O_RDONLY | O_XATTR); -+ -+ if (fd < 0) { -+ return errno; -+ } -+ dirp = fdopendir(fd); -+ if (dirp == NULL) { -+ ret = errno; -+ close(fd); -+ return ret; -+ } -+ -+ *list = apr_array_make(xattr->pool, 1, sizeof(char*)); -+ ent = apr_palloc(xattr->pool, dirent_size); -+ while ((ret = readdir_r(dirp, ent, &retent)) == 0 && retent) { -+ const char *name; -+ if (strncmp(ent->d_name, "SUNW", 4) == 0 || /* private */ -+ strcmp(ent->d_name, ".") == 0 || -+ strcmp(ent->d_name, "..") == 0) continue; -+ -+ name = unescape_attr_name(ent->d_name, xattr->pool); -+ /* we don't need to copy if the name has been unescaped as it -+ is pool allocated memory already */ -+ *(const char**)apr_array_push(*list) = -+ (name != ent->d_name) ? -+ name : apr_pstrdup(xattr->pool, ent->d_name); -+ } -+ -+ if (ret < 0) { -+ ret = errno; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ closedir(dirp); -+ return ret; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ int ret, fd; -+ struct_stat statbuf; -+ -+ fd = openat(xattr->fd, ".", O_XATTR | O_RDONLY); -+ -+ if (fd < 0) { -+ return errno; -+ } -+ -+ ret = unlinkat(fd, escape_attr_name(name, xattr->pool), 0); -+ -+ if (ret < 0) { -+ ret = (errno == ENOENT) ? APR_ENOATTR : errno; -+ } -+ else { -+ ret = APR_SUCCESS; -+ } -+ close(fd); -+ return ret; -+} -+ -+#endif /* USE_XATTR_SOLARIS */ -Index: xattr/netware/xattr.c -=================================================================== ---- xattr/netware/xattr.c (revision 0) -+++ xattr/netware/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -Index: xattr/os2/xattr.c -=================================================================== ---- xattr/os2/xattr.c (revision 0) -+++ xattr/os2/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -Index: xattr/win32/xattr.c -=================================================================== ---- xattr/win32/xattr.c (revision 0) -+++ xattr/win32/xattr.c (revision 0) -@@ -0,0 +1,89 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_tables.h" -+#include "apr_file_xattr.h" -+ -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_path(apr_xattr_t **new, -+ const char *pathname, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_file(apr_xattr_t **new, -+ apr_file_t *file, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_open_dir(apr_xattr_t **new, -+ apr_dir_t *dir, -+ apr_pool_t *p) -+{ -+ *new = NULL; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_destroy(apr_xattr_t *xattr) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_set(const apr_xattr_t *xattr, -+ const char *name, -+ const void *value, -+ apr_size_t size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_get(const apr_xattr_t *xattr, -+ const char *name, -+ void **value, -+ apr_size_t *size, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_exists(const apr_xattr_t *xattr, -+ const char *name, -+ int *exists, -+ apr_uint32_t flags) -+{ -+ *exists = 0; -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_list(const apr_xattr_t *xattr, -+ apr_array_header_t **list, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} -+ -+APR_DECLARE(apr_status_t) apr_xattr_remove(const apr_xattr_t *xattr, -+ const char *name, -+ apr_uint32_t flags) -+{ -+ return APR_ENOTIMPL; -+} diff --git a/dev-libs/apr/files/apr-xattr-tests.patch b/dev-libs/apr/files/apr-xattr-tests.patch deleted file mode 100644 index 6e979c6..0000000 --- a/dev-libs/apr/files/apr-xattr-tests.patch +++ /dev/null @@ -1,542 +0,0 @@ -Index: test/Makefile.in -=================================================================== ---- test/Makefile.in (revision 606453) -+++ test/Makefile.in (working copy) -@@ -28,7 +28,7 @@ - testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \ - testenv.lo testprocmutex.lo testfnmatch.lo testatomic.lo testflock.lo \ - testsock.lo testglobalmutex.lo teststrnatcmp.lo testfilecopy.lo \ -- testtemp.lo testlfs.lo testcond.lo -+ testtemp.lo testlfs.lo testcond.lo testxattr.lo - - OTHER_PROGRAMS = \ - sendfile@EXEEXT@ \ -Index: test/testxattr.c -=================================================================== ---- test/testxattr.c (revision 0) -+++ test/testxattr.c (revision 0) -@@ -0,0 +1,499 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#include "apr_file_io.h" -+#include "apr_file_xattr.h" -+#include "apr_errno.h" -+#include "apr_general.h" -+#include "testutil.h" -+ -+#if APR_HAS_XATTR -+ -+#define DIRNAME "data" -+#define FNAME DIRNAME "/file_xattrfile.txt" -+#define DNAME DIRNAME "/dir_xattrdir" -+ -+#define TESTKEY1 "testkey1" -+#define TESTVAL1 "testval1" -+#define TESTKEY2 "testkey2" -+#define TESTVAL2 "testval2" -+ -+/* test solaris subfilename escaping */ -+#define TESTKEYSPECIAL1 "/testkey2" -+#define TESTKEYSPECIAL2 "%testkey2" -+ -+static void test_xattr_file_set(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_set_create(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_TRUE(tc, APR_STATUS_IS_EEXIST(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_set_replace(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_REPLACE); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_CREATE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), -+ APR_XATTR_REPLACE); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_get(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_get_enoattr(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_exists(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ int exists; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, !exists); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, exists); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_list(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ rv = apr_xattr_set(xattr, TESTKEY2, TESTVAL2, strlen(TESTVAL2), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 2, list->nelts); -+ cmp1 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY1) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY2) == 0); -+ cmp2 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY2) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY1) == 0); -+ ABTS_TRUE(tc, cmp1 || cmp2 ); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_remove(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_NEQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_file_remove_enoattr(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOATTR(rv)); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+static void test_xattr_dir_set(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_get(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_exists(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ int exists; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, !exists); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_exists(xattr, TESTKEY1, &exists, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_TRUE(tc, exists); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_list(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ rv = apr_xattr_set(xattr, TESTKEY2, TESTVAL2, strlen(TESTVAL2), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 2, list->nelts); -+ cmp1 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY1) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY2) == 0); -+ cmp2 = (strcmp(APR_ARRAY_IDX(list, 0, char*), TESTKEY2) == 0) && -+ (strcmp(APR_ARRAY_IDX(list, 1, char*), TESTKEY1) == 0); -+ ABTS_TRUE(tc, cmp1 || cmp2 ); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_dir_remove(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_size_t size; -+ char *val = NULL; -+ -+ rv = apr_dir_make(DNAME, APR_OS_DEFAULT, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, DNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, TESTKEY1, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_remove(xattr, TESTKEY1, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, TESTKEY1, (void**)&val, &size, 0); -+ ABTS_INT_NEQUAL(tc, APR_SUCCESS, rv); -+ -+ apr_xattr_destroy(xattr); -+ apr_dir_remove(DNAME, p); -+} -+ -+static void test_xattr_open_path_enoent(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_TRUE(tc, APR_STATUS_IS_ENOENT(rv)); -+} -+ -+static void test_xattr_file_special_chars(abts_case *tc, void *data) -+{ -+ apr_status_t rv; -+ apr_xattr_t *xattr; -+ apr_file_t *filetest = NULL; -+ apr_size_t size; -+ const char *name = (const char*)data; -+ char *val = NULL; -+ apr_array_header_t *list = NULL; -+ int cmp1, cmp2; -+ -+ rv = apr_file_open(&filetest, FNAME, -+ APR_WRITE | APR_CREATE | APR_DELONCLOSE, -+ APR_UREAD | APR_UWRITE | APR_GREAD, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_open_path(&xattr, FNAME, p); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_set(xattr, name, TESTVAL1, strlen(TESTVAL1), 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ -+ rv = apr_xattr_get(xattr, name, (void**)&val, &size, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_INT_EQUAL(tc, strlen(TESTVAL1), size); -+ ABTS_PTR_NOTNULL(tc, val); -+ ABTS_TRUE(tc, strncmp(TESTVAL1, val, strlen(TESTVAL1)) == 0); -+ -+ rv = apr_xattr_list(xattr, &list, 0); -+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); -+ ABTS_PTR_NOTNULL(tc, list); -+ ABTS_INT_EQUAL(tc, 1, list->nelts); -+ ABTS_TRUE(tc, strcmp(name, APR_ARRAY_IDX(list, 0, char*)) == 0); -+ -+ apr_xattr_destroy(xattr); -+ apr_file_close(filetest); -+} -+ -+#else -+ -+static void test_xattr_not_impl(abts_case *tc, void *data) -+{ -+ ABTS_NOT_IMPL(tc, "xattr not implemented on this platform"); -+} -+ -+#endif /* APR_HAS_XATTR */ -+ -+abts_suite *testxattr(abts_suite *suite) -+{ -+ suite = ADD_SUITE(suite) -+ -+#if !APR_HAS_XATTR -+ abts_run_test(suite, test_xattr_not_impl, NULL); -+#else -+ abts_run_test(suite, test_xattr_file_set, NULL); -+ abts_run_test(suite, test_xattr_file_set_create, NULL); -+ abts_run_test(suite, test_xattr_file_set_replace, NULL); -+ abts_run_test(suite, test_xattr_file_get, NULL); -+ abts_run_test(suite, test_xattr_file_get_enoattr, NULL); -+ abts_run_test(suite, test_xattr_file_exists, NULL); -+ abts_run_test(suite, test_xattr_file_list, NULL); -+ abts_run_test(suite, test_xattr_file_remove, NULL); -+ abts_run_test(suite, test_xattr_file_remove_enoattr, NULL); -+ abts_run_test(suite, test_xattr_dir_set, NULL); -+ abts_run_test(suite, test_xattr_dir_get, NULL); -+ abts_run_test(suite, test_xattr_dir_exists, NULL); -+ abts_run_test(suite, test_xattr_dir_list, NULL); -+ abts_run_test(suite, test_xattr_dir_remove, NULL); -+ abts_run_test(suite, test_xattr_open_path_enoent, NULL); -+ abts_run_test(suite, test_xattr_file_special_chars, TESTKEYSPECIAL1); -+ abts_run_test(suite, test_xattr_file_special_chars, TESTKEYSPECIAL2); -+#endif -+ -+ return suite; -+} -Index: test/abts_tests.h -=================================================================== ---- test/abts_tests.h (revision 606453) -+++ test/abts_tests.h (working copy) -@@ -66,7 +66,8 @@ - {testtime}, - {testud}, - {testuser}, -- {testvsn} -+ {testvsn}, -+ {testxattr} - }; - - #endif /* APR_TEST_INCLUDES */ -Index: test/testutil.h -=================================================================== ---- test/testutil.h (revision 606453) -+++ test/testutil.h (working copy) -@@ -102,5 +102,6 @@ - abts_suite *testud(abts_suite *suite); - abts_suite *testuser(abts_suite *suite); - abts_suite *testvsn(abts_suite *suite); -+abts_suite *testxattr(abts_suite *suite); - - #endif /* APR_TEST_INCLUDES */ diff --git a/dev-libs/apr/files/config.layout.patch b/dev-libs/apr/files/config.layout.patch deleted file mode 100644 index 66fa868..0000000 --- a/dev-libs/apr/files/config.layout.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- config.layout.orig 2006-07-06 21:44:41.000000000 -0700 -+++ config.layout 2006-07-06 21:46:26.000000000 -0700 -@@ -229,3 +229,22 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - -+ -+# Gentoo layout -+ -+ prefix: /usr -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/modules -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: /usr/share/apr-${APR_MAJOR_VERSION} -+ installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION} -+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APR_MAJOR_VERSION} -+ -+ -+ diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml deleted file mode 100644 index 7a90328..0000000 --- a/dev-libs/apr/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -apache - - apache-bugs@gentoo.org - - - Enable binary compatibility with older kernels - Use /dev/urandom instead of /dev/random - Enable UUID support - - diff --git a/dev-php/awl/ChangeLog b/dev-php/awl/ChangeLog deleted file mode 100644 index cf4f47c..0000000 --- a/dev-php/awl/ChangeLog +++ /dev/null @@ -1,46 +0,0 @@ -# ChangeLog for dev-php/awl -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 31 Jan 2010; Mario Fetka ChangeLog: - initial checkin based on sunrise ebuild - - 07 Jan 2010; lebarjack - -awl-0.38.ebuild, +awl-0.39.ebuild: - Version bump, now depends on php with pdo - - 14 Oct 2009; lebarjack - -awl-0.37.ebuild, +awl-0.38.ebuild: - New version for the awl library - - 01 Jul 2009; lebarjack - -awl-0.36.ebuild, +awl-0.37.ebuild: - New version for the awl library - - 22 Apr 2009; Christian Ruppert awl-0.36.ebuild: - Removed unused eutils inherite, added depend.php. - - 22 Apr 2009; lebarjack - -awl-0.34.ebuild, +awl-0.36.ebuild: - Version bump to 0.36 - - 16 Mar 2009; Nick Fortino (nfortino) awl-0.34.ebuild: - Update ebuild to use EAPI 2. Thanks to Cristian Ruppert and Thomas Sachau - for review - - 24 Nov 2008; lebarjack - -awl-0.33.ebuild, +awl-0.34.ebuild: - New version for awl - - 05 Nov 2008; lebarjack - -libawl-php-0.31.ebuild, +awl-0.33.ebuild: - New version. Renamed to dev-php/awl to reflect upstream naming scheme - - 16 Sep 2008; lebarjack - -libawl-php-0.29.ebuild, +libawl-php-0.31.ebuild: - New version for awl (libawl-php) - - 23 Jun 2008; lebarjack - +libawl-php-0.29.ebuild, +metadata.xml: - New ebuild for bug 229025 - (initial work by Cory Coager ) - diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest deleted file mode 100644 index 9b45d28..0000000 --- a/dev-php/awl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST awl-0.39.tar.gz 222970 RMD160 534ebc5d09752d14c1024c912ab27f901e40ad75 SHA1 52a1b09b9190f29fde5bd3123090dfaf6a0b8ebe SHA256 d4b761ca7f36bf899aebaeeb3b036cebb37bd6ef908f3b6e264c61c84f8f5662 -EBUILD awl-0.39.ebuild 1080 RMD160 c21da7d4f03f69bf8f8af09b7a531ed81b528dab SHA1 326e190931805c714eaa8eebb48e689aaa1f2891 SHA256 0a5c0425ab21c165eabd806a2913e6ac7da4e3c597278569febc781c4eb62300 -MISC ChangeLog 1667 RMD160 f581154d4d2b194100b8c8ad7f03200145fdf2eb SHA1 3341f4cbd175cf815751dd79b7be2b205e0b4eaa SHA256 d25694c6972bf1bbd88527f5a3ac99fcdf9f1b1d7f025c7a633515331eea2f4c -MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/dev-php/awl/awl-0.39.ebuild b/dev-php/awl/awl-0.39.ebuild deleted file mode 100644 index d1e7569..0000000 --- a/dev-php/awl/awl-0.39.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit depend.php php-lib-r1 - -DESCRIPTION="Andrew McMillan's web libraries: A collection of generic classes -used by the davical calendar server" -HOMEPAGE="http://andrew.mcmillan.net.nz/projects/awl" -SRC_URI="http://debian.mcmillan.net.nz/packages/awl/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="dev-lang/php[pcre,pdo,postgres,xml] - doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="${DEPEND}" - -need_php5 - -src_compile() { - if use doc ; then - ebegin "Generating documentation" - phpdoc -c "docs/api/phpdoc.ini" || die "phpdoc failed" - eend $? || die "Documentation failed to build" - fi -} - -src_install() { - local docs="debian/README.Debian debian/changelog" - dodoc-php ${docs} || die "dodoc failed" - - if use doc ; then - dohtml -r "docs/api/" || die "dohtml failed" - fi - - insinto /usr/share/awl - doins -r dba || die "doins failed" - - php-lib-r1_src_install ./inc `find ./inc -type f -print | sed -e "s|./inc||g"` -} diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml deleted file mode 100644 index 7e32869..0000000 --- a/dev-php/awl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -maintainer-wanted - diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog deleted file mode 100644 index ec801dc..0000000 --- a/net-nds/openldap/ChangeLog +++ /dev/null @@ -1,1767 +0,0 @@ -# ChangeLog for net-nds/openldap -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.370 2010/04/11 15:24:10 jokey Exp $ - - 30 Jul 2011; Mario Fetka openldap-2.4.26.ebuild: - correct privat header install - - 30 Jul 2011; Mario Fetka openldap-2.4.26.ebuild: - add install of portable.h header in privat dir - -*openldap-2.4.26 (30 Jul 2011) - - 30 Jul 2011; Mario Fetka +openldap-2.4.26.ebuild, - +files/openldap-2.4.26-contrib-smbk5pwd.patch: - Bump - -*openldap-2.4.25 (28 May 2011) - - 28 May 2011; Mario Fetka - files/openldap-2.4.22.ebuild.diff, +openldap-2.4.25.ebuild: - Bump samba4 patch - - 10 Mar 2011; Mario Fetka metadata.xml: - bump with samba4 useflag - -*openldap-2.4.24 (10 Mar 2011) - - 10 Mar 2011; Mario Fetka - files/openldap-2.4.22.ebuild.diff, openldap-2.4.23.ebuild, - +openldap-2.4.24.ebuild: - bump with samba4 useflag - - 11 Oct 2010; Mario Fetka openldap-2.4.23.ebuild: - add missing depend - - 30 Sep 2010; Mario Fetka - +files/openldap-2.2.6-ntlm.patch, +files/openldap-2.3.21-ppolicy.patch, - +files/openldap-2.3.24-contrib-smbk5pwd.patch, - +files/openldap-2.3.XY-gcc44.patch, +files/openldap-2.3.34-slapd-conf, - +files/openldap-2.3.37-libldap_r.patch, - +files/openldap-2.4.17-contrib-smbk5pwd.patch, - files/openldap-2.4.22.ebuild.diff, +openldap-2.4.23.ebuild, - +files/slapd-initd: - Bump to 2.4.23 with sammba4 - - 09 Jul 2010; Mario Fetka - +files/openldap-2.4.22.ebuild.diff: - add new file - - 03 Jun 2010; Mario Fetka - +files/openldap-2.2.14-perlthreadsfix.patch, - +files/openldap-2.4.11-libldap_r.patch, - +files/openldap-2.4.15-ppolicy.patch, - +files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch, - +files/openldap-2.4.17-gcc44.patch, - +files/openldap-2.4.19-contrib-smbk5pwd.patch, +openldap-2.4.22.ebuild, - +files/DB_CONFIG.fast.example, +files/slapd-confd, +files/slapd-initd2, - +files/slurpd-initd, +metadata.xml: - bump and add samba4 overlay - - 11 Apr 2010; Markus Ullmann -openldap-2.3.41.ebuild, - -openldap-2.3.41-r1.ebuild, -openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild, -openldap-2.4.16.ebuild, - -openldap-2.4.17.ebuild, -openldap-2.4.17-r1.ebuild, - -openldap-2.4.19.ebuild: - Some cleanup, remove unused versions - -*openldap-2.4.21 (11 Apr 2010) - - 11 Apr 2010; Markus Ullmann +files/slapd-initd2, - +openldap-2.4.21.ebuild: - Version bump to upstream recommended version, fix bugs #296567, #306807 - and #306623. Thanks to Andreas Kimpfler, steveb and Mike Hiretsky - - 19 Feb 2010; Robin H. Johnson metadata.xml: - Describe the ODBC use flag better. - - 12 Jan 2010; Doug Goldstein openldap-2.3.41.ebuild, - openldap-2.3.41-r1.ebuild, openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild, openldap-2.4.16.ebuild, openldap-2.4.17.ebuild, - openldap-2.4.17-r1.ebuild, openldap-2.4.19.ebuild, - openldap-2.4.19-r1.ebuild: - modify the order of preserve_libs call so that a user that follows the - instructions to the T doesn't do needless rebuilds of openldap - - 04 Dec 2009; Robin H. Johnson - openldap-2.4.19-r1.ebuild: - Bug #295622: Try for a major improvement in the detection of an existing - on-disk DB. - - 03 Dec 2009; Robin H. Johnson - openldap-2.4.19.ebuild, openldap-2.4.19-r1.ebuild: - Make cxx NOT defaulted per the profile, due to the circular dependency it - brings in with dev-libs/cyrus-sasl. Thanks to Cardoe for pointing out. - - 03 Dec 2009; Robin H. Johnson - openldap-2.4.19-r1.ebuild: - Bug #291821 redux Cleanup the sys-libs/db check more to NOT fire when - there are no database files present. - - 28 Nov 2009; Robin H. Johnson - openldap-2.4.19-r1.ebuild: - 2.4.19-r1 is a compile-fix for ldapc++ and some additional safety checks - not present in the r0 ebuild. Taking the -r0 keywords per bug 290345 GLSA. - - 28 Nov 2009; Robin H. Johnson - openldap-2.4.19-r1.ebuild: - Bug #294401: ldapc++ will not build on a fresh system as it needs liblber - to finish it's configure process. - - 28 Nov 2009; Robin H. Johnson - openldap-2.4.19-r1.ebuild: - Fixup the bash4 usage and go into slightly more detail on the berkdb - prebuilt check so users do not block themselves out of their database. - - 27 Nov 2009; Arfrever Frehtes Taifersar Arahesis - openldap-2.4.19-r1.ebuild: - Check previously used version of sys-libs/db only with USE="berkdb". - - 24 Nov 2009; Robin H. Johnson openldap-2.4.17.ebuild, - openldap-2.4.17-r1.ebuild, openldap-2.4.19.ebuild, - openldap-2.4.19-r1.ebuild: - Bug #291923, fix missing prefix /. - -*openldap-2.4.19-r1 (24 Nov 2009) - - 24 Nov 2009; Robin H. Johnson - +openldap-2.4.19-r1.ebuild: - Bug #293699: Ensure new contrib overlays work properly when dynamically - compiled. Bug #291821: Detect that the to-be-linked against version of DB - is not the same as the existing linked version and prevent the users data - from becoming inaccessible. - - 21 Nov 2009; nixnut openldap-2.4.19.ebuild: - ppc stable #290345 - - 17 Nov 2009; Brent Baude openldap-2.4.19.ebuild: - Marking openldap-2.4.19 ppc64 for bug 290345 - - 15 Nov 2009; Raúl Porcel openldap-2.4.19.ebuild: - ia64/s390/sh/sparc stable wrt #290345 - - 07 Nov 2009; Tobias Klausmann - openldap-2.4.19.ebuild: - Stable on alpha, bug #290345 - - 06 Nov 2009; Markus Meier openldap-2.4.19.ebuild: - arm stable, bug #290345 - - 05 Nov 2009; Markus Meier openldap-2.4.19.ebuild: - amd64 stable, bug #290345 - - 05 Nov 2009; Jeroen Roovers openldap-2.4.19.ebuild: - Stable for HPPA (bug #290345). - - 04 Nov 2009; Christian Faulhammer - openldap-2.4.19.ebuild: - stable x86, security bug 290345 - -*openldap-2.4.19 (03 Nov 2009) - - 03 Nov 2009; Robin H. Johnson - +openldap-2.4.19.ebuild, +files/openldap-2.4.19-contrib-smbk5pwd.patch: - Version bump per bug #290345 (CVE-2009-3767). Also fix: #286427 - disable-syslog w/ USE=minimal. #280986 ldflags. - - 10 Aug 2009; Samuli Suominen - openldap-2.4.17-r1.ebuild, +files/openldap-2.4.17-gcc44.patch: - Fix building with GCC 4.4+ wrt #280988. - - 28 Jul 2009; Robin H. Johnson - -openldap-2.3.39-r2.ebuild, -openldap-2.3.40-r1.ebuild, - -openldap-2.4.7.ebuild, -files/openldap-2.4-disable-bdb46.patch, - -openldap-2.4.10.ebuild, -openldap-2.4.11.ebuild, - -openldap-2.4.11-r1.ebuild, -files/openldap-2.4-ppolicy.patch: - Bug #271723: Clean up old versions. - -*openldap-2.4.17-r1 (28 Jul 2009) - - 28 Jul 2009; Robin H. Johnson - +openldap-2.4.17-r1.ebuild, files/openldap-2.4.17-contrib-smbk5pwd.patch, - +files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch, - files/slapd-initd: - Bug #219371: Install C++ libraries and headers as needed. Bug #233633: Fix - compile with USE="samba gnutls". Bug #273699: Fix slapd init ordering. Bug - #261186: Build plugins with libtool instead of directly. Bug #279461: - Update smbk5pwd building. - -*openldap-2.4.17 (28 Jul 2009) - - 28 Jul 2009; Robin H. Johnson - +openldap-2.4.17.ebuild, +files/openldap-2.4.17-contrib-smbk5pwd.patch: - Bug #279352: version bump. Also fixes bug #266643. - - 08 May 2009; Peter Alfredsen - +files/openldap-2.3.XY-gcc44.patch, openldap-2.3.39-r2.ebuild, - openldap-2.3.40-r1.ebuild, openldap-2.3.41.ebuild, - openldap-2.3.41-r1.ebuild, openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild: - Fix build with gcc-4.4, bug 264761. Thanks to Daniel J. - for the patch. Versions still affected: - openldap-2.4.7, 2.4.10, 2.4.11*, but PMASKED. Use 2.4.16 if you have to. - -*openldap-2.4.16 (14 Apr 2009) - - 14 Apr 2009; Tiziano Müller - +files/openldap-2.4.15-ppolicy.patch, +openldap-2.4.16.ebuild: - Version bump (bug #260796). Also solved bug #245152. - - 07 Mar 2009; Thomas Anderson - openldap-2.3.39-r2.ebuild, openldap-2.3.40-r1.ebuild, - openldap-2.3.41.ebuild, openldap-2.3.41-r1.ebuild, openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild, openldap-2.4.7.ebuild, openldap-2.4.10.ebuild, - openldap-2.4.11.ebuild, openldap-2.4.11-r1.ebuild: - Fix elog which is innaccurate because of portage compression - - 05 Mar 2009; Robin H. Johnson - files/openldap-2.3.34-slapd-conf: - Bug #261287, no longer allowed to have a comment at the end of a line with - other content. - - 15 Jan 2009; Raúl Porcel openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild: - Fix ebuilds with EAPI=2, bug #255021 - - 13 Jan 2009; Raúl Porcel openldap-2.3.43.ebuild, - openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild: - Move to USE-deps to fix bug #253964, acked by robbat2 - - 14 Oct 2008; Robin H. Johnson files/slapd-initd: - Bug #229289, --quiet is no longer needed. - - 14 Oct 2008; Robin H. Johnson - openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild: - Bug #186391 - use krb5-config --cflags instead of hardcoding - -I/usr/include/heimdal. Untested due to lack of kerberos systems. - -*openldap-2.4.11-r1 (14 Oct 2008) - - 14 Oct 2008; Robin H. Johnson - +files/openldap-2.4.11-libldap_r.patch, +openldap-2.4.11-r1.ebuild: - Bug #189817, fix linking of libldap_r with as-needed. - -*openldap-2.3.43-r1 (14 Oct 2008) - - 14 Oct 2008; Robin H. Johnson - +files/openldap-2.3.37-libldap_r.patch, +openldap-2.3.43-r1.ebuild: - Bug #189817, fix linking of libldap_r with as-needed. - -*openldap-2.4.11 (03 Sep 2008) - - 03 Sep 2008; Markus Ullmann +openldap-2.4.11.ebuild: - Version bump wrt bug 232940 - - 16 Aug 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 13 Aug 2008; Robin H. Johnson - openldap-2.3.39-r2.ebuild, openldap-2.3.40-r1.ebuild, - openldap-2.3.41.ebuild, openldap-2.4.7.ebuild, openldap-2.4.10.ebuild: - Bug #233006, block sys-libs/db:4.7 properly. Patch from Arfrever Frehtes - Taifersar Arahesis . - - 03 Aug 2008; Tobias Heinlein - openldap-2.3.43.ebuild: - amd64 stable wrt security bug #230269 - - 22 Jul 2008; Tobias Scherbaum - openldap-2.3.43.ebuild: - ppc stable, bug #230269 - - 21 Jul 2008; Raúl Porcel openldap-2.3.43.ebuild: - alpha/ia64/x86 stable wrt #230269 - - 21 Jul 2008; Friedrich Oslage - openldap-2.3.43.ebuild: - Stable on sparc, bug #230269 - - 21 Jul 2008; Markus Rothe openldap-2.3.43.ebuild: - Stable on ppc64; bug #230269 - - 21 Jul 2008; Jeroen Roovers openldap-2.3.43.ebuild: - Stable for HPPA (bug #230269). - -*openldap-2.3.43 (20 Jul 2008) - - 20 Jul 2008; Robin H. Johnson - +openldap-2.3.43.ebuild: - Version bump for security bug #230269. - - 20 Jun 2008; Peter Alfredsen - openldap-2.3.41-r1.ebuild: - Add -D_GNU_SOURCE for using struct ucred. Bug 228457. - -*openldap-2.4.10 (11 Jun 2008) - - 11 Jun 2008; Tiziano Müller - +openldap-2.4.10.ebuild: - Version bump which adds back the contrib modules, fixes the bdb usage, - etc. - -*openldap-2.3.41-r1 (21 May 2008) - - 21 May 2008; Caleb Tennis +openldap-2.3.41-r1.ebuild: - do a revbump. This incorporates fixes from bug 219069 that allows db 4.6 to - be installed on the system while linking against a lower version - - 18 Mar 2008; Jeroen Roovers openldap-2.3.41.ebuild: - Stable for HPPA (bug #209677). - - 07 Mar 2008; Steve Dibb openldap-2.3.41.ebuild: - amd64 stable, security bug 209677 - - 05 Mar 2008; Tobias Scherbaum - openldap-2.3.41.ebuild: - ppc stable, bug #209677 - - 05 Mar 2008; Raúl Porcel openldap-2.3.41.ebuild: - alpha/ia64/sparc stable wrt #209677 - - 05 Mar 2008; Christian Faulhammer - openldap-2.3.41.ebuild: - stable x86, bug 209677 - - 05 Mar 2008; Brent Baude openldap-2.3.41.ebuild: - Marking openldap-2.3.41 ppc64 for bug 209677 - -*openldap-2.3.41 (04 Mar 2008) - - 04 Mar 2008; Markus Ullmann +openldap-2.3.41.ebuild: - Version bump for security bug #209677 - - 26 Jan 2008; Sven Wegener openldap-2.4.7.ebuild: - Add selinux to IUSE, we use it in *DEPEND. - - 13 Jan 2008; Ulrich Mueller -openldap-2.3.35-r1.ebuild, - -openldap-2.3.39-r1.ebuild: - Remove old revisions wrt bug #201690. - - 13 Jan 2008; Markus Ullmann openldap-2.3.39-r2.ebuild, - openldap-2.3.40-r1.ebuild: - Add samba flag warning for bug #196045 - - 13 Jan 2008; Markus Ullmann openldap-2.3.39-r2.ebuild: - Stable on amd64 with welps permission - - 13 Jan 2008; Markus Ullmann openldap-2.3.39-r2.ebuild, - openldap-2.3.40-r1.ebuild: - Drop readline dep as it's not needed any more - - 13 Jan 2008; Markus Ullmann openldap-2.3.39-r2.ebuild, - openldap-2.3.40-r1.ebuild, openldap-2.4.7.ebuild: - Fix lib preservation for bug #205220 - -*openldap-2.4.7 (13 Jan 2008) - - 13 Jan 2008; Markus Ullmann - +files/openldap-2.4-disable-bdb46.patch, - +files/openldap-2.4-ppolicy.patch, +openldap-2.4.7.ebuild: - Version bump to new 2.4 series - - 10 Jan 2008; Raúl Porcel openldap-2.3.39-r2.ebuild: - alpha/ia64 stable wrt #201690 - - 10 Jan 2008; Markus Ullmann openldap-2.3.39-r2.ebuild: - Stable on sparc - -*openldap-2.3.40-r1 (09 Jan 2008) - - 09 Jan 2008; Markus Ullmann -openldap-2.3.40.ebuild, - +openldap-2.3.40-r1.ebuild: - Revbump to fix docert accidentally re-introduced in .40 - - 09 Jan 2008; Brent Baude openldap-2.3.39-r2.ebuild: - Marking openldap-2.3.39-r2 ppc64 for bug 201690 - - 09 Jan 2008; Brent Baude openldap-2.3.39-r2.ebuild: - Marking openldap-2.3.39-r2 ppc for bug 201690 - - 09 Jan 2008; Jeroen Roovers openldap-2.3.39-r2.ebuild: - Stable for HPPA (bug #201690). - - 09 Jan 2008; Christian Faulhammer - openldap-2.3.39-r2.ebuild: - stable x86, bug 201690 - -*openldap-2.3.40 (06 Jan 2008) - - 06 Jan 2008; Markus Ullmann +openldap-2.3.40.ebuild: - Version bump with added openldap-2.4 sync support - -*openldap-2.3.39-r2 (27 Dec 2007) - - 27 Dec 2007; Ulrich Mueller +openldap-2.3.39-r2.ebuild: - Replace docert with install_cert in pkg_postinst, bug #201690. - - 25 Dec 2007; Markus Ullmann Manifest: - Make repoman happy - - 25 Dec 2007; Markus Ullmann -openldap-2.2.28-r7.ebuild, - -openldap-2.3.37.ebuild, -openldap-2.3.38.ebuild, -openldap-2.3.39.ebuild: - Drop old - - 28 Nov 2007; Chris Gianelloni - openldap-2.3.39-r1.ebuild: - Stable on amd64 wrt bug #197446. - - 27 Nov 2007; Raúl Porcel openldap-2.3.39-r1.ebuild: - alpha/ia64/sparc stable wrt security #197446 - - 27 Nov 2007; Christian Faulhammer - openldap-2.3.39-r1.ebuild: - stable x86, security bug 197446 - - 27 Nov 2007; Jeroen Roovers openldap-2.3.39-r1.ebuild: - Stable for HPPA (bug #197446). Fixed quoting and whitespace issues. - - 27 Nov 2007; Brent Baude openldap-2.3.39-r1.ebuild: - Marking openldap-2.3.39-r1 ppc64 stable for bug 197446 - - 26 Nov 2007; Brent Baude openldap-2.3.39-r1.ebuild: - Marking openldap-2.3.39-r1 ppc for bug 197446 - -*openldap-2.3.39-r1 (08 Nov 2007) - - 08 Nov 2007; Markus Ullmann +openldap-2.3.39-r1.ebuild: - Another dep restriction and enable syncprov overlay by default without - overlays useflag as that is widely used and causes confusion if compiled as - module - - 02 Nov 2007; Mike Frysinger openldap-2.3.39.ebuild: - Add a blocker to db-4.6 since it was unmasked for a little while and can - easily still live on peoples systems #197542. - -*openldap-2.3.39 (29 Oct 2007) - - 29 Oct 2007; Markus Ullmann +openldap-2.3.39.ebuild: - Version bump - - 17 Oct 2007; Chris Gianelloni - openldap-2.3.38.ebuild: - Stable on amd64 wrt bug #195180. - - 12 Oct 2007; Markus Rothe openldap-2.3.38.ebuild: - Stable on ppc64; bug #195180 - - 11 Oct 2007; Lars Weiler openldap-2.3.38.ebuild: - stable ppc, bug #195180 - - 09 Oct 2007; Raúl Porcel openldap-2.3.38.ebuild: - alpha/ia64/sparc stable wrt #195180 - - 09 Oct 2007; Christian Faulhammer openldap-2.3.38.ebuild: - stable x86, bug 195180 - - 09 Oct 2007; Jeroen Roovers openldap-2.3.38.ebuild: - Stable for HPPA (bug #195180). - -*openldap-2.3.38 (06 Sep 2007) - - 06 Sep 2007; Markus Ullmann -openldap-2.3.30-r2.ebuild, - -openldap-2.3.35-r2.ebuild, -openldap-2.3.36.ebuild, - +openldap-2.3.38.ebuild: - Cleanup and version bump - -*openldap-2.3.37 (23 Jul 2007) - - 23 Jul 2007; Markus Ullmann +openldap-2.3.37.ebuild: - Version bump, just minor bugfixes - - 13 Jul 2007; Roy Marples openldap-2.3.36.ebuild: - Keyworded ~sparc-fbsd - -*openldap-2.3.36 (02 Jul 2007) - - 02 Jul 2007; Markus Ullmann +openldap-2.3.36.ebuild: - Version bump, upstream info: only bugfixes - -*openldap-2.3.35-r2 (04 Jun 2007) - - 04 Jun 2007; Markus Ullmann +openldap-2.3.35-r2.ebuild: - Fix lanman bug #178651 - - 02 Jun 2007; nixnut openldap-2.3.35-r1.ebuild: - Stable on ppc wrt bug 180012 - - 02 Jun 2007; Markus Ullmann -openldap-2.3.34-r1.ebuild, - -openldap-2.3.35.ebuild: - Drop old versions - - 31 May 2007; Raúl Porcel openldap-2.3.35-r1.ebuild: - x86 stable wrt #180012 - - 31 May 2007; Raúl Porcel openldap-2.3.35-r1.ebuild: - alpha/ia64 stable wrt #180012 - - 31 May 2007; Daniel Gryniewicz - openldap-2.3.35-r1.ebuild: - Marked stable on amd64 for bug #180012 - - 30 May 2007; Markus Ullmann openldap-2.3.35-r1.ebuild: - Stable on arm - - 29 May 2007; Gustavo Zacarias - openldap-2.3.35-r1.ebuild: - Stable on sparc wrt #180012 - - 29 May 2007; Brent Baude openldap-2.3.35-r1.ebuild: - Marking openldap-2.3.35-r1 ppc64 stable for bug 180012 - - 29 May 2007; Jeroen Roovers openldap-2.3.35-r1.ebuild: - Stable for HPPA (bug #180012). - - 17 May 2007; Roy Marples openldap-2.3.35-r1.ebuild: - Include the correct db.h on FreeBSD. - Fix install to use -o and not -u for SSL certs. - -*openldap-2.3.35-r1 (25 Apr 2007) - - 25 Apr 2007; Robin H. Johnson - +openldap-2.3.35-r1.ebuild: - Fix slapd.conf source location. Move SSL generation back into pkg_postinst - to avoid a potential security problem. - -*openldap-2.3.35 (10 Apr 2007) - - 10 Apr 2007; Markus Ullmann -openldap-2.3.34.ebuild, - +openldap-2.3.35.ebuild: - Version bump - - 06 Apr 2007; Markus Ullmann -openldap-2.3.33.ebuild: - Drop old version - -*openldap-2.3.34-r1 (06 Apr 2007) - - 06 Apr 2007; Markus Ullmann - +files/openldap-2.3.34-slapd-conf, +openldap-2.3.34-r1.ebuild: - Add built backends module population to config file and fix bug #163652 , - bug #172998 and bug #170648 - - 26 Mar 2007; Markus Ullmann - -openldap-2.1.30-r10.ebuild: - Drop 2.1 - -*openldap-2.3.34 (26 Mar 2007) - - 26 Mar 2007; Markus Ullmann +openldap-2.3.34.ebuild: - Version bump - - 16 Feb 2007; Markus Ullmann openldap-2.2.28-r7.ebuild, - -openldap-2.3.27-r3.ebuild, openldap-2.3.30-r2.ebuild, - openldap-2.3.33.ebuild: - Fix liblber wrt bug #164626 and drop unneeded version - - 20 Jan 2007; Markus Ullmann openldap-2.1.30-r10.ebuild: - Fix a patch call - -*openldap-2.3.33 (19 Jan 2007) - - 19 Jan 2007; Markus Ullmann -openldap-2.3.32.ebuild, - +openldap-2.3.33.ebuild: - Version bump (should fix bug #162587 as well) - - 16 Jan 2007; Markus Ullmann - -files/openldap-2.1.27-db40.patch, - -files/openldap-2.1.27-perlthreadsfix.patch, - -files/openldap-2.1.30-autoconf-archived-fix.patch, - -files/openldap-2.1.30-autoconf25.patch, - -files/openldap-2.1.30-db40.patch, -files/openldap-2.1.30-glibc24.patch, - -files/openldap-2.1.30-m4_underquoted.patch, - -files/openldap-2.1.30-rpath.patch, -files/openldap-2.1.30-tests.patch, - -files/openldap-2.1.30-tls-activedirectory-hang-fix.patch, - -files/openldap-2.1.30-ximian_connector.patch, - -files/openldap-2.2.14-db40.patch, - -files/openldap-2.2.26-tls-fix-connection-test.patch, - -files/openldap-2.2.28-autoconf-archived-fix.patch, - -files/openldap-2.2.28-cleartext-passwords.patch, - -files/openldap-2.2.28-r1-configure.in-rpath.patch, - -files/openldap-2.2.28-tests.patch, - -files/openldap-2.2.28-ximian_connector.patch, - -files/openldap-2.3.27-CVE-2006-5779.patch, openldap-2.1.30-r10.ebuild, - openldap-2.2.28-r7.ebuild: - As older versions have a constant patchset, move that out to mirrors - -*openldap-2.3.32 (16 Jan 2007) - - 16 Jan 2007; Markus Ullmann -files/2.0/slapd, - -files/2.0/slapd.conf, -files/2.0/slurpd, +files/slapd-confd, - +files/slapd-initd, +files/slurpd-initd, -openldap-2.1.30-r8.ebuild, - -openldap-2.1.30-r9.ebuild, openldap-2.1.30-r10.ebuild, - -openldap-2.2.28-r5.ebuild, -openldap-2.2.28-r6.ebuild, - openldap-2.2.28-r7.ebuild, -openldap-2.3.24-r1.ebuild, - -openldap-2.3.30-r1.ebuild, openldap-2.3.30-r2.ebuild, - -openldap-2.3.31-r1.ebuild, +openldap-2.3.32.ebuild: - Version bump and ebuild cleanup - - 16 Jan 2007; Markus Ullmann openldap-2.2.28-r7.ebuild, - openldap-2.3.30-r2.ebuild, openldap-2.3.31-r1.ebuild: - Fix preserve libs position - - 13 Jan 2007; Markus Ullmann openldap-2.1.30-r10.ebuild, - openldap-2.2.28-r7.ebuild, openldap-2.3.30-r2.ebuild: - Stable on arm - - 09 Jan 2007; Petteri Räty - openldap-2.3.31-r1.ebuild: - Fixed pkg_postinst to use elog instead of einfo and point to the right doc - directory. - - 08 Jan 2007; Peter Weller (welp) - openldap-2.1.30-r10.ebuild, openldap-2.2.28-r7.ebuild, - openldap-2.3.30-r2.ebuild: - openldap-2.3.30-r2, 2.1.30-r10, and 2.2.28-r7 stable on amd64 wrt bug #159508 - - 08 Jan 2007; Christian Faulhammer - openldap-2.1.30-r10.ebuild, openldap-2.2.28-r7.ebuild, - openldap-2.3.30-r2.ebuild: - stable x86, bug #159508 - - 08 Jan 2007; Bryan Østergaard - openldap-2.1.30-r10.ebuild, openldap-2.2.28-r7.ebuild, - openldap-2.3.30-r2.ebuild: - Stable on Alpha + IA64, bug 159508. - - 08 Jan 2007; Markus Rothe openldap-2.1.30-r10.ebuild, - openldap-2.2.28-r7.ebuild, openldap-2.3.30-r2.ebuild: - Stable on ppc64; bug #159508 - - 08 Jan 2007; Tobias Scherbaum - openldap-2.1.30-r10.ebuild, openldap-2.2.28-r7.ebuild: - Stable on ppc wrt bug #159508. - - 08 Jan 2007; Markus Ullmann openldap-2.1.30-r10.ebuild: - ssl cert magic - - 08 Jan 2007; Jeroen Roovers openldap-2.2.28-r7.ebuild: - Stable for HPPA (bug #159508). - - 08 Jan 2007; Jason Wever openldap-2.1.30-r10.ebuild, - openldap-2.2.28-r7.ebuild, openldap-2.3.30-r2.ebuild: - Stable on SPARC wrt security bug #159508. - - 08 Jan 2007; Jeroen Roovers openldap-2.1.30-r10.ebuild: - Stable for HPPA (bug #159508). - - 08 Jan 2007; Jeroen Roovers openldap-2.3.30-r2.ebuild: - Stable for HPPA (bug #159508). - - 07 Jan 2007; Tobias Scherbaum - openldap-2.3.30-r2.ebuild: - Stable on ppc wrt bug #159508. - -*openldap-2.3.31-r1 (06 Jan 2007) -*openldap-2.3.30-r2 (06 Jan 2007) -*openldap-2.2.28-r7 (06 Jan 2007) -*openldap-2.1.30-r10 (06 Jan 2007) - - 06 Jan 2007; Markus Ullmann -files/gencert.sh, - +openldap-2.1.30-r10.ebuild, +openldap-2.2.28-r7.ebuild, - +openldap-2.3.30-r2.ebuild, -openldap-2.3.31.ebuild, - +openldap-2.3.31-r1.ebuild: - Fixing enewuser placement, some further quotation (all done now, yey), - security bug #159508 and add -j1 temporarily until upstream fixes parallel - make issues - - 25 Dec 2006; Markus Ullmann openldap-2.1.30-r9.ebuild, - openldap-2.2.28-r6.ebuild, openldap-2.3.30-r1.ebuild, - openldap-2.3.31.ebuild: - more quotation fixes and fix bug #156090 - - 23 Dec 2006; Markus Ullmann -files/gencert.sh-2.2.27, - openldap-2.1.30-r9.ebuild, openldap-2.2.28-r5.ebuild, - openldap-2.2.28-r6.ebuild, openldap-2.3.30-r1.ebuild, - openldap-2.3.31.ebuild: - Ebuild clean up, don't build 2.1 libs when building 2.2, just preserve if - needed - - 23 Dec 2006; Markus Ullmann -openldap-2.1.30-r6.ebuild, - -openldap-2.1.30-r7.ebuild, openldap-2.1.30-r8.ebuild, - -openldap-2.2.28-r3.ebuild, -openldap-2.2.28-r4.ebuild, - openldap-2.2.28-r5.ebuild, -openldap-2.3.24-r2.ebuild, - -openldap-2.3.27.ebuild, -openldap-2.3.27-r1.ebuild, - -openldap-2.3.27-r2.ebuild, openldap-2.3.27-r3.ebuild, - -openldap-2.3.30.ebuild: - arm stable wrt bug# 154349 and security cleanup - -*openldap-2.3.31 (23 Dec 2006) - - 23 Dec 2006; Markus Ullmann +openldap-2.3.31.ebuild: - Version bump - -*openldap-2.3.30-r1 (27 Nov 2006) - - 27 Nov 2006; Benjamin Smee - +openldap-2.3.30-r1.ebuild: - bumped to fix an overlays bug, need to be compiled in - - 27 Nov 2006; openldap-2.1.30-r8.ebuild, - openldap-2.2.28-r5.ebuild, openldap-2.3.27-r3.ebuild: - stable on amd64 wrt security bug 154349 - -*openldap-2.3.30 (26 Nov 2006) - - 26 Nov 2006; Michael Hanselmann - +openldap-2.3.30.ebuild: - Bump to 2.3.30, approved by robbat2. - - 24 Nov 2006; Bryan Østergaard - openldap-2.1.30-r8.ebuild, openldap-2.2.28-r5.ebuild, - openldap-2.3.27-r3.ebuild: - Stable on Alpha + ia64, bug 154348. - - 24 Nov 2006; Gustavo Zacarias - openldap-2.1.30-r8.ebuild, openldap-2.2.28-r5.ebuild, - openldap-2.3.27-r3.ebuild: - Stable on sparc wrt security #154349 - - 22 Nov 2006; René Nussbaumer - openldap-2.1.30-r8.ebuild, openldap-2.2.28-r5.ebuild: - Stable on hppa. See bug #154349. - - 22 Nov 2006; Tobias Scherbaum - openldap-2.1.30-r8.ebuild, openldap-2.2.28-r5.ebuild, - openldap-2.3.27-r3.ebuild: - ppc stable, bug #154349 - - 22 Nov 2006; Christian Faulhammer - openldap-2.3.27-r3.ebuild: - stable x86, security bug #154349 - - 22 Nov 2006; Christian Faulhammer - openldap-2.2.28-r5.ebuild: - stable x86, security bug #154349 - - 22 Nov 2006; Christian Faulhammer - openldap-2.1.30-r8.ebuild: - stable x86, security bug #154349 - - 22 Nov 2006; Jeroen Roovers openldap-2.3.27-r3.ebuild: - 2.3.27-r3 stable for HPPA (bug #154349). - - 22 Nov 2006; Robin H. Johnson - openldap-2.1.30-r6.ebuild, openldap-2.1.30-r8.ebuild: - Fix cosmetic typo noted on bug #154349. - - 21 Nov 2006; Brent Baude openldap-2.1.30-r8.ebuild, - openldap-2.2.28-r5.ebuild: - Marking openldap-2.2.28-r5 & openldap-2.1.30-r8 ppc64 for bug 154349 - - 21 Nov 2006; Brent Baude openldap-2.3.27-r3.ebuild: - Marking openldap-2.3.27-r3 ppc64 stable for bug 154349 - -*openldap-2.3.27-r3 (21 Nov 2006) -*openldap-2.2.28-r6 (21 Nov 2006) -*openldap-2.2.28-r5 (21 Nov 2006) -*openldap-2.1.30-r9 (21 Nov 2006) -*openldap-2.1.30-r8 (21 Nov 2006) - - 21 Nov 2006; Robin H. Johnson - +files/openldap-2.3.27-CVE-2006-5779.patch, +openldap-2.1.30-r8.ebuild, - +openldap-2.1.30-r9.ebuild, +openldap-2.2.28-r5.ebuild, - +openldap-2.2.28-r6.ebuild, +openldap-2.3.27-r3.ebuild: - CVE-2006-5779, bug #154349. Please note that all revision sets (both stable - and unstable features) have been bumped. See the bug for the stability - target matrix. - - 19 Oct 2006; Aron Griffis openldap-2.3.27-r2.ebuild: - Mark 2.3.27-r2 stable on ia64. #144862 - - 18 Oct 2006; Markus Ullmann openldap-2.3.27-r2.ebuild: - arm stable wrt bug #144862 - - 18 Oct 2006; Markus Ullmann openldap-2.1.30-r6.ebuild, - openldap-2.2.28-r3.ebuild: - more has_version perl fixes - - 15 Oct 2006; Thomas Cort openldap-2.3.27-r2.ebuild: - Stable on alpha wrt security Bug #144862. - - 15 Oct 2006; Guy Martin openldap-2.3.27-r2.ebuild: - Stable on hppa. - - 15 Oct 2006; Bryan Østergaard - openldap-2.3.27-r2.ebuild: - Add back lost ~ia64 keyword. - - 13 Oct 2006; Jeroen Roovers - files/digest-openldap-2.3.24-r1, files/digest-openldap-2.3.24-r2, - Manifest: - Fixed the openldap-2.3.24.tgz digest for real this time. - - 13 Oct 2006; Jeroen Roovers ChangeLog: - Fixed digest - - 08 Oct 2006; Simon Stelling openldap-2.3.27.ebuild, - openldap-2.3.27-r2.ebuild: - stable on amd64 - - 06 Oct 2006; Jason Wever openldap-2.3.27-r2.ebuild: - Stable on SPARC wrt security bug #144862. - - 05 Oct 2006; Tobias Scherbaum - openldap-2.3.27-r2.ebuild: - ppc stable, bug #144862 - - 05 Oct 2006; Markus Rothe openldap-2.3.27-r2.ebuild: - Stable on ppc64; bug #144862 - - 05 Oct 2006; Joshua Jackson openldap-2.3.27-r2.ebuild: - Stable x86; bug #144862 - - 04 Oct 2006; Markus Ullmann +openldap-2.3.27.ebuild: - Broken latest stable script lead to miss latest x86 stable, reverting - - 04 Oct 2006; Markus Ullmann -openldap-2.1.30-r2.ebuild, - -openldap-2.1.30-r5.ebuild, -openldap-2.2.23-r1.ebuild, - -openldap-2.3.21.ebuild, -openldap-2.3.21-r1.ebuild, - -openldap-2.3.23.ebuild, -openldap-2.3.27.ebuild: - Cleanup - -*openldap-2.3.27-r2 (04 Oct 2006) - - 04 Oct 2006; +openldap-2.3.27-r2.ebuild: - Fixing compile problems w/ USE flag samba/kerberos ( bug #135238 ) - -*openldap-2.3.27-r1 (01 Oct 2006) - - 01 Oct 2006; Robin H. Johnson - +openldap-2.3.27-r1.ebuild: - Bug #147189 - fix dependancies for USE=minimal. Bug #136786 - tidy use - USE=minimal build. - - 19 Sep 2006; Joshua Jackson openldap-2.3.27.ebuild: - Stable x86; bug #144862 - - 18 Sep 2006; Benjamin Smee - openldap-2.3.24-r2.ebuild: - small fix for .24-r2 ebuild - -*openldap-2.3.27 (18 Sep 2006) - - 18 Sep 2006; Benjamin Smee +openldap-2.3.27.ebuild: - Version bump - - 11 Sep 2006; Markus Ullmann openldap-2.1.30-r7.ebuild, - openldap-2.2.28-r4.ebuild, openldap-2.3.21.ebuild, - openldap-2.3.21-r1.ebuild, openldap-2.3.23.ebuild, - openldap-2.3.24-r1.ebuild, openldap-2.3.24-r2.ebuild: - Fixing built_with_use checks for non-existant IUSE ( bug #147134 ) and merge - failure with minimal useflag on first installation ( bug #143473 ) - - 05 Sep 2006; Joshua Kinard openldap-2.3.24-r1.ebuild: - Marked stable on mips. - - 16 Jun 2006; Markus Ullmann openldap-2.3.24-r1.ebuild, - openldap-2.3.24-r2.ebuild: - Minor fix on migration howto wrt bug #136863 and arm love - - 15 Jun 2006; Markus Ullmann openldap-2.3.24-r1.ebuild: - Minor fix for populated tree detection, thanks to cardoe on #gentoo-dev for - troubleshooting it - - 12 Jun 2006; Markus Rothe openldap-2.3.24-r1.ebuild: - Stable on ppc64 - - 11 Jun 2006; Joshua Jackson openldap-2.3.24-r1.ebuild: - stable on x86; security bug #134010 - - 05 Jun 2006; Jason Wever openldap-2.3.24-r1.ebuild: - Stable on SPARC wrt security bug #134010. - - 04 Jun 2006; Thomas Cort openldap-2.3.24-r1.ebuild: - Stable on amd64 wrt security Bug #134010. - - 04 Jun 2006; Thomas Cort openldap-2.3.24-r1.ebuild: - Stable on alpha wrt security Bug #134010. - - 04 Jun 2006; Rene Nussbaumer - openldap-2.3.24-r1.ebuild: - Stable on hppa. See bug #134010. - - 03 Jun 2006; openldap-2.3.24-r1.ebuild: - Stable on ppc; bug #134010 - -*openldap-2.3.24-r2 (03 Jun 2006) -*openldap-2.3.24-r1 (03 Jun 2006) - - 03 Jun 2006; -openldap-2.3.24.ebuild, - +openldap-2.3.24-r1.ebuild, +openldap-2.3.24-r2.ebuild: - Moving 2.3.24 to -r2, Adding 2.3.24-r1 as stable candidate, 2.3.24-r2 is the - overlay-test version wrt bug #134010 - - 02 Jun 2006; Markus Rothe openldap-2.3.24.ebuild: - Stable on ppc64; bug #134010 - - 02 Jun 2006; Tobias Scherbaum - openldap-2.3.24.ebuild: - ppc stable, bug #134010 - - 01 Jun 2006; Thomas Cort openldap-2.3.24.ebuild: - Stable on alpha wrt security Bug #134010. - - 30 May 2006; Markus Ullmann openldap-2.3.24.ebuild: - Testing keyword on arm - -*openldap-2.3.24 (30 May 2006) - - 30 May 2006; Markus Ullmann - +files/openldap-2.3.24-contrib-smbk5pwd.patch, +openldap-2.3.24.ebuild: - Version bump, closing bug #116045, security bug #134010, bug #134505 and bug - #134919 - -*openldap-2.3.23 (18 May 2006) - - 18 May 2006; Markus Ullmann metadata.xml, - +openldap-2.3.23.ebuild: - Version bump and Versiontagcheck improved - - 06 May 2006; Markus Ullmann - +files/openldap-2.1.30-glibc24.patch, openldap-2.2.28-r4.ebuild: - Adding glibc2.4 patch for old version wrt bug #126259 - - 06 May 2006; Markus Ullmann openldap-2.3.21-r1.ebuild: - Modified Version-Tag checker and added some skip option wrt bug #132246 - -*openldap-2.3.21-r1 (06 May 2006) - - 06 May 2006; Markus Ullmann - +files/openldap-2.3.21-ppolicy.patch, +openldap-2.3.21-r1.ebuild: - Adding overlays support wrt bug #132263, thanks to Chris Covington and Dean - Baender - - 03 May 2006; Benjamin Smee openldap-2.3.21.ebuild: - trivial fix for bug #132100 - - 02 May 2006; Markus Ullmann openldap-2.3.21.ebuild: - Reordering einfos to have better information for users - - 01 May 2006; Markus Ullmann openldap-2.3.21.ebuild: - Small fix in lib preservation for 2.3.21 - - 29 Apr 2006; Michael Hanselmann - openldap-2.2.28-r3.ebuild: - Stable on mips. - - 28 Apr 2006; Jason Wever openldap-2.3.21.ebuild: - Added ~sparc keyword wrt bug #130975. - - 27 Apr 2006; Alec Warner Manifest: - Fixing SHA256 digest, pass four - - 24 Apr 2006; Patrick McLean openldap-2.3.21.ebuild: - Added ~amd64 (bug #130975). - - 23 Apr 2006; Markus Rothe openldap-2.3.21.ebuild: - Added ~ppc64; bug #130975 - - 23 Apr 2006; Tobias Scherbaum ChangeLog: - Added to ~ppc, bug #130975 - - 23 Apr 2006; Markus Ullmann -openldap-2.3.18.ebuild, - -openldap-2.3.19.ebuild, -openldap-2.3.20.ebuild: - Cleaning up / renewing digest - - 23 Apr 2006; Markus Ullmann openldap-2.3.21.ebuild: - Readding versiontag pathfix for 2.3 - - 20 Apr 2006; Diego Pettenò - openldap-2.2.28-r4.ebuild: - Add ~x86-fbsd keyword. - -*openldap-2.3.21 (20 Apr 2006) - - 20 Apr 2006; Markus Ullmann +openldap-2.3.21.ebuild: - Version bump, added versiontag reader, preserving old libs instead of - rebuilding them - - 09 Mar 2006; Mike Frysinger openldap-2.2.28-r3.ebuild, - openldap-2.2.28-r4.ebuild, openldap-2.3.18.ebuild, openldap-2.3.19.ebuild, - openldap-2.3.20.ebuild: - Use revdep-rebuild --library instead of revdep-rebuild --soname #125506 by - Carsten Lohrke. - -*openldap-2.3.20 (19 Feb 2006) - - 19 Feb 2006; Markus Ullmann +openldap-2.3.20.ebuild: - Version bump - -*openldap-2.3.19 (30 Jan 2006) - - 30 Jan 2006; Markus Ullmann +openldap-2.3.19.ebuild: - Version bump - - 30 Jan 2006; Markus Ullmann metadata.xml: - Added self as co-maintainer - -*openldap-2.3.18 (18 Jan 2006) - - 18 Jan 2006; Benjamin Smee files/2.0/slapd.conf, - +openldap-2.3.18.ebuild: - Version bump for 2.3 and change of conf.d file - -*openldap-2.3.17 (14 Jan 2006) - - 14 Jan 2006; Benjamin Smee - +files/DB_CONFIG.fast.example, +openldap-2.3.17.ebuild: - Added 2.3 hardmasked for testing. Bug #107686 - -*openldap-2.2.28-r4 (13 Jan 2006) - - 13 Jan 2006; Benjamin Smee - +files/openldap-2.2.28-autoconf-archived-fix.patch, - +files/openldap-2.2.28-cleartext-passwords.patch, - +files/openldap-2.2.28-tests.patch, +openldap-2.2.28-r4.ebuild: - new 2.2 version to fix bugs #105380 , #110412 , #112554, #114544 , #115741 , - #115872 - thanks to Markus Ullmann - -*openldap-2.1.30-r7 (13 Jan 2006) - - 13 Jan 2006; Benjamin Smee - +files/openldap-2.1.30-autoconf-archived-fix.patch, - +files/openldap-2.1.30-m4_underquoted.patch, - +files/openldap-2.1.30-tests.patch, +openldap-2.1.30-r7.ebuild: - new 2.1 version to fix bugs #77330 , #105065 , #105380 , #110412 , #114544 , - #115741 , #115792 , #115872 - thanks to Markus Ullmann - - 13 Dec 2005; Fernando J. Pereda - openldap-2.1.30-r6.ebuild, openldap-2.2.28-r3.ebuild: - stable on alpha wrt bug #105380 - - 10 Dec 2005; Jason Wever openldap-2.1.30-r6.ebuild, - openldap-2.2.28-r3.ebuild: - Stable on SPARC wrt bug #105380. - - 09 Dec 2005; Simon Stelling openldap-2.1.30-r6.ebuild: - stable on amd64 wrt bug 105380 - - 08 Dec 2005; Mark Loeser openldap-2.1.30-r6.ebuild, - openldap-2.2.28-r3.ebuild: - Stable on x86; bug #105380 - - 07 Dec 2005; openldap-2.2.28-r3.ebuild: - Marked stable on amd64 - - 06 Dec 2005; Michael Hanselmann - openldap-2.1.30-r6.ebuild, openldap-2.2.28-r3.ebuild: - Stable on hppa, ppc. - - 06 Dec 2005; Markus Rothe openldap-2.1.30-r6.ebuild, - openldap-2.2.28-r3.ebuild: - Stable on ppc64; bug #105380 - -*openldap-2.1.30-r6 (06 Dec 2005) - - 06 Dec 2005; Robin H. Johnson - +openldap-2.1.30-r6.ebuild: - Backported: Bug #105380 - RPATH. Bug #113770 - Selinux support. - -*openldap-2.2.28-r3 (06 Dec 2005) - - 06 Dec 2005; Robin H. Johnson - +files/openldap-2.1.30-autoconf25.patch, - +files/openldap-2.1.30-rpath.patch, +openldap-2.2.28-r3.ebuild: - Bug #105380 - RPATH again. Bug #113770 - Selinux support. - - 03 Dec 2005; Robin H. Johnson - openldap-2.2.28-r2.ebuild: - Change sys-lib/db DEPEND to ensure db4.2 with TXN patch is brought in. - -*openldap-2.2.28-r2 (03 Dec 2005) - - 03 Dec 2005; Robin H. Johnson - +files/openldap-2.2.28-r1-configure.in-rpath.patch, - +openldap-2.2.28-r2.ebuild: - Fix for RPATH bug #105380, thanks to Markus Ullmann - for the patch. - - 16 Oct 2005; Rene Nussbaumer - openldap-2.2.28.ebuild: - Stable on hppa. - - 03 Oct 2005; Michael Hanselmann - openldap-2.2.28-r1.ebuild: - Added to ~mips. - - 02 Oct 2005; MATSUU Takuto openldap-2.2.28.ebuild: - Stable on sh. - - 22 Sep 2005; Robin H. Johnson openldap-2.1.26.ebuild, - openldap-2.1.27.ebuild, openldap-2.1.27-r1.ebuild, openldap-2.1.30.ebuild, - openldap-2.1.30-r1.ebuild, openldap-2.1.30-r2.ebuild, - openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild, - openldap-2.1.30-r5.ebuild, openldap-2.2.14.ebuild, openldap-2.2.19.ebuild, - openldap-2.2.23.ebuild, openldap-2.2.23-r1.ebuild, openldap-2.2.24.ebuild, - openldap-2.2.26.ebuild, openldap-2.2.26-r1.ebuild, - openldap-2.2.26-r2.ebuild, openldap-2.2.27.ebuild, - openldap-2.2.27-r1.ebuild, openldap-2.2.28.ebuild, - openldap-2.2.28-r1.ebuild: - Bug #103421, use -1 instead of /bin/false for enewuser to allow working on - freebsd. - - 17 Sep 2005; Robin H. Johnson openldap-2.2.26.ebuild, - openldap-2.2.26-r1.ebuild, openldap-2.2.26-r2.ebuild, - openldap-2.2.27.ebuild, openldap-2.2.27-r1.ebuild, openldap-2.2.28.ebuild, - openldap-2.2.28-r1.ebuild: - Bug #106242, typo in the upgrade detection code. - - 15 Sep 2005; Aron Griffis openldap-2.2.28.ebuild: - Mark 2.2.28 stable on alpha - - 14 Sep 2005; Gustavo Zacarias - openldap-2.2.28.ebuild: - Stable on sparc - - 12 Sep 2005; Michael Hanselmann - openldap-2.2.28.ebuild: - Stable on ppc. - - 08 Sep 2005; Robin H. Johnson - +files/openldap-2.2.6-ntlm.patch, openldap-2.2.28-r1.ebuild: - Bug #105209, slightly different NTLM patch, ported by upstream this time, - should fix things for other people better :-). - - 08 Sep 2005; Aron Griffis openldap-2.2.28.ebuild: - Mark 2.2.28 stable on ia64 - -*openldap-2.2.28-r1 (07 Sep 2005) - - 07 Sep 2005; Robin H. Johnson - +files/openldap-2.2.28-ximian_connector.patch, +openldap-2.2.28-r1.ebuild: - Bug #105144, patch for NTLM support, candidate for quick move to stable. - - 07 Sep 2005; Robin H. Johnson openldap-2.2.28.ebuild: - Force upgrade to die. - - 06 Sep 2005; Markus Rothe openldap-2.2.28.ebuild: - Stable on ppc64 - - 06 Sep 2005; Robin H. Johnson openldap-2.2.28.ebuild: - Get rid of message complaining that /etc/openldap/slapd.conf might not exist. - - 05 Sep 2005; Robin H. Johnson openldap-2.2.28.ebuild: - Move to stable x86 now, after much testing. Pay attension to the upgrade - fail-out if you run an LDAP server! - - 25 Aug 2005; Aron Griffis openldap-2.1.30-r5.ebuild: - stable on ia64 - -*openldap-2.2.28 (24 Aug 2005) - - 24 Aug 2005; Robin H. Johnson - +openldap-2.2.28.ebuild: - Version bump. - - 03 Aug 2005; Robin H. Johnson - openldap-2.1.30-r5.ebuild, openldap-2.2.27-r1.ebuild: - Bug #100579, USE=minimal Perl is bad for the perl backend. - - 27 Jul 2005; Robin H. Johnson - openldap-2.2.27-r1.ebuild: - Depend on newer libtool to avoid bug with CC variable being empty still. - - 13 Jul 2005; Rob Holland openldap-2.1.30-r5.ebuild: - stable x86. fix sec bug #96767 - - 13 Jul 2005; Michael Hanselmann - openldap-2.1.30-r5.ebuild: - Stable on hppa. - - 11 Jul 2005; Simon Stelling openldap-2.1.30-r5.ebuild: - stable on amd64 wrt bug 96767 - - 07 Jul 2005; Markus Rothe openldap-2.1.30-r5.ebuild: - Stable on ppc64; bug #96767 - - 06 Jul 2005; Michael Hanselmann - openldap-2.1.30-r5.ebuild: - Stable on ppc. - - 05 Jul 2005; Sven Wegener openldap-2.2.23-r1.ebuild: - QA: Added kerberos to IUSE. - - 04 Jul 2005; Jason Wever openldap-2.1.30-r5.ebuild: - Stable on SPARC wrt security bug #96767. - -*openldap-2.2.27-r1 (03 Jul 2005) -*openldap-2.1.30-r5 (03 Jul 2005) - - 03 Jul 2005; Robin H. Johnson - +files/openldap-2.2.26-tls-fix-connection-test.patch, - +openldap-2.1.30-r5.ebuild, +openldap-2.2.27-r1.ebuild: - Security Bug #96767, ssl not being used always. Note that both 2.1.30-r5 and - 2.2.27-r1 have the patch. - -*openldap-2.2.27 (03 Jul 2005) - - 03 Jul 2005; Robin H. Johnson - +files/gencert.sh-2.2.27, +openldap-2.2.27.ebuild: - Fixed bugs #93074, #97782, #87591. This means that the nasty double-build - problem is now solved! New gencert.sh thanks to xmerlin. USE=minimal support - to skip building the servers. This is a strong candidate for going stable - after the 30 day period. - - 06 Jun 2005; Markus Rothe openldap-2.1.30-r4.ebuild: - Stable on ppc64 - - 30 May 2005; Robin H. Johnson - openldap-2.2.26-r2.ebuild: - Fix bug #94415, -fPIC needed for correct kerberos build stuff. - - 26 May 2005; Herbie Hopkins openldap-2.2.26-r2.ebuild: - more multilib fixes.. - - 21 May 2005; Simon Stelling openldap-2.2.26-r2.ebuild: - fixed multilib-strict issues - -*openldap-2.2.26-r2 (21 May 2005) - - 21 May 2005; Robin H. Johnson - +openldap-2.2.26-r2.ebuild: - More lib compatibility stuff, and instructions about revdep-rebuild. - -*openldap-2.2.26-r1 (19 May 2005) - - 19 May 2005; Robin H. Johnson - +openldap-2.2.26-r1.ebuild: - Add 2.2.26 version that builds a liblber from openldap-2.1. - - 18 May 2005; Robin H. Johnson openldap-2.2.14.ebuild, - openldap-2.2.19.ebuild, openldap-2.2.23.ebuild, openldap-2.2.23-r1.ebuild, - openldap-2.2.24.ebuild, openldap-2.2.26.ebuild: - Fix keywords for other arches on 2.2 series. - - 19 May 2005; Robin H. Johnson openldap-2.2.26.ebuild: - Add reminder about revdep-rebuild. - - 16 May 2005; Rene Nussbaumer - openldap-2.1.30-r4.ebuild: - stable on hppa - - 30 Apr 2005; Robin H. Johnson openldap-2.2.26.ebuild: - Fix up detection. - -*openldap-2.2.26 (30 Apr 2005) - - 30 Apr 2005; Robin H. Johnson - +openldap-2.2.26.ebuild: - Version bump, fix for bug #90959. - - 25 Apr 2005; Bryan Østergaard - openldap-2.1.30-r4.ebuild: - Stable on alpha. - - 20 Apr 2005; Michael Hanselmann - openldap-2.1.30-r4.ebuild: - Stable on ppc. - - 20 Apr 2005; Herbie Hopkins openldap-2.1.30-r4.ebuild: - Stable on amd64, wrt bug #89012 - - 15 Apr 2005; Gustavo Zacarias - openldap-2.1.30-r4.ebuild: - Stable on sparc - - 13 Apr 2005; Robin H. Johnson - openldap-2.1.30-r4.ebuild: - 2.1.30-r4 stable on x86. - - 09 Apr 2005; Markus Rothe openldap-2.1.30-r2.ebuild: - Stable on ppc64 - -*openldap-2.2.24 (20 Mar 2005) - - 20 Mar 2005; Robin H. Johnson - +openldap-2.2.24.ebuild: - New upstream version. Fixed Bugs #82584, #85974. Ebuild now checks properly - for upgrading. - - 28 Feb 2005; Aron Griffis openldap-2.1.30-r2.ebuild, - openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild, - openldap-2.2.14.ebuild, openldap-2.2.19.ebuild, openldap-2.2.23-r1.ebuild, - openldap-2.2.23.ebuild: - add ia64 keywords - - 17 Feb 2005; Robin H. Johnson - openldap-2.1.30-r4.ebuild, openldap-2.2.23-r1.ebuild: - Bug #72186: ensure proper building. - -*openldap-2.2.23-r1 (14 Feb 2005) - - 14 Feb 2005; Robin H. Johnson - +openldap-2.2.23-r1.ebuild: - Special version for seemant ;-). Makes some of the extra stuff as modules, - and builds some of contrib. - -*openldap-2.2.23 (14 Feb 2005) - - 14 Feb 2005; Robin H. Johnson - +openldap-2.2.23.ebuild: - Add in 2.2.23 for testing. Still hardmasked. - - 23 Jan 2005; Robin H. Johnson openldap-2.1.26.ebuild, - openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild, - openldap-2.1.30-r1.ebuild, openldap-2.1.30-r2.ebuild, - openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild, - openldap-2.1.30.ebuild, openldap-2.2.14.ebuild, openldap-2.2.19.ebuild: - Fix bug #79216. - - 29 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 06 Dec 2004; Robin H. Johnson - openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild, - openldap-2.2.14.ebuild, openldap-2.2.19.ebuild: - More docs for 2.2 upgrade, fix slight glitch in slapd.conf. - -*openldap-2.1.30-r4 (01 Dec 2004) - - 01 Dec 2004; Robin H. Johnson - +files/openldap-2.1.30-tls-activedirectory-hang-fix.patch, - files/2.0/slapd, +openldap-2.1.30-r4.ebuild: - Fix bugs #67080 (2.1.30-r4) and #71268 (init-script). - -*openldap-2.2.19 (01 Dec 2004) - - 01 Dec 2004; Robin H. Johnson - +openldap-2.2.19.ebuild: - Latest 2.2 ebuild, for testing only. See ebuild for upgrade notes. - - 07 Nov 2004; Joshua Kinard openldap-2.1.30-r2.ebuild: - Marked stable on mips. - - 05 Oct 2004; Guy Martin openldap-2.1.30-r2.ebuild: - Stable on hppa. - - 03 Oct 2004; Bryan Østergaard openldap-2.1.30-r2.ebuild: - Stable on alpha. - -*openldap-2.1.30-r2 (25 Sep 2004) - - 25 Sep 2004; Jason Wever openldap-2.1.30-r2.ebuild: - Stable on sparc. - - 22 Aug 2004; Jason Wever openldap-2.1.30-r1.ebuild: - Stable on sparc. - -*openldap-2.1.30-r3 (22 Aug 2004) - - 22 Aug 2004; Robin H. Johnson - +openldap-2.1.30-r3.ebuild: - Bug #55706, add BDB checkpoints to config. - - 22 Aug 2004; Joshua Kinard openldap-2.1.30-r1.ebuild: - Marked stable on mips. - - 18 Aug 2004; Aron Griffis openldap-2.1.30-r1.ebuild: - stable on alpha - - 05 Aug 2004; Alastair Tse - +files/openldap-2.1.30-ximian_connector.patch: - adding ximian connector patches to expose more of the ldap api (#58320) - - 18 Jul 2004; Robin H. Johnson openldap-2.1.26.ebuild, - openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild, - openldap-2.1.30-r1.ebuild, openldap-2.1.30.ebuild: - stable 2.1.30-r1 on x86, fixup ebuilds to mirror://. - -*openldap-2.2.14 (09 Jul 2004) - - 09 Jul 2004; Robin H. Johnson openldap-2.2.14.ebuild: - initial 2.2 ebuild, not for public consumption yet. - - 24 Jun 2004; Aron Griffis openldap-2.1.26.ebuild, - openldap-2.1.27-r1.ebuild, openldap-2.1.27.ebuild, - openldap-2.1.30-r1.ebuild, openldap-2.1.30.ebuild: - QA - fix use invocation - -*openldap-2.1.30-r1 (20 Jun 2004) - - 20 Jun 2004; Robin H. Johnson - openldap-2.1.30-r1.ebuild, files/openldap-2.2.14-db40.patch, - files/openldap-2.2.14-perlthreadsfix.patch: - move make test to src_test. - - 12 Jun 2004; Tom Gall openldap-2.1.30.ebuild: - stable on ppc64 bug 53766 - - 06 Jun 2004; Guy Martin openldap-2.1.30.ebuild: - Marked stable on hppa. - - 21 May 2004; Robin H. Johnson files/2.0/slapd, - files/2.0/slurpd: - fix bug #51594, no version bump for now. - - 12 May 2004; Michael McCabe openldap-2.1.30.ebuild: - Added s390 keywords - -*openldap-2.1.30 (28 Apr 2004) - - 28 Apr 2004; Robin H. Johnson openldap-2.1.30.ebuild, - files/openldap-2.1.30-db40.patch: - new version with changes from bug #42427. direct kerberos is deprecated - upstream. - - 24 Apr 2004; Robin H. Johnson - openldap-2.0.25-r1.ebuild, openldap-2.0.25-r2.ebuild, - openldap-2.0.25-r3.ebuild, openldap-2.0.27-r4.ebuild, - openldap-2.0.27-r5.ebuild, openldap-2.0.27.ebuild, openldap-2.1.21.ebuild, - openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild, openldap-2.1.23.ebuild, - files/kerberos-2.0.diff.bz2, files/kerberos-2.1.diff.bz2, - files/openldap-2.0.27-db3-gentoo.patch, - files/openldap-2.1.22-perlsedfoo.patch, files/rfc2252-bork.patch, - files/slapd-2.1-r1.rc6, files/slapd-2.1.conf, files/slapd-2.1.rc6, - files/slapd.rc6, files/slurpd-2.1.rc6, files/slurpd.rc6: - remove old versions incl old 2.0 series. - - 30 Mar 2004; Lars Weiler openldap-2.1.27-r1.ebuild: - stable on ppc, as requested in bug #26728 - -*openldap-2.1.27-r1 (28 Mar 2004) - - 28 Mar 2004; Robin H. Johnson - openldap-2.1.27-r1.ebuild, files/openldap-2.1.27-db40.patch: - add in more db40 fixes, new revision as it may change where your openldap is - linked against. - - 24 Mar 2004; Michael Sterrett - openldap-2.1.22-r1.ebuild, openldap-2.1.23.ebuild, openldap-2.1.26.ebuild, - openldap-2.1.27.ebuild: - don't use deprecated ? : use syntax - - 23 Mar 2004; Joshua Kinard openldap-2.1.27.ebuild: - Marked stable on mips. - - 10 Mar 2004; Jason Wever openldap-2.1.26.ebuild: - Stable on sparc. - - 09 Mar 2004; openldap-2.1.26.ebuild: - stable on alpha and ia64 - - 08 Mar 2004; Robin H. Johnson openldap-2.1.23.ebuild, - openldap-2.1.26.ebuild, openldap-2.1.27.ebuild: - ppc64 keywords removed pending deps: app-crypt/mit-krb5, app-crypt/heimdal, - dev-libs/cyrus-sasl, dev-db/unixODBC - -*openldap-2.1.27 (08 Mar 2004) - - 08 Mar 2004; Robin H. Johnson openldap-2.1.27.ebuild, - files/openldap-2.1.27-perlthreadsfix.patch: - fix bug #43021, change kerberos deps to virtual instead of app-crypt/mit-krb5 - (which breaks heimdal). fix bug #42966, version bump. newer, more portable fix - for bug #31202 (also fixes a weird problem case). - - 27 Feb 2004; Joshua Kinard openldap-2.1.26.ebuild: - Added ~mips to KEYWORDS to satisfy repoman deps. - - 15 Feb 2004; Robin H. Johnson openldap-2.1.26.ebuild: - add more notes on bug #41297 fix, from bug #41039. - - 11 Feb 2004; Robin H. Johnson openldap-2.1.26.ebuild: - fix bug #41297. fix bug #31202. - - 08 Feb 2004; Robin H. Johnson openldap-2.1.26.ebuild: - bug #26728, security bump, held up for a long time by DB4.1 - - 04 Feb 2004; Robin H. Johnson openldap-2.1.26.ebuild: - fix bug #40417 - -*openldap-2.1.26 (27 Jan 2004) -*openldap-2.0.27-r5 (27 Jan 2004) - - 27 Jan 2004; Robin H. Johnson - openldap-2.0.27-r5.ebuild, openldap-2.1.26.ebuild: - fix bug #33718, and version bump to new openldap - - 06 Jan 2004; openldap-2.0.27-r4.ebuild: - Stable on alpha and ia64 - - 22 Dec 2003; Robin H. Johnson - openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild, openldap-2.1.23.ebuild: - Fix IUSE in 2.1.2[23] as per bug #34769. - - 13 Dec 2003; Jason Wever openldap-2.0.27-r4.ebuild: - Marked stable on sparc. - - 05 Dec 2003; Robin H. Johnson openldap-2.1.23.ebuild: - change the version depend on berkdb to 4.1.25_p1-r3 and fix a nasty bug with - DEPEND - - 06 Nov 2003; Robin H. Johnson - openldap-2.0.25-r3.ebuild, openldap-2.0.27-r4.ebuild, - openldap-2.1.21.ebuild, openldap-2.1.22-r1.ebuild, openldap-2.1.22.ebuild, - openldap-2.1.23.ebuild, files/gencert.sh: - : instead of . for chown - - 28 Oct 2003; Robin H. Johnson metadata.xml: - add metadata.xml - -*openldap-2.1.23 (28 Oct 2003) - - 28 Oct 2003; Robin H. Johnson openldap-2.1.23.ebuild: - version bump - - 28 Oct 2003; Robin H. Johnson - openldap-2.1.22-r1.ebuild: - fix bug #31037 - -*openldap-2.1.22-r1 (12 Oct 2003) - - 12 Oct 2003; Robin H. Johnson - openldap-2.1.22-r1.ebuild, files/openldap-2.1.22-perlsedfoo.patch: - add new patch for openldap-2.1 to compile properly again, and cleanup ebuild - - 26 Jul 2003; Nick Hadaway openldap-2.0.25-r3.ebuild: - Backporting features from the 2.0.27-r4 ebuild so 1.0 profiles are - caught up. - - 23 Jul 2003; Nick Hadaway openldap-2.0.27-r4.ebuild, - rfc2252-bork.patch: - Added a comment in postinst re: upgrading from ldap builds which ran - as root. Also included a patch suggested by Jean Jordaan on bug - #24271 which fixes a b0rked rfc2252. - - 13 Jul 2003; Nick Hadaway openldap-2.0.27-r4.ebuild, - openldap-2.1.22.ebuild: - Added chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp} to - pkg_postinst. closes bug #24407 - - 12 Jul 2003; Nick Hadaway openldap-2.0.27-r4.ebuild: - Adding support for linking to SASLv1. (SASL1=yes) Not putting this - behind a use variable as people are expecting to link against SASLv2 - normally. - - 10 Jul 2003; Robin H. Johnson openldap-2.1.22.ebuild: - AF_UNIX and process title support. - - 09 Jul 2003; Nick Hadaway openldap-2.1.22.ebuild: - Version bump. Added ebuild changes made to 2.0.27-r4 to 2.1.22. - Still waiting for db4 to become a reality in gentoo. - - 09 Jul 2003; Nick Hadaway openldap-2.0.27-r4.ebuild, - files/2.0/slapd, files/2.0/slapd.conf: - Updated example to include ldapi. Added eval to the slapd init.d - so the %2f is parsed properly. Changed the location of the slapd.args - in the default config and installed config. Thanks to robbat2 for - working this solution out. Marking stable for x86. - - 08 Jul 2003; Nick Hadaway openldap-2.0.27-r4: - Fixed the conf.d slapd filename and added some code to pkg_postinst - so correct permissions are passed to directories/files affected by the - upgrade from running as root to running as user/group ldap. - -*openldap-2.1.22 (10 Jul 2003) - - 13 Jul 2003; Daniel Ahlberg : - Added missing changelog entry. - -*openldap-2.0.25-r2 (22 Jun 2003) - - 22 Jun 2003; Alastair Tse openldap-2.0.25-r1.ebuild, - openldap-2.0.25-r2.ebuild: - add openldap-2.0.25 back because it will break 1.0 profiles - -*openldap-2.1.21 (14 Jun 2003) - - 14 Jun 2003; Nick Hadaway openldap-2.1.21.ebuild, - files/digest-openldap-2.1.21, files/2.0/slapd, files/2.0/slapd.conf: - Bug fixes as noted in bug #22657. Version bump. - -*openldap-2.0.27-r4 (28 May 2003) - - 28 May 2003; Grant Goodyear openldap-2.0.27-r4.ebuild: - Added MDK password fix, changed behavior wrt gdbm/berkdb USE variables to be - more sensible. Also now generate self-signed ssl cert. - - 28 May 2003; Grant Goodyear openldap-2.1.12.ebuild, - openldap-2.1.19.ebuild, openldap-2.1.20.ebuild: - Changed goofy "-x86" masks to "~x86", but added >=net-nds/openldap-2.1 - to package.mask. That way package.unmask will work properly. - -*openldap-2.1.20 (27 May 2003) - - 27 May 2003; Grant Goodyear openldap-2.1.20.ebuild, - files/gencert.sh: - New version w/ a number of changes: - * self-signed ssl cert created at install time - * order of linking changed so that passwd + ldap works properly - # if "berkdb" and "gdbm" in USE then berkdb used in the ebuild. - - 12 May 2003; Jason Wever openldap-2.0.27-r3.ebuild: - Added ~sparc to keywords. - -*openldap-2.1.19 (11 May 2003) - - 11 May 2003; Alastair Tse openldap-2.1.19.ebuild: - wholesale changes to how this ebuild is installed. fixes : - - wrong pid file directory in both config and init.d (#13057) - - debugging enabled for syslogging (#16131) - - version bumped 2.1 series and omit redundant kerberos patch (#16341) - - fixed /var/tmp paths in *.la (#12084) - -*openldap-2.0.27-r3 (11 May 2003) - - 11 May 2003; Alastair Tse openldap-2.0.27-r3.ebuild, - files/2.0/slapd, files/2.0/slapd.conf, files/2.0/slurpd: - - wholesale changes to how this ebuild is installed. fixes : - - wrong pid file directory in both config and init.d (#13057) - - debugging enabled for syslogging (#16131) - - fixed /var/tmp paths in *.la (#12084) - - 14 Apr 2003; Will Woods openldap-2.0.27-r1.ebuild, - openldap-2.0.27-r2.ebuild, openldap-2.0.27.ebuild: - added alpha to KEYWORDS as appropriate - - 23 Feb 2003; Nick Hadaway openldap-2.0.27*.ebuild : - Changed --disable-sasl to --without-cyrus-sasl as noted by Matt - on bug #16144 - -*openldap-2.1.12 (04 Feb 2003) - - 04 Feb 2003; Nick Hadaway openldap-2.1.12.ebuild, - files/digest-openldap-2.1.12, files/kerberos-2.1.diff.bz2 : - Fixed typos like in 2.0.27-r2 and added the kainz kerberos diff for 2.1 - 2.1.12 is now considered stable so when db4 moves, so will openldap. - -*openldap-2.0.27-r2 (29 Jan 2003) - - 17 Apr 2003; Aron Griffis openldap-2.0.27-r2.ebuild: - Add ~alpha to KEYWORDS - - 04 Feb 2003; Nick Hadaway openldap-2.0.27-r2.ebuild, - files/kerberos-2.0.diff.bz2 : - Added a kerberos configure change as suggested by kainz. - - 29 Jan 2003; Nick Hadaway openldap-2.0.27-r2.ebuild, - files/digest-openldap-2.0.27-r2 files/slapd-2.1-r1.rc6, - files/slapd-2.1.conf : - Fixes some typos in -r1 and adds a slapd.conf based on suggestions - by claer@unixlover.com on bug #8780 - -*openldap-2.0.27-r1 (01 Jan 2002) -*openldap-2.1.10 (01 Jan 2002) - - 03 Jan 2002; Nick Hadaway openldap-2.1.10.ebuild : - Added dependancy on net-libs/openslp. - - 02 Jan 2002; Nick Hadaway openldap-2.0.27-r1.ebuild, - openldap-2.1.10.ebuild. files/slapd-2.1.rc6 : - Added --enable-ldap to openldap-2.1.10 and changed the ldap data dir - from /var/state/openldap/openldap-ldbm to /var/lib/openldap-data. - Both of these fixes/updates come from Eric Renfro. Many thanks! - - 01 Jan 2002; Nick Hadaway openldap-2.0.27-r1.ebuild, - openldap-2.1.10.ebuild, files/digest-openldap-2.0.27-r1, - files/digest-openldap-2.1.10, files/slapd-2.1.rc6, - files/slurpd-2.1.rc6 : - Version bump in the 2.1 series. These latest ebuilds are now setup - so that ldap services drop root privileges on startup. Please - comment on bug #8780. - -*openldap-2.1.9 (18 Dec 2002) - - 18 Dec 2002; Nick Hadaway openldap-2.1.9.ebuild, - files/digest-openldap-2.1.9 : - Version bump. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - - 03 Dec 2002; Will Woods openldap-1.2.13-r6.ebuild: - Added ~alpha keyword and src_unpack() with gnuconfig_update. - -*openldap-2.0.27 (25 Nov 2002) - - 21 Dec 2002; Nick Hadaway openldap-2.0.27.ebuild : - db4 is not required for this version. Also fixed readline - dependancy as to not squash the 1.0 profile. - - 27 Nov 2002; Nick Hadaway openldap-2.0.27.ebuild, - files/digest-openldap-2.0.27 : - Updated stable series of openldap. - -*openldap-2.1.8 (25 Nov 2002) - - 25 Nov 2002; Nick Hadaway openldap-2.1.8.ebuilod, - files/digest-openldap-2.1.8 : - New ebuild of openldap. Lots of configure updates. Needs lots of - testing. The ebuild depends on db4 so all arches are marked - until - db4 is marked unstable for testing. - -*openldap-2.0.25-r3 (21 Sept 2002) - - 11 Oct 2002; Nick Hadaway openldap-2.0.25-r3.ebuild : - Removed sasl support as saslv2 support is not complete in this and - causes a circular dependancy with cyrus-sasl. cyrus-sasl still has - ldap support built in. - - 21 Sept 2002; Grant Goodyear openldap-2.0.25-r3.ebuild - Replaced entire make install section w/ "make DESTDIR=${D} install". - The previous version was putting ${D} in the /etc/openldap files, and - the simple fix seems to have solved the problem. I also checked, and - sysconfdir seems to be working correctly, so I don't think I've broken - Seemant's fix. - -*openldap-2.0.25-r2 (15 Aug 2002) - - 16 Sep 2002; Seemant Kulleen openldap-2.0.25-r2.ebuild - Fixed sysconfdir to /etc so that config files go into the /etc/openldap - directory instead of /etc/openldap/openldap. Thanks to: - gdjohn@egregious.org.uk (Gareth John) in bug #7986 - - 07 Sep 2002; Seemant Kulleen - openldap-2.0.25-r2.ebuild : - Fixed the use flags so that they are not prefixed with "ldap-" as - discovered by jap1@ionet.net (Jacob Perkins) and kevin@aptbasilicata.it - (j2ee) in bug #7597 - - 15 Aug 2002; Nick Hadaway - openldap-2.0.25-r2.ebuild, files/digest-openldap-2.0.25-r2 : - Updated ebuild based on suggestions by Eric Renfro via bug report - #6488 - -*openldap-2.0.25-r1 (29 Jul 2002) - - 12 Aug 2002; Mark Guertin : - Added ppc to keywords - - 29 Jul 2002; Nick Hadaway - openldap-2.0.25-r1, files/slapd.rc6, files/digest-openldap-2.0.25-r1 : - Updated ebuild for proper USE flag to configure option generation. Fixed - a typo in slapd.rc6. Bumping to -r1 due to the many changes in the ebuild - since the first 2.0.25 release. - -*openldap-2.0.25 (17 Jul 2002) - - 26 Jul 2002; Nick Hadaway files/slapd.rc6 : - Added --pidfile /var/state/openldap/slapd.pid to files/slapd.rc6 to supress - error messages when shutting doesn slapd. - - 26 Jul 2002; Nick Hadaway - re-modified ebuild so localstatedir=/var/state/openldap to match with the - default slapd config file. /var/state/openldap/openldap-ldbm and - /var/state/openldap/openldap-slurp are also created correctly. - Bug #5557 re-visited. - - 26 Jul 2002; Nick Hadaway - modified ebuild to create a /var/state/openldap to conicide with default - configuration of where databases are stored. Closes bug #5557. - - 17 Jul 2002; Nick Hadaway - openldap-2.0.25.ebuild, file/digest-openldap-2.0.25 : - Version bump to latest stable vesion. Also added support for SASL by - request on bug #5104. - -*openldap-2.0.23 (20 Apr 2002) - - 20 Apr 2002; Ryan Phillips openldap-2.0.23 : - Updated package - -*openldap-2.0.21 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest deleted file mode 100644 index 4889a80..0000000 --- a/net-nds/openldap/Manifest +++ /dev/null @@ -1,32 +0,0 @@ -AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b -AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175 -AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243 -AUX openldap-2.3.21-ppolicy.patch 402 RMD160 72da1c4a886a329607608f8fa07857874ea8973a SHA1 0c6fe313ad06ccee5a96402fc116cf243d37146b SHA256 97feaaff03e839aaad402024082ba62fb2cbe0c721664a85af8674ebb28d7dbd -AUX openldap-2.3.24-contrib-smbk5pwd.patch 1631 RMD160 01e394da82c2ca8493d0dc15c400675545f463bb SHA1 33781455168d2041f3ec00bbaf2da4ffbe411396 SHA256 277990c6bc9e00c29bc5123d5074e1a741a224e884f92651b301375b02edc70e -AUX openldap-2.3.34-slapd-conf 2067 RMD160 40be06ab9188480f9ae9d5e639b8f5c5787942f1 SHA1 ef8693eb4f13843261945460259ebab184f80210 SHA256 f7611233b83fa70dac313b4e734041dfe1ddac07c804bdb12a775d7cf88c36a1 -AUX openldap-2.3.37-libldap_r.patch 862 RMD160 1ab42b2cdc6f3d9d412ccdfa7a7a288c29733231 SHA1 c2f997f2e28b7452a3ef981db9c6d527342ad400 SHA256 82471cc13806a9260e441aea90c8dfe9ce21b6d3edabb71766a2afcff6f80dfb -AUX openldap-2.3.XY-gcc44.patch 1169 RMD160 51be41a0a3440e00507c540171fdcc4bf2eddd57 SHA1 ac2891193493415960509083dd78dd3ea422ef75 SHA256 c799ad2adde0e0801bfd641c1a43860180121a04897b8e2a01ad000ea31e2a8d -AUX openldap-2.4.11-libldap_r.patch 515 RMD160 aa778bad59d498601bab84e215b2bcb6d125cf00 SHA1 e2c52828e719c137802966879f8da93a196cfde3 SHA256 3310a89d38bc39e6eb4333799d475411b274482b8bccab212b3edfd4385db70e -AUX openldap-2.4.15-ppolicy.patch 418 RMD160 5b32da96fbc6002a2d464ea765ad72ebf23727f5 SHA1 cdd7c2bdfb0011561965a39f99e46cbb9f266aba SHA256 98269fa1e8a1a0e62dad9acd36fd9a33614fca9a5830d6e7e606db8eb7f85de5 -AUX openldap-2.4.17-contrib-smbk5pwd.patch 2046 RMD160 8e3834159767183535efa2144631e4cdfcd04a11 SHA1 6af3ca3f212414411e05c8766297b74573c103bc SHA256 81c146b2ee96ef03c169665f366ac25ebf93e2f1abb8ff41dc8741cb0927b813 -AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 RMD160 7e17304b2b85e2dec12e0bc49b82e35443cc703e SHA1 7a25d0002581ae6f78ffe498c3e05eef0119f7a6 SHA256 31e816eb9f3b52f5f9d183f82adebff75892e45e764187e579a92204c90889cb -AUX openldap-2.4.17-gcc44.patch 509 RMD160 07c1b8400e1b24cb8f20f2647b1354d2b28f653d SHA1 5df5a165acec74667f5989f291aedd958be56358 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda -AUX openldap-2.4.19-contrib-smbk5pwd.patch 1555 RMD160 ce8f5caafa4b3d89dc11537f0045335b25c59404 SHA1 372906228b2ab6be13a689f895e173abb4862f2e SHA256 8e08af4235529cbc0c4541a28d5cf7e8cf3f41f7504af41527e993e1399fee92 -AUX openldap-2.4.22.ebuild.diff 1335 RMD160 4cdf9167dd8b241af196a4f72f276356d3d31684 SHA1 34c5ef793a78d70111a58ef7904c006c83ec86fc SHA256 751433d2cd2ca82ad05bbf29a95d92444612aa535aa35ba8f3e798b6500c0842 -AUX openldap-2.4.26-contrib-smbk5pwd.patch 1591 RMD160 a49edbe3560eda46cd5e3a13222815fcda659ad8 SHA1 7d889dd086befc1fb99fdd46327fe309364c5b77 SHA256 3a403d66ea09e590202ec39eacb10432cf5255d865d3a8dcefd81fad9efa098c -AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d -AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5 -AUX slapd-initd2 622 RMD160 750d7c59d1b7e47b0b21b96d301244c3ec3e28bf SHA1 a438adef50bfb925cc7550156b6dbefd68dcb856 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa -AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a984510fa91755cbcbac29883cea1435db7 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff -DIST openldap-2.4.22.tgz 5179727 RMD160 4edf1a822fcb34a06d18a28ce2f50cd040946453 SHA1 dd506b461c1fccd55dfff123b87aa6d07c899136 SHA256 c29b34031305616cf2c847d30706e2d2cdfc2cf91431e0bddab5d483395a40c1 -DIST openldap-2.4.23.tgz 5182440 RMD160 d2268e8fb894680d1d9926fedca736f195e0a0be SHA1 26027e7020256c5f47e17787f17ee8b31af42378 SHA256 5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3 -DIST openldap-2.4.24.tgz 5240643 RMD160 b9df6a5a562b83fe4ad92f8779909b36fab65c52 SHA1 a4baad3d45ae5810ba5fee48603210697c70d52f SHA256 fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614 -DIST openldap-2.4.25.tgz 5250595 RMD160 31217119f9a82712240bee10c2a350c8f35e0b8e SHA1 56efaf3656cc68d3b5be66422c0c89f0104d7183 SHA256 615acc9970ae2f612bae7e8012d63f3194ef02a2a638bc1fd9ca7f31d85c1075 -DIST openldap-2.4.26.tgz 5250064 RMD160 a74f4cb13eef296781a35e12a8d62104c5fc28ec SHA1 d71179bbcf7211fef0be45e23766ca10fa6a69cf SHA256 1f42048cebbcd8647c9c566f8f070946103a15717345915ecd5fccfbe19a7c3d -EBUILD openldap-2.4.22.ebuild 20379 RMD160 b7c7defdfcf7aa14b80064219326af823c7b7631 SHA1 4d331c21e40fea26fab163c50843fac897f5f64c SHA256 b2e5bb9586925bb1dc8bff7a9a8850812639bcaa4f2fb89c6efa03882f5e7644 -EBUILD openldap-2.4.23.ebuild 20369 RMD160 90599a947a238edca12b340c4b3dc3df166224dd SHA1 dbbef8fec1c19ea027f1fcb41b957e4e59ab7185 SHA256 b8802afd821e4f6231971317269c4f07adf76bdfcd71b46238938c04bd9eddff -EBUILD openldap-2.4.24.ebuild 20370 RMD160 e4b2bbc628bbf1aa583761ecd02721ac372b581a SHA1 318542d35e508e0042891b6beb818d7bc49d8e6f SHA256 6d910b576ac589796c28e00c27ca9806d861073a0ec54232d69de2bc885cefa1 -EBUILD openldap-2.4.25.ebuild 20381 RMD160 e35f0167d804e4ad887d7f658f7c1eeca28dc8db SHA1 ed23ba4722ae7d087d283ed38c55a3a07a80b09a SHA256 b3820ffd1d978ee8f65ab6c90b861942f6de7e1db1e9ad8f195b2669e89af0e4 -EBUILD openldap-2.4.26.ebuild 20928 RMD160 ded2e1b3b5ccc154f82ebfe231bc664c4f389709 SHA1 c20feac980412e733986ab2d42ea1d7c51a13c5c SHA256 325a8202964f9d223e4d9c95891782d2c5c5e4953bd6db01b62ed8544cbdfad2 -MISC ChangeLog 65984 RMD160 f071570259f46a33c76ddbd25a0128addbb3da3b SHA1 b3f823ed200091310fb3ad6c3f388c6930bf4706 SHA256 e3ce56ad3cdfa04d95857a34d50bf1daad36f1d2b064b82a2f2d7783c62eda95 -MISC metadata.xml 609 RMD160 03c8cbd053db76231f859b1c55c5c98a81ab93b4 SHA1 94aa8548d9d70c345694d34e95bdc79716aa7816 SHA256 9ce8d5f8cb31fc99d3d156e453a4e5bf8d7e4546bbe818bb1cb729653b776bff diff --git a/net-nds/openldap/files/DB_CONFIG.fast.example b/net-nds/openldap/files/DB_CONFIG.fast.example deleted file mode 100644 index 8b52062..0000000 --- a/net-nds/openldap/files/DB_CONFIG.fast.example +++ /dev/null @@ -1,25 +0,0 @@ -# $OpenLDAP: pkg/ldap/servers/slapd/DB_CONFIG,v 1.1 2004/06/18 02:49:08 kurt Exp $ -# Example DB_CONFIG file for use with slapd(8) BDB/HDB databases. -# -# See Sleepycat Berkeley DB documentation -# -# for detail description of DB_CONFIG syntax and semantics. -# -# Hints can also be found in the OpenLDAP Software FAQ -# - -# one 0.25 GB cache -set_cachesize 0 16777216 0 - -# Data Directory -#set_data_dir db - -# Transaction Log settings -set_lg_regionmax 262144 -set_lg_bsize 524288 -#set_lg_dir logs - -# When using (and only when using) slapadd(8) or slapindex(8), -# the following flags may be useful: -#set_flags DB_TXN_NOSYNC -#set_flags DB_TXN_NOT_DURABLE diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch deleted file mode 100644 index ddb6672..0000000 --- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in openldap-2.2.14/servers/slapd/back-perl/Makefile.in ---- openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 2004-04-12 11:20:14.000000000 -0700 -+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in 2004-06-20 18:43:41.000000000 -0700 -@@ -31,7 +31,7 @@ - - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) --UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) -+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) `perl -MExtUtils::Embed -e ldopts` - - LIBBASE = back_perl - diff --git a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch b/net-nds/openldap/files/openldap-2.2.6-ntlm.patch deleted file mode 100644 index 1e52f99..0000000 --- a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch +++ /dev/null @@ -1,199 +0,0 @@ -(Note that this patch is not useful on its own... it just adds some -hooks to work with the LDAP authentication process at a lower level -than the API otherwise allows. The code that calls these hooks and -actually drives the NTLM authentication process is in -lib/e2k-global-catalog.c, and the code that actually implements the -NTLM algorithms is in xntlm/.) - -This is a patch against OpenLDAP 2.2.6. Apply with -p0 - - ---- include/ldap.h.orig 2004-01-01 13:16:28.000000000 -0500 -+++ include/ldap.h 2004-07-14 11:58:49.000000000 -0400 -@@ -1753,5 +1753,26 @@ - LDAPControl **cctrls )); - - -+/* -+ * 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 */ ---- libraries/libldap/Makefile.in.orig 2004-01-01 13:16:29.000000000 -0500 -+++ libraries/libldap/Makefile.in 2004-07-14 13:37:23.000000000 -0400 -@@ -20,7 +20,7 @@ - SRCS = bind.c open.c result.c error.c compare.c search.c \ - controls.c messages.c references.c extended.c cyrus.c \ - modify.c add.c modrdn.c delete.c abandon.c \ -- sasl.c sbind.c kbind.c unbind.c cancel.c \ -+ sasl.c ntlm.c sbind.c kbind.c unbind.c cancel.c \ - filter.c free.c sort.c passwd.c whoami.c \ - getdn.c getentry.c getattr.c getvalues.c addentry.c \ - request.c os-ip.c url.c sortctrl.c vlvctrl.c \ -@@ -29,7 +29,7 @@ - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ - controls.lo messages.lo references.lo extended.lo cyrus.lo \ - modify.lo add.lo modrdn.lo delete.lo abandon.lo \ -- sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \ -+ sasl.lo ntlm.lo sbind.lo kbind.lo unbind.lo cancel.lo \ - filter.lo free.lo sort.lo passwd.lo whoami.lo \ - getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ - request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \ ---- /dev/null 2004-06-30 15:04:37.000000000 -0400 -+++ libraries/libldap/ntlm.c 2004-07-14 13:44:18.000000000 -0400 -@@ -0,0 +1,137 @@ -+/* $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 ); -+} diff --git a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch b/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch deleted file mode 100644 index 06bbee8..0000000 --- a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- clients.orig/tools/common.c 2006-05-05 00:24:01.000000000 -0700 -+++ clients/tools/common.c 2006-05-05 00:24:13.000000000 -0700 -@@ -904,8 +904,8 @@ - tool_bind( LDAP *ld ) - { - #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST -- if ( ppolicy ) { - LDAPControl *ctrls[2], c; -+ if ( ppolicy ) { - c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST; - c.ldctl_value.bv_val = NULL; - c.ldctl_value.bv_len = 0; - diff --git a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch deleted file mode 100644 index 091ff26..0000000 --- a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- contrib/slapd-modules/smbk5pwd/Makefile.ORIG 2006-05-17 13:11:57.194660019 +0300 -+++ contrib/slapd-modules/smbk5pwd/Makefile 2006-05-17 13:11:14.503082288 +0300 -@@ -9,29 +9,39 @@ - # top-level directory of the distribution or, alternatively, at - # . - -+#libexecdir=/usr/lib/openldap -+moduledir=$(libexecdir)/openldap - LIBTOOL=../../../libtool --OPT=-g -O2 -+#OPT= - CC=gcc - - # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -+#DEFS= - --HEIMDAL_INC=-I/usr/heimdal/include -+#KRB5_INC= - SSL_INC= - LDAP_INC=-I../../../include -I../../../servers/slapd --INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) - --HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_LIB=-lkrb5 -lkadm5srv - SSL_LIB=-lcrypto --LDAP_LIB=-lldap_r -llber --LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -- -+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif -+ - all: smbk5pwd.la - - - smbk5pwd.lo: smbk5pwd.c -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ -+ -rpath $(moduledir) -module -o $@ $? $(LIBS) -+ -+install-mod: -+ $(LIBTOOL) --mode=install ../../../build/shtool install -c \ -+ -m 755 smbk5pwd.la $(DESTDIR)$(moduledir) diff --git a/net-nds/openldap/files/openldap-2.3.34-slapd-conf b/net-nds/openldap/files/openldap-2.3.34-slapd-conf deleted file mode 100644 index ad767cf..0000000 --- a/net-nds/openldap/files/openldap-2.3.34-slapd-conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# See slapd.conf(5) for details on configuration options. -# This file should NOT be world readable. -# -include /etc/openldap/schema/core.schema - -# Define global ACLs to disable default read access. - -# Do not enable referrals until AFTER you have a working directory -# service AND an understanding of referrals. -#referral ldap://root.openldap.org - -pidfile /var/run/openldap/slapd.pid -argsfile /var/run/openldap/slapd.args - -# Load dynamic backend modules: -###INSERTDYNAMICMODULESHERE### - -# Sample security restrictions -# Require integrity protection (prevent hijacking) -# Require 112-bit (3DES or better) encryption for updates -# Require 63-bit encryption for simple bind -# security ssf=1 update_ssf=112 simple_bind=64 - -# Sample access control policy: -# Root DSE: allow anyone to read it -# Subschema (sub)entry DSE: allow anyone to read it -# Other DSEs: -# Allow self write access -# Allow authenticated users read access -# Allow anonymous users to authenticate -# Directives needed to implement policy: -# access to dn.base="" by * read -# access to dn.base="cn=Subschema" by * read -# access to * -# by self write -# by users read -# by anonymous auth -# -# if no access controls are present, the default policy -# allows anyone and everyone to read anything but restricts -# updates to rootdn. (e.g., "access to * by * read") -# -# rootdn can always read and write EVERYTHING! - -####################################################################### -# BDB database definitions -####################################################################### - -database hdb -suffix "dc=my-domain,dc=com" -# -checkpoint 32 30 -rootdn "cn=Manager,dc=my-domain,dc=com" -# Cleartext passwords, especially for the rootdn, should -# be avoid. See slappasswd(8) and slapd.conf(5) for details. -# Use of strong authentication encouraged. -rootpw secret -# The database directory MUST exist prior to running slapd AND -# should only be accessible by the slapd and slap tools. -# Mode 700 recommended. -directory /var/lib/openldap-data -# Indices to maintain -index objectClass eq diff --git a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch b/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch deleted file mode 100644 index d015bda..0000000 --- a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libraries/libldap_r/Makefile.in.old 2007-01-02 22:43:50.000000000 +0100 -+++ libraries/libldap_r/Makefile.in 2007-08-22 13:32:20.000000000 +0200 -@@ -56,7 +56,7 @@ - XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) - XXXLIBS = $(LTHREAD_LIBS) - NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) --UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) -+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) - - .links : Makefile - @for i in $(XXSRCS); do \ ---- servers/slapd/slapi/Makefile.in.old 2007-01-02 22:44:10.000000000 +0100 -+++ servers/slapd/slapi/Makefile.in 2007-08-22 14:58:51.000000000 +0200 -@@ -37,6 +37,7 @@ - XLIBS = $(LIBRARY) - XXLIBS = - NT_LINK_LIBS = $(AC_LIBS) -+UNIX_LINK_LIBS = ../../../libraries/libldap_r/libldap_r.la $(LTHREAD_LIBS) - - XINCPATH = -I$(srcdir)/.. -I$(srcdir) - XDEFS = $(MODULES_CPPFLAGS) diff --git a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch b/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch deleted file mode 100644 index 0213d81..0000000 --- a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- include/ldap_pvt_thread.h 2009-04-03 08:51:30.000000000 -0400 -+++ include/ldap_pvt_thread.h 2009-04-03 08:56:36.000000000 -0400 -@@ -57,12 +57,12 @@ - - #ifndef LDAP_PVT_THREAD_H_DONE - #define LDAP_PVT_THREAD_SET_STACK_SIZE --#ifndef LDAP_PVT_THREAD_STACK_SIZE -- /* LARGE stack. Will be twice as large on 64 bit machine. */ --#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) ) - /* May be explicitly defined to zero to disable it */ --#elif LDAP_PVT_THREAD_STACK_SIZE == 0 -+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0 - #undef LDAP_PVT_THREAD_SET_STACK_SIZE -+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE) -+ /* LARGE stack. Will be twice as large on 64 bit machine. */ -+#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) ) - #endif - #endif /* !LDAP_PVT_THREAD_H_DONE */ - ---- libraries/libldap/os-ip.c 2009-04-03 08:51:30.000000000 -0400 -+++ libraries/libldap/os-ip.c 2009-04-03 08:54:47.000000000 -0400 -@@ -652,7 +652,7 @@ - char *herr; - #ifdef NI_MAXHOST - char hbuf[NI_MAXHOST]; --#elif defined( MAXHOSTNAMELEN -+#elif defined( MAXHOSTNAMELEN ) - char hbuf[MAXHOSTNAMELEN]; - #else - char hbuf[256]; diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch deleted file mode 100644 index 448249a..0000000 --- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in ---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 2008-02-11 15:26:49.000000000 -0800 -+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in 2008-10-14 02:10:18.402799262 -0700 -@@ -37,6 +37,7 @@ - XLIBS = $(LIBRARY) - XXLIBS = - NT_LINK_LIBS = $(AC_LIBS) -+UNIX_LINK_LIBS = ../../../libraries/libldap_r/libldap_r.la $(LTHREAD_LIBS) - - XINCPATH = -I$(srcdir)/.. -I$(srcdir) - XDEFS = $(MODULES_CPPFLAGS) diff --git a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch deleted file mode 100644 index 3195ee5..0000000 --- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- openldap-2.4.15/clients/tools/common.c.orig 2009-02-05 15:05:03.000000000 -0800 -+++ openldap-2.4.15/clients/tools/common.c 2009-03-21 01:45:14.000000000 -0700 -@@ -1315,8 +1315,8 @@ - int nsctrls = 0; - - #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST -+ LDAPControl c; - if ( ppolicy ) { -- LDAPControl c; - c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST; - c.ldctl_value.bv_val = NULL; - c.ldctl_value.bv_len = 0; diff --git a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch deleted file mode 100644 index bf59170..0000000 --- a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Nuar --exclude 'openldap-2.4*' --exclude p -I '$OpenLDAP' openldap-2.4.17.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.17/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.17.orig/contrib/slapd-modules/smbk5pwd/Makefile 2009-04-27 16:36:57.000000000 -0700 -+++ openldap-2.4.17/contrib/slapd-modules/smbk5pwd/Makefile 2009-07-27 15:00:37.097428029 -0700 -@@ -9,37 +9,43 @@ - # top-level directory of the distribution or, alternatively, at - # . - -+#libexecdir=/usr/lib/openldap -+moduledir=$(libexecdir) - LIBTOOL=../../../libtool --OPT=-g -O2 -+#OPT= - CC=gcc - - # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -+#DEFS= - --HEIMDAL_INC=-I/usr/heimdal/include -+#KRB5_INC= - SSL_INC= - LDAP_INC=-I../../../include -I../../../servers/slapd --INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) - --HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_LIB=-lkrb5 -lkadm5srv - SSL_LIB=-lcrypto --LDAP_LIB=-lldap_r -llber --LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -- -+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif -+ - all: smbk5pwd.la - - - smbk5pwd.lo: smbk5pwd.c -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -- -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ -+ -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: - rm -f smbk5pwd.lo smbk5pwd.la - - install: smbk5pwd.la -- mkdir -p $(PREFIX)/lib/openldap -- $(LIBTOOL) --mode=install cp smbk5pwd.la $(PREFIX)/lib/openldap -- $(LIBTOOL) --finish $(PREFIX)/lib -+ mkdir -p $(DESTDIR)$(moduledir) -+ $(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir) -+ $(LIBTOOL) --finish $(DESTDIR)$(libexecdir) diff --git a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch deleted file mode 100644 index e511746..0000000 --- a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch +++ /dev/null @@ -1,109 +0,0 @@ -If GnuTLS is used, the lmpasswd module for USE=samba does not compile. -Forward-port an old Debian patch that upstream never applied. - -Signed-off-by: Robin H. Johnson -Signed-off-by: Steffen Hau -X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 -X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 -X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 - ---- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 -+++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 -@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; - typedef PK11Context *des_context[1]; - #define DES_ENCRYPT CKA_ENCRYPT - -+#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+# include -+static int gcrypt_init = 0; -+ -+typedef const void* des_key; -+typedef unsigned char des_cblock[8]; -+typedef des_cblock des_data_block; -+typedef int des_key_schedule; /* unused */ -+typedef des_key_schedule des_context; /* unused */ -+#define des_failed(encrypted) 0 -+#define des_finish(key, schedule) -+ -+#define des_set_key_unchecked( key, key_sched ) \ -+ gcry_cipher_setkey( hd, key, 8 ) -+ -+#define des_ecb_encrypt( input, output, key_sched, enc ) \ -+ gcry_cipher_encrypt( hd, *output, 8, *input, 8 ) -+ -+#define des_set_odd_parity( key ) do {} while(0) -+ - #endif - - #endif /* SLAPD_LMHASH */ -@@ -651,7 +671,7 @@ static int chk_md5( - - #ifdef SLAPD_LMHASH - --#if defined(HAVE_OPENSSL) -+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H) - - /* - * abstract away setting the parity. -@@ -841,6 +861,19 @@ static int chk_lanman( - des_data_block StdText = "KGS!@#$%"; - des_data_block PasswordHash1, PasswordHash2; - char PasswordHash[33], storedPasswordHash[33]; -+ -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_hd_t hd; -+ -+ if ( !gcrypt_init ) { -+ gcry_check_version( GCRYPT_VERSION ); -+ gcrypt_init = 1; -+ } -+ -+ schedule = schedule; /* unused - avoid warning */ -+ -+ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ - - for( i=0; ibv_len; i++) { - if(cred->bv_val[i] == '\0') { -@@ -883,6 +916,10 @@ static int chk_lanman( - strncpy( storedPasswordHash, passwd->bv_val, 32 ); - storedPasswordHash[32] = '\0'; - ldap_pvt_str2lower( storedPasswordHash ); -+ -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_close( hd ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ - - return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK; - } -@@ -1138,6 +1175,19 @@ static int hash_lanman( - des_data_block PasswordHash1, PasswordHash2; - char PasswordHash[33]; - -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_hd_t hd; -+ -+ if ( !gcrypt_init ) { -+ gcry_check_version( GCRYPT_VERSION ); -+ gcrypt_init = 1; -+ } -+ -+ schedule = schedule; /* unused - avoid warning */ -+ -+ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ -+ - for( i=0; ibv_len; i++) { - if(passwd->bv_val[i] == '\0') { - return LUTIL_PASSWD_ERR; /* NUL character in password */ -@@ -1168,6 +1218,10 @@ static int hash_lanman( - - hash->bv_val = PasswordHash; - hash->bv_len = 32; -+ -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_close( hd ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ - - return pw_string( scheme, hash ); - } diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch deleted file mode 100644 index aa7fe7a..0000000 --- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp ---- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300 -+++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300 -@@ -13,6 +13,7 @@ - #include - #endif - -+#include - #include - #include "SaslInteractionHandler.h" - #include "SaslInteraction.h" diff --git a/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch deleted file mode 100644 index f20fda0..0000000 --- a/net-nds/openldap/files/openldap-2.4.19-contrib-smbk5pwd.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nuar openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile 2009-10-02 21:16:53.000000000 +0000 -+++ openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile 2009-11-03 21:01:41.199550611 +0000 -@@ -13,22 +13,26 @@ - # . - - LIBTOOL=../../../libtool --OPT=-g -O2 -+#OPT= - CC=gcc - - # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -+#DEFS= - --HEIMDAL_INC=-I/usr/heimdal/include -+#KRB5_INC= - SSL_INC= - LDAP_INC=-I../../../include -I../../../servers/slapd --INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) - --HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_LIB=-lkrb5 -lkadm5srv - SSL_LIB=-lcrypto --LDAP_LIB=-lldap_r -llber --LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -- -+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif -+ - prefix=/usr/local - exec_prefix=$(prefix) - ldap_subdir=/openldap -@@ -41,10 +45,10 @@ - - - smbk5pwd.lo: smbk5pwd.c -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: diff --git a/net-nds/openldap/files/openldap-2.4.22.ebuild.diff b/net-nds/openldap/files/openldap-2.4.22.ebuild.diff deleted file mode 100644 index 6c6c7ea..0000000 --- a/net-nds/openldap/files/openldap-2.4.22.ebuild.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- /usr/portage/net-nds/openldap/openldap-2.4.21.ebuild 2010-04-11 17:14:48.000000000 +0200 -+++ openldap-2.4.25.ebuild 2010-06-03 05:27:07.963282627 +0200 -@@ -17,7 +17,7 @@ - IUSE_BACKEND="+berkdb" - IUSE_OVERLAY="overlays perl" - IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" --IUSE_CONTRIB="smbkrb5passwd kerberos" -+IUSE_CONTRIB="smbkrb5passwd kerberos samba4" - IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" - IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -@@ -412,6 +412,15 @@ - || die "emake smbk5pwd failed" - fi - -+ if use samba4 ; then -+ einfo "Building contrib-module: samba4" -+ cd "${S}/contrib/slapd-modules/samba4" -+ -+ emake \ -+ CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ -+ || die "emake samba4 failed" -+ fi -+ - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" -@@ -543,6 +552,13 @@ - newdoc README smbk5pwd-README - fi - -+ if use samba4 ; then -+ einfo "Install the samba4 module" -+ cd "${S}/contrib/slapd-modules/samba4" -+ emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" -+ newdoc README samba4-README -+ fi -+ - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do diff --git a/net-nds/openldap/files/openldap-2.4.26-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.26-contrib-smbk5pwd.patch deleted file mode 100644 index 78148a8..0000000 --- a/net-nds/openldap/files/openldap-2.4.26-contrib-smbk5pwd.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -uNr openldap-2.4.26.orig//contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.26/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.26.orig//contrib/slapd-modules/smbk5pwd/Makefile 2011-07-30 08:51:34.251000121 +0200 -+++ openldap-2.4.26/contrib/slapd-modules/smbk5pwd/Makefile 2011-07-30 08:52:44.432000121 +0200 -@@ -13,22 +13,26 @@ - # . - - LIBTOOL=../../../libtool --OPT=-g -O2 -+#OPT= - CC=gcc - - # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. --DEFS=-DDO_KRB5 -DDO_SAMBA -DDO_SHADOW -+#DEFS= -DDO_SHADOW - --HEIMDAL_INC=-I/usr/heimdal/include -+#KRB5_INC= - SSL_INC= - LDAP_INC=-I../../../include -I../../../servers/slapd --INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC) - --HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_LIB=-lkrb5 -lkadm5srv - SSL_LIB=-lcrypto --LDAP_LIB=-lldap_r -llber --LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -- -+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif -+ - prefix=/usr/local - exec_prefix=$(prefix) - ldap_subdir=/openldap -@@ -41,10 +45,10 @@ - - - smbk5pwd.lo: smbk5pwd.c -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $? -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $? - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: diff --git a/net-nds/openldap/files/slapd-confd b/net-nds/openldap/files/slapd-confd deleted file mode 100644 index 2240ad3..0000000 --- a/net-nds/openldap/files/slapd-confd +++ /dev/null @@ -1,9 +0,0 @@ -# conf.d file for openldap -# -# To enable both the standard unciphered server and the ssl encrypted -# one uncomment this line or set any other server starting options -# you may desire. -# -# OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" -# Uncomment the below to use the new slapd configuration for openldap 2.3 -#OPTS="-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd deleted file mode 100644 index 0746cf4..0000000 --- a/net-nds/openldap/files/slapd-initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.3 2009/07/28 21:28:25 robbat2 Exp $ - -depend() { - need net - before dbus hald avahi-daemon -} - -start() { - ebegin "Starting ldap-server" - eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}" - eend $? -} - -stop() { - ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid - eend $? -} diff --git a/net-nds/openldap/files/slapd-initd2 b/net-nds/openldap/files/slapd-initd2 deleted file mode 100644 index 26e4344..0000000 --- a/net-nds/openldap/files/slapd-initd2 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd2,v 1.1 2010/04/11 15:14:48 jokey Exp $ - -depend() { - need net - before dbus hald avahi-daemon - provide ldap -} - -start() { - ebegin "Starting ldap-server" - eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}" - eend $? -} - -stop() { - ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid - eend $? -} diff --git a/net-nds/openldap/files/slurpd-initd b/net-nds/openldap/files/slurpd-initd deleted file mode 100644 index f5aa2ea..0000000 --- a/net-nds/openldap/files/slurpd-initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slurpd-initd,v 1.1 2007/01/16 23:22:02 jokey Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting slurpd" - start-stop-daemon --start --quiet \ - --exec /usr/lib/openldap/slurpd - eend $? -} - -stop() { - ebegin "Stopping slurpd" - start-stop-daemon --stop --quiet \ - --exec /usr/lib/openldap/slurpd - eend $? -} diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml deleted file mode 100644 index fb8378d..0000000 --- a/net-nds/openldap/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - ldap - - ldap-bugs@gentoo.org - - - Enable experimental backend options - Enable ODBC and SQL backend options - Enable contributed OpenLDAP overlays - Enable Samba4 support - Enable overlay for syncing ldap, unix and - lanman passwords - - diff --git a/net-nds/openldap/openldap-2.4.22.ebuild b/net-nds/openldap/openldap-2.4.22.ebuild deleted file mode 100644 index 79b08b3..0000000 --- a/net-nds/openldap/openldap-2.4.22.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.1 2010/04/11 15:14:48 jokey Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" - -IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" -IUSE_CONTRIB="smbkrb5passwd kerberos samba4" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl[-build] ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - openldap_datadirs="" - if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" - fi - openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs}; do - CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` - CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} - if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then - einfo "- Checking ${each}..." - if [ -r ${CURRENT_TAG} ] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source ${CURRENT_TAG} - if [ "${OLDPF}" == "" ] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` - - [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" - - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - local fail=0 - if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then - : - # Nothing wrong here. - elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [ "${fail}" == "1" ] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." - eerror - if [ "${FORCE_UPGRADE}" != "1" ]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - else - openldap_find_versiontags - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.19 - epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch - - cd "${S}"/build - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" -} - -build_contrib_module() { - lt="${S}/libtool" - # - cd "${S}/contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf="${myconf} --enable-ldap" - - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I/usr/include/iodbc - fi - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(use_enable tcpd wrappers)" - - local ssl_lib="no" - if use ssl || ( use ! minimal && use samba ) ; then - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use samba4 ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" - - emake \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake samba4 failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd2 slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - if use samba4 ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -pkg_postinst() { - if ! use minimal ; then - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild deleted file mode 100644 index 2dfbee8..0000000 --- a/net-nds/openldap/openldap-2.4.23.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.7 2010/09/12 04:34:43 josejx Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" - -IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" -IUSE_CONTRIB="smbkrb5passwd kerberos samba4" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl[-build] ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - openldap_datadirs="" - if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" - fi - openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs}; do - CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` - CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} - if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then - einfo "- Checking ${each}..." - if [ -r ${CURRENT_TAG} ] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source ${CURRENT_TAG} - if [ "${OLDPF}" == "" ] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` - - [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" - - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - local fail=0 - if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then - : - # Nothing wrong here. - elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [ "${fail}" == "1" ] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." - eerror - if [ "${FORCE_UPGRADE}" != "1" ]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - else - openldap_find_versiontags - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.19 - epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch - - cd "${S}"/build - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" -} - -build_contrib_module() { - lt="${S}/libtool" - # - cd "${S}/contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf="${myconf} --enable-ldap" - - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I/usr/include/iodbc - fi - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(use_enable tcpd wrappers)" - - local ssl_lib="no" - if use ssl || ( use ! minimal && use samba ) ; then - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use samba4 ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" - - emake \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake samba4 failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd2 slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - if use samba4 ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -pkg_postinst() { - if ! use minimal ; then - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild deleted file mode 100644 index 3352946..0000000 --- a/net-nds/openldap/openldap-2.4.24.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.6 2011/02/26 16:44:43 armin76 Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" - -IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" -IUSE_CONTRIB="smbkrb5passwd kerberos samba4" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl[-build] ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - openldap_datadirs="" - if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" - fi - openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs}; do - CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` - CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} - if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then - einfo "- Checking ${each}..." - if [ -r ${CURRENT_TAG} ] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source ${CURRENT_TAG} - if [ "${OLDPF}" == "" ] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` - - [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" - - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - local fail=0 - if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then - : - # Nothing wrong here. - elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [ "${fail}" == "1" ] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." - eerror - if [ "${FORCE_UPGRADE}" != "1" ]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - else - openldap_find_versiontags - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.19 - epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch - - cd "${S}"/build - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" -} - -build_contrib_module() { - lt="${S}/libtool" - # - cd "${S}/contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf="${myconf} --enable-ldap" - - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I/usr/include/iodbc - fi - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(use_enable tcpd wrappers)" - - local ssl_lib="no" - if use ssl || ( use ! minimal && use samba ) ; then - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use samba4 ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" - - emake \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake samba4 failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd2 slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - if use samba4 ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -pkg_postinst() { - if ! use minimal ; then - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild deleted file mode 100644 index 2acac4e..0000000 --- a/net-nds/openldap/openldap-2.4.25.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.1 2011/05/06 15:45:59 robbat2 Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" - -IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" -IUSE_CONTRIB="smbkrb5passwd kerberos samba4" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl[-build] ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - openldap_datadirs="" - if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" - fi - openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs}; do - CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` - CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} - if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then - einfo "- Checking ${each}..." - if [ -r ${CURRENT_TAG} ] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source ${CURRENT_TAG} - if [ "${OLDPF}" == "" ] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` - - [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" - - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - local fail=0 - if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then - : - # Nothing wrong here. - elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [ "${fail}" == "1" ] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." - eerror - if [ "${FORCE_UPGRADE}" != "1" ]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - else - openldap_find_versiontags - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.19 - epatch "${FILESDIR}"/${PN}-2.4.19-contrib-smbk5pwd.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch - - cd "${S}"/build - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" -} - -build_contrib_module() { - lt="${S}/libtool" - # - cd "${S}/contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf="${myconf} --enable-ldap" - - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I/usr/include/iodbc - fi - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(use_enable tcpd wrappers)" - - local ssl_lib="no" - if use ssl || ( use ! minimal && use samba ) ; then - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use samba4 ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" - - emake \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake samba4 failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd2 slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - if use samba4 ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -pkg_postinst() { - if ! use minimal ; then - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} diff --git a/net-nds/openldap/openldap-2.4.26.ebuild b/net-nds/openldap/openldap-2.4.26.ebuild deleted file mode 100644 index 72d053f..0000000 --- a/net-nds/openldap/openldap-2.4.26.ebuild +++ /dev/null @@ -1,637 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.1 2011/05/06 15:45:59 robbat2 Exp $ - -EAPI="2" -inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" - -IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux" -IUSE_CONTRIB="smbkrb5passwd kerberos samba4" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -# openssl is needed to generate lanman-passwords required by samba -RDEPEND="sys-libs/ncurses - icu? ( dev-libs/icu ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl[-build] ) - samba? ( dev-libs/openssl ) - berkdb? ( sys-libs/db ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal ) - kerberos? ( virtual/krb5 ) - cxx? ( dev-libs/cyrus-sasl ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - openldap_datadirs="" - if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then - openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)" - fi - openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs}; do - CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` - CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} - if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then - einfo "- Checking ${each}..." - if [ -r ${CURRENT_TAG} ] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source ${CURRENT_TAG} - if [ "${OLDPF}" == "" ] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` - - [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" - - # Now we must check for the major version of sys-libs/db linked against. - SLAPD_PATH=${ROOT}/usr/$(get_libdir)/openldap/slapd - if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then - OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - NEWVER="$(use berkdb && db_findver sys-libs/db)" - local fail=0 - if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then - : - # Nothing wrong here. - elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [ "${OLDVER}" != "${NEWVER}" ]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [ "${fail}" == "1" ] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. egrep -v '^entryCSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." - eerror - if [ "${FORCE_UPGRADE}" != "1" ]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then - einfo - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - einfo - else - openldap_find_versiontags - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.19 - epatch "${FILESDIR}"/${PN}-2.4.26-contrib-smbk5pwd.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch - - cd "${S}"/build - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" -} - -build_contrib_module() { - lt="${S}/libtool" - # - cd "${S}/contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - local myconf - - #Fix for glibc-2.8 and ucred. Bug 228457. - append-flags -D_GNU_SOURCE - - use debug && myconf="${myconf} $(use_enable debug)" - - # ICU usage is not configurable - export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)" - - if ! use minimal ; then - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf="${myconf} --enable-ldap" - - # backends - myconf="${myconf} --enable-slapd" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} --enable-bdb --enable-hdb" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I$(db_includedir) - else - ewarn - ewarn "Note: if you disable berkdb, you can only use remote-backends!" - ewarn - ebeep 5 - myconf="${myconf} --disable-bdb --disable-hdb" - fi - for backend in dnssrv ldap meta monitor null passwd relay shell sock; do - myconf="${myconf} --enable-${backend}=mod" - done - - myconf="${myconf} $(use_enable perl perl mod)" - - myconf="${myconf} $(use_enable odbc sql mod)" - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I/usr/include/iodbc - fi - myconf="${myconf} --with-odbc=${odbc_lib}" - fi - - # slapd options - myconf="${myconf} $(use_enable crypt) $(use_enable slp)" - myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)" - if use experimental ; then - myconf="${myconf} --enable-dynacl" - myconf="${myconf} --enable-aci=mod" - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf="${myconf} --enable-${option}" - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf="${myconf} --enable-syncprov=yes" - use overlays && myconf="${myconf} --enable-overlays=mod" - - else - myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb" - myconf="${myconf} --disable-overlays --disable-syslog" - fi - - # basic functionality stuff - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)" - myconf="${myconf} $(use_enable tcpd wrappers)" - - local ssl_lib="no" - if use ssl || ( use ! minimal && use samba ) ; then - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf="${myconf} --with-tls=${ssl_lib}" - - for basicflag in dynamic local proctitle shared static; do - myconf="${myconf} --enable-${basicflag}" - done - - tc-export CC AR CXX - STRIP=/bin/true \ - econf \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "econf failed" -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - if ! use minimal ; then - if use cxx ; then - local myconf_ldapcpp - myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include" - cd "${S}/contrib/ldapc++" - OLD_LDFLAGS="$LDFLAGS" - OLD_CPPFLAGS="$CPPFLAGS" - append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs - append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs - append-cppflags -I../../../include - econf ${myconf_ldapcpp} \ - CC="${CC}" \ - CXX="${CXX}" \ - || die "econf ldapc++ failed" - CPPFLAGS="$OLD_CPPFLAGS" - LDFLAGS="${OLD_LDFLAGS}" - fi - fi -} - -src_compile() { - emake depend || die "emake depend failed" - emake CC="${CC}" AR="${AR}" || die "emake failed" - lt="${S}/libtool" - export echo="echo" - - if ! use minimal ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${S}/contrib/ldapc++" - emake \ - CC="${CC}" CXX="${CXX}" \ - || die "emake ldapc++ failed" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" - - emake \ - DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="$(krb5-config --cflags)" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake smbk5pwd failed" - fi - - if use samba4 ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" - - emake \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \ - || die "emake samba4 failed" - fi - - if use kerberos ; then - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath /usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "nops" "nops.c" "nops-overlay" - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -src_test() { - cd tests ; make tests || die "make tests failed" -} - -src_install() { - lt="${S}/libtool" - emake DESTDIR="${D}" install || die "make install failed" - - # install header for compiling external overlays & plugins (mmc-core, pwdcheck, memberof, defslang ...) - # install deeps - insinto /usr/include/openldap/include/ac - doins include/ac/*.h - insinto /usr/include/openldap/libraries/liblunicode/ucdata - doins libraries/liblunicode/ucdata/*.h - # install header - insinto /usr/include/openldap/include - doins include/*.h - # install slapd header - insinto /usr/include/openldap/slapd - doins servers/slapd/*.h - # install slapi header - insinto /usr/include/openldap/slapd/slapi - doins servers/slapd/slapi/*.h - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - fowners ldap:ldap /var/run/openldap - fperms 0755 /var/run/openldap - - if ! use minimal; then - # use our config - rm "${D}"etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf - configfile="${D}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "populate config with built backends" - for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do - elog "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default - eend - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd2 slapd - newconfd "${FILESDIR}"/slapd-confd slapd - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd - fi - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${S}/contrib/ldapc++" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed" - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed" - newdoc README smbk5pwd-README - fi - - if use samba4 ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" - emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed" - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" - for l in */*.la; do - "${lt}" --mode=install cp ${l} \ - "${D}"usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - docinto contrib - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - doman allop/slapo-allop.5 - newdoc autogroup/README autogroup-README - newdoc denyop/denyop.c denyop-denyop.c - newdoc dsaschema/README dsaschema-README - doman lastmod/slapo-lastmod.5 - doman nops/slapo-nops.5 - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - fi -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib usr/$(get_libdir)/{libldap,libldap_r,liblber}-2.3.so.0 -} - -pkg_postinst() { - if ! use minimal ; then - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - fi - - # These lines force the permissions of various content to be correct - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default} - chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm} - fi - - elog "Getting started using OpenLDAP? There is some documentation available:" - elog "Gentoo Guide to OpenLDAP Authentication" - elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0 -} diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog deleted file mode 100644 index 8959618..0000000 --- a/www-apps/davical/ChangeLog +++ /dev/null @@ -1,73 +0,0 @@ -# ChangeLog for www-apps/davical -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 09 May 2010; Mario Fetka davical-0.9.8.ebuild, - +davical-0.9.9.ebuild: - Bump - - 31 Jan 2010; Mario Fetka +davical-0.9.8.ebuild: - initial checkin based on sunrise ebuild - - 07 Jan 2010; lebarjack - -davical-0.9.7.6.ebuild, -files/postinstall-en-0.9.7.6.txt, - +davical-0.9.8.ebuild, +files/postinstall-en-0.9.8.txt: - Version bump, now depends on php with pdo - - 28 Oct 2009; lebarjack - -davical-0.9.7.4.ebuild, -files/postinstall-en-0.9.7.4.txt, - +davical-0.9.7.6.ebuild, +files/postinstall-en-0.9.7.6.txt: - version bump - - 12 Oct 2009; lebarjack - -davical-0.9.7.2.ebuild, -files/postinstall-en-0.9.7.2.txt, - +davical-0.9.7.4.ebuild, +files/postinstall-en-0.9.7.4.txt: - New version for davical - - 17 Sep 2009; lebarjack - -davical-0.9.7.1.ebuild, -files/postinstall-en-0.9.7.1.txt, - +davical-0.9.7.2.ebuild, +files/postinstall-en-0.9.7.2.txt: - New version - - 03 Sep 2009; lebarjack - -davical-0.9.7.ebuild, +davical-0.9.7.1.ebuild, - +files/postinstall-en-0.9.7.1.txt, -files/postinstall-en-0.9.7.txt: - Version bump for davical - - 01 Jul 2009; lebarjack - -davical-0.9.6.3.ebuild, -files/postinstall-en-0.9.6.3.txt, - +davical-0.9.7.ebuild, +files/postinstall-en-0.9.7.txt: - New version for davical - - 22 Apr 2009; Christian Ruppert davical-0.9.6.3.ebuild: - Removed unused inherits, added missing die statements. - - 22 Apr 2009; lebarjack - -davical-0.9.6.2.ebuild, -files/postinstall-en-0.9.6.2.txt, - +davical-0.9.6.3.ebuild, +files/postinstall-en-0.9.6.3.txt: - Version bump to 0.9.6.3 - - 16 Mar 2009; Nick Fortino (nfortino) - davical-0.9.6.2.ebuild: - Update ebuild to use EAPI 2. Thanks to Cristian Ruppert and Thomas Sachau - for review - - 24 Nov 2008; lebarjack - -davical-0.9.6.1.ebuild, -files/postinstall-en-0.9.6.1.txt, - +davical-0.9.6.2.ebuild, +files/postinstall-en-0.9.6.2.txt: - New version for davical - Better ical calendar support - - 05 Nov 2008; lebarjack - -davical-0.9.5.2.ebuild, -files/postinstall-en-0.9.5.txt, - +davical-0.9.6.1.ebuild, +files/postinstall-en-0.9.6.1.txt: - New version - - 16 Sep 2008; lebarjack - -davical-0.9.5.ebuild, +davical-0.9.5.2.ebuild, -files/driver_ldap.patch: - New version for davical (Ex-rscds) - - 23 Jun 2008; lebarjack - +davical-0.9.5.ebuild, +files/postinstall-en-0.9.5.txt, - +files/driver_ldap.patch, +files/rscds.conf, +metadata.xml: - New ebuild for bug 195118 - (initial work by Cory Coager ) - diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest deleted file mode 100644 index 5690a65..0000000 --- a/www-apps/davical/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX postinstall-en-0.9.8.txt 492 RMD160 31bf31bfd7a3937d444844c3742b549b77d9de79 SHA1 5edf6c9c2fd1047be370a584f0f7d9a0dec17498 SHA256 da31aedbd3508422ccb8715e2958651ea430a95408c4ccd27a6fd1a03eb10ecc -AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7 -DIST davical-0.9.8.tar.gz 1840965 RMD160 cb6ed25786fab3c7f9f0938fd146f28a2e661f57 SHA1 8fe11041881d53e3a256ddf915b577d658b7d4db SHA256 f474a3a685d4b018306bc15f24acf5f8cc990be0c0c48dabfaed5126ce4b06d7 -DIST davical-0.9.9.tar.gz 1949981 RMD160 74a4abecd7527b09e425dbff4b5c1cf845670205 SHA1 c1ec44757a769a5c999c8348958a8a6ad59379fc SHA256 9052f844b8b1139d62ec9f1cc8cb31a4f34d86b783476fe674148fe6fd99c96c -EBUILD davical-0.9.8.ebuild 1731 RMD160 a44149a71f98759b7927fb51bce4b567eb181536 SHA1 f79e7acd1d9199b98173392ebba0eee648b51352 SHA256 50a770dfe2d0c86f32fc63781c453eb3e1be7143995f0fd67ebd4fb37f81a9b6 -EBUILD davical-0.9.9.ebuild 1731 RMD160 a44149a71f98759b7927fb51bce4b567eb181536 SHA1 f79e7acd1d9199b98173392ebba0eee648b51352 SHA256 50a770dfe2d0c86f32fc63781c453eb3e1be7143995f0fd67ebd4fb37f81a9b6 -MISC ChangeLog 2985 RMD160 43417838d3c9b4c16631fd12a8edabf83b9e26f0 SHA1 ba3ecd6bb8db8c543345696a7c3e8fb9b9bb19c6 SHA256 a78387155e4458e60b3be2b2c78aafc34617538a0a49df6fa5d4a7c19df80fd0 -MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/www-apps/davical/davical-0.9.8.ebuild b/www-apps/davical/davical-0.9.8.ebuild deleted file mode 100644 index 3460341..0000000 --- a/www-apps/davical/davical-0.9.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit webapp depend.php - -DESCRIPTION="A CalDAV and iCal server" -HOMEPAGE="http://davical.org/" -SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="doc vhosts" - -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="www-servers/apache - || ( =dev-lang/php-5.3 ) - app-admin/pwgen - >=dev-php/awl-0.39 - dev-perl/yaml - dev-perl/DBI - dev-perl/DBD-Pg" - -need_php5 -need_httpd - -src_compile() { - if use doc ; then - ebegin "Generating documentation" - phpdoc -c "docs/api/phpdoc.ini" - eend $? || die "Documentation failed to build" - fi - emake inc/always.php || die "emake failed" - scripts/po/rebuild-translations.sh -} - -src_install() { - webapp_src_preinst - - local docs="INSTALL README debian/README.Debian \ - testing/README.regression_tests \ - TODO debian/changelog" - dodoc-php ${docs} || die "dodoc failed" - - einfo "Installing main files" - local dirs="htdocs inc locale" - insinto "${MY_HTDOCSDIR}" - doins -r ${dirs} || die "doins failed" - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" - - if use doc ; then - einfo "Installing documentation" - dohtml -r "docs/api/" || die "dohtml failed" - dohtml -r "docs/website/" || die "dohtml failed" - fi - - insinto /etc/${PN} - newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php \ - || die "newins failed" - - webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt" - webapp_src_install - - fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" - fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" - -} diff --git a/www-apps/davical/davical-0.9.9.ebuild b/www-apps/davical/davical-0.9.9.ebuild deleted file mode 100644 index 3460341..0000000 --- a/www-apps/davical/davical-0.9.9.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit webapp depend.php - -DESCRIPTION="A CalDAV and iCal server" -HOMEPAGE="http://davical.org/" -SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="doc vhosts" - -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="www-servers/apache - || ( =dev-lang/php-5.3 ) - app-admin/pwgen - >=dev-php/awl-0.39 - dev-perl/yaml - dev-perl/DBI - dev-perl/DBD-Pg" - -need_php5 -need_httpd - -src_compile() { - if use doc ; then - ebegin "Generating documentation" - phpdoc -c "docs/api/phpdoc.ini" - eend $? || die "Documentation failed to build" - fi - emake inc/always.php || die "emake failed" - scripts/po/rebuild-translations.sh -} - -src_install() { - webapp_src_preinst - - local docs="INSTALL README debian/README.Debian \ - testing/README.regression_tests \ - TODO debian/changelog" - dodoc-php ${docs} || die "dodoc failed" - - einfo "Installing main files" - local dirs="htdocs inc locale" - insinto "${MY_HTDOCSDIR}" - doins -r ${dirs} || die "doins failed" - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" - - if use doc ; then - einfo "Installing documentation" - dohtml -r "docs/api/" || die "dohtml failed" - dohtml -r "docs/website/" || die "dohtml failed" - fi - - insinto /etc/${PN} - newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php \ - || die "newins failed" - - webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt" - webapp_src_install - - fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" - fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" - -} diff --git a/www-apps/davical/files/postinstall-en-0.9.8.txt b/www-apps/davical/files/postinstall-en-0.9.8.txt deleted file mode 100644 index 57e4af2..0000000 --- a/www-apps/davical/files/postinstall-en-0.9.8.txt +++ /dev/null @@ -1,12 +0,0 @@ -You will need access to postgresql database to use davical. - -Read /usr/share/doc/www-apps/davical-${PV}/INSTALL.gz for installation -instructions. -Release notes are available at -http://wiki.davical.org/w/Release_Notes/${PV}. -Full documentation and wiki on http://davical.org - -If you are upgrading from a previous version of davical, don't forget to -upgrade the database structure with - cd /usr/share/webapps/davical/${PV}/sqlscripts/ - ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx diff --git a/www-apps/davical/files/rscds.conf b/www-apps/davical/files/rscds.conf deleted file mode 100644 index 0288764..0000000 --- a/www-apps/davical/files/rscds.conf +++ /dev/null @@ -1,279 +0,0 @@ -pg_connect[] = 'dbname=davical port=5432 user=general' -* The application will attempt to -* connect to the database, successively applying connection parameters from -* the array in $c->pg_connect. -* used in the web interface but also the caldav Server -*/ -$c->pg_connect[] = "dbname=davical user=general"; -// $c->pg_connect[] = "dbname=davical user=general port=5433 host=somehost password=mypass"; - - -/**************************** -********* Desirable ********* -*****************************/ - -/** -* default : Really Simple CalDAV Store -* Is used to specify the authentication realm of the server, as well as -* being used as a name to display in various places. -*/ -$c->system_name = "Really Simple CalDAV Store"; - -/** -* default is false -* If true, then events requested from someone other than the admmin or owner -* of a calendar will not get any alarm for it. Some client software also -* allows you to configure calendar by calendar which ones allow alarms. -*/ -$c->hide_alarm = true; - -/** -*default is false -*If true, then TODO requested from someone other than the admmin or owner -* of a calendar will not get any answer -*/ -$c->hide_TODO = true; - -/*************************************************************************** -* * -* ADMIN web Interface * -* * -***************************************************************************/ -/** -* Displayed on the login page to indicate who you should ask if you have -* problems logging on. Also for the "From" of the email sent when a user -* has lost his password and click on the login page -* on "Help! I've forgotten my password" -*/ -$c->admin_email ='calendar-admin@example.com'; - -/** -* default=true -* if true the admin web interface will -* have link on name to access details -*

The "enable_row_linking" option controls whether javascript is used -* to make the entire row clickable in browse lists in the administration -* pages. Since this doesn't work in Konqueror you may want to set this -* to false if you expect people to be using Konqueror with the DAViCal -* administration pages.

-*/ -// $c->enable_row_linking = true; - -/** -* These should be an array of style sheets with a path specified relative -* to the root directory. Used for overriding display styles in the admin -* interface. -* e.g. : $c->local_styles = array('/css/my.css'); -**/ -// $c->local_styles = array(); -// $c->print_styles = array(); - - -/*************************************************************************** -* * -* Caldav Server * -* * -***************************************************************************/ - -/** -* The "collections_always_exist" value defines whether a MKCALENDAR -* command is needed to create a calendar collection before calendar -* resources can be stored in it. You will want to leave this to the -* default (true) if people will be using Evolution or Sunbird / -* Lightning against this because that software does not support the -* creation of calendar collections. -* Default: true -*/ -// $c->collections_always_exist = true; - -/** -* The name of a user's "home" calendar. This will be created for each -* new user. -* Default: 'home' -*/ -// $c->home_calendar_name = 'home'; - -/** -* An array of groups / permissions which should be automatically added -* for each new user created. This is a crude mechanism which we -* will hopefully manage to work out some better approach for in the -* future. For now, create an array that looks something like: -* array( 9 => 'R', 4 => 'A' ) -* to create a 'read' relationship to user_no 9 and an 'all' relation -* with user_no 4. -* Default: none -*/ -// $c->default_relationships = array(); - - -/*************************************************************************** -* * -* External Authentication Sources * -* * -***************************************************************************/ - -/** -* Allow specifying another way to control access of the user by authenticating -* him against other drivers such has LDAP (the default is the PgSQL DB) -* $c->authenticate_hook['call'] should be set to the name of the plugin and must -* be a valid function that will be call like this: -* call_user_func( $c->authenticate_hook['call'], $username, $password ) -* -* The login mecanism is made in 2 places: -* - for the web interface in: index.php that calls RSCDSSession.php that extends -* Session.php (from AWL libraries) -* - for the caldav client in: caldav.php that calls BasicAuthSession.php -* Both Session.php and BasicAuthSession.php check against the -* authenticate_hook['call'], although for BasicAuthSession.php this will be for -* each page. For Session.php this will only occur during login. -* -* $c->authenticate_hook['config'] should be set up with any configuration data -* needed by the authenticate call for the moment used only in awl/inc/AuthPlugins.php -* and he used to authenticate the user should be at least 'password,user_no' -* awl/inc/AuthPlugins.php is a sample file not used by showing what could be -* a hook -*/ - -/********************************/ -/******* Other AWL hook *********/ -/********************************/ -// require_once('auth-functions.php'); -// $c->authenticate_hook = array( -// 'call' => 'AuthExternalAwl', -// 'config' => array( -// // A PgSQL database connection string for the database containing user records -// 'connection' => 'dbname=wrms host=otherhost port=5433 user=general', -// // Which columns should be fetched from the database -// 'columns' => "user_no, active, email_ok, joined, last_update AS updated, last_used, username, password, fullname, email", -// // a WHERE clause to limit the records returned. -// 'where' => "active AND org_code=7" -// ) -// ); - - -/********************************/ -/*********** LDAP hook **********/ -/********************************/ -/* - * For Active Directory go down to the next example. - */ - -//$c->authenticate_hook['call'] = 'LDAP_check'; -//$c->authenticate_hook['config'] = array( -// 'host' => 'www.tennaxia.net', //host name of your LDAP Server -// 'port' => '389', //port - - /* For the initial bind to be anonymous leave bindDN and passDN - commented out */ -// DN to bind to this server enabling to perform request -// 'bindDN'=> 'cn=manager,cn=internal,dc=tennaxia,dc=net', -// Password of the previous bindDN to bind to this server enabling to perform request -// 'passDN'=> 'xxxxxxxx', - -// 'protocolVersion' => '3', //Version of LDAP protocol to use -// 'baseDNUsers'=> 'dc=tennaxia,dc=net', //where to look at valid user -// 'filterUsers' => 'objectClass=kolabInetOrgPerson', //filter which must validate a user according to RFC4515, i.e. surrounded by brackets -// 'baseDNGroups' => 'ou=divisions,dc=tennaxia,dc=net', //not used ATM -// 'filterGroups' => 'objectClass=groupOfUniqueNames', //not used ATM - /** /!\ "username" should be set and "updated" must be set **/ -// 'mapping_field' => array("username" => "uid", -// "updated" => "modifyTimestamp", -// "fullname" => "cn" , -// "email" =>"mail" -// ), //used to create the user based on his ldap properties - /** used to set default value for all users, will be overcharged by ldap if defined also in mapping_field **/ -// 'default_value' => array("date_format_type" => "E","locale" => "fr_FR"), - /** foreach key set start and length in the string provided by ldap - example for openLDAP timestamp : 20070503162215Z **/ -// 'format_updated'=> array('Y' => array(0,4),'m' => array(4,2),'d'=> array(6,2),'H' => array(8,2),'M'=>array(10,2),'S' => array(12,2)), -// 'startTLS' => 'yes', // Require that TLS is used for LDAP? - // If ldap_start_tls is not working, it is probably - // because php wants to validate the server's - // certificate. Try adding "TLS_REQCERT never" to the - // ldap configuration file that php uses (e.g. /etc/ldap.conf - // or /etc/ldap/ldap.conf). Of course, this lessens security! -// 'scope' => 'subtree', // Search scope to use, defaults to subtree. -// // Allowed values: base, onelevel, subtree. -// -// ); -// -//include('drivers_ldap.php'); - -/* - * Use the following LDAP example if you are using Active Directory - * - * You will need to change host, passDN and DOMAIN in bindDN - * and baseDNUsers. - */ -//$c->authenticate_hook['call'] = 'LDAP_check'; -//$c->authenticate_hook['config'] = array( -// 'host' => 'ldap://ldap.example.net', -// 'bindDN' => 'auth@DOMAIN', -// 'passDN' => 'secret', -// 'baseDNUsers' => 'dc=DOMAIN,dc=local', -// 'protocolVersion' => 3, -// 'optReferrals' => 0, -// 'filterUsers' => '(&(objectcategory=person)(objectclass=user)(givenname=*))', -// 'mapping_field' => array("username" => "uid", -// "fullname" => "cn" , -// "email" => "mail"), -// 'default_value' => array("date_format_type" => "E","locale" => "en_NZ"), -// 'format_updated' => array('Y' => array(0,4),'m' => array(4,2),'d'=> array(6,2),'H' => array(8,2),'M'=>array(10,2),'S' => array(12,2)) -// ); -//include('drivers_ldap.php'); - - -/** -* Authentication against PAM using the Squid helper script. -*/ -//$c->authenticate_hook = array( -// 'call' => 'SQUID_PAM_check', -// 'config' => array( 'script' => '/usr/bin/pam_auth', 'email_base' => 'example.com' ); -// ); -//include('drivers_squid_pam.php'); - - -/** -* The default locale will be "en_NZ"; -* If you are in a non-English locale, you can set the default_locale -* configuration to one of the supported locales. -* -* Supported Locales (at present, see: "select * from supported_locales ;" for a full list) -* -* "de_DE", "en_NZ", "es_AR", "fr_FR", "nl_NL", "ru_RU" -* -* If you want locale support you probably know more about configuring it than me, but -* at this stage it should be noted that all translations are UTF-8, and pages are -* served as UTF-8, so you will need to ensure that the UTF-8 versions of these locales -* are supported on your system. -* -* People interested in providing new translations are directed to the Wiki: -* http://rscds.sourceforge.net/moin/TranslatingRscds -**/ -// $c->default_locale = "en_NZ"; - -/** -* Default will be $_SERVER['SERVER_NAME']; -* This is used to construct URLs which are passed in the answers to the client. You may -* want to force this to a specific domain in responses if your system is accessed by -* multiple names, otherwise you probably won't need to change it. -*/ -// $c->domain_name; - -/** -* Used as a fallback for the TZID of an event where one is not supplied as part -* of a VEVENT. The local (server) time zone will be used as a default. -*/ -// $c->local_tzid; diff --git a/www-apps/davical/metadata.xml b/www-apps/davical/metadata.xml deleted file mode 100644 index 7e32869..0000000 --- a/www-apps/davical/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -maintainer-wanted -