rpms/condor/F-12 fix_platform_check.patch, NONE, 1.1 guess_version_from_release_dir.patch, NONE, 1.1 only_dynamic_unstripped.patch, NONE, 1.1 chkconfig_off.patch, 1.1, 1.2 condor.spec, 1.24, 1.25 condor_config.generic.patch, 1.3, 1.4 generate-tarball.sh, 1.3, 1.4 NOTICE.txt, 1.1, NONE no_basename.patch, 1.1, NONE no_rpmdb_query.patch, 1.1, NONE

Fri Dec 4 12:00:36 UTC 2009

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8280

Modified Files:
	chkconfig_off.patch condor.spec condor_config.generic.patch 
	generate-tarball.sh 
Added Files:
	fix_platform_check.patch guess_version_from_release_dir.patch 
	only_dynamic_unstripped.patch 
Removed Files:
	NOTICE.txt no_basename.patch no_rpmdb_query.patch 
Log Message:
7.4.0-0.1

fix_platform_check.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix_platform_check.patch ---
--- condor-7.4.0/src/configure.ac	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/configure.ac	2009-12-04 06:22:47.000000000 -0500
@@ -608,7 +608,7 @@
 AC_SUBST(_cv_kernel_rev,$_cv_kernel_rev)
 
 AC_MSG_CHECKING([platform name])
-AC_MSG_RESULT([$_platform])
+AC_MSG_RESULT([$_cv_platform])
 AC_SUBST(_cv_platform,$_cv_platform)
 
 # check out the libc

guess_version_from_release_dir.patch:
 make_final_tarballs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE guess_version_from_release_dir.patch ---
--- condor-7.4.0/src/condor_scripts/make_final_tarballs	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/condor_scripts/make_final_tarballs	2009-12-04 06:19:34.000000000 -0500
@@ -111,10 +111,12 @@
 } else {
     # If we weren't told on the command line, use the condor_master
     # binary with -version to find the version string.
-    if( -f "strip_dir/sbin/condor_master" ) {
-        $vers_string=`./strip_dir/sbin/condor_master -version`;
+    if( -f "release_dir/sbin/condor_master" ) {
+        $vers_string=`./release_dir/sbin/condor_master -version`;
     } elsif ( -f "static_dir/sbin/condor_master" ) {
         $vers_string=`./static_dir/sbin/condor_master -version`;
+    } elsif ( -f "strip_dir/sbin/condor_master" ) {
+        $vers_string=`./strip_dir/sbin/condor_master -version`;
     } else {
 	die "ERROR: can't find a condor_version, and no -v specified";
     }

only_dynamic_unstripped.patch:
 Imakefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE only_dynamic_unstripped.patch ---
--- condor-7.4.0/src/Imakefile	2009-10-28 11:05:25.000000000 -0400
+++ condor-7.4.0mf/src/Imakefile	2009-12-04 06:00:50.000000000 -0500
@@ -575,9 +575,9 @@
 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_checksums --target=../public --md5sum="$(MD5SUM)" --sha1sum="$(SHA1SUM)" $(MD5Constraint) $(SHA1Constraint)
 

chkconfig_off.patch:
 condor.init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: chkconfig_off.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/chkconfig_off.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chkconfig_off.patch	15 Jan 2009 05:01:05 -0000	1.1
+++ chkconfig_off.patch	4 Dec 2009 12:00:30 -0000	1.2
@@ -5,8 +5,8 @@ diff -ru condor-7.2.0/src/condor_example
  #
  # 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


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- condor.spec	28 Aug 2009 18:02:12 -0000	1.24
+++ condor.spec	4 Dec 2009 12:00:31 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.4
+Version: 7.4.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -20,16 +20,17 @@ 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
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.4-159529-RH.tar.gz
+Source0: condor-7.4.0-193173-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
+Patch8: guess_version_from_release_dir.patch
+Patch9: fix_platform_check.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -108,14 +109,13 @@ exit 0
 %prep
 %setup -q -n %{name}-%{version}
 
-cp %{SOURCE2} .
-
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -135,6 +135,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 \
@@ -173,7 +174,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 +264,8 @@ rm $PREFIX/lib/webservice/condorStarter.
 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
 
 # not packaging glexec support right now
 rm $PREFIX/libexec/condor_glexec_cleanup
@@ -398,6 +400,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 +417,13 @@ 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/libvirt_simple_script.awk
+%_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 +495,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
@@ -556,7 +567,7 @@ rm -rf %{buildroot}
 /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 +587,17 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009  <matt at redhat> - 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
+
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release
 - Removed gcc44_const.patch, accepted upstream

condor_config.generic.patch:
 condor_config.generic |   52 +++++++++++++++++++++++++++++++++-----------------
 customize             |    2 -
 2 files changed, 36 insertions(+), 18 deletions(-)

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor_config.generic.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- condor_config.generic.patch	24 Feb 2009 14:52:24 -0000	1.3
+++ condor_config.generic.patch	4 Dec 2009 12:00:31 -0000	1.4
@@ -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


Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/generate-tarball.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- generate-tarball.sh	7 Jan 2009 19:22:17 -0000	1.3
+++ generate-tarball.sh	4 Dec 2009 12:00:32 -0000	1.4
@@ -25,9 +25,6 @@ echo "...recording BUILD-ID: $build"
 
 for f in \
     src/condor_mail \
-    src/condor_vm-gahp/cygwin1.dll \
-    src/condor_vm-gahp/mkisofs.exe \
-    config/CONDOR_TEST_LRG \
     src/condor_tests/job_vmu_basic.sh \
     src/condor_tests/job_vmu_cdrom.run \
     src/condor_tests/job_vmu_cdrom.sh \
@@ -40,12 +37,9 @@ for f in \
     src/condor_tests/x_vm_utils.pm \
     src/condor_tests/x_param.vmware \
     src/condor_tests/x_vmware_test_vm.cmd \
-    src/condor_tests/x_vmware_test_vm.tar.gz \
     src/condor_tests/x_vmware_configpostsrc \
-    config/CONDOR_TEST_CNFDTL \
     src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
     src/condor_tests/job_ligo_x86-64-chkpttst.run \
-    src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
     src/condor_tests/job_quill_basic.cmd \
     src/condor_tests/job_quill_basic.pl \
     src/condor_tests/job_quill_basic.run \


--- NOTICE.txt DELETED ---


--- no_basename.patch DELETED ---


--- no_rpmdb_query.patch DELETED ---


