<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/34c46cfac5bdd55627fc6de98d085fdb1b03df10">https://github.com/macports/macports-ports/commit/34c46cfac5bdd55627fc6de98d085fdb1b03df10</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 34c46cf htcondor: update to 8.8.1
</span>34c46cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34c46cfac5bdd55627fc6de98d085fdb1b03df10
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Thu Feb 21 12:30:17 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> htcondor: update to 8.8.1
</span>---
science/htcondor/Portfile | 10 +++---
science/htcondor/files/condor_config | 39 ++--------------------
...rnal-bundles-openssl-1.0.1e-CMakeLists.txt.diff | 21 ++++++++++++
3 files changed, 30 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/Portfile b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d810f7..9396035 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup htcondor htcondor 8_7_7 V
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup htcondor htcondor 8_8_1 V
</span> version [strsed ${github.version} g/_/\./]
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,8 +82,9 @@ variant kerberos description {enable Kerberos5 support} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8b29509fb553454f5d67f67cb59db1d80d50f43c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65cb1b12f8cb972a3d245f6cea7ec0509cd86d07368dc3dc0dcd7679238cb3b4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 53f076464a125c3574b25a3df1cb36d1bdd9bc34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 abab3e8fe39bcebe68ea6efb60438f88f51bf9e2d345d8a1f061b6584440cc1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13135083
</span>
depends_build-append port:fig2dev \
port:latex2html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +97,7 @@ depends_lib-append port:boost \
</span> license_noconflict latex2html
patchfiles patch-build-cmake-CondorPackageConfig.cmake.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-external-bundles-openssl-1.0.1e-CMakeLists.txt.diff \
</span> patch-src-classad-CMakeLists.txt.diff \
patch-src-condor_scripts-macosx_rewrite_libs.diff \
patch-src-condor_utils-CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +114,7 @@ post-patch {
</span> }
# FIXME: Globus support is disabled because Globus is not available in MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DWITH_GLOBUS:BOOL="0" -DWITH_VOMS:BOOL="0" -DWITH_GSOAP:BOOL="0" -DBUILD_TESTING:BOOL="0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DWITH_GLOBUS:BOOL="0" -DWITH_VOMS:BOOL="0" -DBUILD_TESTING:BOOL="0"
</span>
# Man pages are not part of the default build target.
post-build {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/condor_config b/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;color:#808080;'>index 91c4e91..ec997d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/condor_config
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1062,8 +1062,8 @@ DAEMON_LIST = MASTER, SCHEDD, STARTD, NEGOTIATOR, COLLECTOR
</span> #DC_DAEMON_LIST = \
#MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD, \
#VIEW_SERVER, CONDOR_VIEW, VIEW_COLLECTOR, HAWKEYE, CREDD, HAD, \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#DEFRAG, GANGLIAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#DEFRAG, GANGLIAD, ANNEXD
</span>
## Where are the binaries for these daemons?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1082,6 +1082,7 @@ SHARED_PORT = $(LIBEXEC)/condor_shared_port
</span> TRANSFERER = $(LIBEXEC)/condor_transferer
DEFRAG = $(LIBEXEC)/condor_defrag
GANGLIAD = $(LIBEXEC)/condor_gangliad
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ANNEXD = $(SBIN)/condor_annexd
</span>
## When the master starts up, it can place it's address (IP and port)
## into a file. This way, tools running on the local machine don't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1454,39 +1455,6 @@ benchmarks_kflops_job_load = 1.0
</span> ## nodes, just increase this parameter.
#DISCONNECTED_KEYBOARD_IDLE_BOOST = 1200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-######
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## Settings for computing optional resource availability statistics:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-######
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## If STARTD_COMPUTE_AVAIL_STATS = True, the startd will compute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## statistics about resource availability to be included in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## classad(s) sent to the collector describing the resource(s) the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## startd manages. The following attributes will always be included
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## in the resource classad(s) if STARTD_COMPUTE_AVAIL_STATS = True:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## AvailTime = What proportion of the time (between 0.0 and 1.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## has this resource been in a state other than "Owner"?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## LastAvailInterval = What was the duration (in seconds) of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## last period between "Owner" states?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## The following attributes will also be included if the resource is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## not in the "Owner" state:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## AvailSince = At what time did the resource last leave the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## "Owner" state? Measured in the number of seconds since the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## epoch (00:00:00 UTC, Jan 1, 1970).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## AvailTimeEstimate = Based on past history, this is an estimate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## of how long the current period between "Owner" states will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## last.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#STARTD_COMPUTE_AVAIL_STATS = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## If STARTD_COMPUTE_AVAIL_STATS = True, STARTD_AVAIL_CONFIDENCE sets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## the confidence level of the AvailTimeEstimate. By default, the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## estimate is based on the 80th percentile of past values.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#STARTD_AVAIL_CONFIDENCE = 0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## STARTD_MAX_AVAIL_PERIOD_SAMPLES limits the number of samples of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## past available intervals stored by the startd to limit memory and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## disk consumption. Each sample requires 4 bytes of memory and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## approximately 10 bytes of disk space.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#STARTD_MAX_AVAIL_PERIOD_SAMPLES = 100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ## CKPT_PROBE is the location of a program which computes aspects of the
## CheckpointPlatform classad attribute. By default the location of this
## executable will be here: $(LIBEXEC)/condor_ckpt_probe
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1510,7 +1478,6 @@ SCHEDD_ADDRESS_FILE = $(SPOOL)/.schedd_address
</span> ## as well as sending it to the collector. This way, tools that need
## information about a daemon do not have to contact the central manager
## to get information about a daemon on the same machine.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## This feature is necessary for Quill to work.
</span> SCHEDD_DAEMON_AD_FILE = $(SPOOL)/.schedd_classad
## How often should the schedd send an update to the central manager?
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/htcondor/files/patch-external-bundles-openssl-1.0.1e-CMakeLists.txt.diff b/science/htcondor/files/patch-external-bundles-openssl-1.0.1e-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8cdbae7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/htcondor/files/patch-external-bundles-openssl-1.0.1e-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- externals/bundles/openssl/1.0.1e/CMakeLists.txt.orig 2019-02-12 11:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ externals/bundles/openssl/1.0.1e/CMakeLists.txt 2019-02-12 11:07:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WITH_OPENSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_multiple( "ssl;crypto" OPENSSL_FOUND )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( NOT OPENSSL_FOUND AND NOT PROPER )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( WINDOWS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ condor_pre_external( OPENSSL openssl-1.0.1e "lib;include" "include/openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,6 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (OPENSSL_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message (STATUS "external configured (OPENSSL_FOUND=${OPENSSL_FOUND})")
</span></pre><pre style='margin:0'>
</pre>