Backported: Bug #105380 - RPATH. Bug #113770 - Selinux support.

Package-Manager: portage-2.0.53

4 files changed, 270 insertions, 2 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 26e17fabea79..1d4aa43ce606 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.148 2005/12/06 17:10:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.149 2005/12/06 17:47:02 robbat2 Exp $
+
+*openldap-2.1.30-r6 (06 Dec 2005)
+
+  06 Dec 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.1.30-r6.ebuild:
+  Backported: Bug #105380 - RPATH. Bug #113770 - Selinux support.
 
 *openldap-2.2.28-r3 (06 Dec 2005)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index a5400e03f5e4..75e74ef90331 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,4 @@
-MD5 3d1ec842c6779369a73c08e9dfed4d70 ChangeLog 27252
+MD5 c7d79d5cbec956877f3bb879e355462c ChangeLog 27437
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
 MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
@@ -11,6 +11,7 @@ MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r2 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r3 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r4 65
 MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r5 65
+MD5 6da89687536a5ec9a422938e997a8a04 files/digest-openldap-2.1.30-r6 65
 MD5 27d2ee25b32bf4a429ae80149508ff34 files/digest-openldap-2.2.14 65
 MD5 d1db1a9bf4afc66b26e33beef17f07f4 files/digest-openldap-2.2.19 65
 MD5 fa0a0dfbb9f3984fb2907c020e02ec73 files/digest-openldap-2.2.23 65
@@ -49,6 +50,7 @@ MD5 943899d61dff15e7eb2ff62409814b49 openldap-2.1.30-r2.ebuild 7483
 MD5 992888650b5b09f265a46469585bcba8 openldap-2.1.30-r3.ebuild 7208
 MD5 2d4e17747e16fdd75a17a66c5537184c openldap-2.1.30-r4.ebuild 7308
 MD5 2950a8442733483861d191c433359f59 openldap-2.1.30-r5.ebuild 7628
+MD5 6ff5c47dfba8555aed408d3da66e3390 openldap-2.1.30-r6.ebuild 8148
 MD5 aebb509ea0634689f1e3a4549d4d343d openldap-2.1.30.ebuild 7361
 MD5 917840881094150cd91192866ec4e1c6 openldap-2.2.14.ebuild 7247
 MD5 7ddeb08466499dbe3c49b850b336744f openldap-2.2.19.ebuild 7955
diff --git a/net-nds/openldap/files/digest-openldap-2.1.30-r6 b/net-nds/openldap/files/digest-openldap-2.1.30-r6
new file mode 100644
index 000000000000..a6a4a08b05c0
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.1.30-r6
@@ -0,0 +1 @@
+MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
diff --git a/net-nds/openldap/openldap-2.1.30-r6.ebuild b/net-nds/openldap/openldap-2.1.30-r6.ebuild
new file mode 100644
index 000000000000..44348de56a74
--- /dev/null
+++ b/net-nds/openldap/openldap-2.1.30-r6.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2005/12/06 17:47:02 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
+
+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"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-apps/sed-4
+	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 )"
+
+# 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 <robbat2@gentoo.org> March 8, 2004
+
+# if USE=berkdb
+#	pull in sys-libs/db
+# else if USE=gdbm
+#	pull in sys-libs/gdbm
+# else
+#	pull in sys-libs/db
+DEPEND="${DEPEND}
+	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 )"
+
+pkg_preinst() {
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/lib/openldap ldap
+}
+
+pkg_setup() {
+	if built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
+}
+
+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 ${FILESDIR}/${PN}-2.1.30-db40.patch
+	epatch ${FILESDIR}/${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 ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
+
+	# supersedes old fix for bug #31202
+	cd ${S}
+	epatch ${FILESDIR}/${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 ${FILESDIR}/${PN}-2.1.30-ximian_connector.patch
+
+	export WANT_AUTOMAKE="1.9"
+	export WANT_AUTOCONF="2.5"
+	#make files ready for new autoconf
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
+	
+	# reconf compat and current for RPATH solve
+	cd ${WORKDIR}/${S}
+	einfo "Running libtoolize on ${S}"
+	libtoolize --copy --force
+	einfo "Running aclocal on ${S}"
+	aclocal || die "aclocal failed"
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
+	einfo "Running autoconf on ${S}"
+	autoconf || 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
+
+	# alas, for BSD only
+	#myconf="${myconf} --with-fetch"
+
+	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"
+
+	# disabled options
+	# --with-bdb-module=dynamic
+	# --enable-dnsserv --with-dnsserv-module=dynamic
+
+	econf \
+		--enable-static \
+		--enable-shared \
+		--libexecdir=/usr/lib/openldap \
+		${myconf} || die "configure failed"
+
+	make depend || die "make depend failed"
+	make || die "make failed"
+
+}
+
+src_test() {
+	einfo "Doing tests"
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
+	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 # <kbyte> <min>" -i ${D}/${f}
+		fowners root:ldap ${f}
+		fperms 0640 ${f}
+	done
+
+	# install our own init scripts
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/2.0/slapd slapd
+	newexe ${FILESDIR}/2.0/slurpd slurpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/2.0/slapd.conf slapd
+
+	# install MDK's ssl cert script
+	if use ssl || use samba; then
+		dodir /etc/openldap/ssl
+		exeinto /etc/openldap/ssl
+		doexe ${FILESDIR}/gencert.sh
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		# make a self-signed ssl cert (if there isn't one there already)
+		if [ ! -e /etc/openldap/ssl/ldap.pem ]
+		then
+			cd /etc/openldap/ssl
+			yes "" | sh gencert.sh
+			chmod 640 ldap.pem
+			chown root:ldap ldap.pem
+		else
+			einfo "An LDAP cert already appears to exist, no creating"
+		fi
+	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 /var/run/openldap
+	chmod 0755 /var/run/openldap
+	chown root:ldap /etc/openldap/slapd.conf
+	chmod 0640 /etc/openldap/slapd.conf
+	chown root:ldap /etc/openldap/slapd.conf.default
+	chmod 0640 /etc/openldap/slapd.conf.default
+	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+
+	# notes from bug #41297, bug #41039
+	ewarn "If you are upgrading from OpenLDAP 2.0, major changes have occured:"
+	ewarn "- bind_anon_dn is now disabled by default for security"
+	ewarn "  add 'allow bind_anon_dn' to your config for the old behavior."
+	ewarn "- Default schemas have changed, you should slapcat your entire DB to"
+	ewarn "  a file, delete your DB, and then slapadd it again. Alternatively"
+	ewarn "  you can try slapindex which should work in almost all cases. Be"
+	ewarn "  sure to check the permissions on the database files afterwards!"
+	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
+}