From 59d0b3103dae37ef022edaba64ed10a822ed4b89 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 04 2010 17:34:14 +0000
Subject: Merge branch 'master' into el4


Conflicts:

	.gitignore
	389-admin-git-local.sh
	389-admin-git.sh
	389-admin.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index bc5278c..079ac02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-389-admin-1.1.11.rc1.tar.bz2
+389-admin-1.1.11.rc2.tar.bz2
+*~
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 0e3bcb5..a3c3935 100755
--- a/389-admin-git-local.sh
+++ b/389-admin-git-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc1
+VERSION=1.1.11.rc2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index e06144b..368760a 100755
--- a/389-admin-git.sh
+++ b/389-admin-git.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc1
+VERSION=1.1.11.rc2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index 0e00a15..c6032e9 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -1,19 +1,20 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc1
+%global prerel .rc2
 # also need the relprefix 0. field for a pre-release - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.11
-Release:          %{?relprefix}6%{?prerel}%{?dist}
+Release:          %{?relprefix}7%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:         fedora-ds-admin = %{version}-%{release}
 Obsoletes:        fedora-ds-admin < 1.1.8-1
+Obsoletes:        %{name}-selinux
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -27,8 +28,23 @@ BuildRequires:    apr-devel
 BuildRequires:    mod_nss
 BuildRequires:    389-adminutil-devel
 
+# The following are needed to build the SELinux policy
+BuildRequires:    checkpolicy
+BuildRequires:    selinux-policy-devel
+BuildRequires:    /usr/share/selinux/devel/Makefile
+BuildRequires:    389-ds-base-selinux-devel
+
 Requires:         389-ds-base
 Requires:         mod_nss
+
+# this is needed for using semanage from our setup scripts
+Requires:         policycoreutils-python
+
+# this is needed to load and unload the policy module
+Requires(post):         policycoreutils
+Requires(preun):        policycoreutils
+Requires(postun):       policycoreutils
+
 # the following are needed for some of our scripts
 Requires:         perl-Mozilla-LDAP
 Requires:         nss-tools
@@ -54,7 +70,7 @@ and CGI utilities used by the console.
 %patch1
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --with-selinux
 
 # Generate symbolic info for debuggers
 export XCFLAGS=$RPM_OPT_FLAGS
@@ -65,7 +81,6 @@ export USE_64=1
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT 
 
@@ -81,7 +96,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,14 +137,32 @@ if %{pkgname}admin_consoleconf then
     posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.mode)
     posix.chown('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf', %{pkgname}admin_consoleconf.uid, %{pkgname}admin_consoleconf.gid)
 end
+-- load the selinux policy module
+variants = "%{selinux_variants}"
+for selinuxvariant in string.gfind(variants, "%a+") do
+  os.execute('semodule -s '..selinuxvariant..' -i %{_datadir}/selinux/'..selinuxvariant..'/%{pkgname}-admin.pp > /dev/null 2>&1')
+end
+-- label the files installed by this package
+os.execute('fixfiles -R %{name} restore > /dev/null 2>&1')
 
 %preun
 if [ $1 = 0 ]; then
         /sbin/service %{pkgname}-admin stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}-admin
+        for selinuxvariant in %{selinux_variants}
+        do
+          semodule -s ${selinuxvariant} -r %{pkgname}-admin 2>/dev/null || :
+        done
 fi
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then # Upgrade
+for selinuxvariant in %{selinux_variants}
+do
+  semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp 2>/dev/null || :
+done
+fi
 
 %posttrans -p <lua>
 -- if we saved the run level configuration in %pre, restore it now
@@ -152,6 +184,7 @@ end
 %dir %{_sysconfdir}/%{pkgname}/admin-serv
 %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf
 %{_datadir}/%{pkgname}
+%{_datadir}/selinux/*/%{pkgname}-admin.pp
 %{_sysconfdir}/rc.d/init.d/%{pkgname}-admin
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}-admin
 %{_sbindir}/*
@@ -161,6 +194,11 @@ end
 
 
 %changelog
+* Wed Aug  4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.7.rc2
+- 1.1.11.rc2 release
+- git tag 389-admin-1.1.11.rc2
+- Bug 594745 - Get rid of dirsrv_lib_t label
+
 * Wed Jun  9 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.6.rc1
 - 1.1.11.rc1 release
 
diff --git a/sources b/sources
index dbbfb93..377b04c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc80b47ce1e5bd39d8e5632dd359d1df  389-admin-1.1.11.rc1.tar.bz2
+b766fc81b26d92172115004499b3fe8d  389-admin-1.1.11.rc2.tar.bz2