--- 389-ds-base-1.2.11.15.ebuild 2012-10-02 22:25:09.000000000 +0200 +++ 389-ds-base-1.2.11.15.ebuild 2013-03-10 20:25:57.807941591 +0100 @@ -34,14 +34,12 @@ sys-libs/pam sys-libs/zlib kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] ) - selinux? ( >=sys-apps/policycoreutils-1.30.30 - sec-policy/selinux-base-policy )" + selinux? ( sec-policy/selinux-dirsrv )" DEPEND="${ALL_DEPEND} virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) - selinux? ( sys-devel/m4 >=sys-apps/checkpolicy-1.30.12 ) sys-apps/sed" RDEPEND="${ALL_DEPEND} virtual/perl-Time-Local @@ -55,7 +53,6 @@ } src_prepare() { - epatch "${FILESDIR}/selinux.patch" # Fix compilation against mozldap epatch "${FILESDIR}/389-ds-base-1.2.11-fix-mozldap.patch" # Upstream patch, will be in 1.2.11.16, fixes CVE-2012-4450 @@ -99,19 +96,12 @@ # Use -j1 otherwise libacl-plugin.so could fail to install properly emake -j1 || die "compile failed" - if use selinux; then - emake -f selinux/Makefile || die " build selinux policy failed" - fi } src_install () { # Use -j1 otherwise libacl-plugin.so could fail to install properly emake -j1 DESTDIR="${D}" install || die "emake install failed" - if use selinux;then - emake -f selinux/Makefile DESTDIR="${D}" install || die "Install selinux policy failed" - fi - # install not installed header insinto /usr/include/dirsrv doins ldap/servers/slapd/slapi-plugin.h @@ -162,23 +152,6 @@ } pkg_postinst() { - if use selinux; then - if has "loadpolicy" $FEATURES; then - einfo "Inserting the following modules into the module store" - cd /usr/share/selinux/targeted # struct policy not supported - semodule -s dirsrv -i dirsrv.pp - else - elog - elog "Policy has not been loaded. It is strongly suggested" - elog "that the policy be loaded before continuing!!" - elog - elog "Automatic policy loading can be enabled by adding" - elog "\"loadpolicy\" to the FEATURES in make.conf." - elog - ebeep 4 - fi - fi - 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"