Update to libmcrypt-2.5.5

For the moment, this disables dynamic module loading and bundles
together all the ciphers into the main library.  When libtool-1.4
hits our tree, the updated ltdl support can be used to re-enable
the dynloading.
This commit is contained in:
avsm 2003-01-18 22:53:29 +00:00
parent e41353896b
commit ec0e440b0a
6 changed files with 8 additions and 206 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2002/12/29 20:31:40 fgsch Exp $
# $OpenBSD: Makefile,v 1.13 2003/01/18 22:53:29 avsm Exp $
COMMENT= "interface to access block/stream encryption algorithms"
DISTNAME= libmcrypt-2.4.15
DISTNAME= libmcrypt-2.5.5
CATEGORIES= security
MASTER_SITES= ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/ \
ftp://argeas.cs-net.gr/pub/unix/mcrypt/libmcrypt/

View File

@ -1,3 +1,3 @@
MD5 (libmcrypt-2.4.15.tar.gz) = 2fab8ff457ce59ca55b8301f389c4a7e
RMD160 (libmcrypt-2.4.15.tar.gz) = 6aaa677640cabc4bd8bdcfb3399172e79d18482a
SHA1 (libmcrypt-2.4.15.tar.gz) = dcad99877f1d6f7df6919a30f84845c827f46340
MD5 (libmcrypt-2.5.5.tar.gz) = c5b0d48ddd62a9b8ae7cd9944f3deaba
RMD160 (libmcrypt-2.5.5.tar.gz) = 43ee4eb560875b8baeca0271eaf4720d11b5aefe
SHA1 (libmcrypt-2.5.5.tar.gz) = 50bc659d6fc25d11a8299cf438015514050332e9

View File

@ -1,86 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2001/10/13 22:56:24 avsm Exp $
--- aclocal.m4.orig Sat Oct 13 19:24:31 2001
+++ aclocal.m4 Sat Oct 13 19:27:23 2001
@@ -866,7 +866,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -1269,7 +1276,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1673,10 +1682,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2150,9 +2173,25 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2002/04/07 07:19:50 pvalchev Exp $
--- configure.orig Sat Jun 9 04:10:14 2001
+++ configure Sat Apr 6 23:59:17 2002
@@ -6707,7 +6707,7 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -7191,10 +7191,6 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

View File

@ -1,33 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2001/06/12 16:05:17 avsm Exp $
lib/libmcrypt.so.6.7
lib/libmcrypt/libarcfour.so.0.0
lib/libmcrypt/libblowfish-compat.so.0.0
lib/libmcrypt/libblowfish.so.0.0
lib/libmcrypt/libcast-128.so.0.0
lib/libmcrypt/libcast-256.so.0.0
lib/libmcrypt/libcbc.so.0.0
lib/libmcrypt/libcfb.so.0.0
lib/libmcrypt/libdes.so.0.0
lib/libmcrypt/libecb.so.0.0
lib/libmcrypt/libenigma.so.0.0
lib/libmcrypt/libgost.so.0.0
lib/libmcrypt/libloki97.so.0.0
lib/libmcrypt/libnofb.so.0.0
lib/libmcrypt/libofb.so.0.0
lib/libmcrypt/libpanama.so.0.0
lib/libmcrypt/librc2.so.0.0
lib/libmcrypt/librijndael-128.so.0.0
lib/libmcrypt/librijndael-192.so.0.0
lib/libmcrypt/librijndael-256.so.0.0
lib/libmcrypt/libsafer-sk128.so.0.0
lib/libmcrypt/libsafer-sk64.so.0.0
lib/libmcrypt/libsaferplus.so.0.0
lib/libmcrypt/libserpent.so.0.0
lib/libmcrypt/libstream.so.0.0
lib/libmcrypt/libthreeway.so.0.0
lib/libmcrypt/libtripledes.so.0.0
lib/libmcrypt/libtwofish.so.0.0
lib/libmcrypt/libwake.so.0.0
lib/libmcrypt/libxtea.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.6 2003/01/18 22:53:29 avsm Exp $
lib/libmcrypt.so.8.5
DYNLIBDIR(%B)
NEWDYNLIBDIR(%D/lib/libmcrypt)

View File

@ -1,67 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2001/06/12 16:05:17 avsm Exp $
@comment $OpenBSD: PLIST,v 1.5 2003/01/18 22:53:29 avsm Exp $
bin/libmcrypt-config
include/mcrypt.h
lib/libmcrypt.a
lib/libmcrypt.la
lib/libmcrypt/arcfour.la
lib/libmcrypt/blowfish-compat.la
lib/libmcrypt/blowfish.la
lib/libmcrypt/cast-128.la
lib/libmcrypt/cast-256.la
lib/libmcrypt/cbc.la
lib/libmcrypt/cfb.la
lib/libmcrypt/des.la
lib/libmcrypt/ecb.la
lib/libmcrypt/enigma.la
lib/libmcrypt/gost.la
lib/libmcrypt/libarcfour.a
lib/libmcrypt/libblowfish-compat.a
lib/libmcrypt/libblowfish.a
lib/libmcrypt/libcast-128.a
lib/libmcrypt/libcast-256.a
lib/libmcrypt/libcbc.a
lib/libmcrypt/libcfb.a
lib/libmcrypt/libdes.a
lib/libmcrypt/libecb.a
lib/libmcrypt/libenigma.a
lib/libmcrypt/libgost.a
lib/libmcrypt/libloki97.a
lib/libmcrypt/libnofb.a
lib/libmcrypt/libofb.a
lib/libmcrypt/libpanama.a
lib/libmcrypt/librc2.a
lib/libmcrypt/librijndael-128.a
lib/libmcrypt/librijndael-192.a
lib/libmcrypt/librijndael-256.a
lib/libmcrypt/libsafer-sk128.a
lib/libmcrypt/libsafer-sk64.a
lib/libmcrypt/libsaferplus.a
lib/libmcrypt/libserpent.a
lib/libmcrypt/libstream.a
lib/libmcrypt/libthreeway.a
lib/libmcrypt/libtripledes.a
lib/libmcrypt/libtwofish.a
lib/libmcrypt/libwake.a
lib/libmcrypt/libxtea.a
lib/libmcrypt/loki97.la
lib/libmcrypt/nofb.la
lib/libmcrypt/ofb.la
lib/libmcrypt/panama.la
lib/libmcrypt/rc2.la
lib/libmcrypt/rijndael-128.la
lib/libmcrypt/rijndael-192.la
lib/libmcrypt/rijndael-256.la
lib/libmcrypt/safer-sk128.la
lib/libmcrypt/safer-sk64.la
lib/libmcrypt/saferplus.la
lib/libmcrypt/serpent.la
lib/libmcrypt/stream.la
lib/libmcrypt/threeway.la
lib/libmcrypt/tripledes.la
lib/libmcrypt/twofish.la
lib/libmcrypt/wake.la
lib/libmcrypt/xtea.la
man/man3/mcrypt.3
share/aclocal/libmcrypt.m4
%%SHARED%%
@dirrm lib/libmcrypt