Update libmcrypt to 2.4.17. Changes from version 2.4.7 include:

- Bug fixes and memory leaks
- Added new modes: nCFG
- Due to an endianness handling problem Blowfish algorithm was not compatible
  with other implementations. Now it has been corrected. If you want
  to access the old algorithm used use the "blowfish-compat" module.
- Corrected bug in rijndael-256.  This makes the algorithm incompatible with
  previous versions.

5 files changed, 107 insertions, 129 deletions

diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index cab143ea35a..3f914670f28 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/06/20 21:35:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/09 19:16:20 jlam Exp $
 
-DISTNAME=	libmcrypt-2.4.7
+DISTNAME=	libmcrypt-2.4.17
 CATEGORIES=	security devel
-MASTER_SITES=	http://mcrypt.hellug.gr/lib/
+MASTER_SITES=	ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/ \
+		ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/old/ \
+		http://mcrypt.hellug.gr/lib/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mcrypt.hellug.gr/
@@ -10,8 +12,10 @@ COMMENT=	crypto algorithms library
 
 USE_BUILDLINK_ONLY=	yes
 USE_LIBTOOL=		yes
-#USE_LTDL=		yes
 GNU_CONFIGURE=		yes
 
+post-extract:
+	${RM} -rf ${WRKSRC}/libltdl
+
 .include "../../devel/libtool/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libmcrypt/buildlink.mk b/security/libmcrypt/buildlink.mk
index 873b11ffebf..83a1c7264de 100644
--- a/security/libmcrypt/buildlink.mk
+++ b/security/libmcrypt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/09 06:43:58 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/10/09 19:16:20 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmcrypt.
 #
@@ -17,7 +17,7 @@ LIBMCRYPT_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libmcrypt?=	libmcrypt>=2.2
+BUILDLINK_DEPENDS.libmcrypt?=	libmcrypt>=2.4.17
 DEPENDS+=	${BUILDLINK_DEPENDS.libmcrypt}:../../security/libmcrypt
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libmcrypt=libmcrypt
@@ -26,9 +26,22 @@ BUILDLINK_FILES.libmcrypt=	include/mcrypt.h
 BUILDLINK_FILES.libmcrypt+=	lib/libmcrypt.*
 
 BUILDLINK_TARGETS.libmcrypt=	libmcrypt-buildlink
+BUILDLINK_TARGETS.libmcrypt+=	libmcrypt-buildlink-config-wrapper
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libmcrypt}
 
+BUILDLINK_CONFIG.libmcrypt=	\
+	${BUILDLINK_PREFIX.libmcrypt}/bin/libmcrypt-config
+BUILDLINK_CONFIG_WRAPPER.libmcrypt=	\
+	${BUILDLINK_DIR}/bin/libmcrypt-config
+
+.if defined(USE_CONFIG_WRAPPER)
+LIBMCRYPT_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmcrypt}
+CONFIGURE_ENV+=		LIBMCRYPT_CONFIG="${LIBMCRYPT_CONFIG}"
+MAKE_ENV+=		LIBMCRYPT_CONFIG="${LIBMCRYPT_CONFIG}"
+.endif
+
 pre-configure: ${BUILDLINK_TARGETS.libmcrypt}
 libmcrypt-buildlink: _BUILDLINK_USE
+libmcrypt-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
 .endif	# LIBMCRYPT_BUILDLINK_MK
diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo
index d9e23a96cb3..ea5a133674d 100644
--- a/security/libmcrypt/distinfo
+++ b/security/libmcrypt/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:33 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/09 19:16:20 jlam Exp $
 
-SHA1 (libmcrypt-2.4.7.tar.gz) = 83927b8c838e8a3d6d76e75c645f001f8396a10d
-Size (libmcrypt-2.4.7.tar.gz) = 296829 bytes
+SHA1 (libmcrypt-2.4.17.tar.gz) = a0e5ca6a3114af8edd726c210d263b82ed7814a0
+Size (libmcrypt-2.4.17.tar.gz) = 464774 bytes
+SHA1 (patch-aa) = 3b048b052a41d24f625cee14fb4b1f57ade5de01
diff --git a/security/libmcrypt/patches/patch-aa b/security/libmcrypt/patches/patch-aa
new file mode 100644
index 00000000000..acdc8ac672b
--- /dev/null
+++ b/security/libmcrypt/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2001/10/09 19:16:21 jlam Exp $
+
+--- configure.orig	Thu Sep 27 03:41:28 2001
++++ configure
+@@ -4382,8 +4382,6 @@
+     INCLTDL=
+   fi
+ 
+-LIBLTDL_DIR=libltdl
+-
+ cat >>confdefs.h <<\EOF
+ #define USE_LTDL 1
+ EOF
diff --git a/security/libmcrypt/pkg/PLIST b/security/libmcrypt/pkg/PLIST
index ddd0872ab00..6d900424a4b 100644
--- a/security/libmcrypt/pkg/PLIST
+++ b/security/libmcrypt/pkg/PLIST
@@ -1,154 +1,101 @@
-@comment $NetBSD: PLIST,v 1.2 2001/05/10 13:29:40 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/10/09 19:16:21 jlam Exp $
+bin/libmcrypt-config
 include/mcrypt.h
 lib/libmcrypt.a
 lib/libmcrypt.la
 lib/libmcrypt.so
-lib/libmcrypt.so.4
-lib/libmcrypt.so.4.4
-lib/libmcrypt/arcfour-iv.la
+lib/libmcrypt.so.6
+lib/libmcrypt.so.6.8
+lib/libmcrypt/arcfour.a
 lib/libmcrypt/arcfour.la
+lib/libmcrypt/arcfour.so
+lib/libmcrypt/blowfish-compat.a
+lib/libmcrypt/blowfish-compat.la
+lib/libmcrypt/blowfish-compat.so
+lib/libmcrypt/blowfish.a
 lib/libmcrypt/blowfish.la
+lib/libmcrypt/blowfish.so
+lib/libmcrypt/cast-128.a
 lib/libmcrypt/cast-128.la
+lib/libmcrypt/cast-128.so
+lib/libmcrypt/cast-256.a
 lib/libmcrypt/cast-256.la
+lib/libmcrypt/cast-256.so
+lib/libmcrypt/cbc.a
 lib/libmcrypt/cbc.la
+lib/libmcrypt/cbc.so
+lib/libmcrypt/cfb.a
 lib/libmcrypt/cfb.la
+lib/libmcrypt/cfb.so
+lib/libmcrypt/des.a
 lib/libmcrypt/des.la
+lib/libmcrypt/des.so
+lib/libmcrypt/ecb.a
 lib/libmcrypt/ecb.la
+lib/libmcrypt/ecb.so
+lib/libmcrypt/enigma.a
 lib/libmcrypt/enigma.la
+lib/libmcrypt/enigma.so
+lib/libmcrypt/gost.a
 lib/libmcrypt/gost.la
-lib/libmcrypt/libarcfour-iv.a
-lib/libmcrypt/libarcfour-iv.so
-lib/libmcrypt/libarcfour-iv.so.0
-lib/libmcrypt/libarcfour-iv.so.0.0
-lib/libmcrypt/libarcfour.a
-lib/libmcrypt/libarcfour.so
-lib/libmcrypt/libarcfour.so.0
-lib/libmcrypt/libarcfour.so.0.0
-lib/libmcrypt/libblowfish.a
-lib/libmcrypt/libblowfish.so
-lib/libmcrypt/libblowfish.so.0
-lib/libmcrypt/libblowfish.so.0.0
-lib/libmcrypt/libcast-128.a
-lib/libmcrypt/libcast-128.so
-lib/libmcrypt/libcast-128.so.0
-lib/libmcrypt/libcast-128.so.0.0
-lib/libmcrypt/libcast-256.a
-lib/libmcrypt/libcast-256.so
-lib/libmcrypt/libcast-256.so.0
-lib/libmcrypt/libcast-256.so.0.0
-lib/libmcrypt/libcbc.a
-lib/libmcrypt/libcbc.so
-lib/libmcrypt/libcbc.so.0
-lib/libmcrypt/libcbc.so.0.0
-lib/libmcrypt/libcfb.a
-lib/libmcrypt/libcfb.so
-lib/libmcrypt/libcfb.so.0
-lib/libmcrypt/libcfb.so.0.0
-lib/libmcrypt/libdes.a
-lib/libmcrypt/libdes.so
-lib/libmcrypt/libdes.so.0
-lib/libmcrypt/libdes.so.0.0
-lib/libmcrypt/libecb.a
-lib/libmcrypt/libecb.so
-lib/libmcrypt/libecb.so.0
-lib/libmcrypt/libecb.so.0.0
-lib/libmcrypt/libenigma.a
-lib/libmcrypt/libenigma.so
-lib/libmcrypt/libenigma.so.0
-lib/libmcrypt/libenigma.so.0.0
-lib/libmcrypt/libgost.a
-lib/libmcrypt/libgost.so
-lib/libmcrypt/libgost.so.0
-lib/libmcrypt/libgost.so.0.0
-lib/libmcrypt/libloki97.a
-lib/libmcrypt/libloki97.so
-lib/libmcrypt/libloki97.so.0
-lib/libmcrypt/libloki97.so.0.0
-lib/libmcrypt/libnofb.a
-lib/libmcrypt/libnofb.so
-lib/libmcrypt/libnofb.so.0
-lib/libmcrypt/libnofb.so.0.0
-lib/libmcrypt/libofb.a
-lib/libmcrypt/libofb.so
-lib/libmcrypt/libofb.so.0
-lib/libmcrypt/libofb.so.0.0
-lib/libmcrypt/libpanama.a
-lib/libmcrypt/libpanama.so
-lib/libmcrypt/libpanama.so.0
-lib/libmcrypt/libpanama.so.0.0
-lib/libmcrypt/librc2.a
-lib/libmcrypt/librc2.so
-lib/libmcrypt/librc2.so.0
-lib/libmcrypt/librc2.so.0.0
-lib/libmcrypt/librijndael-128.a
-lib/libmcrypt/librijndael-128.so
-lib/libmcrypt/librijndael-128.so.0
-lib/libmcrypt/librijndael-128.so.0.0
-lib/libmcrypt/librijndael-192.a
-lib/libmcrypt/librijndael-192.so
-lib/libmcrypt/librijndael-192.so.0
-lib/libmcrypt/librijndael-192.so.0.0
-lib/libmcrypt/librijndael-256.a
-lib/libmcrypt/librijndael-256.so
-lib/libmcrypt/librijndael-256.so.0
-lib/libmcrypt/librijndael-256.so.0.0
-lib/libmcrypt/libsafer-sk128.a
-lib/libmcrypt/libsafer-sk128.so
-lib/libmcrypt/libsafer-sk128.so.0
-lib/libmcrypt/libsafer-sk128.so.0.0
-lib/libmcrypt/libsafer-sk64.a
-lib/libmcrypt/libsafer-sk64.so
-lib/libmcrypt/libsafer-sk64.so.0
-lib/libmcrypt/libsafer-sk64.so.0.0
-lib/libmcrypt/libsaferplus.a
-lib/libmcrypt/libsaferplus.so
-lib/libmcrypt/libsaferplus.so.0
-lib/libmcrypt/libsaferplus.so.0.0
-lib/libmcrypt/libserpent.a
-lib/libmcrypt/libserpent.so
-lib/libmcrypt/libserpent.so.0
-lib/libmcrypt/libserpent.so.0.0
-lib/libmcrypt/libstream.a
-lib/libmcrypt/libstream.so
-lib/libmcrypt/libstream.so.0
-lib/libmcrypt/libstream.so.0.0
-lib/libmcrypt/libthreeway.a
-lib/libmcrypt/libthreeway.so
-lib/libmcrypt/libthreeway.so.0
-lib/libmcrypt/libthreeway.so.0.0
-lib/libmcrypt/libtripledes.a
-lib/libmcrypt/libtripledes.so
-lib/libmcrypt/libtripledes.so.0
-lib/libmcrypt/libtripledes.so.0.0
-lib/libmcrypt/libtwofish.a
-lib/libmcrypt/libtwofish.so
-lib/libmcrypt/libtwofish.so.0
-lib/libmcrypt/libtwofish.so.0.0
-lib/libmcrypt/libwake.a
-lib/libmcrypt/libwake.so
-lib/libmcrypt/libwake.so.0
-lib/libmcrypt/libwake.so.0.0
-lib/libmcrypt/libxtea.a
-lib/libmcrypt/libxtea.so
-lib/libmcrypt/libxtea.so.0
-lib/libmcrypt/libxtea.so.0.0
+lib/libmcrypt/gost.so
+lib/libmcrypt/loki97.a
 lib/libmcrypt/loki97.la
+lib/libmcrypt/loki97.so
+lib/libmcrypt/ncfb.a
+lib/libmcrypt/ncfb.la
+lib/libmcrypt/ncfb.so
+lib/libmcrypt/nofb.a
 lib/libmcrypt/nofb.la
+lib/libmcrypt/nofb.so
+lib/libmcrypt/ofb.a
 lib/libmcrypt/ofb.la
+lib/libmcrypt/ofb.so
+lib/libmcrypt/panama.a
 lib/libmcrypt/panama.la
+lib/libmcrypt/panama.so
+lib/libmcrypt/rc2.a
 lib/libmcrypt/rc2.la
+lib/libmcrypt/rc2.so
+lib/libmcrypt/rijndael-128.a
 lib/libmcrypt/rijndael-128.la
+lib/libmcrypt/rijndael-128.so
+lib/libmcrypt/rijndael-192.a
 lib/libmcrypt/rijndael-192.la
+lib/libmcrypt/rijndael-192.so
+lib/libmcrypt/rijndael-256.a
 lib/libmcrypt/rijndael-256.la
+lib/libmcrypt/rijndael-256.so
+lib/libmcrypt/safer-sk128.a
 lib/libmcrypt/safer-sk128.la
+lib/libmcrypt/safer-sk128.so
+lib/libmcrypt/safer-sk64.a
 lib/libmcrypt/safer-sk64.la
+lib/libmcrypt/safer-sk64.so
+lib/libmcrypt/saferplus.a
 lib/libmcrypt/saferplus.la
+lib/libmcrypt/saferplus.so
+lib/libmcrypt/serpent.a
 lib/libmcrypt/serpent.la
+lib/libmcrypt/serpent.so
+lib/libmcrypt/stream.a
 lib/libmcrypt/stream.la
+lib/libmcrypt/stream.so
+lib/libmcrypt/threeway.a
 lib/libmcrypt/threeway.la
+lib/libmcrypt/threeway.so
+lib/libmcrypt/tripledes.a
 lib/libmcrypt/tripledes.la
+lib/libmcrypt/tripledes.so
+lib/libmcrypt/twofish.a
 lib/libmcrypt/twofish.la
+lib/libmcrypt/twofish.so
+lib/libmcrypt/wake.a
 lib/libmcrypt/wake.la
+lib/libmcrypt/wake.so
+lib/libmcrypt/xtea.a
 lib/libmcrypt/xtea.la
+lib/libmcrypt/xtea.so
 man/man3/mcrypt.3
+share/aclocal/libmcrypt.m4
 @dirrm lib/libmcrypt