rpms/condor/F-11 only_dynamic_unstripped.patch, NONE, 1.1 chkconfig_off.patch, 1.1, 1.2 condor.spec, 1.25, 1.26 condor_config.generic.patch, 1.3, 1.4 sources, 1.8, 1.9 NOTICE.txt, 1.1, NONE no_basename.patch, 1.1, NONE no_rpmdb_query.patch, 1.1, NONE
matt
matt at fedoraproject.org
Tue Jan 5 20:05:22 UTC 2010
Author: matt
Update of /cvs/pkgs/rpms/condor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6056
Modified Files:
chkconfig_off.patch condor.spec condor_config.generic.patch
sources
Added Files:
only_dynamic_unstripped.patch
Removed Files:
NOTICE.txt no_basename.patch no_rpmdb_query.patch
Log Message:
7.4.1-1
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-11/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 5 Jan 2010 20:05:22 -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-11/condor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- condor.spec 28 Aug 2009 17:18:55 -0000 1.25
+++ condor.spec 5 Jan 2010 20:05:22 -0000 1.26
@@ -1,6 +1,6 @@
Summary: Condor: High Throughput Computing
Name: condor
-Version: 7.2.4
+Version: 7.4.1
Release: 1%{?dist}
License: ASL 2.0
Group: Applications/System
@@ -20,16 +20,16 @@ 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
# Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.4-159529-RH.tar.gz
+Source0: condor-7.4.1-204351-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
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -41,13 +41,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 +98,17 @@ useful on systems where no device (e.g.
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 +120,11 @@ exit 0
%prep
%setup -q -n %{name}-%{version}
-cp %{SOURCE2} .
-
%patch0 -p1
%patch1 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%patch6 -p1
+%patch7 -p1
# fix errant execute permissions
find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -135,6 +144,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 +154,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 +185,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 +275,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 +411,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 +428,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 +505,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 +534,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 +569,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 +603,16 @@ fi
%changelog
+* Tue Jan 5 2010 <matt at redhat> - 7.4.1-1
+- Upgrade to 7.4.1 release
+- Security update (BZ549577)
+- 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
+- Use new --with-platform, to avoid modification of make_final_tarballs
+- Introduced vm-gahp package to hold libvirt deps
+
* Fri Aug 28 2009 <matt at redhat> - 7.2.4-1
- Upgrade to 7.2.4 release
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-11/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 5 Jan 2010 20:05:22 -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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 28 Aug 2009 17:18:55 -0000 1.8
+++ sources 5 Jan 2010 20:05:22 -0000 1.9
@@ -1 +1 @@
-08d488cb94a8c111e968b609702a5ab3 condor-7.2.4-159529-RH.tar.gz
+492bc41c46c262dcf17769e84b4ad8ad condor-7.4.1-204351-RH.tar.gz
--- NOTICE.txt DELETED ---
--- no_basename.patch DELETED ---
--- no_rpmdb_query.patch DELETED ---
More information about the fedora-extras-commits
mailing list