diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-12-08 16:53:32 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-12-08 16:53:32 +0000 |
commit | ce6f3b87e9afbe53f54fba3afe678aae87ffe948 (patch) | |
tree | 32844f68b7f6afded25388dc1c1524747fcbee72 /security | |
parent | 2f8a9a624cc55c24783d121fbc91f039c30bb0e1 (diff) | |
download | pkgsrc-ce6f3b87e9afbe53f54fba3afe678aae87ffe948.tar.gz |
Regenerate patches.
Diffstat (limited to 'security')
-rw-r--r-- | security/openssl/distinfo | 20 | ||||
-rw-r--r-- | security/openssl/patches/patch-Configure | 14 | ||||
-rw-r--r-- | security/openssl/patches/patch-Makefile.org | 8 | ||||
-rw-r--r-- | security/openssl/patches/patch-Makefile.shared | 4 | ||||
-rw-r--r-- | security/openssl/patches/patch-apps_Makefile | 6 | ||||
-rw-r--r-- | security/openssl/patches/patch-config | 20 | ||||
-rw-r--r-- | security/openssl/patches/patch-crypto_bn_bn__prime.pl | 4 | ||||
-rw-r--r-- | security/openssl/patches/patch-crypto_des_Makefile | 4 | ||||
-rw-r--r-- | security/openssl/patches/patch-engines_ccgost_Makefile | 4 | ||||
-rw-r--r-- | security/openssl/patches/patch-tools_Makefile | 4 |
10 files changed, 44 insertions, 44 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 57c0311e2e4..7699d2e9090 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.118 2015/12/07 15:57:42 jperkin Exp $ +$NetBSD: distinfo,v 1.119 2015/12/08 16:53:32 jperkin Exp $ SHA1 (openssl-1.0.2e.tar.gz) = 2c5691496761cb18f98476eefa4d35c835448fb6 RMD160 (openssl-1.0.2e.tar.gz) = 324ed411043364af2ea908124225eece7d604a94 SHA512 (openssl-1.0.2e.tar.gz) = b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f Size (openssl-1.0.2e.tar.gz) = 5256555 bytes -SHA1 (patch-Configure) = ce5f4ab244f49d3a556b1123190f2424b38fd789 -SHA1 (patch-Makefile.org) = 72f023aeead660decaa09b6664936bd73a214069 -SHA1 (patch-Makefile.shared) = effbea94f9e7f399f4f46542bed6d54fc42748e6 -SHA1 (patch-apps_Makefile) = 745e01fb967979f5105896f8a728fd7a041af6c9 -SHA1 (patch-config) = ac8ced00cfa7d31b84afb08aedc38102fd777824 -SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6 -SHA1 (patch-crypto_des_Makefile) = 6c67c81ba7054647e1138165d9280c8db82b8498 -SHA1 (patch-engines_ccgost_Makefile) = 8834074c74abab604ef1ba7959750c22c0ffb6e7 -SHA1 (patch-tools_Makefile) = 6e7324d01c0cd5e290085fe8124315bcac8cf198 +SHA1 (patch-Configure) = 2e39c50188600e7e491b77dd47b14a27198c1860 +SHA1 (patch-Makefile.org) = f4525cbd71e8b537033c0f39d695b73ae8cdb9e3 +SHA1 (patch-Makefile.shared) = 15b0238b1e0be0e8ca05f1a557b1cb55039ed5fd +SHA1 (patch-apps_Makefile) = 15150b4f4325c4a74ebb513994faf7649976282f +SHA1 (patch-config) = 1476fa7bcc3469fb940825650b550a920b84a945 +SHA1 (patch-crypto_bn_bn__prime.pl) = 834e11bc0b214fc5dcb9a651e13369003708b4ce +SHA1 (patch-crypto_des_Makefile) = f5f92b1e9597c068ab63332e38904a6e115a0a0d +SHA1 (patch-engines_ccgost_Makefile) = 68b46f01f06f98e860d3fd585fe8c72627ea7675 +SHA1 (patch-tools_Makefile) = 52bac15bd2aa02725545f5168c95c8ba4721b409 diff --git a/security/openssl/patches/patch-Configure b/security/openssl/patches/patch-Configure index 38933a3ae4b..1c01eb7457a 100644 --- a/security/openssl/patches/patch-Configure +++ b/security/openssl/patches/patch-Configure @@ -1,12 +1,12 @@ -$NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $ +$NetBSD: patch-Configure,v 1.6 2015/12/08 16:53:32 jperkin Exp $ * Avoid -fast on Solaris, creates non-portable packages which depend on host-specific CPU features. * Add GNU/kFreeBSD support. ---- Configure.orig 2015-06-11 14:50:11.000000000 +0100 -+++ Configure 2015-06-12 12:07:54.000000000 +0100 -@@ -358,6 +358,7 @@ +--- Configure.orig 2015-12-03 14:04:23.000000000 +0000 ++++ Configure +@@ -358,6 +358,7 @@ my %table=( # "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", @@ -14,7 +14,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $ "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", #### -@@ -481,8 +482,31 @@ +@@ -482,8 +483,31 @@ my %table=( "BSD-ia64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "BSD-x86_64", "cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -47,7 +47,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", -@@ -932,7 +956,7 @@ +@@ -933,7 +957,7 @@ PROCESS_ARGS: # The check for the option is there so scripts aren't # broken } @@ -56,7 +56,7 @@ $NetBSD: patch-Configure,v 1.5 2015/06/12 17:02:24 tron Exp $ { if (/^--prefix=(.*)$/) { -@@ -1764,7 +1788,7 @@ +@@ -1767,7 +1791,7 @@ while (<IN>) elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; diff --git a/security/openssl/patches/patch-Makefile.org b/security/openssl/patches/patch-Makefile.org index d3b39db6958..a192fe0a417 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.3 2015/02/12 13:08:53 adam Exp $ +$NetBSD: patch-Makefile.org,v 1.4 2015/12/08 16:53:32 jperkin Exp $ Adjust build procedure. ---- Makefile.org.orig 2015-01-22 14:58:06.000000000 +0000 +--- Makefile.org.orig 2015-12-03 14:04:23.000000000 +0000 +++ Makefile.org @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl @@ -29,7 +29,7 @@ Adjust build procedure. SHARED_LDFLAGS= GENERAL= Makefile -@@ -536,7 +538,7 @@ dist: +@@ -532,7 +534,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 \ -@@ -645,41 +647,56 @@ install_docs: +@@ -641,41 +643,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 2b57529a13a..f5c46fba431 100644 --- a/security/openssl/patches/patch-Makefile.shared +++ b/security/openssl/patches/patch-Makefile.shared @@ -1,9 +1,9 @@ -$NetBSD: patch-Makefile.shared,v 1.3 2015/10/26 09:42:47 jperkin Exp $ +$NetBSD: patch-Makefile.shared,v 1.4 2015/12/08 16:53:32 jperkin Exp $ Adjust build procedure. Fix SunOS -h linker argument. ---- Makefile.shared.orig 2015-07-09 11:53:21.000000000 +0000 +--- Makefile.shared.orig 2015-12-03 14:04:23.000000000 +0000 +++ 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 45d2564aad1..a44b59b048b 100644 --- a/security/openssl/patches/patch-apps_Makefile +++ b/security/openssl/patches/patch-apps_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-apps_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-apps_Makefile,v 1.3 2015/12/08 16:53:32 jperkin Exp $ Adjust build procedure. ---- apps/Makefile.orig Mon Apr 7 16:55:44 2014 +--- apps/Makefile.orig 2015-12-03 14:44:30.000000000 +0000 +++ apps/Makefile @@ -4,6 +4,7 @@ @@ -12,7 +12,7 @@ Adjust build procedure. CC= cc INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) CFLAG= -g -static -@@ -109,13 +110,13 @@ install: +@@ -112,13 +113,13 @@ install: @set -e; for i in $(SCRIPTS); \ do \ (echo installing $$i; \ diff --git a/security/openssl/patches/patch-config b/security/openssl/patches/patch-config index efe744dde81..b851b33169c 100644 --- a/security/openssl/patches/patch-config +++ b/security/openssl/patches/patch-config @@ -1,8 +1,8 @@ -$NetBSD: patch-config,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-config,v 1.3 2015/12/08 16:53:32 jperkin Exp $ Adjust config procedure. ---- config.orig Mon Mar 17 16:14:20 2014 +--- config.orig 2015-12-03 14:04:23.000000000 +0000 +++ config @@ -49,6 +49,7 @@ done # First get uname entries that we use below @@ -12,7 +12,7 @@ Adjust config procedure. [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" -@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in +@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "mips4-sgi-irix64"; exit 0 ;; @@ -23,7 +23,7 @@ Adjust config procedure. Linux:[2-9].*) echo "${MACHINE}-whatever-linux2"; exit 0 ;; -@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in +@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "${MACHINE}-whatever-linux1"; exit 0 ;; @@ -34,7 +34,7 @@ Adjust config procedure. GNU*) echo "hurd-x86"; exit 0; ;; -@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in +@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "${MACHINE}-whatever-freebsd"; exit 0 ;; @@ -54,7 +54,7 @@ Adjust config procedure. echo "${MACHINE}-whatever-openbsd"; exit 0 ;; -@@ -728,12 +737,19 @@ case "$GUESSOS" in +@@ -747,12 +756,19 @@ case "$GUESSOS" in ;; *-*-sunos4) OUT="sunos-$CC" ;; @@ -74,12 +74,12 @@ Adjust config procedure. *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD libc=/usr/lib/libc.so -@@ -746,6 +762,8 @@ case "$GUESSOS" in - *) OUT="BSD-x86"; options="$options no-sse2" ;; +@@ -766,6 +782,8 @@ case "$GUESSOS" in esac ;; *-*-*bsd*) OUT="BSD-generic32" ;; -+ -+ *-*-interix) OUT="Interix" ;; ++ *-*-interix) OUT="Interix" ;; ++ *-*-osf) OUT="osf1-alpha-cc" ;; *-*-tru64) OUT="tru64-alpha-cc" ;; + *-*-[Uu]nix[Ww]are7) diff --git a/security/openssl/patches/patch-crypto_bn_bn__prime.pl b/security/openssl/patches/patch-crypto_bn_bn__prime.pl index 95f4464376f..153b05b7bd7 100644 --- a/security/openssl/patches/patch-crypto_bn_bn__prime.pl +++ b/security/openssl/patches/patch-crypto_bn_bn__prime.pl @@ -1,6 +1,6 @@ -$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.3 2015/12/08 16:53:32 jperkin Exp $ ---- crypto/bn/bn_prime.pl.orig Mon Mar 17 16:14:20 2014 +--- crypto/bn/bn_prime.pl.orig 2015-12-03 14:04:23.000000000 +0000 +++ crypto/bn/bn_prime.pl @@ -1,6 +1,8 @@ #!/usr/local/bin/perl diff --git a/security/openssl/patches/patch-crypto_des_Makefile b/security/openssl/patches/patch-crypto_des_Makefile index 1c805f1a308..c7a53673f8b 100644 --- a/security/openssl/patches/patch-crypto_des_Makefile +++ b/security/openssl/patches/patch-crypto_des_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-crypto_des_Makefile,v 1.2 2015/02/12 13:08:53 adam Exp $ +$NetBSD: patch-crypto_des_Makefile,v 1.3 2015/12/08 16:53:32 jperkin Exp $ Not all m4 macro processors have severe buffer limitations. ---- crypto/des/Makefile.orig 2015-01-22 16:12:10.000000000 +0000 +--- crypto/des/Makefile.orig 2015-12-03 14:44:18.000000000 +0000 +++ crypto/des/Makefile @@ -60,7 +60,11 @@ des: des.o cbc3_enc.o lib $(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB) diff --git a/security/openssl/patches/patch-engines_ccgost_Makefile b/security/openssl/patches/patch-engines_ccgost_Makefile index 7be6291e37d..7e2f7e68b91 100644 --- a/security/openssl/patches/patch-engines_ccgost_Makefile +++ b/security/openssl/patches/patch-engines_ccgost_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-engines_ccgost_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-engines_ccgost_Makefile,v 1.3 2015/12/08 16:53:32 jperkin Exp $ * Make sure rpath is set properly on the libgost.so engine lib. ---- engines/ccgost/Makefile.orig Mon Apr 7 16:55:42 2014 +--- engines/ccgost/Makefile.orig 2015-12-03 14:44:29.000000000 +0000 +++ engines/ccgost/Makefile @@ -32,7 +32,7 @@ lib: $(LIBOBJ) $(MAKE) -f $(TOP)/Makefile.shared -e \ diff --git a/security/openssl/patches/patch-tools_Makefile b/security/openssl/patches/patch-tools_Makefile index acc7acea8e7..ec0dc7f42ee 100644 --- a/security/openssl/patches/patch-tools_Makefile +++ b/security/openssl/patches/patch-tools_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-tools_Makefile,v 1.2 2014/05/13 02:23:11 rodent Exp $ +$NetBSD: patch-tools_Makefile,v 1.3 2015/12/08 16:53:32 jperkin Exp $ Adjust build procedure. ---- tools/Makefile.orig Mon Mar 17 16:14:20 2014 +--- tools/Makefile.orig 2015-12-03 14:04:23.000000000 +0000 +++ tools/Makefile @@ -4,6 +4,7 @@ |