Attachment #129277 for bug #173246




#

PORTNAME=	condor
PORTVERSION=	7.8.6
CATEGORIES=	sysutils net
MASTER_SITES=	# empty
DISTNAME=	condor_src-${PORTVERSION}-all-all

	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_master_off.1 \
	condor_off.1 \
	condor_on.1 \
	condor_power.1 \

	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 \

	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 \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (condor_src-7.6.6-all-all.tar.gz) = bb22398768b9414ae8fd63f5bd715310bc22df510f0505c45814be2f64535f8b	1	SHA256 (condor_src-7.8.6-all-all.tar.gz) = 09d80d6a7c6ddbc5eedc89cbab52259be37c43bfba55af2e9fbaf238c47a4404
2	SIZE (condor_src-7.6.6-all-all.tar.gz) = 16663204	2	SIZE (condor_src-7.8.6-all-all.tar.gz) = 17491084





##  Where is the local condor directory for each host?  
##  This is where the local config file(s), logs and
##  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?


##  Full path to a mail delivery program that understands that "-s"
##  means you want to specify a subject:
MAIL                    = /usr/bin/mail

##--------------------------------------------------------------------
##  Network domain parameters:

##  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 




############################################################################
##  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)

############################################################################
## Pool's short description

##  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)


###########################################################################
# DAEMON LIST:
#
# 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

##  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)





--- 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;
 }
 

+#endif
 
 #if defined(LINUX)
 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)

Lines 18-31 Link Here

(-)files/pkg-install.in (-2 / +8 lines)
18		18
19	u=condor	19	u=condor
20	g=condor	20	g=condor
21	homedir=/var/db/condor
22		21
		22	# Place condor on a large partition so it can accommodate output files from
		23	# jobs. The default /var/db/condor could result in /var filling up with
		24	# job output.
		25	homedir=/home/condor
		26
23	case $2 in	27	case $2 in
24	POST-INSTALL)	28	POST-INSTALL)
25	for dir in log spool config execute; do	29	for dir in log spool config execute; do
26	mkdir -p $homedir/$dir	30	mkdir -p $homedir/$dir
27	done	31	done
28	chown -Rh $u:$g $homedir	32	chown -Rh $u:$g $homedir
		33	rm /var/db/condor
		34	ln -s $homedir /var/db
29	;;	35	;;
30		36
31	DEINSTALL)	37	DEINSTALL)
Lines 33-37 Link Here
33	rmdir $homedir/$dir 2>/dev/null	39	rmdir $homedir/$dir 2>/dev/null
34	done	40	done
35	;;	41	;;
		42	esac
36		43
37	esac

Lines 1-8 Link Here

(-)files/pkg-message.in (-1 / +8 lines)
1		1
2	Sample condor_config and condor_config.local files are available in	2	Sample condor_config and condor_config.local files are available in
3	%%ETCDIR%%. Copy them to %%PREFIX%%/etc and edit to taste	3	%%ETCDIR%%. Copy them to %%PREFIX%%/etc and edit condor_config.local to taste
4	to get started.	4	to get started.
5		5
		6	Settings in condor_config.local override the defaults in condor_config.
		7	Use condor_config as a reference, and make all changes to condor_config.local.
		8
		9	Unless this is the central manager host, you will need to at least change
		10	CONDOR_HOST. Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
		11	this host.
		12
6	To start the condor daemons, add 'condor_enable="YES"' to	13	To start the condor daemons, add 'condor_enable="YES"' to
7		14
8	/etc/rc.conf	15	/etc/rc.conf

Lines 1-10 Link Here

(-)pkg-plist (-42 / +14 lines)
1	bin/classad_functional_tester	1	bin/classad_functional_tester
2	bin/classad_version	2	bin/classad_version
3	bin/condor
4	bin/condor_check_userlogs	3	bin/condor_check_userlogs
5	bin/condor_cod	4	bin/condor_cod
6	bin/condor_config_val	5	bin/condor_config_val
		6	bin/condor_continue
7	bin/condor_dagman	7	bin/condor_dagman
		8	bin/condor_drain
8	bin/condor_findhost	9	bin/condor_findhost
9	bin/condor_gather_info	10	bin/condor_gather_info
10	bin/condor_history	11	bin/condor_history
Lines 25-30 Link Here
25	bin/condor_status	26	bin/condor_status
26	bin/condor_submit	27	bin/condor_submit
27	bin/condor_submit_dag	28	bin/condor_submit_dag
		29	bin/condor_suspend
		30	bin/condor_test_match
28	bin/condor_transfer_data	31	bin/condor_transfer_data
29	bin/condor_userlog	32	bin/condor_userlog
30	bin/condor_userlog_job_counter	33	bin/condor_userlog_job_counter
Lines 40-47 Link Here
40	%%ETCDIR%%/examples/condor.boot.generic	43	%%ETCDIR%%/examples/condor.boot.generic
41	%%ETCDIR%%/examples/condor.boot.rpm	44	%%ETCDIR%%/examples/condor.boot.rpm
42	%%ETCDIR%%/examples/condor.init	45	%%ETCDIR%%/examples/condor.init
		46	%%ETCDIR%%/examples/condor.plist
43	%%ETCDIR%%/examples/condor.sysconfig	47	%%ETCDIR%%/examples/condor.sysconfig
44	%%ETCDIR%%/examples/condor_config.generic	48	%%ETCDIR%%/examples/condor_config.generic
		49	%%ETCDIR%%/examples/condor_config.generic.redhat
45	%%ETCDIR%%/examples/condor_config.local.central.manager	50	%%ETCDIR%%/examples/condor_config.local.central.manager
46	%%ETCDIR%%/examples/condor_config.local.ckpt.server	51	%%ETCDIR%%/examples/condor_config.local.ckpt.server
47	%%ETCDIR%%/examples/condor_config.local.dedicated.resource	52	%%ETCDIR%%/examples/condor_config.local.dedicated.resource
Lines 90-105 Link Here
90	include/compat_classad.h	95	include/compat_classad.h
91	include/compat_classad_list.h	96	include/compat_classad_list.h
92	include/compat_classad_util.h	97	include/compat_classad_util.h
93	include/condor_ast.h
94	include/condor_astbase.h
95	include/condor_attrlist.h
96	include/condor_classad.h	98	include/condor_classad.h
97	include/condor_constants.h	99	include/condor_constants.h
98	include/condor_event.h	100	include/condor_event.h
99	include/condor_exprtype.h
100	include/condor_header_features.h	101	include/condor_header_features.h
101	include/condor_holdcodes.h	102	include/condor_holdcodes.h
102	include/condor_parser.h
103	include/file_lock.h	103	include/file_lock.h
104	include/iso_dates.h	104	include/iso_dates.h
105	include/read_user_log.h	105	include/read_user_log.h
Lines 111-135 Link Here
111	lib/Condor.pm	111	lib/Condor.pm
112	lib/CondorJavaInfo.class	112	lib/CondorJavaInfo.class
113	lib/CondorJavaWrapper.class	113	lib/CondorJavaWrapper.class
114	lib/Execute.pm	114	lib/CondorPersonal.pm
115	lib/FileLock.pm	115	lib/CondorTest.pm
		116	lib/CondorUtils.pm
116	lib/condor_ssh_to_job_sshd_config_template	117	lib/condor_ssh_to_job_sshd_config_template
117	lib/libchirp_client.a	118	lib/libchirp_client.a
118	lib/libclassad.a	119	lib/libclassad.a
119	lib/libcondorapi.a	120	lib/libcondorapi.a
120	lib/scimark2lib.jar	121	lib/scimark2lib.jar
121	libexec/bgp_available_partitions	122	libexec/accountant_log_fixer
122	libexec/bgp_back_partition
123	libexec/bgp_boot_partition
124	libexec/bgp_destroy_partition
125	libexec/bgp_generate_partition
126	libexec/bgp_query_work_loads
127	libexec/bgp_shutdown_partition
128	libexec/condor_chirp	123	libexec/condor_chirp
		124	libexec/condor_defrag
129	libexec/condor_job_router	125	libexec/condor_job_router
130	libexec/condor_kflops	126	libexec/condor_kflops
131	libexec/condor_limits_wrapper.sh	127	libexec/condor_limits_wrapper.sh
132	libexec/condor_mips	128	libexec/condor_mips
		129	libexec/condor_power_state
133	libexec/condor_rooster	130	libexec/condor_rooster
134	libexec/condor_schedd.init	131	libexec/condor_schedd.init
135	libexec/condor_shared_port	132	libexec/condor_shared_port
Lines 139-158 Link Here
139	libexec/condor_transferer	136	libexec/condor_transferer
140	libexec/curl_plugin	137	libexec/curl_plugin
141	libexec/data_plugin	138	libexec/data_plugin
142	libexec/gridftp_wrapper.sh
143	libexec/libvirt_simple_script.awk	139	libexec/libvirt_simple_script.awk
144	libexec/power_state
145	libexec/sshd.sh	140	libexec/sshd.sh
146	sbin/cleanup_release
147	sbin/condor
148	sbin/condor_advertise	141	sbin/condor_advertise
149	sbin/condor_c-gahp	142	sbin/condor_c-gahp
150	sbin/condor_c-gahp_worker_thread	143	sbin/condor_c-gahp_worker_thread
151	sbin/condor_cleanup_local
152	sbin/condor_cold_start
153	sbin/condor_cold_stop
154	sbin/condor_collector	144	sbin/condor_collector
155	sbin/condor_config_bind
156	sbin/condor_configure	145	sbin/condor_configure
157	sbin/condor_credd	146	sbin/condor_credd
158	sbin/condor_fetchlog	147	sbin/condor_fetchlog
Lines 160-178 Link Here
160	sbin/condor_had	149	sbin/condor_had
161	sbin/condor_init	150	sbin/condor_init
162	sbin/condor_install	151	sbin/condor_install
163	sbin/condor_install_local
164	sbin/condor_lease_manager
165	sbin/condor_local_start
166	sbin/condor_local_stop
167	sbin/condor_master	152	sbin/condor_master
168	sbin/condor_master_off
169	sbin/condor_negotiator	153	sbin/condor_negotiator
170	sbin/condor_off	154	sbin/condor_off
171	sbin/condor_on	155	sbin/condor_on
172	sbin/condor_preen	156	sbin/condor_preen
173	sbin/condor_procd	157	sbin/condor_procd
174	sbin/condor_reconfig	158	sbin/condor_reconfig
175	sbin/condor_reconfig_schedd
176	sbin/condor_replication	159	sbin/condor_replication
177	sbin/condor_restart	160	sbin/condor_restart
178	sbin/condor_root_switchboard	161	sbin/condor_root_switchboard
Lines 180-207 Link Here
180	sbin/condor_set_shutdown	163	sbin/condor_set_shutdown
181	sbin/condor_shadow	164	sbin/condor_shadow
182	sbin/condor_startd	165	sbin/condor_startd
183	sbin/condor_startd_factory
184	sbin/condor_starter	166	sbin/condor_starter
185	sbin/condor_store_cred	167	sbin/condor_store_cred
186	sbin/condor_transferd	168	sbin/condor_transferd
187	sbin/condor_updates_stats	169	sbin/condor_updates_stats
188	sbin/condor_vm-gahp	170	sbin/condor_vm-gahp
189	sbin/filelock_midwife	171	sbin/remote_gahp
190	sbin/filelock_undertaker
191	sbin/install_release
192	sbin/uniq_pid_command
193	sbin/uniq_pid_midwife
194	sbin/uniq_pid_undertaker
195	src/chirp/chirp_client.c	172	src/chirp/chirp_client.c
196	src/chirp/chirp_client.h	173	src/chirp/chirp_client.h
197	src/chirp/chirp_protocol.h	174	src/chirp/chirp_protocol.h
198	src/startd_factory/BlueGeneP/htc_list_partitions.cpp
199	src/startd_factory/BlueGeneP/htc_tool.cpp
200	@dirrmtry src/startd_factory/BlueGeneP
201	@dirrmtry src/startd_factory
202	@dirrmtry src/chirp	175	@dirrmtry src/chirp
203	@dirrmtry src	176	@dirrmtry src
204	@dirrm include/classad	177	@dirrm include/classad@dirrm %%ETCDIR%%/sysconfig
205	@dirrm %%ETCDIR%%/sysconfig
206	@dirrm %%ETCDIR%%/examples	178	@dirrm %%ETCDIR%%/examples
207	@dirrm %%ETCDIR%%	179	@dirrm %%ETCDIR%%

Return to bug 173246

Lines 6-12 Link Here

(-)Makefile (-4 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= condor	8	PORTNAME= condor
9	PORTVERSION= 7.6.6	9	PORTVERSION= 7.8.6
10	CATEGORIES= sysutils net	10	CATEGORIES= sysutils net
11	MASTER_SITES= # empty	11	MASTER_SITES= # empty
12	DISTNAME= condor_src-${PORTVERSION}-all-all	12	DISTNAME= condor_src-${PORTVERSION}-all-all
Lines 57-72 Link Here
57	condor_config_bind.1 \	57	condor_config_bind.1 \
58	condor_config_val.1 \	58	condor_config_val.1 \
59	condor_configure.1 \	59	condor_configure.1 \
60	condor_convert_history.1 \	60	condor_continue.1 \
61	condor_dagman.1 \	61	condor_dagman.1 \
62	condor_fetchlog.1 \	62	condor_fetchlog.1 \
63	condor_findhost.1 \	63	condor_findhost.1 \
		64	condor_gather_info.1 \
64	condor_glidein.1 \	65	condor_glidein.1 \
65	condor_history.1 \	66	condor_history.1 \
66	condor_hold.1 \	67	condor_hold.1 \
67	condor_load_history.1 \	68	condor_load_history.1 \
68	condor_master.1 \	69	condor_master.1 \
69	condor_master_off.1 \
70	condor_off.1 \	70	condor_off.1 \
71	condor_on.1 \	71	condor_on.1 \
72	condor_power.1 \	72	condor_power.1 \
Lines 76-88 Link Here
76	condor_q.1 \	76	condor_q.1 \
77	condor_qedit.1 \	77	condor_qedit.1 \
78	condor_reconfig.1 \	78	condor_reconfig.1 \
79	condor_reconfig_schedd.1 \
80	condor_release.1 \	79	condor_release.1 \
81	condor_reschedule.1 \	80	condor_reschedule.1 \
82	condor_restart.1 \	81	condor_restart.1 \
83	condor_rm.1 \	82	condor_rm.1 \
84	condor_router_history.1 \	83	condor_router_history.1 \
85	condor_router_q.1 \	84	condor_router_q.1 \
		85	condor_router_rm.1 \
86	condor_run.1 \	86	condor_run.1 \
87	condor_set_shutdown.1 \	87	condor_set_shutdown.1 \
88	condor_ssh_to_job.1 \	88	condor_ssh_to_job.1 \
Lines 91-96 Link Here
91	condor_store_cred.1 \	91	condor_store_cred.1 \
92	condor_submit.1 \	92	condor_submit.1 \
93	condor_submit_dag.1 \	93	condor_submit_dag.1 \
		94	condor_suspend.1 \
94	condor_transfer_data.1 \	95	condor_transfer_data.1 \
95	condor_updates_stats.1 \	96	condor_updates_stats.1 \
96	condor_userlog.1 \	97	condor_userlog.1 \

Lines 57-63 Link Here

(-)files/condor_config.in (-2 / +4 lines)
57		57
58	## Where is the local condor directory for each host?	58	## Where is the local condor directory for each host?
59	## This is where the local config file(s), logs and	59	## This is where the local config file(s), logs and
60	## spool/execute directories are located	60	## spool/execute directories are located. Should be a large
		61	## partition if jobs may produce a lot of output.
61	LOCAL_DIR = $(TILDE)	62	LOCAL_DIR = $(TILDE)
62		63
63	## Where is the machine-specific local config file for each host?	64	## Where is the machine-specific local config file for each host?
Lines 84-90 Link Here
84		85
85	## Full path to a mail delivery program that understands that "-s"	86	## Full path to a mail delivery program that understands that "-s"
86	## means you want to specify a subject:	87	## means you want to specify a subject:
87	MAIL = /bin/mail	88	MAIL = /usr/bin/mail
88		89
89	##--------------------------------------------------------------------	90	##--------------------------------------------------------------------
90	## Network domain parameters:	91	## Network domain parameters:
Lines 177-182 Link Here
177	## machine(s) where whoever is the condor administrator(s) works	178	## machine(s) where whoever is the condor administrator(s) works
178	## (assuming you trust all the users who log into that/those	179	## (assuming you trust all the users who log into that/those
179	## machine(s), since this is machine-wide access you're granting).	180	## machine(s), since this is machine-wide access you're granting).
		181
180	ALLOW_ADMINISTRATOR = $(CONDOR_HOST)	182	ALLOW_ADMINISTRATOR = $(CONDOR_HOST)
181		183
182	## If there are no machines that should have administrative access	184	## If there are no machines that should have administrative access

Lines 1-27 Link Here

(-)files/condor_config.local.in (-10 / +51 lines)
		1	############################################################################
		2	## condor_config.local
		3	## Settings here override the defaults in condor_config.
		4	## Make changes/additions here and leave condor_config unchanged so
		5	## that defaults are documented.
		6	############################################################################
		7
		8	############################################################################
1	## What machine is your central manager?	9	## What machine is your central manager?
		10	## Use $(FULL_HOSTNAME) if this is the central manager, or the central
		11	## manager's hostname otherwise.
2		12
3	CONDOR_HOST = $(FULL_HOSTNAME)	13	## CONDOR_HOST = $(FULL_HOSTNAME)
4		14
		15	############################################################################
5	## Pool's short description	16	## Pool's short description
6		17
7	COLLECTOR_NAME = Personal Condor at $(FULL_HOSTNAME)	18	## COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
8		19
		20	############################################################################
9	## When is this machine willing to start a job?	21	## When is this machine willing to start a job?
10		22
11	START = TRUE	23	START = TRUE
12		24
13		25	############################################################################
14	## When to suspend a job?	26	## When to suspend a job?
15		27
16	SUSPEND = FALSE	28	SUSPEND = FALSE
17		29
18		30	############################################################################
19	## When to nicely stop a job?	31	## When to nicely stop a job?
20	## (as opposed to killing it instantaneously)	32	## (as opposed to killing it instantaneously)
21		33
22	PREEMPT = FALSE	34	PREEMPT = FALSE
23		35
24		36	############################################################################
25	## When to instantaneously kill a preempting job	37	## When to instantaneously kill a preempting job
26	## (e.g. if a job is in the pre-empting stage for too long)	38	## (e.g. if a job is in the pre-empting stage for too long)
27		39
Lines 30-42 Link Here
30	###########################################################################	42	###########################################################################
31	# DAEMON LIST:	43	# DAEMON LIST:
32	#	44	#
33	# All hosts: MASTER	45	# All hosts: MASTER
34	# Central manager: COLLECTOR, NEGOTIATOR	46	# Central manager: COLLECTOR, NEGOTIATOR
35	# Submit hosts: SCHEDD	47	# Submit hosts: SCHEDD
36	# Execute hosts: STARTD	48	# Execute hosts: STARTD
37		49
38	## This macro determines what daemons the condor_master will start and	50	## This macro determines what daemons the condor_master will start and
39	## keep its watchful eyes on.	51	## keep its watchful eyes on.
40	## The list is a comma or space separated list of subsystem names	52	## The list is a comma or space separated list of subsystem names
41		53
42	DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD	54	## Central manager
		55	## DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
		56
		57	## Submit/execute host
		58	DAEMON_LIST = MASTER, SCHEDD, STARTD
		59
		60	## Execute-only host
		61	## DAEMON_LIST = MASTER, STARTD
		62
		63	###########################################################################
		64	## Permissions for this host
		65	##
		66	## .your.domain, x.y.z., hostname, $(MACRO)
		67	##
		68	## ALLOW_ADMINISTRATOR is required by condor_off
		69	## If central manager is not this host, this entry allows both the central
		70	## manager and this host to manage the pool.
		71
		72	ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
		73
		74	##
		75	## Enables condor_status, condor_q, ...
		76
		77	ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
		78
		79	##
		80	## Enables scheduling jobs here
		81
		82	ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
		83

Lines 1-6 Link Here

(-)files/patch-src-condor_sysapi-idle_time.cpp (-5 / +13 lines)
1	--- src/condor_sysapi/idle_time.cpp.orig 2012-01-17 10:53:14.000000000 -0600	1	--- src/condor_sysapi/idle_time.cpp.bak 2012-10-24 23:10:41.000000000 -0500
2	+++ src/condor_sysapi/idle_time.cpp 2012-04-07 14:37:17.000000000 -0500	2	+++ src/condor_sysapi/idle_time.cpp 2012-12-01 14:46:20.000000000 -0600
3	@@ -202,17 +202,22 @@	3	@@ -205,19 +205,30 @@
4	return;	4	return;
5	}	5	}
6		6
Lines 11-27 Link Here
11	+#endif	11	+#endif
12		12
13	#if defined(LINUX)	13	#if defined(LINUX)
14	static char *UtmpName = "/var/run/utmp";	14	static const char *UtmpName = "/var/run/utmp";
15	static char *AltUtmpName = "/var/adm/utmp";	15	static const char *AltUtmpName = "/var/adm/utmp";
16	-#elif defined(CONDOR_FREEBSD)	16	-#elif defined(CONDOR_FREEBSD)
17	+// FreeBSD 9 made a clean break from utmp to utmpx	17	+// FreeBSD 9 made a clean break from utmp to utmpx
18	+#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)	18	+#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
19	static char *UtmpName = "/var/run/utmp";	19	static char *UtmpName = "/var/run/utmp";
20	static char *AltUtmpName = "";	20	static char *AltUtmpName = "";
21	-#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11)	21	-#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11)
		22	+// FreeBSD 9 made a clean break from utmp to utmpx
22	+#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11) \|\| defined(CONDOR_FREEBSD9)	23	+#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11) \|\| defined(CONDOR_FREEBSD9)
23	#include <utmpx.h>	24	#include <utmpx.h>
		25	+#if defined(CONDOR_FREEBSD9)
24	+#define ut_name ut_user	26	+#define ut_name ut_user
		27	+static char *UtmpName = "/var/run/utx.active";
		28	+static char *AltUtmpName = "";
		29	+#else
25	static char *UtmpName = "/etc/utmpx";	30	static char *UtmpName = "/etc/utmpx";
26	static char *AltUtmpName = "/var/adm/utmpx";	31	static char *AltUtmpName = "/var/adm/utmpx";
		32	+#endif
27	#undef UTMP_KIND	33	#undef UTMP_KIND
		34	#define UTMP_KIND utmpx
		35	#elif defined(HPUX11)