From owner-svn-ports-all@freebsd.org Mon Feb 29 18:35:01 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1CB6AB8FCA; Mon, 29 Feb 2016 18:35:01 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D484367; Mon, 29 Feb 2016 18:35:01 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1TIZ0js048685; Mon, 29 Feb 2016 18:35:00 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1TIZ0wE048682; Mon, 29 Feb 2016 18:35:00 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201602291835.u1TIZ0wE048682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 29 Feb 2016 18:35:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409822 - in head/security: pinentry pinentry-gnome3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 18:35:01 -0000 Author: rakuco Date: Mon Feb 29 18:35:00 2016 New Revision: 409822 URL: https://svnweb.freebsd.org/changeset/ports/409822 Log: 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) Modified: head/security/pinentry-gnome3/Makefile head/security/pinentry/Makefile head/security/pinentry/distinfo Modified: head/security/pinentry-gnome3/Makefile ============================================================================== --- head/security/pinentry-gnome3/Makefile Mon Feb 29 17:20:51 2016 (r409821) +++ head/security/pinentry-gnome3/Makefile Mon Feb 29 18:35:00 2016 (r409822) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= GNOME 3 version of the GnuPG password dialog Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Mon Feb 29 17:20:51 2016 (r409821) +++ head/security/pinentry/Makefile Mon Feb 29 18:35:00 2016 (r409822) @@ -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-gnome .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 Modified: head/security/pinentry/distinfo ============================================================================== --- head/security/pinentry/distinfo Mon Feb 29 17:20:51 2016 (r409821) +++ head/security/pinentry/distinfo Mon Feb 29 18:35:00 2016 (r409822) @@ -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