Import of pkgsrc-2016Q3

security/openssl/patches/patch-Configure

@@ -1,12 +1,12 @@
-$NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $
+$NetBSD: patch-Configure,v 1.7 2016/01/28 16:30:43 jperkin Exp $
 
 * Avoid -fast on Solaris, creates non-portable packages which depend on
   host-specific CPU features.
 * Add GNU/kFreeBSD support.
 
---- Configure.orig	2015-06-11 14:50:11.000000000 +0100
-+++ Configure	2015-06-12 12:07:54.000000000 +0100
-@@ -358,6 +358,7 @@
+--- Configure.orig	2016-01-28 13:56:08.000000000 +0000
++++ Configure
+@@ -361,6 +361,7 @@ my %table=(
  #
  "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
@@ -14,7 +14,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
  ####
-@@ -481,8 +482,31 @@
+@@ -485,8 +486,31 @@ my %table=(
  "BSD-ia64",	"gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-x86_64",	"cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
@@ -47,7 +47,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $
  "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
  "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
  
-@@ -932,7 +956,7 @@
+@@ -936,7 +960,7 @@ PROCESS_ARGS:
  			# The check for the option is there so scripts aren't
  			# broken
  			}
@@ -56,7 +56,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $
  			{
  			if (/^--prefix=(.*)$/)
  				{
-@@ -1764,7 +1788,7 @@
+@@ -1770,7 +1794,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;

security/openssl/patches/patch-Makefile.org

@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.org,v 1.3 2015/02/12 13:08:53 adam Exp $
+$NetBSD: patch-Makefile.org,v 1.5 2016/01/28 16:30:43 jperkin Exp $
 
 Adjust build procedure.
 
---- Makefile.org.orig	2015-01-22 14:58:06.000000000 +0000
+--- Makefile.org.orig	2016-01-28 13:56:08.000000000 +0000
 +++ Makefile.org
 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
  
@@ -29,16 +29,16 @@ Adjust build procedure.
  SHARED_LDFLAGS=
  
  GENERAL=        Makefile
-@@ -536,7 +538,7 @@ dist:   
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -528,7 +530,7 @@ dist:   
+ 	@$(MAKE) SDIRS='$(SDIRS)' clean
+ 	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
  
 -install: all install_docs install_sw
 +install: install_docs install_sw
  
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -645,41 +647,56 @@ install_docs:
+@@ -637,41 +639,56 @@ install_docs:
  	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  	here="`pwd`"; \
  	filecase=; \

security/openssl/patches/patch-Makefile.shared

@@ -1,8 +1,9 @@
-$NetBSD: patch-Makefile.shared,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-Makefile.shared,v 1.5 2016/01/28 16:30:43 jperkin Exp $
 
 Adjust build procedure.
+Fix SunOS -h linker argument.
 
---- Makefile.shared.orig	Mon Mar 17 16:14:20 2014
+--- Makefile.shared.orig	2016-01-28 13:38:30.000000000 +0000
 +++ Makefile.shared
 @@ -315,6 +315,11 @@ link_o.alpha-osf1:
  	@ if $(DETECT_GNU_LD); then \
@@ -58,6 +59,24 @@ Adjust build procedure.
  		fi; \
  	fi; \
  	$(LINK_SO_A)
+@@ -372,7 +382,7 @@ link_o.solaris:
+ 		SHLIB_SUFFIX=; \
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
++		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
+ 	fi; \
+ 	$(LINK_SO_O)
+ link_a.solaris:
+@@ -386,7 +396,7 @@ link_a.solaris:
+ 		SHLIB_SUFFIX=;\
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
++		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
+ 	fi; \
+ 	$(LINK_SO_A)
+ link_app.solaris:
 @@ -484,7 +494,7 @@ link_a.irix:
  		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
  		ALLSYMSFLAGS="$${MINUSWL}-all"; \

security/openssl/patches/patch-apps_Makefile

@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-apps_Makefile,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
 Adjust build procedure.
 
---- apps/Makefile.orig	Mon Apr  7 16:55:44 2014
+--- apps/Makefile.orig	2016-01-28 13:57:21.000000000 +0000
 +++ apps/Makefile
 @@ -4,6 +4,7 @@
  
@@ -12,7 +12,7 @@ Adjust build procedure.
  CC=		cc
  INCLUDES=	-I$(TOP) -I../include $(KRB5_INCLUDES)
  CFLAG=		-g -static
-@@ -109,13 +110,13 @@ install:
+@@ -112,13 +113,13 @@ install:
  	@set -e; for i in $(SCRIPTS); \
  	do  \
  	(echo installing $$i; \

security/openssl/patches/patch-config

@@ -1,8 +1,8 @@
-$NetBSD: patch-config,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-config,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
 Adjust config procedure.
 
---- config.orig	Mon Mar 17 16:14:20 2014
+--- config.orig	2016-01-28 13:56:08.000000000 +0000
 +++ config
 @@ -49,6 +49,7 @@ done
  # First get uname entries that we use below
@@ -12,7 +12,7 @@ Adjust config procedure.
  [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
  [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
  [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
-@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "mips4-sgi-irix64"; exit 0
  	;;
  
@@ -23,7 +23,7 @@ Adjust config procedure.
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "${MACHINE}-whatever-linux1"; exit 0
  	;;
  
@@ -34,7 +34,7 @@ Adjust config procedure.
      GNU*)
  	echo "hurd-x86"; exit 0;
  	;;
-@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "${MACHINE}-whatever-freebsd"; exit 0
  	;;
  
@@ -54,7 +54,7 @@ Adjust config procedure.
  	echo "${MACHINE}-whatever-openbsd"; exit 0
  	;;
  
-@@ -728,12 +737,19 @@ case "$GUESSOS" in
+@@ -747,12 +756,19 @@ case "$GUESSOS" in
  	;;
    *-*-sunos4)		OUT="sunos-$CC" ;;
  
@@ -74,12 +74,12 @@ Adjust config procedure.
    *86*-*-*bsd*)		# mimic ld behaviour when it's looking for libc...
  			if [ -L /usr/lib/libc.so ]; then	# [Free|Net]BSD
  			    libc=/usr/lib/libc.so
-@@ -746,6 +762,8 @@ case "$GUESSOS" in
- 			*)	OUT="BSD-x86"; options="$options no-sse2" ;;
+@@ -766,6 +782,8 @@ case "$GUESSOS" in
  			esac ;;
    *-*-*bsd*)		OUT="BSD-generic32" ;;
-+
-+  *-*-interix)		OUT="Interix" ;;
  
++  *-*-interix)		OUT="Interix" ;;
++
    *-*-osf)		OUT="osf1-alpha-cc" ;;
    *-*-tru64)		OUT="tru64-alpha-cc" ;;
+   *-*-[Uu]nix[Ww]are7)

security/openssl/patches/patch-crypto_bn_bn__prime.pl

@@ -1,6 +1,6 @@
-$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
---- crypto/bn/bn_prime.pl.orig	Mon Mar 17 16:14:20 2014
+--- crypto/bn/bn_prime.pl.orig	2016-01-28 13:38:30.000000000 +0000
 +++ crypto/bn/bn_prime.pl
 @@ -1,6 +1,8 @@
  #!/usr/local/bin/perl

security/openssl/patches/patch-crypto_des_Makefile

@@ -1,8 +1,8 @@
-$NetBSD: patch-crypto_des_Makefile,v 1.2 2015/02/12 13:08:53 adam Exp $
+$NetBSD: patch-crypto_des_Makefile,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
 Not all m4 macro processors have severe buffer limitations.
 
---- crypto/des/Makefile.orig	2015-01-22 16:12:10.000000000 +0000
+--- crypto/des/Makefile.orig	2016-01-28 13:57:09.000000000 +0000
 +++ crypto/des/Makefile
 @@ -60,7 +60,11 @@ des: des.o cbc3_enc.o lib
  	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)

security/openssl/patches/patch-engines_ccgost_Makefile

@@ -1,8 +1,8 @@
-$NetBSD: patch-engines_ccgost_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-engines_ccgost_Makefile,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
 * Make sure rpath is set properly on the libgost.so engine lib.
 
---- engines/ccgost/Makefile.orig	Mon Apr  7 16:55:42 2014
+--- engines/ccgost/Makefile.orig	2016-01-28 13:57:20.000000000 +0000
 +++ engines/ccgost/Makefile
 @@ -32,7 +32,7 @@ lib: $(LIBOBJ)
  		$(MAKE) -f $(TOP)/Makefile.shared -e \

security/openssl/patches/patch-tools_Makefile

@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-tools_Makefile,v 1.4 2016/01/28 16:30:43 jperkin Exp $
 
 Adjust build procedure.
 
---- tools/Makefile.orig	Mon Mar 17 16:14:20 2014
+--- tools/Makefile.orig	2016-01-28 13:38:31.000000000 +0000
 +++ tools/Makefile
 @@ -4,6 +4,7 @@