Date: Fri, 4 Oct 2013 13:18:07 GMT From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182635: [patch] Update sysutils/condor to 8.0.3 Message-ID: <201310041318.r94DI7WM088091@oldred.freebsd.org> Resent-Message-ID: <201310041320.r94DK0Uo057279@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182635
>Category: ports
>Synopsis: [patch] Update sysutils/condor to 8.0.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 04 13:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Nathan Whitehorn
>Release: 10.0-CURRENT
>Organization:
University of Wisconsin
>Environment:
FreeBSD terminus.icecube.wisc.edu 10.0-ALPHA4 FreeBSD 10.0-ALPHA4 #18 r256008M: Thu Oct 3 14:44:23 CDT 2013 root@terminus.icecube.wisc.edu:/usr/obj/usr/src/sys/TERMINUS amd64
>Description:
Update sysutils/condor to version 8.0.3. The attached patch also makes it use STAGE and build with GCC on CURRENT (clang doesn't work for various reasons).
One other note: condor source files actually are redistributable (it is Apache licensed). FreeBSD would just have to host them itself.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 329304)
+++ Makefile (working copy)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= condor
-PORTVERSION= 7.8.7
-PORTREVISION= 1
+PORTVERSION= 8.0.3
+PORTREVISION= 0
CATEGORIES= sysutils net
MASTER_SITES= # empty
DISTNAME= condor_src-${PORTVERSION}-all-all
@@ -31,77 +31,8 @@
GROUPS= ${USERS}
USE_RC_SUBR= condor
+USE_GCC= yes
-PORTEXAMPLES= *
-PORTDOCS= *
-
-MANCOMPRESSED= yes
-
-MAN1= \
- cleanup_release.1 \
- condor_advertise.1 \
- condor_check_userlogs.1 \
- condor_checkpoint.1 \
- condor_chirp.1 \
- condor_cod.1 \
- condor_cold_start.1 \
- condor_cold_stop.1 \
- condor_compile.1 \
- condor_config_bind.1 \
- condor_config_val.1 \
- condor_configure.1 \
- condor_continue.1 \
- condor_dagman.1 \
- condor_fetchlog.1 \
- condor_findhost.1 \
- condor_gather_info.1 \
- condor_glidein.1 \
- condor_history.1 \
- condor_hold.1 \
- condor_load_history.1 \
- condor_master.1 \
- condor_off.1 \
- condor_on.1 \
- condor_power.1 \
- condor_preen.1 \
- condor_prio.1 \
- condor_procd.1 \
- condor_q.1 \
- condor_qedit.1 \
- condor_reconfig.1 \
- condor_release.1 \
- condor_reschedule.1 \
- condor_restart.1 \
- condor_rm.1 \
- condor_router_history.1 \
- condor_router_q.1 \
- condor_router_rm.1 \
- condor_run.1 \
- condor_set_shutdown.1 \
- condor_ssh_to_job.1 \
- condor_stats.1 \
- condor_status.1 \
- condor_store_cred.1 \
- condor_submit.1 \
- condor_submit_dag.1 \
- condor_suspend.1 \
- condor_transfer_data.1 \
- condor_updates_stats.1 \
- condor_userlog.1 \
- condor_userprio.1 \
- condor_vacate.1 \
- condor_vacate_job.1 \
- condor_version.1 \
- condor_wait.1 \
- filelock_midwife.1 \
- filelock_undertaker.1 \
- gidd_alloc.1 \
- install_release.1 \
- procd_ctl.1 \
- uniq_pid_midwife.1 \
- uniq_pid_undertaker.1
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
Index: distinfo
===================================================================
--- distinfo (revision 329304)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (condor_src-7.8.7-all-all.tar.gz) = 876dbb3c1135ba4a31c4c25d5db2b072e0de4be1927245cd37a23252bf853d78
-SIZE (condor_src-7.8.7-all-all.tar.gz) = 17325973
+SHA256 (condor_src-8.0.3-all-all.tar.gz) = 8220ae05b50e189a7b9e8018c88a6ebe6316f0affb3f99d3301788f514bd9b1e
+SIZE (condor_src-8.0.3-all-all.tar.gz) = 18678759
Index: files/patch-src-condor_scripts-CMakeLists.txt
===================================================================
--- files/patch-src-condor_scripts-CMakeLists.txt (revision 329304)
+++ files/patch-src-condor_scripts-CMakeLists.txt (working copy)
@@ -1,11 +0,0 @@
---- src/condor_scripts/CMakeLists.txt.orig 2012-01-17 10:53:14.000000000 -0600
-+++ src/condor_scripts/CMakeLists.txt 2012-04-07 14:37:17.000000000 -0500
-@@ -30,8 +30,6 @@
- if (WANT_FULL_DEPLOYMENT)
- install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
- install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
-- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_install \${CMAKE_INSTALL_PREFIX}/condor_install)" )
-- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \${CMAKE_INSTALL_PREFIX}/condor_configure)" )
- endif(WANT_FULL_DEPLOYMENT)
-
- install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
Index: pkg-plist
===================================================================
--- pkg-plist (revision 329304)
+++ pkg-plist (working copy)
@@ -10,10 +10,12 @@
bin/condor_gather_info
bin/condor_history
bin/condor_hold
+bin/condor_ping
bin/condor_power
bin/condor_prio
bin/condor_q
bin/condor_qedit
+bin/condor_qsub
bin/condor_release
bin/condor_reschedule
bin/condor_rm
@@ -27,6 +29,7 @@
bin/condor_submit
bin/condor_submit_dag
bin/condor_suspend
+bin/condor_tail
bin/condor_test_match
bin/condor_transfer_data
bin/condor_userlog
@@ -36,35 +39,38 @@
bin/condor_vacate_job
bin/condor_version
bin/condor_wait
-%%ETCDIR%%/condor
-%%ETCDIR%%/condor_config
-%%ETCDIR%%/condor_config.local
-%%ETCDIR%%/examples/README
-%%ETCDIR%%/examples/condor.boot.generic
-%%ETCDIR%%/examples/condor.boot.rpm
-%%ETCDIR%%/examples/condor.init
-%%ETCDIR%%/examples/condor.plist
-%%ETCDIR%%/examples/condor.sysconfig
-%%ETCDIR%%/examples/condor_config.generic
-%%ETCDIR%%/examples/condor_config.generic.redhat
-%%ETCDIR%%/examples/condor_config.local.central.manager
-%%ETCDIR%%/examples/condor_config.local.ckpt.server
-%%ETCDIR%%/examples/condor_config.local.dedicated.resource
-%%ETCDIR%%/examples/condor_config.local.dedicated.submit
-%%ETCDIR%%/examples/condor_config.local.ha_condor_client
-%%ETCDIR%%/examples/condor_config.local.ha_condor_had
-%%ETCDIR%%/examples/condor_config.local.view_server
-%%ETCDIR%%/examples/condor_config.submit.generic
-%%ETCDIR%%/examples/lamscript
-%%ETCDIR%%/examples/mp1script
-%%ETCDIR%%/examples/mp2script
-%%ETCDIR%%/examples/openmpiscript
-%%ETCDIR%%/sysconfig/condor
+bin/condor_who
+etc/condor/condor
+etc/condor/condor_config
+etc/condor/condor_config.local
+etc/condor/examples/README
+etc/condor/examples/condor.boot.generic
+etc/condor/examples/condor.boot.rpm
+etc/condor/examples/condor.init
+etc/condor/examples/condor.plist
+etc/condor/examples/condor.sysconfig
+etc/condor/examples/condor_config.generic
+etc/condor/examples/condor_config.generic.redhat
+etc/condor/examples/condor_config.local.central.manager
+etc/condor/examples/condor_config.local.ckpt.server
+etc/condor/examples/condor_config.local.dedicated.resource
+etc/condor/examples/condor_config.local.dedicated.submit
+etc/condor/examples/condor_config.local.ha_condor_client
+etc/condor/examples/condor_config.local.ha_condor_had
+etc/condor/examples/condor_config.local.view_server
+etc/condor/examples/condor_config.submit.generic
+etc/condor/examples/lamscript
+etc/condor/examples/mp1script
+etc/condor/examples/mp2script
+etc/condor/examples/openmpiscript
+etc/condor/sysconfig/condor
+etc/rc.d/condor
include/MyString.h
include/chirp_client.h
include/classad/attrrefs.h
include/classad/cclassad.h
include/classad/classad.h
+include/classad/classadCache.h
include/classad/classadErrno.h
include/classad/classadItor.h
include/classad/classad_distribution.h
@@ -108,12 +114,8 @@
include/user_log.c++.h
include/write_user_log.h
lib/Chirp.jar
-lib/Condor.pm
lib/CondorJavaInfo.class
lib/CondorJavaWrapper.class
-lib/CondorPersonal.pm
-lib/CondorTest.pm
-lib/CondorUtils.pm
lib/condor_ssh_to_job_sshd_config_template
lib/libchirp_client.a
lib/libclassad.a
@@ -136,8 +138,77 @@
libexec/condor_transferer
libexec/curl_plugin
libexec/data_plugin
+libexec/interactive.sub
libexec/libvirt_simple_script.awk
libexec/sshd.sh
+man/man1/bosco_cluster.1.gz
+man/man1/bosco_findplatform.1.gz
+man/man1/bosco_install.1.gz
+man/man1/bosco_ssh_start.1.gz
+man/man1/bosco_start.1.gz
+man/man1/bosco_stop.1.gz
+man/man1/bosco_uninstall.1.gz
+man/man1/condor_advertise.1.gz
+man/man1/condor_check_userlogs.1.gz
+man/man1/condor_checkpoint.1.gz
+man/man1/condor_chirp.1.gz
+man/man1/condor_cod.1.gz
+man/man1/condor_compile.1.gz
+man/man1/condor_config_val.1.gz
+man/man1/condor_configure.1.gz
+man/man1/condor_continue.1.gz
+man/man1/condor_dagman.1.gz
+man/man1/condor_drain.1.gz
+man/man1/condor_fetchlog.1.gz
+man/man1/condor_findhost.1.gz
+man/man1/condor_gather_info.1.gz
+man/man1/condor_glidein.1.gz
+man/man1/condor_history.1.gz
+man/man1/condor_hold.1.gz
+man/man1/condor_install.1.gz
+man/man1/condor_load_history.1.gz
+man/man1/condor_master.1.gz
+man/man1/condor_off.1.gz
+man/man1/condor_on.1.gz
+man/man1/condor_ping.1.gz
+man/man1/condor_power.1.gz
+man/man1/condor_preen.1.gz
+man/man1/condor_prio.1.gz
+man/man1/condor_procd.1.gz
+man/man1/condor_q.1.gz
+man/man1/condor_qedit.1.gz
+man/man1/condor_qsub.1.gz
+man/man1/condor_reconfig.1.gz
+man/man1/condor_release.1.gz
+man/man1/condor_reschedule.1.gz
+man/man1/condor_restart.1.gz
+man/man1/condor_rm.1.gz
+man/man1/condor_rmdir.1.gz
+man/man1/condor_router_history.1.gz
+man/man1/condor_router_q.1.gz
+man/man1/condor_router_rm.1.gz
+man/man1/condor_run.1.gz
+man/man1/condor_set_shutdown.1.gz
+man/man1/condor_ssh_to_job.1.gz
+man/man1/condor_stats.1.gz
+man/man1/condor_status.1.gz
+man/man1/condor_store_cred.1.gz
+man/man1/condor_submit.1.gz
+man/man1/condor_submit_dag.1.gz
+man/man1/condor_suspend.1.gz
+man/man1/condor_tail.1.gz
+man/man1/condor_transfer_data.1.gz
+man/man1/condor_updates_stats.1.gz
+man/man1/condor_userlog.1.gz
+man/man1/condor_userprio.1.gz
+man/man1/condor_vacate.1.gz
+man/man1/condor_vacate_job.1.gz
+man/man1/condor_version.1.gz
+man/man1/condor_wait.1.gz
+man/man1/condor_who.1.gz
+man/man1/gidd_alloc.1.gz
+man/man1/procd_ctl.1.gz
+sbin/bosco_install
sbin/condor_advertise
sbin/condor_c-gahp
sbin/condor_c-gahp_worker_thread
@@ -145,6 +216,7 @@
sbin/condor_configure
sbin/condor_credd
sbin/condor_fetchlog
+sbin/condor_ft-gahp
sbin/condor_gridmanager
sbin/condor_had
sbin/condor_init
@@ -169,19 +241,52 @@
sbin/condor_updates_stats
sbin/condor_vm-gahp
sbin/remote_gahp
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-2.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/A.submit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/B.submit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/C.submit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/D.submit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/Diamond.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/README.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/diamond.dag
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/half.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/random.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/dagman/sum.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/env.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/env.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/fortIO.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/fortIO.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/fstream.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/fstream.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/io.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/io.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/loop.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/loop.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/printer.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/printer.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/reader.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/reader.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/reader.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/registers.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/registers.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/sh_loop
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/sh_loop.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/submit
src/chirp/chirp_client.c
src/chirp/chirp_client.h
src/chirp/chirp_protocol.h
@dirrmtry src/chirp
@dirrmtry src
-@dirrm include/classad
-@dirrm %%ETCDIR%%/sysconfig
-@dirrm %%ETCDIR%%/examples
-@dirrm %%ETCDIR%%
-@cwd /
-@dirrmtry home/condor/config
-@dirrmtry home/condor/execute
-@dirrmtry home/condor/log
-@dirrmtry home/condor/spool
-@dirrmtry home/condor
-@dirrmtry home
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/examples/dagman
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/examples
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry include/classad
+@dirrmtry etc/condor/sysconfig
+@dirrmtry etc/condor/examples
+@dirrmtry etc/condor
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041318.r94DI7WM088091>