Index: head/sysutils/condor/Makefile =================================================================== --- head/sysutils/condor/Makefile +++ head/sysutils/condor/Makefile @@ -1,12 +1,11 @@ # Created by: Andy Pavlo # $FreeBSD$ -# -# Note: Make sure there are no older versions of HTCondor installed during + +# Note: Make sure there are no other versions of HTCondor installed during # build. The build system may pick up incompatible headers and libs. PORTNAME= condor -PORTVERSION= 8.4.9 -PORTREVISION= 8 +DISTVERSION= 8.4.12 CATEGORIES= sysutils net MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ DISTNAME= condor_src-${PORTVERSION}-all-all @@ -17,18 +16,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt -BROKEN= fails to build +BROKEN_powerpc64= fails to build -LIB_DEPENDS+= libkrb5support.so:security/krb5 \ +LIB_DEPENDS= libkrb5support.so:security/krb5 \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ - ${PY_BOOST} \ - libexpat.so:textproc/expat2 + libexpat.so:textproc/expat2 \ + ${PY_BOOST} -WRKSRC= ${WRKDIR}/condor-${PORTVERSION} +# Does not work with Python 3 +USES= cmake:noninja cpe perl5 pgsql python:2.7 shebangfix ssl USE_LDCONFIG= yes -# Does not build with Python 3 -USES= cmake cpe perl5 pgsql python:2.7 shebangfix ssl CPE_VENDOR= condor_project SHEBANG_FILES= src/condor_scripts/condor_qsub \ src/condor_gridmanager/remote_gahp \ @@ -37,11 +35,11 @@ src/condor_starter.V6.1/condor_ssh_to_job_shell_setup \ src/condor_job_router/condor_router_history +WRKSRC= ${WRKDIR}/condor-${PORTVERSION} WANT_PGSQL= server CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC -# Does not build with Python 3 -CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ +CMAKE_ARGS= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ -DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \ -DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so @@ -61,7 +59,7 @@ pre-everything:: @( ${PRINTF} "\nWARNING: Condor needs approximately 3GB to build!"; \ - ${PRINTF} " Please make sure your build environment has that much before continuing.\n" ) + ${PRINTF} " Please make sure your build environment has that much space before continuing.\n" ) post-patch: @${REINPLACE_CMD} \ Index: head/sysutils/condor/distinfo =================================================================== --- head/sysutils/condor/distinfo +++ head/sysutils/condor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475844209 -SHA256 (condor_src-8.4.9-all-all.tar.gz) = 56be45f54c014680dfd5439749b02fb9da4a11fb5645ff36d22dd0ccef1043ce -SIZE (condor_src-8.4.9-all-all.tar.gz) = 17379991 +TIMESTAMP = 1522374768 +SHA256 (condor_src-8.4.12-all-all.tar.gz) = d1544f41f31931fdaa9bfed8cb5f7e669b6e1e53c300888fda05cb29b6091c2a +SIZE (condor_src-8.4.12-all-all.tar.gz) = 17391439 Index: head/sysutils/condor/files/patch-src_condor__includes_condor__crypt__3des.h =================================================================== --- head/sysutils/condor/files/patch-src_condor__includes_condor__crypt__3des.h +++ head/sysutils/condor/files/patch-src_condor__includes_condor__crypt__3des.h @@ -1,11 +0,0 @@ ---- src/condor_includes/condor_crypt_3des.h.orig 2015-04-07 15:10:11 UTC -+++ src/condor_includes/condor_crypt_3des.h -@@ -61,7 +61,7 @@ class Condor_Crypt_3des : public Condor_ - //------------------------------------------ - // Private constructor - //------------------------------------------ -- des_key_schedule keySchedule1_, keySchedule2_, keySchedule3_; -+ DES_key_schedule keySchedule1_, keySchedule2_, keySchedule3_; - unsigned char ivec_[8]; - int num_; - }; Index: head/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp =================================================================== --- head/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp +++ head/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp @@ -0,0 +1,11 @@ +--- src/condor_io/condor_auth_kerberos.cpp.orig 2018-03-29 12:44:08 UTC ++++ src/condor_io/condor_auth_kerberos.cpp +@@ -80,7 +80,7 @@ static void (KRB5_CALLCONV *krb5_free_cr + static void (KRB5_CALLCONV *krb5_free_keyblock_ptr)(krb5_context, register krb5_keyblock *) = NULL; + static void (KRB5_CALLCONV *krb5_free_principal_ptr)(krb5_context, krb5_principal) = NULL; + static void (KRB5_CALLCONV *krb5_free_ticket_ptr)(krb5_context, krb5_ticket *) = NULL; +-static krb5_error_code (KRB5_CALLCONV *krb5_fwd_tgt_creds_ptr)(krb5_context, krb5_auth_context, char *, krb5_principal, krb5_principal, krb5_ccache, int, krb5_data *) = NULL; ++static krb5_error_code (KRB5_CALLCONV *krb5_fwd_tgt_creds_ptr)(krb5_context, krb5_auth_context, const char *, krb5_principal, krb5_principal, krb5_ccache, int, krb5_data *) = NULL; + static krb5_error_code (KRB5_CALLCONV *krb5_get_credentials_ptr)(krb5_context, krb5_flags, krb5_ccache, krb5_creds *, krb5_creds **) = NULL; + // The presence of KRB5_RESPONDER_QUESTION_PASSWORD is a hacky substitute + // for detecting the version of Kerberos where the function signature Index: head/sysutils/condor/files/patch-src_condor__io_condor__crypt__3des.cpp =================================================================== --- head/sysutils/condor/files/patch-src_condor__io_condor__crypt__3des.cpp +++ head/sysutils/condor/files/patch-src_condor__io_condor__crypt__3des.cpp @@ -1,41 +0,0 @@ ---- src/condor_io/condor_crypt_3des.cpp.orig 2015-04-07 15:10:11 UTC -+++ src/condor_io/condor_crypt_3des.cpp -@@ -35,9 +35,9 @@ Condor_Crypt_3des :: Condor_Crypt_3des(c - unsigned char * keyData = k.getPaddedKeyData(24); - ASSERT(keyData); - -- des_set_key((des_cblock *) keyData , keySchedule1_); -- des_set_key((des_cblock *) (keyData+8) , keySchedule2_); -- des_set_key((des_cblock *) (keyData+16), keySchedule3_); -+ DES_set_key((DES_cblock *) keyData , &keySchedule1_); -+ DES_set_key((DES_cblock *) (keyData+8) , &keySchedule2_); -+ DES_set_key((DES_cblock *) (keyData+16), &keySchedule3_); - - // initialize ivsec - resetState(); -@@ -71,9 +71,9 @@ bool Condor_Crypt_3des :: encrypt(unsign - output = (unsigned char *) malloc(input_len); - - if (output) { -- des_ede3_cfb64_encrypt(input, output, output_len, -- keySchedule1_, keySchedule2_, keySchedule3_, -- (des_cblock *)ivec_, &num_, DES_ENCRYPT); -+ DES_ede3_cfb64_encrypt(input, output, output_len, -+ &keySchedule1_, &keySchedule2_, &keySchedule3_, -+ (DES_cblock *)ivec_, &num_, DES_ENCRYPT); - return true; - } - else { -@@ -95,9 +95,9 @@ bool Condor_Crypt_3des :: decrypt(unsign - if (output) { - output_len = input_len; - -- des_ede3_cfb64_encrypt(input, output, output_len, -- keySchedule1_, keySchedule2_, keySchedule3_, -- (des_cblock *)ivec_, &num_, DES_DECRYPT); -+ DES_ede3_cfb64_encrypt(input, output, output_len, -+ &keySchedule1_, &keySchedule2_, &keySchedule3_, -+ (DES_cblock *)ivec_, &num_, DES_DECRYPT); - - return true; // Should be changed - } Index: head/sysutils/condor/pkg-descr =================================================================== --- head/sysutils/condor/pkg-descr +++ head/sysutils/condor/pkg-descr @@ -1,14 +1,13 @@ Condor is a open-source, specialized workload management system for -compute-intensive jobs. Like other full-featured batch systems, Condor -provides a job queuing mechanism, scheduling policy, priority scheme, -resource monitoring, and resource management. Users submit their serial -or parallel jobs to Condor, Condor places them into a queue, chooses -when and where to run the jobs based upon a policy, carefully monitors -their progress, and ultimately informs the user upon completion. Condor -also contains mechanisms to submit jobs to grid-sites and supports many -different grid toolkits. +compute-intensive jobs. Like other full-featured batch systems, Condor provides +a job queuing mechanism, scheduling policy, priority scheme, resource +monitoring, and resource management. Users submit their serial or parallel jobs +to Condor, Condor places them into a queue, chooses when and where to run the +jobs based upon a policy, carefully monitors their progress, and ultimately +informs the user upon completion. Condor also contains mechanisms to submit +jobs to grid-sites and supports many different grid toolkits. -It is developed at the University of Wisconsin-Madison's Department -of Computer Sciences. +It is developed at the University of Wisconsin-Madison's Department of Computer +Sciences. WWW: http://research.cs.wisc.edu/condor/