segf&build fixes

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/dev-php5/pecl-gnupg/ChangeLog b/dev-php5/pecl-gnupg/ChangeLog
index 8b6f4fa55fccfccc1332db75689f8dcbb5e5af22..7fcc8b83dd15f2828b2912402097862bd778efef 100644 (file)
--- a/dev-php5/pecl-gnupg/ChangeLog
+++ b/dev-php5/pecl-gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-gnupg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-gnupg/ChangeLog,v 1.2 2008/06/09 19:40:02 swegener Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-gnupg/ChangeLog,v 1.3 2010/03/28 19:03:44 mabi Exp $
+
+*pecl-gnupg-1.3.1-r1 (28 Mar 2010)
+
+  28 Mar 2010; <mabi@gentoo.org> +files/1.3.1/01-large_file_system.patch,
+  +pecl-gnupg-1.3.1-r1.ebuild, +files/1.3.1/02-gpgme_new_seg_fault.patch:
+  fix segfault and build error with gpgme-1.2 (bug #302446) thanks to Jamie
+  Learmonth
 
   09 Jun 2008; Sven Wegener <swegener@gentoo.org> pecl-gnupg-1.3.1.ebuild:
   Set RDEPEND="${DEPEND}"

diff --git a/dev-php5/pecl-gnupg/Manifest b/dev-php5/pecl-gnupg/Manifest
index 29be9cb1057032a5153431ee2277958d374c8d67..b4b6660e1f964d916506d769efb132d4739e5c0e 100644 (file)
--- a/dev-php5/pecl-gnupg/Manifest
+++ b/dev-php5/pecl-gnupg/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.3.1/01-large_file_system.patch 260 RMD160 233696edcab8cf3565ce0b860270f6bb8a4a8eb8 SHA1 b25bee58d8e0a9876eef700509d16360e900d91a SHA256 e885b86a6523b7069f5d53ad715b4a422596bc3ade15704c6687aa783b5888ca
+AUX 1.3.1/02-gpgme_new_seg_fault.patch 366 RMD160 bf1266555a4031ea6eb7781e53c9c35374493a95 SHA1 abdadb68fdaed6fe1c736bfefa8bdbd79931dd01 SHA256 9dc8719ec4cbc70a42ad3cb0515698373d97ad0097b6d3cae45a8a39698f5884
 DIST gnupg-1.3.1.tgz 19331 RMD160 dc06c1ff11641902d6f7b1ac0bb283d1253b7274 SHA1 2f7dfd2e9b4ccfae595fe5b3ebf28eaa50eb5ef3 SHA256 fc6980b9ec2fc31f2ba30f0b571832ebffeda6831c96cf206fc872e08418fe37
+EBUILD pecl-gnupg-1.3.1-r1.ebuild 662 RMD160 d4ea3faedb0ba16b0e62a9f0887244a0e8ceb44b SHA1 229073776c8f882d493a6363402b35c599b14493 SHA256 4cc50293e96ece5223c42ca727b11da2e720321dbf760bad0b4b50096b5b35a6
 EBUILD pecl-gnupg-1.3.1.ebuild 489 RMD160 4660cf5270598eb26708dab318ffa393ed3e2fbe SHA1 fe05ba7750db70c1d38691eaeb6a45d2d1c4a934 SHA256 b6d1242f0ea74cb41bc5b602ed3a9ced3b08e347a4c59618c0b05b3537b583b4
-MISC ChangeLog 582 RMD160 a64a0b19da6d2e57b4045ac86e2e5c6b0e331817 SHA1 751c96c83d3c1714f5f4329d38d9cc1aee46ad5b SHA256 28ba25b5e721635373ed34aeeb801db283fd7d684d1d962749b5957d24853f07
+MISC ChangeLog 851 RMD160 4bd73b959218eeb6adc13304a06d046a936894bd SHA1 18c929e8f600552c94af8f173943a558f204cdfe SHA256 46b54a9833ef7395c186ad7a05df062a16a264922b18f696a505f19aefa41be8
 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFITYcbI1lqEGTUzyQRAhrCAKDIuebLONeX+o7do410tuTmyWMV7ACfdQ0K
-SJy4yghcaRnyY5SSslQh9qU=
-=mN1y
------END PGP SIGNATURE-----

diff --git a/dev-php5/pecl-gnupg/files/1.3.1/01-large_file_system.patch b/dev-php5/pecl-gnupg/files/1.3.1/01-large_file_system.patch
new file mode 100644 (file)
index 0000000..4e64e3c
--- /dev/null
+++ b/dev-php5/pecl-gnupg/files/1.3.1/01-large_file_system.patch
@@ -0,0 +1,9 @@
+--- config.m4  2007-05-04 13:23:41.000000000 +0000
++++ config.m4.new      2010-03-28 01:13:10.000000000 +0000
+@@ -41,4 +41,6 @@
+   PHP_SUBST(GNUPG_SHARED_LIBADD)
+ 
+   PHP_NEW_EXTENSION(gnupg, [gnupg.c gnupg_keylistiterator.c], $ext_shared)
++
++  AC_SYS_LARGEFILE
+ fi

diff --git a/dev-php5/pecl-gnupg/files/1.3.1/02-gpgme_new_seg_fault.patch b/dev-php5/pecl-gnupg/files/1.3.1/02-gpgme_new_seg_fault.patch
new file mode 100644 (file)
index 0000000..4ecb2a2
--- /dev/null
+++ b/dev-php5/pecl-gnupg/files/1.3.1/02-gpgme_new_seg_fault.patch
@@ -0,0 +1,10 @@
+--- ./gnupg.c.old      2007-05-04 17:23:41.000000000 +0400
++++ ./gnupg.c  2010-01-27 15:04:04.000000000 +0300
+@@ -136,6 +136,7 @@
+ static void gnupg_res_init(gnupg_object *intern TSRMLS_DC){
+       /* init the gpgme-lib and set the default values */
+       gpgme_ctx_t     ctx;
++      gpgme_check_version                             (0);
+       gpgme_new                                       (&ctx);
+       gpgme_set_armor                         (ctx,1);
+       intern->ctx                             =       ctx;

diff --git a/dev-php5/pecl-gnupg/pecl-gnupg-1.3.1-r1.ebuild b/dev-php5/pecl-gnupg/pecl-gnupg-1.3.1-r1.ebuild
new file mode 100644 (file)
index 0000000..14a7f8e
--- /dev/null
+++ b/dev-php5/pecl-gnupg/pecl-gnupg-1.3.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-gnupg/pecl-gnupg-1.3.1-r1.ebuild,v 1.1 2010/03/28 19:03:44 mabi Exp $
+
+PHP_EXT_NAME="gnupg"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+EAPI="2"
+
+inherit php-ext-pecl-r1 eutils
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="PHP wrapper around the gpgme library"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-crypt/gpgme"
+RDEPEND="${DEPEND}"
+
+need_php_by_category
+
+src_prepare() {
+       cd ${S}
+       epatch "${FILESDIR}"/"${PV}"/01-large_file_system.patch
+       epatch "${FILESDIR}"/"${PV}"/02-gpgme_new_seg_fault.patch
+       eautoreconf
+}