From zeising@daemonic.se  Mon Jul  9 17:17:11 2012
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1CFF106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 17:17:11 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id 292158FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 17:17:10 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 1206640003
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 19:17:10 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 045BB40007; Mon,  9 Jul 2012 19:17:10 +0200 (CEST)
Received: from mx.daemonic.se (h-45-105.a163.priv.bahnhof.se [94.254.45.105])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id 6967140003
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 19:17:09 +0200 (CEST)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id 3WWCs110Sbz8gtM
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 19:17:09 +0200 (CEST)
Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025)
	with ESMTPS id FHBHiApjCMTg for <FreeBSD-gnats-submit@freebsd.org>;
	Mon,  9 Jul 2012 19:17:06 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
	by mx.daemonic.se (Postfix) with ESMTPS id 3WWCry3Jxvz8gtL
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 19:17:06 +0200 (CEST)
Received: from tifa.daemonic.se (tifa.daemonic.se [10.32.0.6])
	by mail.daemonic.se (Postfix) with ESMTPSA id 3WWCry2lg6z9Ctj
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jul 2012 19:17:06 +0200 (CEST)
Received: by tifa.daemonic.se (Postfix, from userid 1001)
	id 2DA09228F5; Mon,  9 Jul 2012 19:17:06 +0200 (CEST)
Message-Id: <20120709171706.2DA09228F5@tifa.daemonic.se>
Date: Mon,  9 Jul 2012 19:17:06 +0200 (CEST)
From: Niclas Zeising <zeising@daemonic.se>
Reply-To: Niclas Zeising <zeising@daemonic.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] update security/nettle to latest version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         169742
>Category:       ports
>Synopsis:       [PATCH] update security/nettle to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    johans
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 09 17:20:05 UTC 2012
>Closed-Date:    Thu Jul 12 21:02:43 UTC 2012
>Last-Modified:  Thu Jul 12 21:10:00 UTC 2012
>Originator:     Niclas Zeising
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD tifa.daemonic.se 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r231776M: Wed Feb 15 22:30:06 CET 2012 root@tifa.daemonic.se:/usr/obj/usr/src/sys/TIFA amd64


	
>Description:
	security/nettle is out of date.
>How-To-Repeat:
	
>Fix:

	attached patch updates security/nettle to the latest version, which, amongst other things contains a clang build fix, no need for the reinplace_cmd any more.
	
	Note that this update bumps the minor shlib version, so dependent ports might need a portrevision bump (not included in patch).  I compiled gnutls against the new version without any problems.

--- security.nettle.update.diff begins here ---
Index: security/nettle/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/nettle/Makefile,v
retrieving revision 1.34
diff -u -d -r1.34 Makefile
--- security/nettle/Makefile	18 Dec 2011 22:47:56 -0000	1.34
+++ security/nettle/Makefile	9 Jul 2012 17:14:01 -0000
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	nettle
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		http://www.lysator.liu.se/~nisse/archive/:liu \
-		ftp://ftp.lysator.liu.se/pub/security/lsh/:liu
+		ftp://ftp.lysator.liu.se/pub/security/lsh/ \
+		http://www.lysator.liu.se/~nisse/archive/ 
 MASTER_SITE_SUBDIR=	${PORTNAME}/:DEFAULT
 
 MAINTAINER=	johans@FreeBSD.org
@@ -38,10 +38,6 @@
 
 INFO=		nettle
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/[[:<:]]sub[[:>:]]/subl/' \
-		${WRKSRC}/x86/camellia-crypt-internal.asm
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
Index: security/nettle/distinfo
===================================================================
RCS file: /home/ncvs/ports/security/nettle/distinfo,v
retrieving revision 1.13
diff -u -d -r1.13 distinfo
--- security/nettle/distinfo	4 Sep 2011 15:43:18 -0000	1.13
+++ security/nettle/distinfo	9 Jul 2012 17:14:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (nettle-2.4.tar.gz) = a6009208df6881f75aa1a87081ccfb2ccac1884da10670c53d7b76596f649c3f
-SIZE (nettle-2.4.tar.gz) = 1075789
+SHA256 (nettle-2.5.tar.gz) = 4aa142e908b0053082d7729fc0155dc90dbe71c8ef5f50f30034805ed5c92c72
+SIZE (nettle-2.5.tar.gz) = 1113274
Index: security/nettle/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/nettle/pkg-plist,v
retrieving revision 1.15
diff -u -d -r1.15 pkg-plist
--- security/nettle/pkg-plist	4 Sep 2011 15:43:18 -0000	1.15
+++ security/nettle/pkg-plist	9 Jul 2012 17:14:01 -0000
@@ -36,6 +36,7 @@
 include/nettle/ripemd160.h
 include/nettle/rsa-compat.h
 include/nettle/rsa.h
+include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h
@@ -44,11 +45,11 @@
 lib/libhogweed.a
 lib/libhogweed.so
 lib/libhogweed.so.2
-lib/libhogweed.so.2.1
+lib/libhogweed.so.2.2
 lib/libnettle.a
 lib/libnettle.so
 lib/libnettle.so.4
-lib/libnettle.so.4.3
+lib/libnettle.so.4.4
 libdata/pkgconfig/nettle.pc
 libdata/pkgconfig/hogweed.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -56,10 +57,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/nettle.html
 %%PORTDOCS%%%%DOCSDIR%%/nettle.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16dec.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16enc.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64dec.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64enc.c
 %%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
--- security.nettle.update.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->johans 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jul 9 17:20:15 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169742 
State-Changed-From-To: open->closed 
State-Changed-By: johans 
State-Changed-When: Thu Jul 12 21:02:20 UTC 2012 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169742 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169742: commit references a PR
Date: Thu, 12 Jul 2012 21:02:21 +0000 (UTC)

 johans      2012-07-12 21:02:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/nettle      Makefile distinfo pkg-plist 
   Log:
   - Update Nettle to 2.5 release
   - Remove local patch that is no longer needed
   - This release is ABI/API compatible with the previous version
   
   PR:             ports/169742
   Submitted by:   Niclas Zeising <zeising@daemonic.se>
   
   Revision  Changes    Path
   1.35      +5 -7      ports/security/nettle/Makefile
   1.14      +2 -2      ports/security/nettle/distinfo
   1.16      +7 -5      ports/security/nettle/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
