Added a patch for a bad rfc and a comment re: upgrading from slapd that ran as root

3 files changed, 55 insertions, 3 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 6dacca11adb1..5cb4e90f05ad 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -3,8 +3,8 @@ MD5 1c1807843ba9fc5cc3dd9a51e9f9c5d2 openldap-2.1.22.ebuild 6076
 MD5 405655723adfa7c4470f1984f5463dd1 openldap-2.0.27.ebuild 2325
 MD5 6b611092dd59bc62ddba9578e60e23b2 openldap-2.0.25-r1.ebuild 2530
 MD5 5f9e081b9be4ec33dea8b4d169d2ed2b openldap-2.1.21.ebuild 5295
-MD5 d14af386d7e337e652e7ed6bc98269ea ChangeLog 10584
-MD5 a3148e3d9016ecd9a49e642269d35163 openldap-2.0.27-r4.ebuild 6424
+MD5 7fa9f68adc7705bb8730dad1d70a56b0 ChangeLog 10584
+MD5 089c7801a5a41d87c1878d1fce7b3cb4 openldap-2.0.27-r4.ebuild 6425
 MD5 646fd34831ae403ecda2103b01f49a0f files/slapd-2.1.conf 278
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r2 65
diff --git a/net-nds/openldap/files/rfc2252-bork.patch b/net-nds/openldap/files/rfc2252-bork.patch
new file mode 100644
index 000000000000..d0a201fb2634
--- /dev/null
+++ b/net-nds/openldap/files/rfc2252-bork.patch
@@ -0,0 +1,39 @@
+diff -urN openldap-2.0.27/doc/rfc/rfc2252.txt openldap-2.0.27-modified/doc/rfc/rfc2252.txt
+--- openldap-2.0.27/doc/rfc/rfc2252.txt	1998-10-27 19:02:11.000000000 -0600
++++ openldap-2.0.27-modified/doc/rfc/rfc2252.txt	2003-07-23 13:49:04.000000000 -0500
+@@ -1027,12 +1027,12 @@
+ 
+ 6.11. DIT Content Rule Description
+ 
++   ( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DIT Content Rule Description' )
+ 
+-   ues in this syntax are encoded according to the following BNF.
+-   lementors should note that future versions of this document
+-    have expanded this BNF to include additional terms.
++   Values in this syntax are encoded according to the following BNF.
++   Implementors should note that future versions of this document may
++   have expanded this BNF to include additional terms.
+ 
+-    0
+ 
+       DITContentRuleDescription = "("
+           numericoid   ; Structural ObjectClass identifier
+@@ -1045,9 +1045,8 @@
+           [ "NOT" oids ]    ; AttributeType identifiers
+          ")"
+ 
+-    0 2. Facsimile Telephone Number
++6.12. Facsimile Telephone Number
+ 
+-    3
+ 
+    ( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'Facsimile Telephone Number' )
+ 
+@@ -1063,6 +1062,7 @@
+ 
+ 
+ 
++
+ Wahl, et. al.               Standards Track                    [Page 19]
+ 
+ RFC 2252                   LADPv3 Attributes               December 1997
diff --git a/net-nds/openldap/openldap-2.0.27-r4.ebuild b/net-nds/openldap/openldap-2.0.27-r4.ebuild
index 95d3ad6cbea5..33e29f878ab0 100644
--- a/net-nds/openldap/openldap-2.0.27-r4.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r4.ebuild,v 1.9 2003/07/13 23:35:09 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r4.ebuild,v 1.10 2003/07/23 19:11:11 raker Exp $
 
 inherit eutils
 
@@ -61,15 +61,21 @@ pkg_preinst() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	# never worked anyway ?
 	epatch ${FILESDIR}/kerberos-2.0.diff.bz2
+
 	# force the use of db3 only, db4 has api breakages
 	epatch ${FILESDIR}/${P}-db3-gentoo.patch
+
 	# 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 -ie 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' ${S}/servers/slapd/Makefile.in
+
+	# rfc2252 has some missing characters...
+	epatch ${FILESDIR}/rfc2252-bork.patch
 }
 
 src_compile() {
@@ -210,4 +216,11 @@ pkg_postinst() {
 		einfo "SASL1=yes emerge net-nds/openldap"
 		einfo ""
 	fi
+
+	ewarn ""
+	ewarn "slapd is no longer running as root!"
+	ewarn "If you have upgraded from a previous ebuild you may find problems"
+	ewarn "Make sure your ldap databases are chown ldap:ldap"
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=24790 for more info"
+	ewarn ""
 }