Index: head/security/pinentry/Makefile =================================================================== --- head/security/pinentry/Makefile (revision 428682) +++ head/security/pinentry/Makefile (revision 428683) @@ -1,133 +1,134 @@ # Created by: Michael Nottebrock # $FreeBSD$ PORTNAME= pinentry -PORTVERSION= 0.9.7 -PORTREVISION?= 1 +PORTVERSION= 1.0.0 +PORTREVISION?= 0 CATEGORIES= security MASTER_SITES= GNUPG/pinentry -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT?= Collection of simple PIN or passphrase entry dialogs +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + USES= tar:bzip2 .if !defined(PINENTRY_GUI) INFO= pinentry NO_ARCH= yes NO_BUILD= yes PLIST_FILES= bin/pinentry OPTIONS_SINGLE= FRONTEND OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 QT5 GNOME3 OPTIONS_DEFAULT= TTY FRONTEND_DESC= Default frontend TTY_DESC= Console version PINENTRY_TTY= pinentry-tty TTY_RUN_DEPENDS= ${PINENTRY_TTY}:security/pinentry-tty NCURSES_DESC= Curses frontend PINENTRY_NCURSES= pinentry-curses NCURSES_RUN_DEPENDS= ${PINENTRY_NCURSES}:security/pinentry-curses GTK2_DESC= Gtk+ 2 frontend PINENTRY_GTK2= pinentry-gtk-2 GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:security/pinentry-gtk2 QT4_DESC= Qt 4 frontend PINENTRY_QT4= pinentry-qt4 QT4_RUN_DEPENDS= ${PINENTRY_QT4}:security/pinentry-qt4 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 GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3 .include .for gui in ${OPTIONS_SINGLE_FRONTEND} . if ${PORT_OPTIONS:M${gui}} PINENTRY_BIN= ${PINENTRY_${gui}} . endif .endfor do-install: ${LN} -sf ${PINENTRY_BIN} ${STAGEDIR}${PREFIX}/bin/pinentry ${INSTALL_DATA} ${WRKSRC}/doc/pinentry.info ${STAGEDIR}${PREFIX}/${INFO_PATH} .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 +LDFLAGS+= -Wl,--as-needed -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - 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 USE_GNOME+= gtk20 LIB_DEPENDS+= libgcr-base-3.so:security/gcr PLIST_FILES= bin/pinentry-gnome3 .else CONFIGURE_ARGS+=--disable-pinentry-gnome3 .endif .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 .elif ${PINENTRY_GUI} == "qt5" USES+= compiler:c++11-lib USE_QT5= core gui widgets buildtools_build PLIST_FILES= bin/pinentry-qt5 CONFIGURE_ARGS+=--enable-pinentry-qt5 \ --program-suffix=5 .else CONFIGURE_ARGS+=--disable-pinentry-qt --disable-pinentry-qt5 .endif .if ${PINENTRY_GUI} == "gtk2" USE_GNOME+= gtk20 PLIST_FILES= bin/pinentry-gtk-2 .else CONFIGURE_ARGS+=--disable-pinentry-gtk2 .endif .if ${PINENTRY_GUI} == "curses" PLIST_FILES= bin/pinentry-curses .else CONFIGURE_ARGS+=--disable-pinentry-curses .endif .if ${PINENTRY_GUI} == "tty" PLIST_FILES= bin/pinentry-tty CONFIGURE_ARGS+=--enable-pinentry-tty .else CONFIGURE_ARGS+=--disable-pinentry-tty .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \ ${STAGEDIR}${PREFIX}/info/pinentry.info .endif # !defined(PINENTRY_GUI) .include Index: head/security/pinentry/distinfo =================================================================== --- head/security/pinentry/distinfo (revision 428682) +++ head/security/pinentry/distinfo (revision 428683) @@ -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 Index: head/security/pinentry/files/patch-more_sec_mem =================================================================== --- head/security/pinentry/files/patch-more_sec_mem (revision 428682) +++ head/security/pinentry/files/patch-more_sec_mem (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - # define MAP_ANONYMOUS MAP_ANON - #endif - --#define DEFAULT_POOLSIZE 16384 -+#define DEFAULT_POOLSIZE 16384*4 - - typedef struct memblock_struct MEMBLOCK; - struct memblock_struct { Property changes on: head/security/pinentry/files/patch-more_sec_mem ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/pinentry/files/patch-secmem_secmem.c =================================================================== --- head/security/pinentry/files/patch-secmem_secmem.c (nonexistent) +++ head/security/pinentry/files/patch-secmem_secmem.c (revision 428683) @@ -0,0 +1,11 @@ +--- 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 + +-#define DEFAULT_POOLSIZE 16384 ++#define DEFAULT_POOLSIZE 16384*4 + + typedef struct memblock_struct MEMBLOCK; + struct memblock_struct { Property changes on: head/security/pinentry/files/patch-secmem_secmem.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pinentry-qt4/Makefile =================================================================== --- head/security/pinentry-qt4/Makefile (revision 428682) +++ head/security/pinentry-qt4/Makefile (revision 428683) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Qt 4 version of the GnuPG password dialog PINENTRY_GUI= qt4 MASTERDIR= ${.CURDIR}/../pinentry .include "${MASTERDIR}/Makefile"