Move SELinux policy into selinux-dirsrv package, simplifies ebuild, see bug 445484

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

3 files changed, 185 insertions, 6 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.3.0.2-r1.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.0.2-r1.ebuild
new file mode 100644
index 000000000000..c7b0fefb247e
--- /dev/null
+++ b/net-nds/389-ds-base/389-ds-base-1.3.0.2-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2013 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.3.0.2-r1.ebuild,v 1.1 2013/08/22 17:16:44 swift Exp $
+
+EAPI=5
+
+WANT_AUTOMAKE="1.9"
+MY_P=${P/_alpha/.a}
+MY_P=${MY_P/_rc/.rc}
+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/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
+
+ALL_DEPEND="!>=sys-libs/db-5.0
+	>=dev-libs/cyrus-sasl-2.1.19
+	>=dev-libs/icu-3.4
+	dev-libs/nss[utils]
+	dev-libs/nspr
+	dev-libs/svrcore
+	dev-libs/openssl
+	dev-libs/libpcre:3
+	dev-perl/perl-mozldap
+	>=net-analyzer/net-snmp-5.1.2
+	net-nds/openldap
+	sys-apps/tcp-wrappers
+	>=sys-libs/db-4.5
+	sys-libs/pam
+	sys-libs/zlib
+	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )
+	selinux? ( sec-policy/selinux-dirsrv )"
+
+DEPEND="${ALL_DEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+	sys-apps/sed"
+RDEPEND="${ALL_DEPEND}
+	virtual/perl-Time-Local
+	virtual/perl-MIME-Base64"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup dirsrv
+	enewuser dirsrv -1 -1 -1 dirsrv
+}
+
+src_prepare() {
+	# Fix compilation against mozldap
+	# epatch "${FILESDIR}/389-ds-base-1.2.11-fix-mozldap.patch"
+
+	# as per 389 documentation, when 64bit, export USE_64
+	use amd64 && export USE_64=1
+
+	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
+	eautoreconf
+
+	# enable nsslapd-allow-unauthenticated-binds by default
+	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"
+
+}
+
+src_configure() {
+	local myconf=""
+
+	use auto-dn-suffix && myconf="${myconf} --enable-auto-dn-suffix"
+
+	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) \
+		--enable-maintainer-mode \
+		--enable-autobind \
+		--with-fhs \
+		--with-openldap \
+		$myconf || die "econf failed"
+}
+
+src_compile() {
+	append-lfs-flags
+
+	emake || die "compile failed"
+}
+
+src_install () {
+	# Use -j1 otherwise libacl-plugin.so could fail to install properly
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# install not installed header
+	insinto /usr/include/dirsrv
+	doins ldap/servers/slapd/slapi-plugin.h
+
+	# for build free-ipa require winsync-plugin
+	doins ldap/servers/plugins/replication/winsync-plugin.h
+	doins ldap/servers/plugins/replication/repl-session-plugin.h
+
+	# make sure perl scripts have a proper shebang
+	cd "${D}"/usr/share/dirsrv/script-templates/
+
+	for i in $(find ./  -iname '*.pl') ;do
+		sed -i -e 's/#{{PERL-EXEC}}/#\!\/usr\/bin\/perl/' $i || die
+	done
+
+	# remove redhat style init script
+	rm -rf "${D}"/etc/rc.d || die
+	rm -rf "${D}"/etc/default || die
+
+	# and install gentoo style init script
+	newinitd "${FILESDIR}"/389-ds.initd 389-ds
+	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
+
+	# install Gentoo-specific start/stop scripts
+	rm -f "${D}"/usr/sbin/{re,}start-dirsrv || die "cannot remove 389 start/stop executables"
+	exeinto /usr/sbin
+	doexe "${FILESDIR}"/{re,}start-dirsrv
+
+	# cope with libraries being in /usr/lib/dirsrv
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
+
+	# create the directory where our log file and database
+	diropts -m 0755
+	dodir /var/lib/dirsrv
+	keepdir /var/lib/dirsrv
+	dodir /var/lock/dirsrv
+	keepdir /var/lock/dirsrv
+	# snmp agent, required directory
+	keepdir /var/agentx
+	dodir /var/agentx
+
+	if use doc; then
+		cd "${S}"
+		doxygen slapi.doxy || die "cannot run doxygen"
+		dohtml -r docs/html
+	fi
+}
+
+pkg_postinst() {
+	elog
+	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
+	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"
+	elog
+
+}
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index b16eb6fd442c..052f55918536 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/389-ds-base
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.24 2013/03/14 17:32:02 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.25 2013/08/22 17:16:44 swift Exp $
+
+*389-ds-base-1.3.0.2-r1 (22 Aug 2013)
+
+  22 Aug 2013; Sven Vermeulen <swift@gentoo.org>
+  +389-ds-base-1.3.0.2-r1.ebuild:
+  Fix bug #445484 - move SELinux policy into selinux-dirsrv and depend on that
 
 *389-ds-base-1.3.0.2 (14 Mar 2013)
 
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index f56601a512fc..ebf9c84cb2b2 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -9,13 +9,14 @@ AUX restart-dirsrv 581 SHA256 fd0dfbce5d74b065fc1bef6e11527d56c7fc4f16ae55383841
 AUX selinux.patch 280 SHA256 0600d46c02987c69c3c77a2f8f90dd4c31edea983911268227aa708230cdb6f9 SHA512 333aae269ab806057c2e6eb5b6b657bbbbd12334254b7b7a07f46cb89d7a78d6fd573a987bfe3a0cb74df27e01009b68d8510b47a13ac7ab8e7e4c7301842d6e WHIRLPOOL 3f4c9d1ea8907dda7e236f17355a4710dad6a162395999688173c1a818c48505ea47a8cfa43116981a0a978764f7a27d771fd26e551bb0b3e5e123ba7b8e5121
 AUX start-dirsrv 303 SHA256 d29272f92d2c4420da8aad7919861ab667c8f224bde560491f1626957418d361 SHA512 0a150045099e367ed54a3bf9319f3a608ea9b967f13e6f29aac7d3f6ca2e39edc2d8f843bab9a2c7cb93d8d175a8a34e6c0ad1a0dd1a586cf4141a1dcd3d37d6 WHIRLPOOL 936fc295e75ab18e5207eb2fe2eea42eef3807321f3ff526bbc4f4d8d4ef79b0ff8a09b676d7a993c76efb6da8fab3365b085f682d1a0e615092b8bd0b67a6c5
 DIST 389-ds-base-1.3.0.2.tar.bz2 3008002 SHA256 0482f8cddbb32dc44051d59efe085eb744295a32eac65fbcd0b1bfd807319755 SHA512 99d41e2df832eaf8d83ec32fd9e7ef1819d75640fae2c69e62f5d11998c29d780726cb5d97cec7a6ae410c440d5124ca8b9d0cb7091a437a57f2625b16fca29f WHIRLPOOL 8ad72341e15d05e6af0999808a1930f11c7589c211424f7dfa68c1d8d5cd18657086dbf9aa6c856dc84a3926b47ed46484b30e6f72819a22e26277a3c504c1e0
+EBUILD 389-ds-base-1.3.0.2-r1.ebuild 4656 SHA256 612fe59eb7edd2da991ab881952c22146ae1ec47ae1587e654bad5a3bd58834c SHA512 90992668b662f0f1a9c760bf0fddf19d89edfbea9008c0fe19b2ba57429712ae74d462b720eb7760341136ac325fb9a62c10a1fcc646281a942c55e9af8a05ef WHIRLPOOL b87551bbac4d3884ff718ebd10b0b8546471088de7d3383d4c55bc92dc9dba69fdd7b53b16dfbc2506992c4372135d85be2279b4a47dfe00b8050eda6e4f512e
 EBUILD 389-ds-base-1.3.0.2.ebuild 5558 SHA256 71d16880e34de41013317df54c5ffe24d27138a46ed57c79d41350b606496f66 SHA512 2a859f9673c21742f77a81e8751349bb506c854b051502f0b75ae2a4793942a0945c67d78efd45b1e81398eda22ab6bd94d79814b42e38f02bfd3652a6756821 WHIRLPOOL 0b15959f33f57101f9a1eb7769e8b95f8bd94059bb591e2230f45a370ef0ac62773cacf509954001acefba870e2c5a38ceeb207d2ae379099291e35d5d441715
-MISC ChangeLog 4941 SHA256 ac5a6a75105d1d943241759e604585481d017e1475cae958f44e74d62a053f92 SHA512 bb571b208ee734e81275ce4c1a05414ca649eb997550db616f325ae36daacdd21e6b78fdc563315c81541f38b9641e5168aef840adec7167f0edc19e3d4fffd8 WHIRLPOOL b2dfa3e91fa5104b927aa56d1db84cb2dfbf9b437244dd51de129cb8fd3fb6e2c25d245ac2875d6a8ded795b688de7fb409b18a1414f52249364c61f7672e46b
+MISC ChangeLog 5143 SHA256 8fc45918850c9d8d66f8c7b9cd94b133d8e04e800c0be25f2b1aec182a3295eb SHA512 2926a8f76980880354e08b8bd4c38a7e50d5161e69611c235e09c1b239b6619b6705173e57c2327f950504a84da553fa855edb27920be427b47bff71ef65a84d WHIRLPOOL b76f4974b86f62035d7d3fa9175f7e99ee7cdcf947bf8af82283e60f39062fd95dc946332905bf74fdc6d4c6e6276b5d3824f00b719a6a84b3afb951711435be
 MISC metadata.xml 1048 SHA256 a57ddcbe9aa68a7d05cda7de1dba219fc1a81070899df2d564af33f9d89f5c32 SHA512 0ec15db03c6526ebc7404ac4d674695764d820fad63e6ce3c7fb9e015f1d9a0157cb3507356f074502d0186d18bc1b5fa26d9d1d2fbc622bb426a8054f34dd49 WHIRLPOOL 1dbbc21809873987acde2013a7cc4a3a31bf122b65d04576f7ec6c33df1725e86b778611a2c7dff91f236db7692e87f2d9456918e1c9f0d5f84efd675021a0f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFCF3cACgkQfaj9zK3JFuW0UgCgiBB1qL7cFLO15GKrAIO7ZBgO
-6+0AnA8zDyKQbf9pt22YUChylo6yLkGI
-=9H8+
+iEYEAREIAAYFAlIWRzEACgkQXfqz7M26L9vSPQCffIcz5RVLrpQ2uw85JliHH/7A
+xlsAniqL7Rfv/uN5u2QF76DqTyvZMXzp
+=ahyR
 -----END PGP SIGNATURE-----