From d08957d20143b39931960eca5595f20bca48c958 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 04 2010 16:53:01 +0000
Subject: Merge branch 'el5' into el4


Conflicts:

	.gitignore
	389-ds-base-git-local.sh
	389-ds-base-git.sh
	389-ds-base.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 30216f5..5d85e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-389-ds-base-1.2.6.rc3.tar.bz2
+389-ds-base-1.2.6.rc6.tar.bz2
+*~
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 999539c..39562f4 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.6.rc3
+VERSION=1.2.6.rc6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 4514966..2825260 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.6.rc3
+VERSION=1.2.6.rc6
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 9d6032d..9eb986a 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -1,20 +1,21 @@
 
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
-%global prerel .rc3
+%global prerel .rc6
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.6
-Release:          %{?relprefix}8%{?prerel}%{?dist}
+Release:          %{?relprefix}9%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:         fedora-ds-base = %{version}-%{release}
 Obsoletes:        fedora-ds-base < 1.2.1-1
+Obsoletes:        %{name}-selinux
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -37,6 +38,15 @@ BuildRequires:    tcp_wrappers
 # the following is for the pam passthru auth plug-in
 BuildRequires:    pam-devel
 
+# this is needed for using semanage from our setup scripts
+Requires:         policycoreutils
+
+# these are needed for selinux
+Requires:         selinux-policy >= 2.4.6-203
+Requires(post):   policycoreutils
+Requires(preun):  policycoreutils
+Requires(postun): policycoreutils
+
 # the following are needed for some of our scripts
 Requires:         mozldap-tools
 Requires:         perl-Mozilla-LDAP
@@ -107,7 +117,6 @@ export USE_64=1
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT 
 
@@ -131,7 +140,6 @@ install -p -m 644 ldap/servers/plugins/replication/repl-session-plugin.h $RPM_BU
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -156,9 +164,20 @@ if [ $1 = 0 ]; then # Final removal
         /sbin/chkconfig --del %{pkgname}
         /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}-snmp
+        for selinuxvariant in %{selinux_variants}
+        do
+          semodule -s ${selinuxvariant} -r %{pkgname} 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}.pp 2>/dev/null || :
+done
+fi
 
 %posttrans
 if [ $1 -gt 0 ] ; then
@@ -195,7 +214,6 @@ if [ $1 -gt 0 ] ; then
         /sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1
     done
 fi
-   
 
 %files
 %defattr(-,root,root,-)
@@ -210,6 +228,7 @@ fi
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
+%{_datadir}/selinux/*/%{pkgname}.pp
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
 %{_bindir}/*
@@ -231,8 +250,21 @@ fi
 %{_includedir}/%{pkgname}
 %{_libdir}/%{pkgname}/*.so
 
-
 %changelog
+* Mon Aug  2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.9.rc6
+- 1.2.6 release candidate 6
+- git tag 389-ds-base-1.2.6.rc6
+- Bug 617013 - repl-monitor.pl use cpu upto 90%
+- Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats
+- Bug 547503 - replication broken again, with 389 MMR replication and TCP errors
+- Bug 613833 - Allow dirsrv_t to bind to rpc ports
+- Bug 612242 - membership change on DS does not show on AD
+- Bug 617629 - Missing aliases in new schema files
+- Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears
+- Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments
+- Bug 617862 - Replication: Unable to delete tombstone errors
+- Bug 594745 - Get rid of dirsrv_lib_t label
+
 * Thu Jul  1 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.8.rc3
 - 1.2.6 release candidate 3
 - git tag 389-ds-base-1.2.6.rc3
diff --git a/sources b/sources
index ae9ee47..011cf7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18511d2ec2b2b7704ae12e552077d1f6  389-ds-base-1.2.6.rc3.tar.bz2
+143c4653cf8f3fd3e4cf12617deb8a0f  389-ds-base-1.2.6.rc6.tar.bz2