From d81715fdab931d6d01d0fdecb38a1fb51e7357b3 Mon Sep 17 00:00:00 2001 From: Timothy St. Clair Date: Oct 25 2013 16:11:40 +0000 Subject: Merge branch 'f19' into f20 --- diff --git a/BZ1000106.patch b/BZ1000106.patch new file mode 100644 index 0000000..004d9c2 --- /dev/null +++ b/BZ1000106.patch @@ -0,0 +1,9 @@ +diff --git a/src/condor_examples/condor_config.generic.redhat b/src/condor_examples/condor_config.generic.redhat +index 6f3caaa..a3ac4e7 100644 +--- a/src/condor_examples/condor_config.generic.redhat ++++ b/src/condor_examples/condor_config.generic.redhat +@@ -2315,3 +2315,4 @@ UNHIBERNATE = CurrentTime - MachineLastMatchTime < 1200 + ##-------------------------------------------------------------------- + FILETRANSFER_PLUGINS = $(LIBEXEC)/curl_plugin, $(LIBEXEC)/data_plugin + ++USE_CLONE_TO_CREATE_PROCESSES = False diff --git a/condor.spec b/condor.spec index 01d3513..e86c4a8 100644 --- a/condor.spec +++ b/condor.spec @@ -46,7 +46,7 @@ Summary: Condor: High Throughput Computing Name: condor Version: 8.1.1 -%define condor_base_release 0.2 +%define condor_base_release 0.3 %if %git_build %define condor_release %condor_base_release.%{git_rev}.git %else @@ -114,7 +114,7 @@ Source3: %{name}.service Source4: condor-lcmaps-env.sysconfig %endif -#Patch0: aviaryfields.patch +Patch0: BZ1000106.patch Patch1: chkconfig_off.patch Patch2: hcc_config.patch Patch4: condor_pid_namespaces_v7.patch @@ -123,6 +123,7 @@ Patch8: lcmaps_env_in_init_script.patch Patch9: 0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch Patch11: condor_oom_v3.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake @@ -449,7 +450,7 @@ exit 0 %setup -q -n %{name}-%{tarball_version} %endif -#%patch0 -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch5 -p1 @@ -1228,6 +1229,9 @@ fi %endif %changelog +* Fri Oct 25 2013 Timothy St. Clair - 8.1.1-0.3 +- Patch for workaround on BZ1000106 + * Wed Sep 25 2013 Timothy St. Clair - 8.1.1-0.2 - Fix for BZ1000106 and update to latest @@ -1268,386 +1272,8 @@ fi * Sat Feb 2 2013 Brian Bockelman - 7.9.4-0.4.d028b17.git - Re-sync with master. -* Thu Jan 2 2013 Brian Bockelman - 7.9.4-0.1.dce3324.git +* Wed Jan 2 2013 Brian Bockelman - 7.9.4-0.1.dce3324.git - Add support for python bindings. * Thu Dec 6 2012 Brian Bockelman - 7.9.3-0.6.ce12f50.git - Fix compile for CREAM. - -* Thu Dec 6 2012 Brian Bockelman - 7.9.3-0.5.ce12f50.git -- Merge code which has improved blahp file cleanup. - -* Tue Oct 30 2012 Brian Bockelman - 7.9.2-0.2.b714b0e.git -- Re-up to the latest master. -- Add support for syslog. - -* Thu Oct 11 2012 Brian Bockelman - 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 - 7.9.1-0.13.c7df613.git -- Rebuild to re-enable blahp. - -* Mon Sep 24 2012 Brian Bockelman - 7.9.1-0.12.c7df613.git -- Update to capture the latest security fixes. -- CGAHP scalability fixes have been upstreamed. - -* Thu Aug 16 2012 - 7.9.1-0.1 -- Fast forward to 7.9.1 pre-release -- Fix CVE-2012-3416 - -* Wed Aug 15 2012 Brian Bockelman - 7.9.1-0.11.ecc9193.git -- Fixes to the JobRouter configuration. - -* Tue Aug 14 2012 Brian Bockelman - 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 - 7.9.1-0.9.70b9542.git -- Fix to IP-verify from ZKM. - -* Tue Jul 24 2012 Brian Bockelman - 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 - 7.9.0-0.1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Brian Bockelman - 7.9.1-0.5.ceb6a0a.git -- Upstreaming of many of the custom patches. - -* Mon Jul 16 2012 Brian Bockelman - 7.9.1-0.4.ceb6a0a.git -- Integrate CREAM support from OSG. -- Create CREAM sub-package. - -* Fri Jul 13 2012 Brian Bockelman - 7.9.1-0.2.013069b.git -- Hunt down segfault bug. - -* Fri Jul 13 2012 Brian Bockelman - 7.9.1-0.1.013069b.git -- Update to latest master. - -* Tue Jun 19 2012 Brian Bockelman - 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 - 7.9.0-0.13.888a81cgit -- Patch for C-GAHP client scalability. - -* Fri Jun 15 2012 Brian Bockelman - 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 - 7.9.0-0.11.888a81cgit -- Fix proxy handling for Condor-C submissions. - -* Wed May 30 2012 Brian Bockelman - 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 - 7.9.0-0.8.257bc70git -- Re-enable blahp - -* Wed May 17 2012 Brian Bockelman - 7.9.0-0.7.257bc70git -- Fix reseting of cgroup statistics. - -* Wed May 16 2012 Brian Bockelman - 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 - 7.9.0-0.5.257bc70git -- Fix for autofs support. - -* Fri Apr 27 2012 - 7.9.0-0.1 -- Fast forward to 7.9.0 pre-release - -* Mon Apr 09 2012 Brian Bockelman - 7.9.0-0.1.2693346git.1 -- Update to the 7.9.0 branch. - -* Thu Mar 7 2012 - 7.7.5-0.2 -- Fast forward to 7.7.5 release - -* Fri Feb 10 2012 Brian Bockelman - 7.7.5-0.9.3513b55git -- Fix fd leak for cgroups in the procd. - -* Fri Feb 10 2012 Brian Bockelman - 7.7.5-0.8.3513b55git -- Enable cgroups for EL6. - -* Fri Feb 10 2012 Petr Pisar - 7.7.5-0.1.2 -- Rebuild against PCRE 8.30 - -* Thu Feb 9 2012 - 7.7.5-0.1 -- Fast forward to 7.7.5 pre release - -* Thu Jan 12 2012 Fedora Release Engineering - 7.7.3-0.3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 27 2011 Dan Horák - 7.7.3-0.3 -- mongodb supports only x86/x86_64 => limit plumage subpackage to these arches - -* Fri Nov 11 2011 - 7.7.3-0.2 -- Update install process for tmpfiles.d - -* Tue Oct 25 2011 - 7.7.3-0.1 -- Fast forward to 7.7.3 pre release - -* Fri Sep 16 2011 - 7.7.1-0.1 -- Fast forward to 7.7.1 official release tag V7_7_1 -- ghost var/lock and var/run in spec (BZ656562) - -* Tue Aug 10 2011 - 7.7.0-0.6 -- Rebuild deltacloud dep - -* Tue Jun 8 2011 - 7.7.0-0.5 -- Start to break build products into conditionals for future EPEL5 support. -- Begun integration of a systemd service file. - -* Tue Jun 7 2011 - 7.7.0-0.4 -- Added tmpfiles.d/condor.conf (BZ711456) - -* Tue Jun 7 2011 - 7.7.0-0.3 -- Fast forward to 7.7.0 pre-release at 1babb324 -- Catch libdeltacloud 0.8 update - -* Mon May 23 2011 Brian Bockelman - 7.6.1-0.11.pre -- Begin systemd integration - -* Fri May 20 2011 - 7.7.0-0.2 -- Added GSI support, dependency on Globus - -* Tue May 17 2011 Brian Bockelman - 7.6.1-0.7.pre -- Fix #2162; have spooling and URL plugins interact correctly -- Merge with upstream git repo. - -* Mon May 2 2011 Brian Bockelman - 7.6.1-0.4.pre -- Enable cgroups. - -* Fri Apr 29 2011 Brian Bockelman - 7.6.1-0.3.pre -- Build for https://condor-wiki.cs.wisc.edu/index.cgi/tktview?tn=2109, allowing SubmitterUserResourcesInUse to be weighted. - -* Fri Apr 29 2011 Brian Bockelman - 7.6.1-0.2.pre -- HCC pre-release of 7.6.1 for negotiator fixes. - -* Thu Apr 28 2011 - 7.6.1-0.1 -- Upgrade to 7.6.0 release, pre-release of 7.6.1 at 27972e8 -- Upgrade to 7.6.0 release, pre-release of 7.6.1 at 5617a464 -- Upstreamed patch: log_lock_run.patch -- Introduced condor-classads to obsolete classads -- Introduced condor-aviary, package of the aviary contrib -- Introduced condor-deltacloud-gahp -- Introduced condor-qmf, package of the mgmt/qmf contrib -- Transitioned from LOCAL_CONFIG_FILE to LOCAL_CONFIG_DIR -- Stopped building against gSOAP, -- use aviary over birdbath and ec2_gahp (7.7.0) over amazon_gahp - -* Tue Feb 08 2011 Fedora Release Engineering - 7.5.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 27 2011 - 7.5.5-1 -- Rebase to 7.5.5 release -- configure+imake -> cmake -- Removed patches: -- only_dynamic_unstripped.patch -- gsoap-2.7.16-wsseapi.patch -- gsoap-2.7.16-dom.patch -- man pages are now built with source -- quill is no longer present -- condor_shared_port added -- condor_power added -- condor_credd added -- classads now built from source - -* Thu Jan 13 2011 - 7.4.4-1 -- Upgrade to 7.4.4 release -- Upstreamed: stdsoap2.h.patch.patch - -* Mon Aug 23 2010 - 7.4.3-1 -- Upgrade to 7.4.3 release -- Upstreamed: dso_link_change - -* Fri Jun 11 2010 - 7.4.2-2 -- Rebuild for classads DSO version change (1:0:0) -- Updated stdsoap2.h.patch.patch for gsoap 2.7.16 -- Added gsoap-2.7.16-wsseapi/dom.patch for gsoap 2.7.16 - -* Wed Apr 21 2010 - 7.4.2-1 -- Upgrade to 7.4.2 release - -* Tue Jan 5 2010 - 7.4.1-1 -- Upgrade to 7.4.1 release -- Upstreamed: guess_version_from_release_dir, fix_platform_check -- Security update (BZ549577) - -* Fri Dec 4 2009 - 7.4.0-1 -- Upgrade to 7.4.0 release -- Fixed POSTIN error (BZ540439) -- Removed NOTICE.txt source, now provided by upstream -- Removed no_rpmdb_query.patch, applied upstream -- Removed no_basename.patch, applied upstream -- Added only_dynamic_unstripped.patch to reduce build time -- Added guess_version_from_release_dir.patch, for previous -- Added fix_platform_check.patch -- Use new --with-platform, to avoid modification of make_final_tarballs -- Introduced vm-gahp package to hold libvirt deps - -* Fri Aug 28 2009 - 7.2.4-1 -- Upgrade to 7.2.4 release -- Removed gcc44_const.patch, accepted upstream -- New log, lock, run locations (BZ502175) -- Filtered innocuous semanage message - -* Fri Aug 21 2009 Tomas Mraz - 7.2.1-3 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 7.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 25 2009 - 7.2.1-1 -- Upgraded to 7.2.1 release -- Pruned changes accepted upstream from condor_config.generic.patch -- Removed Requires in favor of automatic dependencies on SONAMEs -- Added no_rmpdb_query.patch to avoid rpm -q during a build - -* Tue Feb 24 2009 Fedora Release Engineering - 7.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 15 2009 Tomas Mraz - 7.2.0-4 -- rebuild with new openssl - -* Mon Jan 14 2009 - 7.2.0-3 -- Fixed regression: initscript was on by default, now off again - -* Thu Jan 8 2009 - 7.2.0-2 -- (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local -- Added missing Obsoletes for condor-static (thanks Michael Schwendt) - -* Wed Jan 7 2009 - 7.2.0-1 -- Upgraded to 7.2.0 release -- Removed -static package -- Added Fedora specific buildid -- Enabled KBDD, daemon to monitor X usage on systems with only USB devs -- Updated install process - -* Wed Oct 8 2008 - 7.0.5-1 -- Rebased on 7.0.5, security update - -* Wed Aug 6 2008 - 7.0.4-1 -- Updated to 7.0.4 source -- Stopped using condor_configure in install step - -* Tue Jun 10 2008 - 7.0.2-1 -- Updated to 7.0.2 source -- Updated config, specifically HOSTALLOW_WRITE, for Personal Condor setup -- Added condor_config.generic - -* Mon Apr 7 2008 - 7.0.0-8 -- Modified init script to be off by default, resolves bz441279 - -* Fri Apr 4 2008 - 7.0.0-7 -- Updated to handle changes in gsoap dependency - -* Mon Feb 11 2008 - 7.0.0-6 -- Added note about how to download the source -- Added generate-tarball.sh script - -* Sun Feb 10 2008 - 7.0.0-5 -- The gsoap package is compiled with --disable-namespaces, which means - soap_set_namespaces is required after each soap_init. The - gsoap_nonamespaces.patch handles this. - -* Fri Feb 8 2008 - 7.0.0-4 -- Added patch to detect GCC 4.3.0 on F9 -- Added patch to detect GLIBC 2.7.90 on F9 -- Added BuildRequires: autoconf to allow for regeneration of configure - script after GCC 4.3.0 detection and GLIBC 2.7.90 patches are - applied -- Condor + GCC 4.3.0 + -O2 results in an internal compiler error - (BZ 432090), so -O2 is removed from optflags for the time - being. Thanks to Mike Bonnet for the suggestion on how to filter - -O2. - -* Tue Jan 22 2008 - 7.0.0-3 -- Update to UW's really-final source for Condor 7.0.0 stable series - release. It is based on the 72173 build with minor changes to the - configure.ac related to the SRB external version. -- In addition to removing externals from the UW tarball, the NTconfig - directory was removed because it had not gone through IP audit. - -* Tue Jan 22 2008 - 7.0.0-2 -- Update to UW's final source for Condor 7.0.0 stable series release - -* Thu Jan 10 2008 - 7.0.0-1 -- Initial package of Condor's stable series under ASL 2.0 -- is_clipped.patch replaced with --without-full-port option to configure -- zlib_is_soft.patch removed, outdated by configure.ac changes -- removed autoconf dependency needed for zlib_is_soft.patch - -* Tue Dec 4 2007 - 6.9.5-2 -- SELinux was stopping useradd in pre because files specified root as - the group owner for /var/lib/condor, fixed, much thanks to Phil Knirsch - -* Fri Nov 30 2007 - 6.9.5-1 -- Fixed release tag -- Added gSOAP support and packaged WSDL files - -* Thu Nov 29 2007 - 6.9.5-0.2 -- Packaged LSB init script -- Changed pre to not create the condor user's home directory, it is - now a directory owned by the package - -* Thu Nov 29 2007 - 6.9.5-0.1 -- Condor 6.9.5 release, the 7.0.0 stable series candidate -- Removed x86_64_no_multilib-200711091700cvs.patch, merged upstream -- Added patch to make zlib a soft requirement, which it should be -- Disabled use of smp_mflags because of make dependency issues -- Explicitly not packaging WSDL files until the SOAP APIs are available - -* Tue Nov 20 2007 - 6.9.5-0.3.200711091700cvs -- Rebuild for repo inheritance update: dependencies are now pulled - from RHEL 5 U1 before RH Application Stack - -* Thu Nov 15 2007 - 6.9.5-0.2.200711091700cvs -- Added support for building on x86_64 without multilib packages -- Made the install section more flexible, reduced need for - make_final_tarballs to be updated - -* Fri Nov 9 2007 - 6.9.5-0.1.200711091700cvs -- Working source with new ASL 2.0 license - -* Fri Nov 9 2007 - 6.9.5-0.1.200711091330cvs -- Source is now stamped ASL 2.0, as of Nov 9 2007 1:30PM Central -- Changed license to ASL 2.0 -- Fixed find in prep to work if no files have bad permissions -- Changed the name of the LICENSE file to match was is now release in - the source tarball - -* Tue Nov 6 2007 - 6.9.5-0.1.rc -- Added m4 dependency not in RHEL 5.1's base -- Changed chmod a-x script to use find as more files appear to have - improper execute bits set -- Added ?dist to Release: -- condor_privsep became condor_root_switchboard - -* Tue Sep 11 2007 - 6.9.5-0.3.20070907cvs -- Instead of releasing libcondorapi.so, which is improperly created - and poorly versioned, we release libcondorapi.a, which is apparently - more widely used, in a -static package -- Instead of installing the stripped tarball, the unstripped is now - installed, which gives a nice debuginfo package -- Found and fixed permissions problems on a number of src files, - issue raised by rpmlint on the debuginfo package - -* Mon Sep 10 2007 - 6.9.5-0.2.20070907cvs -- Updated pre section to create condor's home directory with adduser, and - removed _var/lib/condor from files section -- Added doc LICENSE.TXT to all files sections -- Shortened lines longer than 80 characters in this spec (except the sed line) -- Changed install section so untar'ing a release can handle fedora7 or fedora8 -- Simplified the site.def and config file updates (sed + mv over mv + sed + rm) -- Added a patch (fedora_rawhide_7.91-20070907cvs.patch) to support building on - a fedora 7.91 (current Rawhide) release -- Moved the examples from /usr/share/doc/condor... into builddir and just - marked them as documentation -- Added a number of dir directives to force all files to be listed, no implicit - inclusion - -* Fri Sep 7 2007 - 6.9.5-0.1.20070907cvs -- Initial release