svn commit: r428683 - in head/security: pinentry pinentry-qt4 pinentry/files

[Jason E. Hale]

Author: jhale
Date: Fri Dec 16 15:31:24 2016
New Revision: 428683
URL: https://svnweb.freebsd.org/changeset/ports/428683

Log:
  Update to 1.0.0
  Add LICENSE (GPLv2+)
  Dependency cleanup
  Whitespace fix
  Remake patches
  Take maintainership

Added:
  head/security/pinentry/files/patch-secmem_secmem.c
     - copied, changed from r428682, head/security/pinentry/files/patch-more_sec_mem
Deleted:
  head/security/pinentry/files/patch-more_sec_mem
Modified:
  head/security/pinentry-qt4/Makefile
  head/security/pinentry/Makefile
  head/security/pinentry/distinfo

Modified: head/security/pinentry-qt4/Makefile
==============================================================================
--- head/security/pinentry-qt4/Makefile	Fri Dec 16 14:03:43 2016	(r428682)
+++ head/security/pinentry-qt4/Makefile	Fri Dec 16 15:31:24 2016	(r428683)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Qt 4 version of the GnuPG password dialog
 

Modified: head/security/pinentry/Makefile
==============================================================================
--- head/security/pinentry/Makefile	Fri Dec 16 14:03:43 2016	(r428682)
+++ head/security/pinentry/Makefile	Fri Dec 16 15:31:24 2016	(r428683)
@@ -2,14 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
-PORTVERSION=	0.9.7
-PORTREVISION?=	1
+PORTVERSION=	1.0.0
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	jhale at FreeBSD.org
 COMMENT?=	Collection of simple PIN or passphrase entry dialogs
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		tar:bzip2
 
 .if !defined(PINENTRY_GUI)
@@ -42,7 +45,7 @@ QT4_RUN_DEPENDS=	${PINENTRY_QT4}:securit
 
 QT5_DESC=	Qt 5 frontend
 PINENTRY_QT5=	pinentry-qt5
-QT5_RUN_DEPENDS=	${PINENTRY_QT5}:security/pinentry-qt5 
+QT5_RUN_DEPENDS=	${PINENTRY_QT5}:security/pinentry-qt5
 
 GNOME3_DESC=	GNOME 3 frontend
 PINENTRY_GNOME3=	pinentry-gnome3
@@ -63,21 +66,19 @@ do-install:
 .else # !defined(PINENTRY_GUI)
 PKGNAMESUFFIX=	-${PINENTRY_GUI}
 LIB_DEPENDS=	libassuan.so:security/libassuan \
-		libgcrypt.so:security/libgcrypt \
-		libksba.so:security/libksba
+		libgpg-error.so:security/libgpg-error
 
-USES+=		iconv gmake ncurses pkgconfig
+USES+=		gmake iconv localbase ncurses pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-pinentry-emacs
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-Wl,--as-needed
 
 OPTIONS_DEFINE=	LIBSECRET
 
 LIBSECRET_DESC=	Saving the passphrase with libsecret
 LIBSECRET_CONFIGURE_ENABLE=	libsecret
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
+LIBSECRET_USE=		GNOME=glib20
 
 .if ${PINENTRY_GUI} == "gnome3"
 OPTIONS_SLAVE=	LIBSECRET
@@ -90,7 +91,7 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome
 
 .if ${PINENTRY_GUI} == "qt4"
 USES+=		compiler:c++11-lib
-USE_QT4=	gui moc_build
+USE_QT4=	corelib gui moc_build
 PLIST_FILES=	bin/pinentry-qt4
 CONFIGURE_ARGS+=--disable-pinentry-qt5 \
 		--program-suffix=4

Modified: head/security/pinentry/distinfo
==============================================================================
--- head/security/pinentry/distinfo	Fri Dec 16 14:03:43 2016	(r428682)
+++ head/security/pinentry/distinfo	Fri Dec 16 15:31:24 2016	(r428683)
@@ -1,2 +1,3 @@
-SHA256 (pinentry-0.9.7.tar.bz2) = 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
-SIZE (pinentry-0.9.7.tar.bz2) = 432978
+TIMESTAMP = 1481880660
+SHA256 (pinentry-1.0.0.tar.bz2) = 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
+SIZE (pinentry-1.0.0.tar.bz2) = 436930

Copied and modified: head/security/pinentry/files/patch-secmem_secmem.c (from r428682, head/security/pinentry/files/patch-more_sec_mem)
==============================================================================
--- head/security/pinentry/files/patch-more_sec_mem	Fri Dec 16 14:03:43 2016	(r428682, copy source)
+++ head/security/pinentry/files/patch-secmem_secmem.c	Fri Dec 16 15:31:24 2016	(r428683)
@@ -1,6 +1,6 @@
---- secmem/secmem.c.orig	2007-07-03 05:49:48.000000000 +0600
-+++ secmem/secmem.c		2008-02-17 22:19:50.000000000 +0500
-@@ -85,7 +85,7 @@
+--- secmem/secmem.c.orig	2016-04-14 14:39:51 UTC
++++ secmem/secmem.c
+@@ -88,7 +88,7 @@ log_fatal(char *template, ...)
  #  define MAP_ANONYMOUS MAP_ANON
  #endif