NetBSD Problem Report #44717

From jailbird@fdf.net  Sun Mar 13 06:14:53 2011
Return-Path: <jailbird@fdf.net>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id E045F63B874
	for <gnats-bugs@gnats.NetBSD.org>; Sun, 13 Mar 2011 06:14:52 +0000 (UTC)
Message-Id: <20110313061448.ADD7D15C8085@bobdole.fdf.net>
Date: Sun, 13 Mar 2011 06:14:48 +0000 (UTC)
From: jailbird@fdf.net
Reply-To: jailbird@fdf.net
To: gnats-bugs@gnats.NetBSD.org
Subject: OpenSSL 1.0.0d
X-Send-Pr-Version: 3.95

>Number:         44717
>Category:       pkg
>Synopsis:       Patch to bring security/openssl up-to-date
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Mar 13 06:15:00 +0000 2011
>Closed-Date:    Thu Feb 07 14:08:40 +0000 2013
>Last-Modified:  Thu Feb 07 14:08:40 +0000 2013
>Originator:     Dustin Marquess
>Release:        NetBSD 5.99.47
>Organization:
>Environment:
System: NetBSD bobdole.fdf.net 5.99.47 NetBSD 5.99.47 (BOBDOLE) #0: Sun Mar 6 09:26:12 UTC 2011 root@bobdole.fdf.net:/usr/src/sys/arch/amd64/compile/BOBDOLE amd64
Architecture: x86_64
Machine: amd64
>Description:
	This patch brings security/openssl up from 0.9.8q to 1.0.0d
>How-To-Repeat:
>Fix:
--- openssl/CVS/Entries	2011-03-12 04:43:55.000000000 +0000
+++ openssl-current/CVS/Entries	2011-01-19 16:38:42.000000000 +0000
@@ -5,8 +5,7 @@
 /PLIST.darwin/1.6/Fri Jan 18 01:09:57 2008//
 /options.mk/1.6/Wed Sep 17 01:06:49 2008//
 /buildlink3.mk/1.42/Mon Jan 18 01:15:48 2010//
 /PLIST.common/1.17/Tue Mar  2 01:09:23 2010//
 /builtin.mk/1.29/Mon Jul  5 01:01:33 2010//
-/MESSAGE.SunOS/1.1/Thu Jan 20 16:25:21 2011//
-/Makefile/1.154/Fri Feb 11 05:05:56 2011//
-/distinfo/1.80/Fri Feb 11 05:05:56 2011//
+/Makefile/1.153/Fri Dec  3 01:02:15 2010//
+/distinfo/1.79/Fri Dec  3 01:02:22 2010//
--- openssl/Makefile	2011-02-11 05:05:56.000000000 +0000
+++ openssl-current/Makefile	2011-02-22 05:10:31.000000000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.154 2011/02/09 00:15:30 taca Exp $
+# $NetBSD: Makefile,v 1.153 2010/12/03 00:17:21 taca Exp $

 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
-OPENSSL_VERS?=		0.9.8q
+OPENSSL_VERS?=		1.0.0d

 .if empty(OPENSSL_SNAPSHOT)
 DISTNAME=	openssl-${OPENSSL_VERS}
 MASTER_SITES=	ftp://ftp.openssl.org/source/ \
 				ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/ \
@@ -20,11 +20,10 @@
 MASTER_SITES=	ftp://ftp.openssl.org/snapshot/
 .  endif
 .endif

 SVR4_PKGNAME=	ossl
-PKGREVISION=	1
 CATEGORIES=	security
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openssl.org/
 COMMENT=	Secure Socket Layer and cryptographic library

--- openssl/PLIST.common	2010-03-02 01:09:23.000000000 +0000
+++ openssl-current/PLIST.common	2011-01-19 22:52:41.000000000 +0000
@@ -31,11 +31,10 @@
 include/openssl/hmac.h
 ${PLIST.idea}include/openssl/idea.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/lhash.h
-include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 ${PLIST.mdc2}include/openssl/mdc2.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
@@ -45,11 +44,10 @@
 include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
 include/openssl/pkcs7.h
-include/openssl/pq_compat.h
 include/openssl/pqueue.h
 include/openssl/rand.h
 include/openssl/rc2.h
 include/openssl/rc4.h
 ${PLIST.rc5}include/openssl/rc5.h
@@ -60,14 +58,12 @@
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl23.h
 include/openssl/ssl3.h
 include/openssl/stack.h
-include/openssl/store.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
-include/openssl/tmdiff.h
 include/openssl/txt_db.h
 include/openssl/ui.h
 include/openssl/ui_compat.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
@@ -386,11 +382,10 @@
 man/man3/CRYPTO_num_locks.3
 man/man3/CRYPTO_set_dynlock_create_callback.3
 man/man3/CRYPTO_set_dynlock_destroy_callback.3
 man/man3/CRYPTO_set_dynlock_lock_callback.3
 man/man3/CRYPTO_set_ex_data.3
-man/man3/CRYPTO_set_id_callback.3
 man/man3/CRYPTO_set_locking_callback.3
 man/man3/DES_cbc_cksum.3
 man/man3/DES_cfb64_encrypt.3
 man/man3/DES_cfb_encrypt.3
 man/man3/DES_crypt.3
--- openssl/distinfo	2011-02-11 05:05:56.000000000 +0000
+++ openssl-current/distinfo	2011-02-22 05:10:25.000000000 +0000
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.80 2011/02/09 00:15:30 taca Exp $
+$NetBSD: distinfo,v 1.79 2010/12/03 00:17:21 taca Exp $

-SHA1 (openssl-0.9.8q.tar.gz) = 12b6859698ca299fa0cba594686c25d5c01e410d
-RMD160 (openssl-0.9.8q.tar.gz) = 2a6583fc059f83232b16d0dad8855fc8086f2450
-Size (openssl-0.9.8q.tar.gz) = 3773961 bytes
+SHA1 (openssl-1.0.0d.tar.gz) = 32ca934f380a547061ddab7221b1a34e4e07e8d5
+RMD160 (openssl-1.0.0d.tar.gz) = 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846
+Size (openssl-1.1.0d.tar.gz) = 4025484 bytes
 SHA1 (patch-aa) = eb25505e8a745eb5ba85f857b0f9302fd5e9bda1
-SHA1 (patch-ac) = 6ff4a20440666f5c520837e10547091e1bee2208
+SHA1 (patch-ac) = 0a5c1e5e7c07d91c00259a2e3c5b76ebbe89a47f
 SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
 SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
-SHA1 (patch-af) = 2610930b6b06397fa2e3955b3244c02193f5b7a6
-SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8
+SHA1 (patch-af) = 1856317ff417adbc7669cd8709d6b4218a673747
+SHA1 (patch-ag) = 4698710d77399b386308a876f3ac45298b40bf22
 SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0
-SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302
-SHA1 (patch-ssl_t1__lib.c) = 0ec0cfd2c70c7d35c2bb1c6261d5817ea56941aa
--- openssl/patches/CVS/Entries	2011-02-11 05:05:56.000000000 +0000
+++ openssl-current/patches/CVS/Entries	2010-11-17 01:02:09.000000000 +0000
@@ -4,7 +4,6 @@
 /patch-al/1.4/Fri Jan 18 01:09:58 2008//
 /patch-ag/1.11/Wed Feb 20 01:17:38 2008//
 /patch-ac/1.38/Sat Feb 27 01:01:25 2010//
 /patch-af/1.24/Sat Feb 27 01:01:25 2010//
 /patch-aa/1.24/Thu Aug 19 01:05:33 2010//
-/patch-ssl_t1__lib.c/1.1/Wed Feb  9 00:15:30 2011//
 D
--- openssl/patches/patch-ac	2010-02-27 01:01:25.000000000 +0000
+++ openssl-current/patches/patch-ac	2011-01-19 21:20:09.000000000 +0000
@@ -1,64 +1,61 @@
-$NetBSD: patch-ac,v 1.38 2010/02/26 03:15:13 taca Exp $
+$NetBSD$

---- Configure.orig	2009-11-09 14:14:26.000000000 +0000
+--- Configure.orig	2010-11-30 22:19:26.000000000 +0000
 +++ Configure
-@@ -212,7 +212,7 @@ my %table=(
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -217,7 +217,7 @@ my %table=(
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-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",

  #### Solaris x86 with Sun C setups
 -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:elf:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",

  #### SPARC Solaris with GNU C setups
-@@ -324,6 +324,7 @@ my %table=(
+@@ -329,6 +329,7 @@ my %table=(
  #
- "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
-+"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-Wl,-msym:.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
+ "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",
++"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm} :dlfcn:coff:alpha-osf1-shared::-Wl,-msym:.so",
+ "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",

  ####
-@@ -386,6 +387,25 @@ my %table=(
- "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -395,6 +396,24 @@ my %table=(
+ "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 -DMD32_REG_T=int -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-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -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 -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}: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)",
-+"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)",
++"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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::::::::::::elf: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}:elf: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}::::::::::::elf: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}:elf:dlfcn:bsd-gcc-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}:::",
-@@ -821,6 +841,10 @@ PROCESS_ARGS:
+@@ -816,7 +835,7 @@ PROCESS_ARGS:
+ 			}
+ 		elsif (/^[-+]/)
+ 			{
+-			if (/^-[lL](.*)$/ or /^-Wl,/)
++			if (/^-[lL](.*)$/ or /^-Wl,(.*)$/)
  				{
  				$libs.=$_." ";
  				}
-+			elsif (/^-Wl,(.*)$/)
-+				{
-+				$libs.=$_." ";
-+				}
- 			elsif (/^-[^-]/ or /^\+/)
- 				{
- 				$flags.=$_." ";
-@@ -1566,7 +1590,7 @@ while (<IN>)
+@@ -1560,7 +1579,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
 -		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
 +		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
--- openssl/patches/patch-af	2010-02-27 01:01:25.000000000 +0000
+++ openssl-current/patches/patch-af	2011-01-19 21:32:43.000000000 +0000
@@ -1,55 +1,44 @@
-$NetBSD: patch-af,v 1.24 2010/02/26 03:15:14 taca Exp $
+$NetBSD$

---- Makefile.org.orig	2010-01-27 16:06:36.000000000 +0000
+--- Makefile.org.orig	2010-12-02 18:39:03.000000000 +0000
 +++ Makefile.org
-@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
+@@ -30,6 +30,7 @@ INSTALLTOP=/usr/local/ssl

  # Do not edit this manually. Use Configure --openssldir=DIR do change this!
  OPENSSLDIR=/usr/local/ssl
 +EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl

  # NO_IDEA - Define to build without the IDEA algorithm
  # NO_RC4  - Define to build without the RC4 algorithm
-@@ -132,8 +133,8 @@ FIPSCANLIB=
- 
- BASEADDR=
- 
--DIRS=   crypto fips ssl engines apps test tools
--SHLIBDIRS= crypto ssl fips
-+DIRS=   crypto ssl engines apps test tools # fips
-+SHLIBDIRS= crypto ssl # fips
- 
- # dirs in crypto to build
- SDIRS=  \
-@@ -153,7 +154,7 @@ TESTS = alltests
+@@ -133,7 +134,7 @@ TESTS = alltests

  MAKEFILE= Makefile

 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
  MAN1=1
  MAN3=3
  MANSUFFIX=
-@@ -169,6 +170,7 @@ SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_FIPS=
+@@ -150,6 +151,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+ SHARED_SSL=libssl$(SHLIB_EXT)
  SHARED_LIBS=
  SHARED_LIBS_LINK_EXTS=
 +LIBRPATH=$(INSTALLTOP)/lib
  SHARED_LDFLAGS=

  GENERAL=        Makefile
-@@ -615,7 +617,7 @@ dist:   
+@@ -494,7 +496,7 @@ dist:   
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)

 -install: all install_docs install_sw
 +install: install_docs install_sw

  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -695,35 +697,53 @@ install_docs:
+@@ -605,35 +607,53 @@ install_docs:
  	set -e; for i in doc/apps/*.pod; do \
  		fn=`basename $$i .pod`; \
  		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 -		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 +		case "$$fn" in \
@@ -66,16 +55,16 @@
  		$(PERL) util/extract-names.pl < $$i | \
  			(grep -v $$filecase "^$$fn\$$"; true) | \
  			(grep -v "[	]"; true) | \
  			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
  			 while read n; do \
--				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+-				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 +				case "$$n" in \
 +				CA.pl|openssl) on="$$n" ;; \
 +				*) on="openssl_$$n" ;; \
 +				esac; \
-+				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
++				PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
  			 done); \
  	done; \
  	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
  		fn=`basename $$i .pod`; \
  		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
@@ -95,15 +84,15 @@
  		$(PERL) util/extract-names.pl < $$i | \
  			(grep -v $$filecase "^$$fn\$$"; true) | \
  			(grep -v "[	]"; true) | \
  			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
  			 while read n; do \
--				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+-				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 +				case "$$n" in \
 +				ui*) on="openssl_$$n" ;; \
 +				[A-Z]*|*_*) on="$$n" ;; \
 +				*) on="openssl_$$n" ;; \
 +				esac; \
-+				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
++				PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
  			 done); \
  	done

--- openssl/patches/patch-ag	2008-02-20 01:17:38.000000000 +0000
+++ openssl-current/patches/patch-ag	2011-01-19 20:31:05.000000000 +0000
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.11 2008/02/20 01:10:20 tnn Exp $
+$NetBSD$

---- Makefile.shared.orig	2007-09-16 16:11:51.000000000 +0200
+--- Makefile.shared.orig	2010-08-21 11:36:49.000000000 +0000
 +++ Makefile.shared
-@@ -273,6 +273,11 @@ link_o.alpha-osf1:
- 	@ if ${DETECT_GNU_LD}; then \
+@@ -315,6 +315,11 @@ link_o.alpha-osf1:
+ 	@ if $(DETECT_GNU_LD); then \
  		$(DO_GNU_SO); \
  	else \
 +		if ($(CC) -v 2>&1 | grep gcc) > /dev/null; then \
 +			WL="-Wl,"; DELIM=","; \
 +		else \
 +			WL=""; DELIM=" "; \
 +		fi; \
  		SHLIB=lib$(LIBNAME).so; \
  		SHLIB_SUFFIX=; \
  		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-@@ -282,11 +287,11 @@ link_o.alpha-osf1:
+@@ -324,11 +329,11 @@ link_o.alpha-osf1:
  			SHLIB_HIST="$(LIBVERSION)"; \
  		fi; \
  		SHLIB_SOVER=; \
 -		ALLSYMSFLAGS='-all'; \
 -		NOALLSYMSFLAGS='-none'; \
@@ -27,23 +27,23 @@
 -			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 +			SHAREDFLAGS="$$SHAREDFLAGS $${WL}-set_version$${DELIM}$$SHLIB_HIST"; \
  		fi; \
  	fi; \
  	$(LINK_SO_O)
-@@ -294,6 +299,11 @@ link_a.alpha-osf1:
- 	@ if ${DETECT_GNU_LD}; then \
+@@ -336,6 +341,11 @@ link_a.alpha-osf1:
+ 	@ if $(DETECT_GNU_LD); then \
  		$(DO_GNU_SO); \
  	else \
 +		if ($(CC) -v 2>&1 | grep gcc) > /dev/null; then \
 +			WL="-Wl,"; DELIM=","; \
 +		else \
 +			WL=""; DELIM=" "; \
 +		fi; \
  		SHLIB=lib$(LIBNAME).so; \
  		SHLIB_SUFFIX=; \
  		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
-@@ -303,11 +313,11 @@ link_a.alpha-osf1:
+@@ -345,11 +355,11 @@ link_a.alpha-osf1:
  			SHLIB_HIST="$(LIBVERSION)"; \
  		fi; \
  		SHLIB_SOVER=; \
 -		ALLSYMSFLAGS='-all'; \
 -		NOALLSYMSFLAGS='-none'; \
@@ -54,11 +54,11 @@
 -			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 +			SHAREDFLAGS="$$SHAREDFLAGS $${WL}-set_version$${DELIM}$$SHLIB_HIST"; \
  		fi; \
  	fi; \
  	$(LINK_SO_A)
-@@ -442,7 +452,7 @@ link_a.irix:
+@@ -484,7 +494,7 @@ link_a.irix:
  		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
  		ALLSYMSFLAGS="$${MINUSWL}-all"; \
  		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
 -		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 +		SHAREDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
--- openssl/patches/patch-al	2008-01-18 01:09:58.000000000 +0000
+++ openssl-current/patches/patch-al	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.4 2008/01/17 06:42:49 tnn Exp $
-
---- apps/speed.c.orig	2006-06-09 17:42:11.000000000 +0200
-+++ apps/speed.c	2007-07-31 17:52:43.000000000 +0200
-@@ -108,12 +108,12 @@
- #include <signal.h>
- #endif
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) || defined(__DragonFly__)
- # define USE_TOD
- #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
- # define TIMES
- #endif
--#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
-+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__DragonFly__) /* FIXME */
- # define TIMEB
- #endif
- 
--- openssl/patches/patch-ssl_t1__lib.c	2011-02-09 00:15:30.000000000 +0000
+++ openssl-current/patches/patch-ssl_t1__lib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ssl_t1__lib.c,v 1.1 2011/02/09 00:15:30 taca Exp $
-
-Fix for security issue CVE-2011-0014.
-
---- ssl/t1_lib.c.orig	2010-11-16 14:26:18.000000000 +0000
-+++ ssl/t1_lib.c
-@@ -521,6 +521,7 @@ int ssl_parse_clienthello_tlsext(SSL *s,
- 						}
- 					n2s(data, idsize);
- 					dsize -= 2 + idsize;
-+					size -= 2 + idsize;
- 					if (dsize < 0)
- 						{
- 						*al = SSL_AD_DECODE_ERROR;
-@@ -559,9 +560,14 @@ int ssl_parse_clienthello_tlsext(SSL *s,
- 					}
- 
- 				/* Read in request_extensions */
-+				if (size < 2)
-+					{
-+					*al = SSL_AD_DECODE_ERROR;
-+					return 0;
-+					}
- 				n2s(data,dsize);
- 				size -= 2;
--				if (dsize > size) 
-+				if (dsize != size) 
- 					{
- 					*al = SSL_AD_DECODE_ERROR;
- 					return 0;

>Release-Note:

>Audit-Trail:

State-Changed-From-To: open->closed
State-Changed-By: jperkin@NetBSD.org
State-Changed-When: Thu, 07 Feb 2013 14:08:40 +0000
State-Changed-Why:
pkgsrc openssl is now at 1.0.1d


>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.