diff options
author | rodent <rodent> | 2014-05-13 02:23:11 +0000 |
---|---|---|
committer | rodent <rodent> | 2014-05-13 02:23:11 +0000 |
commit | ce241145798a135fa27e36b88c8123c9c71dca54 (patch) | |
tree | 3f7c6686dbee435738079cece08a7aa0de354b03 | |
parent | 85ccb80003c4353ff6d2b1f1115bf9d1c4201722 (diff) | |
download | pkgsrc-ce241145798a135fa27e36b88c8123c9c71dca54.tar.gz |
Fix build on OpenBSD/sparc64. Defuzz patches (sorry if this is annoying).
30 files changed, 134 insertions, 114 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo index fc53c538b2a..7618cfa04e7 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,33 +1,34 @@ -$NetBSD: distinfo,v 1.105 2014/04/08 23:58:03 obache Exp $ +$NetBSD: distinfo,v 1.106 2014/05/13 02:23:11 rodent Exp $ 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_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) = 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) = eb4d8ccfa47ecc3f50dbda5b0ffd98ea740f4ebf -SHA1 (patch-doc_ssl_SSL__accept.pod) = c68aa6eb518d5ca72ae5bd142fd3895e378ca638 -SHA1 (patch-doc_ssl_SSL__clear.pod) = c7d2eb126137ee642294466f0ea9019fcd5e9b92 -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) = 21682f3385a66ba8f0ebd11bb9bb3c6198352783 -SHA1 (patch-doc_ssl_SSL__write.pod) = 67efd6d0de0a0db34c18c62e4a939c0ea49442ca -SHA1 (patch-engines_ccgost_Makefile) = 08999f0f40969883482ad9ffc1aa9959ed7d402c -SHA1 (patch-tools_Makefile) = d67f3ea397674adbe3360e4df9c2e417dbcab56a +SHA1 (patch-Configure) = f8b8b3ecfa9d23530d13f8f93582db857f772fc4 +SHA1 (patch-Makefile.org) = be55df602286c7f0265a8c5c3d8edaea13b1d966 +SHA1 (patch-Makefile.shared) = 709283ba4bb4bd568e289fe111b8dea319968328 +SHA1 (patch-apps_Makefile) = 745e01fb967979f5105896f8a728fd7a041af6c9 +SHA1 (patch-config) = ac8ced00cfa7d31b84afb08aedc38102fd777824 +SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6 +SHA1 (patch-crypto_des_Makefile) = 31d772eb8c80b577b9cd05337262ddfad297d9b1 +SHA1 (patch-crypto_dso_dso__dlfcn.c) = 065a8254d9c93b17d300a4be9b9a35a919e8b364 +SHA1 (patch-doc_apps_cms.pod) = e111c0b0d74622e4a7e6d12d2bf9d561c69c9d5b +SHA1 (patch-doc_apps_smine.pod) = bb188f893849aac2389eacffe7d0adbd0b29af58 +SHA1 (patch-doc_ssl_SSL__COMP__add__compression__method.pod) = 5e208ed7cd33f1cca74fd5bdd2e8f4944e4b9573 +SHA1 (patch-doc_ssl_SSL__CTX__add__session.pod) = 1e237699e2f1fcf839b658b747967a4cf75eba7f +SHA1 (patch-doc_ssl_SSL__CTX__load__verify__locations.pod) = c9e68f02d950e1f525d7dc23f70b423cff722d91 +SHA1 (patch-doc_ssl_SSL__CTX__set__client__CA__list.pod) = 49e1d7c0d4e875b6fcb43f2af5eb88d1421c5eb5 +SHA1 (patch-doc_ssl_SSL__CTX__set__session__id__context.pod) = ca148386fd507a1a3f50a9ec21023ded386251c8 +SHA1 (patch-doc_ssl_SSL__CTX__set__ssl__version.pod) = 5d9c9982e914323d5b04a472cb566ee6f78dbcfa +SHA1 (patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod) = 70ff7ba97cee03169bab4a613a96306d911b37c6 +SHA1 (patch-doc_ssl_SSL__accept.pod) = 3aa90470a88b89c0ad434f2f8205db915a6d174d +SHA1 (patch-doc_ssl_SSL__clear.pod) = 6c65ae616976b7d6d770d15f97dfb4613b9808c1 +SHA1 (patch-doc_ssl_SSL__connect.pod) = 2b960e52115bcf7376601b1e67a092db289419c6 +SHA1 (patch-doc_ssl_SSL__do__handshake.pod) = a5d09e9e89e268c3e366e8c7be6b210072d4097d +SHA1 (patch-doc_ssl_SSL__read.pod) = ce0ba545ed5d1a4198d5deecedb7e4ee0afd36ed +SHA1 (patch-doc_ssl_SSL__session__reused.pod) = aef3cede850eda892ab73d52b08caa4a10274d55 +SHA1 (patch-doc_ssl_SSL__set__fd.pod) = 3a57fa02613960790b3a275f979c7741559bcf6f +SHA1 (patch-doc_ssl_SSL__set__session.pod) = c5fdc448bde809435f060bceb4d36f7665147112 +SHA1 (patch-doc_ssl_SSL__shutdown.pod) = 1adf6eaab219fc0fc2416199c07b1a7aa8789dc1 +SHA1 (patch-doc_ssl_SSL__write.pod) = 968ac804a295c31d6c71508866e3623b619eadd8 +SHA1 (patch-engines_ccgost_Makefile) = 8834074c74abab604ef1ba7959750c22c0ffb6e7 +SHA1 (patch-tools_Makefile) = 6e7324d01c0cd5e290085fe8124315bcac8cf198 diff --git a/security/openssl/patches/patch-Configure b/security/openssl/patches/patch-Configure index 25dedb3419a..c3c839f4515 100644 --- a/security/openssl/patches/patch-Configure +++ b/security/openssl/patches/patch-Configure @@ -1,10 +1,10 @@ -$NetBSD: patch-Configure,v 1.1 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-Configure,v 1.2 2014/05/13 02:23:11 rodent 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 2014/04/02 12:11:35 he 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 2014/04/02 12:11:35 he 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 40f869e0c25..3bd97c61a58 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 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-Makefile.org,v 1.2 2014/05/13 02:23:11 rodent 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 0b1406f035f..0eea0d130c8 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 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-Makefile.shared,v 1.2 2014/05/13 02:23:11 rodent 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 99a07578cb6..45d2564aad1 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 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-apps_Makefile,v 1.2 2014/05/13 02:23:11 rodent 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 131e5b40aa4..efe744dde81 100644 --- a/security/openssl/patches/patch-config +++ b/security/openssl/patches/patch-config @@ -1,8 +1,8 @@ -$NetBSD: patch-config,v 1.1 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-config,v 1.2 2014/05/13 02:23:11 rodent 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 2e6089b5401..95f4464376f 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 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.2 2014/05/13 02:23:11 rodent 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..c04889c9255 --- /dev/null +++ b/security/openssl/patches/patch-crypto_des_Makefile @@ -0,0 +1,19 @@ +$NetBSD: patch-crypto_des_Makefile,v 1.1 2014/05/13 02:23:11 rodent 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..3c43a68e9ac 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.2 2014/05/13 02:23:11 rodent 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 index 7878c9c0bc0..693fccb61b1 100644 --- a/security/openssl/patches/patch-doc_apps_cms.pod +++ b/security/openssl/patches/patch-doc_apps_cms.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_apps_cms.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_apps_cms.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/apps/cms.pod @@ -454,24 +454,24 @@ remains DER. diff --git a/security/openssl/patches/patch-doc_apps_smine.pod b/security/openssl/patches/patch-doc_apps_smine.pod index 0ce81dca219..3c5e7f2d4f1 100644 --- a/security/openssl/patches/patch-doc_apps_smine.pod +++ b/security/openssl/patches/patch-doc_apps_smine.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_apps_smine.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_apps_smine.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/apps/smime.pod @@ -312,24 +312,24 @@ remains DER. 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 index 833b3119d9c..8b883b58c09 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__COMP__add__compression__method.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__COMP__add__compression__method.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_COMP_add_compression_method.pod -@@ -57,7 +57,7 @@ SSL_COMP_add_compression_method() may re +@@ -57,7 +57,7 @@ SSL_COMP_add_compression_method() may return the follo The operation succeeded. 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 index ae6c0615bd1..e48f5d79e20 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__CTX__add__session.pod @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__add__session.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__add__session.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_CTX_add_session.pod -@@ -58,7 +58,7 @@ The following values are returned by all +@@ -58,7 +58,7 @@ The following values are returned by all functions: the same (identical) session twice. In case of the remove operation, the session was not found in the cache. 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 index 0f9fb82e3d3..4e4a1ebd38e 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__load__verify__locations.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__load__verify__locations.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_CTX_load_verify_locations.pod -@@ -106,7 +106,7 @@ The operation failed because B<CAfile> a +@@ -106,7 +106,7 @@ The operation failed because B<CAfile> and B<CApath> a processing at one of the locations specified failed. Check the error stack to find out the reason. 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 index a3a23aa3b08..90aa19776c4 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__set__client__CA__list.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__set__client__CA__list.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_CTX_set_client_CA_list.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_CTX_set_client_CA_list.pod +@@ -66,13 +66,13 @@ values: =over 4 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 index 115cf3f540a..7ad7c718694 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__set__session__id__context.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__set__session__id__context.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_CTX_set_session_id_context.pod -@@ -70,7 +70,7 @@ The length B<sid_ctx_len> of the session +@@ -70,7 +70,7 @@ The length B<sid_ctx_len> of the session id context B< the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error is logged to the error stack. 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 index 18806b5ec7d..ecba8f4a691 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__set__ssl__version.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__set__ssl__version.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_CTX_set_ssl_version.pod @@ -46,7 +46,7 @@ and SSL_set_ssl_method(): 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 index d8b69bd1a8c..5a3bd630c0c 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_CTX_use_psk_identity_hint.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod +@@ -96,7 +96,7 @@ data to B<psk> and return the length of the random dat connection will fail with decryption_error before it will be finished completely. diff --git a/security/openssl/patches/patch-doc_ssl_SSL__accept.pod b/security/openssl/patches/patch-doc_ssl_SSL__accept.pod index b8870183f69..f88b1cb2608 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__accept.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__accept.pod @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__accept.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__accept.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_accept.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_accept.pod +@@ -44,13 +44,13 @@ The following return values can occur: =over 4 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__clear.pod b/security/openssl/patches/patch-doc_ssl_SSL__clear.pod index c8daceda78b..4af5bd31908 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__clear.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__clear.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__clear.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__clear.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ 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 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__connect.pod b/security/openssl/patches/patch-doc_ssl_SSL__connect.pod index 7094d34add4..1a83b8dd701 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__connect.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__connect.pod @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__connect.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__connect.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_connect.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_connect.pod +@@ -41,13 +41,13 @@ The following return values can occur: =over 4 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod b/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod index a40c208b65a..159f1490011 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__do__handshake.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__do__handshake.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_do_handshake.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_do_handshake.pod +@@ -45,13 +45,13 @@ The following return values can occur: =over 4 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__read.pod b/security/openssl/patches/patch-doc_ssl_SSL__read.pod index b9d7fa318d6..6a2da0687b1 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__read.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__read.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__read.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__read.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ 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 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod b/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod index a824899fa48..644836d45c0 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__session__reused.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__session__reused.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__session__reused.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_session_reused.pod @@ -31,7 +31,7 @@ The following return values can occur: diff --git a/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod b/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod index a0aee368efe..2079d9d4321 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__set__fd.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__set__fd.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__set__fd.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_set_fd.pod @@ -39,7 +39,7 @@ The following return values can occur: diff --git a/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod b/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod index e95154adfbb..032f3b269ef 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__set__session.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__set__session.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__set__session.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ doc/ssl/SSL_set_session.pod @@ -41,7 +41,7 @@ The following return values can occur: diff --git a/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod b/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod index 8e687f43d77..b888775c3e9 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_ssl_SSL__shutdown.pod,v 1.2 2014/01/10 14:32:42 tron Exp $ +$NetBSD: patch-doc_ssl_SSL__shutdown.pod,v 1.3 2014/05/13 02:23:11 rodent 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 @@ +--- doc/ssl/SSL_shutdown.pod.orig Mon Mar 17 16:14:20 2014 ++++ doc/ssl/SSL_shutdown.pod +@@ -92,14 +92,14 @@ The following return values can occur: =over 4 diff --git a/security/openssl/patches/patch-doc_ssl_SSL__write.pod b/security/openssl/patches/patch-doc_ssl_SSL__write.pod index a4804e550f1..28170e38d52 100644 --- a/security/openssl/patches/patch-doc_ssl_SSL__write.pod +++ b/security/openssl/patches/patch-doc_ssl_SSL__write.pod @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_ssl_SSL__write.pod,v 1.1 2013/06/01 08:03:55 sbd Exp $ +$NetBSD: patch-doc_ssl_SSL__write.pod,v 1.2 2014/05/13 02:23:11 rodent 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.orig Mon Mar 17 16:14:20 2014 +++ 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 diff --git a/security/openssl/patches/patch-engines_ccgost_Makefile b/security/openssl/patches/patch-engines_ccgost_Makefile index db476d3132b..7be6291e37d 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.2 2014/05/13 02:23:11 rodent 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 2ca18c56793..acc7acea8e7 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 2014/04/02 12:11:35 he Exp $ +$NetBSD: patch-tools_Makefile,v 1.2 2014/05/13 02:23:11 rodent 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 |