Revbump to fix docert accidentally re-introduced in .40

Package-Manager: portage-2.1.4_rc14

4 files changed, 31 insertions, 17 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 6fea8ed4066b..c8ad0816fbdd 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.303 2008/01/09 17:27:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.304 2008/01/09 23:14:25 jokey Exp $
+
+*openldap-2.3.40-r1 (09 Jan 2008)
+
+  09 Jan 2008; Markus Ullmann <jokey@gentoo.org> -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 <ranger@gentoo.org> openldap-2.3.39-r2.ebuild:
   Marking openldap-2.3.39-r2 ppc64 for bug 201690
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index f11f12cfa09d..5ddda26aeb72 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 MD5 d00ccd5b4b44ac1df463da80d5ebb8a1 files/DB_CONFIG.fast.example 746
 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 files/DB_CONFIG.fast.example 746
@@ -49,14 +52,14 @@ EBUILD openldap-2.3.39-r2.ebuild 17548 RMD160 f03d1601af1010b54aa2c6ec9399e2defc
 MD5 960ad145957223300228814621e98811 openldap-2.3.39-r2.ebuild 17548
 RMD160 f03d1601af1010b54aa2c6ec9399e2defc9f4a3d openldap-2.3.39-r2.ebuild 17548
 SHA256 08a5211f0336b374322d759aa356cc580c832d3bcffc216ee014579bb61fa1e8 openldap-2.3.39-r2.ebuild 17548
-EBUILD openldap-2.3.40.ebuild 17583 RMD160 9ea30c9574a0c4e0893854a054813bde472ed22d SHA1 2f87c024fbc3aef4b5619af53ce8231609ac4e0b SHA256 4c21947b451ca4d9291b43058f9ac8c68cd6bd97edbba95b6128a9178620aae0
-MD5 83d92dcee163ab1484858384cdf99e65 openldap-2.3.40.ebuild 17583
-RMD160 9ea30c9574a0c4e0893854a054813bde472ed22d openldap-2.3.40.ebuild 17583
-SHA256 4c21947b451ca4d9291b43058f9ac8c68cd6bd97edbba95b6128a9178620aae0 openldap-2.3.40.ebuild 17583
-MISC ChangeLog 51899 RMD160 c9d04f0aaef8975eaf88c863f6d84390933c37fe SHA1 9a39a8b7d4a46a32d1e45f395902481782f8adb6 SHA256 ecdfd010d422c8c3e61a66fe59156dd1a8dee7c58b55cd3678164214cf2b1edd
-MD5 324265b31714b80192021debbc90ebf9 ChangeLog 51899
-RMD160 c9d04f0aaef8975eaf88c863f6d84390933c37fe ChangeLog 51899
-SHA256 ecdfd010d422c8c3e61a66fe59156dd1a8dee7c58b55cd3678164214cf2b1edd ChangeLog 51899
+EBUILD openldap-2.3.40-r1.ebuild 17551 RMD160 3849ae7603b8232dc91298e2e74d873fb0961800 SHA1 576a4a142da9baad2ca6bfcb2b9bcd1a7418661a SHA256 6d28630f700e3df6b8e2fcd19eae546a347104d55d4ee228ac7fd32edf6977ce
+MD5 ad5b27809619e38a9816878e0f9707e8 openldap-2.3.40-r1.ebuild 17551
+RMD160 3849ae7603b8232dc91298e2e74d873fb0961800 openldap-2.3.40-r1.ebuild 17551
+SHA256 6d28630f700e3df6b8e2fcd19eae546a347104d55d4ee228ac7fd32edf6977ce openldap-2.3.40-r1.ebuild 17551
+MISC ChangeLog 52096 RMD160 6dc10614d000bfaad2892e6ed5f644c8dc49c228 SHA1 1b2f9b2d8559c4e0fc0a6ce06854811d683d90d5 SHA256 86c7f90a2e98265582bfc6c0f4cd70d5443f384d7c5a25046672c071b767c4c0
+MD5 57a55d61ecfbb8c7b46a68c2180daa30 ChangeLog 52096
+RMD160 6dc10614d000bfaad2892e6ed5f644c8dc49c228 ChangeLog 52096
+SHA256 86c7f90a2e98265582bfc6c0f4cd70d5443f384d7c5a25046672c071b767c4c0 ChangeLog 52096
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -70,6 +73,13 @@ SHA256 5a4ea847198a1ac267f0dce069599435e41114a7f5ef888c4848808bd84177e8 files/di
 MD5 2904d9d3df30c3fe329dbc5f2229d528 files/digest-openldap-2.3.39-r2 241
 RMD160 31170ae8b40bd657e6feb04b3f89743f91746642 files/digest-openldap-2.3.39-r2 241
 SHA256 5a4ea847198a1ac267f0dce069599435e41114a7f5ef888c4848808bd84177e8 files/digest-openldap-2.3.39-r2 241
-MD5 706f1d79627fe43c0a2ef96c4eec275b files/digest-openldap-2.3.40 241
-RMD160 6bc43c6fe3dfc5f873286dd1c4e48b10020c5842 files/digest-openldap-2.3.40 241
-SHA256 5680af4fc8b0376dd0adb7f566cc4661a22d3c6c97cb233dd9f986fbe102a977 files/digest-openldap-2.3.40 241
+MD5 706f1d79627fe43c0a2ef96c4eec275b files/digest-openldap-2.3.40-r1 241
+RMD160 6bc43c6fe3dfc5f873286dd1c4e48b10020c5842 files/digest-openldap-2.3.40-r1 241
+SHA256 5680af4fc8b0376dd0adb7f566cc4661a22d3c6c97cb233dd9f986fbe102a977 files/digest-openldap-2.3.40-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHhVVaz974XjDVpbkRAomQAJ4iSdQvZKQkbQVGSsoPjRBdsdczwACg0UuV
+PS1HhSATNrAnyp24ka8JgyQ=
+=41IA
+-----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/digest-openldap-2.3.40 b/net-nds/openldap/files/digest-openldap-2.3.40-r1
index ac1b2837a116..ac1b2837a116 100644
--- a/net-nds/openldap/files/digest-openldap-2.3.40
+++ b/net-nds/openldap/files/digest-openldap-2.3.40-r1
diff --git a/net-nds/openldap/openldap-2.3.40.ebuild b/net-nds/openldap/openldap-2.3.40-r1.ebuild
index 8ae083514a9f..d9a3085088e1 100644
--- a/net-nds/openldap/openldap-2.3.40.ebuild
+++ b/net-nds/openldap/openldap-2.3.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40.ebuild,v 1.1 2008/01/06 09:32:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.1 2008/01/09 23:14:25 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -474,10 +474,8 @@ pkg_postinst() {
 		# and a misconfiguration if multiple machines use the same key and cert.
 		# Additionally, it overwrites
 		if use ssl; then
-			insinto /etc/openldap/ssl
-			insopts -m0644 -o ldap -g ldap
-			docert ldap
-			##fowners ldap:ldap /etc/openldap/ssl/ldap.*
+			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."