Attachment #175990 for bug #213627

View | Details | Raw Unified | Return to bug 213627
Collapse All | Expand All

Lines 1-2 Link Here

(-)/usr/wip/sysutils/condor/distinfo (-2 / +3 lines)
1	SHA256 (condor_src-8.2.8-all-all.tar.gz) = 4a51232f07ecd6648a8dddeebe92e82ee18e3c4819589c83bbd443189c4a7ded	1	TIMESTAMP = 1475844209
2	SIZE (condor_src-8.2.8-all-all.tar.gz) = 19137676	2	SHA256 (condor_src-8.4.9-all-all.tar.gz) = 56be45f54c014680dfd5439749b02fb9da4a11fb5645ff36d22dd0ccef1043ce
		3	SIZE (condor_src-8.4.9-all-all.tar.gz) = 17379991




--- build/cmake/CondorPackageConfig.cmake.orig	2015-04-07 15:10:11 UTC
+++ build/cmake/CondorPackageConfig.cmake
@@ -1,3 +1,4 @@
+
  ###############################################################
  #
  # Copyright 2011 Red Hat, Inc.
@@ -174,6 +175,23 @@ if(${OS_NAME} STREQUAL "DARWIN")
 	# enable if we desire native packaging.
 	# set ( CPACK_GENERATOR "${CPACK_GENERATOR};PackageMaker" ) ;
 	# set (CPACK_OSX_PACKAGE_VERSION)
+
+elseif ( ${OS_NAME} STREQUAL "FREEBSD" )
+
+	# Condor installs nothing useful to FreeBSD in C_INIT, so
+	# just tuck it out of the way.  FreeBSD RC scripts come from
+	# the port's "files" directory.
+	set( C_INIT		etc/condor )
+	set( C_ETC		etc/condor )
+	set( C_CONFIGD		etc/condor/config.d )
+	set( C_SYSCONFIG	etc/condor/sysconfig )
+	
+	set( C_ETC_EXAMPLES	etc/condor/examples )
+	# Condor installs an "examples" directory into C_SHARE_EXAMPLES
+	# so set it to share/condor instead of share/condor/examples.
+	set( C_SHARE_EXAMPLES	share/examples/condor )
+	set( C_DOC		share/doc/condor )
+	
 elseif ( ${OS_NAME} MATCHES "WIN" )
 
 	# override for windows.




--- build/cmake/macros/SystemSpecificInformations.cmake.orig	2016-10-19 22:27:09.555151000 -0500
+++ build/cmake/macros/SystemSpecificInformations.cmake	2016-10-19 22:28:10.217670000 -0500
@@ -265,6 +265,7 @@ if(UNIX)
     set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" )
     set( CONDOR_FREEBSD ON )
     set( BSD_UNIX ON )
+    # FIXME: Is there a >= to replace all the MATCHES operators below?
     if(FREEBSD_MAJOR MATCHES "4" )
       set( CONDOR_FREEBSD4 ON )
     elseif(FREEBSD_MAJOR MATCHES "5" )
@@ -284,6 +285,9 @@ if(UNIX)
     elseif(FREEBSD_MAJOR MATCHES "11" )
       set( CONDOR_FREEBSD11 ON )
       set( CONDOR_UTMPX ON )
     elseif(FREEBSD_MAJOR MATCHES "8" )
       set( CONDOR_FREEBSD8 ON )
+    elseif(FREEBSD_MAJOR MATCHES "9" )
+      set( CONDOR_FREEBSD9 ON )
+      set( CONDOR_UTMPX ON )
+    elseif(FREEBSD_MAJOR MATCHES "10" )
+      set( CONDOR_FREEBSD10 ON )
+      set( CONDOR_UTMPX ON )
+    elseif(FREEBSD_MAJOR MATCHES "11" )
+      set( CONDOR_FREEBSD11 ON )
+      set( CONDOR_UTMPX ON )
+    elseif(FREEBSD_MAJOR MATCHES "12" )
+      set( CONDOR_FREEBSD11 ON )
+      set( CONDOR_UTMPX ON )
     endif()
     if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" )

Lines 1-4 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__includes_condor__crypt__3des.h (-1 / +1 lines)
1	--- src/condor_includes/condor_crypt_3des.h.orig 2015-04-07 15:10:11 UTC	1	--- src/condor_includes/condor_crypt_3des.h.orig 2016-09-29 11:34:28 UTC
2	+++ src/condor_includes/condor_crypt_3des.h	2	+++ src/condor_includes/condor_crypt_3des.h
3	@@ -61,7 +61,7 @@ class Condor_Crypt_3des : public Condor_	3	@@ -61,7 +61,7 @@ class Condor_Crypt_3des : public Condor_
4	//------------------------------------------	4	//------------------------------------------




--- src/condor_includes/config.h.cmake.orig	2015-04-07 15:10:11 UTC
+++ src/condor_includes/config.h.cmake
@@ -16,7 +16,11 @@
  * 
  *************************************************************/
 
-/* config.h.cmake.  Generated from configure.ac by autoheader. -> then updated for cmake */
+/*
+ * config.h.cmake.  Generated from configure.ac by autoheader.
+ * config.h generated by cmake using system info gathered by
+ * build/cmake/macros/SystemSpecificInformations.cmake.
+ */
 
 #ifndef __CONFIGURE_H_CMAKE__
 #define __CONFIGURE_H_CMAKE__
@@ -47,6 +51,10 @@
 #cmakedefine CONDOR_FREEBSD7
 ///* Define if on FreeBSD 8 */
 #cmakedefine CONDOR_FREEBSD8
+///* Define if on FreeBSD 9 */
+#cmakedefine CONDOR_FREEBSD9
+///* Define if on FreeBSD 9 or later, which use utmpx insead of utmp */
+#cmakedefine CONDOR_UTMPX
 ///* Define if on FreeBSD */
 #cmakedefine CONDOR_FREEBSD
 ///* Define release of FreeBSD (i.e. 7.4, 8.2) */
@@ -55,6 +63,7 @@
 #cmakedefine FREEBSD_MAJOR
 ///* Define minor release of FreeBSD */
 #cmakedefine FREEBSD_MINOR
+
 //////////////////////////////////////////////////
 
 //////////////////////////////////////////////////

Lines 1-4 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__io_condor__crypt__3des.cpp (-1 / +1 lines)
1	--- src/condor_io/condor_crypt_3des.cpp.orig 2015-04-07 15:10:11 UTC	1	--- src/condor_io/condor_crypt_3des.cpp.orig 2016-09-29 11:34:28 UTC
2	+++ src/condor_io/condor_crypt_3des.cpp	2	+++ src/condor_io/condor_crypt_3des.cpp
3	@@ -35,9 +35,9 @@ Condor_Crypt_3des :: Condor_Crypt_3des(c	3	@@ -35,9 +35,9 @@ Condor_Crypt_3des :: Condor_Crypt_3des(c
4	unsigned char * keyData = k.getPaddedKeyData(24);	4	unsigned char * keyData = k.getPaddedKeyData(24);




--- src/condor_power/power_state.cpp.orig	2015-04-07 15:10:11 UTC
+++ src/condor_power/power_state.cpp
@@ -57,7 +57,8 @@ enum
 	E_ARGCNT  = -6,  /* too few/many arguments */
 	E_NOREST  = -7,  /* failed to switch the machine's power state */
 	E_CLASSAD = -8,  /* error in class-ad (errno = %d) */
-	E_UNKNOWN = -9   /* unknown error */
+	E_UNSUPPORTED = -9, /* OS not supported */
+	E_UNKNOWN = -10   /* unknown error */
 };
 
 /**	Error messages */
@@ -72,7 +73,8 @@ static const char *errmsgs[] = {
   /* E_ARGCNT   -6 */  "wrong number of arguments.\n",
   /* E_NOREST   -7 */  "failed to switch the machine's power state.\n",
   /* E_CLASSAD  -8 */  "error in class-ad (errno = %d).\n",
-  /* E_UNKNOWN  -9 */  "unknown error.\n"
+  /* E_UNSUPPORTED = -9 */ "condor_power() not implemented for this OS.\n",
+  /* E_UNKNOWN  -10 */  "unknown error.\n"
 };
 
 /**	Typedefs */
@@ -257,6 +259,8 @@ main( int argc, const char *argv[] )
 	/**	Create the hibernation mechanism. */
 # if ( HIBERNATOR_TYPE_DEFINED )
 	hibernator = new RealHibernator;
+# else
+	error( E_UNSUPPORTED );
 # endif
 	if ( !hibernator ) {
 		error( E_NOMEM, "hibernator object." );




--- src/condor_sysapi/idle_time.cpp.orig	2015-04-07 15:10:11 UTC
+++ src/condor_sysapi/idle_time.cpp
@@ -205,19 +205,28 @@ calc_idle_time_cpp( time_t & m_idle, tim
 	return;
 }
 
+#if !defined(CONDOR_UTMPX)
 #include <utmp.h>
 #define UTMP_KIND utmp
+#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_UTMPX)
 static char *UtmpName = "/var/run/utmp";
 static char *AltUtmpName = "";
-#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
+#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_UTMPX)
 #include <utmpx.h>
+#if defined(CONDOR_UTMPX)
+#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)




--- src/condor_utils/condor_config.cpp.orig	2015-04-07 15:10:11 UTC
+++ src/condor_utils/condor_config.cpp
@@ -910,7 +910,7 @@ real_config(const char* host, int wantsQ
 		fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
 				myDistro->GetUc() );
 #	  if defined UNIX
-		fprintf(stderr,"/etc/%s/, nor ~%s/ contain a %s_config source.\n",
+		fprintf(stderr,"/etc/%s/, /usr/local/etc/, nor ~%s/ contain a %s_config source.\n",
 				myDistro->Get(), myDistro->Get(), myDistro->Get() );
 #	  elif defined WIN32
 		fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
@@ -920,7 +920,7 @@ real_config(const char* host, int wantsQ
 		fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
 				"source,\n", myDistro->GetUc() );
 #	  if defined UNIX
-		fprintf( stderr,"or put a \"%s_config\" file in /etc/%s or ~%s/\n",
+		fprintf( stderr,"or put a \"%s_config\" file in /etc/%s/ /usr/local/etc/ or ~%s/\n",
 				 myDistro->Get(), myDistro->Get(), myDistro->Get() );
 #	  elif defined WIN32
 		fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"




--- src/python-bindings/dc_tool.cpp.orig	2015-04-07 15:10:11 UTC
+++ src/python-bindings/dc_tool.cpp
@@ -7,6 +7,21 @@
 # include <pyport.h>
 # endif
 
+/*
+ * #include <Python.h> solves a ctype function overload issue, but causes
+ * a dprintf() conflict.  Redefining dprintf and getline prevents a collision
+ * with the definitions in stdio.h, #included from Python.h, so the condor
+ * versions are used instead.
+ */
+
+#ifdef __FreeBSD__
+#define dprintf _hide_dprintf
+#define getline _hide_getline
+#include <Python.h>
+#undef getline
+#undef dprintf
+#endif
+
 #include "condor_common.h"
 
 #include <boost/python.hpp>




--- src/python-bindings/secman.cpp.orig	2015-04-07 15:10:11 UTC
+++ src/python-bindings/secman.cpp
@@ -7,6 +7,21 @@
 # include <pyport.h>
 # endif
 
+/* 
+ * #include <Python.h> solves a ctype function overload issue, but causes
+ * a dprintf() conflict.  Redefining dprintf and getline disables them in
+ * in stdio.h, #included by Python.h, so they don't collide with the condor
+ * versions.
+ */
+
+#ifdef __FreeBSD__
+#define dprintf _hide_dprintf
+#define getline _hide_getline
+#include <Python.h>
+#undef getline
+#undef dprintf
+#endif
+
 #include "condor_common.h"
 
 #include <boost/python.hpp>

Lines 1-8 Link Here

(-)/usr/wip/sysutils/condor/Makefile (-7 / +8 lines)
1	# Created by: Andy Pavlo	1	# Created by: Andy Pavlo
2	# $FreeBSD: head/sysutils/condor/Makefile 413746 2016-04-21 16:43:14Z swills $	2	# $FreeBSD: head/sysutils/condor/Makefile 413746 2016-04-21 16:43:14Z swills $
		3	#
		4	# Note: Make sure there are no older versions of HTCondor installed during
		5	# build. The build system may pick up incompatible headers and libs.
3		6
4	PORTNAME= condor	7	PORTNAME= condor
5	PORTVERSION= 8.2.8	8	PORTVERSION= 8.4.9
6	CATEGORIES= sysutils net	9	CATEGORIES= sysutils net
7	MASTER_SITES= http://www.acadix.biz/Ports/distfiles/	10	MASTER_SITES= http://www.acadix.biz/Ports/distfiles/
8	DISTNAME= condor_src-${PORTVERSION}-all-all	11	DISTNAME= condor_src-${PORTVERSION}-all-all
Lines 18-29 Link Here
18	LIB_DEPENDS+= libkrb5support.so:security/krb5 \	21	LIB_DEPENDS+= libkrb5support.so:security/krb5 \
19	libpcre.so:devel/pcre \	22	libpcre.so:devel/pcre \
20	libcurl.so:ftp/curl \	23	libcurl.so:ftp/curl \
21	libboost_python.so:devel/boost-python-libs	24	libboost_python.so:devel/boost-python-libs \
		25	libexpat.so:textproc/expat2
22		26
23	WRKSRC= ${WRKDIR}/condor-${PORTVERSION}	27	WRKSRC= ${WRKDIR}/condor-${PORTVERSION}
24	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
25	# Does not build with Python 3	29	# Does not build with Python 3
26	USES= cmake cpe gmake perl5 pgsql python:2 shebangfix	30	USES= cmake cpe gmake perl5 pgsql python:2 shebangfix ssl
27	CPE_VENDOR= condor_project	31	CPE_VENDOR= condor_project
28	SHEBANG_FILES= src/condor_scripts/condor_qsub \	32	SHEBANG_FILES= src/condor_scripts/condor_qsub \
29	src/condor_gridmanager/remote_gahp \	33	src/condor_gridmanager/remote_gahp \
Lines 40-49 Link Here
40	-DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \	44	-DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \
41	-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so	45	-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so
42		46
43	# This was an issue in previous releases, but I've tested 8.2.8 extensively
44	# on machines with as many as 16 cores.
45	# MAKE_JOBS_UNSAFE= yes
46
47	SUB_FILES= condor-config condor_config.local pkg-message	47	SUB_FILES= condor-config condor_config.local pkg-message
48		48
49	USERS= condor	49	USERS= condor
Lines 71-76 Link Here
71	-e 's\|/usr/local/condor\|${PREFIX}\|g' \	71	-e 's\|/usr/local/condor\|${PREFIX}\|g' \
72	-e 's\|$$(LOCAL_DIR)/condor_config.local\|$$(RELEASE_DIR)/etc/condor_config.local\|g' \	72	-e 's\|$$(LOCAL_DIR)/condor_config.local\|$$(RELEASE_DIR)/etc/condor_config.local\|g' \
73	-e 's\|/bin/mail\|/usr/bin/mail\|g' \	73	-e 's\|/bin/mail\|/usr/bin/mail\|g' \
		74	-e 's\|/usr/bin/java\|${LOCALBASE}/bin/java\|g' \
74	-e 's\|^CONDOR_HOST\|## CONDOR_HOST\|' \	75	-e 's\|^CONDOR_HOST\|## CONDOR_HOST\|' \
75	-e 's\|#CONDOR_IDS=x.x\|CONDOR_IDS=466.466\|' \	76	-e 's\|#CONDOR_IDS=x.x\|CONDOR_IDS=466.466\|' \
76	${WRKSRC}/src/condor_examples/condor_config.annotated	77	${WRKSRC}/src/condor_examples/condor_config.annotated




bin/condor_tail
bin/condor_test_match
bin/condor_transfer_data
bin/condor_update_machine_ad
bin/condor_userlog
bin/condor_userlog_job_counter
bin/condor_userprio

bin/condor_version
bin/condor_wait
bin/condor_who
@sample etc/condor_config.sample
@sample etc/condor_config.local.sample
%%ETCDIR%%/condor
%%ETCDIR%%/condor_config
%%ETCDIR%%/examples/README
%%ETCDIR%%/examples/condor-tmpfiles.conf
%%ETCDIR%%/examples/condor.boot.generic
%%ETCDIR%%/examples/condor.boot.rpm
%%ETCDIR%%/examples/condor.init
%%ETCDIR%%/examples/condor.plist
%%ETCDIR%%/examples/condor.service
%%ETCDIR%%/examples/condor.sysconfig
%%ETCDIR%%/examples/condor_config.annotated
%%ETCDIR%%/examples/condor_config.generic

%%ETCDIR%%/examples/mp2script
%%ETCDIR%%/examples/openmpiscript
%%ETCDIR%%/sysconfig/condor
@sample etc/condor_config.local.sample
@sample etc/condor_config.sample
include/MyString.h
include/chirp_client.h
include/classad/attrrefs.h

lib/libchirp_client.a
lib/libclassad.a
lib/libcondorapi.a
lib/libpyclassad%%PYTHON_VER%%_8_4_9.a
lib/python/classad.so
lib/python/htcondor.so
lib/scimark2lib.jar

libexec/condor_rooster
libexec/condor_schedd.init
libexec/condor_shared_port
libexec/condor_sinful
libexec/condor_ssh
libexec/condor_ssh_to_job_shell_setup
libexec/condor_ssh_to_job_sshd_setup
libexec/condor_testingd
libexec/condor_transferer
libexec/condor_urlfetch
libexec/curl_plugin
libexec/data_plugin
libexec/interactive.sub
libexec/libclassad_python_user.so
libexec/libvirt_simple_script.awk
libexec/sshd.sh
man/man1/bosco_cluster.1.gz

man/man1/condor_history.1.gz
man/man1/condor_hold.1.gz
man/man1/condor_install.1.gz
man/man1/condor_job_router_info.1.gz
man/man1/condor_master.1.gz
man/man1/condor_off.1.gz
man/man1/condor_on.1.gz

man/man1/condor_suspend.1.gz
man/man1/condor_tail.1.gz
man/man1/condor_transfer_data.1.gz
man/man1/condor_update_machine_ad.1.gz
man/man1/condor_updates_stats.1.gz
man/man1/condor_urlfetch.1.gz
man/man1/condor_userlog.1.gz

Return to bug 213627

Lines 1-31 Link Here

(-)/usr/wip/sysutils/condor/files/patch-build_cmake_CondorPackageConfig.cmake (-31 lines)
1	--- build/cmake/CondorPackageConfig.cmake.orig 2015-04-07 15:10:11 UTC
2	+++ build/cmake/CondorPackageConfig.cmake
3	@@ -1,3 +1,4 @@
4	+
5	###############################################################
6	#
7	# Copyright 2011 Red Hat, Inc.
8	@@ -174,6 +175,23 @@ if(${OS_NAME} STREQUAL "DARWIN")
9	# enable if we desire native packaging.
10	# set ( CPACK_GENERATOR "${CPACK_GENERATOR};PackageMaker" ) ;
11	# set (CPACK_OSX_PACKAGE_VERSION)
12	+
13	+elseif ( ${OS_NAME} STREQUAL "FREEBSD" )
14	+
15	+ # Condor installs nothing useful to FreeBSD in C_INIT, so
16	+ # just tuck it out of the way. FreeBSD RC scripts come from
17	+ # the port's "files" directory.
18	+ set( C_INIT etc/condor )
19	+ set( C_ETC etc/condor )
20	+ set( C_CONFIGD etc/condor/config.d )
21	+ set( C_SYSCONFIG etc/condor/sysconfig )
22	+
23	+ set( C_ETC_EXAMPLES etc/condor/examples )
24	+ # Condor installs an "examples" directory into C_SHARE_EXAMPLES
25	+ # so set it to share/condor instead of share/condor/examples.
26	+ set( C_SHARE_EXAMPLES share/examples/condor )
27	+ set( C_DOC share/doc/condor )
28	+
29	elseif ( ${OS_NAME} MATCHES "WIN" )
30
31	# override for windows.

Lines 1-30 Link Here

(-)/usr/wip/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake (-26 / +15 lines)
1	--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2015-04-07 15:10:11 UTC	1	--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2016-10-19 22:27:09.555151000 -0500
2	+++ build/cmake/macros/SystemSpecificInformations.cmake	2	+++ build/cmake/macros/SystemSpecificInformations.cmake 2016-10-19 22:28:10.217670000 -0500
3	@@ -252,7 +252,8 @@ if(UNIX)	3	@@ -265,6 +265,7 @@ if(UNIX)
4	endif(EXISTS "/etc/issue")	4	set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" )
5		5	set( CONDOR_FREEBSD ON )
6	elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")	6	set( BSD_UNIX ON )
7	- string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-RELEASE" FREEBSD "${CMAKE_SYSTEM_VERSION}")	7	+ # FIXME: Is there a >= to replace all the MATCHES operators below?
8	+ # Match x.x-RELEASE, x.x-BETA1, etc.	8	if(FREEBSD_MAJOR MATCHES "4" )
9	+ string(REGEX MATCH "(([0-9]+)\\.([0-9]+))-([A-Z0-9])+" FREEBSD "${CMAKE_SYSTEM_VERSION}")	9	set( CONDOR_FREEBSD4 ON )
10	set( FREEBSD_RELEASE "${CMAKE_MATCH_1}" )	10	elseif(FREEBSD_MAJOR MATCHES "5" )
11	set( FREEBSD_MAJOR "${CMAKE_MATCH_2}" )	11	@@ -284,6 +285,9 @@ if(UNIX)
12	set( FREEBSD_MINOR "${CMAKE_MATCH_3}" )	12	elseif(FREEBSD_MAJOR MATCHES "11" )
13	@@ -270,6 +271,18 @@ if(UNIX)	13	set( CONDOR_FREEBSD11 ON )
14	set( CONDOR_FREEBSD7 ON )	14	set( CONDOR_UTMPX ON )
15	elseif(FREEBSD_MAJOR MATCHES "8" )
16	set( CONDOR_FREEBSD8 ON )
17	+ elseif(FREEBSD_MAJOR MATCHES "9" )
18	+ set( CONDOR_FREEBSD9 ON )
19	+ set( CONDOR_UTMPX ON )
20	+ elseif(FREEBSD_MAJOR MATCHES "10" )
21	+ set( CONDOR_FREEBSD10 ON )
22	+ set( CONDOR_UTMPX ON )
23	+ elseif(FREEBSD_MAJOR MATCHES "11" )
24	+ set( CONDOR_FREEBSD11 ON )
25	+ set( CONDOR_UTMPX ON )
26	+ elseif(FREEBSD_MAJOR MATCHES "12" )	15	+ elseif(FREEBSD_MAJOR MATCHES "12" )
27	+ set( CONDOR_FREEBSD12 ON )	16	+ set( CONDOR_FREEBSD11 ON )
28	+ set( CONDOR_UTMPX ON )	17	+ set( CONDOR_UTMPX ON )
29	endif()	18	endif()
30	if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" )	19	if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" )

Lines 1-34 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__includes_config.h.cmake (-34 lines)
1	--- src/condor_includes/config.h.cmake.orig 2015-04-07 15:10:11 UTC
2	+++ src/condor_includes/config.h.cmake
3	@@ -16,7 +16,11 @@
4	*
5	*************************************************************/
6
7	-/* config.h.cmake. Generated from configure.ac by autoheader. -> then updated for cmake */
8	+/*
9	+ * config.h.cmake. Generated from configure.ac by autoheader.
10	+ * config.h generated by cmake using system info gathered by
11	+ * build/cmake/macros/SystemSpecificInformations.cmake.
12	+ */
13
14	#ifndef __CONFIGURE_H_CMAKE__
15	#define __CONFIGURE_H_CMAKE__
16	@@ -47,6 +51,10 @@
17	#cmakedefine CONDOR_FREEBSD7
18	///* Define if on FreeBSD 8 */
19	#cmakedefine CONDOR_FREEBSD8
20	+///* Define if on FreeBSD 9 */
21	+#cmakedefine CONDOR_FREEBSD9
22	+///* Define if on FreeBSD 9 or later, which use utmpx insead of utmp */
23	+#cmakedefine CONDOR_UTMPX
24	///* Define if on FreeBSD */
25	#cmakedefine CONDOR_FREEBSD
26	///* Define release of FreeBSD (i.e. 7.4, 8.2) */
27	@@ -55,6 +63,7 @@
28	#cmakedefine FREEBSD_MAJOR
29	///* Define minor release of FreeBSD */
30	#cmakedefine FREEBSD_MINOR
31	+
32	//////////////////////////////////////////////////
33
34	//////////////////////////////////////////////////

Lines 1-31 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__power_power__state.cpp (-31 lines)
1	--- src/condor_power/power_state.cpp.orig 2015-04-07 15:10:11 UTC
2	+++ src/condor_power/power_state.cpp
3	@@ -57,7 +57,8 @@ enum
4	E_ARGCNT = -6, /* too few/many arguments */
5	E_NOREST = -7, /* failed to switch the machine's power state */
6	E_CLASSAD = -8, /* error in class-ad (errno = %d) */
7	- E_UNKNOWN = -9 /* unknown error */
8	+ E_UNSUPPORTED = -9, /* OS not supported */
9	+ E_UNKNOWN = -10 /* unknown error */
10	};
11
12	/** Error messages */
13	@@ -72,7 +73,8 @@ static const char *errmsgs[] = {
14	/* E_ARGCNT -6 */ "wrong number of arguments.\n",
15	/* E_NOREST -7 */ "failed to switch the machine's power state.\n",
16	/* E_CLASSAD -8 */ "error in class-ad (errno = %d).\n",
17	- /* E_UNKNOWN -9 */ "unknown error.\n"
18	+ /* E_UNSUPPORTED = -9 */ "condor_power() not implemented for this OS.\n",
19	+ /* E_UNKNOWN -10 */ "unknown error.\n"
20	};
21
22	/** Typedefs */
23	@@ -257,6 +259,8 @@ main( int argc, const char *argv[] )
24	/** Create the hibernation mechanism. */
25	# if ( HIBERNATOR_TYPE_DEFINED )
26	hibernator = new RealHibernator;
27	+# else
28	+ error( E_UNSUPPORTED );
29	# endif
30	if ( !hibernator ) {
31	error( E_NOMEM, "hibernator object." );

Lines 1-33 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__sysapi_idle__time.cpp (-33 lines)
1	--- src/condor_sysapi/idle_time.cpp.orig 2015-04-07 15:10:11 UTC
2	+++ src/condor_sysapi/idle_time.cpp
3	@@ -205,19 +205,28 @@ calc_idle_time_cpp( time_t & m_idle, tim
4	return;
5	}
6
7	+#if !defined(CONDOR_UTMPX)
8	#include <utmp.h>
9	#define UTMP_KIND utmp
10	+#endif
11
12	#if defined(LINUX)
13	static const char *UtmpName = "/var/run/utmp";
14	static const char *AltUtmpName = "/var/adm/utmp";
15	-#elif defined(CONDOR_FREEBSD)
16	+// FreeBSD 9 made a clean break from utmp to utmpx
17	+#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_UTMPX)
18	static char *UtmpName = "/var/run/utmp";
19	static char *AltUtmpName = "";
20	-#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11)
21	+#elif defined(Solaris28) \|\| defined(Solaris29) \|\| defined(Solaris10) \|\| defined(Solaris11) \|\| defined(CONDOR_UTMPX)
22	#include <utmpx.h>
23	+#if defined(CONDOR_UTMPX)
24	+#define ut_name ut_user
25	+static char *UtmpName = "/var/run/utx.active";
26	+static char *AltUtmpName = "";
27	+#else
28	static char *UtmpName = "/etc/utmpx";
29	static char *AltUtmpName = "/var/adm/utmpx";
30	+#endif
31	#undef UTMP_KIND
32	#define UTMP_KIND utmpx
33	#elif defined(HPUX11)

Lines 1-20 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_condor__utils_condor__config.cpp (-20 lines)
1	--- src/condor_utils/condor_config.cpp.orig 2015-04-07 15:10:11 UTC
2	+++ src/condor_utils/condor_config.cpp
3	@@ -910,7 +910,7 @@ real_config(const char* host, int wantsQ
4	fprintf(stderr,"\nNeither the environment variable %s_CONFIG,\n",
5	myDistro->GetUc() );
6	# if defined UNIX
7	- fprintf(stderr,"/etc/%s/, nor ~%s/ contain a %s_config source.\n",
8	+ fprintf(stderr,"/etc/%s/, /usr/local/etc/, nor ~%s/ contain a %s_config source.\n",
9	myDistro->Get(), myDistro->Get(), myDistro->Get() );
10	# elif defined WIN32
11	fprintf(stderr,"nor the registry contains a %s_config source.\n", myDistro->Get() );
12	@@ -920,7 +920,7 @@ real_config(const char* host, int wantsQ
13	fprintf( stderr,"Either set %s_CONFIG to point to a valid config "
14	"source,\n", myDistro->GetUc() );
15	# if defined UNIX
16	- fprintf( stderr,"or put a \"%s_config\" file in /etc/%s or ~%s/\n",
17	+ fprintf( stderr,"or put a \"%s_config\" file in /etc/%s/ /usr/local/etc/ or ~%s/\n",
18	myDistro->Get(), myDistro->Get(), myDistro->Get() );
19	# elif defined WIN32
20	fprintf( stderr,"or put a \"%s_config\" source in the registry at:\n"

Lines 1-24 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_python-bindings_dc__tool.cpp (-24 lines)
1	--- src/python-bindings/dc_tool.cpp.orig 2015-04-07 15:10:11 UTC
2	+++ src/python-bindings/dc_tool.cpp
3	@@ -7,6 +7,21 @@
4	# include <pyport.h>
5	# endif
6
7	+/*
8	+ * #include <Python.h> solves a ctype function overload issue, but causes
9	+ * a dprintf() conflict. Redefining dprintf and getline prevents a collision
10	+ * with the definitions in stdio.h, #included from Python.h, so the condor
11	+ * versions are used instead.
12	+ */
13	+
14	+#ifdef __FreeBSD__
15	+#define dprintf _hide_dprintf
16	+#define getline _hide_getline
17	+#include <Python.h>
18	+#undef getline
19	+#undef dprintf
20	+#endif
21	+
22	#include "condor_common.h"
23
24	#include <boost/python.hpp>

Lines 1-24 Link Here

(-)/usr/wip/sysutils/condor/files/patch-src_python-bindings_secman.cpp (-24 lines)
1	--- src/python-bindings/secman.cpp.orig 2015-04-07 15:10:11 UTC
2	+++ src/python-bindings/secman.cpp
3	@@ -7,6 +7,21 @@
4	# include <pyport.h>
5	# endif
6
7	+/*
8	+ * #include <Python.h> solves a ctype function overload issue, but causes
9	+ * a dprintf() conflict. Redefining dprintf and getline disables them in
10	+ * in stdio.h, #included by Python.h, so they don't collide with the condor
11	+ * versions.
12	+ */
13	+
14	+#ifdef __FreeBSD__
15	+#define dprintf _hide_dprintf
16	+#define getline _hide_getline
17	+#include <Python.h>
18	+#undef getline
19	+#undef dprintf
20	+#endif
21	+
22	#include "condor_common.h"
23
24	#include <boost/python.hpp>

Lines 34-39 Link Here

(-)/usr/wip/sysutils/condor/pkg-plist (-3 / +11 lines)
34	bin/condor_tail	34	bin/condor_tail
35	bin/condor_test_match	35	bin/condor_test_match
36	bin/condor_transfer_data	36	bin/condor_transfer_data
		37	bin/condor_update_machine_ad
37	bin/condor_userlog	38	bin/condor_userlog
38	bin/condor_userlog_job_counter	39	bin/condor_userlog_job_counter
39	bin/condor_userprio	40	bin/condor_userprio
Lines 42-56 Link Here
42	bin/condor_version	43	bin/condor_version
43	bin/condor_wait	44	bin/condor_wait
44	bin/condor_who	45	bin/condor_who
45	@sample etc/condor_config.sample
46	@sample etc/condor_config.local.sample
47	%%ETCDIR%%/condor	46	%%ETCDIR%%/condor
48	%%ETCDIR%%/condor_config	47	%%ETCDIR%%/condor_config
49	%%ETCDIR%%/examples/README	48	%%ETCDIR%%/examples/README
		49	%%ETCDIR%%/examples/condor-tmpfiles.conf
50	%%ETCDIR%%/examples/condor.boot.generic	50	%%ETCDIR%%/examples/condor.boot.generic
51	%%ETCDIR%%/examples/condor.boot.rpm	51	%%ETCDIR%%/examples/condor.boot.rpm
52	%%ETCDIR%%/examples/condor.init	52	%%ETCDIR%%/examples/condor.init
53	%%ETCDIR%%/examples/condor.plist	53	%%ETCDIR%%/examples/condor.plist
		54	%%ETCDIR%%/examples/condor.service
54	%%ETCDIR%%/examples/condor.sysconfig	55	%%ETCDIR%%/examples/condor.sysconfig
55	%%ETCDIR%%/examples/condor_config.annotated	56	%%ETCDIR%%/examples/condor_config.annotated
56	%%ETCDIR%%/examples/condor_config.generic	57	%%ETCDIR%%/examples/condor_config.generic
Lines 68-73 Link Here
68	%%ETCDIR%%/examples/mp2script	69	%%ETCDIR%%/examples/mp2script
69	%%ETCDIR%%/examples/openmpiscript	70	%%ETCDIR%%/examples/openmpiscript
70	%%ETCDIR%%/sysconfig/condor	71	%%ETCDIR%%/sysconfig/condor
		72	@sample etc/condor_config.local.sample
		73	@sample etc/condor_config.sample
71	include/MyString.h	74	include/MyString.h
72	include/chirp_client.h	75	include/chirp_client.h
73	include/classad/attrrefs.h	76	include/classad/attrrefs.h
Lines 127-133 Link Here
127	lib/libchirp_client.a	130	lib/libchirp_client.a
128	lib/libclassad.a	131	lib/libclassad.a
129	lib/libcondorapi.a	132	lib/libcondorapi.a
130	lib/libpyclassad%%PYTHON_VER%%_8_2_8.a	133	lib/libpyclassad%%PYTHON_VER%%_8_4_9.a
131	lib/python/classad.so	134	lib/python/classad.so
132	lib/python/htcondor.so	135	lib/python/htcondor.so
133	lib/scimark2lib.jar	136	lib/scimark2lib.jar
Lines 144-157 Link Here
144	libexec/condor_rooster	147	libexec/condor_rooster
145	libexec/condor_schedd.init	148	libexec/condor_schedd.init
146	libexec/condor_shared_port	149	libexec/condor_shared_port
		150	libexec/condor_sinful
147	libexec/condor_ssh	151	libexec/condor_ssh
148	libexec/condor_ssh_to_job_shell_setup	152	libexec/condor_ssh_to_job_shell_setup
149	libexec/condor_ssh_to_job_sshd_setup	153	libexec/condor_ssh_to_job_sshd_setup
		154	libexec/condor_testingd
150	libexec/condor_transferer	155	libexec/condor_transferer
151	libexec/condor_urlfetch	156	libexec/condor_urlfetch
152	libexec/curl_plugin	157	libexec/curl_plugin
153	libexec/data_plugin	158	libexec/data_plugin
154	libexec/interactive.sub	159	libexec/interactive.sub
		160	libexec/libclassad_python_user.so
155	libexec/libvirt_simple_script.awk	161	libexec/libvirt_simple_script.awk
156	libexec/sshd.sh	162	libexec/sshd.sh
157	man/man1/bosco_cluster.1.gz	163	man/man1/bosco_cluster.1.gz
Lines 180-185 Link Here
180	man/man1/condor_history.1.gz	186	man/man1/condor_history.1.gz
181	man/man1/condor_hold.1.gz	187	man/man1/condor_hold.1.gz
182	man/man1/condor_install.1.gz	188	man/man1/condor_install.1.gz
		189	man/man1/condor_job_router_info.1.gz
183	man/man1/condor_master.1.gz	190	man/man1/condor_master.1.gz
184	man/man1/condor_off.1.gz	191	man/man1/condor_off.1.gz
185	man/man1/condor_on.1.gz	192	man/man1/condor_on.1.gz
Lines 213-218 Link Here
213	man/man1/condor_suspend.1.gz	220	man/man1/condor_suspend.1.gz
214	man/man1/condor_tail.1.gz	221	man/man1/condor_tail.1.gz
215	man/man1/condor_transfer_data.1.gz	222	man/man1/condor_transfer_data.1.gz
		223	man/man1/condor_update_machine_ad.1.gz
216	man/man1/condor_updates_stats.1.gz	224	man/man1/condor_updates_stats.1.gz
217	man/man1/condor_urlfetch.1.gz	225	man/man1/condor_urlfetch.1.gz
218	man/man1/condor_userlog.1.gz	226	man/man1/condor_userlog.1.gz