[153798] trunk/dports/devel/cryptlib

ryandesign at macports.org ryandesign at macports.org
Tue Oct 11 18:47:41 CEST 2016 

Revision: 153798
          https://trac.macports.org/changeset/153798
Author:   ryandesign at macports.org
Date:     2016-10-11 09:47:40 -0700 (Tue, 11 Oct 2016)
Log Message:
-----------
cryptlib: update to 3.4.3

Resolves #45675

Modified Paths:
--------------
    trunk/dports/devel/cryptlib/Portfile
    trunk/dports/devel/cryptlib/files/patch-makefile.diff
    trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff

Added Paths:
-----------
    trunk/dports/devel/cryptlib/files/patch-random-unix.c.diff

Removed Paths:
-------------
    trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff

Modified: trunk/dports/devel/cryptlib/Portfile
===================================================================
--- trunk/dports/devel/cryptlib/Portfile	2016-10-11 16:09:22 UTC (rev 153797)
+++ trunk/dports/devel/cryptlib/Portfile	2016-10-11 16:47:40 UTC (rev 153798)
@@ -13,7 +13,7 @@
 PortGroup           muniversal 1.0
 
 name                cryptlib
-version             3.4.2
+version             3.4.3
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel security crypto
 platforms           darwin
@@ -37,8 +37,8 @@
 distname            cl[join [split $version .] ""]
 use_zip             yes
 
-checksums           rmd160  c16757dbd44a50b211b5168fbc7ecf7c307b88d6 \
-                    sha256  0ee4a7568ddb7de6b155b79844e25bc1a20af9439b0db38bfbd47a984be923a3
+checksums           rmd160  407a473d64cad30931f93b6d52bc3eb77c63e55f \
+                    sha256  08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad
 
 pre-extract {
     # DOS to UNIX line endings.
@@ -46,8 +46,8 @@
 }
 extract.mkdir       yes
 
-patchfiles          patch-crypt-osconfig.h.diff \
-                    patch-makefile.diff \
+patchfiles-append   patch-makefile.diff \
+                    patch-random-unix.c.diff \
                     patch-tools-ccopts.sh.diff
 
 # Build fails when compiler is gcc or llvm-gcc; warnings are printed when compiler is clang.
@@ -73,8 +73,12 @@
 destroot.env        PREFIX="${prefix}"
 
 post-destroot {
-    xinstall -d ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
+    set docdir ${prefix}/share/doc/${subport}
+    xinstall -d ${destroot}${docdir}
+    xinstall -m 644 -W ${worksrcpath} \
+        COPYING \
+        README \
+        ${destroot}${docdir}
 }
 
 livecheck.type      regex

Deleted: trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff	2016-10-11 16:09:22 UTC (rev 153797)
+++ trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff	2016-10-11 16:47:40 UTC (rev 153798)
@@ -1,13 +0,0 @@
---- crypt/osconfig.h.orig	2012-11-06 01:14:56.000000000 -0600
-+++ crypt/osconfig.h	2013-12-13 23:25:21.000000000 -0600
-@@ -310,6 +310,10 @@
- 	#define DES_UNROLL
- 	#define RC4_INDEX
-   #endif /* Mac OS variants */
-+  #if defined( __LP64__ )
-+	#undef SIXTY_FOUR_BIT
-+	#define SIXTY_FOUR_BIT_LONG
-+  #endif
- #endif /* Mac OS X / iOS */
- 
- /* MSDOS */

Modified: trunk/dports/devel/cryptlib/files/patch-makefile.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile.diff	2016-10-11 16:09:22 UTC (rev 153797)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.diff	2016-10-11 16:47:40 UTC (rev 153798)
@@ -1,23 +1,15 @@
---- makefile.orig	2012-12-14 03:31:22.000000000 -0600
-+++ makefile	2013-12-13 23:41:55.000000000 -0600
-@@ -73,7 +73,7 @@
+--- makefile.orig	2016-03-25 04:33:28.000000000 -0500
++++ makefile	2016-10-08 11:15:56.000000000 -0500
+@@ -90,7 +90,7 @@
  # Further cc flags are gathered dynamically at runtime via the ccopts.sh
  # script.
  
 -CFLAGS		= -c -D__UNIX__ -DNDEBUG -I.
 +CFLAGS		+= -c -D__UNIX__ -DNDEBUG -I.
- CFLAGS_DEBUG = -c -D__UNIX__ -I. -g3 -ggdb -O0
- 
- # Paths and command names.  We have to be careful with comments attached to
-@@ -90,7 +90,6 @@
- SHARED_OBJ_DIR = ./shared-obj
- CPP			= $(CC) -E
- LD			= $(CC)
--LDFLAGS		=
- AR			= ar
- STRIP		= strip
- SHELL		= /bin/sh
-@@ -1481,7 +1480,8 @@
+ 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
+@@ -1486,7 +1486,8 @@
  					$(STRIP) $(OBJS) $(EXTRAOBJS)
  
  $(DYLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
@@ -27,16 +19,7 @@
  					-current_version $(MAJ).$(MIN).$(PLV) \
  					-o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
  
-@@ -1875,7 +1875,7 @@
- #			decide to try it.
- 
- Darwin:
--	@make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer" LDFLAGS="-object -s"
-+	@make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer"
- 
- # MinGW: cc is gcc.  Note that we have to use the cross-compile flags
- # XCFLAGS rather than CFLAGS because the latter implies a native Unix
-@@ -2657,3 +2657,12 @@
+@@ -2864,3 +2865,12 @@
  	fi
  	@if [ `uname -s` = 'CYGWIN_NT-5.0' ] ; then rm -f *.exe; fi
  	@if [ `uname -s` = 'HP-UX' ] ; then rm -f lib$(PROJ).sl; fi

Added: trunk/dports/devel/cryptlib/files/patch-random-unix.c.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-random-unix.c.diff	                        (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-random-unix.c.diff	2016-10-11 16:47:40 UTC (rev 153798)
@@ -0,0 +1,11 @@
+--- random/unix.c.orig	2016-02-25 03:52:52.000000000 -0600
++++ random/unix.c	2016-10-11 11:40:52.000000000 -0500
+@@ -593,7 +593,7 @@
+ #include <sys/gmon.h>				/* For CTL_KERN:KERN_PROF identifiers */
+ #if defined( __NetBSD__ )
+   #include <uvm/uvm_param.h>		/* For CTL_VM identifiers */
+-#else
++#elif !defined( __APPLE__ )
+   #include <vm/vm_param.h>			/* For CTL_VM identifiers */
+ #endif /* BSD-variant-specific include paths */
+ 

Modified: trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff	2016-10-11 16:09:22 UTC (rev 153797)
+++ trunk/dports/devel/cryptlib/files/patch-tools-ccopts.sh.diff	2016-10-11 16:47:40 UTC (rev 153798)
@@ -1,6 +1,6 @@
---- tools/ccopts.sh.orig	2010-12-19 00:57:12.000000000 -0600
-+++ tools/ccopts.sh	2011-10-17 21:27:53.000000000 -0500
-@@ -268,7 +268,7 @@
+--- tools/ccopts.sh.orig	2016-03-04 18:54:34.000000000 -0600
++++ tools/ccopts.sh	2016-10-08 11:16:50.000000000 -0500
+@@ -375,7 +375,7 @@
  # worked since at least 2.7.2 although it wasn't actually documented until
  # the first 3.x releases).
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161011/f9df14a1/attachment-0002.html>

More information about the macports-changes mailing list