From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 10 15:50:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE2B0106566B for ; Sat, 10 Oct 2009 15:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AB2438FC16 for ; Sat, 10 Oct 2009 15:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AFo2eD098692 for ; Sat, 10 Oct 2009 15:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9AFo2Js098680; Sat, 10 Oct 2009 15:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 10 Oct 2009 15:50:02 GMT Resent-Message-Id: <200910101550.n9AFo2Js098680@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Charlie Kester Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1009A1065672 for ; Sat, 10 Oct 2009 15:46:59 +0000 (UTC) (envelope-from corky1951@comcast.net) Received: from QMTA02.emeryville.ca.mail.comcast.net (qmta02.emeryville.ca.mail.comcast.net [76.96.30.24]) by mx1.freebsd.org (Postfix) with ESMTP id EF3F18FC2C for ; Sat, 10 Oct 2009 15:46:58 +0000 (UTC) Received: from OMTA13.emeryville.ca.mail.comcast.net ([76.96.30.52]) by QMTA02.emeryville.ca.mail.comcast.net with comcast id r2Sj1c00217UAYkA23mz5D; Sat, 10 Oct 2009 15:46:59 +0000 Received: from comcast.net ([98.203.142.76]) by OMTA13.emeryville.ca.mail.comcast.net with comcast id r3my1c0071f6R9u8Z3myWP; Sat, 10 Oct 2009 15:46:59 +0000 Received: by comcast.net (sSMTP sendmail emulation); Sat, 10 Oct 2009 08:50:06 -0700 Message-Id: <20091010154659.1009A1065672@hub.freebsd.org> Date: Sat, 10 Oct 2009 08:50:06 -0700 From: Charlie Kester To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/139484: [MAINTAINER PATCH] security/nettle: update to 2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Charlie Kester List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Oct 2009 15:50:03 -0000 >Number: 139484 >Category: ports >Synopsis: [MAINTAINER PATCH] security/nettle: update to 2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 10 15:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Charlie Kester >Release: FreeBSD 7.2-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD bigbox.local 7.2-RELEASE-p3 FreeBSD 7.2-RELEASE-p3 #0: Wed Aug 19 06:50:21 PDT 2009 root@bigbox.local:/usr/obj/usr/src/sys/BIGBOX i386 >Description: Update to version 2.0 This release breaks binary compatibility by splitting the nettle library into two libraries, libnettle and libhogweed. libnettle contains the symmetric crypto algorithms that don't depend on GMP, while libhogweed contains the public key algorithms that depend on GMP. >How-To-Repeat: >Fix: --- nettle-2.0.diff begins here --- diff -ruN /usr/ports/security/nettle/Makefile ./nettle/Makefile --- /usr/ports/security/nettle/Makefile 2009-07-07 20:45:07.000000000 -0700 +++ ./nettle/Makefile 2009-10-09 01:06:57.000000000 -0700 @@ -1,4 +1,5 @@ # ex:ts=8 +# ex:ts=8 # New ports collection makefile for: nettle # Date created: Dec 6, 2001 # Whom: ijliao @@ -7,8 +8,7 @@ # PORTNAME= nettle -PORTVERSION= 1.15 -PORTREVISION= 2 +PORTVERSION= 2.0 CATEGORIES= security MASTER_SITES= http://www.lysator.liu.se/~nisse/archive/ \ ftp://ftp.lysator.liu.se/pub/security/lsh/ @@ -23,20 +23,20 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-shared + LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -DOCS= NEWS README TODO nettle.html +DOCS= NEWS README TODO nettle.html nettle.pdf EXAMPLES= examples/*.c examples/*.h INFO= nettle -post-extract: - @${RM} -f ${WRKSRC}/nettle.info* - post-install: +.if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} +.endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff -ruN /usr/ports/security/nettle/distinfo ./nettle/distinfo --- /usr/ports/security/nettle/distinfo 2007-05-27 02:48:24.000000000 -0700 +++ ./nettle/distinfo 2009-10-09 01:03:07.000000000 -0700 @@ -1,3 +1,3 @@ -MD5 (nettle-1.15.tar.gz) = 6b0fd004359660b65ff3eca77b3d5fa6 -SHA256 (nettle-1.15.tar.gz) = d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac -SIZE (nettle-1.15.tar.gz) = 829862 +MD5 (nettle-2.0.tar.gz) = d813bc76b1042d76100efbc6a955d7df +SHA256 (nettle-2.0.tar.gz) = 65b9e230b953bfb075f10473917e216df9b825fc325b88f69cdf756ffa17cbd6 +SIZE (nettle-2.0.tar.gz) = 883732 diff -ruN /usr/ports/security/nettle/files/patch-Makefile.in ./nettle/files/patch-Makefile.in --- /usr/ports/security/nettle/files/patch-Makefile.in 2005-11-24 03:25:04.000000000 -0800 +++ ./nettle/files/patch-Makefile.in 1969-12-31 16:00:00.000000000 -0800 @@ -1,10 +0,0 @@ ---- Makefile.in.orig Tue Nov 1 09:34:09 2005 -+++ Makefile.in Tue Nov 1 09:34:24 2005 -@@ -221,7 +221,6 @@ - $(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) - [ -z "$(SHLIBSONAME)" ] \ - || (cd $(DESTDIR)$(libdir) \ -- && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \ - && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) ) - - install-info: nettle.info diff -ruN /usr/ports/security/nettle/files/patch-configure ./nettle/files/patch-configure --- /usr/ports/security/nettle/files/patch-configure 2005-11-24 03:25:04.000000000 -0800 +++ ./nettle/files/patch-configure 1969-12-31 16:00:00.000000000 -0800 @@ -1,11 +0,0 @@ ---- configure.orig Tue Nov 1 09:35:20 2005 -+++ configure Tue Nov 1 09:36:28 2005 -@@ -2990,7 +2990,7 @@ - *) - SHLIBFORLINK=libnettle.so - SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)' -- SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)' -+ SHLIBFILE='$(SHLIBSONAME)' - SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)' - # FIXME: It might make some sense to link with -lgmp - SHLIBLIBS='' diff -ruN /usr/ports/security/nettle/files/patch-examples_nettle-openssl.c ./nettle/files/patch-examples_nettle-openssl.c --- /usr/ports/security/nettle/files/patch-examples_nettle-openssl.c 2006-09-02 15:17:13.000000000 -0700 +++ ./nettle/files/patch-examples_nettle-openssl.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,13 +0,0 @@ - -$FreeBSD: ports/security/nettle/files/patch-examples_nettle-openssl.c,v 1.3 2006/09/02 22:17:13 simon Exp $ - ---- examples/nettle-openssl.c.orig -+++ examples/nettle-openssl.c -@@ -35,6 +35,7 @@ - #define NCOMPAT - #define OPENSSL_DISABLE_OLD_DES_SUPPORT - -+#include - #include - - #include diff -ruN /usr/ports/security/nettle/pkg-plist ./nettle/pkg-plist --- /usr/ports/security/nettle/pkg-plist 2007-07-16 00:58:02.000000000 -0700 +++ ./nettle/pkg-plist 2009-10-09 23:17:54.000000000 -0700 @@ -37,26 +37,35 @@ include/nettle/sha.h include/nettle/twofish.h include/nettle/yarrow.h -@dirrm include/nettle +lib/libhogweed.a +lib/libhogweed.so +lib/libhogweed.so.1 +lib/libhogweed.so.1.0 lib/libnettle.a lib/libnettle.so -lib/libnettle.so.2 +lib/libnettle.so.3 +lib/libnettle.so.3.0 %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/nettle.html +%%PORTDOCS%%%%DOCSDIR%%/nettle.pdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eratosthenes.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt1.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-openssl.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/next-prime.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_rsa_key.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-decrypt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-encrypt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-keygen.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-session.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-sign.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsa-verify.c +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%EXAMPLESDIR%%/getopt.c -%%EXAMPLESDIR%%/getopt.h -%%EXAMPLESDIR%%/getopt1.c -%%EXAMPLESDIR%%/io.c -%%EXAMPLESDIR%%/io.h -%%EXAMPLESDIR%%/nettle-benchmark.c -%%EXAMPLESDIR%%/nettle-openssl.c -%%EXAMPLESDIR%%/rsa-decrypt.c -%%EXAMPLESDIR%%/rsa-encrypt.c -%%EXAMPLESDIR%%/rsa-keygen.c -%%EXAMPLESDIR%%/rsa-session.h -%%EXAMPLESDIR%%/rsa-sign.c -%%EXAMPLESDIR%%/rsa-verify.c -@dirrm %%EXAMPLESDIR%% +@dirrm include/nettle --- nettle-2.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: