Version bump, bug #213383. Drop bindnow-flags, bug #213669. Workaround for API change in >=glib-2.16.1, bug #213382.

Package-Manager: portage-2.1.4.4

7 files changed, 162 insertions, 13 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 17373c3aacc7..2d6e2b42eb35 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.82 2008/02/13 10:59:30 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.83 2008/03/23 13:08:32 swegener Exp $
+
+*pinentry-0.7.5 (23 Mar 2008)
+
+  23 Mar 2008; Sven Wegener <swegener@gentoo.org>
+  +files/pinentry-0.7.5-grab.patch, +files/pinentry-gmem.patch,
+  pinentry-0.7.3.ebuild, pinentry-0.7.4-r1.ebuild, +pinentry-0.7.5.ebuild:
+  Version bump, bug #213383. Drop bindnow-flags, bug #213669. Workaround for
+  API change in >=glib-2.16.1, bug #213382.
 
   13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -pinentry-0.7.2-r3.ebuild:
   Cleanup
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 1f84c8dfb881..de152600ae14 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.7.2-info.patch 541 RMD160 c62e0e0b2ef45d4b9f0134a3468863c28074cf86 SHA1 0136f0332d29e0396510b3492f5eb27f43972774 SHA256 284c24b0f8a5199e1833837ef33fd8c94c7da451e688fdf7f195ab11cb6d9359
 AUX 0.7.2-libcap.patch 910 RMD160 21292ff64730826431d78d1f96a1909cb2c8997c SHA1 bc523a03e593f3bfa84437bdc603d683a21097f5 SHA256 4d142f836bcbcbfcf21412d891335e6d4351ebced3c5a699e493e5f6a4599701
 AUX pinentry-0.7.2-grab.patch 658 RMD160 6ea97caf552316ba3dad87fc976f3fd2407237e2 SHA1 f5b15301427217ff8cf9144343ded6fcf74f7151 SHA256 061d9c0f7d9c1c6902eacebb4ffc520260259d8f9de5abca254c606ed6276259
 AUX pinentry-0.7.4-grab.patch 717 RMD160 3dd998c7a2d06c8923345356489f58258121d3df SHA1 884f34b3aa1d79383495ee7ec653fbbbeaac8125 SHA256 747e3faccbc5b4f41999b2d65ebfe82e671708d2c6d952e737a9014320dd8319
+AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
+AUX pinentry-gmem.patch 880 RMD160 82c41513e47be43a801ec0d2e6cf89857b5e373f SHA1 34abb7caa0aecbd4d8f592695c30e40311425688 SHA256 484dafa00a7fe6e04380d32f3a468082d68923c11f8e3fb007e09018b4b617f5
 DIST pinentry-0.7.3.tar.gz 417000 RMD160 b7bb850e55337cefb7ec0d4eea91924c6903cce2 SHA1 557b886bc7a7030fd185fbc085703ef1ed304db8 SHA256 df1d2c47d501031b4c995cee3e464e62578b8959559121a207a8046e2cd9a5bf
 DIST pinentry-0.7.4.tar.gz 416651 RMD160 32b375586da2e2fc92c672484557af280481eeff SHA1 6cd28bda641a6c89d0bb4120e646f967605c532a SHA256 31ecfe618f67fda24a6514d21749344d8e8f9f4cd66b19f361622e73515aa04f
-EBUILD pinentry-0.7.3.ebuild 2291 RMD160 6af730e17672a3ae1c453def96c7f4f5a55b60f7 SHA1 62d4ef4e75b71f2f8fb1b70c96f9c8c84de67b98 SHA256 807e7a325a1e8a7ab413945928db7619f48fcfa71255af845dddbbaf572f9e35
-EBUILD pinentry-0.7.4-r1.ebuild 2124 RMD160 c00f4276f7bc29ce11e08203fc786d70b6d3c3e7 SHA1 a460513c3435855fc666789ba388a6421e0311c0 SHA256 10986ebd82caac0660d7a72471be157956cddf2ce223a6d30386e84bbb9ff722
-MISC ChangeLog 10669 RMD160 d51f15e7d33e7f599d22c7a472b76bbe7298a2f6 SHA1 671ff7c283169f63cd09a6233c4aa50d17a913ee SHA256 744ed08a69650097c2940e8d13baddd5f29590c6e4d23b2d64ea5a6a922dc4ee
+DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2d SHA1 6699a1ff94c649e8905199d480c6412cc43bad3d SHA256 cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172
+EBUILD pinentry-0.7.3.ebuild 2285 RMD160 d3706e6a1b25a336359bb9ee550aa1aa1f7c1a8a SHA1 e589b98a074e794757d8a0881dbaba812ff7c51d SHA256 064c24cb5f655b055fb577fd68d9803e5738f69d3eee6b94aceaf8043ad99258
+EBUILD pinentry-0.7.4-r1.ebuild 2122 RMD160 08cd63e0e31d0b1ce47524b3cb1604f7cf4196a4 SHA1 efc1c274bd6720ac058f078b41f9c3439544bb3c SHA256 7fb46b3897c286799c6f1093e18e1e4adbdc97cd5e139afcc79a8b3b4516099f
+EBUILD pinentry-0.7.5.ebuild 2127 RMD160 b18ee3156747230de77203b46d169b9726f16e11 SHA1 04949a233bfa81a853dae9d6946b9d59ab000ac8 SHA256 e29860c7b800db1fd916dbc2f7b39567ddf96ad9e5745e2bd88e624e1ba6126e
+MISC ChangeLog 11013 RMD160 abd099131e1fb56083466e935c48c46746356bb6 SHA1 863378095973b7caa6aa6d6c0c0a0fc6be92f0f3 SHA256 3c79629a32c0128447c120ea94b17eb68d55f7315d109033ef3767b24c6a4d05
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH5lZmI1lqEGTUzyQRAmftAKCo+KxuP+4eNOuaKpwD54fTcfhWbQCgiLjl
+viwp06HVnUEbLOC47tcuv+Y=
+=WnOA
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch
new file mode 100644
index 000000000000..7cd3d96cdc9e
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch
@@ -0,0 +1,15 @@
+--- pinentry/gtk+-2/pinentry-gtk-2.c
++++ pinentry/gtk+-2/pinentry-gtk-2.c
+@@ -261,10 +261,10 @@ create_window (int confirm_mode)
+   if (!confirm_mode)
+     {
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "map-event" : "focus-in-event",
++			"focus-in-event",
+ 			G_CALLBACK (grab_keyboard), NULL);
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "unmap-event" : "focus-out-event",
++			"focus-out-event",
+ 			G_CALLBACK (ungrab_keyboard), NULL);
+     }
+   gtk_window_add_accel_group (GTK_WINDOW (win), acc);
diff --git a/app-crypt/pinentry/files/pinentry-gmem.patch b/app-crypt/pinentry/files/pinentry-gmem.patch
new file mode 100644
index 000000000000..78121e6b3dbe
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-gmem.patch
@@ -0,0 +1,45 @@
+Workaround for API change in >=glib-2.16.1, bug #213382
+
+This is not the final solution, but the patches posted on the mailing-list
+cause more breakage than they help to solve the problem.
+
+Index: pinentry/gtk+-2/gtksecentry.c
+===================================================================
+--- pinentry/gtk+-2/gtksecentry.c	(revision 181)
++++ pinentry/gtk+-2/gtksecentry.c	(working copy)
+@@ -270,7 +270,11 @@
+ 
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_malloc(gsize size)
++#else
+ g_malloc(gulong size)
++#endif
+ {
+     gpointer p;
+ 
+@@ -288,7 +292,11 @@
+ }
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_malloc0(gsize size)
++#else
+ g_malloc0(gulong size)
++#endif
+ {
+     gpointer p;
+ 
+@@ -308,7 +316,11 @@
+ }
+ 
+ gpointer
++#if GLIB_CHECK_VERSION(2, 16, 1)
++g_realloc(gpointer mem, gsize size)
++#else
+ g_realloc(gpointer mem, gulong size)
++#endif
+ {
+     gpointer p;
+ 
diff --git a/app-crypt/pinentry/pinentry-0.7.3.ebuild b/app-crypt/pinentry/pinentry-0.7.3.ebuild
index 3b90b4c0f56a..f11b12e995c4 100644
--- a/app-crypt/pinentry/pinentry-0.7.3.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.3.ebuild,v 1.9 2007/10/09 14:59:19 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.3.ebuild,v 1.10 2008/03/23 13:08:32 swegener Exp $
 
 #WANT_AUTOCONF="2.5"
 #WANT_AUTOMAKE="1.9"
 
-inherit flag-o-matic qt3 multilib eutils autotools
+inherit qt3 multilib eutils autotools
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}/0.7.2-libcap.patch"
 	epatch "${FILESDIR}/0.7.2-info.patch"
 	epatch "${FILESDIR}/${PN}-0.7.2-grab.patch"
+	epatch "${FILESDIR}/${PN}-gmem.patch"
 
 	AT_M4DIR="m4" eautoreconf
 }
@@ -41,8 +42,6 @@ src_compile() {
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	fi
 
-	append-ldflags $(bindnow-flags)
-
 	# Issues finding qt on multilib systems
 	export QTLIB="${QTDIR}/$(get_libdir)"
 
diff --git a/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild b/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
index 5fda7713a56c..ab530a866e07 100644
--- a/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild,v 1.6 2008/01/21 21:10:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild,v 1.7 2008/03/23 13:08:32 swegener Exp $
 
-inherit qt3 multilib eutils flag-o-matic
+inherit qt3 multilib eutils
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
@@ -22,7 +22,9 @@ DEPEND="gtk? ( =x11-libs/gtk+-2* )
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}/${P}-grab.patch"
+	epatch "${FILESDIR}/${PN}-gmem.patch"
 }
 
 src_compile() {
@@ -33,8 +35,6 @@ src_compile() {
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	fi
 
-	append-ldflags $(bindnow-flags)
-
 	# Issues finding qt on multilib systems
 	export QTLIB="${QTDIR}/$(get_libdir)"
 
diff --git a/app-crypt/pinentry/pinentry-0.7.5.ebuild b/app-crypt/pinentry/pinentry-0.7.5.ebuild
new file mode 100644
index 000000000000..f53a3623e053
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.7.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5.ebuild,v 1.1 2008/03/23 13:08:32 swegener Exp $
+
+inherit qt3 multilib eutils
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://www.gnupg.org/aegypten/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ncurses qt3 caps"
+
+DEPEND="gtk? ( =x11-libs/gtk+-2* )
+	ncurses? ( sys-libs/ncurses )
+	qt3? ( $(qt_min_version 3.3) )
+	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
+	caps? ( sys-libs/libcap )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-grab.patch"
+	epatch "${FILESDIR}/${PN}-gmem.patch"
+}
+
+src_compile() {
+	local myconf=""
+
+	if ! ( use qt3 || use gtk || use ncurses )
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses"
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-maintainer-mode \
+		--disable-pinentry-gtk \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable qt3 pinentry-qt) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+	elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+	elog "The soft resource limit for memory locking specifies the limit an"
+	elog "unprivileged process may lock into memory. You can also use POSIX"
+	elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+	elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+	elog "your users."
+}