[condor/f17] 7.9.1-0.1

tstclair tstclair at fedoraproject.org
Thu Aug 16 16:30:37 UTC 2012


commit 88a48d09cd83f0c0d411ed2bb843001a4186e2be
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Aug 16 11:28:50 2012 -0500

    7.9.1-0.1

 .gitignore  |    1 +
 condor.spec |   18 +++++++++++-------
 sources     |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 795d7af..da3ed29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /condor-7.7.5-e5e734c8-2-GIT.tar.gz
 /condor-7.9.0-3b0e7b0c-GIT.tar.gz
 /condor-7.9.1-65cac1a2-RH.tar.gz
+/condor-7.9.1-c88f1e4e-RH.tar.gz
diff --git a/condor.spec b/condor.spec
index a98e651..9f4f7f4 100644
--- a/condor.spec
+++ b/condor.spec
@@ -90,7 +90,7 @@ Source0: condor.tar.gz
 #   8f6ba9377309d0d961de538224664f5b  condor_src-7.9.1-all-all.tar.gz
 #
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.9.1-65cac1a2-RH.tar.gz
+Source0: condor-7.9.1-c88f1e4e-RH.tar.gz
 Source1: generate-tarball.sh
 %endif
 
@@ -979,6 +979,14 @@ rm -rf %{buildroot}
 
 %if %systemd
 %post
+test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
+if [ $? = 0 ]; then
+   restorecon -R -v /var/lock/condor
+   setsebool -P condor_domain_can_network_connect 1
+   semanage port -a -t condor_port_t -p tcp 12345
+   # the number of extraneous SELinux warnings on f17 is very high
+fi
+
 if [ $1 -eq 1 ] ; then
     # Initial installation 
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -1010,11 +1018,6 @@ fi
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
-#test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
-#if [ $? = 0 ]; then
-#   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd
-#   restorecon  %_sbindir/condor_startd
-#fi
 
 %preun -n condor
 if [ $1 = 0 ]; then
@@ -1031,8 +1034,9 @@ fi
 %endif
 
 %changelog
-* Thu Aug 9 2012 <tstclair at redhat.com> - 7.9.1-0.1
+* Wed Aug 15 2012 <tstclair at redhat.com> - 7.9.1-0.1
 - Fast forward to 7.9.1 pre-release
+- Fix CVE-2012-3416
 
 * Fri Apr 27 2012 <tstclair at redhat.com> - 7.9.0-0.1
 - Fast forward to 7.9.0 pre-release
diff --git a/sources b/sources
index db20704..cc0a15e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f0f21bdfc802259e8bd3171d69851ca  condor-7.9.1-65cac1a2-RH.tar.gz
+aac9cd4e8f1e784d51182d9e4c29ceed  condor-7.9.1-c88f1e4e-RH.tar.gz


More information about the scm-commits mailing list