ports/118704: sysutils/condor: update to 6.8.5
Andy Pavlo
pavlo at cs.wisc.edu
Fri Dec 14 21:30:02 UTC 2007
>Number: 118704
>Category: ports
>Synopsis: sysutils/condor: update to 6.8.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 14 21:30:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Andy Pavlo
>Release: 6.2
>Organization:
University of Wisconsin
>Environment:
FreeBSD tiberius 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Tue Jul 24 19:35:23 EDT 2007 andy at tiberius:/usr/obj/usr/src/sys/TIBERIUS_KERNEL i386
>Description:
This patch will upgrade Condor from 6.8.4 to the new stable series 6.8.5
It also contains fixes for installing in the pointyhat test system
>How-To-Repeat:
diff patch included:
[/usr/ports/sysutils]# patch -p0 < condor.diff
>Fix:
Patch attached with submission follows:
diff -ruN condor.orig/Makefile condor/Makefile
--- condor.orig/Makefile Tue Jul 10 12:18:17 2007
+++ condor/Makefile Wed Jul 11 09:13:36 2007
@@ -6,7 +6,7 @@
#
PORTNAME= condor
-PORTVERSION= 6.8.4
+PORTVERSION= 6.8.5
CATEGORIES= sysutils parallel
MASTER_SITES= http://www.cs.wisc.edu/condor/cgi-bin/downloads/sendfile.pl/${OSREL}/v6.8/
DISTNAME= condor-${PORTVERSION}-freebsd6-x86-dynamic
diff -ruN condor.orig/distinfo condor/distinfo
--- condor.orig/distinfo Tue Jul 10 12:18:17 2007
+++ condor/distinfo Wed Jul 11 09:13:27 2007
@@ -1,3 +1,3 @@
-MD5 (condor-6.8.4-freebsd6-x86-dynamic.tar.gz) = 950fa962f2a9b5af20fc572ea506c5c7
-SHA256 (condor-6.8.4-freebsd6-x86-dynamic.tar.gz) = 5e246718ef080564c6c551cc6f8e762f4381bdbd6717ce4f07b189d5e7b6846e
-SIZE (condor-6.8.4-freebsd6-x86-dynamic.tar.gz) = 91225595
+MD5 (condor-6.8.5-freebsd6-x86-dynamic.tar.gz) = b21ae6789f94b530248659087bc5adf2
+SHA256 (condor-6.8.5-freebsd6-x86-dynamic.tar.gz) = 22ce1e36a9cab7c099a77dcb33d046bd9360b9c0044307b389b9bbcf0cf7dc08
+SIZE (condor-6.8.5-freebsd6-x86-dynamic.tar.gz) = 91309292
diff -ruN condor.orig/files/patch-condor_configure condor/files/patch-condor_configure
--- condor.orig/files/patch-condor_configure Tue Jul 10 12:18:17 2007
+++ condor/files/patch-condor_configure Wed Jul 11 09:13:27 2007
@@ -1,6 +1,18 @@
---- condor_configure.orig Thu Feb 1 07:11:10 2007
-+++ condor_configure Sat Apr 28 18:26:02 2007
-@@ -134,6 +134,7 @@
+--- condor_configure.orig Tue Jul 10 14:58:29 2007
++++ condor_configure Tue Jul 10 14:58:34 2007
+@@ -111,6 +111,11 @@
+ only needed when condor_configure is called by a higher-level script, not when
+ invoked by a person.
+
++--overwrite
++Always overwrite the contents of the 'sbin' directory in the installation directory.
++By default, Condor will make a backup copy of the original 'sbin' and create a new
++'sbin' directory containing only the new binaries.
++
+ --verbose
+ Print more information.
+
+@@ -134,6 +139,7 @@
$opt_maybe_daemon_owner,
$opt_install_log,
$opt_verbose,
@@ -8,7 +20,45 @@
);
-@@ -482,6 +483,7 @@
+@@ -428,9 +434,21 @@
+
+ # Lookup the full hostname.
+ if (!gethostbyname($host)) {
+- die "\nInvalid host name \"$host\". Please set the \
+- environment variable \$HOSTNAME to the full name of this machine \
+- e.g. mymachine.mydomain.com \n";
++ ##
++ ## We use to die right here when we couldn't get the hostname.
++ ## But the FreeBSD testers run Condor in a jail without a real hostname, so
++ ## we need to be able to still install when gethostbyname() fails
++ ## This is why we just set the fullhost to the host, and blank out the domain
++ ## Andy Pavlo - 06/27/2007
++ ##
++ $fullhost = $host;
++ $domain = "";
++ my $msg = "WARNING: Unable to determine full hostname for host '$host'. ".
++ "Condor may not work properly\n".
++ "Please set the environment variable \$HOSTNAME to the full name ".
++ "of this machine (e.g., mymachine.mydomain.com)\n";
++ warn($msg);
++ return;
+ }
+
+ $fullhost=(gethostbyname($host))[0];
+@@ -449,7 +467,11 @@
+ if( ! ($fullhost =~ /.*\..*/) ) {
+ $fullhost=$host;
+ $domain="";
+- warn "\nWARNING: Unable to determine full hostname.\n Condor may not work properly\n";
++ my $msg = "WARNING: Unable to determine full hostname for host '$host'. ".
++ "Condor may not work properly\n".
++ "Please set the environment variable \$HOSTNAME to the full name ".
++ "of this machine (e.g., mymachine.mydomain.com)\n";
++ warn($msg);
+ } else {
+ # Grab just the domain, so we have it.
+ $fullhost =~ /\w*\.(.*)/;
+@@ -482,6 +504,7 @@
"install-log=s" => \$opt_install_log,
"verbose!" => \$opt_verbose,
"help" => sub {print $Usage; exit 0},
@@ -16,7 +66,16 @@
) or die $Usage;
if ($opt_local_dir && !($opt_local_dir =~ m/^\//)) {
-@@ -629,7 +631,7 @@
+@@ -557,6 +580,8 @@
+ return $ENV{CONDOR_CONFIG};
+ } elsif (-f "/etc/condor/condor_config") {
+ return "/etc/condor/condor_config";
++ } elsif (-f "/usr/local/etc/condor_config") {
++ return "/usr/local/etc/condor_config";
+ } elsif (-f "$release_dir/etc/condor_config") {
+ return "$release_dir/etc/condor_config";
+ }
+@@ -629,7 +654,7 @@
# Move the sbin directories instead of overwriting them,
# so that the running daemons don't blow up
@@ -25,3 +84,12 @@
rename ("$release_dir/sbin", "$release_dir/sbin.old.$timestamp") or
die "Unable to move $release_dir/sbin!\n";
}
+@@ -671,7 +696,7 @@
+ die "Unable to create local config file: $local_config_file!\n";
+ $global_config{LOCAL_CONFIG_FILE}="$local_config_file";
+
+- make_personal_condor();
++ # make_personal_condor();
+ # Don't assume the CONDOR_HOST will be defined (e.g. Condor-G)
+ #$local_config{CONDOR_HOST}=$host;
+
diff -ruN condor.orig/pkg-descr condor/pkg-descr
--- condor.orig/pkg-descr Tue Jul 10 12:18:17 2007
+++ condor/pkg-descr Wed Jul 11 09:18:39 2007
@@ -1,10 +1,9 @@
-Condor is a open-source, specialized workload management system for
-compute-intensive jobs. Like other full-featured batch systems, Condor
-provides a job queueing mechanism, scheduling policy, priority scheme,
-resource monitoring, and resource management. Users submit their serial
-or parallel jobs to Condor, Condor places them into a queue, chooses
-when and where to run the jobs based upon a policy, carefully monitors
-their progress, and ultimately informs the user upon completion. Condor
+Condor is a specialized workload management system for compute-intensive jobs.
+Like other full-featured batch systems, Condor provides a job queueing mechanism,
+scheduling policy, priority scheme, resource monitoring, and resource management.
+Users submit their serial or parallel jobs to Condor, Condor places them into a
+queue, chooses when and where to run the jobs based upon a policy, carefully
+monitors their progress, and ultimately informs the user upon completion. Condor
also contains mechanisms to submit jobs to grid-sites and supports many
different grid toolkits.
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list