summaryrefslogtreecommitdiff
path: root/security/openssl/patches
diff options
context:
space:
mode:
Diffstat (limited to 'security/openssl/patches')
-rw-r--r--security/openssl/patches/patch-Configure9
-rw-r--r--security/openssl/patches/patch-Makefile.org8
-rw-r--r--security/openssl/patches/patch-Makefile.shared4
-rw-r--r--security/openssl/patches/patch-apps_Makefile6
-rw-r--r--security/openssl/patches/patch-config13
-rw-r--r--security/openssl/patches/patch-crypto_bn_bn__prime.pl6
-rw-r--r--security/openssl/patches/patch-crypto_des_Makefile19
-rw-r--r--security/openssl/patches/patch-crypto_dso_dso__dlfcn.c4
-rw-r--r--security/openssl/patches/patch-doc_apps_cms.pod36
-rw-r--r--security/openssl/patches/patch-doc_apps_smine.pod36
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__COMP__add__compression__method.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__load__verify__locations.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod22
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__set__session__id__context.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__set__ssl__version.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__accept.pod22
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__clear.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__connect.pod22
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod22
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__read.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__set__session.pod15
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod23
-rw-r--r--security/openssl/patches/patch-doc_ssl_SSL__write.pod15
-rw-r--r--security/openssl/patches/patch-engines_ccgost_Makefile6
-rw-r--r--security/openssl/patches/patch-tools_Makefile6
29 files changed, 50 insertions, 394 deletions
diff --git a/security/openssl/patches/patch-Configure b/security/openssl/patches/patch-Configure
index fe79fa1a14e..d761beacf71 100644
--- a/security/openssl/patches/patch-Configure
+++ b/security/openssl/patches/patch-Configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-Configure,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Configure,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
* Avoid -fast on Solaris, creates non-portable packages which depend on
host-specific CPU features.
* Add GNU/kFreeBSD support.
---- Configure.orig 2013-02-11 15:26:04.000000000 +0000
+--- Configure.orig Mon Mar 17 16:14:20 2014
+++ 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,7 +25,7 @@ $NetBSD: patch-Configure,v 1.1.2.2 2014/04/08 10:09:26 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",
####
-@@ -422,6 +423,28 @@ my %table=(
+@@ -422,7 +423,29 @@ 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)",
@@ -50,10 +50,11 @@ $NetBSD: patch-Configure,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+"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 +888,13 @@ PROCESS_ARGS:
# The check for the option is there so scripts aren't
# broken
diff --git a/security/openssl/patches/patch-Makefile.org b/security/openssl/patches/patch-Makefile.org
index b6103f9d7b3..c7aebd2f72b 100644
--- a/security/openssl/patches/patch-Makefile.org
+++ b/security/openssl/patches/patch-Makefile.org
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.org,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Makefile.org,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
Adjust build procedure.
---- Makefile.org.orig 2013-02-11 15:26:04.000000000 +0000
+--- Makefile.org.orig Mon Mar 17 16:14:20 2014
+++ Makefile.org
@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
@@ -29,7 +29,7 @@ Adjust build procedure.
SHARED_LDFLAGS=
GENERAL= Makefile
-@@ -537,7 +539,7 @@ dist:
+@@ -538,7 +540,7 @@ dist:
dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
@@ -38,7 +38,7 @@ Adjust build procedure.
install_sw:
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -642,41 +644,56 @@ install_docs:
+@@ -643,41 +645,56 @@ install_docs:
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
here="`pwd`"; \
filecase=; \
diff --git a/security/openssl/patches/patch-Makefile.shared b/security/openssl/patches/patch-Makefile.shared
index 9dc0f809012..6bb4586f4e5 100644
--- a/security/openssl/patches/patch-Makefile.shared
+++ b/security/openssl/patches/patch-Makefile.shared
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.shared,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Makefile.shared,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
Adjust build procedure.
---- Makefile.shared.orig 2010-08-21 11:37:17.000000000 +0000
+--- Makefile.shared.orig Mon Mar 17 16:14:20 2014
+++ Makefile.shared
@@ -315,6 +315,11 @@ link_o.alpha-osf1:
@ if $(DETECT_GNU_LD); then \
diff --git a/security/openssl/patches/patch-apps_Makefile b/security/openssl/patches/patch-apps_Makefile
index 75b66663a64..2a7f487a94e 100644
--- a/security/openssl/patches/patch-apps_Makefile
+++ b/security/openssl/patches/patch-apps_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-apps_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-apps_Makefile,v 1.1.2.3 2014/06/05 13:20:18 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
+--- apps/Makefile.orig Mon Apr 7 16:55:44 2014
++++ apps/Makefile
@@ -4,6 +4,7 @@
DIR= apps
diff --git a/security/openssl/patches/patch-config b/security/openssl/patches/patch-config
index 7596d6d07e2..446f6dab6ea 100644
--- a/security/openssl/patches/patch-config
+++ b/security/openssl/patches/patch-config
@@ -1,8 +1,8 @@
-$NetBSD: patch-config,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-config,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
Adjust config procedure.
---- config.orig Mon Feb 11 15:25:39 2013
+--- config.orig Mon Mar 17 16:14:20 2014
+++ 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}:${
+@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
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}:${
+@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
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}:${
+@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
@@ -54,7 +54,7 @@ Adjust config procedure.
echo "${MACHINE}-whatever-openbsd"; exit 0
;;
-@@ -728,6 +737,11 @@ case "$GUESSOS" in
+@@ -728,12 +737,19 @@ case "$GUESSOS" in
;;
*-*-sunos4) OUT="sunos-$CC" ;;
@@ -66,7 +66,6 @@ Adjust config procedure.
*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" ;;
diff --git a/security/openssl/patches/patch-crypto_bn_bn__prime.pl b/security/openssl/patches/patch-crypto_bn_bn__prime.pl
index 9bd3316f9f3..eedcebbc91c 100644
--- a/security/openssl/patches/patch-crypto_bn_bn__prime.pl
+++ b/security/openssl/patches/patch-crypto_bn_bn__prime.pl
@@ -1,7 +1,7 @@
-$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.1.2.3 2014/06/05 13:20:18 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
+--- crypto/bn/bn_prime.pl.orig Mon Mar 17 16:14:20 2014
++++ crypto/bn/bn_prime.pl
@@ -1,6 +1,8 @@
#!/usr/local/bin/perl
# bn_prime.pl
diff --git a/security/openssl/patches/patch-crypto_des_Makefile b/security/openssl/patches/patch-crypto_des_Makefile
new file mode 100644
index 00000000000..72e9096ab45
--- /dev/null
+++ b/security/openssl/patches/patch-crypto_des_Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-crypto_des_Makefile,v 1.1.2.2 2014/06/05 13:20:18 tron Exp $
+
+Not all m4 macro processors have severe buffer limitations.
+
+--- crypto/des/Makefile.orig Mon Apr 7 16:55:27 2014
++++ crypto/des/Makefile
+@@ -60,7 +60,11 @@ des: des.o cbc3_enc.o lib
+ $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
+
+ des_enc-sparc.S: asm/des_enc.m4
+- m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
++ifeq ($(OPSYS),SunOS)
++ m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
++else
++ m4 asm/des_enc.m4 > des_enc-sparc.S
++endif
+
+ des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
+ $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
diff --git a/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c b/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c
index 937190e9e4b..14bcdcb0e7e 100644
--- a/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c
+++ b/security/openssl/patches/patch-crypto_dso_dso__dlfcn.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-crypto_dso_dso__dlfcn.c,v 1.1 2013/07/26 11:27:02 ryoon Exp $
+$NetBSD: patch-crypto_dso_dso__dlfcn.c,v 1.1.6.1 2014/06/05 13:20:18 tron 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.orig Mon Mar 17 16:14:20 2014
+++ crypto/dso/dso_dlfcn.c
@@ -60,7 +60,7 @@
that handle _GNU_SOURCE and other similar macros. Defining it later
diff --git a/security/openssl/patches/patch-doc_apps_cms.pod b/security/openssl/patches/patch-doc_apps_cms.pod
deleted file mode 100644
index 7878c9c0bc0..00000000000
--- a/security/openssl/patches/patch-doc_apps_cms.pod
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-doc_apps_cms.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/apps/cms.pod.orig 2013-02-11 15:26:04.000000000 +0000
-+++ doc/apps/cms.pod
-@@ -454,24 +454,24 @@ remains DER.
-
- the operation was completely successfully.
-
--=item 1
-+=item Z<>1
-
- an error occurred parsing the command options.
-
--=item 2
-+=item Z<>2
-
- one of the input files could not be read.
-
--=item 3
-+=item Z<>3
-
- an error occurred creating the CMS file or when reading the MIME
- message.
-
--=item 4
-+=item Z<>4
-
- an error occurred decrypting or verifying the message.
-
--=item 5
-+=item Z<>5
-
- the message was verified correctly but an error occurred writing out
- the signers certificates.
diff --git a/security/openssl/patches/patch-doc_apps_smine.pod b/security/openssl/patches/patch-doc_apps_smine.pod
deleted file mode 100644
index 0ce81dca219..00000000000
--- a/security/openssl/patches/patch-doc_apps_smine.pod
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-doc_apps_smine.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/apps/smime.pod.orig 2013-02-11 15:26:04.000000000 +0000
-+++ doc/apps/smime.pod
-@@ -312,24 +312,24 @@ remains DER.
-
- the operation was completely successfully.
-
--=item 1
-+=item Z<>1
-
- an error occurred parsing the command options.
-
--=item 2
-+=item Z<>2
-
- one of the input files could not be read.
-
--=item 3
-+=item Z<>3
-
- an error occurred creating the PKCS#7 file or when reading the MIME
- message.
-
--=item 4
-+=item Z<>4
-
- an error occurred decrypting or verifying the message.
-
--=item 5
-+=item Z<>5
-
- the message was verified correctly but an error occurred writing out
- the signers certificates.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__COMP__add__compression__method.pod b/security/openssl/patches/patch-doc_ssl_SSL__COMP__add__compression__method.pod
deleted file mode 100644
index 833b3119d9c..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__COMP__add__compression__method.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__COMP__add__compression__method.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/ssl/SSL_COMP_add_compression_method.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_COMP_add_compression_method.pod
-@@ -57,7 +57,7 @@ SSL_COMP_add_compression_method() may re
-
- The operation succeeded.
-
--=item 1
-+=item Z<>1
-
- The operation failed. Check the error queue to find out the reason.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod
deleted file mode 100644
index ae6c0615bd1..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__add__session.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/ssl/SSL_CTX_add_session.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_CTX_add_session.pod
-@@ -58,7 +58,7 @@ The following values are returned by all
- the same (identical) session twice. In case of the remove operation, the
- session was not found in the cache.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__load__verify__locations.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__load__verify__locations.pod
deleted file mode 100644
index 0f9fb82e3d3..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__load__verify__locations.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__load__verify__locations.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/ssl/SSL_CTX_load_verify_locations.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_CTX_load_verify_locations.pod
-@@ -106,7 +106,7 @@ The operation failed because B<CAfile> a
- processing at one of the locations specified failed. Check the error
- stack to find out the reason.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod
deleted file mode 100644
index a3a23aa3b08..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 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 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.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__session__id__context.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__session__id__context.pod
deleted file mode 100644
index 115cf3f540a..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__session__id__context.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__set__session__id__context.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/ssl/SSL_CTX_set_session_id_context.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_CTX_set_session_id_context.pod
-@@ -70,7 +70,7 @@ The length B<sid_ctx_len> of the session
- the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
- is logged to the error stack.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__ssl__version.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__ssl__version.pod
deleted file mode 100644
index 18806b5ec7d..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__ssl__version.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__CTX__set__ssl__version.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/ssl/SSL_CTX_set_ssl_version.pod.orig 2013-02-11 15:26:04.000000000 +0000
-+++ doc/ssl/SSL_CTX_set_ssl_version.pod
-@@ -46,7 +46,7 @@ and SSL_set_ssl_method():
-
- The new choice failed, check the error stack to find out the reason.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod b/security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod
deleted file mode 100644
index d8b69bd1a8c..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 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.
-
--=item 0
-+=item Z<>0
-
- PSK identity was not found. An "unknown_psk_identity" alert message
- will be sent and the connection setup fails.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__accept.pod b/security/openssl/patches/patch-doc_ssl_SSL__accept.pod
deleted file mode 100644
index b8870183f69..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__accept.pod
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 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 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.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__clear.pod b/security/openssl/patches/patch-doc_ssl_SSL__clear.pod
deleted file mode 100644
index c8daceda78b..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__clear.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__clear.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/ssl/SSL_clear.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_clear.pod
-@@ -61,7 +61,7 @@ The following return values can occur:
- The SSL_clear() operation could not be performed. Check the error stack to
- find out the reason.
-
--=item 1
-+=item Z<>1
-
- The SSL_clear() operation was successful.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__connect.pod b/security/openssl/patches/patch-doc_ssl_SSL__connect.pod
deleted file mode 100644
index 7094d34add4..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__connect.pod
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 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 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.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod b/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod
deleted file mode 100644
index a40c208b65a..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 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 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.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__read.pod b/security/openssl/patches/patch-doc_ssl_SSL__read.pod
deleted file mode 100644
index b9d7fa318d6..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__read.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__read.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/ssl/SSL_read.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_read.pod
-@@ -86,7 +86,7 @@ The following return values can occur:
- The read operation was successful; the return value is the number of
- bytes actually read from the TLS/SSL connection.
-
--=item 0
-+=item Z<>0
-
- The read operation was not successful. The reason may either be a clean
- shutdown due to a "close notify" alert sent by the peer (in which case
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod b/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod
deleted file mode 100644
index a824899fa48..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__session__reused.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/ssl/SSL_session_reused.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_session_reused.pod
-@@ -31,7 +31,7 @@ The following return values can occur:
-
- A new session was negotiated.
-
--=item 1
-+=item Z<>1
-
- A session was reused.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod b/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod
deleted file mode 100644
index a0aee368efe..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__set__fd.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/ssl/SSL_set_fd.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_set_fd.pod
-@@ -39,7 +39,7 @@ The following return values can occur:
-
- The operation failed. Check the error stack to find out why.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod b/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod
deleted file mode 100644
index e95154adfbb..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__set__session.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/ssl/SSL_set_session.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_set_session.pod
-@@ -41,7 +41,7 @@ The following return values can occur:
-
- The operation failed; check the error stack to find out the reason.
-
--=item 1
-+=item Z<>1
-
- The operation succeeded.
-
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod b/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod
deleted file mode 100644
index 8e687f43d77..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod
+++ /dev/null
@@ -1,23 +0,0 @@
-$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 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 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.
diff --git a/security/openssl/patches/patch-doc_ssl_SSL__write.pod b/security/openssl/patches/patch-doc_ssl_SSL__write.pod
deleted file mode 100644
index a4804e550f1..00000000000
--- a/security/openssl/patches/patch-doc_ssl_SSL__write.pod
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_ssl_SSL__write.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/ssl/SSL_write.pod.orig 2013-02-11 15:02:48.000000000 +0000
-+++ doc/ssl/SSL_write.pod
-@@ -79,7 +79,7 @@ The following return values can occur:
- The write operation was successful, the return value is the number of
- bytes actually written to the TLS/SSL connection.
-
--=item 0
-+=item Z<>0
-
- The write operation was not successful. Probably the underlying connection
- was closed. Call SSL_get_error() with the return value B<ret> to find out,
diff --git a/security/openssl/patches/patch-engines_ccgost_Makefile b/security/openssl/patches/patch-engines_ccgost_Makefile
index db476d3132b..822379928dc 100644
--- a/security/openssl/patches/patch-engines_ccgost_Makefile
+++ b/security/openssl/patches/patch-engines_ccgost_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-engines_ccgost_Makefile,v 1.1 2013/02/06 21:40:34 jperkin Exp $
+$NetBSD: patch-engines_ccgost_Makefile,v 1.1.10.1 2014/06/05 13:20:18 tron Exp $
* Make sure rpath is set properly on the libgost.so engine lib.
---- engines/ccgost/Makefile.orig 2012-04-26 10:42:20.000000000 +0000
-+++ engines/ccgost/Makefile 2013-02-04 13:27:37.220193130 +0000
+--- engines/ccgost/Makefile.orig Mon Apr 7 16:55:42 2014
++++ engines/ccgost/Makefile
@@ -32,7 +32,7 @@ lib: $(LIBOBJ)
$(MAKE) -f $(TOP)/Makefile.shared -e \
LIBNAME=$(LIBNAME) \
diff --git a/security/openssl/patches/patch-tools_Makefile b/security/openssl/patches/patch-tools_Makefile
index a80abec8e37..a2cdbe1eec0 100644
--- a/security/openssl/patches/patch-tools_Makefile
+++ b/security/openssl/patches/patch-tools_Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-tools_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-tools_Makefile,v 1.1.2.3 2014/06/05 13:20:18 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
+--- tools/Makefile.orig Mon Mar 17 16:14:20 2014
++++ tools/Makefile
@@ -4,6 +4,7 @@
DIR= tools