From cfc2cc11d063aa12b0a8e4f17b5152a28e3aa1a4 Mon Sep 17 00:00:00 2001 From: landry Date: Sun, 26 Oct 2008 10:39:27 +0000 Subject: [PATCH] Update libgcrypt to 1.4.3. ok naddy@ ajacoutot@ --- security/libgcrypt/Makefile | 13 ++++++------- security/libgcrypt/distinfo | 10 +++++----- security/libgcrypt/patches/patch-configure | 14 -------------- security/libgcrypt/patches/patch-src_hmac256_c | 13 +++++++++++++ security/libgcrypt/pkg/PLIST | 4 +++- 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 security/libgcrypt/patches/patch-configure create mode 100644 security/libgcrypt/patches/patch-src_hmac256_c diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 2bb66362413..8657eaf89a1 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.13 2008/02/17 23:25:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.14 2008/10/26 10:39:27 landry Exp $ COMMENT= crypto library based on code used in GnuPG -VERSION= 1.2.4 -DISTNAME= libgcrypt-${VERSION} +DISTNAME= libgcrypt-1.4.3 CATEGORIES= security -SHARED_LIBS= gcrypt 13.0 +SHARED_LIBS= gcrypt 14.0 HOMEPAGE= http://www.gnu.org/directory/security/libgcrypt.html -# LGPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -23,11 +22,11 @@ MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \ MODULES= devel/gettext LIB_DEPENDS= gpg-error::security/libgpg-error +BUILD_DEPENDS= ::print/transfig +WANTLIB= c USE_LIBTOOL= Yes -SEPARATE_BUILD= concurrent - CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-static diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index 7d306e0ef83..edfa0f86bff 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -1,5 +1,5 @@ -MD5 (libgcrypt-1.2.4.tar.gz) = viDuR3eP+QcDr9WMCQ8HuQ== -RMD160 (libgcrypt-1.2.4.tar.gz) = aluihO/kjGlj4h2FWKaQlq6gPYQ= -SHA1 (libgcrypt-1.2.4.tar.gz) = 0nnnpEZMzPDMTinDdKHoMl/GW5o= -SHA256 (libgcrypt-1.2.4.tar.gz) = zzw/MT6+uRZdgEOb6ut/YhtzhWohWeS4THDzK0Vf2ew= -SIZE (libgcrypt-1.2.4.tar.gz) = 1013625 +MD5 (libgcrypt-1.4.3.tar.gz) = NmCD4NKlZayGgkXwqECInA== +RMD160 (libgcrypt-1.4.3.tar.gz) = WLDkJvZdHFZvMyQPTTCSTABXxR0= +SHA1 (libgcrypt-1.4.3.tar.gz) = PZ1YNQHOlRWW+n3TZnr9NXrH0FY= +SHA256 (libgcrypt-1.4.3.tar.gz) = GZsIr8ibHB39rrGdxMLd+WPEv2iqEtZoBSAF+fIS/OI= +SIZE (libgcrypt-1.4.3.tar.gz) = 1357080 diff --git a/security/libgcrypt/patches/patch-configure b/security/libgcrypt/patches/patch-configure deleted file mode 100644 index 6bcd7bd77ec..00000000000 --- a/security/libgcrypt/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2007/09/21 06:00:11 steven Exp $ ---- configure.orig Fri Sep 14 21:16:01 2007 -+++ configure Fri Sep 14 21:16:46 2007 -@@ -20966,8 +20966,8 @@ esac - case "${target}" in - *-openbsd*) - # FIXME: Are these the best flags for OpenBSD? -- NAME_OF_DEV_RANDOM="/dev/srandom" -- NAME_OF_DEV_URANDOM="/dev/urandom" -+ NAME_OF_DEV_RANDOM="/dev/arandom" -+ NAME_OF_DEV_URANDOM="/dev/arandom" - # DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" - ;; - diff --git a/security/libgcrypt/patches/patch-src_hmac256_c b/security/libgcrypt/patches/patch-src_hmac256_c new file mode 100644 index 00000000000..7b9b46620bd --- /dev/null +++ b/security/libgcrypt/patches/patch-src_hmac256_c @@ -0,0 +1,13 @@ +Fix alignment issue on sparc64. +$OpenBSD: patch-src_hmac256_c,v 1.1 2008/10/26 10:39:27 landry Exp $ +--- src/hmac256.c.orig Thu Oct 16 13:51:12 2008 ++++ src/hmac256.c Thu Oct 16 13:51:40 2008 +@@ -271,7 +271,7 @@ finalize (hmac256_context_t hd) + /* Store the digest into hd->buf. */ + p = hd->buf; + #ifdef WORDS_BIGENDIAN +-#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) ++#define X(a) do { memcpy(p, &hd->h##a, sizeof(u32)); p += 4; } while(0) + #else /* little endian */ + #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ + *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) diff --git a/security/libgcrypt/pkg/PLIST b/security/libgcrypt/pkg/PLIST index 48b11995917..a6ce32730e2 100644 --- a/security/libgcrypt/pkg/PLIST +++ b/security/libgcrypt/pkg/PLIST @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.5 2007/09/21 06:00:11 steven Exp $ +@comment $OpenBSD: PLIST,v 1.6 2008/10/26 10:39:27 landry Exp $ +@bin bin/dumpsexp +@bin bin/hmac256 bin/libgcrypt-config include/gcrypt-module.h include/gcrypt.h