[condor: 31/31] Merge Fedora build into HCC build.

Brian Bockelman bbockelm at fedoraproject.org
Fri Mar 8 01:22:15 UTC 2013


commit e02692304d0965cff98259bcc4c3b2dad5fb868d
Merge: 0686d1b b2248ee
Author: Brian Bockelman <bbockelm at cse.unl.edu>
Date:   Wed Mar 6 21:10:44 2013 -0600

    Merge Fedora build into HCC build.

 .gitignore                  |   11 ++-
 condor-tmpfiles.conf        |    3 +-
 condor.spec                 |  316 +++++++++++++++++++++++++------------------
 condor_config.generic.patch |   89 +++++++++----
 generate-tarball.sh         |    3 +-
 sources                     |    2 +-
 6 files changed, 261 insertions(+), 163 deletions(-)
---
diff --cc .gitignore
index 34a694b,bac0213..437b96f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,11 +1,12 @@@
  .*.swp
- /condor-7.7.3-c39a8b84-GIT.tar.gz
 +_build
+ /condor-7.7.3-c39a8b84-GIT.tar.gz
+ /condor-7.7.5-03a0f934-GIT.tar.gz
+ /condor-7.7.5-e5e734c8-GIT.tar.gz
+ /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
+ /condor-7.9.1-83a2a073-RH.tar.gz
+ /condor-7.9.5-af94b2ac-RH.tar.gz
+ /condor-7.9.5-8015f029-RH.tar.gz
diff --cc condor.spec
index 2626a8a,ff84455..b96f0ce
--- a/condor.spec
+++ b/condor.spec
@@@ -1,9 -1,7 +1,9 @@@
  %define tarball_version 7.9.5
  
- %define _default_patch_fuzz 2
++#%define _default_patch_fuzz 2
 +
  # Things for F15 or later
- %if 0%{?fedora} >= 15
+ %if 0%{?fedora} >= 16
  %define deltacloud 1
  %define aviary 1
  %ifarch %{ix86} x86_64
@@@ -14,24 -12,17 +14,22 @@@
  %endif
  %define systemd 1
  %define cgroups 1
- %define qmf 1
  %else
  %define deltacloud 0
 -%define aviary 0
 +%define aviary 1
  %define plumage 0
  %define systemd 0
  %define cgroups 0
- %define qmf 1
  %endif
  
 +%if 0%{?rhel} >= 6
 +%define cgroups 1
 +%endif
 +
  # Things not turned on, or don't have Fedora packages yet
 -%define blahp 0
 -%define glexec 0
 +%define blahp 1
 +%define glexec 1
 +%define cream 1
  
  # These flags are meant for developers; it allows one to build Condor
  # based upon a git-derived tarball, instead of an upstream release tarball
@@@ -47,10 -33,10 +45,10 @@@
  
  Summary: Condor: High Throughput Computing
  Name: condor
- Version: %{tarball_version}
+ Version: 7.9.5
 -%define condor_base_release 0.1
 +%define condor_base_release 0.3
  %if %git_build
 -	%define condor_release %condor_base_release.%{git_rev}git
 +	%define condor_release %condor_base_release.%{git_rev}.git
  %else
  	%define condor_release %condor_base_release
  %endif
@@@ -107,27 -95,9 +107,27 @@@ Source1: generate-tarball.s
  
  %if %systemd
  Source2: %{name}-tmpfiles.conf
 -Source3: condor.service
 +Source3: %{name}.service
 +%else
 +Source4: condor-lcmaps-env.sysconfig
  %endif
+ 
 +Patch0: condor_config.generic.patch
 +Patch1: chkconfig_off.patch
- 
 +Patch2: hcc_config.patch
 +Patch3: wso2-axis2.patch
 +Patch4: condor_pid_namespaces_v7.patch
 +Patch5: condor-gahp.patch
 +#Patch6: cgahp_scaling.patch
 +#Patch7: condor-1605-v4.patch
 +#Patch7: condor_host_alias_patch.txt
 +Patch8: lcmaps_env_in_init_script.patch
 +# See gt3158
 +Patch9: 0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch
 +Patch11: condor_oom_v3.patch
 +# From ZKM
 +#Patch12: zkm-782.patch
 +
  BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
  BuildRequires: %_bindir/cmake
@@@ -144,9 -114,7 +144,8 @@@ BuildRequires: /usr/include/curl/curl.
  BuildRequires: /usr/include/expat.h
  BuildRequires: openldap-devel
  BuildRequires: /usr/include/ldap.h
- BuildRequires: qpid-qmf-devel
  BuildRequires: latex2html
 +BuildRequires: boost-devel
  
  # Globus GSI build requirements
  BuildRequires: globus-gssapi-gsi-devel
@@@ -383,47 -350,9 +393,47 @@@ Requires: pcre-deve
  Obsoletes: classads-devel <= 1.0.8
  
  %description classads-devel
- Header files for Condor's ClassAd Library, a powerful and flexible,
+ Header files for HTCondor's ClassAd Library, a powerful and flexible,
  semi-structured representation of data.
  
 +%if %cream
 +#######################
 +%package cream-gahp
 +Summary: Allows Condor to act as a client to CREAM.
 +Group: Applications/System
 +Requires: %name = %version-%release
 +
 +%description cream-gahp
 +The cream_gahp enables the Condor grid universe to communicate with a remote
 +CREAM server.
 +%endif
 +
 +#######################
 +%package python
 +Summary: Python bindings for Condor.
 +Group: Applications/System
 +Requires: %name = %version-%release
 +
 +%description python
 +The python bindings allow one to directly invoke the C++ implementations of
 +the ClassAd library and HTCondor from python
 +
 +#######################
 +%package bosco
 +Summary: BOSCO, a Condor overlay system for managing jobs at remote clusters
 +Url: http://bosco.opensciencegrid.org
 +Group: Applications/System
 +Requires: %name = %version-%release
 +
 +%description bosco
 +BOSCO allows a locally-installed Condor to submit jobs to remote clusters,
 +using SSH as a transit mechanism.  It is designed for cases where the remote
 +cluster is using a different batch system such as PBS, SGE, LSF, or another
 +Condor system.
 +
 +BOSCO provides an overlay system so the remote clusters appear to be a Condor
 +cluster.  This allows the user to run their workflows using Condor tools across
 +multiple clusters.
  
  %pre
  getent group condor >/dev/null || groupadd -r condor
@@@ -467,7 -376,8 +477,9 @@@ find src -perm /a+x -type f -name "*.[C
  %build
  
  %cmake -DNO_PHONE_HOME:BOOL=TRUE \
 +       -DBUILD_TESTING:BOOL=FALSE \
+        -DBUILDID:STRING=RH-%{version}-%{release} \
+        -D_VERBOSE:BOOL=TRUE \
         -DHAVE_BACKFILL:BOOL=FALSE \
         -DHAVE_BOINC:BOOL=FALSE \
         -DWITH_GSOAP:BOOL=FALSE \
@@@ -491,25 -403,7 +505,18 @@@
  %else
         -DWITH_AVIARY:BOOL=FALSE \
  %endif
- %if %qmf
-        -DWITH_TRIGGERD:BOOL=TRUE \
-        -DWITH_MANAGEMENT:BOOL=TRUE \
- %else
-        -DWITH_TRIGGERD:BOOL=FALSE \
-        -DWITH_MANAGEMENT:BOOL=FALSE \
- %endif
         -DWANT_FULL_DEPLOYMENT:BOOL=TRUE \
 +%if %blahp
 +       -DBLAHP_FOUND=/usr/libexec/BLClient \
 +       -DWITH_BLAHP:BOOL=TRUE \
 +%else
 +       -DWITH_BLAHP:BOOL=FALSE \
 +%endif
 +%if %cream
 +       -DWITH_CREAM:BOOL=TRUE \
 +%else
 +       -DWITH_CREAM:BOOL=FALSE \
 +%endif
  %if %glexec
         -DWANT_GLEXEC:BOOL=TRUE \
  %else
@@@ -522,9 -416,8 +529,9 @@@
         -DWITH_LIBDELTACLOUD:BOOL=FALSE \
  %endif
         -DWITH_GLOBUS:BOOL=TRUE \
 +       -DWITH_PYTHON_BINDINGS:BOOL=TRUE \
  %if %cgroups
-        -DLIBCGROUP_FOUND_SEARCH_cgroup=/%{_lib}/libcgroup.so.1
+ 	-DWITH_LIBCGROUP:BOOL=TRUE
  %endif
  
  make %{?_smp_mflags}
@@@ -599,11 -490,6 +603,9 @@@ populate %_sysconfdir/condor/config.d %
  mkdir -p %{buildroot}/%{_var}/lib/condor/aviary
  populate %{_var}/lib/condor/aviary %{buildroot}/usr/axis2.xml
  populate %{_var}/lib/condor/aviary %{buildroot}/usr/services/
 +#populate %{_var}/lib/condor/aviary %{buildroot}/usr/collector/
- mv %{buildroot}%{_var}/lib/condor/aviary/services/hadoop/libaviary_hadoop_axis.so %{buildroot}%{_libdir}/condor/plugins/
++#mv %{buildroot}%{_var}/lib/condor/aviary/services/hadoop/libaviary_hadoop_axis.so %{buildroot}%{_libdir}/condor/plugins/
 +mv %{buildroot}%{_var}/lib/condor/aviary/services/collector/libaviary_collector_axis.so %{buildroot}%{_libdir}/condor/plugins/
- mv %{buildroot}%{_datadir}/condor/libaviary_axis_provider.so %{buildroot}%{_libdir}/condor/plugins/
- mv %{buildroot}%{_datadir}/condor/libaviary_wso2_common.so %{buildroot}%{_libdir}/condor/plugins/
  %endif
  
  %if %plumage
@@@ -658,10 -545,14 +660,14 @@@ rm -r %{buildroot}/%{_sysconfdir}/init.
  %if %systemd
  # install tmpfiles.d/condor.conf
  mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
 -install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 +install -m 0644 %{name}-tmpfiles.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
  
+ mkdir -p %{buildroot}%{_localstatedir}/run/
+ install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
+ 
  mkdir -p %{buildroot}%{_unitdir}
 -cp %{SOURCE3} %{buildroot}%{_unitdir}/condor.service
 +cp %{name}.service %{buildroot}%{_unitdir}/condor.service
+ 
  %else
  # install the lsb init script
  mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
@@@ -771,13 -644,15 +770,12 @@@ rm -rf %{buildroot
  %_initrddir/condor
  %endif
  %dir %_datadir/condor/
 -#%_datadir/condor/Chirp.jar
  %_datadir/condor/CondorJavaInfo.class
  %_datadir/condor/CondorJavaWrapper.class
- # dep problem in 7.7.3
  #%_datadir/condor/Condor.pm
  %_datadir/condor/scimark2lib.jar
 -#%_datadir/condor/gt4-gahp.jar
 -#%_datadir/condor/gt42-gahp.jar
  %dir %_sysconfdir/condor/config.d/
 -%_sysconfdir/condor/config.d/00personal_condor.config
 +%config(noreplace) %_sysconfdir/condor/config.d/00personal_condor.config
  %_sysconfdir/condor/condor_ssh_to_job_sshd_config_template
  %dir %_libexecdir/condor/
  %_libexecdir/condor/condor_chirp
@@@ -808,6 -681,8 +806,8 @@@
  %_libexecdir/condor/condor_glexec_wrapper
  %_libexecdir/condor/glexec_starter_setup.sh
  %_libexecdir/condor/condor_defrag
 -%_libexecdir/condor/condor_schedd.init
++#%_libexecdir/condor/condor_schedd.init
+ %_libexecdir/condor/interactive.sub
  %_mandir/man1/condor_advertise.1.gz
  %_mandir/man1/condor_check_userlogs.1.gz
  %_mandir/man1/condor_chirp.1.gz
@@@ -853,10 -728,12 +853,12 @@@
  %_mandir/man1/condor_glidein.1.gz
  %_mandir/man1/condor_gather_info.1.gz
  %_mandir/man1/condor_router_rm.1.gz
+ 
  # bin/condor is a link for checkpoint, reschedule, vacate
 -%_libdir/libcondor_utils_7_9_5.so
 +%_libdir/libcondor_utils*.so
  #%_bindir/condor
  %_bindir/condor_submit_dag
+ %_bindir/condor_who
  %_bindir/condor_prio
  %_bindir/condor_transfer_data
  %_bindir/condor_check_userlogs
@@@ -892,8 -769,8 +894,7 @@@
  %_bindir/condor_continue
  %_bindir/condor_suspend
  %_bindir/condor_test_match
 -#%_bindir/condor_glidein
  %_bindir/condor_drain
- %_bindir/condor_who
  # sbin/condor is a link for master_off, off, on, reconfig,
  # reconfig_schedd, restart
  #%_sbindir/condor
@@@ -935,19 -812,10 +936,19 @@@
  %dir %_var/lib/condor/execute/
  %dir %_var/log/condor/
  %dir %_var/lib/condor/spool/
 +%if %systemd
  %ghost %dir %_var/lock/condor/
  %ghost %dir %_var/run/condor/
 +%else
 +%dir %_var/lock/condor
 +%dir %_var/lock/condor/local
 +%dir %_var/run/condor
 +%endif
 +
 +%_libexecdir/condor/accountant_log_fixer
 +%_datadir/condor/libcondorapi.so
- %_libexecdir/condor/interactive.sub
  
+ #################
  %files procd
  %_sbindir/condor_procd
  %_sbindir/gidd_alloc
@@@ -957,55 -825,21 +958,34 @@@
  %_mandir/man1/condor_procd.1.gz
  
  #################
- %if %qmf
- %files qmf
- %defattr(-,root,root,-)
- %doc LICENSE-2.0.txt NOTICE.txt
- %config(noreplace) %_sysconfdir/condor/config.d/60condor-qmf.config
- %dir %_libdir/condor/plugins
- %_libdir/condor/plugins/MgmtCollectorPlugin-plugin.so
- %_libdir/condor/plugins/MgmtMasterPlugin-plugin.so
- %_libdir/condor/plugins/MgmtNegotiatorPlugin-plugin.so
- %_libdir/condor/plugins/MgmtScheddPlugin-plugin.so
- %_libdir/condor/plugins/MgmtStartdPlugin-plugin.so
- %_bindir/get_trigger_data
- %_sbindir/condor_trigger_config
- %_sbindir/condor_triggerd
- %_sbindir/condor_job_server
- %endif
- 
- #################
  %if %aviary
- %files aviary
+ %files aviary-common
  %defattr(-,root,root,-)
  %doc LICENSE-2.0.txt NOTICE.txt
 +%_sysconfdir/condor/config.d/61aviary.config
 +%dir %_libdir/condor/plugins
 +%_libdir/condor/plugins/AviaryScheddPlugin-plugin.so
 +%_libdir/condor/plugins/AviaryLocatorPlugin-plugin.so
 +%_libdir/condor/plugins/AviaryCollectorPlugin-plugin.so
 +%_libdir/condor/plugins/AviaryHadoopPlugin-plugin.so
 +%_libdir/condor/plugins/libaviary_collector_axis.so
- %_libdir/condor/plugins/libaviary_hadoop_axis.so
- %_libdir/condor/plugins/libaviary_wso2_common.so
- %_libdir/condor/plugins/libaviary_axis_provider.so
 +%_sbindir/aviary_query_server
  %dir %_datadir/condor/aviary
  %_datadir/condor/aviary/jobcontrol.py*
- %_datadir/condor/aviary/jobinventory.py*
  %_datadir/condor/aviary/jobquery.py*
- %_datadir/condor/aviary/locator.py*
  %_datadir/condor/aviary/submissions.py*
  %_datadir/condor/aviary/submission_ids.py*
- %_datadir/condor/aviary/submit.py*
- %_datadir/condor/aviary/setattr.py*
- %_datadir/condor/aviary/subinventory.py*
- %_datadir/condor/aviary/collector_tool.py*
 +%_datadir/condor/aviary/hadoop_tool.py*
 +%_datadir/condor/aviary/hdfs_datanode.sh
 +%_datadir/condor/aviary/hdfs_namenode.sh
 +%_datadir/condor/aviary/mapred_jobtracker.sh
 +%_datadir/condor/aviary/mapred_tasktracker.sh
+ %_datadir/condor/aviary/subinventory.py*
+ %_datadir/condor/aviary/submit.py*
+ %_datadir/condor/aviary/setattr.py*
+ %_datadir/condor/aviary/jobinventory.py*
+ %_datadir/condor/aviary/locator.py*
+ %_datadir/condor/aviary/collector_tool.py*
  %dir %_datadir/condor/aviary/dag
  %_datadir/condor/aviary/dag/diamond.dag
  %_datadir/condor/aviary/dag/dag-submit.py*
@@@ -1031,22 -862,55 +1008,54 @@@
  %_var/lib/condor/aviary/services/query/aviary-common.xsd
  %_var/lib/condor/aviary/services/query/aviary-query.xsd
  %_var/lib/condor/aviary/services/query/aviary-query.wsdl
+ %dir %_var/lib/condor/aviary/services/locator
+ %_var/lib/condor/aviary/services/locator/services.xml
  %_var/lib/condor/aviary/services/locator/aviary-common.xsd
- %_var/lib/condor/aviary/services/locator/aviary-locator.wsdl
  %_var/lib/condor/aviary/services/locator/aviary-locator.xsd
- %_var/lib/condor/aviary/services/locator/libaviary_locator_axis.so
- %_var/lib/condor/aviary/services/locator/services.xml
- %_var/lib/condor/aviary/services/collector/aviary-collector.wsdl
- %_var/lib/condor/aviary/services/collector/aviary-collector.xsd
- %_var/lib/condor/aviary/services/collector/aviary-common.xsd
+ %_var/lib/condor/aviary/services/locator/aviary-locator.wsdl
+ %dir %_var/lib/condor/aviary/services/collector
  %_var/lib/condor/aviary/services/collector/services.xml
+ %_var/lib/condor/aviary/services/collector/aviary-common.xsd
+ %_var/lib/condor/aviary/services/collector/aviary-collector.xsd
+ %_var/lib/condor/aviary/services/collector/aviary-collector.wsdl
+ 
+ %files aviary
+ %defattr(-,root,root,-)
+ %doc LICENSE-2.0.txt NOTICE.txt
+ %_sysconfdir/condor/config.d/61aviary.config
+ %_libdir/libaviary_axis_provider.so
+ %_libdir/libaviary_wso2_common.so
+ %dir %_libdir/condor/plugins
+ %_libdir/condor/plugins/AviaryScheddPlugin-plugin.so
+ %_libdir/condor/plugins/AviaryLocatorPlugin-plugin.so
+ %_libdir/condor/plugins/AviaryCollectorPlugin-plugin.so
+ %_sbindir/aviary_query_server
+ %_var/lib/condor/aviary/services/job/libaviary_job_axis.so
+ %_var/lib/condor/aviary/services/query/libaviary_query_axis.so
+ %_var/lib/condor/aviary/services/locator/libaviary_locator_axis.so
 -%_var/lib/condor/aviary/services/collector/libaviary_collector_axis.so
+ 
+ %files aviary-hadoop-common
+ %defattr(-,root,root,-)
+ %doc LICENSE-2.0.txt NOTICE.txt
+ %_var/lib/condor/aviary/services/hadoop/services.xml
  %_var/lib/condor/aviary/services/hadoop/aviary-common.xsd
- %_var/lib/condor/aviary/services/hadoop/aviary-hadoop.wsdl
  %_var/lib/condor/aviary/services/hadoop/aviary-hadoop.xsd
- %_var/lib/condor/aviary/services/hadoop/services.xml
+ %_var/lib/condor/aviary/services/hadoop/aviary-hadoop.wsdl
+ %_datadir/condor/aviary/hadoop_tool.py*
  
+ %files aviary-hadoop
+ %defattr(-,root,root,-)
+ %doc LICENSE-2.0.txt NOTICE.txt
+ %_var/lib/condor/aviary/services/hadoop/libaviary_hadoop_axis.so
+ %_libdir/condor/plugins/AviaryHadoopPlugin-plugin.so
+ %_sysconfdir/condor/config.d/63aviary-hadoop.config
+ %_datadir/condor/aviary/hdfs_datanode.sh
+ %_datadir/condor/aviary/hdfs_namenode.sh
+ %_datadir/condor/aviary/mapred_jobtracker.sh
+ %_datadir/condor/aviary/mapred_tasktracker.sh
  %endif
  
+ #################
  %if %plumage
  %files plumage
  %defattr(-,root,root,-)
@@@ -1221,103 -1058,43 +1236,140 @@@ f
  %endif
  
  %changelog
+ * Thu Feb 28 2013 <tstclair at redhat.com> - 7.9.5-0.1
+ - Fast forward to 7.9.5 pre-release
+ 
 +* Thu Feb 14 2013 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.5-0.1.4e2a2ef.git
 +- Re-sync with master.
 +- Use upstream python bindings.
 +
+ * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 7.9.1-0.1.5
+ - Rebuild for Boost-1.53.0
+ 
+ * Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 7.9.1-0.1.4
+ - Rebuild for Boost-1.53.0
+ 
 +* Sat Feb  2 2013 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.4-0.4.d028b17.git
 +- Re-sync with master.
 +
 +* Thu Jan  2 2013 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.4-0.1.dce3324.git
 +- Add support for python bindings.
 +
 +* Thu Dec  6 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.3-0.6.ce12f50.git
 +- Fix compile for CREAM.
 +
 +* Thu Dec  6 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.3-0.5.ce12f50.git
 +- Merge code which has improved blahp file cleanup.
 +
 +* Tue Oct 30 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.2-0.2.b714b0e.git
 +- Re-up to the latest master.
 +- Add support for syslog.
 +
 +* Thu Oct 11 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.14.b135441.git
 +- Re-up to the latest master.
 +- Split out a separate package for BOSCO.
 +
 +* Tue Sep 25 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.13.c7df613.git
 +- Rebuild to re-enable blahp.
 +
 +* Mon Sep 24 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.12.c7df613.git
 +- Update to capture the latest security fixes.
 +- CGAHP scalability fixes have been upstreamed.
 +
+ * Thu Aug 16 2012 <tstclair at redhat.com> - 7.9.1-0.1
+ - Fast forward to 7.9.1 pre-release
+ - Fix CVE-2012-3416
+ 
 +* Wed Aug 15 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.11.ecc9193.git
 +- Fixes to the JobRouter configuration.
 +
 +* Tue Aug 14 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.10.9e05bd9.git
 +- Update to latest trunk so we can get the EditInPlace JobRouter configs.
 +
 +* Tue Aug 14 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.9.70b9542.git
 +- Fix to IP-verify from ZKM.
 +
 +* Tue Jul 24 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.6.ceb6a0a.git
 +- Fix per-user condor config to be more useful.  See gt3158
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.9.0-0.1.3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
 +* Mon Jul 16 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.5.ceb6a0a.git
 +- Upstreaming of many of the custom patches.
 +
 +* Mon Jul 16 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.4.ceb6a0a.git
 +- Integrate CREAM support from OSG.
 +- Create CREAM sub-package.
 +
 +* Fri Jul 13 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.2.013069b.git
 +- Hunt down segfault bug.
 +
 +* Fri Jul 13 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.1-0.1.013069b.git
 +- Update to latest master.
 +
 +* Tue Jun 19 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.14.888a81cgit
 +- Fix DNS-based hostname checks for GSI.
 +- Add the user lock directory to the file listing.
 +
 +* Sun Jun 17 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.13.888a81cgit
 +- Patch for C-GAHP client scalability.
 +
 +* Fri Jun 15 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.12.888a81cgit
 +- Fix re-acquisition of routed jobs on JR restart.
 +- Allow DNS-based hostname checks for GSI.
 +- Allow the queue super-user to impersonate any other user.
 +
 +* Wed Jun 2 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.11.888a81cgit
 +- Fix proxy handling for Condor-C submissions.
 +
 +* Wed May 30 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.10.888a81cgit
 +- Fix blahp segfault and GLOBUS_LOCATION.
 +- Allow a 2-schedd setup for JobRouter.
 +
 +* Mon May 28 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.8.257bc70git
 +- Re-enable blahp
 +
 +* Wed May 17 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.7.257bc70git
 +- Fix reseting of cgroup statistics.
 +
 +* Wed May 16 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.6.257bc70git
 +- Fix for procd when there is no swap accounting.
 +- Allow condor_defrag to cancel draining when it is happy with things.
 +
 +* Mon May 11 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.5.257bc70git
 +- Fix for autofs support.
 +
+ * Fri Apr 27 2012 <tstclair at redhat.com> - 7.9.0-0.1
+ - Fast forward to 7.9.0 pre-release
+ 
 +* Mon Apr 09 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.9.0-0.1.2693346git.1
 +- Update to the 7.9.0 branch.
 +
+ * Thu Mar 7 2012 <tstclair at redhat.com> - 7.7.5-0.2
+ - Fast forward to 7.7.5 release
+ 
 +* Fri Feb 10 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.7.5-0.9.3513b55git
 +- Fix fd leak for cgroups in the procd.
 +
 +* Fri Feb 10 2012 Brian Bockelman <bbockelm at cse.unl.edu> - 7.7.5-0.8.3513b55git
 +- Enable cgroups for EL6.
 +
+ * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 7.7.5-0.1.2
+ - Rebuild against PCRE 8.30
+ 
+ * Thu Feb 9 2012 <tstclair at redhat.com> - 7.7.5-0.1
+ - Fast forward to 7.7.5 pre release
+ 
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.7.3-0.3.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Sun Nov 27 2011 Dan HorĂ¡k <dan[at]danny.cz> - 7.7.3-0.3
+ - mongodb supports only x86/x86_64 => limit plumage subpackage to these arches
+ 
+ * Fri Nov 11 2011 <tstclair at redhat.com> - 7.7.3-0.2
+ - Update install process for tmpfiles.d
+ 
  * Tue Oct 25 2011 <tstclair at redhat.com> - 7.7.3-0.1
  - Fast forward to 7.7.3 pre release
  
diff --cc condor_config.generic.patch
index 4cf69c1,805c9b5..3b8c780
--- a/condor_config.generic.patch
+++ b/condor_config.generic.patch
@@@ -209,7 -248,18 +248,7 @@@ index a800f31..80ad566 10064
   
   ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
   ##  used to introduce a new classpath:
- @@ -2503,7 +2554,7 @@
 -@@ -2230,8 +2282,8 @@ MAX_VM_GAHP_LOG	= 1000000
 - 
 - ## What kind of virtual machine program will be used for 
 - ## the VM universe?
 --## The two options are vmware and xen.  (Required)
 --#VM_TYPE = vmware
 -+## The three primary options are KVM, Xen and VMware.  (Required: no default)
 -+#VM_TYPE = kvm
 - 
 - ## How much memory can be used for the VM universe? (Required)
 - ## This value is the maximum amount of memory that can be used by the 
+ @@ -2458,7 +2510,7 @@ KBDD_ADDRESS_FILE = $(LOG)/.kbdd_address
   #SSH_TO_JOB_SSHD_ARGS = "-i -e -f %f"
   
   # sshd configuration template used by condor_ssh_to_job_sshd_setup.


More information about the scm-commits mailing list