<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82a4963ad64c85bdc3af511e62121ef098559a67">https://github.com/macports/macports-ports/commit/82a4963ad64c85bdc3af511e62121ef098559a67</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 82a4963 apg: Do not link with libcrypto
</span>82a4963 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 82a4963ad64c85bdc3af511e62121ef098559a67
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 29 06:12:40 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> apg: Do not link with libcrypto
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't modify the Makefile to link with OpenSSL's libcrypto. apg does not
</span><span style='display:block; white-space:pre;color:#404040;'> use it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> apg does use libcrypt, but on Darwin the functionality of libcrypt is
</span><span style='display:block; white-space:pre;color:#404040;'> in libSystem so no separate -lcrypt flag should be used on Darwin.
</span>---
security/apg/Portfile | 5 ++---
security/apg/files/patch-Makefile.diff | 31 +++++++++++++++++++++++--------
2 files changed, 25 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/apg/Portfile b/security/apg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69b8b06b..e71ff82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/apg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/apg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup deprecated 1.0
</span>
name apg
version 2.3.0b
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories security
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,7 @@ post-extract {
</span> patchfiles patch-Makefile.diff \
patch-apg.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:cracklib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libcrypto.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:cracklib
</span>
build.args-append CFLAGS="\$CPPFLAGS \$CFLAGS \$LDFLAGS"
build.env-append CRACKLIB_DICTPATH=\"${prefix}/share/cracklib/pw_dict\"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/apg/files/patch-Makefile.diff b/security/apg/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ea51f9b..dc40d64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/apg/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/apg/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2003-08-07 08:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2020-05-29 00:27:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This works on MacOS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2003-08-07 10:40:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-05-29 05:52:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OS := $(shell uname -s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,15 +29,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE#1: You should comment the line 'APG_CLIBS += -lcrypt' for QNX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RTP 6.1.0, OpenBSD 2.8 and for WIN32.
</span> #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# NOTE#2: If ld (linker) could not find `crypt' library try to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# replace line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 'APG_CLIBS += -lcrypt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# with line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 'APG_CLIBS += -lcrypto'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# This works on MacOS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span> STANDALONE_OPTIONS += -DAPG_USE_CRYPT
<span style='display:block; white-space:pre;background:#ffe0e0;'>--APG_CLIBS += -lcrypt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+APG_CLIBS += -lcrypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APG_CLIBS += -lcrypt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span>
##################################################################
# Support for cracklib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,9 +45,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,9 +42,9 @@
</span> # must uncomment the folowing 4 lines (you must not do this for WIN32)
#
#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +37,7 @@
</span>
##################################################################
# Support for ANSI X9.17/SHA1 PRNG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +132,7 @@
</span> ${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
apgbfm:
</pre><pre style='margin:0'>
</pre>