diff --git a/.cvsignore b/.cvsignore index 02e8525..3f43086 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -condor-7.0.5-105846-RH.tar.gz +condor-7.2.0-121001-RH.tar.gz diff --git a/DetectGCC.patch b/DetectGCC.patch new file mode 100644 index 0000000..b305f8b --- /dev/null +++ b/DetectGCC.patch @@ -0,0 +1,16 @@ +diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac +--- condor-7.0.2.orig/src/configure.ac 2008-06-11 10:04:54.000000000 -0500 ++++ condor-7.0.2/src/configure.ac 2008-06-11 10:04:07.000000000 -0500 +@@ -877,6 +877,12 @@ + CompilerMinor="3" + CompilerPatch="1" + ;; ++ "4.3.2" ) ++ CompilerKind="GCC" ++ CompilerMajor="4" ++ CompilerMinor="3" ++ CompilerPatch="2" ++ ;; + * ) + if test "x$enable_gcc_version_check" = "xyes"; then + AC_MSG_RESULT([ERROR]) diff --git a/GLibCFlag28.patch b/GLibCFlag28.patch deleted file mode 100644 index e0cce92..0000000 --- a/GLibCFlag28.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru condor-7.0.2.orig/config/LINUX.cf condor-7.0.2/config/LINUX.cf ---- condor-7.0.2.orig/config/LINUX.cf 2008-06-11 09:47:23.000000000 -0500 -+++ condor-7.0.2/config/LINUX.cf 2008-06-11 09:49:18.000000000 -0500 -@@ -42,6 +42,8 @@ - # define GlibCFlag -DGLIBC=GLIBC -DGLIBC26=GLIBC26 - # elif defined( IS_GLIBC27 ) - # define GlibCFlag -DGLIBC=GLIBC -DGLIBC27=GLIBC27 -+# elif defined( IS_GLIBC28 ) -+# define GlibCFlag -DGLIBC=GLIBC -DGLIBC28=GLIBC28 - # endif - #else /* Non IS_GLIBC */ - # define GlibCFlag diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..cc4365b --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,47 @@ +Condor + +Copyright (C) 1990-2007, Condor Team, Computer Sciences Department, +University of Wisconsin-Madison, WI. + +This source code is covered by the Apache License, Version 2.0, which +can be found in the accompanying LICENSE-2.0.txt file, or online at +http://www.apache.org/licenses/ . + +This product includes software developed by and/or derived from the +Globus Project (http://www.globus.org/) to which the U.S. Government +retains certain rights. Copyright (c) 1999 University of Chicago and +The University of Southern California. All Rights Reserved. + +This product includes software developed by the OpenSSL Project for +use in the OpenSSL Toolkit (http://www.openssl.org/). Complete +conditions and disclaimers for OpenSSL can be found at +http://www.openssl.org/source/license.html + +Some distributions of Condor include software developed by the +Info-ZIP Project (http://www.info-zip.org/). Complete conditions +and disclaimers for Info-ZIP can be found at +http://www.info-zip.org/doc/LICENSE + +Some distributions of Condor include MAKEMSI software developed by +Dennis Bareis (http://dennisbareis.com/makemsi.htm). Complete +conditions and disclaimers for MAKEMSI can be found at +http://makemsi-manual.dennisbareis.com/disclaimer.htm + +Some distributions of Condor include a compiled, unmodified version +of the GNU C library. The complete source code to GNU glibc can be +found at http://www.gnu.org/software/libc/. + +Part of the software embedded in this product is gSOAP software. +Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van +Engelen, Genivia inc. All Rights Reserved. +THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/condor.spec b/condor.spec index 985ec49..2c38902 100644 --- a/condor.spec +++ b/condor.spec @@ -1,6 +1,6 @@ Summary: Condor: High Throughput Computing Name: condor -Version: 7.0.5 +Version: 7.2.0 Release: 1%{?dist} License: ASL 2.0 Group: Applications/System @@ -17,37 +17,39 @@ URL: http://www.cs.wisc.edu/condor/ # b08743cfa2e87adbcda042896e8ef537 condor_src-7.0.2-all-all.tar.gz # 5f326ad522b63eacf34c6c563cf46910 condor_src-7.0.4-all-all.tar.gz # 73323100c5b2259f3b9c042fa05451e0 condor_src-7.0.5-all-all.tar.gz +# a2dd96ea537b2c6d105b6c8dad563ddc condor_src-7.2.0-all-all.tar.gz # Note: The md5sum of each generated tarball may be different -Source0: condor-7.0.5-105846-RH.tar.gz +Source0: condor-7.2.0-121001-RH.tar.gz Source1: generate-tarball.sh +Source2: NOTICE.txt Patch0: condor_config.generic.patch -Patch2: GLibCFlag28.patch -Patch3: DetectGCC432.patch -Patch4: autoconf-relax-quoting.patch +Patch1: stdsoap2.h.patch.patch +Patch2: DetectGCC.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: imake BuildRequires: flex BuildRequires: byacc -BuildRequires: tcsh BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: openssl-devel BuildRequires: krb5-devel -BuildRequires: gsoap-devel >= 2.7.10-2 +BuildRequires: gsoap-devel >= 2.7.12-1 BuildRequires: bind-utils BuildRequires: m4 BuildRequires: autoconf BuildRequires: classads-devel +BuildRequires: libX11-devel Requires: pcre Requires: postgresql-libs Requires: openssl Requires: krb5-libs -Requires: gsoap >= 2.7.10-2 +Requires: gsoap >= 2.7.12-1 Requires: mailx Requires: classads +Requires: python >= 2.2 Requires(pre): shadow-utils @@ -71,14 +73,26 @@ monitors their progress, and ultimately informs the user upon completion. -%package static -Summary: Headers and libraries for interacting with Condor -Group: Development/System -Requires: %name = %version-%release +#%package static +#Summary: Headers and libraries for interacting with Condor +#Group: Development/System +#Requires: %name = %version-%release +# +# +#%description static +#Headers and libraries for interacting with Condor and its components. + +%package kbdd +Summary: Condor Keyboard Daemon +Group: Applications/System +Requires: %name = %version-%release +Requires: libX11 -%description static -Headers and libraries for interacting with Condor and its components. +%description kbdd +The condor_kbdd monitors logged in X users for activity. It is only +useful on systems where no device (e.g. /dev/*) can be used to +determine console idle time. %pre @@ -92,10 +106,11 @@ exit 0 %prep %setup -q -n %{name}-%{version} +cp %{SOURCE2} . + %patch0 -p1 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # fix errant execute permissions find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \; @@ -114,18 +129,22 @@ export USE_OLD_IMAKE cd src ./build_init -%configure --enable-proper \ +%configure --with-buildid=Fedora-%{version}-%{release} \ + --enable-proper \ --disable-full-port \ --disable-gcc-version-check \ --disable-glibc-version-check \ --disable-static \ --disable-rpm \ + --enable-kbdd \ + --disable-hibernation \ + --disable-lease-manager \ --without-zlib \ --with-openssl \ --with-krb5 \ --with-postgresql \ --with-gsoap \ - --without-classads \ + --with-classads \ --with-man=$PWD/../externals/bundles/man/current # SMP_NUM_JOBS must be set properly to pass -j to make @@ -148,7 +167,8 @@ function populate { rm -rf %{buildroot} # make public creates release tarballs which we will install -cd public/v7.0 +oldpwd=$PWD +cd public/v7.2 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x cd condor-%{version} @@ -158,6 +178,21 @@ populate install * cp $PREFIX/etc/examples/condor_config.generic $PREFIX/etc/condor_config +# the default condor_config file is not architecture aware and thus +# sets the LIB directory to always be /usr/lib, we want to do better +# than that. this is, so far, the best place to do this +# specialization. we strip the "lib" or "lib64" part from _libdir and +# stick it in the LIB variable in the config. +LIB=$(echo %{?_libdir} | sed -e 's:/usr/\(.*\):\1:') +if [ "$LIB" = "%_libdir" ]; then + echo "_libdir does not contain /usr, sed expression needs attention" + exit 1 +fi +sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \ + $PREFIX/etc/examples/condor_config.generic \ + > $PREFIX/etc/condor_config + + mkdir $PREFIX/local_dir mkdir -m1777 $PREFIX/local_dir/execute mkdir -m0755 $PREFIX/local_dir/log @@ -191,9 +226,117 @@ rm $PREFIX/sbin/condor_vacate # the libcondorapi.so is not properly created, instead of providing it # we will provide the .a version in a static package rm $PREFIX/lib/libcondorapi.so -# sbin/condor and uniq_pid_command are pointless hard links +# sbin/condor is a pointless hard links rm $PREFIX/sbin/condor + +# not packaging the condor_startd_factory right now +rm $PREFIX/sbin/condor_startd_factory +rm $PREFIX/lib/webservice/condorStartdFactory.wsdl +rm $PREFIX/libexec/bgp_available_partitions +rm $PREFIX/libexec/bgp_back_partition +rm $PREFIX/libexec/bgp_boot_partition +rm $PREFIX/libexec/bgp_destroy_partition +rm $PREFIX/libexec/bgp_generate_partition +rm $PREFIX/libexec/bgp_query_work_loads +rm $PREFIX/libexec/bgp_shutdown_partition + +# not packaging uninteresting WSDL files, except for the master +rm $PREFIX/lib/webservice/condorCgahp.wsdl +rm $PREFIX/lib/webservice/condorDagman.wsdl +rm $PREFIX/lib/webservice/condorDbmsd.wsdl +rm $PREFIX/lib/webservice/condorDcskel.wsdl +rm $PREFIX/lib/webservice/condorEventd.wsdl +rm $PREFIX/lib/webservice/condorGridmanager.wsdl +rm $PREFIX/lib/webservice/condorHad.wsdl +rm $PREFIX/lib/webservice/condorJobRouter.wsdl +rm $PREFIX/lib/webservice/condorKbdd.wsdl +rm $PREFIX/lib/webservice/condorNegotiator.wsdl +rm $PREFIX/lib/webservice/condorShadow.wsdl +rm $PREFIX/lib/webservice/condorStartd.wsdl +rm $PREFIX/lib/webservice/condorStarter.wsdl +rm $PREFIX/lib/webservice/condorTransferd.wsdl +rm $PREFIX/lib/webservice/condorTt.wsdl +rm $PREFIX/lib/webservice/condorVMgahp.wsdl + + +# not packaging glexec support right now +rm $PREFIX/libexec/condor_glexec_cleanup +rm $PREFIX/libexec/condor_glexec_job_wrapper +rm $PREFIX/libexec/condor_glexec_kill +rm $PREFIX/libexec/condor_glexec_run +rm $PREFIX/libexec/condor_glexec_setup +# not shipping gt42 gahp right now +rm $PREFIX/sbin/gt42_gahp + +# not going to package the sc2005 negotiator +#rm $PREFIX/sbin/condor_lease_manager + +# not going to package these until we know what they are +rm $PREFIX/bin/condor_power +rm $PREFIX/sbin/condor_set_shutdown + +# not packaging glidein support, depends on globus +rm $PREFIX/man/man1/condor_glidein.1 +rm $PREFIX/bin/condor_glidein + +# not packaging deployment tools +# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker rm $PREFIX/sbin/uniq_pid_command +rm $PREFIX/sbin/uniq_pid_midwife +rm $PREFIX/sbin/uniq_pid_undertaker +rm $PREFIX/sbin/cleanup_release +rm $PREFIX/sbin/condor_local_stop +rm $PREFIX/sbin/condor_cleanup_local +rm $PREFIX/sbin/condor_cold_start +rm $PREFIX/sbin/condor_cold_stop +rm $PREFIX/sbin/condor_config_bind +rm $PREFIX/sbin/filelock_midwife +rm $PREFIX/sbin/filelock_undertaker +rm $PREFIX/sbin/condor_install_local +rm $PREFIX/sbin/condor_local_start +rm $PREFIX/sbin/install_release +rm $PREFIX/lib/Execute.pm +rm $PREFIX/lib/FileLock.pm +rm $PREFIX/man/man1/condor_config_bind.1 +rm $PREFIX/man/man1/condor_cold_start.1 +rm $PREFIX/man/man1/condor_cold_stop.1 + +# not packaging the ckpt server +rm $PREFIX/sbin/condor_ckpt_server + +# not packaging standard universe +rm $PREFIX/bin/condor_checkpoint +rm $PREFIX/sbin/condor_shadow.std +rm $PREFIX/sbin/condor_starter.std +rm $PREFIX/bin/condor_compile +rm $PREFIX/man/man1/condor_compile.1 +rm $PREFIX/man/man1/condor_checkpoint.1 +rm $PREFIX/libexec/condor_ckpt_probe + +# not packaging configure/install scripts +rm $PREFIX/man/man1/condor_configure.1 +rm $PREFIX/sbin/condor_configure +rm $PREFIX/sbin/condor_install + +# not packaging legacy cruft +rm $PREFIX/man/man1/condor_master_off.1 +rm $PREFIX/sbin/condor_master_off +rm $PREFIX/man/man1/condor_reconfig_schedd.1 +rm $PREFIX/sbin/condor_reconfig_schedd +rm $PREFIX/man/man1/condor_convert_history.1 +rm $PREFIX/sbin/condor_convert_history + +# not packaging anything globus related +rm $PREFIX/sbin/condor_gridshell +rm $PREFIX/sbin/grid_monitor.sh +rm $PREFIX/sbin/gt4_gahp + +# not packaging unsupported gahps +rm $PREFIX/sbin/unicore_gahp + +# not packaging libcondorapi.a +rm $PREFIX/lib/libcondorapi.a + # some scripts are examples but have exec bits set anyway chmod a-x $PREFIX/etc/examples/condor.boot @@ -204,14 +347,17 @@ chmod a-x $PREFIX/etc/examples/mp1script populate %_mandir/man1 $PREFIX/man/man1/* populate %_bindir $PREFIX/bin/* populate %_sbindir $PREFIX/sbin/* -populate %_usrsrc $PREFIX/src/chirp populate %_sysconfdir/condor $PREFIX/etc/condor_config -populate %_includedir/condor $PREFIX/include/* -populate %_libdir $PREFIX/lib/libcondorapi.a +# no -static package +#populate %_usrsrc $PREFIX/src/chirp +#populate %_includedir/condor $PREFIX/include/* +#populate %_libdir $PREFIX/lib/libcondorapi.a populate %_datadir/condor $PREFIX/lib/* +populate %_datadir/condor/sql $PREFIX/sql/* populate %_libexecdir/condor $PREFIX/libexec/* populate %_var/lib/condor $PREFIX/local_dir/* + # install the lsb init script install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor @@ -243,54 +389,35 @@ rm -rf %{buildroot} %_datadir/condor/CondorJavaInfo.class %_datadir/condor/CondorJavaWrapper.class %_datadir/condor/Condor.pm -%_datadir/condor/Execute.pm -%_datadir/condor/FileLock.pm %_datadir/condor/scimark2lib.jar %dir %_datadir/condor/webservice/ -%_datadir/condor/webservice/condorAccountant.wsdl -%_datadir/condor/webservice/condorCgahp.wsdl %_datadir/condor/webservice/condorCollector.wsdl -%_datadir/condor/webservice/condorDagman.wsdl -%_datadir/condor/webservice/condorDbmsd.wsdl -%_datadir/condor/webservice/condorDcskel.wsdl -%_datadir/condor/webservice/condorEventd.wsdl -%_datadir/condor/webservice/condorGridmanager.wsdl -%_datadir/condor/webservice/condorHad.wsdl %_datadir/condor/webservice/condorMaster.wsdl -%_datadir/condor/webservice/condorNegotiator.wsdl %_datadir/condor/webservice/condorSchedd.wsdl -%_datadir/condor/webservice/condorShadow.wsdl -%_datadir/condor/webservice/condorStartd.wsdl -%_datadir/condor/webservice/condorStarter.wsdl -%_datadir/condor/webservice/condorTransferd.wsdl -%_datadir/condor/webservice/condorVMgahp.wsdl +%dir %_datadir/condor/sql/ +%_datadir/condor/sql/common_createddl.sql +%_datadir/condor/sql/oracle_createddl.sql +%_datadir/condor/sql/oracle_dropddl.sql +%_datadir/condor/sql/pgsql_createddl.sql +%_datadir/condor/sql/pgsql_dropddl.sql %dir %_libexecdir/condor/ %_libexecdir/condor/condor_chirp %_libexecdir/condor/condor_ssh %_libexecdir/condor/sshd.sh -%_libexecdir/condor/condor_ckpt_probe +%_libexecdir/condor/condor_job_router %_libexecdir/condor/gridftp_wrapper.sh %_mandir/man1/condor_advertise.1.gz -%_mandir/man1/condor_checkpoint.1.gz %_mandir/man1/condor_check_userlogs.1.gz %_mandir/man1/condor_chirp.1.gz %_mandir/man1/condor_cod.1.gz -%_mandir/man1/condor_cold_start.1.gz -%_mandir/man1/condor_cold_stop.1.gz -%_mandir/man1/condor_compile.1.gz -%_mandir/man1/condor_config_bind.1.gz -%_mandir/man1/condor_convert_history.1.gz -%_mandir/man1/condor_configure.1.gz %_mandir/man1/condor_config_val.1.gz %_mandir/man1/condor_dagman.1.gz %_mandir/man1/condor_fetchlog.1.gz %_mandir/man1/condor_findhost.1.gz -%_mandir/man1/condor_glidein.1.gz %_mandir/man1/condor_history.1.gz %_mandir/man1/condor_hold.1.gz %_mandir/man1/condor_load_history.1.gz %_mandir/man1/condor_master.1.gz -%_mandir/man1/condor_master_off.1.gz %_mandir/man1/condor_off.1.gz %_mandir/man1/condor_on.1.gz %_mandir/man1/condor_preen.1.gz @@ -298,7 +425,6 @@ rm -rf %{buildroot} %_mandir/man1/condor_q.1.gz %_mandir/man1/condor_qedit.1.gz %_mandir/man1/condor_reconfig.1.gz -%_mandir/man1/condor_reconfig_schedd.1.gz %_mandir/man1/condor_release.1.gz %_mandir/man1/condor_reschedule.1.gz %_mandir/man1/condor_restart.1.gz @@ -319,10 +445,8 @@ rm -rf %{buildroot} %_mandir/man1/condor_wait.1.gz # bin/condor is a link for checkpoint, reschedule, vacate %_bindir/condor -%_bindir/condor_glidein %_bindir/condor_load_history %_bindir/condor_submit_dag -%_bindir/condor_checkpoint %_bindir/condor_prio %_bindir/condor_transfer_data %_bindir/condor_check_userlogs @@ -331,7 +455,6 @@ rm -rf %{buildroot} %_bindir/condor_cod %_bindir/condor_qedit %_bindir/condor_userlog -%_bindir/condor_compile %_bindir/condor_release %_bindir/condor_userlog_job_counter %_bindir/condor_config_val @@ -342,6 +465,9 @@ rm -rf %{buildroot} %_bindir/condor_vacate %_bindir/condor_dump_history %_bindir/condor_run +%_bindir/condor_router_history +%_bindir/condor_router_q +%_bindir/condor_router_rm %_bindir/condor_vacate_job %_bindir/condor_findhost %_bindir/condor_stats @@ -351,31 +477,17 @@ rm -rf %{buildroot} %_bindir/condor_wait %_bindir/condor_hold %_bindir/condor_submit -%_sbindir/cleanup_release # sbin/condor is a link for master_off, off, on, reconfig, # reconfig_schedd, restart %_sbindir/condor_advertise %_sbindir/condor_c-gahp %_sbindir/condor_c-gahp_worker_thread -%_sbindir/condor_ckpt_server -%_sbindir/condor_cleanup_local -%_sbindir/condor_cold_start -%_sbindir/condor_cold_stop %_sbindir/condor_collector -%_sbindir/condor_config_bind -%_sbindir/condor_configure -%_sbindir/condor_convert_history %_sbindir/condor_dbmsd %_sbindir/condor_fetchlog -%_sbindir/condor_gridshell %_sbindir/condor_had %_sbindir/condor_init -%_sbindir/condor_install -%_sbindir/condor_install_local -%_sbindir/condor_local_start -%_sbindir/condor_local_stop %_sbindir/condor_master -%_sbindir/condor_master_off %_sbindir/condor_negotiator %_sbindir/condor_off %_sbindir/condor_on @@ -383,32 +495,21 @@ rm -rf %{buildroot} %_sbindir/condor_procd %_sbindir/condor_quill %_sbindir/condor_reconfig -%_sbindir/condor_reconfig_schedd %_sbindir/condor_replication %_sbindir/condor_restart %_sbindir/condor_root_switchboard %_sbindir/condor_schedd %_sbindir/condor_shadow -%_sbindir/condor_shadow.std %_sbindir/condor_startd %_sbindir/condor_starter -%_sbindir/condor_starter.std %_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/filelock_midwife -%_sbindir/filelock_undertaker -%_sbindir/install_release %_sbindir/condor_gridmanager -%_sbindir/grid_monitor.sh -%_sbindir/gt4_gahp -%_sbindir/unicore_gahp -# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker -%_sbindir/uniq_pid_midwife -%_sbindir/uniq_pid_undertaker %config(noreplace) %_var/lib/condor/condor_config.local %defattr(-,condor,condor,-) %dir %_var/lib/condor/ @@ -417,26 +518,37 @@ rm -rf %{buildroot} %dir %_var/lib/condor/spool/ -%files static +#%files static +#%defattr(-,root,root,-) +#%doc LICENSE-2.0.txt +#%_libdir/libcondorapi.a +#%dir %_includedir/condor/ +#%_includedir/condor/condor_constants.h +#%_includedir/condor/condor_event.h +#%_includedir/condor/condor_holdcodes.h +#%_includedir/condor/file_lock.h +#%_includedir/condor/user_log.c++.h +#%doc %_includedir/condor/user_log.README +#%dir %_usrsrc/chirp/ +#%_usrsrc/chirp/chirp_client.c +#%_usrsrc/chirp/chirp_client.h +#%_usrsrc/chirp/chirp_protocol.h + + +%files kbdd %defattr(-,root,root,-) -%doc LICENSE-2.0.txt -%_libdir/libcondorapi.a -%dir %_includedir/condor/ -%_includedir/condor/condor_constants.h -%_includedir/condor/condor_event.h -%_includedir/condor/condor_holdcodes.h -%_includedir/condor/file_lock.h -%_includedir/condor/user_log.c++.h -%doc %_includedir/condor/user_log.README -%dir %_usrsrc/chirp/ -%_usrsrc/chirp/chirp_client.c -%_usrsrc/chirp/chirp_client.h -%_usrsrc/chirp/chirp_protocol.h +%doc LICENSE-2.0.txt NOTICE.txt +%_sbindir/condor_kbdd %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 + restorecon %_sbindir/condor_startd +fi %preun -n condor @@ -454,14 +566,19 @@ fi %changelog +* 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 -- Patched aclocal.m4 to handle autoconf 2.62 -- Patched configure.ac to handle gcc-4.3.1 * Tue Jun 10 2008 - 7.0.2-1 - Updated to 7.0.2 source diff --git a/condor_config.generic.patch b/condor_config.generic.patch index 53fa15c..142234e 100644 --- a/condor_config.generic.patch +++ b/condor_config.generic.patch @@ -1,8 +1,66 @@ diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic -index c119679..e795a15 100644 +index f3f60a5..94c146f 100644 --- a/src/condor_examples/condor_config.generic +++ b/src/condor_examples/condor_config.generic -@@ -51,19 +51,16 @@ +@@ -1,15 +1,35 @@ + ###################################################################### ++###################################################################### ++## ## ++## N O T I C E: ## ++## ## ++## Customization of this file should be done via the ## ++## LOCAL_CONFIG_FILE. ## ++## ## ++###################################################################### ++###################################################################### ++ ++ ++###################################################################### + ## + ## condor_config + ## + ## This is the global configuration file for condor. Any settings +-## made here may potentially be overridden in the local configuration +-## file. KEEP THAT IN MIND! To double-check that a variable is +-## getting set from the configuration file that you expect, use +-## condor_config_val -v ++## found here * * s h o u l d b e c u s t o m i z e d i n ++## t h e l o c a l c o n f i g u r a t i o n f i l e. * * ++## ++## The local configuration file is specified by LOCAL_CONFIG_FILE ++## below. ++## ++## For a basic configuration, you may only want to start by ++## customizing CONDOR_ADMIN. ++## ++## Note: To double-check where a configuration variable is set from ++## you can use condor_config_val -v , ++## e.g. condor_config_val -v CONDOR_ADMIN. + ## + ## The file is divided into four main parts: +-## Part 1: Settings you MUST customize ++## Part 1: Settings you likely want to customize + ## Part 2: Settings you may want to customize + ## Part 3: Settings that control the policy of when condor will + ## start and stop jobs on your machines +@@ -21,11 +41,6 @@ + ## various settings in here and possible ways to configure your + ## pool. + ## +-## If you are installing Condor as root and then handing over the +-## administration of this file to a person you do not trust with +-## root access, please read the Installation chapter paying careful +-## note to the condor_config.root entries. +-## + ## Unless otherwise specified, settings that are commented out show + ## the defaults that are used if you don't define a value. Settings + ## that are defined here MUST BE DEFINED since they have no default +@@ -47,18 +62,15 @@ + ## # # # # # # # + ## # # # # # # ##### + ## +-## Part 1: Settings you must customize: ++## Part 1: Settings you likely want to customize: ###################################################################### ###################################################################### @@ -18,13 +76,25 @@ index c119679..e795a15 100644 ## Where is the local condor directory for each host? ## This is where the local config file(s), logs and - ## spool/execute directories are located --LOCAL_DIR = $(TILDE) -+LOCAL_DIR = /var/lib/condor - #LOCAL_DIR = $(RELEASE_DIR)/hosts/$(HOSTNAME) +@@ -72,7 +84,7 @@ LOCAL_CONFIG_FILE = $(LOCAL_DIR)/condor_config.local + + ## If the local config file is not present, is it an error? + ## WARNING: This is a potential security issue. +-## If not specificed, te default is True ++## If not specificed, the default is True + #REQUIRE_LOCAL_CONFIG_FILE = TRUE + + ##-------------------------------------------------------------------- +@@ -84,7 +96,7 @@ CONDOR_ADMIN = condor-admin@your.domain + + ## Full path to a mail delivery program that understands that "-s" + ## means you want to specify a subject: +-MAIL = /usr/bin/mail ++MAIL = /bin/mail - ## Where is the machine-specific local config file for each host? -@@ -93,13 +90,13 @@ MAIL = /usr/bin/mail + ##-------------------------------------------------------------------- + ## Network domain parameters: +@@ -93,13 +105,13 @@ MAIL = /usr/bin/mail ## machines don't share a common UID space, set it to ## UID_DOMAIN = $(FULL_HOSTNAME) ## to specify that each machine has its own UID space. @@ -40,7 +110,7 @@ index c119679..e795a15 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 +215,7 @@ HOSTALLOW_READ = * +@@ -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. @@ -49,17 +119,61 @@ index c119679..e795a15 100644 #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain #HOSTDENY_WRITE = bad-machine.your.domain -@@ -859,10 +856,10 @@ LOG = $(LOCAL_DIR)/log - SPOOL = $(LOCAL_DIR)/spool +@@ -231,10 +243,9 @@ HOSTALLOW_NEGOTIATOR = $(CONDOR_HOST) + HOSTALLOW_NEGOTIATOR_SCHEDD = $(CONDOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS) + + ## Config access. Machines listed here can use the condor_config_val +-## tool to modify all daemon configurations except those specified in +-## the condor_config.root file. This level of host-wide access +-## should only be granted with extreme caution. By default, config +-## access is denied from all hosts. ++## tool to modify all daemon configurations. This level of host-wide ++## access should only be granted with extreme caution. By default, ++## config access is denied from all hosts. + #HOSTALLOW_CONFIG = trusted-host.your.domain + + ## Flocking Configs. These are the real things that Condor looks at, +@@ -872,9 +883,10 @@ SPOOL = $(LOCAL_DIR)/spool EXECUTE = $(LOCAL_DIR)/execute BIN = $(RELEASE_DIR)/bin --LIB = $(RELEASE_DIR)/lib + LIB = $(RELEASE_DIR)/lib -INCLUDE = $(RELEASE_DIR)/include -+LIB = $(RELEASE_DIR)/share/condor +INCLUDE = $(RELEASE_DIR)/include/condor SBIN = $(RELEASE_DIR)/sbin -LIBEXEC = $(RELEASE_DIR)/libexec +LIBEXEC = $(RELEASE_DIR)/libexec/condor ++SHARE = $(RELEASE_DIR)/share/condor ## If you leave HISTORY undefined (comment it out), no history file ## will be created. +@@ -1655,7 +1667,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx + ## them here. However, do not remove the existing entries, as Condor + ## needs them. + +-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar . ++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar . + + ## JAVA_CLASSPATH_ARGUMENT describes the command-line parameter + ## used to introduce a new classpath: +@@ -2299,7 +2311,7 @@ LeaseManager = $(SBIN)/condor_lease_manager + # Turn on the lease manager + #DAEMON_LIST = $(DAEMON_LIST), LeaseManager + +-# The identification and location of the quill daemon for local clients. ++# The identification and location of the lease manager for local clients. + LeaseManger_ADDRESS_FILE = $(LOG)/.lease_manager_address + + ## LeaseManager startup arguments +diff --git a/src/condor_examples/customize b/src/condor_examples/customize +index b1c5710..cb2dea1 100644 +--- a/src/condor_examples/customize ++++ b/src/condor_examples/customize +@@ -54,7 +54,7 @@ sub get_platform_defaults { + $_ = $os; + SWITCH: { + if(/^Linux/) { +- $mail_path="/usr/bin/mail"; ++ $mail_path="/bin/mail"; + $ps_path="/bin/ps auwx"; + $console_devs="mouse, console"; + last SWITCH; diff --git a/generate-tarball.sh b/generate-tarball.sh index c14efe9..5cba6b8 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -12,6 +12,7 @@ echo "Processing $input" echo "...extracting $input" tar xzf $input +#cd condor_src-$1 cd condor-$1 if [ ! -f BUILD-ID ] ; then @@ -22,16 +23,57 @@ fi echo "...recording BUILD-ID: $build" -echo "...removing NTconfig directory" -rm -rf NTconfig +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 \ + src/condor_tests/job_vmu_ckpt.run \ + src/condor_tests/job_vmu_ckpt.sh \ + src/condor_tests/job_vmu_network.key \ + src/condor_tests/job_vmu_network.run \ + src/condor_tests/job_vmu_network.sh \ + src/condor_tests/job_vmu_basic.run \ + 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 \ + src/condor_tests/x_job_quill_basic.template \ + src/condor_tests/x_job_quill_supw \ + src/condor_tests/x_param.quill \ + src/condor_tests/x_postgress_quill.conf \ + src/condor_tests/x_quill_buildperlmods.pl \ + src/condor_tests/x_quill_config_postsrc.template \ + src/condor_tests/x_quill_Expect-1.20.tar.gz \ + src/condor_tests/x_quill_IO-Tty-1.07.tar.gz \ + src/condor_tests/x_quill_pgsqlinstall.pl \ + src/condor_tests/x_quill_pgsqlstop.pl \ + src/condor_tests/x_quill_readline-5.2.tar.gz \ + src/condor_tests/x_quill_readlineinstall.pl; +do + echo "...removing $f"; + rm -r $f; +done; echo "...removing all externals except 'man'" mv externals/bundles/man externals/ -rm -rf externals/bundles/* +rm -r externals/bundles/* mv externals/man externals/bundles/ echo "...creating condor-$1-$build-RH.tar.gz" cd .. +#mv condor_src-$1 condor-$1 tar czfsp condor-$1-$build-RH.tar.gz condor-$1 echo "...cleaning up" diff --git a/sources b/sources index 0381172..e28da17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -132e01af31659d71c5f3c5d850f9c3eb condor-7.0.5-105846-RH.tar.gz +e84581852745cc46b25a7e9b28e2046f condor-7.2.0-121001-RH.tar.gz diff --git a/stdsoap2.h.patch.patch b/stdsoap2.h.patch.patch new file mode 100644 index 0000000..90face9 --- /dev/null +++ b/stdsoap2.h.patch.patch @@ -0,0 +1,13 @@ +diff --git a/src/condor_daemon_core.V6/stdsoap2.h.patch b/src/condor_daemon_core.V6/stdsoap2.h.patch +index a0fe3ed..c84abe7 100644 +--- a/src/condor_daemon_core.V6/stdsoap2.h.patch ++++ b/src/condor_daemon_core.V6/stdsoap2.h.patch +@@ -47,7 +47,7 @@ + @@ -418,8 +427,8 @@ + #endif + +- #if defined(__cplusplus) && !defined(WITH_LEAN) ++ #if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT) + -# include + -# include + +# include