Version bump

Package-Manager: portage-2.1.2.3

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 172d1bd11f005f5898f561bb5f12a9ca8f78ce5d..e73d17e444bdedf6fc10d1ba781b010313e76e34 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.262 2007/04/06 11:09:40 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.263 2007/04/10 16:38:53 jokey Exp $
+
+*openldap-2.3.35 (10 Apr 2007)
+
+  10 Apr 2007; Markus Ullmann <jokey@gentoo.org> -openldap-2.3.34.ebuild,
+  +openldap-2.3.35.ebuild:
+  Version bump
 
   06 Apr 2007; Markus Ullmann <jokey@gentoo.org> -openldap-2.3.33.ebuild:
   Drop old version

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fc241f9e581fa1df07a9d9b6f657a2b3b211953a..f7ef17f69f46333ef5b9d1d9988d130f5ea3fd6b 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -40,6 +40,7 @@ SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff files/sl
 DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA1 0b3a3b9b61f6f033685218957fb84ba1d58887de SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba
 DIST openldap-2.3.30.tgz 3763533 RMD160 4cafe33efcc1cf3baedc73a89f115a659407a710 SHA1 99dd73df2bdf3ac303b2a81ee2c689a2ee09e13a SHA256 3b27a5666dbe4584612be443bfa636238a48f3c16a4dc8f43d59171e8697687b
 DIST openldap-2.3.34.tgz 3791412 RMD160 78d01bb09bc2c0e3cc55cce96239072fa5641847 SHA1 f56fb1e2ef150d09f9b4aa8af9f47015de71d5a8 SHA256 be1e258de7bb15969ede7dfc0f0dc163b337393846d872be6c9f3fb87b8d0f0e
+DIST openldap-2.3.35.tgz 3795444 RMD160 a00bdfbb34071ff11a9ba9c10a92bb738d29223d SHA1 aec609f4538bc05083d02fce04c3b3338686c1a0 SHA256 87342ccb4844ff2fb77af1bc9bb7f419caa24c148842a97fc5af7c3fc0d5997a
 DIST openldap-compatversions-patchset-1.0.tar.bz2 10547 RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c SHA1 eb6dfb169023e88f08ee93baabcf9293bc29e5f5 SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26
 EBUILD openldap-2.2.28-r7.ebuild 11822 RMD160 9ac18b128cbe7071cf978ed0cd007f9efaebc0fc SHA1 5d986ee8f6796143ae73e4e5d0c724f4ea21cb35 SHA256 e34b9bc86ebba150dc0e3efe4683521d1c401c47071d2201261576a971804b7c
 MD5 4a152c367b4d24500803167848e30a6d openldap-2.2.28-r7.ebuild 11822
@@ -53,14 +54,14 @@ EBUILD openldap-2.3.34-r1.ebuild 16572 RMD160 37120a930924dec1d38207ffb551ab6faa
 MD5 824e55b96cacd4aab40ee745cf4054c2 openldap-2.3.34-r1.ebuild 16572
 RMD160 37120a930924dec1d38207ffb551ab6faa789865 openldap-2.3.34-r1.ebuild 16572
 SHA256 3370b652beb02feac93cd8e8c3e99247fc81fc2128e54b17f9ca6d7644d9f3b6 openldap-2.3.34-r1.ebuild 16572
-EBUILD openldap-2.3.34.ebuild 16354 RMD160 5b671d299972cb62625d1b83b345b96f79e95679 SHA1 00f78c7c16803a5e85d0d9170eb3dedada3b8aae SHA256 24578705b253a0a60cb54cbab501be9c699651a843a837d81ae8f5261a3c289e
-MD5 8d89d0d955daf4f158a2c7a0ea1782b8 openldap-2.3.34.ebuild 16354
-RMD160 5b671d299972cb62625d1b83b345b96f79e95679 openldap-2.3.34.ebuild 16354
-SHA256 24578705b253a0a60cb54cbab501be9c699651a843a837d81ae8f5261a3c289e openldap-2.3.34.ebuild 16354
-MISC ChangeLog 46547 RMD160 4c4efce2b41a59f1cd2c5dba8ae6701b7ce87e69 SHA1 65b1215d10b810f61c6d08631882cf9df050e685 SHA256 341679ec45db6fe282d68c5e60caaf1b80aa53055da9ee6f9198b5662a8e9f47
-MD5 7a6bc132fc7ac9f478d0a43a21395374 ChangeLog 46547
-RMD160 4c4efce2b41a59f1cd2c5dba8ae6701b7ce87e69 ChangeLog 46547
-SHA256 341679ec45db6fe282d68c5e60caaf1b80aa53055da9ee6f9198b5662a8e9f47 ChangeLog 46547
+EBUILD openldap-2.3.35.ebuild 16569 RMD160 c25904aa2ed3a5980558a8c1328b6dc12edf891c SHA1 3a642a63fc180674cf02f0335ac4edd615835625 SHA256 5a62fbc1ab51a3afd325d0058569f8845fa60a1aa9d6d50234608d9190b0da78
+MD5 176de051e9fb28f43850c3ee6e5a7f36 openldap-2.3.35.ebuild 16569
+RMD160 c25904aa2ed3a5980558a8c1328b6dc12edf891c openldap-2.3.35.ebuild 16569
+SHA256 5a62fbc1ab51a3afd325d0058569f8845fa60a1aa9d6d50234608d9190b0da78 openldap-2.3.35.ebuild 16569
+MISC ChangeLog 46696 RMD160 db4ed1d52a441788f718495d6f6fa98eec90fde8 SHA1 8e934caacb80d702cc8e79f0b9143029e794279e SHA256 97cdb6d88eafeec0e6ec4b1150a5437daf8b4222e4c32be0f269d5dfd7662776
+MD5 cdb152e298548c63df14f92f7500a66e ChangeLog 46696
+RMD160 db4ed1d52a441788f718495d6f6fa98eec90fde8 ChangeLog 46696
+SHA256 97cdb6d88eafeec0e6ec4b1150a5437daf8b4222e4c32be0f269d5dfd7662776 ChangeLog 46696
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -71,16 +72,16 @@ SHA256 61bde84c81976ceb65369263a2ed306e0ce296f57b832a15dad2d5f57fd5fc22 files/di
 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 a36a4d5b98e1e91f51e0cc934be7bb0f files/digest-openldap-2.3.34 241
-RMD160 7443a8589b0719ed79fadb01a2d9cd30bfff56a9 files/digest-openldap-2.3.34 241
-SHA256 556c93efd750d5e3b35ff047b524c5bf7dddb0f8fecd6992adf9e6b1606f1a99 files/digest-openldap-2.3.34 241
 MD5 a36a4d5b98e1e91f51e0cc934be7bb0f files/digest-openldap-2.3.34-r1 241
 RMD160 7443a8589b0719ed79fadb01a2d9cd30bfff56a9 files/digest-openldap-2.3.34-r1 241
 SHA256 556c93efd750d5e3b35ff047b524c5bf7dddb0f8fecd6992adf9e6b1606f1a99 files/digest-openldap-2.3.34-r1 241
+MD5 a388cf08477b2b60be0268438bb033da files/digest-openldap-2.3.35 241
+RMD160 b0b69c11bfaf606472359bc108cc41e849683404 files/digest-openldap-2.3.35 241
+SHA256 73e68dc4e31d77ea8ba22dee4737fa0a148a952041d8452aa46a4933fd1940a2 files/digest-openldap-2.3.35 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFip5z974XjDVpbkRAlldAJ4jGYAaI+dLmZXrpWCSZ9MHe5O+9wCguGP3
-3TMyD+BnkkDBgi4o0K1+DJQ=
-=VGJa
+iD8DBQFGG72qz974XjDVpbkRAm1QAKCd+L1bQHxucgHXpESoA756Bm5vmwCgouUB
+ltMrLpwmPZgwtUIpNEX8h+E=
+=fHbj
 -----END PGP SIGNATURE-----

diff --git a/net-nds/openldap/files/digest-openldap-2.3.34 b/net-nds/openldap/files/digest-openldap-2.3.34
deleted file mode 100644 (file)
index 8e1a422..0000000
--- a/net-nds/openldap/files/digest-openldap-2.3.34
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 143eeb6e3c163e5f52d8e744b43a5960 openldap-2.3.34.tgz 3791412
-RMD160 78d01bb09bc2c0e3cc55cce96239072fa5641847 openldap-2.3.34.tgz 3791412
-SHA256 be1e258de7bb15969ede7dfc0f0dc163b337393846d872be6c9f3fb87b8d0f0e openldap-2.3.34.tgz 3791412

diff --git a/net-nds/openldap/files/digest-openldap-2.3.35 b/net-nds/openldap/files/digest-openldap-2.3.35
new file mode 100644 (file)
index 0000000..68f1de4
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.3.35
@@ -0,0 +1,3 @@
+MD5 91ae33b88bce17a48743da35a0aa04fd openldap-2.3.35.tgz 3795444
+RMD160 a00bdfbb34071ff11a9ba9c10a92bb738d29223d openldap-2.3.35.tgz 3795444
+SHA256 87342ccb4844ff2fb77af1bc9bb7f419caa24c148842a97fc5af7c3fc0d5997a openldap-2.3.35.tgz 3795444

diff --git a/net-nds/openldap/openldap-2.3.34.ebuild b/net-nds/openldap/openldap-2.3.35.ebuild
similarity index 90%
rename from net-nds/openldap/openldap-2.3.34.ebuild
rename to net-nds/openldap/openldap-2.3.35.ebuild
index 86413bf6547d6881af2d0000daf3d17fe5f3652e..fe52989b399764b215c26a1ced160be398a6fe56 100644 (file)
--- a/net-nds/openldap/openldap-2.3.34.ebuild
+++ b/net-nds/openldap/openldap-2.3.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.34.ebuild,v 1.1 2007/03/26 22:58:34 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.35.ebuild,v 1.1 2007/04/10 16:38:53 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -246,17 +246,17 @@ src_compile() {
                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`"
+               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} $(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`"
+               myconf="${myconf} $(use_with samba lmpasswd)"
                # slapd overlay options
                myconf="${myconf} --enable-dyngroup --enable-proxycache"
-               myconf="${myconf} `use_enable overlays`"
+               use overlays && myconf="${myconf} --enable-overlays=mod"
        else
                myconf="${myconf} --disable-slapd --disable-slurpd"
                myconf="${myconf} --disable-bdb --disable-ldbm"
@@ -269,9 +269,9 @@ src_compile() {
        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`"
+       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)
@@ -367,9 +367,9 @@ src_install() {
 
        # 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
+       #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
@@ -377,13 +377,23 @@ src_install() {
        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 # <kbyte> <min>" -i "${D}"/${f}
-                       fowners root:ldap ${f}
-                       fperms 0640 ${f}
+               # use our config
+               rm "${D}"etc/openldap/slapd.con*
+               insinto /etc/openldap
+               newins "${FILESDIR}"/${P}-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-initd slapd
@@ -391,7 +401,7 @@ src_install() {
                newconfd "${FILESDIR}"/slapd-confd slapd
 
                if [ $(get_libdir) != lib ]; then
-                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"/etc/init.d/{slapd,slurpd}
+                       sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/{slapd,slurpd}
                fi
 
                # install contributed modules
@@ -420,7 +430,7 @@ src_install() {
                fi
                if [ -e "${S}"/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
                        cd "${S}"/contrib/slapd-modules/smbk5pwd
-                       newdoc README.contrib.smbk5pwd
+                       newdoc README README.contrib.smbk5pwd
                        libexecdir="/usr/$(get_libdir)/openldap" \
                        emake DESTDIR="${D}" install-mod || \
                        die "failed to install smbk5pwd overlay module"
@@ -440,6 +450,14 @@ src_install() {
                        die "failed to install addrdnvalues plugin"
                fi
 
+               #do ssl cert magic
+               if use ssl; then
+                       insinto /etc/openldap/ssl
+                       docert ldap
+                       fowners ldap:ldap /etc/openldap/ssl/ldap.*
+                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+                       ewarn "add 'TLS_REQCERT never' if you want to use them."
+               fi
        fi
 }
 
@@ -454,19 +472,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if ! use minimal ; then
-               if use ssl; then
-                       insinto /etc/openldap/ssl
-                       docert ldap
-                       ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-                       ewarn "add 'TLS_REQCERT never' if you want to use them."
-               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}
-       fi
 
        # Reference inclusion bug #77330
        echo