[389-ds-base/el4/master: 91/91] Merge branch 'el5' into el4
Richard Allen Megginson
rmeggins at fedoraproject.org
Wed Aug 4 16:53:47 UTC 2010
commit d08957d20143b39931960eca5595f20bca48c958
Merge: 5ed5bbc 3a4827c
Author: Rich Megginson <rmeggins at redhat.com>
Date: Wed Aug 4 10:53:01 2010 -0600
Merge branch 'el5' into el4
Conflicts:
.gitignore
389-ds-base-git-local.sh
389-ds-base-git.sh
389-ds-base.spec
sources
.gitignore | 3 ++-
389-ds-base-git-local.sh | 2 +-
389-ds-base-git.sh | 2 +-
389-ds-base.spec | 46 +++++++++++++++++++++++++++++++++++++++-------
sources | 2 +-
5 files changed, 44 insertions(+), 11 deletions(-)
---
diff --cc 389-ds-base.spec
index 9d6032d,1318f09..9eb986a
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -107,7 -123,16 +117,6 @@@ export USE_64=
make %{?_smp_mflags}
-
-# Build the SELinux policy module for each variant
-cd selinux-built
-for selinuxvariant in %{selinux_variants}
-do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- mv %{pkgname}.pp %{pkgname}.pp.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
-
%install
rm -rf $RPM_BUILD_ROOT
@@@ -131,7 -156,24 +140,6 @@@ install -p -m 644 ldap/servers/plugins/
# 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
-
-# Install the SELinux policy
-cd selinux-built
-for selinuxvariant in %{selinux_variants}
-do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 %{pkgname}.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp
-done
-cd -
-
-# Install the SELinux policy interface
-cd selinux-built
-install -d %{buildroot}%{_datadir}/%{pkgname}-selinux
-install -p -m 644 %{pkgname}.if %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.if
-install -p -m 644 %{pkgname}.te %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.te
-install -p -m 644 %{pkgname}.fc %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.fc
-cd -
-
%clean
rm -rf $RPM_BUILD_ROOT
@@@ -156,46 -239,71 +164,56 @@@ if [ $1 = 0 ]; then # Final remova
/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 -p <lua>
--- if we saved the run level configuration in %pre, restore it now
--- we can get rid of this code once Fedora 11 becomes obsolete
-if %{pkgname}_savelinks then
- for fullpath,link in pairs(%{pkgname}_savelinks) do
- posix.symlink(link,fullpath)
--- print("posttrans - restored run level "..fullpath.." to "..link)
- end
-end
-if %{pkgname}_upgrading then
- instbase = "%{_sysconfdir}/%{pkgname}"
--- print("posttrans - upgrading - looking for instances in "..instbase)
--- find all instances
- instances = {} -- instances that require a restart after upgrade
- for dir in posix.files(instbase) do
--- print("dir="..dir)
- if string.find(dir,"^slapd-") and not string.find(dir,"\.removed$") then
- inst = string.gsub(dir,"^slapd[-]", "")
--- print("found instance "..inst.." getting status")
- rc = os.execute('/sbin/service %{pkgname} status '..inst..' >/dev/null 2>&1')
--- if instance is running, we must restart it after upgrade
- if rc == 0 then
- instances[inst] = inst
--- print("instance "..inst.." is running")
--- else
--- print("instance "..inst.." is shutdown")
- end
- end
- end
--- shutdown all instances
--- print("shutting down all instances . . .")
- os.execute('/sbin/service %{pkgname} stop > /dev/null 2>&1')
--- do the upgrade
--- print("upgrading instances . . .")
- os.execute('%{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1')
--- restart instances that require it
- for inst,dummy in pairs(instances) do
--- print("restarting instance "..inst)
- os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1')
- end
--- restart the snmp subagent if needed
- os.execute('/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1')
-end
--- if we upgraded from fedora to 389, the upgrade will shutdown
--- all old running instances, so we have to start them here
-if %{pkgname}_exists then
--- print("restarting all instances due to package rename")
- os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
-end
-
+%posttrans
+if [ $1 -gt 0 ] ; then
+ instbase="%{_sysconfdir}/%{pkgname}"
+# echo posttrans - upgrading - looking for instances in $instbase
+# find all instances
+ instances=""
+ for dir in $instbase/slapd-* ; do
+ case "$dir" in
+ *.removed) continue ;;
+ esac
+ if [ ! -d "$dir" ] ; then
+ continue;
+ fi
+ inst=${dir#slapd-}
+# echo found instance $inst getting status
+ if /sbin/service %{pkgname} status $inst >/dev/null 2>&1 ; then
+# if instance is running, we must restart it after upgrade
+ instances="$instances $inst"
+# echo instance $inst is running
+# else
+# echo instance $inst is shutdown
+ fi
+ done
+# shutdown all instances
+# echo shutting down all instances . . .
+ /sbin/service %{pkgname} stop > /dev/null 2>&1
+# do the upgrade
+# echo upgrading instances . . .
+ %{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1
+# restart instances that require it
+ for inst in $instances ; do
+# echo restarting instance $inst
+ /sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1
+ done
+fi
-
%files
%defattr(-,root,root,-)
@@@ -231,8 -340,25 +250,21 @@@
%{_includedir}/%{pkgname}
%{_libdir}/%{pkgname}/*.so
-
-%files selinux-devel
-%defattr(-,root,root,-)
-%{_datadir}/%{pkgname}-selinux
-
%changelog
+ * Mon Aug 2 2010 Rich Megginson <rmeggins at 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 at redhat.com> - 1.2.6-0.8.rc3
- 1.2.6 release candidate 3
- git tag 389-ds-base-1.2.6.rc3
More information about the scm-commits
mailing list