[pkgsrc/trunk]: pkgsrc/security/openssl Alter patches to make them more likel...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/openssl Alter patches to make them more likel...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:06:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c42ba50ac9d4
branches:  trunk
changeset: 486270:c42ba50ac9d4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Dec 25 22:11:26 2004 +0000

description:
Alter patches to make them more likely to be accepted back by the
OpenSSL project.  Also use the sparcv9 MD5 assembly routines on
NetBSD/sparc64.

diffstat:

 security/openssl/Makefile         |   3 +--
 security/openssl/distinfo         |   6 +++---
 security/openssl/patches/patch-aa |  34 ++++++++++++++++++++++++++++------
 security/openssl/patches/patch-ac |   8 ++++----
 4 files changed, 36 insertions(+), 15 deletions(-)

diffs (126 lines):

diff -r 21d77a65eb00 -r c42ba50ac9d4 security/openssl/Makefile
--- a/security/openssl/Makefile Sat Dec 25 21:47:45 2004 +0000
+++ b/security/openssl/Makefile Sat Dec 25 22:11:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2004/12/24 22:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.99 2004/12/25 22:11:26 jlam Exp $
 
 DISTNAME=      openssl-0.9.7e
 SVR4_PKGNAME=  ossl
@@ -55,7 +55,6 @@
 
 CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=                PERL="${PERL5}"
-CONFIGURE_ENV+=                MACHINE_ARCH=${MACHINE_ARCH}
 
 PLIST_OPSYS=           ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
 .if exists(${PLIST_OPSYS})
diff -r 21d77a65eb00 -r c42ba50ac9d4 security/openssl/distinfo
--- a/security/openssl/distinfo Sat Dec 25 21:47:45 2004 +0000
+++ b/security/openssl/distinfo Sat Dec 25 22:11:26 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2004/12/25 19:09:08 jlam Exp $
+$NetBSD: distinfo,v 1.35 2004/12/25 22:11:26 jlam Exp $
 
 SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54
 Size (openssl-0.9.7e.tar.gz) = 3043231 bytes
-SHA1 (patch-aa) = 80fa04df4aed2009f158f8c10b00ff087a68643a
-SHA1 (patch-ac) = 5c7681182a3f40a91e4431db668b70bec997d3ee
+SHA1 (patch-aa) = 5ab4ec9fdf15c9ded6a6205dc4801e053b3769fc
+SHA1 (patch-ac) = 6d5d06d6de0fe10ee42dae2d259beb38106e59bf
 SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a
 SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
 SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa
diff -r 21d77a65eb00 -r c42ba50ac9d4 security/openssl/patches/patch-aa
--- a/security/openssl/patches/patch-aa Sat Dec 25 21:47:45 2004 +0000
+++ b/security/openssl/patches/patch-aa Sat Dec 25 22:11:26 2004 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.16 2004/12/25 19:09:09 jlam Exp $
+$NetBSD: patch-aa,v 1.17 2004/12/25 22:11:26 jlam Exp $
 
---- config.orig        Mon Jun 28 18:01:05 2004
+--- config.orig        2004-06-28 18:01:05.000000000 -0400
 +++ config
-@@ -155,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -49,6 +49,7 @@ done
+ # First get uname entries that we use below
+ 
+ MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
++MACHINE_ARCH=`(uname -p) 2>/dev/null` || MACHINE_ARCH="unknown"
+ RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
+ SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
+ VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
+@@ -155,6 +156,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
        echo "mips4-sgi-irix64"; exit 0
        ;;
  
@@ -13,13 +21,23 @@
      Linux:[2-9].*)
        echo "${MACHINE}-whatever-linux2"; exit 0
        ;;
-@@ -654,9 +658,16 @@ EOF
+@@ -216,7 +221,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+       ;;
+ 
+     NetBSD:*)
+-      echo "${MACHINE}-whatever-netbsd"; exit 0
++      echo "${MACHINE_ARCH}-whatever-netbsd"; exit 0
+       ;;
+ 
+     OpenBSD:*)
+@@ -654,9 +659,21 @@ EOF
    ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
 -  *86*-*-netbsd) OUT="NetBSD-x86" ;;
 -  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
 -  *-*-netbsd) OUT="NetBSD-sparc" ;;
++  x86_64-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
 +  *86*-*-netbsd)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +              OUT="NetBSD-x86-aout"
@@ -27,8 +45,12 @@
 +              OUT="NetBSD-x86-elf"
 +      fi
 +      ;;
-+  sun3*-*-netbsd) OUT="NetBSD-m68k" ;;
-+  *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
++  alpha-*-netbsd|arm-*-netbsd|arm32-*-netbsd|m68000-*-netbsd|m68k-*-netbsd|\
++  mipseb-*-netbsd|mipsel-*-netbsd|ns32k-*-netbsd|powerpc-*-netbsd|\
++  sparc-*-netbsd|sparc64-*-netbsd|vax-*-netbsd)
++      OUT="NetBSD-${MACHINE_ARCH}"
++      ;;
++  *-*-netbsd) OUT="NetBSD" ;;
 +  *-*-interix3) OUT="Interix3" ;;
    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
    *86*-*-openbsd) OUT="OpenBSD-i386" ;;
diff -r 21d77a65eb00 -r c42ba50ac9d4 security/openssl/patches/patch-ac
--- a/security/openssl/patches/patch-ac Sat Dec 25 21:47:45 2004 +0000
+++ b/security/openssl/patches/patch-ac Sat Dec 25 22:11:26 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.19 2004/12/25 19:09:09 jlam Exp $
+$NetBSD: patch-ac,v 1.20 2004/12/25 22:11:26 jlam Exp $
 
---- Configure.orig     Fri Oct  1 07:34:28 2004
+--- Configure.orig     2004-10-01 07:34:28.000000000 -0400
 +++ Configure
 @@ -400,9 +400,23 @@ my %table=(
  "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK 
RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -9,7 +9,7 @@
 -"NetBSD-sparc",       "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX 
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::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 -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 -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-arm32", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -20,7 +20,7 @@
 +"NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-powerpc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-sparc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 
BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-aout", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-elf", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/openmotif Enable pkgviews installation.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/guile Update to 1.6.7:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/openmotif Enable pkgviews installation.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/guile Update to 1.6.7:
Indexes:
Home | Main Index | Thread Index | Old Index