Update to 2.5.6.

January 19 2003: (version 2.5.6)
- Fixes in win32 detection and DLL building.
- Fixes for solaris (a symbol was not exported)
- Corrected bug which made algorithm symbols to be inserted
  twice in symbol table.

December 22 2002: (version 2.5.5)
- Better win32 detection and DLL building.
- Changed some variables names in gost.c to allow compiling
  with gcc and K6 optimizations.
- Some buffer overrun checks on input. Patches and suggestions
  by Ilia A.
- Made the default behaviour to include all algorithms into
  the main library, instead of using dynamic modules. Dynamic
  loading is disabled by default. The --enable-dynamic-loading flag
  can be used in the configure script, to get the old behaviour.
- Some fixes in ECB mode.

August 16 2002: (version 2.5.3)
- The const keyword is now used in the exported functions
- Corrected problem in libltdl's configure script

June 22 2002: (version 2.5.2)
- Fixed bug in the returned IV size of ARCFOUR
- Fixed bug in mcrypt_readdir() which prevented the test programs
  to work.

May 30 2002: (version 2.5.1)
- Corrected the license. COPYING.LIB (LGPL) is now included
  instead of COPYING (GPL)

Mar 09th 2002: (version 2.5.0)
- Several corrections in stream and block cipher modes.
- Added --disable-dynamic-loading configure option
- The IV modifications in Arcfour and Wake have been disabled
  by default.
- Added CTR mode for block ciphers.
- Fixes in nCFB and nOFB modes.
- Added mcrypt_enc_get_state() function.
- Added test for nCFB, CFB, nOFB and CTR with AES

Feb 14th 2002:
- nOFB and nCFB modes can now encrypt and decrypt plaintext
  of size less than block size.

4 files changed, 13 insertions, 108 deletions

diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index e46d7eb478b..bfa2834d160 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 18:39:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/05 08:42:55 wiz Exp $
 
-DISTNAME=	libmcrypt-2.4.22
+DISTNAME=	libmcrypt-2.5.6
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/ \
 		ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/old/ \
@@ -12,11 +12,10 @@ COMMENT=	crypto algorithms library
 
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+GNU_CONFIGURE=		yes
 
-post-extract:
-	${RM} -rf ${WRKSRC}/libltdl
+post-install:
+	${RMDIR} ${PREFIX}/lib/libmcrypt
 
-.include "../../devel/libtool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libmcrypt/PLIST b/security/libmcrypt/PLIST
index 6cb2cda8931..7f5149872ae 100644
--- a/security/libmcrypt/PLIST
+++ b/security/libmcrypt/PLIST
@@ -1,101 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/03/05 08:42:55 wiz Exp $
 bin/libmcrypt-config
 include/mcrypt.h
 lib/libmcrypt.a
 lib/libmcrypt.la
 lib/libmcrypt.so
-lib/libmcrypt.so.6
-lib/libmcrypt.so.6.22
-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/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
+lib/libmcrypt.so.8
+lib/libmcrypt.so.8.6
 man/man3/mcrypt.3
 share/aclocal/libmcrypt.m4
-@dirrm lib/libmcrypt
diff --git a/security/libmcrypt/buildlink2.mk b/security/libmcrypt/buildlink2.mk
index 43022583303..5d3cfd5f739 100644
--- a/security/libmcrypt/buildlink2.mk
+++ b/security/libmcrypt/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:53 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/05 08:42:56 wiz Exp $
 
 .if !defined(LIBMCRYPT_BUILDLINK2_MK)
 LIBMCRYPT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libmcrypt
-BUILDLINK_DEPENDS.libmcrypt?=	libmcrypt>=2.4.17
+BUILDLINK_DEPENDS.libmcrypt?=	libmcrypt>=2.5.6
 BUILDLINK_PKGSRCDIR.libmcrypt?=	../../security/libmcrypt
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.libmcrypt=libmcrypt
@@ -13,8 +13,6 @@ BUILDLINK_PREFIX.libmcrypt_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libmcrypt=	include/mcrypt.h
 BUILDLINK_FILES.libmcrypt+=	lib/libmcrypt.*
 
-.include "../../devel/libtool/buildlink2.mk"
-
 BUILDLINK_TARGETS+=	libmcrypt-buildlink
 
 libmcrypt-buildlink: _BUILDLINK_USE
diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo
index 1478c4e42b9..40df08cdfcd 100644
--- a/security/libmcrypt/distinfo
+++ b/security/libmcrypt/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 18:39:54 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/03/05 08:42:56 wiz Exp $
 
-SHA1 (libmcrypt-2.4.22.tar.gz) = f462cbbcb0c220cb30dead2afa63452c1a5b21e5
-Size (libmcrypt-2.4.22.tar.gz) = 490383 bytes
-SHA1 (patch-aa) = d5a0b2dfbcf32c9b9577c1be6499f1954f9c66a8
+SHA1 (libmcrypt-2.5.6.tar.gz) = 9e3500bb568a2297d8f9763da4556af74ae3e20b
+Size (libmcrypt-2.5.6.tar.gz) = 634589 bytes