Attachment #177908 for bug #215236

Lines 1-7 Link Here

(-)security/libgcrypt/Makefile (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libgcrypt	3	PORTNAME= libgcrypt
4	PORTVERSION= 1.7.3	4	PORTVERSION= 1.7.4
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= GNUPG	6	MASTER_SITES= GNUPG
7		7
Lines 24-31 Link Here
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	TEST_TARGET= check	25	TEST_TARGET= check
26		26
27	DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \	27	DOCS= AUTHORS ChangeLog ChangeLog-2011 NEWS THANKS TODO \
28	README.GIT THANKS TODO doc/HACKING doc/README.apichanges	28	doc/HACKING doc/README.apichanges
29	INFO= gcrypt	29	INFO= gcrypt
30	PORTDOCS= *	30	PORTDOCS= *
31		31

Lines 1-3 Link Here

(-)security/libgcrypt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1471514079	1	TIMESTAMP = 1481495027
2	SHA256 (libgcrypt-1.7.3.tar.bz2) = ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071	2	SHA256 (libgcrypt-1.7.4.tar.bz2) = 3b67862e2f4711e25c4ce3cc4b48d52a58a3afdcd1d8c6a57f93a1c0ef03e5c6
3	SIZE (libgcrypt-1.7.3.tar.bz2) = 2861294	3	SIZE (libgcrypt-1.7.4.tar.bz2) = 2883284




--- mpi/longlong.h.orig	2016-06-16 11:43:39 UTC
+++ mpi/longlong.h
@@ -174,6 +174,7 @@ MA 02111-1307, USA. */
     (pl) = __m0 * __m1; 						\
   } while (0)
 # define UMUL_TIME 46
+# if 0
 # ifndef LONGLONG_STANDALONE
 #  define udiv_qrnnd(q, r, n1, n0, d) \
   do { UDItype __r;							\
@@ -183,6 +184,7 @@ MA 02111-1307, USA. */
 extern UDItype __udiv_qrnnd ();
 #  define UDIV_TIME 220
 # endif /* !LONGLONG_STANDALONE */
+#endif /* 0 */
 #endif /* __alpha */
 
 /***************************************
@@ -1293,7 +1295,7 @@ typedef unsigned int UTItype __attribute
 	     "rJ" ((USItype)(al)),                                      \
 	     "rI" ((USItype)(bl))                                       \
 	   __CLOBBER_CC)
-# if defined (__sparc_v8__) || defined(__sparcv8)
+# if defined (__sparc_v8__) || defined(__sparcv8) || defined(__sparc__)
 /* Don't match immediate range because, 1) it is not often useful,
    2) the 'I' flag thinks of the range as a 13 bit signed interval,
    while we want to match a 13 bit interval, sign extended to 32 bits,

Lines 6-11 Link Here

(-)security/libgcrypt/pkg-plist (-1 / +1 lines)
6	lib/libgcrypt.a	6	lib/libgcrypt.a
7	lib/libgcrypt.so	7	lib/libgcrypt.so
8	lib/libgcrypt.so.20	8	lib/libgcrypt.so.20
9	lib/libgcrypt.so.20.1.3	9	lib/libgcrypt.so.20.1.4
10	man/man1/hmac256.1.gz	10	man/man1/hmac256.1.gz
11	share/aclocal/libgcrypt.m4	11	share/aclocal/libgcrypt.m4

Return to bug 215236

Lines 1-27 Link Here

(-)security/libgcrypt/files/patch-mpi_longlong.h (-27 lines)
1	--- mpi/longlong.h.orig 2016-06-16 11:43:39 UTC
2	+++ mpi/longlong.h
3	@@ -174,6 +174,7 @@ MA 02111-1307, USA. */
4	(pl) = __m0 * __m1; \
5	} while (0)
6	# define UMUL_TIME 46
7	+# if 0
8	# ifndef LONGLONG_STANDALONE
9	# define udiv_qrnnd(q, r, n1, n0, d) \
10	do { UDItype __r; \
11	@@ -183,6 +184,7 @@ MA 02111-1307, USA. */
12	extern UDItype __udiv_qrnnd ();
13	# define UDIV_TIME 220
14	# endif /* !LONGLONG_STANDALONE */
15	+#endif /* 0 */
16	#endif /* __alpha */
17
18	/***************************************
19	@@ -1293,7 +1295,7 @@ typedef unsigned int UTItype __attribute
20	"rJ" ((USItype)(al)), \
21	"rI" ((USItype)(bl)) \
22	__CLOBBER_CC)
23	-# if defined (__sparc_v8__) \|\| defined(__sparcv8)
24	+# if defined (__sparc_v8__) \|\| defined(__sparcv8) \|\| defined(__sparc__)
25	/* Don't match immediate range because, 1) it is not often useful,
26	2) the 'I' flag thinks of the range as a 13 bit signed interval,
27	while we want to match a 13 bit interval, sign extended to 32 bits,