diff options
Diffstat (limited to 'security/openssl/patches')
| -rw-r--r-- | security/openssl/patches/patch-aa | 65 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ab | 89 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ac | 39 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ad | 21 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ae | 15 | ||||
| -rw-r--r-- | security/openssl/patches/patch-af | 36 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ag | 25 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ai | 13 | ||||
| -rw-r--r-- | security/openssl/patches/patch-aj | 18 |
9 files changed, 151 insertions, 170 deletions
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa index 844617fe4eb..7a44be0f9c8 100644 --- a/security/openssl/patches/patch-aa +++ b/security/openssl/patches/patch-aa @@ -1,63 +1,24 @@ -$NetBSD: patch-aa,v 1.8 2002/07/28 05:36:30 schmonz Exp $ +$NetBSD: patch-aa,v 1.9 2002/08/04 15:47:46 fredb Exp $ ---- config.orig Thu Sep 21 05:23:14 2000 +--- config.orig Sun Jun 16 05:32:14 2002 +++ config -@@ -83,6 +83,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ - echo "${MACHINE}-ibm-aix"; exit 0 - ;; - -+ Darwin:*) -+ echo "`uname -p`-apple-darwin${RELEASE}"; exit 0 -+ ;; -+ - dgux:*) - echo "${MACHINE}-dg-dgux"; exit 0 - ;; -@@ -167,10 +171,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ - echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0 - ;; - -- NetBSD:*:*:*386*) -- echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0 -+ NetBSD:*:*:i386) -+ if echo __ELF__ | cc -E - | grep -q __ELF__; then -+ echo "i386-whatever-netbsd"; exit 0 -+ else -+ echo "i386elf-whatever-netbsd"; exit 0 -+ fi - ;; -- -+ - NetBSD:*) - echo "${MACHINE}-whatever-netbsd"; exit 0 - ;; -@@ -330,6 +338,7 @@ else +@@ -388,7 +388,7 @@ + # does give us what we want though, so we use that. We just just the + # major and minor version numbers. + # peak single digit before and after first dot, e.g. 2.95.1 gives 29 +- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` ++ GCCVER=`echo $GCCVER | sed 's/[^.]*\([0-9]\)\.\([0-9]\).*/\1\2/'` + else CC=cc fi - -+if false; then - if [ "$SYSTEM" = "SunOS" ]; then - # check for WorkShop C, expected output is "cc: blah-blah C x.x" - CCVER=`(cc -V 2>&1) 2>/dev/null | \ -@@ -347,6 +356,7 @@ if [ "$SYSTEM" = "SunOS" ]; then - CC=sc3 - fi - fi -+fi - - if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then - # check for Compaq C, expected output is "blah-blah C Vx.x" -@@ -454,9 +464,10 @@ case "$GUESSOS" in - alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; +@@ -577,8 +577,8 @@ *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; *-freebsd[1-2]*) OUT="FreeBSD" ;; -- *86*-*-netbsd) OUT="NetBSD-x86" ;; + *86*-*-netbsd) OUT="NetBSD-x86" ;; - sun3*-*-netbsd) OUT="NetBSD-m68" ;; - *-*-netbsd) OUT="NetBSD-sparc" ;; -+ *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;; -+ *86-*-netbsd) OUT="NetBSD-i386" ;; -+ *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;; -+ *-*-darwin*) OUT="Darwin" ;; ++ sun3*-*-netbsd) OUT="NetBSD-m68k" ;; ++ *-*-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;; *86*-*-openbsd) OUT="OpenBSD-x86" ;; alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; pmax*-*-openbsd) OUT="OpenBSD-mips" ;; diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab index 1d5b8797271..832c6b4da1c 100644 --- a/security/openssl/patches/patch-ab +++ b/security/openssl/patches/patch-ab @@ -1,82 +1,13 @@ -$NetBSD: patch-ab,v 1.7 2001/07/11 01:26:10 wiz Exp $ +$NetBSD: patch-ab,v 1.8 2002/08/04 15:47:46 fredb Exp $ ---- crypto/rand/md_rand.c.orig Mon Sep 11 14:42:39 2000 -+++ crypto/rand/md_rand.c -@@ -308,6 +308,7 @@ - { - static volatile int stirred_pool = 0; - int i,j,k,st_num,st_idx; -+ int num_ceil; - int ok; - long md_c[2]; - unsigned char local_md[MD_DIGEST_LENGTH]; -@@ -328,6 +329,12 @@ - } - #endif +--- crypto/opensslv.h.orig Tue Jul 30 05:34:28 2002 ++++ crypto/opensslv.h +@@ -79,7 +79,7 @@ + * should only keep the versions that are binary compatible with the current. + */ + #define SHLIB_VERSION_HISTORY "" +-#define SHLIB_VERSION_NUMBER "0.9.6" ++#define SHLIB_VERSION_NUMBER "300.0" -+ if (num <= 0) -+ return 1; -+ -+ /* round upwards to multiple of MD_DIGEST_LENGTH/2 */ -+ num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2); -+ - /* - * (Based on the rand(3) manpage:) - * -@@ -409,11 +416,11 @@ - md_c[1] = md_count[1]; - memcpy(local_md, md, sizeof md); - -- state_index+=num; -+ state_index+=num_ceil; - if (state_index > state_num) - state_index %= state_num; - -- /* state[st_idx], ..., state[(st_idx + num - 1) % st_num] -+ /* state[st_idx], ..., state[(st_idx + num_ceil - 1) % st_num] - * are now ours (but other threads may use them too) */ - - md_count[0] += 1; -@@ -424,6 +431,7 @@ - - while (num > 0) - { -+ /* num_ceil -= MD_DIGEST_LENGTH/2 */ - j=(num >= MD_DIGEST_LENGTH/2)?MD_DIGEST_LENGTH/2:num; - num-=j; - MD_Init(&m); -@@ -434,27 +442,28 @@ - curr_pid = 0; - } - #endif -- MD_Update(&m,&(local_md[MD_DIGEST_LENGTH/2]),MD_DIGEST_LENGTH/2); -+ MD_Update(&m,local_md,MD_DIGEST_LENGTH); - MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); - #ifndef PURIFY - MD_Update(&m,buf,j); /* purify complains */ - #endif -- k=(st_idx+j)-st_num; -+ k=(st_idx+MD_DIGEST_LENGTH/2)-st_num; - if (k > 0) - { -- MD_Update(&m,&(state[st_idx]),j-k); -+ MD_Update(&m,&(state[st_idx]),MD_DIGEST_LENGTH/2-k); - MD_Update(&m,&(state[0]),k); - } - else -- MD_Update(&m,&(state[st_idx]),j); -+ MD_Update(&m,&(state[st_idx]),MD_DIGEST_LENGTH/2); - MD_Final(local_md,&m); - -- for (i=0; i<j; i++) -+ for (i=0; i<MD_DIGEST_LENGTH/2; i++) - { - state[st_idx++]^=local_md[i]; /* may compete with other threads */ -- *(buf++)=local_md[i+MD_DIGEST_LENGTH/2]; - if (st_idx >= st_num) - st_idx=0; -+ if (i < j) -+ *(buf++)=local_md[i+MD_DIGEST_LENGTH/2]; - } - } + #endif /* HEADER_OPENSSLV_H */ diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac index 2721ed5687b..6e0d2b3833e 100644 --- a/security/openssl/patches/patch-ac +++ b/security/openssl/patches/patch-ac @@ -1,12 +1,35 @@ -$NetBSD: patch-ac,v 1.4 2002/07/28 05:36:30 schmonz Exp $ +$NetBSD: patch-ac,v 1.5 2002/08/04 15:47:46 fredb Exp $ ---- Configure.orig Thu Jul 25 20:08:05 2002 +--- Configure.orig Thu Aug 1 14:11:00 2002 +++ Configure -@@ -404,6 +404,7 @@ my %table=( +@@ -347,9 +347,6 @@ + "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", + "linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "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)", +-"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)", + "FreeBSD-elf", "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)", + "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", + "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", +@@ -500,6 +482,20 @@ - ##### MacOS X (a.k.a. Rhapsody) setup - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -+"Darwin","cc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DUSE_TOD::(unknown):::::::::::::darwin-shared:-fno-common:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + ##### VxWorks for various targets + "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::", ++ ++##### NetBSD ++"NetBSD-alpha", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-arm32", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-m68000", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-m68k", "gcc:-DTERMIOS -O2 -m68020-40 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-mipseb", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-mipsel", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib: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):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-sparc", "gcc:-DTERMIOS -O2 -mv8 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib: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):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_RISC1::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"NetBSD-x86", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + ); - ##### Sony NEWS-OS 4.x - "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad new file mode 100644 index 00000000000..c1d46b8488c --- /dev/null +++ b/security/openssl/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.6 2002/08/04 15:47:46 fredb Exp $ + +--- apps/Makefile.ssl.orig Tue Jul 30 04:29:57 2002 ++++ apps/Makefile.ssl +@@ -99,11 +100,11 @@ + @for i in $(SCRIPTS); \ + do \ + (echo installing $$i; \ +- cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ +- chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ +- done +- @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \ +- chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf ++ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i; \ ++ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i ); \ ++ done; ++ @cp openssl.cnf $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/; \ ++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/openssl.cnf + + tags: + ctags $(SRC) diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae new file mode 100644 index 00000000000..99febec539e --- /dev/null +++ b/security/openssl/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.5 2002/08/04 15:47:46 fredb Exp $ + +--- tools/Makefile.ssl.orig Thu Apr 29 16:52:08 1999 ++++ tools/Makefile.ssl +@@ -31,8 +31,8 @@ + done; + @for i in $(MISC_APPS) ; \ + do \ +- (cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ +- chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ ++ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ ++ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ + done; + + files: diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af new file mode 100644 index 00000000000..e23a3936201 --- /dev/null +++ b/security/openssl/patches/patch-af @@ -0,0 +1,36 @@ +$NetBSD: patch-af,v 1.4 2002/08/04 15:47:47 fredb Exp $ + +--- Makefile.org.orig Fri Jul 19 11:33:26 2002 ++++ Makefile.org +@@ -169,7 +169,7 @@ + MAKEFILE= Makefile.ssl + MAKE= make -f Makefile.ssl + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=$(INSTALLTOP)/man + MAN1=1 + MAN3=3 + SHELL=/bin/sh +@@ -261,7 +261,7 @@ + libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \ + ( set -x; ${CC} ${SHARED_LDFLAGS} \ + -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +- -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ++ -Wl,-soname=lib$$i.so.${SHLIB_MAJOR} \ + -Wl,-Bsymbolic \ + -Wl,--whole-archive lib$$i.a \ + -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ +@@ -631,10 +631,10 @@ + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ + $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ +- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ ++ $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl \ ++ $(INSTALL_PREFIX)$(OPENSSLDIR) \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ +- $(INSTALL_PREFIX)$(OPENSSLDIR)/private \ +- $(INSTALL_PREFIX)$(OPENSSLDIR)/lib ++ $(INSTALL_PREFIX)$(OPENSSLDIR)/private + @for i in $(EXHEADER) ;\ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ diff --git a/security/openssl/patches/patch-ag b/security/openssl/patches/patch-ag new file mode 100644 index 00000000000..cef3e9c6646 --- /dev/null +++ b/security/openssl/patches/patch-ag @@ -0,0 +1,25 @@ +$NetBSD: patch-ag,v 1.4 2002/08/04 15:47:47 fredb Exp $ + +--- e_os.h.orig Fri Aug 2 15:08:30 2002 ++++ e_os.h +@@ -431,6 +431,20 @@ + (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) + #endif + ++#if defined(__NetBSD_Version__) ++#define NetBSD_1_4_3 104000300 ++#define NetBSD_1_4A 104010000 ++#define NetBSD_1_4K 104110000 ++#if (__NetBSD_Version__ < NetBSD_1_4_3) || \ ++ (__NetBSD_Version__ >= NetBSD_1_4A) && (__NetBSD_Version__ <= NetBSD_1_4K) ++#include <string.h> ++# define strlcat(s2,s1,n) \ ++ (strncat(s2,s1,n); n ? memset(s2[n-1],0,1) : 0; strlen(s1) + strlen(s2)) ++# define strlcpy(s2,s1,n) \ ++ (strncpy(s2,s1,n); n ? memset(s2[n-1],0,1) : 0; strlen(s1)) ++#endif ++#endif /* __NetBSD_Version__ */ ++ + /***********************************************/ + + /* do we need to do this for getenv. diff --git a/security/openssl/patches/patch-ai b/security/openssl/patches/patch-ai deleted file mode 100644 index e5749d1e7fe..00000000000 --- a/security/openssl/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.2 1999/11/25 18:51:47 erh Exp $ - ---- apps/ca.c.orig Fri Aug 6 16:47:09 1999 -+++ apps/ca.c Wed Oct 20 17:49:43 1999 -@@ -98,7 +98,7 @@ - #define PROG ca_main - - #define BASE_SECTION "ca" --#define CONFIG_FILE "openssl.cnf" -+#define CONFIG_FILE "etc/openssl.cnf" - - #define ENV_DEFAULT_CA "default_ca" - diff --git a/security/openssl/patches/patch-aj b/security/openssl/patches/patch-aj deleted file mode 100644 index 19faff6cc56..00000000000 --- a/security/openssl/patches/patch-aj +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2001/05/11 22:14:11 tron Exp $ - ---- e_os.h.orig Thu Sep 21 11:23:14 2000 -+++ e_os.h Sat May 12 00:03:27 2001 -@@ -1,4 +1,3 @@ --/* e_os.h */ - /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * -@@ -297,7 +296,7 @@ - typedef unsigned long clock_t; - # endif - --# define OPENSSL_CONF "openssl.cnf" -+# define OPENSSL_CONF "etc/openssl.cnf" - # define SSLEAY_CONF OPENSSL_CONF - # define RFILE ".rnd" - # define LIST_SEPARATOR_CHAR ':' |