From nobody@FreeBSD.org  Wed Oct 31 20:33:33 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CB666E5
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 31 Oct 2012 20:33:33 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id B22E58FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 31 Oct 2012 20:33:33 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9VKXWmj092260
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 31 Oct 2012 20:33:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q9VKXWYn092259;
	Wed, 31 Oct 2012 20:33:32 GMT
	(envelope-from nobody)
Message-Id: <201210312033.q9VKXWYn092259@red.freebsd.org>
Date: Wed, 31 Oct 2012 20:33:32 GMT
From: Jason Bacon <jwbacon@tds.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: maintainer update: sysutils/condor
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173246
>Category:       ports
>Synopsis:       maintainer update: sysutils/condor
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 31 20:40:00 UTC 2012
>Closed-Date:    Thu Jan 10 19:26:54 UTC 2013
>Last-Modified:  Thu Jan 10 19:26:54 UTC 2013
>Originator:     Jason Bacon
>Release:        9.0-RELEASE
>Organization:
Acadix Consulting, LLC
>Environment:
FreeBSD sculpin.jbacon.dyndns.org 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Update to lastest stable release.

Major improvements to config file templates to simplify post-install setup.

Changed default dir from /var/db/condor to /home/condor so that user jobs won't fill /var.

Also tested on 8.3-RELEASE.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/sysutils/condor/Makefile /home/bacon/Prog/Ports/ports/sysutils/condor/Makefile
--- /usr/ports/sysutils/condor/Makefile	2012-05-10 11:28:19.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/Makefile	2012-10-31 12:28:22.000000000 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	condor
-PORTVERSION=	7.6.6
+PORTVERSION=	7.8.6
 CATEGORIES=	sysutils net
 MASTER_SITES=	# empty
 DISTNAME=	condor_src-${PORTVERSION}-all-all
@@ -57,16 +57,16 @@
 	condor_config_bind.1 \
 	condor_config_val.1 \
 	condor_configure.1 \
-	condor_convert_history.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_master_off.1 \
 	condor_off.1 \
 	condor_on.1 \
 	condor_power.1 \
@@ -76,13 +76,13 @@
 	condor_q.1 \
 	condor_qedit.1 \
 	condor_reconfig.1 \
-	condor_reconfig_schedd.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 \
@@ -91,6 +91,7 @@
 	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 \
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/distinfo /home/bacon/Prog/Ports/ports/sysutils/condor/distinfo
--- /usr/ports/sysutils/condor/distinfo	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/distinfo	2012-10-31 13:13:14.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b
-SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204
+SHA256 (condor_src-7.8.6-all-all.tar.gz) = 09d80d6a7c6ddbc5eedc89cbab52259be37c43bfba55af2e9fbaf238c47a4404
+SIZE (condor_src-7.8.6-all-all.tar.gz) = 17491084
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/condor_config.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.in
--- /usr/ports/sysutils/condor/files/condor_config.in	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.in	2012-10-31 12:54:08.000000000 -0500
@@ -57,7 +57,8 @@
 
 ##  Where is the local condor directory for each host?  
 ##  This is where the local config file(s), logs and
-##  spool/execute directories are located
+##  spool/execute directories are located.  Should be a large
+##  partition if jobs may produce a lot of output.
 LOCAL_DIR               = $(TILDE)
 
 ##  Where is the machine-specific local config file for each host?
@@ -84,7 +85,7 @@
 
 ##  Full path to a mail delivery program that understands that "-s"
 ##  means you want to specify a subject:
-MAIL                    = /bin/mail
+MAIL                    = /usr/bin/mail
 
 ##--------------------------------------------------------------------
 ##  Network domain parameters:
@@ -177,6 +178,7 @@
 ##  machine(s) where whoever is the condor administrator(s) works
 ##  (assuming you trust all the users who log into that/those
 ##  machine(s), since this is machine-wide access you're granting).
+
 ALLOW_ADMINISTRATOR = $(CONDOR_HOST)
 
 ##  If there are no machines that should have administrative access 
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/condor_config.local.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.local.in
--- /usr/ports/sysutils/condor/files/condor_config.local.in	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.local.in	2012-10-31 13:06:00.000000000 -0500
@@ -1,27 +1,39 @@
+############################################################################
+##  condor_config.local
+##  Settings here override the defaults in condor_config.
+##  Make changes/additions here and leave condor_config unchanged so
+##  that defaults are documented.
+############################################################################
+
+############################################################################
 ##  What machine is your central manager?
+##  Use $(FULL_HOSTNAME) if this is the central manager, or the central
+##  manager's hostname otherwise.
 
-CONDOR_HOST = $(FULL_HOSTNAME)
+##  CONDOR_HOST = $(FULL_HOSTNAME)
 
+############################################################################
 ## Pool's short description
 
-COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)
+##  COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
 
+############################################################################
 ##  When is this machine willing to start a job? 
 
 START = TRUE
 
-
+############################################################################
 ##  When to suspend a job?
 
 SUSPEND = FALSE
 
-
+############################################################################
 ##  When to nicely stop a job?
 ##  (as opposed to killing it instantaneously)
 
 PREEMPT = FALSE
 
-
+############################################################################
 ##  When to instantaneously kill a preempting job
 ##  (e.g. if a job is in the pre-empting stage for too long)
 
@@ -30,13 +42,42 @@
 ###########################################################################
 # DAEMON LIST:
 #
-# All hosts:		MASTER
-# Central manager:	COLLECTOR, NEGOTIATOR
-# Submit hosts:		SCHEDD
-# Execute hosts:	STARTD
+# All hosts:            MASTER
+# Central manager:      COLLECTOR, NEGOTIATOR
+# Submit hosts:         SCHEDD
+# Execute hosts:        STARTD
 
 ##  This macro determines what daemons the condor_master will start and 
 ##  keep its watchful eyes on.
 ##  The list is a comma or space separated list of subsystem names
 
-DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
+##  Central manager
+##  DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
+
+##  Submit/execute host
+DAEMON_LIST = MASTER, SCHEDD, STARTD
+
+##  Execute-only host
+##  DAEMON_LIST = MASTER, STARTD
+
+###########################################################################
+##  Permissions for this host
+##
+##  *.your.domain, x.y.z.*, hostname, $(MACRO)
+##
+##  ALLOW_ADMINISTRATOR is required by condor_off
+##  If central manager is not this host, this entry allows both the central
+##  manager and this host to manage the pool.
+
+ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
+
+##
+##  Enables condor_status, condor_q, ...
+
+ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
+
+##
+##  Enables scheduling jobs here
+
+ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
+
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp /home/bacon/Prog/Ports/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp
--- /usr/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	2012-10-30 14:26:40.000000000 -0500
@@ -1,6 +1,6 @@
---- src/condor_sysapi/idle_time.cpp.orig	2012-01-17 10:53:14.000000000 -0600
-+++ src/condor_sysapi/idle_time.cpp	2012-04-07 14:37:17.000000000 -0500
-@@ -202,17 +202,22 @@
+--- src/condor_sysapi/idle_time.cpp.orig	2012-10-24 23:10:41.000000000 -0500
++++ src/condor_sysapi/idle_time.cpp	2012-10-30 14:25:53.000000000 -0500
+@@ -205,17 +205,25 @@
  	return;
  }
  
@@ -11,17 +11,20 @@
 +#endif
  
  #if defined(LINUX)
- static char *UtmpName = "/var/run/utmp";
- static char *AltUtmpName = "/var/adm/utmp";
+ static const char *UtmpName = "/var/run/utmp";
+ static const char *AltUtmpName = "/var/adm/utmp";
 -#elif defined(CONDOR_FREEBSD)
 +// FreeBSD 9 made a clean break from utmp to utmpx
 +#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
  static char *UtmpName = "/var/run/utmp";
  static char *AltUtmpName = "";
 -#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
++// FreeBSD 9 made a clean break from utmp to utmpx
 +#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9)
  #include <utmpx.h>
++#if defined(CONDOR_FREEBSD9)
 +#define ut_name ut_user
++#endif
  static char *UtmpName = "/etc/utmpx";
  static char *AltUtmpName = "/var/adm/utmpx";
  #undef UTMP_KIND
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/pkg-install.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-install.in
--- /usr/ports/sysutils/condor/files/pkg-install.in	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-install.in	2012-10-31 15:23:13.000000000 -0500
@@ -18,7 +18,11 @@
 
 u=condor
 g=condor
-homedir=/var/db/condor
+
+# Place condor on a large partition so it can accommodate output files from
+# jobs.  The default /var/db/condor could result in /var filling up with
+# job output.
+homedir=/home/condor
 
 case $2 in
 POST-INSTALL)
@@ -26,6 +30,7 @@
 	mkdir -p $homedir/$dir
     done
     chown -Rh $u:$g $homedir
+    ln -s $homedir /var/db
     ;;
 
 DEINSTALL)
@@ -33,5 +38,5 @@
 	rmdir $homedir/$dir 2>/dev/null
     done
     ;;
-
 esac
+
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/pkg-message.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-message.in
--- /usr/ports/sysutils/condor/files/pkg-message.in	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-message.in	2012-10-31 13:13:07.000000000 -0500
@@ -1,8 +1,15 @@
 
 Sample condor_config and condor_config.local files are available in
-%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit to taste
+%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit condor_config.local to taste
 to get started.
 
+Settings in condor_config.local override the defaults in condor_config.
+Use condor_config as a reference, and make all changes to condor_config.local.
+
+Unless this is the central manager host, you will need to at least change
+CONDOR_HOST.  Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
+this host.
+
 To start the condor daemons, add 'condor_enable="YES"' to
 
 	/etc/rc.conf
diff -ruN --exclude=CVS /usr/ports/sysutils/condor/pkg-plist /home/bacon/Prog/Ports/ports/sysutils/condor/pkg-plist
--- /usr/ports/sysutils/condor/pkg-plist	2012-05-07 10:06:45.000000000 -0500
+++ /home/bacon/Prog/Ports/ports/sysutils/condor/pkg-plist	2012-10-30 22:28:56.000000000 -0500
@@ -1,10 +1,11 @@
 bin/classad_functional_tester
 bin/classad_version
-bin/condor
 bin/condor_check_userlogs
 bin/condor_cod
 bin/condor_config_val
+bin/condor_continue
 bin/condor_dagman
+bin/condor_drain
 bin/condor_findhost
 bin/condor_gather_info
 bin/condor_history
@@ -25,6 +26,8 @@
 bin/condor_status
 bin/condor_submit
 bin/condor_submit_dag
+bin/condor_suspend
+bin/condor_test_match
 bin/condor_transfer_data
 bin/condor_userlog
 bin/condor_userlog_job_counter
@@ -40,8 +43,10 @@
 %%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
@@ -90,16 +95,11 @@
 include/compat_classad.h
 include/compat_classad_list.h
 include/compat_classad_util.h
-include/condor_ast.h
-include/condor_astbase.h
-include/condor_attrlist.h
 include/condor_classad.h
 include/condor_constants.h
 include/condor_event.h
-include/condor_exprtype.h
 include/condor_header_features.h
 include/condor_holdcodes.h
-include/condor_parser.h
 include/file_lock.h
 include/iso_dates.h
 include/read_user_log.h
@@ -111,25 +111,22 @@
 lib/Condor.pm
 lib/CondorJavaInfo.class
 lib/CondorJavaWrapper.class
-lib/Execute.pm
-lib/FileLock.pm
+lib/CondorPersonal.pm
+lib/CondorTest.pm
+lib/CondorUtils.pm
 lib/condor_ssh_to_job_sshd_config_template
 lib/libchirp_client.a
 lib/libclassad.a
 lib/libcondorapi.a
 lib/scimark2lib.jar
-libexec/bgp_available_partitions
-libexec/bgp_back_partition
-libexec/bgp_boot_partition
-libexec/bgp_destroy_partition
-libexec/bgp_generate_partition
-libexec/bgp_query_work_loads
-libexec/bgp_shutdown_partition
+libexec/accountant_log_fixer
 libexec/condor_chirp
+libexec/condor_defrag
 libexec/condor_job_router
 libexec/condor_kflops
 libexec/condor_limits_wrapper.sh
 libexec/condor_mips
+libexec/condor_power_state
 libexec/condor_rooster
 libexec/condor_schedd.init
 libexec/condor_shared_port
@@ -139,20 +136,12 @@
 libexec/condor_transferer
 libexec/curl_plugin
 libexec/data_plugin
-libexec/gridftp_wrapper.sh
 libexec/libvirt_simple_script.awk
-libexec/power_state
 libexec/sshd.sh
-sbin/cleanup_release
-sbin/condor
 sbin/condor_advertise
 sbin/condor_c-gahp
 sbin/condor_c-gahp_worker_thread
-sbin/condor_cleanup_local
-sbin/condor_cold_start
-sbin/condor_cold_stop
 sbin/condor_collector
-sbin/condor_config_bind
 sbin/condor_configure
 sbin/condor_credd
 sbin/condor_fetchlog
@@ -160,19 +149,13 @@
 sbin/condor_had
 sbin/condor_init
 sbin/condor_install
-sbin/condor_install_local
-sbin/condor_lease_manager
-sbin/condor_local_start
-sbin/condor_local_stop
 sbin/condor_master
-sbin/condor_master_off
 sbin/condor_negotiator
 sbin/condor_off
 sbin/condor_on
 sbin/condor_preen
 sbin/condor_procd
 sbin/condor_reconfig
-sbin/condor_reconfig_schedd
 sbin/condor_replication
 sbin/condor_restart
 sbin/condor_root_switchboard
@@ -180,25 +163,15 @@
 sbin/condor_set_shutdown
 sbin/condor_shadow
 sbin/condor_startd
-sbin/condor_startd_factory
 sbin/condor_starter
 sbin/condor_store_cred
 sbin/condor_transferd
 sbin/condor_updates_stats
 sbin/condor_vm-gahp
-sbin/filelock_midwife
-sbin/filelock_undertaker
-sbin/install_release
-sbin/uniq_pid_command
-sbin/uniq_pid_midwife
-sbin/uniq_pid_undertaker
+sbin/remote_gahp
 src/chirp/chirp_client.c
 src/chirp/chirp_client.h
 src/chirp/chirp_protocol.h
-src/startd_factory/BlueGeneP/htc_list_partitions.cpp
-src/startd_factory/BlueGeneP/htc_tool.cpp
-@dirrmtry src/startd_factory/BlueGeneP
-@dirrmtry src/startd_factory
 @dirrmtry src/chirp
 @dirrmtry src
 @dirrm include/classad


>Release-Note:
>Audit-Trail:

From: Nathan Whitehorn <nwhitehorn@freebsd.org>
To: bug-followup@FreeBSD.org, jwbacon@tds.net
Cc:  
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Sat, 01 Dec 2012 14:52:17 -0600

 This is a multi-part message in MIME format.
 
 --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg)
 Content-type: text/plain; CHARSET=US-ASCII; format=flowed
 Content-transfer-encoding: 7BIT
 
 I tried this out today and found a couple of minor errors: the path to 
 the utmpx file was wrong (used the Solaris one) and it could become 
 confused on reinstall if the /var/db/condor symlink already existed. The 
 attached patch is the same as the original, but with these fixed.
 
 Two side notes:
 1. It would be really nice if this could be committed soon. Condor 7.8.6 
 fixes a security flaw 
 (http://research.cs.wisc.edu/htcondor/security/vulnerabilities/CONDOR-2012-0003.html)
 2. Have any of the patches been sent back to upstream? I work at UW and 
 would be happy to toss them over the fence if not.
 -Nathan
 
 --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg)
 Content-type: text/plain; CHARSET=US-ASCII; name=condor786.diff
 Content-transfer-encoding: 7BIT
 Content-disposition: attachment; filename=condor786.diff
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 307967)
 +++ Makefile	(working copy)
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	condor
 -PORTVERSION=	7.6.6
 +PORTVERSION=	7.8.6
  CATEGORIES=	sysutils net
  MASTER_SITES=	# empty
  DISTNAME=	condor_src-${PORTVERSION}-all-all
 @@ -57,16 +57,16 @@
  	condor_config_bind.1 \
  	condor_config_val.1 \
  	condor_configure.1 \
 -	condor_convert_history.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_master_off.1 \
  	condor_off.1 \
  	condor_on.1 \
  	condor_power.1 \
 @@ -76,13 +76,13 @@
  	condor_q.1 \
  	condor_qedit.1 \
  	condor_reconfig.1 \
 -	condor_reconfig_schedd.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 \
 @@ -91,6 +91,7 @@
  	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 \
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 307967)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b
 -SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204
 +SHA256 (condor_src-7.8.6-all-all.tar.gz) = 09d80d6a7c6ddbc5eedc89cbab52259be37c43bfba55af2e9fbaf238c47a4404
 +SIZE (condor_src-7.8.6-all-all.tar.gz) = 17491084
 Index: files/condor_config.in
 ===================================================================
 --- files/condor_config.in	(revision 307967)
 +++ files/condor_config.in	(working copy)
 @@ -57,7 +57,8 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
 -##  spool/execute directories are located
 +##  spool/execute directories are located.  Should be a large
 +##  partition if jobs may produce a lot of output.
  LOCAL_DIR               = $(TILDE)
  
  ##  Where is the machine-specific local config file for each host?
 @@ -84,7 +85,7 @@
  
  ##  Full path to a mail delivery program that understands that "-s"
  ##  means you want to specify a subject:
 -MAIL                    = /bin/mail
 +MAIL                    = /usr/bin/mail
  
  ##--------------------------------------------------------------------
  ##  Network domain parameters:
 @@ -177,6 +178,7 @@
  ##  machine(s) where whoever is the condor administrator(s) works
  ##  (assuming you trust all the users who log into that/those
  ##  machine(s), since this is machine-wide access you're granting).
 +
  ALLOW_ADMINISTRATOR = $(CONDOR_HOST)
  
  ##  If there are no machines that should have administrative access 
 Index: files/condor_config.local.in
 ===================================================================
 --- files/condor_config.local.in	(revision 307967)
 +++ files/condor_config.local.in	(working copy)
 @@ -1,27 +1,39 @@
 +############################################################################
 +##  condor_config.local
 +##  Settings here override the defaults in condor_config.
 +##  Make changes/additions here and leave condor_config unchanged so
 +##  that defaults are documented.
 +############################################################################
 +
 +############################################################################
  ##  What machine is your central manager?
 +##  Use $(FULL_HOSTNAME) if this is the central manager, or the central
 +##  manager's hostname otherwise.
  
 -CONDOR_HOST = $(FULL_HOSTNAME)
 +##  CONDOR_HOST = $(FULL_HOSTNAME)
  
 +############################################################################
  ## Pool's short description
  
 -COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)
 +##  COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
  
 +############################################################################
  ##  When is this machine willing to start a job? 
  
  START = TRUE
  
 -
 +############################################################################
  ##  When to suspend a job?
  
  SUSPEND = FALSE
  
 -
 +############################################################################
  ##  When to nicely stop a job?
  ##  (as opposed to killing it instantaneously)
  
  PREEMPT = FALSE
  
 -
 +############################################################################
  ##  When to instantaneously kill a preempting job
  ##  (e.g. if a job is in the pre-empting stage for too long)
  
 @@ -30,13 +42,42 @@
  ###########################################################################
  # DAEMON LIST:
  #
 -# All hosts:		MASTER
 -# Central manager:	COLLECTOR, NEGOTIATOR
 -# Submit hosts:		SCHEDD
 -# Execute hosts:	STARTD
 +# All hosts:            MASTER
 +# Central manager:      COLLECTOR, NEGOTIATOR
 +# Submit hosts:         SCHEDD
 +# Execute hosts:        STARTD
  
  ##  This macro determines what daemons the condor_master will start and 
  ##  keep its watchful eyes on.
  ##  The list is a comma or space separated list of subsystem names
  
 -DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
 +##  Central manager
 +##  DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
 +
 +##  Submit/execute host
 +DAEMON_LIST = MASTER, SCHEDD, STARTD
 +
 +##  Execute-only host
 +##  DAEMON_LIST = MASTER, STARTD
 +
 +###########################################################################
 +##  Permissions for this host
 +##
 +##  *.your.domain, x.y.z.*, hostname, $(MACRO)
 +##
 +##  ALLOW_ADMINISTRATOR is required by condor_off
 +##  If central manager is not this host, this entry allows both the central
 +##  manager and this host to manage the pool.
 +
 +ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables condor_status, condor_q, ...
 +
 +ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables scheduling jobs here
 +
 +ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 Index: files/patch-src-condor_sysapi-idle_time.cpp
 ===================================================================
 --- files/patch-src-condor_sysapi-idle_time.cpp	(revision 307967)
 +++ files/patch-src-condor_sysapi-idle_time.cpp	(working copy)
 @@ -1,6 +1,6 @@
 ---- src/condor_sysapi/idle_time.cpp.orig	2012-01-17 10:53:14.000000000 -0600
 -+++ src/condor_sysapi/idle_time.cpp	2012-04-07 14:37:17.000000000 -0500
 -@@ -202,17 +202,22 @@
 +--- src/condor_sysapi/idle_time.cpp.bak	2012-10-24 23:10:41.000000000 -0500
 ++++ src/condor_sysapi/idle_time.cpp	2012-12-01 14:46:20.000000000 -0600
 +@@ -205,19 +205,30 @@
   	return;
   }
   
 @@ -11,17 +11,25 @@
  +#endif
   
   #if defined(LINUX)
 - static char *UtmpName = "/var/run/utmp";
 - static char *AltUtmpName = "/var/adm/utmp";
 + static const char *UtmpName = "/var/run/utmp";
 + static const char *AltUtmpName = "/var/adm/utmp";
  -#elif defined(CONDOR_FREEBSD)
  +// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
   static char *UtmpName = "/var/run/utmp";
   static char *AltUtmpName = "";
  -#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
 ++// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9)
   #include <utmpx.h>
 ++#if defined(CONDOR_FREEBSD9)
  +#define ut_name ut_user
 ++static char *UtmpName = "/var/run/utx.active";
 ++static char *AltUtmpName = "";
 ++#else
   static char *UtmpName = "/etc/utmpx";
   static char *AltUtmpName = "/var/adm/utmpx";
 ++#endif
   #undef UTMP_KIND
 + #define UTMP_KIND utmpx
 + #elif defined(HPUX11)
 Index: files/pkg-install.in
 ===================================================================
 --- files/pkg-install.in	(revision 307967)
 +++ files/pkg-install.in	(working copy)
 @@ -18,14 +18,20 @@
  
  u=condor
  g=condor
 -homedir=/var/db/condor
  
 +# Place condor on a large partition so it can accommodate output files from
 +# jobs.  The default /var/db/condor could result in /var filling up with
 +# job output.
 +homedir=/home/condor
 +
  case $2 in
  POST-INSTALL)
      for dir in log spool config execute; do
  	mkdir -p $homedir/$dir
      done
      chown -Rh $u:$g $homedir
 +    rm /var/db/condor
 +    ln -s $homedir /var/db
      ;;
  
  DEINSTALL)
 @@ -33,5 +39,5 @@
  	rmdir $homedir/$dir 2>/dev/null
      done
      ;;
 +esac
  
 -esac
 Index: files/pkg-message.in
 ===================================================================
 --- files/pkg-message.in	(revision 307967)
 +++ files/pkg-message.in	(working copy)
 @@ -1,8 +1,15 @@
  
  Sample condor_config and condor_config.local files are available in
 -%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit to taste
 +%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit condor_config.local to taste
  to get started.
  
 +Settings in condor_config.local override the defaults in condor_config.
 +Use condor_config as a reference, and make all changes to condor_config.local.
 +
 +Unless this is the central manager host, you will need to at least change
 +CONDOR_HOST.  Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
 +this host.
 +
  To start the condor daemons, add 'condor_enable="YES"' to
  
  	/etc/rc.conf
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 307967)
 +++ pkg-plist	(working copy)
 @@ -1,10 +1,11 @@
  bin/classad_functional_tester
  bin/classad_version
 -bin/condor
  bin/condor_check_userlogs
  bin/condor_cod
  bin/condor_config_val
 +bin/condor_continue
  bin/condor_dagman
 +bin/condor_drain
  bin/condor_findhost
  bin/condor_gather_info
  bin/condor_history
 @@ -25,6 +26,8 @@
  bin/condor_status
  bin/condor_submit
  bin/condor_submit_dag
 +bin/condor_suspend
 +bin/condor_test_match
  bin/condor_transfer_data
  bin/condor_userlog
  bin/condor_userlog_job_counter
 @@ -40,8 +43,10 @@
  %%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
 @@ -90,16 +95,11 @@
  include/compat_classad.h
  include/compat_classad_list.h
  include/compat_classad_util.h
 -include/condor_ast.h
 -include/condor_astbase.h
 -include/condor_attrlist.h
  include/condor_classad.h
  include/condor_constants.h
  include/condor_event.h
 -include/condor_exprtype.h
  include/condor_header_features.h
  include/condor_holdcodes.h
 -include/condor_parser.h
  include/file_lock.h
  include/iso_dates.h
  include/read_user_log.h
 @@ -111,25 +111,22 @@
  lib/Condor.pm
  lib/CondorJavaInfo.class
  lib/CondorJavaWrapper.class
 -lib/Execute.pm
 -lib/FileLock.pm
 +lib/CondorPersonal.pm
 +lib/CondorTest.pm
 +lib/CondorUtils.pm
  lib/condor_ssh_to_job_sshd_config_template
  lib/libchirp_client.a
  lib/libclassad.a
  lib/libcondorapi.a
  lib/scimark2lib.jar
 -libexec/bgp_available_partitions
 -libexec/bgp_back_partition
 -libexec/bgp_boot_partition
 -libexec/bgp_destroy_partition
 -libexec/bgp_generate_partition
 -libexec/bgp_query_work_loads
 -libexec/bgp_shutdown_partition
 +libexec/accountant_log_fixer
  libexec/condor_chirp
 +libexec/condor_defrag
  libexec/condor_job_router
  libexec/condor_kflops
  libexec/condor_limits_wrapper.sh
  libexec/condor_mips
 +libexec/condor_power_state
  libexec/condor_rooster
  libexec/condor_schedd.init
  libexec/condor_shared_port
 @@ -139,20 +136,12 @@
  libexec/condor_transferer
  libexec/curl_plugin
  libexec/data_plugin
 -libexec/gridftp_wrapper.sh
  libexec/libvirt_simple_script.awk
 -libexec/power_state
  libexec/sshd.sh
 -sbin/cleanup_release
 -sbin/condor
  sbin/condor_advertise
  sbin/condor_c-gahp
  sbin/condor_c-gahp_worker_thread
 -sbin/condor_cleanup_local
 -sbin/condor_cold_start
 -sbin/condor_cold_stop
  sbin/condor_collector
 -sbin/condor_config_bind
  sbin/condor_configure
  sbin/condor_credd
  sbin/condor_fetchlog
 @@ -160,19 +149,13 @@
  sbin/condor_had
  sbin/condor_init
  sbin/condor_install
 -sbin/condor_install_local
 -sbin/condor_lease_manager
 -sbin/condor_local_start
 -sbin/condor_local_stop
  sbin/condor_master
 -sbin/condor_master_off
  sbin/condor_negotiator
  sbin/condor_off
  sbin/condor_on
  sbin/condor_preen
  sbin/condor_procd
  sbin/condor_reconfig
 -sbin/condor_reconfig_schedd
  sbin/condor_replication
  sbin/condor_restart
  sbin/condor_root_switchboard
 @@ -180,28 +163,17 @@
  sbin/condor_set_shutdown
  sbin/condor_shadow
  sbin/condor_startd
 -sbin/condor_startd_factory
  sbin/condor_starter
  sbin/condor_store_cred
  sbin/condor_transferd
  sbin/condor_updates_stats
  sbin/condor_vm-gahp
 -sbin/filelock_midwife
 -sbin/filelock_undertaker
 -sbin/install_release
 -sbin/uniq_pid_command
 -sbin/uniq_pid_midwife
 -sbin/uniq_pid_undertaker
 +sbin/remote_gahp
  src/chirp/chirp_client.c
  src/chirp/chirp_client.h
  src/chirp/chirp_protocol.h
 -src/startd_factory/BlueGeneP/htc_list_partitions.cpp
 -src/startd_factory/BlueGeneP/htc_tool.cpp
 -@dirrmtry src/startd_factory/BlueGeneP
 -@dirrmtry src/startd_factory
  @dirrmtry src/chirp
  @dirrmtry src
 -@dirrm include/classad
 -@dirrm %%ETCDIR%%/sysconfig
 +@dirrm include/classad@dirrm %%ETCDIR%%/sysconfig
  @dirrm %%ETCDIR%%/examples
  @dirrm %%ETCDIR%%
 
 --Boundary_(ID_GNneARyUQAUxvBI0vFAwqg)--

From: Jason Bacon <jwbacon@tds.net>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Sun, 02 Dec 2012 14:19:46 -0600

 On 12/01/12 14:52, Nathan Whitehorn wrote:
 > I tried this out today and found a couple of minor errors: the path to 
 > the utmpx file was wrong (used the Solaris one) and it could become 
 > confused on reinstall if the /var/db/condor symlink already existed. 
 > The attached patch is the same as the original, but with these fixed.
 >
 > Two side notes:
 > 1. It would be really nice if this could be committed soon. Condor 
 > 7.8.6 fixes a security flaw 
 > (http://research.cs.wisc.edu/htcondor/security/vulnerabilities/CONDOR-2012-0003.html)
 Just tried out the patches, and they look good.  Thanks for chipping in...
 > 2. Have any of the patches been sent back to upstream? I work at UW 
 > and would be happy to toss them over the fence if not.
 No, I haven't.  I did this update in a hurry and wanted to go over it 
 again before sending anything upstream.  It looks like you found the 
 bugs I would have been looking for, so I think we have something worth 
 sending upstream now.  I would gladly accept your offer to pass the 
 patches along.
 
 Thanks much,
 
      -J
 
 
State-Changed-From-To: open->feedback 
State-Changed-By: rm 
State-Changed-When: Fri Jan 4 18:45:29 UTC 2013 
State-Changed-Why:  
Hello. With this patch (Nathan's version) it fails on install. Plese see 
log here: http://people.freebsd.org/~rm/condor-7.8.6.log Would you 
please fix? And I also see that there is updated, so it may have sence 
to actualize patch also. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173246 

From: Ruslan Makhmatkhanov <cvs-src@yandex.ru>
To: Jason Bacon <jwbacon@tds.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Sun, 06 Jan 2013 19:27:51 +0400

 Jason Bacon wrote on 06.01.2013 18:14:
 > On 01/04/2013 12:45, rm@FreeBSD.org wrote:
 >> Synopsis: maintainer update: sysutils/condor
 >>
 >> State-Changed-From-To: open->feedback
 >> State-Changed-By: rm
 >> State-Changed-When: Fri Jan 4 18:45:29 UTC 2013
 >> State-Changed-Why:
 >> Hello. With this patch (Nathan's version) it fails on install. Plese see
 >> log here: http://people.freebsd.org/~rm/condor-7.8.6.log Would you
 >> please fix? And I also see that there is updated, so it may have sence
 >> to actualize patch also.
 >>
 >> http://www.freebsd.org/cgi/query-pr.cgi?pr=173246
 >
 > The old pkg-install does not work if rm is aliased.
 >
 > New patch set attached with full path names for all commands.
 >
 > Heads-up: Nathan's patch also lost a newline in pkg-plist somewhere
 > along the way.  I've seen this happen once or twice before when
 > submitting PRs.
 >
 
 It's still failing with the same error:
 http://people.freebsd.org/~rm/condor-7.8.6-new-patch.log
 
 Would you please modify the patch to update to 7.8.7 while you on it? 
 Thanks.
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.

From: Jason Bacon <jwbacon@tds.net>
To: Ruslan Makhmatkhanov <cvs-src@yandex.ru>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Sun, 06 Jan 2013 16:30:24 -0600

 This is a multi-part message in MIME format.
 --------------070605080908010004000004
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 On 01/06/2013 09:27, Ruslan Makhmatkhanov wrote:
 > Jason Bacon wrote on 06.01.2013 18:14:
 >> On 01/04/2013 12:45, rm@FreeBSD.org wrote:
 >>> Synopsis: maintainer update: sysutils/condor
 >>>
 >>> State-Changed-From-To: open->feedback
 >>> State-Changed-By: rm
 >>> State-Changed-When: Fri Jan 4 18:45:29 UTC 2013
 >>> State-Changed-Why:
 >>> Hello. With this patch (Nathan's version) it fails on install. Plese 
 >>> see
 >>> log here: http://people.freebsd.org/~rm/condor-7.8.6.log Would you
 >>> please fix? And I also see that there is updated, so it may have sence
 >>> to actualize patch also.
 >>>
 >>> http://www.freebsd.org/cgi/query-pr.cgi?pr=173246
 >>
 >> The old pkg-install does not work if rm is aliased.
 >>
 >> New patch set attached with full path names for all commands.
 >>
 >> Heads-up: Nathan's patch also lost a newline in pkg-plist somewhere
 >> along the way.  I've seen this happen once or twice before when
 >> submitting PRs.
 >>
 >
 > It's still failing with the same error:
 > http://people.freebsd.org/~rm/condor-7.8.6-new-patch.log
 >
 > Would you please modify the patch to update to 7.8.7 while you on it? 
 > Thanks.
 >
 Are you sure you applied the newest patches?  I can't reproduce this 
 error anymore.
 
 Patch to 7.8.7 attached.
 
 -- 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Jason W. Bacon
 jwbacon@tds.net
 http://personalpages.tds.net/~jwbacon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 
 --------------070605080908010004000004
 Content-Type: text/plain;
  name="condor-diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="condor-diff.txt"
 
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/Makefile /home/bacon/Prog/Ports/ports/sysutils/condor/Makefile
 --- /usr/ports/sysutils/condor/Makefile	2012-12-10 13:24:05.000000000 -0600
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/Makefile	2013-01-06 16:22:07.000000000 -0600
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	condor
 -PORTVERSION=	7.6.6
 -PORTREVISION=	1
 +PORTVERSION=	7.8.7
  CATEGORIES=	sysutils net
  MASTER_SITES=	# empty
  DISTNAME=	condor_src-${PORTVERSION}-all-all
 @@ -58,16 +57,16 @@
  	condor_config_bind.1 \
  	condor_config_val.1 \
  	condor_configure.1 \
 -	condor_convert_history.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_master_off.1 \
  	condor_off.1 \
  	condor_on.1 \
  	condor_power.1 \
 @@ -77,13 +76,13 @@
  	condor_q.1 \
  	condor_qedit.1 \
  	condor_reconfig.1 \
 -	condor_reconfig_schedd.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 \
 @@ -92,6 +91,7 @@
  	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 \
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/distinfo /home/bacon/Prog/Ports/ports/sysutils/condor/distinfo
 --- /usr/ports/sysutils/condor/distinfo	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/distinfo	2013-01-06 15:59:25.000000000 -0600
 @@ -1,2 +1,2 @@
 -SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b
 -SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204
 +SHA256 (condor_src-7.8.7-all-all.tar.gz) = 876dbb3c1135ba4a31c4c25d5db2b072e0de4be1927245cd37a23252bf853d78
 +SIZE (condor_src-7.8.7-all-all.tar.gz) = 17325973
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/condor_config.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.in
 --- /usr/ports/sysutils/condor/files/condor_config.in	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.in	2012-12-01 17:45:17.000000000 -0600
 @@ -57,7 +57,8 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
 -##  spool/execute directories are located
 +##  spool/execute directories are located.  Should be a large
 +##  partition if jobs may produce a lot of output.
  LOCAL_DIR               = $(TILDE)
  
  ##  Where is the machine-specific local config file for each host?
 @@ -84,7 +85,7 @@
  
  ##  Full path to a mail delivery program that understands that "-s"
  ##  means you want to specify a subject:
 -MAIL                    = /bin/mail
 +MAIL                    = /usr/bin/mail
  
  ##--------------------------------------------------------------------
  ##  Network domain parameters:
 @@ -177,6 +178,7 @@
  ##  machine(s) where whoever is the condor administrator(s) works
  ##  (assuming you trust all the users who log into that/those
  ##  machine(s), since this is machine-wide access you're granting).
 +
  ALLOW_ADMINISTRATOR = $(CONDOR_HOST)
  
  ##  If there are no machines that should have administrative access 
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/condor_config.local.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.local.in
 --- /usr/ports/sysutils/condor/files/condor_config.local.in	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/condor_config.local.in	2012-12-01 17:45:17.000000000 -0600
 @@ -1,27 +1,39 @@
 +############################################################################
 +##  condor_config.local
 +##  Settings here override the defaults in condor_config.
 +##  Make changes/additions here and leave condor_config unchanged so
 +##  that defaults are documented.
 +############################################################################
 +
 +############################################################################
  ##  What machine is your central manager?
 +##  Use $(FULL_HOSTNAME) if this is the central manager, or the central
 +##  manager's hostname otherwise.
  
 -CONDOR_HOST = $(FULL_HOSTNAME)
 +##  CONDOR_HOST = $(FULL_HOSTNAME)
  
 +############################################################################
  ## Pool's short description
  
 -COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)
 +##  COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
  
 +############################################################################
  ##  When is this machine willing to start a job? 
  
  START = TRUE
  
 -
 +############################################################################
  ##  When to suspend a job?
  
  SUSPEND = FALSE
  
 -
 +############################################################################
  ##  When to nicely stop a job?
  ##  (as opposed to killing it instantaneously)
  
  PREEMPT = FALSE
  
 -
 +############################################################################
  ##  When to instantaneously kill a preempting job
  ##  (e.g. if a job is in the pre-empting stage for too long)
  
 @@ -30,13 +42,42 @@
  ###########################################################################
  # DAEMON LIST:
  #
 -# All hosts:		MASTER
 -# Central manager:	COLLECTOR, NEGOTIATOR
 -# Submit hosts:		SCHEDD
 -# Execute hosts:	STARTD
 +# All hosts:            MASTER
 +# Central manager:      COLLECTOR, NEGOTIATOR
 +# Submit hosts:         SCHEDD
 +# Execute hosts:        STARTD
  
  ##  This macro determines what daemons the condor_master will start and 
  ##  keep its watchful eyes on.
  ##  The list is a comma or space separated list of subsystem names
  
 -DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
 +##  Central manager
 +##  DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
 +
 +##  Submit/execute host
 +DAEMON_LIST = MASTER, SCHEDD, STARTD
 +
 +##  Execute-only host
 +##  DAEMON_LIST = MASTER, STARTD
 +
 +###########################################################################
 +##  Permissions for this host
 +##
 +##  *.your.domain, x.y.z.*, hostname, $(MACRO)
 +##
 +##  ALLOW_ADMINISTRATOR is required by condor_off
 +##  If central manager is not this host, this entry allows both the central
 +##  manager and this host to manage the pool.
 +
 +ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables condor_status, condor_q, ...
 +
 +ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables scheduling jobs here
 +
 +ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp /home/bacon/Prog/Ports/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp
 --- /usr/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	2012-12-01 17:45:17.000000000 -0600
 @@ -1,6 +1,6 @@
 ---- src/condor_sysapi/idle_time.cpp.orig	2012-01-17 10:53:14.000000000 -0600
 -+++ src/condor_sysapi/idle_time.cpp	2012-04-07 14:37:17.000000000 -0500
 -@@ -202,17 +202,22 @@
 +--- src/condor_sysapi/idle_time.cpp.bak	2012-10-24 23:10:41.000000000 -0500
 ++++ src/condor_sysapi/idle_time.cpp	2012-12-01 14:46:20.000000000 -0600
 +@@ -205,19 +205,30 @@
   	return;
   }
   
 @@ -11,17 +11,25 @@
  +#endif
   
   #if defined(LINUX)
 - static char *UtmpName = "/var/run/utmp";
 - static char *AltUtmpName = "/var/adm/utmp";
 + static const char *UtmpName = "/var/run/utmp";
 + static const char *AltUtmpName = "/var/adm/utmp";
  -#elif defined(CONDOR_FREEBSD)
  +// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
   static char *UtmpName = "/var/run/utmp";
   static char *AltUtmpName = "";
  -#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
 ++// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9)
   #include <utmpx.h>
 ++#if defined(CONDOR_FREEBSD9)
  +#define ut_name ut_user
 ++static char *UtmpName = "/var/run/utx.active";
 ++static char *AltUtmpName = "";
 ++#else
   static char *UtmpName = "/etc/utmpx";
   static char *AltUtmpName = "/var/adm/utmpx";
 ++#endif
   #undef UTMP_KIND
 + #define UTMP_KIND utmpx
 + #elif defined(HPUX11)
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/pkg-install.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-install.in
 --- /usr/ports/sysutils/condor/files/pkg-install.in	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-install.in	2013-01-05 10:15:45.000000000 -0600
 @@ -18,7 +18,11 @@
  
  u=condor
  g=condor
 -homedir=/var/db/condor
 +
 +# Place condor on a large partition so it can accommodate output files from
 +# jobs.  The default /var/db/condor could result in /var filling up with
 +# job output.
 +homedir=/home/condor
  
  case $2 in
  POST-INSTALL)
 @@ -26,12 +30,20 @@
  	mkdir -p $homedir/$dir
      done
      chown -Rh $u:$g $homedir
 +    # Insurance in case DEINSTALL case was not executed
 +    /bin/rm /var/db/condor
 +    /bin/ln -s $homedir /var/db
      ;;
  
  DEINSTALL)
 +    # Remove directories only if they're empty.  This could leave incompatible
 +    # older files in place when Condor is upgraded.  Not sure how backward
 +    # compatible condor versions are with respect to logs, etc.  For now,
 +    # the syadmin is left to deal with this.
      for dir in log spool config execute; do
 -	rmdir $homedir/$dir 2>/dev/null
 +	/bin/rmdir $homedir/$dir 2>/dev/null
      done
 +    /bin/rm /var/db/condor
      ;;
 -
  esac
 +
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/files/pkg-message.in /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-message.in
 --- /usr/ports/sysutils/condor/files/pkg-message.in	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/files/pkg-message.in	2012-12-01 17:45:17.000000000 -0600
 @@ -1,8 +1,15 @@
  
  Sample condor_config and condor_config.local files are available in
 -%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit to taste
 +%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit condor_config.local to taste
  to get started.
  
 +Settings in condor_config.local override the defaults in condor_config.
 +Use condor_config as a reference, and make all changes to condor_config.local.
 +
 +Unless this is the central manager host, you will need to at least change
 +CONDOR_HOST.  Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
 +this host.
 +
  To start the condor daemons, add 'condor_enable="YES"' to
  
  	/etc/rc.conf
 diff -ruN --exclude=CVS /usr/ports/sysutils/condor/pkg-plist /home/bacon/Prog/Ports/ports/sysutils/condor/pkg-plist
 --- /usr/ports/sysutils/condor/pkg-plist	2012-05-07 10:06:45.000000000 -0500
 +++ /home/bacon/Prog/Ports/ports/sysutils/condor/pkg-plist	2013-01-06 15:54:40.000000000 -0600
 @@ -1,10 +1,11 @@
  bin/classad_functional_tester
  bin/classad_version
 -bin/condor
  bin/condor_check_userlogs
  bin/condor_cod
  bin/condor_config_val
 +bin/condor_continue
  bin/condor_dagman
 +bin/condor_drain
  bin/condor_findhost
  bin/condor_gather_info
  bin/condor_history
 @@ -25,6 +26,8 @@
  bin/condor_status
  bin/condor_submit
  bin/condor_submit_dag
 +bin/condor_suspend
 +bin/condor_test_match
  bin/condor_transfer_data
  bin/condor_userlog
  bin/condor_userlog_job_counter
 @@ -40,8 +43,10 @@
  %%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
 @@ -90,16 +95,11 @@
  include/compat_classad.h
  include/compat_classad_list.h
  include/compat_classad_util.h
 -include/condor_ast.h
 -include/condor_astbase.h
 -include/condor_attrlist.h
  include/condor_classad.h
  include/condor_constants.h
  include/condor_event.h
 -include/condor_exprtype.h
  include/condor_header_features.h
  include/condor_holdcodes.h
 -include/condor_parser.h
  include/file_lock.h
  include/iso_dates.h
  include/read_user_log.h
 @@ -111,25 +111,22 @@
  lib/Condor.pm
  lib/CondorJavaInfo.class
  lib/CondorJavaWrapper.class
 -lib/Execute.pm
 -lib/FileLock.pm
 +lib/CondorPersonal.pm
 +lib/CondorTest.pm
 +lib/CondorUtils.pm
  lib/condor_ssh_to_job_sshd_config_template
  lib/libchirp_client.a
  lib/libclassad.a
  lib/libcondorapi.a
  lib/scimark2lib.jar
 -libexec/bgp_available_partitions
 -libexec/bgp_back_partition
 -libexec/bgp_boot_partition
 -libexec/bgp_destroy_partition
 -libexec/bgp_generate_partition
 -libexec/bgp_query_work_loads
 -libexec/bgp_shutdown_partition
 +libexec/accountant_log_fixer
  libexec/condor_chirp
 +libexec/condor_defrag
  libexec/condor_job_router
  libexec/condor_kflops
  libexec/condor_limits_wrapper.sh
  libexec/condor_mips
 +libexec/condor_power_state
  libexec/condor_rooster
  libexec/condor_schedd.init
  libexec/condor_shared_port
 @@ -139,20 +136,12 @@
  libexec/condor_transferer
  libexec/curl_plugin
  libexec/data_plugin
 -libexec/gridftp_wrapper.sh
  libexec/libvirt_simple_script.awk
 -libexec/power_state
  libexec/sshd.sh
 -sbin/cleanup_release
 -sbin/condor
  sbin/condor_advertise
  sbin/condor_c-gahp
  sbin/condor_c-gahp_worker_thread
 -sbin/condor_cleanup_local
 -sbin/condor_cold_start
 -sbin/condor_cold_stop
  sbin/condor_collector
 -sbin/condor_config_bind
  sbin/condor_configure
  sbin/condor_credd
  sbin/condor_fetchlog
 @@ -160,19 +149,13 @@
  sbin/condor_had
  sbin/condor_init
  sbin/condor_install
 -sbin/condor_install_local
 -sbin/condor_lease_manager
 -sbin/condor_local_start
 -sbin/condor_local_stop
  sbin/condor_master
 -sbin/condor_master_off
  sbin/condor_negotiator
  sbin/condor_off
  sbin/condor_on
  sbin/condor_preen
  sbin/condor_procd
  sbin/condor_reconfig
 -sbin/condor_reconfig_schedd
  sbin/condor_replication
  sbin/condor_restart
  sbin/condor_root_switchboard
 @@ -180,25 +163,15 @@
  sbin/condor_set_shutdown
  sbin/condor_shadow
  sbin/condor_startd
 -sbin/condor_startd_factory
  sbin/condor_starter
  sbin/condor_store_cred
  sbin/condor_transferd
  sbin/condor_updates_stats
  sbin/condor_vm-gahp
 -sbin/filelock_midwife
 -sbin/filelock_undertaker
 -sbin/install_release
 -sbin/uniq_pid_command
 -sbin/uniq_pid_midwife
 -sbin/uniq_pid_undertaker
 +sbin/remote_gahp
  src/chirp/chirp_client.c
  src/chirp/chirp_client.h
  src/chirp/chirp_protocol.h
 -src/startd_factory/BlueGeneP/htc_list_partitions.cpp
 -src/startd_factory/BlueGeneP/htc_tool.cpp
 -@dirrmtry src/startd_factory/BlueGeneP
 -@dirrmtry src/startd_factory
  @dirrmtry src/chirp
  @dirrmtry src
  @dirrm include/classad
 
 --------------070605080908010004000004--

From: Jason Bacon <bacon@uwm.edu>
To: bug-followup@FreeBSD.org, jwbacon@tds.net
Cc: Nathan Whitehorn <nwhitehorn@freebsd.org>, rm@freebsd.org
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Sun, 06 Jan 2013 22:34:55 -0600

 I found the problem with installation.  It only occurs if the condor 
 user does not already exist, which is why I had trouble reproducing it.  
 The problem is  /usr/ports/UIDs has /var/db/condor as the home directory 
 where it should be /home/condor.
 
 With that corrected, the current patch set should work.
 

From: Ruslan Makhmatkhanov <cvs-src@yandex.ru>
To: Jason Bacon <bacon@uwm.edu>
Cc: bug-followup@FreeBSD.org, jwbacon@tds.net, 
 Nathan Whitehorn <nwhitehorn@freebsd.org>
Subject: Re: ports/173246: maintainer update: sysutils/condor
Date: Mon, 07 Jan 2013 08:46:30 +0400

 Jason Bacon wrote on 07.01.2013 08:34:
 >
 > I found the problem with installation.  It only occurs if the condor
 > user does not already exist, which is why I had trouble reproducing it.
 > The problem is  /usr/ports/UIDs has /var/db/condor as the home directory
 > where it should be /home/condor.
 >
 > With that corrected, the current patch set should work.
 
 Ok, I'll try to change home directory in /usr/ports/UIDs to 
 /home/condor. Thanks.
 
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.
State-Changed-From-To: feedback->open 
State-Changed-By: rm 
State-Changed-When: Mon Jan 7 06:11:31 UTC 2013 
State-Changed-Why:  
Still has some errors, please see the log: 
http://people.freebsd.org/~rm/condor-7.8.7.log It warns about files in 
/home/condor + rm /var/db/condor call failed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173246 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173246: commit references a PR
Date: Thu, 10 Jan 2013 19:01:55 +0000 (UTC)

 Author: rm
 Date: Thu Jan 10 19:01:39 2013
 New Revision: 310198
 URL: http://svnweb.freebsd.org/changeset/ports/310198
 
 Log:
   - update to 7.8.7
   
   PR:		173246
   Submitted by:	Jason Bacon <jwbacon@tds.net> (maintainer)
   Submitted by:   nwhitehorn (some fixes to the port)
 
 Added:
   head/sysutils/condor/pkg-deinstall   (contents, props changed)
   head/sysutils/condor/pkg-install   (contents, props changed)
 Deleted:
   head/sysutils/condor/files/pkg-install.in
 Modified:
   head/sysutils/condor/Makefile
   head/sysutils/condor/distinfo
   head/sysutils/condor/files/condor_config.in
   head/sysutils/condor/files/condor_config.local.in
   head/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp
   head/sysutils/condor/files/pkg-message.in
   head/sysutils/condor/pkg-plist
 
 Modified: head/sysutils/condor/Makefile
 ==============================================================================
 --- head/sysutils/condor/Makefile	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/Makefile	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,13 +1,8 @@
 -# New ports collection makefile for:	condor
 -# Date created:			01 May 2007
 -# Whom:				Andy Pavlo
 -#
 +# Created by: Andy Pavlo
  # $FreeBSD$
 -#
  
  PORTNAME=	condor
 -PORTVERSION=	7.6.6
 -PORTREVISION=	1
 +PORTVERSION=	7.8.7
  CATEGORIES=	sysutils net
  MASTER_SITES=	# empty
  DISTNAME=	condor_src-${PORTVERSION}-all-all
 @@ -33,7 +28,7 @@ LDFLAGS+=	-rpath=${LOCALBASE}/lib:/usr/l
  CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \
  		-DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS}
  
 -SUB_FILES=	pkg-install condor_config condor_config.local pkg-message
 +SUB_FILES=	condor_config condor_config.local pkg-message
  
  USERS=		condor
  GROUPS=		${USERS}
 @@ -58,16 +53,16 @@ MAN1=	\
  	condor_config_bind.1 \
  	condor_config_val.1 \
  	condor_configure.1 \
 -	condor_convert_history.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_master_off.1 \
  	condor_off.1 \
  	condor_on.1 \
  	condor_power.1 \
 @@ -77,13 +72,13 @@ MAN1=	\
  	condor_q.1 \
  	condor_qedit.1 \
  	condor_reconfig.1 \
 -	condor_reconfig_schedd.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 \
 @@ -92,6 +87,7 @@ MAN1=	\
  	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 \
 
 Modified: head/sysutils/condor/distinfo
 ==============================================================================
 --- head/sysutils/condor/distinfo	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/distinfo	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,2 +1,2 @@
 -SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b
 -SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204
 +SHA256 (condor_src-7.8.7-all-all.tar.gz) = 876dbb3c1135ba4a31c4c25d5db2b072e0de4be1927245cd37a23252bf853d78
 +SIZE (condor_src-7.8.7-all-all.tar.gz) = 17325973
 
 Modified: head/sysutils/condor/files/condor_config.in
 ==============================================================================
 --- head/sysutils/condor/files/condor_config.in	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/files/condor_config.in	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -57,7 +57,8 @@ RELEASE_DIR             = %%PREFIX%%
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
 -##  spool/execute directories are located
 +##  spool/execute directories are located.  Should be a large
 +##  partition if jobs may produce a lot of output.
  LOCAL_DIR               = $(TILDE)
  
  ##  Where is the machine-specific local config file for each host?
 @@ -84,7 +85,7 @@ CONDOR_ADMIN            = root@localhost
  
  ##  Full path to a mail delivery program that understands that "-s"
  ##  means you want to specify a subject:
 -MAIL                    = /bin/mail
 +MAIL                    = /usr/bin/mail
  
  ##--------------------------------------------------------------------
  ##  Network domain parameters:
 @@ -177,6 +178,7 @@ FLOCK_COLLECTOR_HOSTS = $(FLOCK_TO)
  ##  machine(s) where whoever is the condor administrator(s) works
  ##  (assuming you trust all the users who log into that/those
  ##  machine(s), since this is machine-wide access you're granting).
 +
  ALLOW_ADMINISTRATOR = $(CONDOR_HOST)
  
  ##  If there are no machines that should have administrative access 
 
 Modified: head/sysutils/condor/files/condor_config.local.in
 ==============================================================================
 --- head/sysutils/condor/files/condor_config.local.in	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/files/condor_config.local.in	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,27 +1,39 @@
 +############################################################################
 +##  condor_config.local
 +##  Settings here override the defaults in condor_config.
 +##  Make changes/additions here and leave condor_config unchanged so
 +##  that defaults are documented.
 +############################################################################
 +
 +############################################################################
  ##  What machine is your central manager?
 +##  Use $(FULL_HOSTNAME) if this is the central manager, or the central
 +##  manager's hostname otherwise.
  
 -CONDOR_HOST = $(FULL_HOSTNAME)
 +##  CONDOR_HOST = $(FULL_HOSTNAME)
  
 +############################################################################
  ## Pool's short description
  
 -COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)
 +##  COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
  
 +############################################################################
  ##  When is this machine willing to start a job? 
  
  START = TRUE
  
 -
 +############################################################################
  ##  When to suspend a job?
  
  SUSPEND = FALSE
  
 -
 +############################################################################
  ##  When to nicely stop a job?
  ##  (as opposed to killing it instantaneously)
  
  PREEMPT = FALSE
  
 -
 +############################################################################
  ##  When to instantaneously kill a preempting job
  ##  (e.g. if a job is in the pre-empting stage for too long)
  
 @@ -30,13 +42,42 @@ KILL = FALSE
  ###########################################################################
  # DAEMON LIST:
  #
 -# All hosts:		MASTER
 -# Central manager:	COLLECTOR, NEGOTIATOR
 -# Submit hosts:		SCHEDD
 -# Execute hosts:	STARTD
 +# All hosts:            MASTER
 +# Central manager:      COLLECTOR, NEGOTIATOR
 +# Submit hosts:         SCHEDD
 +# Execute hosts:        STARTD
  
  ##  This macro determines what daemons the condor_master will start and 
  ##  keep its watchful eyes on.
  ##  The list is a comma or space separated list of subsystem names
  
 -DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
 +##  Central manager
 +##  DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
 +
 +##  Submit/execute host
 +DAEMON_LIST = MASTER, SCHEDD, STARTD
 +
 +##  Execute-only host
 +##  DAEMON_LIST = MASTER, STARTD
 +
 +###########################################################################
 +##  Permissions for this host
 +##
 +##  *.your.domain, x.y.z.*, hostname, $(MACRO)
 +##
 +##  ALLOW_ADMINISTRATOR is required by condor_off
 +##  If central manager is not this host, this entry allows both the central
 +##  manager and this host to manage the pool.
 +
 +ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables condor_status, condor_q, ...
 +
 +ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 +##
 +##  Enables scheduling jobs here
 +
 +ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
 +
 
 Modified: head/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp
 ==============================================================================
 --- head/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/files/patch-src-condor_sysapi-idle_time.cpp	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,6 +1,6 @@
 ---- src/condor_sysapi/idle_time.cpp.orig	2012-01-17 10:53:14.000000000 -0600
 -+++ src/condor_sysapi/idle_time.cpp	2012-04-07 14:37:17.000000000 -0500
 -@@ -202,17 +202,22 @@
 +--- src/condor_sysapi/idle_time.cpp.bak	2012-10-24 23:10:41.000000000 -0500
 ++++ src/condor_sysapi/idle_time.cpp	2012-12-01 14:46:20.000000000 -0600
 +@@ -205,19 +205,30 @@
   	return;
   }
   
 @@ -11,17 +11,25 @@
  +#endif
   
   #if defined(LINUX)
 - static char *UtmpName = "/var/run/utmp";
 - static char *AltUtmpName = "/var/adm/utmp";
 + static const char *UtmpName = "/var/run/utmp";
 + static const char *AltUtmpName = "/var/adm/utmp";
  -#elif defined(CONDOR_FREEBSD)
  +// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
   static char *UtmpName = "/var/run/utmp";
   static char *AltUtmpName = "";
  -#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
 ++// FreeBSD 9 made a clean break from utmp to utmpx
  +#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9)
   #include <utmpx.h>
 ++#if defined(CONDOR_FREEBSD9)
  +#define ut_name ut_user
 ++static char *UtmpName = "/var/run/utx.active";
 ++static char *AltUtmpName = "";
 ++#else
   static char *UtmpName = "/etc/utmpx";
   static char *AltUtmpName = "/var/adm/utmpx";
 ++#endif
   #undef UTMP_KIND
 + #define UTMP_KIND utmpx
 + #elif defined(HPUX11)
 
 Modified: head/sysutils/condor/files/pkg-message.in
 ==============================================================================
 --- head/sysutils/condor/files/pkg-message.in	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/files/pkg-message.in	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,8 +1,15 @@
  
  Sample condor_config and condor_config.local files are available in
 -%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit to taste
 +%%ETCDIR%%.  Copy them to %%PREFIX%%/etc and edit condor_config.local to taste
  to get started.
  
 +Settings in condor_config.local override the defaults in condor_config.
 +Use condor_config as a reference, and make all changes to condor_config.local.
 +
 +Unless this is the central manager host, you will need to at least change
 +CONDOR_HOST.  Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
 +this host.
 +
  To start the condor daemons, add 'condor_enable="YES"' to
  
  	/etc/rc.conf
 
 Added: head/sysutils/condor/pkg-deinstall
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/condor/pkg-deinstall	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -0,0 +1,30 @@
 +#!/bin/sh
 +
 +##########################################################################
 +#   Script description:
 +#       Install script for Condor scheduler
 +#
 +#   Arguments:
 +#       $1 = port name
 +#       $2 = mode (e.g. 'POST-INSTALL')
 +#
 +#   Returns:
 +#       Standard
 +#
 +#   History:
 +#   Date        Name        Modification
 +#   2011-11-22  J Bacon     Derived from Ganglia pkg-install
 +##########################################################################
 +
 +case $2 in
 +DEINSTALL)
 +    # Old log, spool, etc. in /home/condor are left in place.
 +    # This could leave incompatible
 +    # older files in place when Condor is upgraded.  Not sure how backward
 +    # compatible condor versions are with respect to logs, etc.  For now,
 +    # the syadmin is left to deal with this.
 +
 +    # Remove the link to /home/condor
 +    /bin/rm -f /var/db/condor
 +    ;;
 +esac
 
 Added: head/sysutils/condor/pkg-install
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/condor/pkg-install	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -0,0 +1,37 @@
 +#!/bin/sh
 +
 +##########################################################################
 +#   Script description:
 +#       Install script for Condor scheduler
 +#
 +#   Arguments:
 +#       $1 = port name
 +#       $2 = mode (e.g. 'POST-INSTALL')
 +#
 +#   Returns:
 +#       Standard
 +#
 +#   History:
 +#   Date        Name        Modification
 +#   2011-11-22  J Bacon     Derived from Ganglia pkg-install
 +##########################################################################
 +
 +u=condor
 +g=condor
 +
 +# Place condor on a large partition so it can accommodate output files from
 +# jobs.  The default /var/db/condor could result in /var filling up with
 +# job output.
 +homedir=/home/condor
 +
 +case $2 in
 +POST-INSTALL)
 +    for dir in log spool config execute; do
 +	mkdir -p $homedir/$dir
 +    done
 +    chown -Rh $u:$g $homedir
 +    # Insurance in case pkg-deinstall was not executed
 +    /bin/rm -f /var/db/condor
 +    /bin/ln -s $homedir /var/db
 +    ;;
 +esac
 
 Modified: head/sysutils/condor/pkg-plist
 ==============================================================================
 --- head/sysutils/condor/pkg-plist	Thu Jan 10 18:31:21 2013	(r310197)
 +++ head/sysutils/condor/pkg-plist	Thu Jan 10 19:01:39 2013	(r310198)
 @@ -1,10 +1,11 @@
  bin/classad_functional_tester
  bin/classad_version
 -bin/condor
  bin/condor_check_userlogs
  bin/condor_cod
  bin/condor_config_val
 +bin/condor_continue
  bin/condor_dagman
 +bin/condor_drain
  bin/condor_findhost
  bin/condor_gather_info
  bin/condor_history
 @@ -25,6 +26,8 @@ bin/condor_stats
  bin/condor_status
  bin/condor_submit
  bin/condor_submit_dag
 +bin/condor_suspend
 +bin/condor_test_match
  bin/condor_transfer_data
  bin/condor_userlog
  bin/condor_userlog_job_counter
 @@ -40,8 +43,10 @@ bin/condor_wait
  %%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
 @@ -90,16 +95,11 @@ include/classad/xmlSource.h
  include/compat_classad.h
  include/compat_classad_list.h
  include/compat_classad_util.h
 -include/condor_ast.h
 -include/condor_astbase.h
 -include/condor_attrlist.h
  include/condor_classad.h
  include/condor_constants.h
  include/condor_event.h
 -include/condor_exprtype.h
  include/condor_header_features.h
  include/condor_holdcodes.h
 -include/condor_parser.h
  include/file_lock.h
  include/iso_dates.h
  include/read_user_log.h
 @@ -111,25 +111,22 @@ lib/Chirp.jar
  lib/Condor.pm
  lib/CondorJavaInfo.class
  lib/CondorJavaWrapper.class
 -lib/Execute.pm
 -lib/FileLock.pm
 +lib/CondorPersonal.pm
 +lib/CondorTest.pm
 +lib/CondorUtils.pm
  lib/condor_ssh_to_job_sshd_config_template
  lib/libchirp_client.a
  lib/libclassad.a
  lib/libcondorapi.a
  lib/scimark2lib.jar
 -libexec/bgp_available_partitions
 -libexec/bgp_back_partition
 -libexec/bgp_boot_partition
 -libexec/bgp_destroy_partition
 -libexec/bgp_generate_partition
 -libexec/bgp_query_work_loads
 -libexec/bgp_shutdown_partition
 +libexec/accountant_log_fixer
  libexec/condor_chirp
 +libexec/condor_defrag
  libexec/condor_job_router
  libexec/condor_kflops
  libexec/condor_limits_wrapper.sh
  libexec/condor_mips
 +libexec/condor_power_state
  libexec/condor_rooster
  libexec/condor_schedd.init
  libexec/condor_shared_port
 @@ -139,20 +136,12 @@ libexec/condor_ssh_to_job_sshd_setup
  libexec/condor_transferer
  libexec/curl_plugin
  libexec/data_plugin
 -libexec/gridftp_wrapper.sh
  libexec/libvirt_simple_script.awk
 -libexec/power_state
  libexec/sshd.sh
 -sbin/cleanup_release
 -sbin/condor
  sbin/condor_advertise
  sbin/condor_c-gahp
  sbin/condor_c-gahp_worker_thread
 -sbin/condor_cleanup_local
 -sbin/condor_cold_start
 -sbin/condor_cold_stop
  sbin/condor_collector
 -sbin/condor_config_bind
  sbin/condor_configure
  sbin/condor_credd
  sbin/condor_fetchlog
 @@ -160,19 +149,13 @@ sbin/condor_gridmanager
  sbin/condor_had
  sbin/condor_init
  sbin/condor_install
 -sbin/condor_install_local
 -sbin/condor_lease_manager
 -sbin/condor_local_start
 -sbin/condor_local_stop
  sbin/condor_master
 -sbin/condor_master_off
  sbin/condor_negotiator
  sbin/condor_off
  sbin/condor_on
  sbin/condor_preen
  sbin/condor_procd
  sbin/condor_reconfig
 -sbin/condor_reconfig_schedd
  sbin/condor_replication
  sbin/condor_restart
  sbin/condor_root_switchboard
 @@ -180,28 +163,25 @@ sbin/condor_schedd
  sbin/condor_set_shutdown
  sbin/condor_shadow
  sbin/condor_startd
 -sbin/condor_startd_factory
  sbin/condor_starter
  sbin/condor_store_cred
  sbin/condor_transferd
  sbin/condor_updates_stats
  sbin/condor_vm-gahp
 -sbin/filelock_midwife
 -sbin/filelock_undertaker
 -sbin/install_release
 -sbin/uniq_pid_command
 -sbin/uniq_pid_midwife
 -sbin/uniq_pid_undertaker
 +sbin/remote_gahp
  src/chirp/chirp_client.c
  src/chirp/chirp_client.h
  src/chirp/chirp_protocol.h
 -src/startd_factory/BlueGeneP/htc_list_partitions.cpp
 -src/startd_factory/BlueGeneP/htc_tool.cpp
 -@dirrmtry src/startd_factory/BlueGeneP
 -@dirrmtry src/startd_factory
  @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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Thu Jan 10 19:26:52 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173246 
>Unformatted:
