<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/431389fbaabc6a08aae95f6c04ea6d099dbaffc0">https://github.com/macports/macports-ports/commit/431389fbaabc6a08aae95f6c04ea6d099dbaffc0</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 431389f cryptlib: Update to 3.4.4
</span>431389f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 431389fbaabc6a08aae95f6c04ea6d099dbaffc0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 28 09:20:52 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> cryptlib: Update to 3.4.4
</span>---
devel/cryptlib/Portfile | 38 +++++++++++++---------
devel/cryptlib/files/patch-makefile.diff | 43 ++++++++++++++-----------
devel/cryptlib/files/patch-tools-ccopts.sh.diff | 11 -------
3 files changed, 46 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/Portfile b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6e9b84..4955b28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,19 +5,18 @@ PortGroup conflicts_build 1.0
</span>
# Quoth the makefile: "[Multiple-architecture building] is rather trouble-prone
# because the low-level crypto code has to configure itself for CPU endianness
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# and word size for the algorithms that require low-level bit fiddling, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and word size 5975092or the algorithms that require low-level bit fiddling, and
</span> # uses different code strategies depending on the CPU architecture and bit
# width. This single-pass build for multiple architectures often causes
# problems, and you're more or less on your own if you decide to try it."
PortGroup muniversal 1.0
name cryptlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.4
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel security crypto
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license {Sleepycat Restrictive}
description cryptlib is a powerful security toolkit (library)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +33,14 @@ long_description cryptlib is a powerful security toolkit that allows even \
</span> homepage https://www.cs.auckland.ac.nz/~pgut001/cryptlib/
master_sites ftp://ftp.franken.de/pub/crypt/cryptlib/ \
http://www.cypherpunks.to/~peter/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3.4.3.1 was stealth-updated 2017-01-30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span> distname cl[join [split $version .] ""]
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e4b48ea2b888a4cc684d425520b49e0578c39263 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a608d725f66669d983083420f9f57f763f320292c50346de3e8c1caeee743bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c51232bba6eac582b16991f6d01518dc8cbf49f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aa461b57c703f987a649a3987feb10d088d440f42b3160ef36104058909fec3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5975092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:zlib
</span>
pre-extract {
# DOS to UNIX line endings.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,30 +48,36 @@ pre-extract {
</span> }
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tools-ccopts.sh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-makefile.diff
</span>
# Build fails when compiler is gcc or llvm-gcc; warnings are printed when compiler is clang.
conflicts_build unixODBC
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target default shared
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc}" \
</span> PREFIX="${prefix}"
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) CFLAGS='${configure.cflags} ${configure.cppflags} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) LDFLAGS='-arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set archflag "-arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CFLAGS=[list {*}${configure.cflags} {*}${configure.cppflags} {*}${archflag}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# LDFLAGS=[list {*}${configure.ldflags} {*}${archflag}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} ${configure.cppflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} -arch ${arch}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal] && [info exists merger_build_env(${build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append $merger_build_env(${build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal] && [info exists merger_build_env(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append $merger_build_env(${configure.build_arch})
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args PREFIX="${prefix}"
</span>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/files/patch-makefile.diff b/devel/cryptlib/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a5071d..f710d6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2016-12-06 21:19:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2017-01-16 20:53:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2018-02-08 12:39:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2018-03-28 08:16:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span> # Further cc flags are gathered dynamically at runtime via the ccopts.sh
# script.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,26 +9,31 @@
</span> CFLAGS_ANALYSE = -c -D__UNIX__ -I.
CFLAGS_COVERAGE = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1 --coverage -fprofile-arcs -ftest-coverage
CFLAGS_DEBUG = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1489,7 +1489,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -450,6 +450,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @if [ ! -d "$(DESTDIR)$(PATH_LIB)" ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$(DESTDIR)$(PATH_LIB)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 755 "$(DESTDIR)$(PATH_LIB)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @if [ ! -d "$(DESTDIR)$(PATH_INCLUDE)" ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p "$(DESTDIR)$(PATH_INCLUDE)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 755 "$(DESTDIR)$(PATH_INCLUDE)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -470,6 +471,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -f "$(DYLIBNAME)" ] ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp "$(DYLIBNAME)" "$(DESTDIR)$(PATH_LIB)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 755 "$(DESTDIR)$(PATH_LIB)/$(DYLIBNAME)" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -s "$(DYLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).$(MAJ).dylib" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -s "$(DYLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).dylib" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp cryptlib.h "$(DESTDIR)$(PATH_INCLUDE)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 644 "$(DESTDIR)$(PATH_INCLUDE)/cryptlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1557,8 +1560,9 @@
</span> $(STRIP) $(MAJ).$(MIN) $(OBJS) $(EXTRAOBJS)
$(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) $(LDFLAGS) -dynamiclib -install_name $(PREFIX)/lib/$(DYLIBNAME) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -compatibility_version $(MAJ).$(MIN) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LD) $(LDFLAGS) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
</span> -current_version $(MAJ).$(MIN).$(PLV) \
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ -install_name $(PATH_LIB)/$(DYLIBNAME) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `./tools/getlibs.sh autodetect` \
</span> -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2854,3 +2855,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ `uname -s` = 'CYGWIN_NT-5.0' ] ; then rm -f *.exe; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ `uname -s` = 'HP-UX' ] ; then rm -f lib$(PROJ).sl; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m 644 $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -s $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib/lib$(PROJ).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(PREFIX)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m 644 cryptlib.h $(DESTDIR)$(PREFIX)/include
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/files/patch-tools-ccopts.sh.diff b/devel/cryptlib/files/patch-tools-ccopts.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 66eeb03..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/files/patch-tools-ccopts.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/ccopts.sh.orig 2016-11-28 21:51:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/ccopts.sh 2017-01-16 20:55:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -385,7 +385,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # worked since at least 2.7.2 although it wasn't actually documented until
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the first 3.x releases).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GCC_VER="$(gcc -dumpversion | tr -d '.' | cut -c 1-2)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GCC_VER="$($CC -dumpversion | tr -d '.' | cut -c 1-2)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Try and determine the CPU type. This is made more complex by a pile of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # *BSE's which, along with antideluvian tools like an as that doesn't
</span></pre><pre style='margin:0'>
</pre>