net-nds/389-ds-base: Update to 1.3.4.14 and 1.3.5.15

Acked-by wibrown@redhat.com

Package-Manager: portage-2.3.2

4 files changed, 271 insertions, 3 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild
new file mode 100644
index 000000000000..ae9230b2bd39
--- /dev/null
+++ b/net-nds/389-ds-base/389-ds-base-1.3.4.14.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOMAKE="1.9"
+
+inherit user eutils multilib flag-o-matic autotools
+
+DESCRIPTION="389 Directory Server (core librares and daemons )"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
+
+# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize.
+# The --with-db-inc line in econf will need to be updated as well when changing db version.
+COMMON_DEPEND="
+	sys-libs/db:4.8
+	>=dev-libs/cyrus-sasl-2.1.19
+	>=net-analyzer/net-snmp-5.1.2
+	>=dev-libs/icu-3.4:=
+	dev-libs/nss[utils]
+	dev-libs/nspr
+	dev-libs/svrcore
+	dev-libs/openssl:0=
+	dev-libs/libpcre:3
+	>=dev-perl/perl-mozldap-1.5.3
+	dev-perl/NetAddr-IP
+	net-nds/openldap
+	sys-libs/pam
+	sys-libs/zlib
+	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-dirsrv )
+	virtual/perl-Time-Local
+	virtual/perl-MIME-Base64"
+
+pkg_setup() {
+	enewgroup dirsrv
+	enewuser dirsrv -1 -1 -1 dirsrv
+}
+
+src_prepare() {
+	#0001-Ticket-47840-add-configure-option-to-disable-instanc.patch
+	epatch "${FILESDIR}/389-ds-base-1.3.4-no-instance-script.patch"
+
+	# as per 389 documentation, when 64bit, export USE_64
+	use amd64 && export USE_64=1
+
+	# This will be changed in 1.3.5.X
+	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
+	eautoreconf
+
+	append-lfs-flags
+}
+
+src_configure() {
+	# for 1.3.5.X, will add --enable-gcc-security.
+	# auto-dn-suffix currently throws warning in configure script,
+	# see https://fedorahosted.org/389/ticket/48710
+	econf \
+		$(use_enable debug) \
+		$(use_enable pam-passthru) \
+		$(use_enable ldapi) \
+		$(use_enable autobind) \
+		$(use_enable dna) \
+		$(use_enable bitwise) \
+		$(use_enable presence) \
+		$(use_with kerberos) \
+		$(use_enable auto-dn-suffix) \
+		--enable-maintainer-mode \
+		--with-fhs \
+		--with-openldap \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		--with-db-inc=/usr/include/db4.8
+
+}
+
+src_compile() {
+	default
+	if use doc; then
+		doxygen slapi.doxy || die "cannot run doxygen"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# remove redhat style init script
+	rm -rf "${D}"/etc/rc.d || die
+	# Needs a config option to remove this.
+	rm -rf "${D}"/etc/default || die
+
+	# and install gentoo style init script
+	# Get these merged upstream
+	newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
+	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
+
+	# cope with libraries being in /usr/lib/dirsrv
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
+
+	if use doc; then
+		cd "${S}" || die
+		docinto html/
+		dodoc -r docs/html/.
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
+	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
+	elog "adding proper 'server' entries, and adding the lines below to"
+	elog " => /etc/snmp/snmpd.conf"
+	elog
+	elog "master agentx"
+	elog "agentXSocket /var/agentx/master"
+	elog
+	elog "To start 389 Directory Server (LDAP service) at boot:"
+	elog
+	elog "    rc-update add 389-ds default"
+	elog
+	elog "If you are upgrading from previous 1.2.6 release candidates"
+	elog "please see:"
+	elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer"
+	echo
+}
diff --git a/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild
new file mode 100644
index 000000000000..374642fba009
--- /dev/null
+++ b/net-nds/389-ds-base/389-ds-base-1.3.5.15.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOMAKE="1.13"
+
+inherit user eutils multilib flag-o-matic autotools
+
+DESCRIPTION="389 Directory Server (core librares and daemons )"
+HOMEPAGE="http://www.port389.org/"
+SRC_URI="http://www.port389.org/sources/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise presence kerberos selinux"
+
+# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize.
+# The --with-db-inc line in econf will need to be updated as well when changing db version.
+COMMON_DEPEND="
+	sys-libs/db:4.8
+	>=dev-libs/cyrus-sasl-2.1.19
+	>=net-analyzer/net-snmp-5.1.2
+	>=dev-libs/icu-3.4:=
+	>=dev-libs/nss-3.22[utils]
+	dev-libs/nspr
+	>=dev-libs/svrcore-4.1.2
+	dev-libs/openssl:0=
+	dev-libs/libpcre:3
+	>=dev-perl/perl-mozldap-1.5.3
+	dev-perl/NetAddr-IP
+	net-nds/openldap
+	sys-libs/pam
+	sys-libs/zlib
+	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-dirsrv )
+	virtual/perl-Time-Local
+	virtual/perl-MIME-Base64"
+
+pkg_setup() {
+	enewgroup dirsrv
+	enewuser dirsrv -1 -1 -1 dirsrv
+}
+
+src_prepare() {
+	# as per 389 documentation, when 64bit, export USE_64
+	use amd64 && export USE_64=1
+
+	eautoreconf
+
+	append-lfs-flags
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable pam-passthru) \
+		$(use_enable ldapi) \
+		$(use_enable autobind) \
+		$(use_enable dna) \
+		$(use_enable bitwise) \
+		$(use_enable presence) \
+		$(use_with kerberos) \
+		$(use_enable auto-dn-suffix) \
+		--with-initddir=no \
+		--enable-maintainer-mode \
+		--with-fhs \
+		--with-openldap \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		--with-db-inc=/usr/include/db4.8
+
+}
+
+src_compile() {
+	default
+	if use doc; then
+		doxygen slapi.doxy || die "cannot run doxygen"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Install gentoo style init script
+	# Get these merged upstream
+	newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
+	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
+
+	# cope with libraries being in /usr/lib/dirsrv
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
+
+	if use doc; then
+		cd "${S}" || die
+		docinto html/
+		dodoc -r docs/html/.
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
+	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
+	elog "adding proper 'server' entries, and adding the lines below to"
+	elog " => /etc/snmp/snmpd.conf"
+	elog
+	elog "master agentx"
+	elog "agentXSocket /var/agentx/master"
+	elog
+	elog "To start 389 Directory Server (LDAP service) at boot:"
+	elog
+	elog "    rc-update add 389-ds default"
+	elog
+	echo
+}
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index f3b174de4f2f..a329a844f177 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,2 +1,4 @@
+DIST 389-ds-base-1.3.4.14.tar.bz2 3433905 SHA256 4408e61c52dc56d8e0ffee530dde70c2af00aa86b385cc40b389ef8bcce55aaa SHA512 1043b3e3437d1d24d1eec54c5c5ca39692151d05b8eb035224db78e68a1f4011bd2e0916f54609387903e2bbe9345f954be5c0a578f90a107958f74604908d6c WHIRLPOOL f2bf87c450c870ad1b886000f49f5d1b6def760c9b1634cffe4871da755932d43cb9253bebe12092032359097a7786e9d29fc64d4326fb3a079a79163a2ccc01
 DIST 389-ds-base-1.3.4.8.tar.bz2 3396105 SHA256 a00468afcfa50de375f921a827a04dd53b6a11b632982bb0db98cafca509e701 SHA512 ac85223cb38d4cebb3ff61b23e3c0312b0cd30a0c6bf0d9644842c6ecfbc9379ea4a639c80b3e78a13a67f273342fec78e9ecf4672cc72e289d72d74c2fa0d8f WHIRLPOOL 4c7645be5b70c108ef437aaf6d50293a99fa6a552c859f649904c6974c8830e5bf96286a0f998c5d187c1f66f3e0922bbe1e756889e6b0a33e8d9db56f0aa005
+DIST 389-ds-base-1.3.5.15.tar.bz2 3554197 SHA256 21dd81525422b64d2760144a4dedf1d3351ecdea7e8e40ae97cd7645b2b527fc SHA512 af1e82f5de80e493241c9d58f0127cd24517e18305ec0ba918bff8b2fa96dc69b32d7172d9b411a544251abfc04098ea9d0c1b41bf9d88e6caaaeae9cb15200b WHIRLPOOL 6f07f20e54dc9e8d7ff2c519d5826f0606d1a2d9113ba2441cdc600790f844f3b02b2d334f111fddaded50e87fc1a6cdca38a5cfe294c4f3d20930b5756c943c
 DIST 389-ds-base-1.3.5.4.tar.bz2 3520056 SHA256 a82f78e56473db4c3aca7a73e012fcd66a508d3b4734bb54936974e4272739b8 SHA512 0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e WHIRLPOOL 1300126fe21c2adcb014364ead33f6766475f2b9dbe43531a11284a0ba21f61e63591804ec227aa118378482e91b34ef44f60f600fa4da5416b68176b2bb1b7b
diff --git a/net-nds/389-ds-base/files/389-ds.initd-r1 b/net-nds/389-ds-base/files/389-ds.initd-r1
index 0cd8e0e58c06..474c270b2bb9 100644
--- a/net-nds/389-ds-base/files/389-ds.initd-r1
+++ b/net-nds/389-ds-base/files/389-ds.initd-r1
@@ -1,10 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 DIRSRV_EXEC="/usr/sbin/ns-slapd"
 PID_DIRECTORY="/var/run/dirsrv"
+LOCK_DIRECTORY="/var/lock/dirsrv"
 DIRSRV_CONF_DIR="/etc/dirsrv"
 DS_INSTANCES=${DIRSRV_CONF_DIR}/slapd-*
 F389DS_INSTANCES=""
@@ -33,9 +34,11 @@ start() {
 			continue
 		fi
 		# Create the required directories in case they got nuked
-		mkdir -p /var/lock/dirsrv/${instance}
+		mkdir -p ${PID_DIRECTORY}
+		mkdir -p ${LOCK_DIRECTORY}/${instance}
 		# This will probably break one day, we should be pulling out the suitespotuser from dse.ldif
-		chown dirsrv: /var/lock/dirsrv/${instance}
+		chown dirsrv: ${PID_DIRECTORY}
+		chown dirsrv: ${LOCK_DIRECTORY}/${instance}
 		ebegin "Starting 389 Directory Server: instance ${instance}"
 		start-stop-daemon --start --quiet -m \
 			--pidfile ${PID_DIRECTORY}/${instance}.startpid \