From owner-svn-ports-all@freebsd.org Fri Dec 18 12:25:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76BA9A497D5; Fri, 18 Dec 2015 12:25:02 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A5EB1A91; Fri, 18 Dec 2015 12:25:02 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBICP199070881; Fri, 18 Dec 2015 12:25:01 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBICP1nv070879; Fri, 18 Dec 2015 12:25:01 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512181225.tBICP1nv070879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 18 Dec 2015 12:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403961 - in head/security/libgcrypt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 12:25:02 -0000 Author: rakuco Date: Fri Dec 18 12:25:01 2015 New Revision: 403961 URL: https://svnweb.freebsd.org/changeset/ports/403961 Log: Add upstream commit to fix build errors with -pedantic. This fixes at least devel/ccrtp's build on 9.3, which is currently broken: In file included from ccrtp/crypto/gcrypt/gcrypthmac.cpp:23: /usr/local/include/gcrypt.h:509: error: comma at end of enumerator list /usr/local/include/gcrypt.h:1346: error: comma at end of enumerator list Makefile:571: recipe for target 'gcrypthmac.lo' failed MFH'ing this is not necessary, this bug is only present in libgcrypt 1.6.4. PR: 205000 Approved by: maintainer timeout (15 days) Added: head/security/libgcrypt/files/patch-git_f5832285 (contents, props changed) Modified: head/security/libgcrypt/Makefile Modified: head/security/libgcrypt/Makefile ============================================================================== --- head/security/libgcrypt/Makefile Fri Dec 18 12:08:49 2015 (r403960) +++ head/security/libgcrypt/Makefile Fri Dec 18 12:25:01 2015 (r403961) @@ -2,7 +2,7 @@ PORTNAME= libgcrypt PORTVERSION= 1.6.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= GNUPG Added: head/security/libgcrypt/files/patch-git_f5832285 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libgcrypt/files/patch-git_f5832285 Fri Dec 18 12:25:01 2015 (r403961) @@ -0,0 +1,40 @@ +Fixes at least devel/ccrtp's build: + In file included from ccrtp/crypto/gcrypt/gcrypthmac.cpp:23: + /usr/local/include/gcrypt.h:509: error: comma at end of enumerator list + /usr/local/include/gcrypt.h:1346: error: comma at end of enumerator list + +From: Werner Koch +Date: Thu, 19 Mar 2015 09:43:55 +0000 (+0100) +Subject: Fix two pedantic warnings. +X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=f5832285b0e420d77be1b8da10a1e1d86583b414 + +Fix two pedantic warnings. + +* src/gcrypt.h.in (gcry_mpi_flag, gcry_mac_algos): Remove trailing +comma. +-- + +Reported-by: Opal Raava +Signed-off-by: Werner Koch +--- + +--- src/gcrypt.h.in ++++ src/gcrypt.h.in +@@ -511,7 +511,7 @@ enum gcry_mpi_flag + GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */ + GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */ + GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */ +- GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */ ++ GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4. */ + }; + + +@@ -1372,7 +1372,7 @@ enum gcry_mac_algos + /* Flags used with the open function. */ + enum gcry_mac_flags + { +- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */ ++ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */ + }; + + /* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR