From 04a2003ada15eb430044a66c373f5bef0d2c175f Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Sat, 6 Jan 2007 15:09:54 +0000 Subject: [PATCH] Fixing enewuser placement, some further quotation (all done now, yey), security bug #159508 and add -j1 temporarily until upstream fixes parallel make issues Package-Manager: portage-2.1.2_rc4-r6 --- net-nds/openldap/Manifest | 57 +- net-nds/openldap/files/digest-openldap-2.3.31 | 3 - net-nds/openldap/files/gencert.sh | 139 ----- net-nds/openldap/openldap-2.3.31.ebuild | 513 ------------------ 4 files changed, 32 insertions(+), 680 deletions(-) delete mode 100644 net-nds/openldap/files/digest-openldap-2.3.31 delete mode 100644 net-nds/openldap/files/gencert.sh delete mode 100644 net-nds/openldap/openldap-2.3.31.ebuild diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index b6a2e89aef92..ac89b3d8a217 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 SHA1 5b9b3418b433c15df1a0cb72d2c7f8f361cf33e1 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 files/2.0/slapd 584 @@ -17,10 +14,6 @@ AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 S MD5 d00ccd5b4b44ac1df463da80d5ebb8a1 files/DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 files/DB_CONFIG.fast.example 746 SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b files/DB_CONFIG.fast.example 746 -AUX gencert.sh 3505 RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf SHA1 c725139698999415a7076b369222172949c2635f SHA256 73f1f7f0d76132da878ae8739f4f4403bb5f17d630ffa109fe4b1645e7f073c6 -MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505 -RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf files/gencert.sh 3505 -SHA256 73f1f7f0d76132da878ae8739f4f4403bb5f17d630ffa109fe4b1645e7f073c6 files/gencert.sh 3505 AUX openldap-2.1.27-db40.patch 718 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 SHA1 9a6a9fb9608a1abfbafa3a4e4915d67e8e36ec4c SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53 MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 files/openldap-2.1.27-db40.patch 718 @@ -119,6 +112,10 @@ DIST openldap-2.3.24.tgz 3756405 RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06 DIST openldap-2.3.27.tgz 3757519 RMD160 8c25c39689daa515f14e88611490ae6d8df0911c SHA1 c2b6ac3ec89d0f58d079592946d045dba45edafe SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b DIST openldap-2.3.31.tgz 3766559 RMD160 3a5bc3622d64c7af27901046144bc9e2952abf57 SHA1 4ee3cefdb82aaabb42fe25f791e8a0f48b046a16 SHA256 0b43259bc738f207f2bcd3adea6e819cdeab0fd92ba5992153dbe41563c56eb2 +EBUILD openldap-2.1.30-r10.ebuild 7832 RMD160 8637a3ef9745924d86a777727911da370b9400e1 SHA1 08f70add49da22e2cfe7b40f92112a22f4dd4820 SHA256 17190bfd5ca1cda9c906747d3acb301414ee6451b6dc09d414153ccca7cadad2 +MD5 d6ec0ad3378896166e0cf8dfe5c8c71c openldap-2.1.30-r10.ebuild 7832 +RMD160 8637a3ef9745924d86a777727911da370b9400e1 openldap-2.1.30-r10.ebuild 7832 +SHA256 17190bfd5ca1cda9c906747d3acb301414ee6451b6dc09d414153ccca7cadad2 openldap-2.1.30-r10.ebuild 7832 EBUILD openldap-2.1.30-r8.ebuild 8278 RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae SHA1 fb357ac09cf4a83be7f06c7b1ddbf9981e7bd26b SHA256 f43bd32d81fa68f1d033655bdfd4ebdb1e2e65acc663dc9c4f66085553e3efea MD5 b6cef48c62a0322e3e7a8433225f5cad openldap-2.1.30-r8.ebuild 8278 RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae openldap-2.1.30-r8.ebuild 8278 @@ -135,6 +132,10 @@ EBUILD openldap-2.2.28-r6.ebuild 12065 RMD160 c62172c3e59d5c9f918a865dfdebba9d89 MD5 a0d15f76c54b00d40cac2aa29c14e8c7 openldap-2.2.28-r6.ebuild 12065 RMD160 c62172c3e59d5c9f918a865dfdebba9d89d0bc4b openldap-2.2.28-r6.ebuild 12065 SHA256 2ae8e1b9792dcda472c96a525429ec4b351c48e4b116a7727a8c6293420a7a61 openldap-2.2.28-r6.ebuild 12065 +EBUILD openldap-2.2.28-r7.ebuild 11680 RMD160 39a45622c040cff97d47827998d2a3767c13cc6d SHA1 141617383a37855880342ac670a743413e14d6b9 SHA256 7a6471ffe4b3e8e1af9658c639b9e1e2c3ba4752de5cda0bc8d67c2402898cc8 +MD5 7336559319257278a60786a0f089a3d2 openldap-2.2.28-r7.ebuild 11680 +RMD160 39a45622c040cff97d47827998d2a3767c13cc6d openldap-2.2.28-r7.ebuild 11680 +SHA256 7a6471ffe4b3e8e1af9658c639b9e1e2c3ba4752de5cda0bc8d67c2402898cc8 openldap-2.2.28-r7.ebuild 11680 EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 SHA1 159add9ffaea974e73cc15edfde3cd48dd1ea31c SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42 MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268 @@ -147,18 +148,25 @@ EBUILD openldap-2.3.30-r1.ebuild 16702 RMD160 fe8ed68bb49f2184443a928f149aad4008 MD5 ad67c38598307c2bfe7a46b862357a50 openldap-2.3.30-r1.ebuild 16702 RMD160 fe8ed68bb49f2184443a928f149aad4008fdc654 openldap-2.3.30-r1.ebuild 16702 SHA256 e661420c05c760161273446fe95cadd9312e8a5b394c2d920e9ec1287eeee6a8 openldap-2.3.30-r1.ebuild 16702 -EBUILD openldap-2.3.31.ebuild 16699 RMD160 d757678fa4973aaeeed3001e79468ef6c4e05bc4 SHA1 96b8047b838d0e3c6a9f04eb807f503b6e1fc816 SHA256 a8daba227a393e22674739048e56e8632c275317dcd4e4164ca587decea0a708 -MD5 31605cb83e52ec96f53d240e57735812 openldap-2.3.31.ebuild 16699 -RMD160 d757678fa4973aaeeed3001e79468ef6c4e05bc4 openldap-2.3.31.ebuild 16699 -SHA256 a8daba227a393e22674739048e56e8632c275317dcd4e4164ca587decea0a708 openldap-2.3.31.ebuild 16699 -MISC ChangeLog 41291 RMD160 0d904274dcbb1f0a2a00907f9922a416502bdcd1 SHA1 23bd39008c85f77142d2a89110a2592ce123c5e5 SHA256 b59ad56c7e4089a1e5530193a4862998541e57b6731dd45b0298a6700648edb9 -MD5 7d3a00acf1f4c8a5546d7c8dabb27313 ChangeLog 41291 -RMD160 0d904274dcbb1f0a2a00907f9922a416502bdcd1 ChangeLog 41291 -SHA256 b59ad56c7e4089a1e5530193a4862998541e57b6731dd45b0298a6700648edb9 ChangeLog 41291 +EBUILD openldap-2.3.30-r2.ebuild 16338 RMD160 87b214f7ac84e08103e85300397cc7ff234dae0e SHA1 1e4dfdb89fad15c8a9bb362b4a5a50134e36f257 SHA256 11e9255e9baeff399ed590b3572253825e207565107011fc17f176806b13f61f +MD5 02e71b6073bc11525b02d9019225caf6 openldap-2.3.30-r2.ebuild 16338 +RMD160 87b214f7ac84e08103e85300397cc7ff234dae0e openldap-2.3.30-r2.ebuild 16338 +SHA256 11e9255e9baeff399ed590b3572253825e207565107011fc17f176806b13f61f openldap-2.3.30-r2.ebuild 16338 +EBUILD openldap-2.3.31-r1.ebuild 16338 RMD160 b8cd8b23877a790e037c64260728dc006fa59aeb SHA1 bf02aea903c29f08ac6fddf015b0921e491c8f94 SHA256 4fe16064895d8c889b9247d3f0ae07aa89092a17cfb188f9008b0ab8393ce0d3 +MD5 55c3d460654b0815e7045f3631264012 openldap-2.3.31-r1.ebuild 16338 +RMD160 b8cd8b23877a790e037c64260728dc006fa59aeb openldap-2.3.31-r1.ebuild 16338 +SHA256 4fe16064895d8c889b9247d3f0ae07aa89092a17cfb188f9008b0ab8393ce0d3 openldap-2.3.31-r1.ebuild 16338 +MISC ChangeLog 41806 RMD160 5fc8f4c82da39aa5fc2c03abfa10717711edade6 SHA1 b942fec710b4218ba7faf066ea15fd21cc9def8b SHA256 4fc0847bc06da417796b58ac1542eebcbc4e85adb82fd3be496d25a3e41722fe +MD5 38096c90a712b9eb67f5ba96e8b7fb14 ChangeLog 41806 +RMD160 5fc8f4c82da39aa5fc2c03abfa10717711edade6 ChangeLog 41806 +SHA256 4fc0847bc06da417796b58ac1542eebcbc4e85adb82fd3be496d25a3e41722fe ChangeLog 41806 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 metadata.xml 240 +MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r10 241 +RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r10 241 +SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r10 241 MD5 c9e269ba9c43c4aefb19e6cce36405a6 files/digest-openldap-2.1.30-r8 241 RMD160 41352ebe2a161b8683f2706cb6c460c4ba4e1fee files/digest-openldap-2.1.30-r8 241 SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/digest-openldap-2.1.30-r8 241 @@ -171,6 +179,9 @@ SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/di MD5 7c24277a9daf03437d0d2266c2379a60 files/digest-openldap-2.2.28-r6 241 RMD160 68c8f1b251970b4272d34661de70d260efe8f90c files/digest-openldap-2.2.28-r6 241 SHA256 51c7035bfbf95337f8b29fb76a53ed35b35d31d1e194d72fd430126279074adf files/digest-openldap-2.2.28-r6 241 +MD5 7c24277a9daf03437d0d2266c2379a60 files/digest-openldap-2.2.28-r7 241 +RMD160 68c8f1b251970b4272d34661de70d260efe8f90c files/digest-openldap-2.2.28-r7 241 +SHA256 51c7035bfbf95337f8b29fb76a53ed35b35d31d1e194d72fd430126279074adf files/digest-openldap-2.2.28-r7 241 MD5 90715e5ebf5339aaaa881c3ed3b46b3c files/digest-openldap-2.3.24-r1 241 RMD160 13c05b3ac61d04c0b78a7788823a866477e2eb16 files/digest-openldap-2.3.24-r1 241 SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/digest-openldap-2.3.24-r1 241 @@ -180,13 +191,9 @@ SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/di MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30-r1 241 RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30-r1 241 SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30-r1 241 -MD5 1247d1d103d4ab02a26179ce98c3b19f files/digest-openldap-2.3.31 241 -RMD160 9c8f735c271be532aa62750728ed5002f0fb481c files/digest-openldap-2.3.31 241 -SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/digest-openldap-2.3.31 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFj+cwz974XjDVpbkRAuqIAJ4zifhGbA13PK0qgXZlm1yo6QaY2ACfRLqh -G2A+EoWQJ25WEXpYSTHks+A= -=ToFT ------END PGP SIGNATURE----- +MD5 e912b83e7dba93d81b8fad6d2df489b1 files/digest-openldap-2.3.30-r2 241 +RMD160 a308c1e798233f0f862c0d5556f2543075738d0b files/digest-openldap-2.3.30-r2 241 +SHA256 eecda55d0b9bcbce0abc0a292f082d4d9979c1133ef593b43f7ad11eeadf0933 files/digest-openldap-2.3.30-r2 241 +MD5 1247d1d103d4ab02a26179ce98c3b19f files/digest-openldap-2.3.31-r1 241 +RMD160 9c8f735c271be532aa62750728ed5002f0fb481c files/digest-openldap-2.3.31-r1 241 +SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/digest-openldap-2.3.31-r1 241 diff --git a/net-nds/openldap/files/digest-openldap-2.3.31 b/net-nds/openldap/files/digest-openldap-2.3.31 deleted file mode 100644 index ea5a28f93166..000000000000 --- a/net-nds/openldap/files/digest-openldap-2.3.31 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fd8aa874590661c0fbc53ef3bf80c847 openldap-2.3.31.tgz 3766559 -RMD160 3a5bc3622d64c7af27901046144bc9e2952abf57 openldap-2.3.31.tgz 3766559 -SHA256 0b43259bc738f207f2bcd3adea6e819cdeab0fd92ba5992153dbe41563c56eb2 openldap-2.3.31.tgz 3766559 diff --git a/net-nds/openldap/files/gencert.sh b/net-nds/openldap/files/gencert.sh deleted file mode 100644 index 66c61d1edd57..000000000000 --- a/net-nds/openldap/files/gencert.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/sh -## -## gencert.sh -- Create self-signed test certificate -## Christian Zoffoli -## Version 0.2 - 20010501 -## -## - - -### external tools -openssl="/usr/bin/openssl" - -### some optional terminal sequences -case $TERM in - xterm|xterm*|vt220|vt220*) - T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'` - T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'` - ;; - vt100|vt100*) - T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'` - T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'` - ;; - default) - T_MD='' - T_ME='' - ;; -esac - -# find some random files -# (do not use /dev/random here, because this device -# doesn't work as expected on all platforms) -randfiles='' -for file in /var/log/messages /var/adm/messages \ - /kernel /vmunix /vmlinuz \ - /etc/hosts /etc/resolv.conf; do - if [ -f $file ]; then - if [ ".$randfiles" = . ]; then - randfiles="$file" - else - randfiles="${randfiles}:$file" - fi - fi -done - - -echo "" -echo "${T_MD}" -echo "----------------------------------------------------------------------" -echo "Create self-signed test certificate" -echo "" -echo "Christian Zoffoli " -echo "Version 0.2 - 20010501" -echo "" -echo "" -echo "______________________________________________________________________${T_ME}" -echo "" -echo "" - - -if [ ! -e ./ldap.pem ];then - echo "Will create ldap.pem in `pwd`" -else - echo "ldap.pem already exist, dying" - exit -fi - - -mkdir -p /tmp/tmpssl-$$ -pushd /tmp/tmpssl-$$ > /dev/null - -echo "" -echo "" -echo "${T_MD}Generating Certificate " -echo "______________________________________________________________________${T_ME}" -echo "" - - -COMMONNAME=`hostname` - -if [ ! -n "$COMMONNAME" ] - then - COMMONNAME="www.openldap.org" -fi -#. /etc/sysconfig/i18n -if [ -n "$COUNTRY" ] - then - COUNTRY=`echo $LANG | sed -e "s/.*_//;s/@.*//;s/\..*//;s/_.*//" |tr a-z A-Z` -else - COUNTRY="US" -fi - -cat >.cfg <&2 - exit 1 -fi - - -popd >/dev/null - - -rm -f /tmp/tmpssl-$$/*.csr -rm -f /tmp/tmpssl-$$/ca.* -chmod 400 /tmp/tmpssl-$$/* - -echo "Certificate creation done!" -cp /tmp/tmpssl-$$/ldap.* . -chown ldap:ldap ldap.* - -rm -rf /tmp/tmpssl-$$ - - diff --git a/net-nds/openldap/openldap-2.3.31.ebuild b/net-nds/openldap/openldap-2.3.31.ebuild deleted file mode 100644 index a714f77b1485..000000000000 --- a/net-nds/openldap/openldap-2.3.31.ebuild +++ /dev/null @@ -1,513 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.31.ebuild,v 1.3 2006/12/25 14:49:06 jokey Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -AT_M4DIR="./build" -inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator - -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 ~x86-fbsd" -IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline -samba sasl slp smbkrb5passwd ssl tcpd selinux" - -# note that the 'samba' USE flag pulling in OpenSSL is NOT an error. OpenLDAP -# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like -# mine at work)! -# Robin H. Johnson March 8, 2004 - -RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1" -RDEPEND="sys-libs/ncurses - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( dev-libs/openssl ) - readline? ( sys-libs/readline ) - sasl? ( dev-libs/cyrus-sasl ) - !minimal? ( - odbc? ( dev-db/unixODBC ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl ) - samba? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - berkdb? ( ${RDEPEND_BERKDB} ) - !berkdb? ( - gdbm? ( sys-libs/gdbm ) - !gdbm? ( ${RDEPEND_BERKDB} ) - ) - smbkrb5passwd? ( - dev-libs/openssl - app-crypt/heimdal - ) - ) - selinux? ( sec-policy/selinux-openldap )" -DEPEND="${RDEPEND}" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -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 "" - 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 - die "You need to upgrade your database first" -} - -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 - 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}` - - # are we on the same branch? - if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; 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}" - if [[ `ls -a ${each} | wc -l` > 5 ]] ; 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 - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo - -} - -pkg_setup() { - if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then - die "You must have a complete (USE='-minimal') Perl install to use the perl backend!" - 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 - -} - -pkg_preinst() { - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap -} - -src_unpack() { - unpack ${A} - - # According to MDK, the link order needs to be changed so that - # on systems w/ MD5 passwords the system crypt library is used - # (the net result is that "passwd" can be used to change ldap passwords w/ - # proper pam support) - sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \ - ${S}/servers/slapd/Makefile.in - - # supersedes old fix for bug #31202 - EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch - - # 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_OPTS="-p0 -d ${S}" - - # ximian connector 1.4.7 ntlm patch - epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch - - # bug #132263 - if use overlays ; then - epatch ${FILESDIR}/${PN}-2.3.21-ppolicy.patch - fi - - # fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't - # do it perfectly. - cd ${S}/build - ln -s shtool install - ln -s shtool install.sh - 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" - - # bug #116045 - # patch contrib modules - if ! use minimal ; then - cd ${S}/contrib - epatch ${FILESDIR}/${PN}-2.3.24-contrib-smbk5pwd.patch - fi -} - -src_compile() { - local myconf - - # HDB is only available with BerkDB - myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod' - myconf_gdbm='--disable-bdb --enable-ldbm-api=gdbm --disable-hdb' - - use debug && myconf="${myconf} --enable-debug" # there is no disable-debug - - # enable slapd/slurpd servers if not doing a minimal build - if ! use minimal ; then - myconf="${myconf} --enable-slapd --enable-slurpd" - # base backend stuff - myconf="${myconf} --enable-ldbm" - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} ${myconf_berkdb}" - elif use gdbm ; then - einfo "Using GDBM for local backend" - myconf="${myconf} ${myconf_gdbm}" - else - ewarn "Neither gdbm or berkdb USE flags present, falling back to" - ewarn "Berkeley DB for local backend" - myconf="${myconf} ${myconf_berkdb}" - fi - # extra backend stuff - myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod" - myconf="${myconf} --enable-dnssrv=mod --enable-ldap" - myconf="${myconf} --enable-meta=mod --enable-monitor=mod" - myconf="${myconf} --enable-null=mod --enable-shell=mod" - myconf="${myconf} --enable-relay=mod" - myconf="${myconf} `use_enable perl perl mod`" - myconf="${myconf} `use_enable odbc sql mod`" - # slapd options - myconf="${myconf} `use_enable crypt` `use_enable slp`" - myconf="${myconf} --enable-rewrite --enable-rlookups" - myconf="${myconf} --enable-aci --enable-modules" - myconf="${myconf} --enable-cleartext --enable-slapi" - myconf="${myconf} `use_with samba lmpasswd`" - # slapd overlay options - myconf="${myconf} --enable-dyngroup --enable-proxycache" - myconf="${myconf} `use_enable overlays`" - else - myconf="${myconf} --disable-slapd --disable-slurpd" - myconf="${myconf} --disable-bdb --disable-ldbm" - myconf="${myconf} --disable-hdb --disable-monitor" - myconf="${myconf} --disable-slurpd --disable-overlays" - myconf="${myconf} --disable-relay" - fi - - # basic functionality stuff - myconf="${myconf} --enable-syslog --enable-dynamic" - myconf="${myconf} --enable-local --enable-proctitle" - - myconf="${myconf} `use_enable ipv6` `use_enable readline`" - myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`" - myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`" - - if [ $(get_libdir) != "lib" ] ; then - append-ldflags -L/usr/$(get_libdir) - fi - - STRIP=/bin/true \ - econf \ - --enable-static \ - --enable-shared \ - --libexecdir=/usr/$(get_libdir)/openldap \ - ${myconf} || die "configure failed" - - emake depend || die "make depend failed" - emake || die "make failed" - - # openldap/contrib - tc-export CC - if ! use minimal ; then - # dsaschema - einfo "Building contributed dsaschema" - cd "${S}"/contrib/slapd-modules/dsaschema - ${CC} -shared -I../../../include ${CFLAGS} -fPIC \ - -Wall -o libdsaschema-plugin.so dsaschema.c || \ - die "failed to compile dsaschema module" - # kerberos passwd - if use kerberos ; then - einfo "Building contributed pw-kerberos" - cd "${S}"/contrib/slapd-modules/passwd/ && \ - ${CC} -shared -I../../../include ${CFLAGS} -fPIC \ - -DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \ - die "failed to compile kerberos password module" - fi - # netscape mta-md5 password - einfo "Building contributed pw-netscape" - cd "${S}"/contrib/slapd-modules/passwd/ && \ - ${CC} -shared -I../../../include ${CFLAGS} -fPIC \ - -o pw-netscape.so netscape.c || \ - die "failed to compile netscape password module" - # smbk5pwd overlay - # Note: this modules builds, but may not work with - # Gentoo's MIT-Kerberos. It was designed for Heimdal - # Kerberos. - if use smbkrb5passwd ; then - einfo "Building contributed smbk5pwd" - local mydef - local mykrb5inc - mydef="-DDO_SAMBA -DDO_KRB5" - mykrb5inc="-I/usr/include/heimdal/" - cd "${S}"/contrib/slapd-modules/smbk5pwd && \ - libexecdir="/usr/$(get_libdir)/openldap" \ - DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \ - die "failed to compile smbk5pwd module" - fi - # addrdnvalues - einfo "Building contributed addrdnvalues" - cd "${S}"/contrib/slapi-plugins/addrdnvalues/ && \ - ${CC} -shared -I../../../include ${CFLAGS} -fPIC \ - -o libaddrdnvalues-plugin.so addrdnvalues.c || \ - die "failed to compile addrdnvalues plugin" - fi -} - -src_test() { - einfo "Doing tests" - cd tests ; make tests || die "make tests failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${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/ - - # make state directories - local dirlist="data" - if ! use minimal; then - dirlist="${dirlist} slurp ldbm" - fi - for x in ${dirlist}; do - keepdir /var/lib/openldap-${x} - fowners ldap:ldap /var/lib/openldap-${x} - fperms 0700 /var/lib/openldap-${x} - done - - 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} - - # manually remove /var/tmp references in .la - # because it is packaged with an ancient libtool - for x in "${D}"/usr/$(get_libdir)/lib*.la; do - sed -i -e "s:-L${S}[/]*libraries::" ${x} - done - - # 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 - # config modifications - for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do - sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i "${D}"/${f} - sed -e "/database\tbdb$/acheckpoint 32 30 # " -i "${D}"/${f} - fowners root:ldap ${f} - fperms 0640 ${f} - done - - # install our own init scripts - newinitd "${FILESDIR}"/2.0/slapd slapd - newinitd "${FILESDIR}"/2.0/slurpd slurpd - newconfd "${FILESDIR}"/2.0/slapd.conf slapd - - if [ $(get_libdir) != lib ]; then - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"/etc/init.d/{slapd,slurpd} - fi - - # install contributed modules - docinto / - if [ -e "${S}"/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ]; - then - cd "${S}"/contrib/slapd-modules/dsaschema/ - newdoc README README.contrib.dsaschema - exeinto /usr/$(get_libdir)/openldap/openldap - doexe libdsaschema-plugin.so || \ - die "failed to install dsaschema module" - fi - if [ -e "${S}"/contrib/slapd-modules/passwd/pw-kerberos.so ]; then - cd "${S}"/contrib/slapd-modules/passwd/ - newdoc README README.contrib.passwd - exeinto /usr/$(get_libdir)/openldap/openldap - doexe pw-kerberos.so || \ - die "failed to install kerberos passwd module" - fi - if [ -e "${S}"/contrib/slapd-modules/passwd/pw-netscape.so ]; then - cd "${S}"/contrib/slapd-modules/passwd/ - newdoc README README.contrib.passwd - exeinto /usr/$(get_libdir)/openldap/openldap - doexe "${S}"/contrib/slapd-modules/passwd/pw-netscape.so || \ - die "failed to install Netscape MTA-MD5 passwd module" - fi - if [ -e "${S}"/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then - cd "${S}"/contrib/slapd-modules/smbk5pwd - newdoc README.contrib.smbk5pwd - libexecdir="/usr/$(get_libdir)/openldap" \ - emake DESTDIR="${D}" install-mod || \ - die "failed to install smbk5pwd overlay module" - fi - if [ -e "${S}"/contrib/slapd-tools/statslog ]; then - cd "${S}"/contrib/slapd-tools - exeinto /usr/bin - newexe statslog ldapstatslog || \ - die "failed to install ldapstatslog script" - fi - if [ -e "${S}"/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ]; - then - cd "${S}"/contrib/slapi-plugins/addrdnvalues - newdoc README README.contrib.addrdnvalues - exeinto /usr/$(get_libdir)/openldap/openldap - doexe libaddrdnvalues-plugin.so || \ - die "failed to install addrdnvalues plugin" - fi - - fi - - # install MDK's ssl cert script - if use ssl || use samba; then - dodir /etc/openldap/ssl - exeinto /etc/openldap/ssl - doexe "${FILESDIR}"/gencert.sh - fi - - # keep old libs if any - LIBSUFFIXES=".so.2.0.130 -2.2.so.7" - for LIBSUFFIX in ${LIBSUFFIXES} ; do - for each in lber libldap libldap_r ; do - preserve_old_lib "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}" - done - done -} - -pkg_postinst() { - if use ssl; then - # make a self-signed ssl cert (if there isn't one there already) - if [ ! -e /etc/openldap/ssl/ldap.pem ] - then - cd /etc/openldap/ssl - yes "" | sh gencert.sh - chmod 640 ldap.pem - chown root:ldap ldap.pem - else - einfo - einfo "An LDAP cert already appears to exist, no creating" - einfo - fi - fi - 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,slurp} - - if use ssl; then - ewarn - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT never' if you want to use them." - ewarn - fi - - # Reference inclusion bug #77330 - echo - einfo - einfo "Getting started using OpenLDAP? There is some documentation available:" - einfo "Gentoo Guide to OpenLDAP Authentication" - einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - einfo - - # note to bug #110412 - echo - einfo - einfo "An example file for tuning BDB backends with openldap is:" - einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz" - einfo - - LIBSUFFIXES=".so.2.0.130 -2.2.so.7" - for LIBSUFFIX in ${LIBSUFFIXES} ; do - for each in lber libldap libldap_r ; do - preserve_old_lib_notify "${ROOT}usr/$(get_libdir)/${each}${LIBSUFFIX}" - done - done -} -- 2.26.2