Attachment #117438 for bug #159520

View | Details | Raw Unified | Return to bug 159520
Collapse All | Expand All




#

PORTNAME=	gnupg
PORTVERSION=	2.0.18
PORTREVISION=	3
CATEGORIES=	security
MASTER_SITES=	${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR=	gnupg

MAINTAINER=	kuriyama@FreeBSD.org
COMMENT=	The GNU Privacy Guard

BUILD_DEPENDS=	libksba>=1.2.0:${PORTSDIR}/security/libksba
LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
		gcrypt.18:${PORTSDIR}/security/libgcrypt \
		gpg-error:${PORTSDIR}/security/libgpg-error \

verify:	checksum
	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig

post-patch:
	@${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
	@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
		${WRKSRC}/tools/symcryptrun.c

post-install:

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (gnupg-2.0.17.tar.bz2) = ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6	1	SHA256 (gnupg-2.0.18.tar.bz2) = 48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
2	SIZE (gnupg-2.0.17.tar.bz2) = 3997356	2	SIZE (gnupg-2.0.18.tar.bz2) = 4016606
3	SHA256 (gnupg-2.0.17.tar.bz2.sig) = 27918acebd48f93e3042c3b6f6396182bee2c9a5f0448d2063ce73986bb748ff	3	SHA256 (gnupg-2.0.18.tar.bz2.sig) = 9238f90e17589a421e6ba5c5d7bd9f68fbd1f1553198a3448fbdc887a38b975d
4	SIZE (gnupg-2.0.17.tar.bz2.sig) = 287	4	SIZE (gnupg-2.0.18.tar.bz2.sig) = 287




--- g10/pkglue.c.orig	2011-01-09 14:06:16.000000000 -0800
+++ g10/pkglue.c	2011-07-12 21:32:41.000000000 -0700
@@ -34,10 +34,10 @@
 {
   gcry_sexp_t list;
   gcry_mpi_t data;
-  
+
   list = gcry_sexp_find_token (sexp, item, 0);
   assert (list);
-  data = gcry_sexp_nth_mpi (list, 1, 0);
+  data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   assert (data);
   gcry_sexp_release (list);
   return data;
@@ -293,7 +293,7 @@
   if (rc)
     return rc;
 
-  *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
+  *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
   gcry_sexp_release (s_plain);
   if (!*result)
     return -1;			/* oops */

Return to bug 159520

Lines 6-13 Link Here

(-)Makefile (-6 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= gnupg	8	PORTNAME= gnupg
9	PORTVERSION= 2.0.17	9	PORTVERSION= 2.0.18
10	PORTREVISION= 3
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= ${MASTER_SITE_GNUPG}	11	MASTER_SITES= ${MASTER_SITE_GNUPG}
13	MASTER_SITE_SUBDIR= gnupg	12	MASTER_SITE_SUBDIR= gnupg
Lines 17-23 Link Here
17	MAINTAINER= kuriyama@FreeBSD.org	16	MAINTAINER= kuriyama@FreeBSD.org
18	COMMENT= The GNU Privacy Guard	17	COMMENT= The GNU Privacy Guard
19		18
20	BUILD_DEPENDS= libksba>=1.2.0:${PORTSDIR}/security/libksba
21	LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \	19	LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \
22	gcrypt.18:${PORTSDIR}/security/libgcrypt \	20	gcrypt.18:${PORTSDIR}/security/libgcrypt \
23	gpg-error:${PORTSDIR}/security/libgpg-error \	21	gpg-error:${PORTSDIR}/security/libgpg-error \
Lines 115-124 Link Here
115	verify: checksum	113	verify: checksum
116	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig	114	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
117		115
118	pre-configure:	116	post-patch:
119	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \	117	@${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
120	${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure	118	${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
121	${REINPLACE_CMD} -e "/#include <utmp.h>/d" \	119	@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
122	${WRKSRC}/tools/symcryptrun.c	120	${WRKSRC}/tools/symcryptrun.c
123		121
124	post-install:	122	post-install:

Removed Link Here

(-)files/patch-g10__pkglue.c (-24 lines)
1	--- g10/pkglue.c.orig 2011-01-09 14:06:16.000000000 -0800
2	+++ g10/pkglue.c 2011-07-12 21:32:41.000000000 -0700
3	@@ -34,10 +34,10 @@
4	{
5	gcry_sexp_t list;
6	gcry_mpi_t data;
7	-
8	+
9	list = gcry_sexp_find_token (sexp, item, 0);
10	assert (list);
11	- data = gcry_sexp_nth_mpi (list, 1, 0);
12	+ data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
13	assert (data);
14	gcry_sexp_release (list);
15	return data;
16	@@ -293,7 +293,7 @@
17	if (rc)
18	return rc;
19
20	- *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
21	+ *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
22	gcry_sexp_release (s_plain);
23	if (!*result)
24	return -1; /* oops */