From bsdkaffee@gmail.com  Wed Aug  8 20:12:29 2012
Return-Path: <bsdkaffee@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39AD7106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  8 Aug 2012 20:12:29 +0000 (UTC)
	(envelope-from bsdkaffee@gmail.com)
Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54])
	by mx1.freebsd.org (Postfix) with ESMTP id EE6EE8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  8 Aug 2012 20:12:28 +0000 (UTC)
Received: by vbmv11 with SMTP id v11so1497799vbm.13
        for <FreeBSD-gnats-submit@freebsd.org>; Wed, 08 Aug 2012 13:12:28 -0700 (PDT)
Received: by 10.59.7.68 with SMTP id da4mr3033786ved.4.1344456747949;
        Wed, 08 Aug 2012 13:12:27 -0700 (PDT)
Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68])
        by mx.google.com with ESMTPS id cz2sm22003519vdb.3.2012.08.08.13.12.26
        (version=TLSv1/SSLv3 cipher=OTHER);
        Wed, 08 Aug 2012 13:12:27 -0700 (PDT)
Message-Id: <1344456747.159117.96133@mocha.verizon.net>
Date: Wed, 8 Aug 2012 16:12:27 -0400
From: Jason E. Hale <bsdkaffee@gmail.com>
Reply-To: Jason E. Hale <bsdkaffee@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: umq@ueo.co.jp
Subject: [PATCH] security/gnutls: Add patch to help remove warnings in other ports 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170488
>Category:       ports
>Synopsis:       [PATCH] security/libgcrypt: Add patch to help remove warnings in other ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    novel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 08 20:20:01 UTC 2012
>Closed-Date:    Sat Aug 25 08:36:44 UTC 2012
>Last-Modified:  Sat Aug 25 08:40:03 UTC 2012
>Originator:     Jason E. Hale
>Release:        FreeBSD 9.0-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386


	
>Description:
- gcrypt.h has some deprecated functions that aren't properly wrapped and
  emit warnings even if -DGCRYPT_NO_DEPRECATED is passed to the compiler
  such as:
     /usr/local/include/gcrypt.h:1336: warning: 'gcry_ac_io_mode_t' is deprecated
     /usr/local/include/gcrypt.h:1337: warning: 'gcry_ac_io_type_t' is deprecated
     /usr/local/include/gcrypt.h:1344: warning: 'gcry_ac_data_read_cb_t' is deprecated
     /usr/local/include/gcrypt.h:1358: warning: 'gcry_ac_data_write_cb_t' is deprecated
     /usr/local/include/gcrypt.h:1393: warning: 'gcry_md_algo_t' is deprecated
     /usr/local/include/gcrypt.h:1401: warning: 'gcry_md_algo_t' is deprecated
- While here: avoid installing multiple copies of the GPLv2 and LGPL21,
  they are known licenses and are in ${PORTSDIR}/Templates/Licenses
- Bump PORTREVISION since installed files will change
	
>How-To-Repeat:
- Build a port that depends on libgcrypt like devel/gwenhywfar
	
>Fix:

	
gcrypt.h.in patch created with information from:
http://lists.gnupg.org/pipermail/gcrypt-devel/2011-September/001843.html


--- 2012-08-08-libgcrypt.diff begins here ---
Index: files/patch-src__gcrypt.h.in
===================================================================
--- files/patch-src__gcrypt.h.in	(revision 0)
+++ files/patch-src__gcrypt.h.in	(working copy)
@@ -0,0 +1,19 @@
+--- ./src/gcrypt.h.in.orig	2012-08-08 07:35:27.000000000 -0400
++++ ./src/gcrypt.h.in	2012-08-08 07:37:47.000000000 -0400
+@@ -1248,7 +1248,7 @@
+    number.  */
+ gcry_error_t gcry_md_list (int *list, int *list_length);
+ 
+-
++#if !defined(GCRYPT_NO_DEPRECATED) || defined(_GCRYPT_IN_LIBGCRYPT)
+ /* Alternative interface for asymmetric cryptography.  This interface
+    is deprecated.  */
+ 
+@@ -1401,6 +1401,7 @@
+   gcry_md_algo_t md;
+ } gcry_ac_ssa_pkcs_v1_5_t _GCRY_ATTR_INTERNAL;
+ 
++#endif
+ 
+ #ifndef GCRYPT_NO_DEPRECATED
+ /* Returns a new, empty data set in DATA.  */

Property changes on: files/patch-src__gcrypt.h.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 302305)
+++ pkg-plist	(working copy)
@@ -9,8 +9,6 @@
 lib/libgcrypt.so.18
 share/aclocal/libgcrypt.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
Index: Makefile
===================================================================
--- Makefile	(revision 302305)
+++ Makefile	(working copy)
@@ -6,6 +6,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,6 @@
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
-LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
@@ -27,7 +27,7 @@
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_LDCONFIG=	yes
 
-DOCS=	AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README README.SVN \
+DOCS=	AUTHORS ChangeLog INSTALL NEWS README README.SVN \
 	THANKS TODO doc/HACKING doc/README.apichanges
 INFO=	gcrypt
 
--- 2012-08-08-libgcrypt.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->novel 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 8 20:20:12 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: "Jason E. Hale" <bsdkaffee@gmail.com>
To: bug-followup@freebsd.org, bsdkaffee@gmail.com
Cc:  
Subject: Re: ports/170488: [PATCH] security/gnutls: Add patch to help remove warnings in other ports
Date: Wed, 08 Aug 2012 20:23:50 -0400

 Sorry...this is for security/libgcrypt not security/gnutls.

From: Roman Bogorodskiy <novel@FreeBSD.org>
To: bug-followup@FreeBSD.org, bsdkaffee@gmail.com, umq@ueo.co.jp
Cc:  
Subject: Re: ports/170488: [PATCH] security/libgcrypt: Add patch to help
 remove warnings in other ports
Date: Sun, 12 Aug 2012 08:51:43 +0400

 --VV4b6MQE+OnNyhkM
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 As a maintainer of security/libgcrypt, could you please take a look at
 this PR:=20
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/170488
 
 and tell if you approve it.
 
 Thanks,
 
 Roman Bogorodskiy
 
 --VV4b6MQE+OnNyhkM
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (FreeBSD)
 
 iQEcBAEBAgAGBQJQJzZeAAoJEMltX/4IwiJqYfIH/1A2V5x7Jn8f0Pd0+OLOy7yr
 uEjhsyS6mNh52/l4IsOgbAsK9N6YgqstXUITsnaixruRlV1yDSb9wIFwSgEs3WMK
 yBh6DIWGucxLt6VlKzJW0rncgd1FhGa0N8xt8HPHQDsFfM+iLj6ob1jk9cDWnPHr
 zqXZmBEU7O0ovQhqCxvFKXWgKr21XyIpyuTGl4HDMcFJeyuevwptFXV1A/QDghIn
 /+XbJ3H4fSp8zYWUvfRuSZFonhEsFsX2h3NAPoOGQtjuh0+/vWEIm2JadTqeyuqn
 YX7VxpmmVPBjWm9AaCBDwhz+ABabSCqgVX0P3H9glEkezfvsZkNEf8fPaczUnns=
 =E5+y
 -----END PGP SIGNATURE-----
 
 --VV4b6MQE+OnNyhkM--

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@freebsd.org, bsdkaffee@gmail.com
Cc:  
Subject: Re: ports/170488: [PATCH] security/libgcrypt: Add patch to help
 remove warnings in other ports
Date: Sat, 18 Aug 2012 06:34:32 +0900

 Hi,
 
 > As a maintainer of security/libgcrypt, could you please take a look at
 > this PR:
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/170488
 
 The patch looks fine, thanks.
 I approve it.
 
 Regards,
 -- 
 end
 
     Hirohisa Yamaguchi
       umq@ueo.co.jp
State-Changed-From-To: open->closed 
State-Changed-By: novel 
State-Changed-When: Sat Aug 25 08:36:43 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170488: commit references a PR
Date: Sat, 25 Aug 2012 08:34:11 +0000 (UTC)

 Author: novel
 Date: Sat Aug 25 08:33:55 2012
 New Revision: 303123
 URL: http://svn.freebsd.org/changeset/ports/303123
 
 Log:
   - Properly define deprecated functions to remove warnings in other
     ports
   - Avoid installing multiple copies of the GPLv2 and LGPL21 licenses
   - Bump PORTREVISION
   
   PR:		170488
   Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
   Approved by:	Hirohisa Yamaguchi (maintainer)
 
 Added:
   head/security/libgcrypt/files/patch-src__gcrypt.h.in   (contents, props changed)
 Modified:
   head/security/libgcrypt/Makefile
   head/security/libgcrypt/pkg-plist
 
 Modified: head/security/libgcrypt/Makefile
 ==============================================================================
 --- head/security/libgcrypt/Makefile	Sat Aug 25 08:28:10 2012	(r303122)
 +++ head/security/libgcrypt/Makefile	Sat Aug 25 08:33:55 2012	(r303123)
 @@ -6,6 +6,7 @@
  
  PORTNAME=	libgcrypt
  PORTVERSION=	1.5.0
 +PORTREVISION=	1
  CATEGORIES=	security
  MASTER_SITES=	${MASTER_SITE_GNUPG}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -15,7 +16,6 @@ COMMENT=	General purpose crypto library 
  
  LICENSE=	GPLv2 LGPL21
  LICENSE_COMB=	multi
 -LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
  
  BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
  RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 @@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
  USE_LDCONFIG=	yes
  
 -DOCS=	AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README README.SVN \
 +DOCS=	AUTHORS ChangeLog INSTALL NEWS README README.SVN \
  	THANKS TODO doc/HACKING doc/README.apichanges
  INFO=	gcrypt
  
 
 Added: head/security/libgcrypt/files/patch-src__gcrypt.h.in
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/security/libgcrypt/files/patch-src__gcrypt.h.in	Sat Aug 25 08:33:55 2012	(r303123)
 @@ -0,0 +1,19 @@
 +--- ./src/gcrypt.h.in.orig	2012-08-08 07:35:27.000000000 -0400
 ++++ ./src/gcrypt.h.in	2012-08-08 07:37:47.000000000 -0400
 +@@ -1248,7 +1248,7 @@
 +    number.  */
 + gcry_error_t gcry_md_list (int *list, int *list_length);
 + 
 +-
 ++#if !defined(GCRYPT_NO_DEPRECATED) || defined(_GCRYPT_IN_LIBGCRYPT)
 + /* Alternative interface for asymmetric cryptography.  This interface
 +    is deprecated.  */
 + 
 +@@ -1401,6 +1401,7 @@
 +   gcry_md_algo_t md;
 + } gcry_ac_ssa_pkcs_v1_5_t _GCRY_ATTR_INTERNAL;
 + 
 ++#endif
 + 
 + #ifndef GCRYPT_NO_DEPRECATED
 + /* Returns a new, empty data set in DATA.  */
 
 Modified: head/security/libgcrypt/pkg-plist
 ==============================================================================
 --- head/security/libgcrypt/pkg-plist	Sat Aug 25 08:28:10 2012	(r303122)
 +++ head/security/libgcrypt/pkg-plist	Sat Aug 25 08:33:55 2012	(r303123)
 @@ -9,8 +9,6 @@ lib/libgcrypt.so
  lib/libgcrypt.so.18
  share/aclocal/libgcrypt.m4
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 -%%PORTDOCS%%%%DOCSDIR%%/COPYING
 -%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
  %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
  %%PORTDOCS%%%%DOCSDIR%%/HACKING
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
