From 5c1920c248f86cad85ce40c02549ed8066dfff62 Mon Sep 17 00:00:00 2001 From: matt Date: May 20 2010 21:53:07 +0000 Subject: sync with F-12/13 --- diff --git a/chkconfig_off.patch b/chkconfig_off.patch index 66ac9cd..f61db0b 100644 --- a/chkconfig_off.patch +++ b/chkconfig_off.patch @@ -5,8 +5,8 @@ diff -ru condor-7.2.0/src/condor_examples/condor.init condor-7.2.0mf/src/condor_ # # condor This script allows for starting and stopping Condor. # --# chkconfig: 2345 90 10 -+# chkconfig: - 90 10 +-# chkconfig: 2345 98 10 ++# chkconfig: - 98 10 # description: Condor is a high throughput computing batch processing # platform. # processname: condor_master diff --git a/condor.spec b/condor.spec index e8727eb..7b455f2 100644 --- a/condor.spec +++ b/condor.spec @@ -1,6 +1,6 @@ Summary: Condor: High Throughput Computing Name: condor -Version: 7.2.4 +Version: 7.4.2 Release: 1%{?dist} License: ASL 2.0 Group: Applications/System @@ -20,16 +20,18 @@ URL: http://www.cs.wisc.edu/condor/ # a2dd96ea537b2c6d105b6c8dad563ddc condor_src-7.2.0-all-all.tar.gz # edbac8267130ac0a0e016d0f113b4616 condor_src-7.2.1-all-all.tar.gz # 6d9b0ef74d575623af11e396fa274174 condor_src-7.2.4-all-all.tar.gz +# ee72b65fad02d21af0dc8f1aa5872110 condor_src-7.4.0-all-all.tar.gz +# d4deeabbbce65980c085d8bea4c1018a condor_src-7.4.1-all-all.tar.gz +# 4714086f58942b78cf03fef9ccb1117c condor_src-7.4.2-all-all.tar.gz # Note: The md5sum of each generated tarball may be different -Source0: condor-7.2.4-159529-RH.tar.gz +Source0: condor-7.4.2-227044-RH.tar.gz Source1: generate-tarball.sh -Source2: NOTICE.txt Patch0: condor_config.generic.patch Patch1: stdsoap2.h.patch.patch Patch3: chkconfig_off.patch -Patch4: no_rpmdb_query.patch -Patch5: no_basename.patch Patch6: log_lock_run.patch +Patch7: only_dynamic_unstripped.patch +Patch10: dso_link_change.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -41,13 +43,14 @@ BuildRequires: postgresql-devel BuildRequires: openssl-devel BuildRequires: krb5-devel BuildRequires: gsoap-devel >= 2.7.12-1 +BuildRequires: libvirt-devel BuildRequires: bind-utils BuildRequires: m4 BuildRequires: autoconf -BuildRequires: classads-devel +BuildRequires: classads-devel >= 1.0.4 BuildRequires: libX11-devel -Requires: gsoap >= 2.7.12-1 +Requires: gsoap >= 2.7.12 Requires: mailx Requires: python >= 2.2 @@ -97,6 +100,17 @@ useful on systems where no device (e.g. /dev/*) can be used to determine console idle time. +%package vm-gahp +Summary: Condor's VM Gahp +Group: Applications/System +Requires: %name = %version-%release + +%description vm-gahp +The condor_vm-gahp enables the Virtual Machine Universe feature of +Condor. The VM Universe uses libvirt to start and control VMs under +Condor's Startd. + + %pre getent group condor >/dev/null || groupadd -r condor getent passwd condor >/dev/null || \ @@ -108,14 +122,12 @@ exit 0 %prep %setup -q -n %{name}-%{version} -cp %{SOURCE2} . - %patch0 -p1 %patch1 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch10 -p1 # fix errant execute permissions find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \; @@ -135,6 +147,7 @@ export USE_OLD_IMAKE cd src ./build_init %configure --with-buildid=Fedora-%{version}-%{release} \ + --with-platform=$(uname -s)-$(uname -p) \ --enable-proper \ --disable-full-port \ --disable-gcc-version-check \ @@ -144,9 +157,11 @@ cd src --enable-kbdd \ --disable-hibernation \ --disable-lease-manager \ + --disable-hdfs \ --without-zlib \ --with-openssl \ --with-krb5 \ + --with-libvirt \ --with-postgresql \ --with-gsoap \ --with-classads \ @@ -173,7 +188,7 @@ rm -rf %{buildroot} # make public creates release tarballs which we will install oldpwd=$PWD -cd public/v7.2 +cd public/v7.4 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x cd condor-%{version} @@ -263,7 +278,9 @@ rm $PREFIX/lib/webservice/condorStarter.wsdl rm $PREFIX/lib/webservice/condorTransferd.wsdl rm $PREFIX/lib/webservice/condorTt.wsdl rm $PREFIX/lib/webservice/condorVMgahp.wsdl - +rm $PREFIX/lib/webservice/condorRooster.wsdl +rm $PREFIX/lib/webservice/condorTest.wsdl +rm $PREFIX/lib/webservice/condorSoapshell.wsdl # not packaging glexec support right now rm $PREFIX/libexec/condor_glexec_cleanup @@ -398,6 +415,7 @@ rm -rf %{buildroot} %_datadir/condor/CondorJavaWrapper.class %_datadir/condor/Condor.pm %_datadir/condor/scimark2lib.jar +%_datadir/condor/condor_ssh_to_job_sshd_config_template %dir %_datadir/condor/webservice/ %_datadir/condor/webservice/condorCollector.wsdl %_datadir/condor/webservice/condorMaster.wsdl @@ -414,6 +432,12 @@ rm -rf %{buildroot} %_libexecdir/condor/sshd.sh %_libexecdir/condor/condor_job_router %_libexecdir/condor/gridftp_wrapper.sh +%_libexecdir/condor/condor_glexec_update_proxy +%_libexecdir/condor/condor_limits_wrapper.sh +%_libexecdir/condor/condor_rooster +%_libexecdir/condor/condor_ssh_to_job_shell_setup +%_libexecdir/condor/condor_ssh_to_job_sshd_setup +%_libexecdir/condor/power_state %_mandir/man1/condor_advertise.1.gz %_mandir/man1/condor_check_userlogs.1.gz %_mandir/man1/condor_chirp.1.gz @@ -485,6 +509,7 @@ rm -rf %{buildroot} %_bindir/condor_wait %_bindir/condor_hold %_bindir/condor_submit +%_bindir/condor_ssh_to_job # sbin/condor is a link for master_off, off, on, reconfig, # reconfig_schedd, restart %_sbindir/condor_advertise @@ -513,10 +538,7 @@ rm -rf %{buildroot} %_sbindir/condor_store_cred %_sbindir/condor_transferd %_sbindir/condor_updates_stats -%_sbindir/condor_vm-gahp %_sbindir/amazon_gahp -%_sbindir/condor_vm_vmware.pl -%_sbindir/condor_vm_xen.sh %_sbindir/condor_gridmanager %config(noreplace) %_var/lib/condor/condor_config.local %defattr(-,condor,condor,-) @@ -551,12 +573,21 @@ rm -rf %{buildroot} %_sbindir/condor_kbdd +%files vm-gahp +%defattr(-,root,root,-) +%doc LICENSE-2.0.txt NOTICE.txt +%_sbindir/condor_vm-gahp +%_sbindir/condor_vm_vmware.pl +%_sbindir/condor_vm_xen.sh +%_libexecdir/condor/libvirt_simple_script.awk + + %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 2>&1| grep -v "already defined" + semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd restorecon %_sbindir/condor_startd fi @@ -576,6 +607,26 @@ fi %changelog +* 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 diff --git a/condor_config.generic.patch b/condor_config.generic.patch index b9d4058..519a5a9 100644 --- a/condor_config.generic.patch +++ b/condor_config.generic.patch @@ -89,15 +89,9 @@ index f3f60a5..94c146f 100644 ## This macro is used to specify a short description of your pool. ## It should be about 20 characters long. For example, the name of -@@ -218,7 +230,7 @@ HOSTALLOW_READ = * - ## HOSTALLOW_WRITE = * - ## but note that this will allow anyone to submit jobs or add - ## machines to your pool and is serious security risk. --HOSTALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE -+HOSTALLOW_WRITE = $(FULL_HOSTNAME) - #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain - #HOSTDENY_WRITE = bad-machine.your.domain - +@@ -214,1 +231,1 @@ +-ALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE ++ALLOW_WRITE = $(FULL_HOSTNAME) @@ -872,9 +883,10 @@ SPOOL = $(LOCAL_DIR)/spool EXECUTE = $(LOCAL_DIR)/execute BIN = $(RELEASE_DIR)/bin diff --git a/dso_link_change.patch b/dso_link_change.patch new file mode 100644 index 0000000..bcb97ad --- /dev/null +++ b/dso_link_change.patch @@ -0,0 +1,23 @@ +commit f075415e311b24a75f434b6540f68e493141e37d +Author: Matthew Farrellee +Date: Thu May 20 17:14:17 2010 -0400 + + Updated proper build for Fedora 13, DSO ld change requires explicit linking of dep deps + + https://fedoraproject.org/wiki/UnderstandingDSOLinkChange + +diff --git a/src/configure.ac b/src/configure.ac +index 3a892e2..645edb8 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -3002,7 +3002,9 @@ fi + + CHECK_EXTERNAL([krb5], [1.4.3-p0], [soft], + [use krb5 (provides Kerberos support)], +- MF_LIB_CHECK([krb5], [[krb5 krb5_free_principal]])) ++ MF_LIB_CHECK([krb5], [[krb5 krb5_free_principal], ++ [k5crypto krb5_c_encrypt], ++ [com_err error_message]])) + + CHECK_EXTERNAL([openssl], [0.9.8h-p2], [soft], + [use OpenSSL (provides authentication and encryption support)], diff --git a/only_dynamic_unstripped.patch b/only_dynamic_unstripped.patch new file mode 100644 index 0000000..3e28c60 --- /dev/null +++ b/only_dynamic_unstripped.patch @@ -0,0 +1,16 @@ +--- condor-7.4.1/src/Imakefile 2010-03-15 23:45:41.000000000 -0400 ++++ condor-7.4.1mf/src/Imakefile 2010-03-15 23:46:20.000000000 -0400 +@@ -611,11 +611,10 @@ + SHA1Constraint = --no-require-sha1 + #endif + +-public: release all_tarballs ++public: release unstrip.tar + if test ! -d ../public; then mkdir ../public; fi +- perl condor_scripts/make_final_tarballs --sys=$(SYSNAME) --platform=$(MFT_PLATFORM) --tarcmd="$(TAR_CMD)" --cpcmd="$(CP_CMD)" --target=../public ++ perl condor_scripts/make_final_tarballs --sys=$(SYSNAME) --platform=$(MFT_PLATFORM) --tarcmd="$(TAR_CMD)" --cpcmd="$(CP_CMD)" --target=../public --linktype=unstripped-dynamic + $(MakeRPMs) +- perl condor_scripts/make_native_packages.pl $(RPM_CMD) + perl condor_scripts/make_checksums --target=../public --md5sum="$(MD5SUM)" --sha1sum="$(SHA1SUM)" $(MD5Constraint) $(SHA1Constraint) + + #if HAVE_EXT_MAN diff --git a/sources b/sources index a7a7c04..16f5e61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08d488cb94a8c111e968b609702a5ab3 condor-7.2.4-159529-RH.tar.gz +b7c15c948dda7e279a22f1ccf02e423c condor-7.4.2-227044-RH.tar.gz