More docs for 2.2 upgrade, fix slight glitch in slapd.conf.

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index b4840cf1ed8ff2640447e67e26503a30cc117df4..8b0ac843cc1c4f9adfc6b2ac47139eb4dd4c9105 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.92 2004/12/02 04:54:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.93 2004/12/07 06:35:00 robbat2 Exp $
+
+  06 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.2.14.ebuild, openldap-2.2.19.ebuild:
+  More docs for 2.2 upgrade, fix slight glitch in slapd.conf.
 
 *openldap-2.1.30-r4 (01 Dec 2004)
 

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index e85a4760e076390a1c2dafbfea485ef269a0b13c..8000af5658c82ee990dd5b7e3f968de2f722fbae 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,13 +1,16 @@
-MD5 e713e1190322c83f334f3044f698272e openldap-2.1.30-r3.ebuild 7189
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab4b7c6b32406f758b481dd2d9bae9c6 openldap-2.1.30-r3.ebuild 7209
 MD5 fcf2498fd5a5126d7e735603e54e45fa openldap-2.1.27.ebuild 7057
 MD5 456232c9bd2a5921a3e34f9cef26f67b openldap-2.1.30-r2.ebuild 7485
-MD5 05e5df131face418a198bf100b84fe6b openldap-2.1.30-r4.ebuild 7257
-MD5 534a92ecf8f0d7eae6f97d22d24ec4f1 openldap-2.2.19.ebuild 7797
-MD5 d94f2359d8d95ddb1b4d2fd2bd490037 openldap-2.2.14.ebuild 7257
+MD5 a37218f28166d09192ec6d94fb78cdca openldap-2.1.30-r4.ebuild 7278
+MD5 3e935052931394e2e3797107fabb18e2 openldap-2.2.19.ebuild 7979
+MD5 5379787c408ca43732cc3ab371d2def7 openldap-2.2.14.ebuild 7271
 MD5 ba77f306a8d0cb13ba801e10323ca35e openldap-2.1.30.ebuild 7367
 MD5 d47b63342e600ae59e64d6b867333590 openldap-2.1.26.ebuild 7096
 MD5 c199a7e5a277675e2b872ab356bd7b3c openldap-2.1.30-r1.ebuild 7382
-MD5 8e57db5a1cfafa6404ac52c840e3a7ca ChangeLog 17990
+MD5 283f9f29e456f76451cff356ddafddc8 ChangeLog 18212
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
 MD5 6287c43754f97e597792e66d4a0d0152 openldap-2.1.27-r1.ebuild 7451
 MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
@@ -31,3 +34,11 @@ MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patc
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
 MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFBtU+SPpIsIjIzwiwRAii/AKCXDm5Rlod5ANCqjK0zUsg+iD7PTACcDY/Y
+e/FbsiUj76gr9xxaBOAhkHM=
+=VSPy
+-----END PGP SIGNATURE-----

diff --git a/net-nds/openldap/openldap-2.1.30-r3.ebuild b/net-nds/openldap/openldap-2.1.30-r3.ebuild
index a948aeef4b6c862b62af8d20ee56956f7eafceb0..e7b3c9e3d2f2044b97a385ec843348bbd5e1e8ad 100644 (file)
--- a/net-nds/openldap/openldap-2.1.30-r3.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r3.ebuild,v 1.1 2004/08/22 20:23:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r3.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -138,10 +138,10 @@ src_compile() {
 
        make depend || die "make depend failed"
        make || die "make failed"
-
 }
 
 src_test() {
+       einfo "Doing tests"
        cd tests ; make tests || die "make tests failed"
 }
 

diff --git a/net-nds/openldap/openldap-2.1.30-r4.ebuild b/net-nds/openldap/openldap-2.1.30-r4.ebuild
index 1a62b292adf4cd9ac77abd890ad322d518f8ded1..e812035c510398b6482ae539a37b30132212b7c5 100644 (file)
--- a/net-nds/openldap/openldap-2.1.30-r4.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r4.ebuild,v 1.1 2004/12/02 04:54:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r4.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -143,6 +143,7 @@ src_compile() {
 }
 
 src_test() {
+       einfo "Doing tests"
        cd tests ; make tests || die "make tests failed"
 }
 

diff --git a/net-nds/openldap/openldap-2.2.14.ebuild b/net-nds/openldap/openldap-2.2.14.ebuild
index 04992f7a2100926417a60311aad0f15e5208c6c9..badaa5db8fcbbd480eca1a99701c74119bde4b15 100644 (file)
--- a/net-nds/openldap/openldap-2.2.14.ebuild
+++ b/net-nds/openldap/openldap-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.14.ebuild,v 1.2 2004/08/22 20:23:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.14.ebuild,v 1.3 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -11,9 +11,8 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
-KEYWORDS="-*"
 #In portage for testing only
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 s390 hppa ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
        >=sys-apps/sed-4
@@ -145,6 +144,7 @@ src_compile() {
 }
 
 src_test() {
+       einfo "Doing tests"
        cd tests ; make tests || die "make tests failed"
 }
 
@@ -172,7 +172,7 @@ src_install() {
        fowners ldap:ldap /var/run/openldap
        fperms 0755 /var/run/openldap
        for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-               sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+               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}

diff --git a/net-nds/openldap/openldap-2.2.19.ebuild b/net-nds/openldap/openldap-2.2.19.ebuild
index f15bd416f0c14c37661baafdc93c94ca085c2efa..fd14ca7c05eaf42fe61d7b8cdf7f886f09147dca 100644 (file)
--- a/net-nds/openldap/openldap-2.2.19.ebuild
+++ b/net-nds/openldap/openldap-2.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.19.ebuild,v 1.1 2004/12/02 04:39:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.19.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 ~s390 ~hppa ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
        >=sys-apps/sed-4
@@ -28,12 +28,13 @@ DEPEND=">=sys-libs/ncurses-5.1
 # We do NOT support major version upgrades yet
 # required process is:
 # 1. stop slapd/slurpd
-# 2. slapcat -l file
+# 2. slapcat -l file ## THIS WILL NOT WORK AFTER THE EMERGE, YOU MUST DO IT WITH THE OLD VERSION
 # 3. egrep -v '^entryCSN:' file >file.new ## are any other changes required?
-# 4. unmerge openldap-2.1
-# 5. emerge openldap-2.2
-# 6. etc-update # !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
+# 4. emerge unmerge '<=net-nds/openldap-2.1*'
+# 5. emerge '>=net-nds/openldap-2.2'
+# 6. etc-update ## !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
 # 7. slapadd -l file.new
+# 8. chown ldap:ldap /var/lib/openldap-data/*
 # 8. start slapd again, set up new replication system maybe
 DEPEND="${DEPEND} !<net-nds/openldap-2.2"
 
@@ -155,6 +156,7 @@ src_compile() {
 }
 
 src_test() {
+       einfo "Doing tests"
        cd tests ; make tests || die "make tests failed"
 }
 
@@ -182,7 +184,7 @@ src_install() {
        fowners ldap:ldap /var/run/openldap
        fperms 0755 /var/run/openldap
        for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-               sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+               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}