From c73396995f8977c304954a799d7712fbd2893f6e Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Mon, 26 Mar 2007 23:10:29 +0000 Subject: [PATCH] Drop 2.1 Package-Manager: portage-2.1.2.2 --- net-nds/openldap/ChangeLog | 6 +- net-nds/openldap/Manifest | 22 +- .../openldap/files/digest-openldap-2.1.30-r10 | 6 - net-nds/openldap/openldap-2.1.30-r10.ebuild | 239 ------------------ 4 files changed, 12 insertions(+), 261 deletions(-) delete mode 100644 net-nds/openldap/files/digest-openldap-2.1.30-r10 delete mode 100644 net-nds/openldap/openldap-2.1.30-r10.ebuild diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index d63e15000f80..a9b8d6df7359 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # 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.259 2007/03/26 22:58:34 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.260 2007/03/26 23:10:29 jokey Exp $ + + 26 Mar 2007; Markus Ullmann + -openldap-2.1.30-r10.ebuild: + Drop 2.1 *openldap-2.3.34 (26 Mar 2007) diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index b79c74465eab..872b7487843c 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -33,16 +33,11 @@ AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a MD5 ba44f1a0e62cb88c68aa64e4a39847fa files/slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 files/slurpd-initd 494 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff files/slurpd-initd 494 -DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831 SHA1 c036f88abbafc16cb64c4e00ccc1c65563864755 SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 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.33.tgz 3787010 RMD160 b06c7a566d2b2673b479343efa32e8f852541f43 SHA1 594421dc510adb0bc80262b17fff20c113472609 SHA256 c0f14356b77858d52ab47306fd908d7e99159956c3fabb48ca6d8fb127372c4f DIST openldap-2.3.34.tgz 3791412 RMD160 78d01bb09bc2c0e3cc55cce96239072fa5641847 SHA1 f56fb1e2ef150d09f9b4aa8af9f47015de71d5a8 SHA256 be1e258de7bb15969ede7dfc0f0dc163b337393846d872be6c9f3fb87b8d0f0e DIST openldap-compatversions-patchset-1.0.tar.bz2 10547 RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c SHA1 eb6dfb169023e88f08ee93baabcf9293bc29e5f5 SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26 -EBUILD openldap-2.1.30-r10.ebuild 7959 RMD160 512a700af709c151054b35acbe68dd944e6937b3 SHA1 4c99f5bd8dad59d52e5c6a96cd988d79ca9d0425 SHA256 c8e7d36475d325066a95e52d1a7072d195dc85a2cb38902f42d7648d6e1c2b86 -MD5 7047f729262c001c72f98738917efad8 openldap-2.1.30-r10.ebuild 7959 -RMD160 512a700af709c151054b35acbe68dd944e6937b3 openldap-2.1.30-r10.ebuild 7959 -SHA256 c8e7d36475d325066a95e52d1a7072d195dc85a2cb38902f42d7648d6e1c2b86 openldap-2.1.30-r10.ebuild 7959 EBUILD openldap-2.2.28-r7.ebuild 11822 RMD160 9ac18b128cbe7071cf978ed0cd007f9efaebc0fc SHA1 5d986ee8f6796143ae73e4e5d0c724f4ea21cb35 SHA256 e34b9bc86ebba150dc0e3efe4683521d1c401c47071d2201261576a971804b7c MD5 4a152c367b4d24500803167848e30a6d openldap-2.2.28-r7.ebuild 11822 RMD160 9ac18b128cbe7071cf978ed0cd007f9efaebc0fc openldap-2.2.28-r7.ebuild 11822 @@ -59,17 +54,14 @@ EBUILD openldap-2.3.34.ebuild 16354 RMD160 5b671d299972cb62625d1b83b345b96f79e95 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 46105 RMD160 9a508db665f047b4143345a3c080f3fdeb3993f0 SHA1 c2b48be62a31a1757ea78a8baf535c12d06e25e4 SHA256 bb044585ab7e6511b12f6809466b8d1bf01e8cd32e4f4491b8e091b812deb5f0 -MD5 a9a37308f34c7ae12205a3f9accf71d7 ChangeLog 46105 -RMD160 9a508db665f047b4143345a3c080f3fdeb3993f0 ChangeLog 46105 -SHA256 bb044585ab7e6511b12f6809466b8d1bf01e8cd32e4f4491b8e091b812deb5f0 ChangeLog 46105 +MISC ChangeLog 46197 RMD160 6e73c65393e2249544f218abf872cecb245303f2 SHA1 d09e057131de6ee7ee0e6d987c0163dab57770d6 SHA256 ed0639135ecd163b0c6167a8fc3cfbbf96cee51b292e6ecf037de13ef0ebea56 +MD5 0914b0872b3d6d2147dd473662778128 ChangeLog 46197 +RMD160 6e73c65393e2249544f218abf872cecb245303f2 ChangeLog 46197 +SHA256 ed0639135ecd163b0c6167a8fc3cfbbf96cee51b292e6ecf037de13ef0ebea56 ChangeLog 46197 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6 metadata.xml 240 -MD5 803c2e34467ceb981caa2c3854af60fd files/digest-openldap-2.1.30-r10 551 -RMD160 0f627c173b06f566a6d5efbfb28f682cab641fe9 files/digest-openldap-2.1.30-r10 551 -SHA256 22157a2b77e4b40a650a1faee88db3b59f58ea060115487496746bb915cb7dfa files/digest-openldap-2.1.30-r10 551 MD5 fc44e4ed11cbd528c735267ab7adcee7 files/digest-openldap-2.2.28-r7 551 RMD160 eb854940e823e0f9f0040834856f7a40db575312 files/digest-openldap-2.2.28-r7 551 SHA256 61bde84c81976ceb65369263a2ed306e0ce296f57b832a15dad2d5f57fd5fc22 files/digest-openldap-2.2.28-r7 551 @@ -85,7 +77,7 @@ SHA256 556c93efd750d5e3b35ff047b524c5bf7dddb0f8fecd6992adf9e6b1606f1a99 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGCFAjz974XjDVpbkRAqTcAJ44CRzsAkKqQSNxBiXYIXysY0vK6QCffIDW -Z5hjA/SbUxxdyuBD/1ikmO8= -=LP5n +iD8DBQFGCFLtz974XjDVpbkRAlGrAJ0VsaU++LimBncM/2xb/N9w4mYJCgCg3j99 +n/8Smx76q/ScpJI6bST67mc= +=eXSs -----END PGP SIGNATURE----- diff --git a/net-nds/openldap/files/digest-openldap-2.1.30-r10 b/net-nds/openldap/files/digest-openldap-2.1.30-r10 deleted file mode 100644 index 0740083a46c5..000000000000 --- a/net-nds/openldap/files/digest-openldap-2.1.30-r10 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673 -RMD160 431aa798c6197530c17611b931f0169d7a53e831 openldap-2.1.30.tgz 2044673 -SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25 openldap-2.1.30.tgz 2044673 -MD5 fe5206e373996ef75924c06755eaadd4 openldap-compatversions-patchset-1.0.tar.bz2 10547 -RMD160 7d6200e26fe8818934a94b4cf192f8e53df5dc2c openldap-compatversions-patchset-1.0.tar.bz2 10547 -SHA256 8b0a7b0c16601405a623012f84f9edba698cb708aea953da3d2f51da26d35c26 openldap-compatversions-patchset-1.0.tar.bz2 10547 diff --git a/net-nds/openldap/openldap-2.1.30-r10.ebuild b/net-nds/openldap/openldap-2.1.30-r10.ebuild deleted file mode 100644 index 2664942ee1e0..000000000000 --- a/net-nds/openldap/openldap-2.1.30-r10.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# 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.1.30-r10.ebuild,v 1.13 2007/01/20 10:44:39 jokey Exp $ - -WANT_AUTOMAKE="1.9" -WANT_AUTOCONF="2.5" -AT_M4DIR="./build" -inherit autotools eutils ssl-cert - -PATCHSETVER=openldap-compatversions-patchset-1.0 -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" -SRC_URI="mirror://openldap/openldap-release/${P}.tgz - mirror://gentoo/${PATCHSETVER}.tar.bz2" - -LICENSE="OPENLDAP" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd selinux" - -# note that the 'samba' USE flag pulling in OpenSSL is NOT an error. OpenLDAP -# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like -# mine at work)! -# Robin H. Johnson March 8, 2004 - -DEPEND=">=sys-libs/ncurses-5.1 - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/readline-4.1 ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 ) - odbc? ( dev-db/unixODBC ) - slp? ( >=net-libs/openslp-1.0 ) - perl? ( >=dev-lang/perl-5.6 ) - samba? ( >=dev-libs/openssl-0.9.6 ) - berkdb? ( >=sys-libs/db-4.1.25_p1-r3 ) - !berkdb? ( - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - !gdbm? ( >=sys-libs/db-4.1.25_p1-r3 ) - )" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-openldap )" - -PATCHDIR=${WORKDIR}/${PATCHSETVER} - -pkg_setup() { - if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then - die "You must have a complete (USE='-minimal') Perl install to use the perl backend!" - fi - - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/lib/openldap ldap -} - -src_unpack() { - unpack ${A} - - # 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 - - # Fix up DB-4.0 linking problem - # remember to autoconf! this expands configure by 500 lines (4 lines to m4 - # stuff). - epatch "${PATCHDIR}"/${PN}-2.1.30-db40.patch - epatch "${PATCHDIR}"/${PN}-2.1.30-tls-activedirectory-hang-fix.patch - - # Security bug #96767 - # http://bugzilla.padl.com/show_bug.cgi?id=210 - EPATCH_OPTS="-p1 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.2.26-tls-fix-connection-test.patch - - # supersedes old fix for bug #31202 - cd "${S}" - epatch "${PATCHDIR}"/${PN}-2.1.27-perlthreadsfix.patch - - # fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't - # do it perfectly. - cd "${S}"/build - ln -s shtool install - ln -s shtool install.sh - - # ximian connector 1.4.7 ntlm patch - cd "${S}" - epatch "${PATCHDIR}"/${PN}-2.1.30-ximian_connector.patch - - #make files ready for new autoconf - EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-autoconf25.patch - - # fix AC calls bug #114544 - EPATCH_OPTS="-p0 -d ${S}/build" epatch "${PATCHDIR}"/${PN}-2.1.30-m4_underquoted.patch - - # make tests rpath ready - EPATCH_OPTS="-p0 -d ${S}/tests" epatch "${PATCHDIR}"/${PN}-2.1.30-tests.patch - - # make autoconf-archive compatible - EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-autoconf-archived-fix.patch - - # CVE-2006-5779, bug #154349 - EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.3.27-CVE-2006-5779.patch - - # reconf current for RPATH solve - libtoolize --copy --force - eaclocal || die "aclocal failed" - EPATCH_OPTS="-p0 -d ${S}" epatch "${PATCHDIR}"/${PN}-2.1.30-rpath.patch - eautoconf || die "autoconf failed" -} - -src_compile() { - local myconf - - # enable debugging to syslog - use debug && myconf="${myconf} --enable-debug" - myconf="${myconf} --enable-syslog" - - # enable slapd/slurpd servers - myconf="${myconf} --enable-ldap" - myconf="${myconf} --enable-slapd --enable-slurpd" - - myconf="${myconf} `use_enable crypt`" - myconf="${myconf} `use_enable ipv6`" - myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`" - myconf="${myconf} `use_with readline`" - myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`" - myconf="${myconf} `use_enable tcpd wrappers`" - myconf="${myconf} `use_enable odbc sql`" - myconf="${myconf} `use_enable perl`" - myconf="${myconf} `use_enable slp`" - - myconf="${myconf} --enable-ldbm" - myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley' - myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm' - if use berkdb; then - einfo "Using Berkeley DB for local backend" - myconf="${myconf} ${myconf_berkdb}" - elif use gdbm; then - einfo "Using GDBM for local backend" - myconf="${myconf} ${myconf_gdbm}" - else - ewarn "Neither gdbm or berkdb USE flags present, falling back to" - ewarn "Berkeley DB for local backend" - myconf="${myconf} ${myconf_berkdb}" - fi - myconf="${myconf} --enable-dynamic --enable-modules" - myconf="${myconf} --enable-rewrite --enable-rlookups" - myconf="${myconf} --enable-passwd --enable-phonetic" - myconf="${myconf} --enable-dnssrv --enable-ldap" - myconf="${myconf} --enable-meta --enable-monitor" - myconf="${myconf} --enable-null --enable-shell" - myconf="${myconf} --enable-local --enable-proctitle" - - econf \ - --enable-static \ - --enable-shared \ - --libexecdir=/usr/lib/openldap \ - ${myconf} || die "configure failed" - - # Adding back -j1 as upstream didn't answer on parallel make issue yet - emake -j1 depend || die "make depend failed" - emake -j1 || die "make failed" -} - -src_test() { - einfo "Doing tests" - cd tests ; make tests || die "make tests failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE "${FILESDIR}"/DB_CONFIG.fast.example - docinto rfc ; dodoc doc/rfc/*.txt - - # make state directories - for x in data slurp ldbm; do - keepdir /var/lib/openldap-${x} - fowners ldap:ldap /var/lib/openldap-${x} - fperms 0700 /var/lib/openldap-${x} - done - - # manually remove /var/tmp references in .la - # because it is packaged with an ancient libtool - for x in "${D}"usr/lib/lib*.la; do - sed -i -e "s:-L${S}[/]*libraries::" ${x} - done - - # change slapd.pid location in configuration file - keepdir /var/run/openldap - 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 "/database\tbdb$/acheckpoint 32 30 # " -i "${D}"${f} - fowners root:ldap ${f} - fperms 0640 ${f} - done - - # install our own init scripts - newinitd "${FILESDIR}"/slapd-initd slapd - newinitd "${FILESDIR}"/slurpd-initd slurpd - newconfd "${FILESDIR}"/slapd-confd slapd -} - -pkg_postinst() { - if use ssl; then - insinto /etc/openldap/ssl - docert ldap - fi - - # Since moving to running openldap as user ldap there are some - # permissions problems with directories and files. - # Let's make sure these permissions are correct. - chown ldap:ldap "${ROOT}"var/run/openldap - chmod 0755 "${ROOT}"var/run/openldap - chown root:ldap "${ROOT}"etc/openldap/slapd.conf - chmod 0640 "${ROOT}"etc/openldap/slapd.conf - 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} - - # notes from bug #41297, bug #41039 - if use ssl; then - ewarn "- Self-signed SSL certificates are treated harshly by OpenLDAP 2.1" - ewarn " add 'TLS_REQCERT never' if you want to use them." - fi - - # Reference inclusion bug #77330 - echo - einfo "Getting started using OpenLDAP? There is some documentation available:" - einfo "Gentoo Guide to OpenLDAP Authentication" - einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)" - - # note to bug #110412 - echo - einfo "An example file for tuning BDB backends with openldap is:" - einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz" -} -- 2.26.2