diff options
Diffstat (limited to 'security/libmcrypt/files')
| -rw-r--r-- | security/libmcrypt/files/patch-aa | 11 | ||||
| -rw-r--r-- | security/libmcrypt/files/patch-ab | 11 | ||||
| -rw-r--r-- | security/libmcrypt/files/patch-ac | 319 | ||||
| -rw-r--r-- | security/libmcrypt/files/patch-ltmain.sh | 37 |
4 files changed, 37 insertions, 341 deletions
diff --git a/security/libmcrypt/files/patch-aa b/security/libmcrypt/files/patch-aa deleted file mode 100644 index aa35e0d91dc5..000000000000 --- a/security/libmcrypt/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig Sat Jun 9 05:10:45 2001 -+++ lib/Makefile.in Thu Jun 14 20:43:39 2001 -@@ -100,7 +100,7 @@ - - lib_LTLIBRARIES = libmcrypt.la - libmcrypt_la_SOURCES = mcrypt_extra.c mcrypt.c bzero.c xmemory.c mcrypt_modules.c win32_comp.c mcrypt_threads.c --libmcrypt_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-symbols libmcrypt.sym -+libmcrypt_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-symbols libmcrypt.sym $(LIBLTDL) - m4datadir = $(datadir)/aclocal - m4data_DATA = libmcrypt.m4 - bin_SCRIPTS = libmcrypt-config diff --git a/security/libmcrypt/files/patch-ab b/security/libmcrypt/files/patch-ab deleted file mode 100644 index f17fdbe63363..000000000000 --- a/security/libmcrypt/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Sat Jun 16 13:37:41 2001 -+++ doc/Makefile.in Sat Jun 16 13:40:26 2001 -@@ -133,7 +133,7 @@ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ inst=$$inst.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ - done diff --git a/security/libmcrypt/files/patch-ac b/security/libmcrypt/files/patch-ac deleted file mode 100644 index e6f14be2457f..000000000000 --- a/security/libmcrypt/files/patch-ac +++ /dev/null @@ -1,319 +0,0 @@ ---- modules/algorithms/3-way.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/3-way.c Fri May 4 18:34:19 2001 -@@ -19,7 +19,7 @@ - #define STRT_D 0xb1b1 /* round constant of first decryption round */ - #define NMBR 11 /* number of rounds is 11 */ - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key threeway_LTX__mcrypt_set_key - #define _mcrypt_encrypt threeway_LTX__mcrypt_encrypt - #define _mcrypt_decrypt threeway_LTX__mcrypt_decrypt ---- modules/algorithms/arcfour.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/arcfour.c Fri May 4 18:34:07 2001 -@@ -22,7 +22,7 @@ - #include <stdlib.h> - #include "arcfour.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key arcfour_LTX__mcrypt_set_key - #define _mcrypt_encrypt arcfour_LTX__mcrypt_encrypt - #define _mcrypt_decrypt arcfour_LTX__mcrypt_decrypt ---- modules/algorithms/blowfish-compat.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/blowfish-compat.c Fri May 4 18:33:53 2001 -@@ -15,7 +15,7 @@ - - #define WORDS_BIGENDIAN - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key blowfish_compat_LTX__mcrypt_set_key - #define _mcrypt_encrypt blowfish_compat_LTX__mcrypt_encrypt - #define _mcrypt_decrypt blowfish_compat_LTX__mcrypt_decrypt ---- modules/algorithms/blowfish.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/blowfish.c Fri May 4 18:33:39 2001 -@@ -13,7 +13,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "blowfish.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key blowfish_LTX__mcrypt_set_key - #define _mcrypt_encrypt blowfish_LTX__mcrypt_encrypt - #define _mcrypt_decrypt blowfish_LTX__mcrypt_decrypt ---- modules/algorithms/cast-128.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/cast-128.c Fri May 4 18:33:28 2001 -@@ -19,7 +19,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "cast-128.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key cast_128_LTX__mcrypt_set_key - #define _mcrypt_encrypt cast_128_LTX__mcrypt_encrypt - #define _mcrypt_decrypt cast_128_LTX__mcrypt_decrypt ---- modules/algorithms/cast-256.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/cast-256.c Fri May 4 18:33:15 2001 -@@ -68,7 +68,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "cast-256.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key cast_256_LTX__mcrypt_set_key - #define _mcrypt_encrypt cast_256_LTX__mcrypt_encrypt - #define _mcrypt_decrypt cast_256_LTX__mcrypt_decrypt ---- modules/algorithms/des.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/des.c Fri May 4 18:33:02 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "des.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key des_LTX__mcrypt_set_key - #define _mcrypt_encrypt des_LTX__mcrypt_encrypt - #define _mcrypt_decrypt des_LTX__mcrypt_decrypt ---- modules/algorithms/enigma.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/enigma.c Fri May 4 18:32:32 2001 -@@ -19,7 +19,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "enigma.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key enigma_LTX__mcrypt_set_key - #define _mcrypt_encrypt enigma_LTX__mcrypt_encrypt - #define _mcrypt_decrypt enigma_LTX__mcrypt_decrypt ---- modules/algorithms/gost.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/gost.c Fri May 4 18:32:20 2001 -@@ -40,7 +40,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key gost_LTX__mcrypt_set_key - #define _mcrypt_encrypt gost_LTX__mcrypt_encrypt - #define _mcrypt_decrypt gost_LTX__mcrypt_decrypt ---- modules/algorithms/loki97.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/loki97.c Fri May 4 18:32:07 2001 -@@ -66,7 +66,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key loki97_LTX__mcrypt_set_key - #define _mcrypt_encrypt loki97_LTX__mcrypt_encrypt - #define _mcrypt_decrypt loki97_LTX__mcrypt_decrypt ---- modules/algorithms/panama.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/panama.c Fri May 4 18:31:50 2001 -@@ -41,7 +41,7 @@ - #include "panama.h" - - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key panama_LTX__mcrypt_set_key - #define _mcrypt_encrypt panama_LTX__mcrypt_encrypt - #define _mcrypt_decrypt panama_LTX__mcrypt_decrypt ---- modules/algorithms/rc2.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/rc2.c Fri May 4 18:31:36 2001 -@@ -20,7 +20,7 @@ - /* #include <assert.h> */ - #include "rc2.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key rc2_LTX__mcrypt_set_key - #define _mcrypt_encrypt rc2_LTX__mcrypt_encrypt - #define _mcrypt_decrypt rc2_LTX__mcrypt_decrypt ---- modules/algorithms/rijndael-128.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/rijndael-128.c Fri May 4 18:31:21 2001 -@@ -25,7 +25,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "rijndael.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key rijndael_128_LTX__mcrypt_set_key - #define _mcrypt_encrypt rijndael_128_LTX__mcrypt_encrypt - #define _mcrypt_decrypt rijndael_128_LTX__mcrypt_decrypt ---- modules/algorithms/rijndael-192.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/rijndael-192.c Fri May 4 18:31:05 2001 -@@ -26,7 +26,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "rijndael.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key rijndael_192_LTX__mcrypt_set_key - #define _mcrypt_encrypt rijndael_192_LTX__mcrypt_encrypt - #define _mcrypt_decrypt rijndael_192_LTX__mcrypt_decrypt ---- modules/algorithms/rijndael-256.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/rijndael-256.c Fri May 4 18:30:52 2001 -@@ -25,7 +25,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "rijndael.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key rijndael_256_LTX__mcrypt_set_key - #define _mcrypt_encrypt rijndael_256_LTX__mcrypt_encrypt - #define _mcrypt_decrypt rijndael_256_LTX__mcrypt_decrypt ---- modules/algorithms/safer128.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/safer128.c Fri May 4 18:30:36 2001 -@@ -31,7 +31,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "safer.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key safer_sk128_LTX__mcrypt_set_key - #define _mcrypt_encrypt safer_sk128_LTX__mcrypt_encrypt - #define _mcrypt_decrypt safer_sk128_LTX__mcrypt_decrypt ---- modules/algorithms/safer64.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/safer64.c Fri May 4 18:30:22 2001 -@@ -31,7 +31,7 @@ - #include "safer.h" - - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key safer_sk64_LTX__mcrypt_set_key - #define _mcrypt_encrypt safer_sk64_LTX__mcrypt_encrypt - #define _mcrypt_decrypt safer_sk64_LTX__mcrypt_decrypt ---- modules/algorithms/saferplus.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/saferplus.c Fri May 4 18:30:07 2001 -@@ -68,7 +68,7 @@ - #include "saferplus.h" - #include <stdlib.h> - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key saferplus_LTX__mcrypt_set_key - #define _mcrypt_encrypt saferplus_LTX__mcrypt_encrypt - #define _mcrypt_decrypt saferplus_LTX__mcrypt_decrypt ---- modules/algorithms/serpent.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/serpent.c Fri May 4 18:29:51 2001 -@@ -43,7 +43,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "serpent.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key serpent_LTX__mcrypt_set_key - #define _mcrypt_encrypt serpent_LTX__mcrypt_encrypt - #define _mcrypt_decrypt serpent_LTX__mcrypt_decrypt ---- modules/algorithms/tripledes.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/tripledes.c Fri May 4 18:29:35 2001 -@@ -22,7 +22,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "tripledes.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key tripledes_LTX__mcrypt_set_key - #define _mcrypt_encrypt tripledes_LTX__mcrypt_encrypt - #define _mcrypt_decrypt tripledes_LTX__mcrypt_decrypt ---- modules/algorithms/twofish.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/twofish.c Fri May 4 18:29:01 2001 -@@ -48,7 +48,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "twofish.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key twofish_LTX__mcrypt_set_key - #define _mcrypt_encrypt twofish_LTX__mcrypt_encrypt - #define _mcrypt_decrypt twofish_LTX__mcrypt_decrypt ---- modules/algorithms/wake.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/wake.c Fri May 4 18:28:45 2001 -@@ -21,7 +21,7 @@ - #include "../../lib/mcrypt_modules.h" - #include "wake.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key wake_LTX__mcrypt_set_key - #define _mcrypt_encrypt wake_LTX__mcrypt_encrypt - #define _mcrypt_decrypt wake_LTX__mcrypt_decrypt ---- modules/algorithms/xtea.c.orig Fri May 4 18:28:02 2001 -+++ modules/algorithms/xtea.c Fri May 4 18:28:27 2001 -@@ -13,7 +13,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _mcrypt_set_key xtea_LTX__mcrypt_set_key - #define _mcrypt_encrypt xtea_LTX__mcrypt_encrypt - #define _mcrypt_decrypt xtea_LTX__mcrypt_decrypt ---- modules/modes/cbc.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/cbc.c Fri May 4 18:39:30 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt cbc_LTX__init_mcrypt - #define _mcrypt_set_state cbc_LTX__mcrypt_set_state - #define _end_mcrypt cbc_LTX__end_mcrypt ---- modules/modes/cfb.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/cfb.c Fri May 4 18:39:18 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt cfb_LTX__init_mcrypt - #define _mcrypt_set_state cfb_LTX__mcrypt_set_state - #define _end_mcrypt cfb_LTX__end_mcrypt ---- modules/modes/ecb.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/ecb.c Fri May 4 18:39:04 2001 -@@ -22,7 +22,7 @@ - - /* EBC MODE */ - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt ecb_LTX__init_mcrypt - #define _end_mcrypt ecb_LTX__end_mcrypt - #define _mcrypt ecb_LTX__mcrypt ---- modules/modes/nofb.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/nofb.c Fri May 4 18:38:45 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt nofb_LTX__init_mcrypt - #define _mcrypt_set_state nofb_LTX__mcrypt_set_state - #define _end_mcrypt nofb_LTX__end_mcrypt ---- modules/modes/ofb.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/ofb.c Fri May 4 18:38:25 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt ofb_LTX__init_mcrypt - #define _mcrypt_set_state cfb_LTX__mcrypt_set_state - #define _end_mcrypt ofb_LTX__end_mcrypt ---- modules/modes/stream.c.orig Fri May 4 18:37:39 2001 -+++ modules/modes/stream.c Fri May 4 18:38:09 2001 -@@ -20,7 +20,7 @@ - #include "../../lib/libdefs.h" - #include "../../lib/mcrypt_modules.h" - --#ifdef USE_LTDL -+#if defined(USE_LTDL) && !defined(__FreeBSD__) - #define _init_mcrypt stream_LTX__init_mcrypt - #define _mcrypt_set_state stream_LTX__mcrypt_set_state - #define _end_mcrypt stream_LTX__end_mcrypt diff --git a/security/libmcrypt/files/patch-ltmain.sh b/security/libmcrypt/files/patch-ltmain.sh new file mode 100644 index 000000000000..93009a29d79c --- /dev/null +++ b/security/libmcrypt/files/patch-ltmain.sh @@ -0,0 +1,37 @@ +--- ltmain.sh.orig Tue Nov 13 21:50:10 2001 ++++ ltmain.sh Sat Nov 24 22:47:52 2001 +@@ -953,6 +953,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -1040,7 +1041,7 @@ + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd* ) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; +@@ -1048,7 +1049,7 @@ + fi + if test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd* ) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -2439,7 +2440,7 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd* ) + # Do not include libc due to us having libc/libc_r. + ;; + *) |