<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3a1a042818422ea7df0c909fbb79c5d38fe3489f">https://github.com/macports/macports-ports/commit/3a1a042818422ea7df0c909fbb79c5d38fe3489f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a1a042818422ea7df0c909fbb79c5d38fe3489f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri May 29 00:52:25 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> apg: update version 2.2.3->2.3.0b
</span>---
security/apg/Portfile | 34 ++++++++++++++++++++++------------
security/apg/files/patch-Makefile.diff | 33 +++++++++++++++++++++++++++++++++
security/apg/files/patch-apg.c.diff | 11 +++++++++++
3 files changed, 66 insertions(+), 12 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 3a9bd27..69b8b06b 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;'>@@ -5,8 +5,8 @@ PortGroup makefile 1.0
</span> PortGroup deprecated 1.0
name apg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories security
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,25 +21,35 @@ long_description APG generates random passwords. Its pronounceable \
</span>
platforms darwin
homepage https://web.archive.org/web/20130313042424/http://www.adel.nursat.kz/apg/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/download/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this should eventually be macports_distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://src.fedoraproject.org/repo/pkgs/apg/apg-2.3.0b.tar.gz/bd82400a5a731070ce895313576afe24/
</span>
deprecated.upstream_support \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ccc1d8a90fcac90717a9ee16fcc85de53d5ef90d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 69c9facde63958ad0a7630055f34d753901733d55ee759d08845a4eda2ba7dba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 108186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 18f9955d6fdb721bec26613860b312d7fea6fba7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 109995
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod -R ug+w ${worksrcpath}"
</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;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-apg.c.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib lib:crypto:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:cracklib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libcrypto.dylib:openssl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-lcrypto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS="\$CFLAGS \$LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CFLAGS="\$CPPFLAGS \$CFLAGS \$LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CRACKLIB_DICTPATH=\"${prefix}/share/cracklib/pw_dict\"
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -s ${worksrcpath}/apg ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -s ${worksrcpath}/apg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/apgbfm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin
</span> xinstall -m 644 ${worksrcpath}/doc/man/apg.1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/doc/man/apgbfm.1 \
</span> ${destroot}${prefix}/share/man/man1
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath}/doc \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ea51f9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2003-08-07 08:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-05-29 00:27:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STANDALONE_OPTIONS += -DAPG_USE_CRYPT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-APG_CLIBS += -lcrypt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++APG_CLIBS += -lcrypto
</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;'>+ # Support for cracklib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,9 +45,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must uncomment the folowing 4 lines (you must not do this for WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#APG_CLIBS += -lcrack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++APG_CLIBS += -lcrack
</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;'>+ # Support for ANSI X9.17/SHA1 PRNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apgbfm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CC} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip ${PROGNAME}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/apg/files/patch-apg.c.diff b/security/apg/files/patch-apg.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d7e1918
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/apg/files/patch-apg.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- apg.c.orig 2003-08-07 08:40:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ apg.c 2020-05-29 00:42:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,7 +709,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * crypt_passstring (const char *p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char salt[10];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char salt[11];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (crypt(p, salt));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>