mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00
Code Issues Releases Activity

Add upstream commit to fix build errors with -pedantic.

Browse Source 
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)
This commit is contained in:
Raphael Kubo da Costa 2015-12-18 12:25:01 +00:00
parent b6bd7d4e36
commit a924b9c755
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403961
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/libgcrypt/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= libgcrypt
PORTVERSION= 1.6.4
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= GNUPG

40
security/libgcrypt/files/patch-git_f5832285 Normal file
View File

@ -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 <wk@gnupg.org>
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 <opalraava@hushmail.com>
Signed-off-by: Werner Koch <wk@gnupg.org>
---
--- 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