backport upstream patch from git, see https://bugzilla.redhat.com/show_bug.cgi?id=617629

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 308 insertions, 6 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.2.5.ebuild b/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild
index f04ba0c9cb42..00ec681f0601 100644
--- a/net-nds/389-ds-base/389-ds-base-1.2.5.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.5.ebuild,v 1.1 2010/07/23 15:15:53 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild,v 1.1 2010/07/28 13:57:00 lxnay Exp $
 
 EAPI=2
 
@@ -67,6 +67,10 @@ src_prepare() {
 	sed -i '/^nsslapd-allow-unauthenticated-binds/ s/off/on/' "${S}"/ldap/ldif/template-dse.ldif.in || \
 		die "cannot tweak default setting: nsslapd-allow-unauthenticated-binds"
 
+	# Fix buggy .ldiff, see RedHat #617629
+	epatch "${FILESDIR}/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch"
+
+
 }
 
 src_configure() {
diff --git a/net-nds/389-ds-base/389-ds-base-1.2.6_rc3.ebuild b/net-nds/389-ds-base/389-ds-base-1.2.6_rc3-r1.ebuild
index 49a55e294691..fbcf05c3058d 100644
--- a/net-nds/389-ds-base/389-ds-base-1.2.6_rc3.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.2.6_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.6_rc3.ebuild,v 1.1 2010/07/07 14:31:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.6_rc3-r1.ebuild,v 1.1 2010/07/28 13:57:00 lxnay Exp $
 
 EAPI=2
 
@@ -67,6 +67,9 @@ src_prepare() {
 	sed -i '/^nsslapd-allow-unauthenticated-binds/ s/off/on/' "${S}"/ldap/ldif/template-dse.ldif.in || \
 		die "cannot tweak default setting: nsslapd-allow-unauthenticated-binds"
 
+	# Fix buggy .ldiff, see RedHat #617629
+	epatch "${FILESDIR}/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch"
+
 }
 
 src_configure() {
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index ec52e650c507..19a8e964135f 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-nds/389-ds-base
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.4 2010/07/23 15:15:53 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.5 2010/07/28 13:57:00 lxnay Exp $
+
+*389-ds-base-1.2.6_rc3-r1 (28 Jul 2010)
+*389-ds-base-1.2.5-r1 (28 Jul 2010)
+
+  28 Jul 2010; Fabio Erculiani <lxnay@gentoo.org> -389-ds-base-1.2.5.ebuild,
+  +389-ds-base-1.2.5-r1.ebuild, -389-ds-base-1.2.6_rc3.ebuild,
+  +389-ds-base-1.2.6_rc3-r1.ebuild,
+  +files/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch:
+  backport upstream patch from git, see
+  https://bugzilla.redhat.com/show_bug.cgi?id=617629
 
 *389-ds-base-1.2.5 (23 Jul 2010)
 
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index b7e728a33438..11a3c0ca4ab9 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-Bug-617629-Missing-aliases-in-new-schema-files.patch 10409 RMD160 d240bc3f39fe721af4eb7ed87f631b74895c91c1 SHA1 7d5926adffbddbce5ffd9f0b438db1968eeba726 SHA256 6766bfb8451d045923018aee3f1c86013c0c8c60457c959c2f9ad339ef5bf8c1
 AUX 1.2.6/selinux_gentoo.patch 410 RMD160 28cf3a3ecf9de2216af7f8b6b1da5b8420e78c14 SHA1 3641911617b1ed7103d2ac6ee5373d6e96889f17 SHA256 bf5935e7a4330bb88bb57058f26e44db57fc967a86d6f562243ec987846b879c
 AUX 1.2.6/selinux_makefile.patch 448 RMD160 a51d3a8fc81e4580984dd6e8ec89dcf5f9a8f66d SHA1 96f71c778609dcb1b8cde91757f55d3766f9d3d7 SHA256 ee4251bd1753696df385175a457c90a6e06f88eea8465e98a681d85b10bb81bc
 AUX 389-ds-snmp.initd 1076 RMD160 7a3be7745e7e7a6de675b40b56556bfacef76a9a SHA1 8d8cbaa5c288d7d2a4ec25a2d85b406336c37073 SHA256 0dccceef42e29b5f696fc241cccdb3641eca3d8e300aef13b13ba1a40f8382e1
@@ -6,7 +7,7 @@ AUX restart-dirsrv 577 RMD160 438df6a53eb0253a25371265ccb85662d0df408b SHA1 2ae8
 AUX start-dirsrv 299 RMD160 d09bf782fb2e926c36c380fb68b21677a88e27fc SHA1 a1337b080d1498a6ecf86fd602cfc9f5c4a18702 SHA256 38c03319a1fc44255e0a658a30a009b577e012fb67626b9c4fc497df8b98aeff
 DIST 389-ds-base-1.2.5.tar.bz2 2791116 RMD160 7bc4af77a66f19f1ee5ea2dfe6678e0d4b09993f SHA1 40340cdf1d1816c5a6b97acfb770c1f5ad6f7f4a SHA256 564fa7fb368d6b0dacd9b237aa515a48f57ae7395f191ba17867a5506cdc0a43
 DIST 389-ds-base-1.2.6.rc3.tar.bz2 2867964 RMD160 9d69aa27c8cd762eb3f483e6b10faa8c70239ae7 SHA1 9a13db5b890514172a0283d4225eea62ef20c5e3 SHA256 4aff1db07b111a2e650b25e48835a927b2e46d78c233f06ea8854a35f4979330
-EBUILD 389-ds-base-1.2.5.ebuild 5200 RMD160 76ed3bf5f7a02d623690b8bbe514b53cfad5ae1e SHA1 6bba5c26a44cc0633bcf89bd28f7796f7466243d SHA256 dcb40219408d6a42940bc6a8a61f77a5bc67370d1182227e91489ecf03714dfc
-EBUILD 389-ds-base-1.2.6_rc3.ebuild 5204 RMD160 3f340066482050303f9960c3cdc13b63f3ec1b58 SHA1 4e4853b1186ffff5e77d483482c4c7fab43a38f2 SHA256 dd73c029c71b225cc2b95e7ca7cc01dc5b956e5cffe8fff262dba153f1b650c1
-MISC ChangeLog 981 RMD160 4f490e695c5d8387d82adf90e314950072508ac5 SHA1 427bb3f6dafa1cffbd5515e6c083b7d303e8f6bd SHA256 58a5e02f0f134d79b52a9ac0902c91522f0ffd7b30168082df9ddf27321ea738
+EBUILD 389-ds-base-1.2.5-r1.ebuild 5325 RMD160 cd8114937e78dd6dfdffded8232b97ca0499e192 SHA1 d9a9b6cf2a66f3bdfd5b3c0141b95c2c3d6def46 SHA256 c9366b7fe94b548fa0025bb925b472c6e80cc346ac5e89c1c656c59eb945b1a1
+EBUILD 389-ds-base-1.2.6_rc3-r1.ebuild 5328 RMD160 177fa26e999f40dc21e4ce9fcdd21446b10d2cee SHA1 4ea571e48c339a955b04132e74714bc732467ca9 SHA256 fc23c68f3359177f7b18283b6bb82e4f1700d74ed3d3317319670e9e8075b4b8
+MISC ChangeLog 1396 RMD160 1e2d36d95780fe0af8e4c9d8b02a516b1177b01e SHA1 23c80d8651ec1d652cbe1336d4e0e8cf21eb61d7 SHA256 f807ab126a67a540e88acad317026882b6a2e4f8a8db2e36a4d6e64d36f924cc
 MISC metadata.xml 1070 RMD160 f31a4089eb70f9228378f1fb6dd69ae2942bc9a3 SHA1 5b58beab1b9e2a63c7378bdf9836683a888600de SHA256 b7bd4cba6afb6af7418c4c6467ef998cdcd381765de671462f15872d29fa4066
diff --git a/net-nds/389-ds-base/files/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch b/net-nds/389-ds-base/files/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch
new file mode 100644
index 000000000000..117d7751dcb6
--- /dev/null
+++ b/net-nds/389-ds-base/files/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch
@@ -0,0 +1,284 @@
+From 522cc3a0a06a3c1054f345801b0e9ed3ea5386e3 Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins@redhat.com>
+Date: Fri, 23 Jul 2010 16:03:51 -0600
+Subject: [PATCH] Bug 617629  - Missing aliases in new schema files
+
+https://bugzilla.redhat.com/show_bug.cgi?id=617629
+Resolves: bug 617629
+Bug Description: Missing aliases in new schema files
+Reviewed by: ???
+Branch: master
+Fix Description: add back the aliases we removed - added a new schema flag
+X-DEPRECATED - this is a quoted string containing a space separated list
+of the deprecated aliases for this attribute
+Platforms tested: RHEL5 x86_64
+Flag Day: no
+Doc impact: no
+---
+ ldap/schema/00core.ldif          |   60 ++++++++++++++++++++++---------------
+ ldap/schema/05rfc4524.ldif       |   30 +++++++++++-------
+ ldap/schema/06inetorgperson.ldif |    5 ++-
+ 3 files changed, 57 insertions(+), 38 deletions(-)
+
+diff --git a/ldap/schema/00core.ldif b/ldap/schema/00core.ldif
+index 3a02192..7f5dab6 100644
+--- a/ldap/schema/00core.ldif
++++ b/ldap/schema/00core.ldif
+@@ -317,26 +317,29 @@ attributeTypes: ( 2.5.4.15 NAME 'businessCategory'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.6 NAME 'c'
++attributeTypes: ( 2.5.4.6 NAME ( 'c' 'countryName' )
+   SUP name
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.11
+   SINGLE-VALUE
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'countryName' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.3 NAME 'cn'
++attributeTypes: ( 2.5.4.3 NAME ( 'cn' 'commonName' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'commonName' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.25 NAME 'dc'
++attributeTypes: ( 0.9.2342.19200300.100.1.25 NAME ( 'dc' 'domaincomponent' )
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+   SINGLE-VALUE
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'domaincomponent' )
+ #
+ ################################################################################
+ #
+@@ -356,10 +359,11 @@ attributeTypes: ( 2.5.4.27 NAME 'destinationIndicator'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.49 NAME 'distinguishedName'
++attributeTypes: ( 2.5.4.49 NAME ( 'distinguishedName' 'dn' )
+   EQUALITY distinguishedNameMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'dn' )
+ #
+ ################################################################################
+ #
+@@ -378,9 +382,10 @@ attributeTypes: ( 2.5.4.47 NAME 'enhancedSearchGuide'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.23 NAME 'facsimileTelephoneNumber'
++attributeTypes: ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' )
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.22
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'fax' )
+ #
+ ################################################################################
+ #
+@@ -418,9 +423,10 @@ attributeTypes: ( 2.5.4.25 NAME 'internationalISDNNumber'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.7 NAME 'l'
++attributeTypes: ( 2.5.4.7 NAME ( 'l' 'locality' 'localityname' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'locality localityname' )
+ #
+ ################################################################################
+ #
+@@ -430,15 +436,17 @@ attributeTypes: ( 2.5.4.31 NAME 'member'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.10 NAME 'o'
++attributeTypes: ( 2.5.4.10 NAME ( 'o' 'organizationname' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'organizationname' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.11 NAME 'ou'
++attributeTypes: ( 2.5.4.11 NAME ( 'ou' 'organizationalUnitName' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'organizationalUnitName' )
+ #
+ ################################################################################
+ #
+@@ -520,23 +528,26 @@ attributeTypes: ( 2.5.4.5 NAME 'serialNumber'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.4 NAME 'sn'
++attributeTypes: ( 2.5.4.4 NAME ( 'sn' 'surName' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'surName' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.8 NAME 'st'
++attributeTypes: ( 2.5.4.8 NAME ( 'st' 'stateOrProvinceName' )
+   SUP name
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'stateOrProvinceName' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 2.5.4.9 NAME 'street'
++attributeTypes: ( 2.5.4.9 NAME ( 'street' 'streetaddress' )
+   EQUALITY caseIgnoreMatch
+   SUBSTR caseIgnoreSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'streetaddress' )
+ #
+ ################################################################################
+ #
+@@ -566,11 +577,12 @@ attributeTypes: ( 2.5.4.12 NAME 'title'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.1 NAME 'uid'
++attributeTypes: ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' )
+   EQUALITY caseIgnoreMatch
+   SUBSTR caseIgnoreSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+-  X-ORIGIN 'RFC 4519' )
++  X-ORIGIN 'RFC 4519'
++  X-DEPRECATED 'userid' )
+ #
+ ################################################################################
+ #
+diff --git a/ldap/schema/05rfc4524.ldif b/ldap/schema/05rfc4524.ldif
+index e666368..ca6073a 100644
+--- a/ldap/schema/05rfc4524.ldif
++++ b/ldap/schema/05rfc4524.ldif
+@@ -28,11 +28,12 @@ attributeTypes: ( 0.9.2342.19200300.100.1.48 NAME 'buildingName'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.43 NAME 'co'
++attributeTypes: ( 0.9.2342.19200300.100.1.43 NAME ( 'co' 'friendlycountryname' )
+   EQUALITY caseIgnoreMatch
+   SUBSTR caseIgnoreSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'friendlycountryname' )
+ #
+ ################################################################################
+ #
+@@ -83,19 +84,21 @@ attributeTypes: ( 0.9.2342.19200300.100.1.13 NAME 'documentVersion'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.5 NAME 'drink'
++attributeTypes: ( 0.9.2342.19200300.100.1.5 NAME ( 'drink' 'favouriteDrink' )
+   EQUALITY caseIgnoreMatch
+   SUBSTR caseIgnoreSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'favouriteDrink' )
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME 'homePhone'
++attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME ( 'homePhone' 'homeTelephoneNumber' )
+   EQUALITY telephoneNumberMatch
+   SUBSTR telephoneNumberSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.50
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'homeTelephoneNumber' )
+ #
+ ################################################################################
+ #
+@@ -123,11 +126,12 @@ attributeTypes: ( 0.9.2342.19200300.100.1.4 NAME 'info'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.3 NAME 'mail'
++attributeTypes: ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822mailbox' )
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'rfc822mailbox' )
+ #
+ ################################################################################
+ #
+@@ -138,11 +142,12 @@ attributeTypes: ( 0.9.2342.19200300.100.1.10 NAME 'manager'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.41 NAME 'mobile'
++attributeTypes: ( 0.9.2342.19200300.100.1.41 NAME ( 'mobile' 'mobileTelephoneNumber' )
+   EQUALITY telephoneNumberMatch
+   SUBSTR telephoneNumberSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.50
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'mobileTelephoneNumber' )
+ #
+ ################################################################################
+ #
+@@ -154,11 +159,12 @@ attributeTypes: ( 0.9.2342.19200300.100.1.45 NAME 'organizationalStatus'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 0.9.2342.19200300.100.1.42 NAME 'pager'
++attributeTypes: ( 0.9.2342.19200300.100.1.42 NAME ( 'pager' 'pagerTelephoneNumber' )
+   EQUALITY telephoneNumberMatch
+   SUBSTR telephoneNumberSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.50
+-  X-ORIGIN 'RFC 4524' )
++  X-ORIGIN 'RFC 4524'
++  X-DEPRECATED 'pagerTelephoneNumber' )
+ #
+ ################################################################################
+ #
+diff --git a/ldap/schema/06inetorgperson.ldif b/ldap/schema/06inetorgperson.ldif
+index 9eb9765..96474f2 100644
+--- a/ldap/schema/06inetorgperson.ldif
++++ b/ldap/schema/06inetorgperson.ldif
+@@ -109,11 +109,12 @@ attributeTypes: ( 0.9.2342.19200300.100.1.7 NAME 'photo'
+ #
+ ################################################################################
+ #
+-attributeTypes: ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI'
++attributeTypes: ( 1.3.6.1.4.1.250.1.57 NAME ( 'labeledURI' 'labeledurl' )
+   EQUALITY caseExactMatch
+   SUBSTR caseExactSubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+-  X-ORIGIN 'RFC 2079' )
++  X-ORIGIN 'RFC 2079'
++  X-DEPRECATED 'labeledurl' )
+ #
+ ################################################################################
+ #
+-- 
+1.5.5.6
+