Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.178 2013/06/07 07:17:15 obache Exp $
+# $NetBSD: Makefile,v 1.185.2.1 2014/04/08 10:09:26 tron Exp $

-DISTNAME=	openssl-1.0.1e
+DISTNAME=	openssl-1.0.1g
 MASTER_SITES=	http://ftp.openssl.org/source/
-PKGREVISION=	1
 SVR4_PKGNAME=	ossl
 CATEGORIES=	security

@@ -16,7 +15,9 @@ CRYPTO=		yes

 PKG_INSTALLATION_TYPES=	overwrite pkgviews

-BUILD_DEPENDS+=	p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
+BUILD_DEPENDS+=	{p5-Perl4-CoreLibs-[0-9]*,perl<5.16}:../../devel/p5-Perl4-CoreLibs
+
+USE_GCC_RUNTIME=	yes

 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
@@ -62,7 +63,7 @@ CONFIGURE_ARGS+=	irix64-mips4-cc
 .    endif
 .  endif
 .elif ${OPSYS} == "OSF1"
-PLIST_OPSYS=		PLIST.osf1
+USE_PLIST_SHLIB=	no
 CONFIGURE_SCRIPT=	./Configure
 .  if !empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	tru64-alpha-gcc
@@ -112,7 +113,11 @@ CONFIGURE_ARGS+=	hpux-parisc-${CC}
 CONFIGURE_ARGS+=	hpux-ia64-${CC}
 .    endif
 .  endif
-
+.elif ${OPSYS} == "Linux"
+.  if ${MACHINE_ARCH} == "powerpc64"
+CONFIGURE_SCRIPT=	./Configure
+CONFIGURE_ARGS+=	linux-ppc64
+.  endif
 .endif

 .include "../../security/openssl/options.mk"
@@ -120,14 +125,11 @@ CONFIGURE_ARGS+=	hpux-ia64-${CC}
 CONFIGURE_ARGS+=	${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=		PERL=${PERL5:Q}

-PLIST_OPSYS?=		${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
-.if exists(${PLIST_OPSYS})
-PLIST_SHLIB=		${PLIST_OPSYS}
-.else
-PLIST_SHLIB=		${PKGDIR}/PLIST.shlib
-.endif
-PLIST_SRC=		${PLIST_SHLIB}
 PLIST_SRC+=		${PKGDIR}/PLIST.common
+USE_PLIST_SHLIB?=	yes
+.if ${USE_PLIST_SHLIB} == "yes"
+PLIST_SRC+=		${PKGDIR}/PLIST.shlib
+.endif
 PLIST_SUBST+=		SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
 PLIST_SUBST+=		SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}

--- a/security/openssl/PLIST.OSF1
+++ b/security/openssl/PLIST.OSF1
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.OSF1,v 1.1 2013/10/03 11:15:48 joerg Exp $
+lib/libcrypto.so
+lib/libssl.so
--- a/security/openssl/PLIST.osf1
+++ b/security/openssl/PLIST.osf1
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.osf1,v 1.1 2007/08/04 14:29:43 tnn Exp $
-lib/libcrypto.so
-lib/libssl.so
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.47 2013/04/03 11:56:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2014/02/12 23:23:17 tron Exp $

 BUILDLINK_TREE+=	openssl

@@ -7,7 +7,7 @@ OPENSSL_BUILDLINK3_MK:=

 .  include "../../mk/bsd.fast.prefs.mk"

-BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.6m
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.1c
 BUILDLINK_ABI_DEPENDS.openssl+=	openssl>=1.0.1c
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl

--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,15 +1,11 @@
-# $NetBSD: builtin.mk,v 1.33 2013/06/13 07:51:26 adam Exp $
+# $NetBSD: builtin.mk,v 1.38 2014/03/03 06:56:35 obache Exp $

 BUILTIN_PKG:=	openssl

-BUILTIN_FIND_LIBS:=		des
-BUILTIN_FIND_FILES_VAR:=	H_OPENSSLCONF H_OPENSSLV
-BUILTIN_FIND_FILES.H_OPENSSLCONF= /usr/include/openssl/opensslconf.h \
-				/usr/sfw/include/openssl/opensslconf.h \
-				/boot/common/include/openssl/opensslconf.h
-BUILTIN_FIND_FILES.H_OPENSSLV=	/usr/include/openssl/opensslv.h \
-				/usr/sfw/include/openssl/opensslv.h \
-				/boot/common/include/openssl/opensslv.h
+BUILTIN_FIND_LIBS:=		crypto des ssl
+BUILTIN_FIND_HEADERS_VAR:=	H_OPENSSLCONF H_OPENSSLV
+BUILTIN_FIND_HEADERS.H_OPENSSLCONF=	openssl/opensslconf.h
+BUILTIN_FIND_HEADERS.H_OPENSSLV=	openssl/opensslv.h 

 .include "../../mk/buildlink3/bsd.builtin.mk"

@@ -34,7 +30,7 @@ MAKEVARS+=	IS_BUILTIN.openssl
    empty(H_OPENSSLV:M__nonexistent__)
 BUILTIN_VERSION.openssl!=						\
 	${AWK} 'BEGIN { hex="0123456789abcdef";				\
-			split("abcdefghijklmnopqrstuvwxyz", alpha, "");	\
+			alpha="abcdefghijklmnopqrstuvwxyz";	\
 		}							\
 		/\#define[ 	]*OPENSSL_VERSION_NUMBER/ {		\
 			major = index(hex, substr($$3, 3, 1)) - 1;	\
@@ -51,7 +47,7 @@ BUILTIN_VERSION.openssl!=						\
 			} else if (i > 26) {				\
 				patchlevel = "a";			\
 			} else {					\
-				patchlevel = alpha[i];			\
+				patchlevel = substr(alpha,i,1);			\
 			}						\
 			printf "%s%s%s%s\n",				\
 				major, minor, teeny, patchlevel;	\
@@ -130,6 +126,11 @@ USE_BUILTIN.openssl=	${IS_BUILTIN.openssl}
 .    if defined(BUILTIN_PKG.openssl) && \
        !empty(IS_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl=	yes
+### take care builtin check case, BUILDLINK_API_DEPENDS may not be defined yet.
+CHECK_BUILTIN.openssl?=	no
+.      if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS])
+BUILDLINK_API_DEPENDS.openssl?=	openssl>=1.0.1c
+.      endif
 .      for dep_ in ${BUILDLINK_API_DEPENDS.openssl}
 .        if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl!=							\
@@ -248,7 +249,7 @@ SSLDIR=	${PKG_SYSCONFDIR.openssl}
 .    if ${OPSYS} == "NetBSD"
 SSLDIR=	/etc/openssl
 .    elif ${OPSYS} == "Haiku"
-SSLDIR=	/boot/common/ssl
+SSLDIR=	/boot/common/data/ssl
 .    else
 SSLDIR=	/etc/ssl 		# most likely place
 .    endif
@@ -278,11 +279,16 @@ openssl-fake-pc:
 	if ${TEST} -f $${src}; then \
 		${LN} -sf $${src} $${dst}; \
 	else \
-		{ ${ECHO} "Name: OpenSSL-libcrypto"; \
-		${ECHO} "Description: OpenSSL cryptography library"; \
-		${ECHO} "Version: ${BUILTIN_VERSION.openssl}"; \
-		${ECHO} "Libs: -L${BUILDLINK_PREFIX.openssl}/lib${LIBABISUFFIX} -lcrypto"; \
-		${ECHO} "Cflags: -I${BUILDLINK_PREFIX.openssl}/include"; \
+		{ ${ECHO} 'prefix=${BUILDLINK_PREFIX.openssl}'; \
+		${ECHO} 'exec_prefix=$${prefix}'; \
+		${ECHO} 'libdir=$${exec_prefix}/lib${LIBABISUFFIX}'; \
+		${ECHO} 'includedir=$${prefix}/include'; \
+		${ECHO}; \
+		${ECHO} 'Name: OpenSSL-libcrypto'; \
+		${ECHO} 'Description: OpenSSL cryptography library'; \
+		${ECHO} 'Version: ${BUILTIN_VERSION.openssl}'; \
+		${ECHO} 'Libs: -L$${libdir} -lcrypto'; \
+		${ECHO} 'Cflags: -I$${includedir}'; \
 		} >$${dst}; \
 	fi
 	${RUN} \
@@ -292,11 +298,16 @@ openssl-fake-pc:
 	if ${TEST} -f $${src}; then \
 		${LN} -sf $${src} $${dst}; \
 	else \
-		{ ${ECHO} "Name: OpenSSL"; \
-		${ECHO} "Description: Secure Sockets Layer and cryptography libraries"; \
-		${ECHO} "Version: ${BUILTIN_VERSION.openssl}"; \
-		${ECHO} "Libs: -L${BUILDLINK_PREFIX.openssl}/lib${LIBABISUFFIX} -lssl -lcrypto"; \
-		${ECHO} "Cflags: -I${BUILDLINK_PREFIX.openssl}/include"; \
+		{ ${ECHO} 'prefix=${BUILDLINK_PREFIX.openssl}'; \
+		${ECHO} 'exec_prefix=$${prefix}'; \
+		${ECHO} 'libdir=$${exec_prefix}/lib${LIBABISUFFIX}'; \
+		${ECHO} 'includedir=$${prefix}/include'; \
+		${ECHO}; \
+		${ECHO} 'Name: OpenSSL'; \
+		${ECHO} 'Description: Secure Sockets Layer and cryptography libraries'; \
+		${ECHO} 'Version: ${BUILTIN_VERSION.openssl}'; \
+		${ECHO} 'Libs: -L$${libdir} -lssl -lcrypto'; \
+		${ECHO} 'Cflags: -I$${includedir}'; \
 		} >$${dst}; \
 	fi
 	${RUN} \
@@ -306,11 +317,16 @@ openssl-fake-pc:
 	if ${TEST} -f $${src}; then \
 		${LN} -sf $${src} $${dst}; \
 	else \
-		{ ${ECHO} "Name: OpenSSL"; \
-		${ECHO} "Description: Secure Sockets Layer and cryptography libraries and tools"; \
-		${ECHO} "Version: ${BUILTIN_VERSION.openssl}"; \
-		${ECHO} "Libs: -L${BUILDLINK_PREFIX.openssl}/lib${LIBABISUFFIX} -lssl -lcrypto"; \
-		${ECHO} "Cflags: -I${BUILDLINK_PREFIX.openssl}/include"; \
+		{ ${ECHO} 'prefix=${BUILDLINK_PREFIX.openssl}'; \
+		${ECHO} 'exec_prefix=$${prefix}'; \
+		${ECHO} 'libdir=$${exec_prefix}/lib${LIBABISUFFIX}'; \
+		${ECHO} 'includedir=$${prefix}/include'; \
+		${ECHO}; \
+		${ECHO} 'Name: OpenSSL'; \
+		${ECHO} 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+		${ECHO} 'Version: ${BUILTIN_VERSION.openssl}'; \
+		${ECHO} 'Libs: -L$${libdir} -lssl -lcrypto'; \
+		${ECHO} 'Cflags: -I$${includedir}'; \
 		} >$${dst}; \
 	fi
 .    endif
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,33 +1,33 @@
-$NetBSD: distinfo,v 1.97 2013/06/13 07:51:26 adam Exp $
+$NetBSD: distinfo,v 1.102.2.2 2014/04/09 09:58:03 tron Exp $

-SHA1 (openssl-1.0.1e.tar.gz) = 3f1b1223c9e8189bfe4e186d86449775bd903460
-RMD160 (openssl-1.0.1e.tar.gz) = 380827c16f18bed4f2eb3d54a387c7c089b2b299
-Size (openssl-1.0.1e.tar.gz) = 4459777 bytes
-SHA1 (patch-aa) = c4b27857698c108fe495fe65ea8857b77e89a655
-SHA1 (patch-ac) = 78148ee9601f67f377a3f8d841bdcf85bd7cfdfe
-SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
-SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
-SHA1 (patch-af) = 376f474f3809365a20a53cfe1c91eca4bc02a5cd
-SHA1 (patch-ag) = b407200455878a8a151fc9b4f771fe17552d04fc
-SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0
+SHA1 (openssl-1.0.1g.tar.gz) = b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c
+RMD160 (openssl-1.0.1g.tar.gz) = cd2eb879646a2b91b2f67dfaf99eb9668ba5d7ea
+Size (openssl-1.0.1g.tar.gz) = 4509047 bytes
+SHA1 (patch-Configure) = ecdafa378e73bd2d6789c985ea28ef4ab2126aa6
+SHA1 (patch-Makefile.org) = 8780f8829b8a010d4283f00740c264a4dc15c7c6
+SHA1 (patch-Makefile.shared) = 1b47a1d3d95391217b15663d3558545780263fbb
+SHA1 (patch-apps_Makefile) = e575ccead86bb39205260b03c00a88fa4d21a906
+SHA1 (patch-config) = 3d33888b6ed4b9e3f6dfc2d3b6bb304e48d1360a
+SHA1 (patch-crypto_bn_bn__prime.pl) = 049250b9bd42e6f155145703135dab39a7ec17e0
+SHA1 (patch-crypto_dso_dso__dlfcn.c) = d5d6ca9a517151357efecb6aa9a5f528a5014290
 SHA1 (patch-doc_apps_cms.pod) = 24792a0db2d8566e0f8b52833de300f538f6a92e
 SHA1 (patch-doc_apps_smine.pod) = 277aee087892f867402ea73bae10383fe24d6e08
-SHA1 (patch-doc_crypto_X509__STORE__CTX__get__error.pod) = 39ceb8d8d88f47794c257286c958daa5c408dfd2
 SHA1 (patch-doc_ssl_SSL__COMP__add__compression__method.pod) = f3fcbe0eae26ac8e24fe937e529ea0dba6ea1639
 SHA1 (patch-doc_ssl_SSL__CTX__add__session.pod) = db72b7e04bb74595a78bc09379854957dcfaa4c7
 SHA1 (patch-doc_ssl_SSL__CTX__load__verify__locations.pod) = d0fd17e118a1bd19c729a0930a52925b9bb81d6d
-SHA1 (patch-doc_ssl_SSL__CTX__set__client__CA__list.pod) = 964ea426276741f89a9d02dd75baaaabc97e0943
+SHA1 (patch-doc_ssl_SSL__CTX__set__client__CA__list.pod) = df3ab7287667f32454357a3a2eaca8275f01ce08
 SHA1 (patch-doc_ssl_SSL__CTX__set__session__id__context.pod) = b5d711fcf9512c82ec2c7aa61303377006ebfca7
 SHA1 (patch-doc_ssl_SSL__CTX__set__ssl__version.pod) = 79340b3f4cfa4293362a79c336e0768711153930
-SHA1 (patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod) = e39c7f0ac0edaadf0462f78947fa40b11084cced
-SHA1 (patch-doc_ssl_SSL__accept.pod) = c5ca9e0333de10d2032d03cf3ce0d9e41b6b495f
+SHA1 (patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod) = eb4d8ccfa47ecc3f50dbda5b0ffd98ea740f4ebf
+SHA1 (patch-doc_ssl_SSL__accept.pod) = c68aa6eb518d5ca72ae5bd142fd3895e378ca638
 SHA1 (patch-doc_ssl_SSL__clear.pod) = c7d2eb126137ee642294466f0ea9019fcd5e9b92
-SHA1 (patch-doc_ssl_SSL__connect.pod) = 78a21f325f5749f0ed491ee71467a4a89848dfe3
-SHA1 (patch-doc_ssl_SSL__do__handshake.pod) = 7b8c392568ef965c1709fc3fefe572f591007b24
+SHA1 (patch-doc_ssl_SSL__connect.pod) = 07327bdb408493c6696efb71070b1b0f7294982c
+SHA1 (patch-doc_ssl_SSL__do__handshake.pod) = f62a43b7b9e59b321cd8dd00d6ea448e3c11d77f
 SHA1 (patch-doc_ssl_SSL__read.pod) = 2a6db16242aceeee645f5b48a9725c5530fbbb8c
 SHA1 (patch-doc_ssl_SSL__session__reused.pod) = 0ed7425cf8b098c97ab223cd368c4b18f5187ae5
 SHA1 (patch-doc_ssl_SSL__set__fd.pod) = 68e3f6f3ff0fdfb2113cebb8f08e6d42c442fa2f
 SHA1 (patch-doc_ssl_SSL__set__session.pod) = e4d8442f4fc827520ca20f108050fcd6314dd41d
-SHA1 (patch-doc_ssl_SSL__shutdown.pod) = ca5b1fd9fda9405907697e848614f050978cfb90
+SHA1 (patch-doc_ssl_SSL__shutdown.pod) = 21682f3385a66ba8f0ebd11bb9bb3c6198352783
 SHA1 (patch-doc_ssl_SSL__write.pod) = 67efd6d0de0a0db34c18c62e4a939c0ea49442ca
 SHA1 (patch-engines_ccgost_Makefile) = 08999f0f40969883482ad9ffc1aa9959ed7d402c
+SHA1 (patch-tools_Makefile) = d67f3ea397674adbe3360e4df9c2e417dbcab56a
--- a/security/openssl/patches/patch-Configure
+++ b/security/openssl/patches/patch-Configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.41 2013/06/13 07:51:26 adam Exp $
+$NetBSD: patch-Configure,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $

 * Avoid -fast on Solaris, creates non-portable packages which depend on
  host-specific CPU features.
-* Allow absolute paths in CFLAGS, e.g. -isysroot /path
+* Add GNU/kFreeBSD support.

--- Configure.orig	2012-03-14 22:20:40.000000000 +0000
+--- Configure.orig	2013-02-11 15:26:04.000000000 +0000
 +++ Configure
@@ -225,8 +225,8 @@ my %table=(
 "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
@@ -25,33 +25,36 @@ $NetBSD: patch-ac,v 1.41 2013/06/13 07:51:26 adam 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",
 
 ####
-@@ -423,6 +424,25 @@ my %table=(
+@@ -422,6 +423,28 @@ my %table=(
+ "BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -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",	"gcc:-DL_ENDIAN -DTERMIOS -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)",
- 
-+"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::(unknown):ULTRASPARC::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::(unknown):ULTRASPARC::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-elf", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"DragonFly-i386",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"DragonFly-x86_64",    "gcc:-DL_ENDIAN -DTERMIOS -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)",
+"GNU/kFreeBSD-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"GNU/kFreeBSD-i386", "gcc:-DL_ENDIAN -DTERMIOS -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
+ 
 "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
-@@ -865,13 +885,13 @@ PROCESS_ARGS:
+@@ -865,13 +888,13 @@ PROCESS_ARGS:
 			# The check for the option is there so scripts aren't
 			# broken
 			}
@@ -67,7 +70,7 @@ $NetBSD: patch-ac,v 1.41 2013/06/13 07:51:26 adam Exp $
 				{
 				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
 				$flags.=$_." ";
-@@ -1674,7 +1694,7 @@ while (<IN>)
+@@ -1674,7 +1697,7 @@ while (<IN>)
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
 		{
 		my $sotmp = $1;
--- a/security/openssl/patches/patch-Makefile.org
+++ b/security/openssl/patches/patch-Makefile.org
@@ -1,6 +1,8 @@
-$NetBSD: patch-af,v 1.25 2013/02/06 21:40:34 jperkin Exp $
+$NetBSD: patch-Makefile.org,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $

--- Makefile.org.orig	2012-04-22 13:25:19.000000000 +0000
+Adjust build procedure.
+
+--- Makefile.org.orig	2013-02-11 15:26:04.000000000 +0000
 +++ Makefile.org
@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
 
@@ -36,7 +38,13 @@ $NetBSD: patch-af,v 1.25 2013/02/06 21:40:34 jperkin Exp $
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -648,35 +650,53 @@ install_docs:
+@@ -642,41 +644,56 @@ install_docs:
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+-	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
+-		filecase=-i; \
+-	fi; \
 	set -e; for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
--- a/security/openssl/patches/patch-Makefile.shared
+++ b/security/openssl/patches/patch-Makefile.shared
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.12 2013/02/06 21:40:34 jperkin Exp $
+$NetBSD: patch-Makefile.shared,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+
+Adjust build procedure.

 --- Makefile.shared.orig	2010-08-21 11:37:17.000000000 +0000
 +++ Makefile.shared
--- a/security/openssl/patches/patch-apps_Makefile
+++ b/security/openssl/patches/patch-apps_Makefile
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.16 2008/01/17 06:42:48 tnn Exp $
+$NetBSD: patch-apps_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+
+Adjust build procedure.

 --- apps/Makefile.orig	2007-02-23 02:01:03.000000000 +0100
 +++ apps/Makefile	2007-07-31 17:18:49.000000000 +0200
--- a/security/openssl/patches/patch-config
+++ b/security/openssl/patches/patch-config
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
+$NetBSD: patch-config,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $

--- config.orig	2011-07-15 19:59:31.000000000 +0000
+Adjust config procedure.
+
+--- config.orig	Mon Feb 11 15:25:39 2013
 +++ config
@@ -49,6 +49,7 @@ done
 # First get uname entries that we use below
@@ -10,7 +12,7 @@ $NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
 [ "$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"
-@@ -154,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
 	echo "mips4-sgi-irix64"; exit 0
 	;;
 
@@ -21,7 +23,18 @@ $NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
     Linux:[2-9].*)
 	echo "${MACHINE}-whatever-linux2"; exit 0
 	;;
-@@ -210,12 +215,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+ 	echo "${MACHINE}-whatever-linux1"; exit 0
+ 	;;
+ 
+    GNU/kFreeBSD:*)
+	echo "${MACHINE}-whatever-gnukfreebsd"; exit 0
+	;;
+
+     GNU*)
+ 	echo "hurd-x86"; exit 0;
+ 	;;
+@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
 	echo "${MACHINE}-whatever-freebsd"; exit 0
 	;;
 
@@ -36,8 +49,12 @@ $NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
 +	echo "${MACHINE_ARCH}-whatever-netbsd"; exit 0
 	;;
 
-     OpenBSD:*)
-@@ -661,13 +666,18 @@ case "$GUESSOS" in
+-    OpenBSD:*)
+    OpenBSD:*|MirBSD:*)
+ 	echo "${MACHINE}-whatever-openbsd"; exit 0
+ 	;;
+ 
+@@ -728,6 +737,11 @@ case "$GUESSOS" in
 	;;
   *-*-sunos4)		OUT="sunos-$CC" ;;
 
@@ -49,21 +66,21 @@ $NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
   *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
   alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
   powerpc64-*-*bsd*)	OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
+@@ -734,6 +748,8 @@ case "$GUESSOS" in
   sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
   ia64-*-*bsd*)		OUT="BSD-ia64" ;;
-  amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
-  *86*-*-*bsd*)		# mimic ld behaviour when it's looking for libc...
-+  amd64-*-*bsd*|x86_64-*-dragonfly*)	OUT="BSD-x86_64" ;;
-+  *86*-*-*bsd*|*-dragonfly*) # mimic ld behaviour when it's looking for libc...
+   amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
+  i386-*-dragonfly*|x86_64-*-dragonfly*)	OUT="DragonFly-${MACHINE_ARCH}";;
+  i386-*-gnukfreebsd*|x86_64-*-gnukfreebsd*)	OUT="GNU/kFreeBSD-${MACHINE}";;
+   *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
- 			else					# OpenBSD
-@@ -680,6 +690,8 @@ case "$GUESSOS" in
+@@ -746,6 +762,8 @@ case "$GUESSOS" in
+ 			*)	OUT="BSD-x86"; options="$options no-sse2" ;;
 			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)
--- a/security/openssl/patches/patch-crypto_bn_bn__prime.pl
+++ b/security/openssl/patches/patch-crypto_bn_bn__prime.pl
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.6 2008/01/17 06:42:49 tnn Exp $
+$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $

 --- crypto/bn/bn_prime.pl.orig	2003-09-25 15:57:58.000000000 +0200
 +++ crypto/bn/bn_prime.pl	2007-07-31 17:53:39.000000000 +0200
--- a/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c
+++ b/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-crypto_dso_dso__dlfcn.c,v 1.1 2013/07/26 11:27:02 ryoon Exp $
+
+* Debian GNU/kFreeBSD needs _GNU_SOURCE.
+
+--- crypto/dso/dso_dlfcn.c.orig	2013-02-11 15:26:04.000000000 +0000
+++ crypto/dso/dso_dlfcn.c
+@@ -60,7 +60,7 @@
+    that handle _GNU_SOURCE and other similar macros.  Defining it later
+    is simply too late, because those headers are protected from re-
+    inclusion.  */
+-#ifdef __linux
+#if defined(__linux) || defined(__FreeBSD_kernel__)
+ # ifndef _GNU_SOURCE
+ #  define _GNU_SOURCE	/* make sure dladdr is declared */
+ # endif
--- a/security/openssl/patches/patch-doc_crypto_X509STORECTXgeterror.pod
+++ b/security/openssl/patches/patch-doc_crypto_X509STORECTXgeterror.pod
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_crypto_X509__STORE__CTX__get__error.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
-
-Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.
-
--- doc/crypto/X509_STORE_CTX_get_error.pod.orig	2013-02-11 15:26:04.000000000 +0000
-+++ doc/crypto/X509_STORE_CTX_get_error.pod
-@@ -278,6 +278,8 @@ happen if extended CRL checking is enabl
- an application specific error. This will never be returned unless explicitly
- set by an application.
- 
-+=back
-+
- =head1 NOTES
- 
- The above functions should be used instead of directly referencing the fields
--- a/security/openssl/patches/patch-doc_ssl_SSLCTXsetclientCA__list.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSLCTXsetclientCA__list.pod
@@ -1,20 +1,22 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__set__client__CA__list.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__CTX__set__client__CA__list.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_CTX_set_client_CA_list.pod.orig	2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_CTX_set_client_CA_list.pod
-@@ -66,11 +66,11 @@ values:
+--- doc/ssl/SSL_CTX_set_client_CA_list.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_CTX_set_client_CA_list.pod	2014-01-10 13:19:11.000000000 +0000
+@@ -66,13 +66,13 @@
 
 =over 4
 
-=item 1
-+=item Z<>1
- 
- The operation succeeded.
- 
 -=item 0
 +=item Z<>0
 
 A failure while manipulating the STACK_OF(X509_NAME) object occurred or
 the X509_NAME could not be extracted from B<cacert>. Check the error stack
+ to find out the reason.
+ 
+-=item 1
+=item Z<>1
+ 
+ The operation succeeded.
+ 
--- a/security/openssl/patches/patch-doc_ssl_SSLCTXusepskidentity__hint.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSLCTXusepskidentity__hint.pod
@@ -1,19 +1,10 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_CTX_use_psk_identity_hint.pod.orig	2013-02-11 15:26:04.000000000 +0000
-+++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod
-@@ -81,6 +81,8 @@ SSL_CTX_use_psk_identity_hint() and SSL_
- 
- Return values from the server callback are interpreted as follows:
- 
-+=over 1
-+
- =item > 0
- 
- PSK identity was found and the server callback has provided the PSK
-@@ -94,9 +96,11 @@ data to B<psk> and return the length of
+--- doc/ssl/SSL_CTX_use_psk_identity_hint.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2014-01-10 13:23:46.000000000 +0000
+@@ -96,7 +96,7 @@
 connection will fail with decryption_error before it will be finished
 completely.
 
@@ -22,7 +13,3 @@ Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.
 
 PSK identity was not found. An "unknown_psk_identity" alert message
 will be sent and the connection setup fails.
- 
-+=back
-+
- =cut
--- a/security/openssl/patches/patch-doc_ssl_SSL__accept.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSL__accept.pod
@@ -1,21 +1,22 @@
-$NetBSD: patch-doc_ssl_SSL__accept.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__accept.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_accept.pod.orig	2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_accept.pod
-@@ -44,12 +44,12 @@ The following return values can occur:
+--- doc/ssl/SSL_accept.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_accept.pod	2014-01-10 13:25:21.000000000 +0000
+@@ -44,13 +44,13 @@
 
 =over 4
 
-=item 1
-+=item Z<>1
- 
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
- 
 -=item 0
 +=item Z<>0
 
 The TLS/SSL handshake was not successful but was shut down controlled and
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
+=item Z<>1
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
--- a/security/openssl/patches/patch-doc_ssl_SSL__connect.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSL__connect.pod
@@ -1,19 +1,13 @@
-$NetBSD: patch-doc_ssl_SSL__connect.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__connect.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_connect.pod.orig	2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_connect.pod
-@@ -41,18 +41,18 @@ The following return values can occur:
+--- doc/ssl/SSL_connect.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_connect.pod	2014-01-10 13:30:56.000000000 +0000
+@@ -41,13 +41,13 @@
 
 =over 4
 
-=item 1
-+=item Z<>1
- 
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
- 
 -=item 0
 +=item Z<>0
 
@@ -21,8 +15,8 @@ Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
 return value B<ret> to find out the reason.
 
-=item E<lt>0
-+=item Z<>E<lt>0
+-=item 1
+=item Z<>1
 
- The TLS/SSL handshake was not successful, because a fatal error occurred either
- at the protocol level or a connection failure occurred. The shutdown was
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
--- a/security/openssl/patches/patch-doc_ssl_SSLdohandshake.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSLdohandshake.pod
@@ -1,21 +1,22 @@
-$NetBSD: patch-doc_ssl_SSL__do__handshake.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__do__handshake.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_do_handshake.pod.orig	2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_do_handshake.pod
-@@ -45,12 +45,12 @@ The following return values can occur:
+--- doc/ssl/SSL_do_handshake.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_do_handshake.pod	2014-01-10 13:32:08.000000000 +0000
+@@ -45,13 +45,13 @@
 
 =over 4
 
-=item 1
-+=item Z<>1
- 
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
- 
 -=item 0
 +=item Z<>0
 
 The TLS/SSL handshake was not successful but was shut down controlled and
 by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
+=item Z<>1
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
--- a/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod
+++ b/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod
@@ -1,21 +1,23 @@
-$NetBSD: patch-doc_ssl_SSL__shutdown.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: patch-doc_ssl_SSL__shutdown.pod,v 1.2 2014/01/10 14:32:42 tron Exp $

 Fix openssl pod docs to work with the very picky pod2man from perl-5.18.0.

--- doc/ssl/SSL_shutdown.pod.orig	2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_shutdown.pod
-@@ -92,12 +92,12 @@ The following return values can occur:
+--- doc/ssl/SSL_shutdown.pod.orig	2014-01-06 13:47:42.000000000 +0000
+++ doc/ssl/SSL_shutdown.pod	2014-01-10 13:32:54.000000000 +0000
+@@ -92,14 +92,14 @@
 
 =over 4
 
-=item 1
-+=item Z<>1
- 
- The shutdown was successfully completed. The "close notify" alert was sent
- and the peer's "close notify" alert was received.
- 
 -=item 0
 +=item Z<>0
 
 The shutdown is not yet finished. Call SSL_shutdown() for a second time,
 if a bidirectional shutdown shall be performed.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+ 
+-=item 1
+=item Z<>1
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
--- a/security/openssl/patches/patch-tools_Makefile
+++ b/security/openssl/patches/patch-tools_Makefile
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.8 2008/01/17 06:42:48 tnn Exp $
+$NetBSD: patch-tools_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+
+Adjust build procedure.

 --- tools/Makefile.orig	2006-02-04 02:49:36.000000000 +0100
 +++ tools/Makefile	2007-07-31 17:20:05.000000000 +0200