Attachment #162427 for bug #204003

Lines 1-7 Link Here

(-)/usr/ports/security/libgcrypt/Makefile (-2 / +2 lines)
1	# $FreeBSD: head/security/libgcrypt/Makefile 397388 2015-09-20 19:22:28Z amdmi3 $	1	# $FreeBSD: head/security/libgcrypt/Makefile 397388 2015-09-20 19:22:28Z amdmi3 $
2		2
3	PORTNAME= libgcrypt	3	PORTNAME= libgcrypt
4	PORTVERSION= 1.6.3	4	PORTVERSION= 1.6.4
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= GNUPG	6	MASTER_SITES= GNUPG
7		7
Lines 46-52 Link Here
46	.endif	46	.endif
47		47
48	post-install:	48	post-install:
49	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.3	49	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.4
50		50
51	post-install-DOCS-on:	51	post-install-DOCS-on:
52	${MKDIR} ${STAGEDIR}${DOCSDIR}	52	${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)/usr/ports/security/libgcrypt/distinfo (-2 / +2 lines)
1	SHA256 (libgcrypt-1.6.3.tar.bz2) = 41b4917b93ae34c6a0e2127378d7a4d66d805a2a86a09911d4f9bd871db7025f	1	SHA256 (libgcrypt-1.6.4.tar.bz2) = c9bc2c7fe2e5f4ea13b0c74f9d24bcbb1ad889bb39297d8082aebf23f4336026
2	SIZE (libgcrypt-1.6.3.tar.bz2) = 2494052	2	SIZE (libgcrypt-1.6.4.tar.bz2) = 2549820

Lines 1-10 Link Here

(-)/usr/ports/security/libgcrypt/files/patch-cipher-Makefile.in (-4 / +4 lines)
1	--- cipher/Makefile.in.orig 2015-01-21 19:09:47.000000000 +0100	1	--- cipher/Makefile.in.orig 2015-10-24 16:32:26 UTC
2	+++ cipher/Makefile.in 2015-01-21 19:13:35.000000000 +0100	2	+++ cipher/Makefile.in
3	@@ -766,6 +766,12 @@	3	@@ -825,6 +825,12 @@ tiger.o: $(srcdir)/tiger.c
4	tiger.lo: $(srcdir)/tiger.c	4	tiger.lo: $(srcdir)/tiger.c
5	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c \| $(o_flag_munging) `	5	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c \| $(o_flag_munging) `
6		6
7	+salsa20.o: $(srcdir)/salsa20.c	7	+salsa20.o: $(srdir)/salsa20.c
8	+ `echo $(COMPILE) -c $(srcdir)/salsa20.c \| $(o_flag_munging) `	8	+ `echo $(COMPILE) -c $(srcdir)/salsa20.c \| $(o_flag_munging) `
9	+	9	+
10	+salsa20.lo: $(srcdir)/salsa20.c	10	+salsa20.lo: $(srcdir)/salsa20.c




--- src/gcrypt.h.in-orig	2014-07-28 03:54:16.000000000 +0200
+++ src/gcrypt.h.in	2014-07-28 03:54:32.000000000 +0200
@@ -508,7 +508,7 @@
     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.  */
   };
 
 
@@ -1345,7 +1345,7 @@
 /* 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

Line 0 Link Here

(-)/usr/ports/security/libgcrypt/files/patch-src_gcrypt.h.in (+11 lines)
	1	--- src/gcrypt.h.in.orig 2015-10-24 16:30:32 UTC
	2	+++ src/gcrypt.h.in
	3	@@ -1343,7 +1343,7 @@ enum gcry_mac_algos
	4	/* Flags used with the open function. */
	5	enum gcry_mac_flags
	6	{
	7	- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */
	8	+ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */
	9	};
	10
	11	/* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR

Lines 5-10 Link Here

(-)/usr/ports/security/libgcrypt/pkg-plist (-1 / +1 lines)
5	include/gcrypt.h	5	include/gcrypt.h
6	lib/libgcrypt.so	6	lib/libgcrypt.so
7	lib/libgcrypt.so.20	7	lib/libgcrypt.so.20
8	lib/libgcrypt.so.20.0.3	8	lib/libgcrypt.so.20.0.4
9	man/man1/hmac256.1.gz	9	man/man1/hmac256.1.gz
10	share/aclocal/libgcrypt.m4	10	share/aclocal/libgcrypt.m4

Return to bug 204003

Lines 1-20 Link Here

(-)/usr/ports/security/libgcrypt/files/patch-gcrypt.h.in (-20 lines)
1	--- src/gcrypt.h.in-orig 2014-07-28 03:54:16.000000000 +0200
2	+++ src/gcrypt.h.in 2014-07-28 03:54:32.000000000 +0200
3	@@ -508,7 +508,7 @@
4	GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */
5	GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */
6	GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */
7	- GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */
8	+ GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4. */
9	};
10
11
12	@@ -1345,7 +1345,7 @@
13	/* Flags used with the open function. */
14	enum gcry_mac_flags
15	{
16	- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */
17	+ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */
18	};
19
20	/* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR