summaryrefslogtreecommitdiff
path: root/security/pinentry
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-02-29 18:35:00 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-02-29 18:35:00 +0000
commitfe2e23cbdd1c0a3bc3f0503e7625d5994f365a80 (patch)
treea32b1c3693c36c5ec5b5fdf2e101223814c8f87a /security/pinentry
parent- Add LICENSE (diff)
Update security/pinentry and slave ports to 0.9.7.
From pinentry's NEWS file: Noteworthy changes in version 0.9.7 (2015-12-07) ------------------------------------------------ * Fix regressions in the Qt pinentry. * Fix minor problems pinnetyr-tty. * New option --invisible-char. Noteworthy changes in version 0.9.6 (2015-09-10) ------------------------------------------------ * Many improvements for the dump tty pinentry. * Use the standard GTK+-2 text entry widget instead of our outdated and back-then-it-was-more-secure text widget. * Use the standard Qt text widget. * Allow for building a static Qt variant. * Fix regression in w32 pinentry. Compare to 0.9.5, the biggest change from a ports perspective is improved support for libc++ in pinentry-qt, as upstream got rid of its custom entry widget that only worked with libstdc++. This allows the Makefile to be simplified and pinentry-qt4 to be built with libc++. There is also an option to build a Qt5-based version of pinentry, but I did not add the new port in this patch. PR: 207567 Approved by: makc (maintainer)
Notes
Notes: svn path=/head/; revision=409822
Diffstat (limited to 'security/pinentry')
-rw-r--r--security/pinentry/Makefile25
-rw-r--r--security/pinentry/distinfo4
2 files changed, 7 insertions, 22 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index f8e42b2c1156..b7ec53dcee55 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pinentry
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.7
PORTREVISION?= 0
CATEGORIES= security
MASTER_SITES= GNUPG/pinentry
@@ -36,12 +36,8 @@ GTK2_DESC= Gtk+ 2 frontend
PINENTRY_GTK2= pinentry-gtk-2
GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2
-.if exists(/usr/lib/libc++.so)
-QT4_DESC= Qt 4 frontend (broken)
-.else
QT4_DESC= Qt 4 frontend
-.endif
-PINENTRY_QT4= pinentry-qt4
+PINENTRY_QT4= pinentry-qt
QT4_RUN_DEPENDS= ${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4
GNOME3_DESC= GNOME 3 frontend
@@ -90,14 +86,11 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3
.if ${PINENTRY_GUI} == "qt4"
USES+= compiler:c++11-lib
-USE_CXXSTD= c++11
-. if exists(/usr/lib/libc++.so)
-IGNORE= does not compile with libc++
-. endif
USE_QT4= gui moc_build
-PLIST_FILES= bin/pinentry-qt4
+PLIST_FILES= bin/pinentry-qt
+CONFIGURE_ARGS+=--disable-pinentry-qt5
.else
-CONFIGURE_ARGS+=--disable-pinentry-qt4
+CONFIGURE_ARGS+=--disable-pinentry-qt --disable-pinentry-qt5
.endif
.if ${PINENTRY_GUI} == "gtk2"
@@ -121,14 +114,6 @@ CONFIGURE_ARGS+=--enable-pinentry-tty
CONFIGURE_ARGS+=--disable-pinentry-tty
.endif
-pre-configure:
-.if ${PINENTRY_GUI} == "qt4"
- cd ${WRKSRC}/qt4 && \
- ${MOC} pinentrydialog.h > pinentrydialog.moc && \
- ${MOC} qsecurelineedit.h > qsecurelineedit.moc && \
- ${MOC} pinentryconfirm.h > pinentryconfirm.moc
-.endif
-
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \
${STAGEDIR}${PREFIX}/info/pinentry.info
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index b50a966682ec..26b526b6a535 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pinentry-0.9.5.tar.bz2) = 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c
-SIZE (pinentry-0.9.5.tar.bz2) = 514677
+SHA256 (pinentry-0.9.7.tar.bz2) = 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
+SIZE (pinentry-0.9.7.tar.bz2) = 432978