From b683b82dbda4cb71b1ac95cf9a31730176b2edd5 Mon Sep 17 00:00:00 2001 From: benoit Date: Fri, 29 May 2009 19:53:11 +0000 Subject: [PATCH] - update libmcrypt to 2.5.8 - update patches & PLIST - change maintainer ok avsm@, ajacoutot@ --- security/libmcrypt/Makefile | 44 ++++++++++--------- security/libmcrypt/distinfo | 10 ++--- .../libmcrypt/patches/patch-lib_Makefile_in | 10 ++--- .../libmcrypt/patches/patch-lib_libmcrypt_m4 | 12 ----- security/libmcrypt/pkg/PLIST | 4 +- 5 files changed, 36 insertions(+), 44 deletions(-) delete mode 100644 security/libmcrypt/patches/patch-lib_libmcrypt_m4 diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile index f12ee4cb2ec..12db12a372c 100644 --- a/security/libmcrypt/Makefile +++ b/security/libmcrypt/Makefile @@ -1,30 +1,32 @@ -# $OpenBSD: Makefile,v 1.20 2009/01/09 17:43:39 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2009/05/29 19:53:11 benoit Exp $ -COMMENT= interface to access block/stream encryption algorithms +COMMENT = interface to access block/stream encryption algorithms -DISTNAME= libmcrypt-2.5.7 -PKGNAME= ${DISTNAME}p2 -CATEGORIES= security -SHARED_LIBS= mcrypt 8.7 -MODGNU_SHARED_LIBS=mcrypt '' -LIBmcrypt_ALIAS=realmcrypt +DISTNAME = libmcrypt-2.5.8 +CATEGORIES = security +SHARED_LIBS = mcrypt 8.7 # .8.7 +MODGNU_SHARED_LIBS = mcrypt '' +LIBmcrypt_ALIAS = realmcrypt -HOMEPAGE= http://mcrypt.sf.net/ -MAINTAINER= Anil Madhavapeddy -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcrypt/} +HOMEPAGE = http://mcrypt.sf.net/ -LIB_DEPENDS= mhash.>=2::security/mhash \ - ltdl.>=1::devel/libtool,-ltdl +MAINTAINER = Benoit Lecocq -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +# LGPLv2.1 +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes -USE_LIBTOOL= Yes +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mcrypt/} -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static +LIB_DEPENDS = mhash.>=2::security/mhash \ + ltdl.>=1::devel/libtool,-ltdl + +USE_LIBTOOL = Yes + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} +CONFIGURE_ARGS += --enable-static .include diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo index b6017c45fa9..715d9ccf57c 100644 --- a/security/libmcrypt/distinfo +++ b/security/libmcrypt/distinfo @@ -1,5 +1,5 @@ -MD5 (libmcrypt-2.5.7.tar.gz) = sb4WMUP46O0EdL7rZCs7rQ== -RMD160 (libmcrypt-2.5.7.tar.gz) = J7WOs+NdT7LtpE9pmQseWSOBgu0= -SHA1 (libmcrypt-2.5.7.tar.gz) = wd5mfE+hv4sJQeNqjA5e9ZEKQco= -SHA256 (libmcrypt-2.5.7.tar.gz) = GG8JGjtfa7pDAUgNagfZ6oMKgTsD15/sPN44Oslr06E= -SIZE (libmcrypt-2.5.7.tar.gz) = 523321 +MD5 (libmcrypt-2.5.8.tar.gz) = CCGDDZMKhqXGkRCDfFW32g== +RMD160 (libmcrypt-2.5.8.tar.gz) = GxdMTDYzxn71UmwVG6KTW2dqjM0= +SHA1 (libmcrypt-2.5.8.tar.gz) = mkJlMukIfddzeqvM/4uRq/kVGno= +SHA256 (libmcrypt-2.5.8.tar.gz) = 5OtsB0u6sWisR7lHwZX/jO+dUaIRzdGMqcnvNNJ6Nz4= +SIZE (libmcrypt-2.5.8.tar.gz) = 1335178 diff --git a/security/libmcrypt/patches/patch-lib_Makefile_in b/security/libmcrypt/patches/patch-lib_Makefile_in index 72942785cef..a8c714b007e 100644 --- a/security/libmcrypt/patches/patch-lib_Makefile_in +++ b/security/libmcrypt/patches/patch-lib_Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.2 2009/01/09 17:43:39 naddy Exp $ ---- lib/Makefile.in.orig Sat Mar 8 18:59:39 2003 -+++ lib/Makefile.in Fri Jan 9 17:30:15 2009 -@@ -157,8 +157,7 @@ libmcrypt_la_SOURCES = mcrypt_extra.c mcrypt.c bzero.c - +$OpenBSD: patch-lib_Makefile_in,v 1.3 2009/05/29 19:53:14 benoit Exp $ +--- lib/Makefile.in.orig Mon Feb 19 07:32:37 2007 ++++ lib/Makefile.in Wed May 27 01:50:14 2009 +@@ -227,8 +227,7 @@ libmcrypt_la_SOURCES = mcrypt_extra.c mcrypt.c bzero.c + mcrypt_symb.c libmcrypt_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/security/libmcrypt/patches/patch-lib_libmcrypt_m4 b/security/libmcrypt/patches/patch-lib_libmcrypt_m4 deleted file mode 100644 index 0d7430de929..00000000000 --- a/security/libmcrypt/patches/patch-lib_libmcrypt_m4 +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_libmcrypt_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ ---- lib/libmcrypt.m4.orig Fri Jan 9 17:32:15 2009 -+++ lib/libmcrypt.m4 Fri Jan 9 17:32:32 2009 -@@ -14,7 +14,7 @@ dnl $id$ - dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS - dnl --AC_DEFUN(AM_PATH_LIBMCRYPT, -+AC_DEFUN([AM_PATH_LIBMCRYPT], - [dnl - dnl Get the cflags and libraries from the libmcrypt-config script - dnl diff --git a/security/libmcrypt/pkg/PLIST b/security/libmcrypt/pkg/PLIST index 8310cd98c8c..ba21c1b95e0 100644 --- a/security/libmcrypt/pkg/PLIST +++ b/security/libmcrypt/pkg/PLIST @@ -1,6 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:36:00 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2009/05/29 19:53:16 benoit Exp $ bin/libmcrypt-config include/mcrypt.h +include/mutils/ +include/mutils/mcrypt.h lib/libmcrypt/ lib/libmcrypt.a lib/libmcrypt.la