summaryrefslogtreecommitdiff
path: root/security/openssl/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/openssl/files')
-rw-r--r--security/openssl/files/patch-ac42
-rw-r--r--security/openssl/files/patch-ah66
-rw-r--r--security/openssl/files/patch-ak13
3 files changed, 84 insertions, 37 deletions
diff --git a/security/openssl/files/patch-ac b/security/openssl/files/patch-ac
index 457756975903..5a2e1ec045c5 100644
--- a/security/openssl/files/patch-ac
+++ b/security/openssl/files/patch-ac
@@ -1,13 +1,31 @@
---- Configure.orig Fri Mar 12 21:31:13 1999
-+++ Configure Tue Mar 23 22:06:03 1999
-@@ -157,8 +157,8 @@
- "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
- "NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
- #"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
--"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
--"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
-+"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
-+"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
- "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm",
- "nextstep", "cc:-O3 -Wall::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::",
+--- Configure.orig Sun May 23 18:29:07 1999
++++ Configure Fri May 28 22:03:00 1999
+@@ -156,7 +156,7 @@
+ "alpha-gcc","gcc:-O3:(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:::",
+ "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings:(unknown)::SIXTY_FOUR_BIT_LONG:::",
+ "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings:(unknown)::SIXTY_FOUR_BIT_LONG:::",
+-"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::",
++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}:(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::",
+
+ # assembler versions -- currently defunct:
+ ##"alpha-gcc","gcc:-O3:(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:asm/alpha.o::",
+@@ -175,8 +175,8 @@
+ "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+ "NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+ #"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+-"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+-"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
++"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
++"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+ "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486:(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm",
+ "nextstep", "cc:-O3 -Wall:(unknown)::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::",
# NCR MP-RAS UNIX ver 02.03.01
+@@ -293,7 +293,7 @@
+ my $perl;
+
+ $ranlib=&which("ranlib") or $ranlib="true";
+-$perl=&which("perl5") or $perl=&which("perl") or $perl="perl";
++$perl=$ENV{PERL};
+
+ &usage if ($#ARGV < 0);
+
diff --git a/security/openssl/files/patch-ah b/security/openssl/files/patch-ah
index 111ce78f8e57..09704c48181c 100644
--- a/security/openssl/files/patch-ah
+++ b/security/openssl/files/patch-ah
@@ -1,6 +1,6 @@
---- config.orig Sun Jan 17 15:20:20 1999
-+++ config Tue Mar 30 12:58:19 1999
-@@ -125,16 +125,12 @@
+--- config.orig Sun May 23 18:04:11 1999
++++ config Fri May 28 18:45:26 1999
+@@ -122,23 +122,12 @@
echo "${MACHINE}-whatever-bsdi"; exit 0
;;
@@ -8,8 +8,15 @@
- echo "${MACHINE}-whatever-freebsd3"; exit 0
- ;;
-
-- FreeBSD:*:*:*486*)
-- echo "i486-whatever-freebsd"; exit 0
+- FreeBSD:*:*:*386*)
+- case `sysctl -n hw.model` in
+- Pentium*)
+- echo "i586-whatever-freebsd"; exit 0
+- ;;
+- *)
+- echo "i386-whatever-freebsd"; exit 0
+- ;;
+- esac;
+ FreeBSD:[12]*:*:*)
+ echo "${MACHINE}-whatever-freebsd"; exit 0
;;
@@ -19,38 +26,47 @@
+ echo "${MACHINE}-whatever-freebsd3"; exit 0
;;
- NetBSD:*:*:*486*)
-@@ -282,15 +278,6 @@
+ NetBSD:*:*:*386*)
+@@ -276,23 +265,6 @@
esac
done
-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
--GCCVER=`gcc -v 2>&1`
+-GCCVER=`(gcc -v) 2>&1`
-if [ $? = "0" ]; then
- CC=gcc
-else
- CC=cc
+- if [ "$SYSTEM" = "SunOS" ]
+- then
+- case `cc -V 2>&1` in
+- *4*) CC=cc;;
+- *5*) CC=cc;;
+- *) CC=sc3;;
+- esac
+- fi
-fi
-
# read the output of the embedded GuessOS
read GUESSOS
-@@ -334,7 +321,7 @@
- # run Configure to check to see if we need to specify the
- # compiler for the platform ... in which case we add it on
- # the end ... otherwise we leave it off
--perl ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
-+${PERL} ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
- if [ $? = "0" ]; then
- OUT="$OUT-$CC"
- fi
-@@ -349,7 +336,7 @@
- if [ "$TEST" = "true" ]; then
- echo ./Configure $OUT $options
- else
-- perl ./Configure $OUT $options
-+ ${PERL} ./Configure $OUT $options
- fi
+@@ -331,18 +303,6 @@
+ # *-dgux) OUT="dgux" ;;
+ *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
+ esac
+-
+-# gcc < 2.8 does not support -mcpu=ultrasparc
+-if [ "$OUT" = solaris-usparc-gcc ]
+-then
+- GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`"
+- GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`"
+- echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x"
+- if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ]
+- then
+- OUT=solaris-usparc-oldgcc
+- fi
+-fi
- )
+ case "$GUESSOS" in
+ i386-*) options="$options 386" ;;
diff --git a/security/openssl/files/patch-ak b/security/openssl/files/patch-ak
new file mode 100644
index 000000000000..819def697e15
--- /dev/null
+++ b/security/openssl/files/patch-ak
@@ -0,0 +1,13 @@
+--- apps/Makefile.ssl.orig Sun May 23 14:36:09 1999
++++ apps/Makefile.ssl Fri May 28 22:29:19 1999
+@@ -101,8 +101,8 @@
+ 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 openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample; \
++ chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
+
+ tags:
+ ctags $(SRC)