diff options
author | Jan Seidel <tuxus@gentoo.org> | 2003-02-09 14:19:20 +0000 |
---|---|---|
committer | Jan Seidel <tuxus@gentoo.org> | 2003-02-09 14:19:20 +0000 |
commit | 00e88e2dcbbc2052fbabf9e33bdbb90fcf630223 (patch) | |
tree | e3b31bc9385f7049225ae33bfa41b6bff4743b03 /dev-libs | |
parent | Added a patch for mips (diff) | |
download | gentoo-2-00e88e2dcbbc2052fbabf9e33bdbb90fcf630223.tar.gz gentoo-2-00e88e2dcbbc2052fbabf9e33bdbb90fcf630223.tar.bz2 gentoo-2-00e88e2dcbbc2052fbabf9e33bdbb90fcf630223.zip |
*** empty log message ***
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff index 52ce504989f4..e1091cfd8f2d 100644 --- a/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff +++ b/dev-libs/openssl/files/openssl-0.9.6g-gentoo.diff @@ -1,49 +1,49 @@ -diff -ur openssl-0.9.6g-orig/Configure openssl-0.9.6g/Configure ---- openssl-0.9.6g-orig/Configure 2002-08-08 23:12:40.000000000 +0200 -+++ openssl-0.9.6g/Configure 2003-02-04 15:15:02.000000000 +0100 -@@ -341,7 +341,7 @@ - "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", - "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", - "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", --"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", -+"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", - "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR),\$(SHLIB_MINOR)", -Only in openssl-0.9.6g: Configure~ -diff -ur openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c ---- openssl-0.9.6g-orig/crypto/des/fcrypt.c 2002-01-08 10:19:55.000000000 +0100 -+++ openssl-0.9.6g/crypto/des/fcrypt.c 2003-02-04 15:14:14.000000000 +0100 -@@ -61,7 +61,7 @@ - void fcrypt_body(DES_LONG *out,des_key_schedule ks, - DES_LONG Eswap0, DES_LONG Eswap1); - --#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) -+#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__) - char *crypt(const char *buf, const char *salt) - { - return(des_crypt(buf, salt)); -diff -ur openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile ---- openssl-0.9.6g-orig/test/Makefile 2002-08-08 23:18:13.000000000 +0200 -+++ openssl-0.9.6g/test/Makefile 2003-02-04 15:14:14.000000000 +0100 -@@ -27,7 +27,7 @@ - - DLIBCRYPTO= ../libcrypto.a - DLIBSSL= ../libssl.a --LIBCRYPTO= -L.. -lcrypto -+LIBCRYPTO= -L.. -lcrypto -lcrypt - LIBSSL= -L.. -lssl - - BNTEST= bntest -diff -ur openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl ---- openssl-0.9.6g-orig/test/Makefile.ssl 2002-08-08 23:18:13.000000000 +0200 -+++ openssl-0.9.6g/test/Makefile.ssl 2003-02-04 15:14:14.000000000 +0100 -@@ -27,7 +27,7 @@ - - DLIBCRYPTO= ../libcrypto.a - DLIBSSL= ../libssl.a --LIBCRYPTO= -L.. -lcrypto -+LIBCRYPTO= -L.. -lcrypto -lcrypt - LIBSSL= -L.. -lssl - - BNTEST= bntest +diff -r -c -C 2 openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c +*** openssl-0.9.6g-orig/crypto/des/fcrypt.c Thu Sep 26 15:20:47 2002 +--- openssl-0.9.6g/crypto/des/fcrypt.c Thu Sep 26 15:21:24 2002 +*************** +*** 62,66 **** + DES_LONG Eswap0, DES_LONG Eswap1); + +! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) + char *crypt(const char *buf, const char *salt) + { +--- 62,66 ---- + DES_LONG Eswap0, DES_LONG Eswap1); + +! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__) + char *crypt(const char *buf, const char *salt) + { +diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile +*** openssl-0.9.6g-orig/test/Makefile Thu Sep 26 15:20:47 2002 +--- openssl-0.9.6g/test/Makefile Thu Sep 26 15:23:26 2002 +*************** +*** 28,32 **** + DLIBCRYPTO= ../libcrypto.a + DLIBSSL= ../libssl.a +! LIBCRYPTO= -L.. -lcrypto + LIBSSL= -L.. -lssl + +--- 28,32 ---- + DLIBCRYPTO= ../libcrypto.a + DLIBSSL= ../libssl.a +! LIBCRYPTO= -L.. -lcrypto -lcrypt + LIBSSL= -L.. -lssl + +diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl +*** openssl-0.9.6g-orig/test/Makefile.ssl Thu Sep 26 15:20:47 2002 +--- openssl-0.9.6g/test/Makefile.ssl Thu Sep 26 15:23:26 2002 +*************** +*** 28,32 **** + DLIBCRYPTO= ../libcrypto.a + DLIBSSL= ../libssl.a +! LIBCRYPTO= -L.. -lcrypto + LIBSSL= -L.. -lssl + +--- 28,32 ---- + DLIBCRYPTO= ../libcrypto.a + DLIBSSL= ../libssl.a +! LIBCRYPTO= -L.. -lcrypto -lcrypt + LIBSSL= -L.. -lssl + + |