From 19bd7782bf428d1cc7af18b44145da827ae8cc5b Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 9 May 2016 08:29:59 +0200 Subject: [PATCH 1/6] intermediate commit --- dev-php/pecl-geoip/Manifest | 3 +++ dev-php/pecl-geoip/metadata.xml | 8 +++++++ dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild | 24 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 dev-php/pecl-geoip/Manifest create mode 100644 dev-php/pecl-geoip/metadata.xml create mode 100644 dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest new file mode 100644 index 0000000..a4f5645 --- /dev/null +++ b/dev-php/pecl-geoip/Manifest @@ -0,0 +1,3 @@ +DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 +EBUILD pecl-geoip-1.1.0-r1.ebuild 449 SHA256 a4ce4ec8ded30f79539d3e54bc449d4d7e1ace918c616cf566d820b8ef544d11 SHA512 f2221ddbb09cfe58603eea9fecae241ffaa356454f6c978e3251c7c8c46d39d0d3d1522c799508cd6b308bacf6a2fda4959ecac9092ad7eadde9642c6ab752eb WHIRLPOOL daaa308d448262a789ee876d646ec6ddce05799ac96771a58feb18c55d990f8d2bd5c83f8a5aa9655d75bc6b7c6069553855439fb2aa32b5e50b585391169c79 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/dev-php/pecl-geoip/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild new file mode 100644 index 0000000..8300ab1 --- /dev/null +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PHP_EXT_NAME="geoip" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS="README ChangeLog" + +USE_PHP="php7-0 php5-6 php5-5 php5-4" + +inherit php-ext-pecl-r2 + +KEYWORDS="amd64 x86" + +DESCRIPTION="PHP extension to map IP address to geographic places" +LICENSE="PHP-3" +SLOT="0" +IUSE="" + +DEPEND=">=dev-libs/geoip-1.4.0" +RDEPEND="${DEPEND}" From 132af0ecb7ba40ca43d588b4871b13d679b9e874 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 10:13:13 +0200 Subject: [PATCH 2/6] intermediate commit of ebuild of php-7 compatible pecl-geoip --- dev-php/pecl-geoip/ChangeLog | 0 dev-php/pecl-geoip/Manifest | 2 +- dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 dev-php/pecl-geoip/ChangeLog diff --git a/dev-php/pecl-geoip/ChangeLog b/dev-php/pecl-geoip/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index a4f5645..711a3d7 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,3 +1,3 @@ DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0-r1.ebuild 449 SHA256 a4ce4ec8ded30f79539d3e54bc449d4d7e1ace918c616cf566d820b8ef544d11 SHA512 f2221ddbb09cfe58603eea9fecae241ffaa356454f6c978e3251c7c8c46d39d0d3d1522c799508cd6b308bacf6a2fda4959ecac9092ad7eadde9642c6ab752eb WHIRLPOOL daaa308d448262a789ee876d646ec6ddce05799ac96771a58feb18c55d990f8d2bd5c83f8a5aa9655d75bc6b7c6069553855439fb2aa32b5e50b585391169c79 +EBUILD pecl-geoip-1.1.0-r1.ebuild 428 SHA256 53dd87fe03b1d777e9e8daebdc40d45a68e85de935f8514d38c070f8b2336711 SHA512 acbfafe11539eee8d415728b18007342e6ad9b66029b39cfdb56ffc0a1c3b562bd9df84b76c5a86df64198be4508961d729c0079f38b1199aab0ca3e1455baa4 WHIRLPOOL 696147307669fc763ecbbbc6c414aa3d76df5d3013333a3df7d0414535927f65d03d38fefd2377697b3910c40f78550cde34c0be92b13f7b3c1a453f022d38ac MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild index 8300ab1..37c905e 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS="README ChangeLog" -USE_PHP="php7-0 php5-6 php5-5 php5-4" +USE_PHP="php7-0" inherit php-ext-pecl-r2 From 628714e9e48db31c39efc1f7cbf41b8ccf26dd46 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 10:15:30 +0200 Subject: [PATCH 3/6] updated ebuild --- dev-php/pecl-geoip/Manifest | 3 ++- dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index 711a3d7..7f20c64 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,3 +1,4 @@ DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0-r1.ebuild 428 SHA256 53dd87fe03b1d777e9e8daebdc40d45a68e85de935f8514d38c070f8b2336711 SHA512 acbfafe11539eee8d415728b18007342e6ad9b66029b39cfdb56ffc0a1c3b562bd9df84b76c5a86df64198be4508961d729c0079f38b1199aab0ca3e1455baa4 WHIRLPOOL 696147307669fc763ecbbbc6c414aa3d76df5d3013333a3df7d0414535927f65d03d38fefd2377697b3910c40f78550cde34c0be92b13f7b3c1a453f022d38ac +EBUILD pecl-geoip-1.1.0-r1.ebuild 430 SHA256 0d5bd3cae4b2eac2590caac4c722cba34f0ffb674b516ec5a97b3e921d4f225f SHA512 9f99fafe4efc874758dcf594346db0491468e25aa61e0db387c5d597a9690ca88fe87b9fc5486a9a90d1a1c0e015889ebbef4b4e049885d883be4ba939235b25 WHIRLPOOL cfe0c6b5a310aa17f3c32a22ab6044ed2d3243b93c626f1bf1013186b1fde7a63d662c17d2f6c8fce1f65052625b1cc29b967793ba06469df678f02e867d9735 +MISC ChangeLog 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild index 37c905e..d0498ba 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild @@ -13,7 +13,7 @@ USE_PHP="php7-0" inherit php-ext-pecl-r2 -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DESCRIPTION="PHP extension to map IP address to geographic places" LICENSE="PHP-3" From 38f050a3b18f41ae6d8e80ef82e647a84567560d Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 11:07:10 +0200 Subject: [PATCH 4/6] try to patch the ebuild to get the latest version from svn trunk. this should be compatible to php7 --- dev-php/pecl-geoip/Manifest | 4 +- ...eoip-1.1.0.9999-patch-to-svn-r337409.patch | 554 ++++++++++++++++++ ...r1.ebuild => pecl-geoip-1.1.0.9999.ebuild} | 13 +- 3 files changed, 569 insertions(+), 2 deletions(-) create mode 100644 dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch rename dev-php/pecl-geoip/{pecl-geoip-1.1.0-r1.ebuild => pecl-geoip-1.1.0.9999.ebuild} (69%) diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index 7f20c64..de19715 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,4 +1,6 @@ +AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 14488 SHA256 b9e1e157e4afb146c95843b13df31baa57ded2e2f84404b5d2e34f502092ada0 SHA512 1958be9b21fa467fd14ea868836a0da12f8f26acec6762b918e542d725fc7d571af8f4eb80796d19cb560975ed63b24aefc13b20bc8ab9ac99a22899560a019f WHIRLPOOL daead5d09a8122d38240172852934ea1545ecf802502d21b1ad2cabe70b6f28bb0022b2847ab9e68df1382e95e3230334562b0289c6d88ebb8bd034424d160e7 DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0-r1.ebuild 430 SHA256 0d5bd3cae4b2eac2590caac4c722cba34f0ffb674b516ec5a97b3e921d4f225f SHA512 9f99fafe4efc874758dcf594346db0491468e25aa61e0db387c5d597a9690ca88fe87b9fc5486a9a90d1a1c0e015889ebbef4b4e049885d883be4ba939235b25 WHIRLPOOL cfe0c6b5a310aa17f3c32a22ab6044ed2d3243b93c626f1bf1013186b1fde7a63d662c17d2f6c8fce1f65052625b1cc29b967793ba06469df678f02e867d9735 +EBUILD pecl-geoip-1.1.0.9999.ebuild 583 SHA256 214b34224cdcbde6090101c4350bc14883af407273dd451b6f0d23df21078f8c SHA512 74b3e841c5b652a1823770811daef0c74dbc804918559a7ec43109bbaeb551d622e8023fe0848dea9338ac661a67839f8f8d08042aab8a21c7ed3be438e2f445 WHIRLPOOL da01cb7f77eca193bc7ad2d9c01e02dddd9e01e9153c1262cafd7fbba8d263b6c9ebfe2a106a9b1454ec53aa9cdf79d75e0d2280ad2e18a12ffbe4f2fb2d0dd7 MISC ChangeLog 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 +MISC patch.diff 468 SHA256 e8093b73d790832b36ffcef999bef82c001e94dc469e82e15dfcbb4b7b3a33a6 SHA512 6a1965c336a84a6165e238b7be7bdcbc488568eb8b9d5a949fed6760c03ba70fd6a07c2b06faa1ad02089a7d0edca7e93d6b76f60a19b06989e36fc20d4857f2 WHIRLPOOL 6e42750c859e17a061ecdf18c3e4f450463eee26a3595751965cc3009bda9fdc5746b6337021d49201ac58f055d6f01f569bbba7718c53673210ded3d8bc03dc diff --git a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch new file mode 100644 index 0000000..b609a7c --- /dev/null +++ b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch @@ -0,0 +1,554 @@ +Index: trunk/package.xml +=================================================================== +--- trunk/package.xml (revision 333461) ++++ trunk/package.xml (revision 337409) +@@ -18,7 +18,7 @@ + 2014-05-01 + + +- 1.1.0 ++ 1.1.1-dev + 1.0.3 + + +@@ -26,13 +26,7 @@ + stable + + PHP License +- * Add geoip_setup_custom_directory() to setup custom directories per request. +-* Remove E_NOTICES for IPs not found in database. +-* Fix a segfault with geoip_db_get_all_info() on newer libs (bug #64692). +-* Add support for geoip_netspeedcell_by_name(), geoip_asnum_by_name() and geoip_domain_by_name() (bug #67121). +-* Fix memory leak with custom directories (bug #67138). +-* Support changing custom directory via ini_set() (bug #61607). +- ++ * + + + +Index: trunk/geoip.def +=================================================================== +--- trunk/geoip.def (revision 333461) ++++ trunk/geoip.def (revision 337409) +@@ -21,7 +21,7 @@ + GEOIPDEF(geoip_country_code3_by_name, GeoIP_country_code3_by_name, GEOIP_COUNTRY_EDITION) + GEOIPDEF(geoip_country_name_by_name, GeoIP_country_name_by_name, GEOIP_COUNTRY_EDITION) + +-#if LIBGEOIP_VERSION >= 1004005 && FALSE ++#if LIBGEOIP_VERSION >= 1004005 + GEOIPDEF(geoip_country_code_by_name_v6, GeoIP_country_code_by_name_v6, GEOIP_COUNTRY_EDITION_V6) + GEOIPDEF(geoip_country_code3_by_name_v6, GeoIP_country_code3_by_name_v6, GEOIP_COUNTRY_EDITION_V6) + GEOIPDEF(geoip_country_name_by_name_v6, GeoIP_country_name_by_name_v6, GEOIP_COUNTRY_EDITION_V6) +Index: trunk/php_geoip.h +=================================================================== +--- trunk/php_geoip.h (revision 333461) ++++ trunk/php_geoip.h (revision 337409) +@@ -24,8 +24,12 @@ + extern zend_module_entry geoip_module_entry; + #define phpext_geoip_ptr &geoip_module_entry + +-#define PHP_GEOIP_VERSION "1.1.0" ++#define PHP_GEOIP_VERSION "1.1.1-dev" + ++#if PHP_MAJOR_VERSION < 7 ++typedef long zend_long; ++#endif ++ + #ifdef PHP_WIN32 + #define PHP_GEOIP_API __declspec(dllexport) + #else +Index: trunk/config.m4 +=================================================================== +--- trunk/config.m4 (revision 333461) ++++ trunk/config.m4 (revision 337409) +@@ -43,7 +43,7 @@ + + PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, + [ +- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/lib, GEOIP_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/$PHP_LIBDIR, GEOIP_SHARED_LIBADD) + AC_DEFINE(HAVE_GEOIPLIB,1,[ ]) + ],[ + AC_MSG_ERROR([wrong geoip lib version or lib not found]) +@@ -95,8 +95,7 @@ + AC_CHECK_DECL(GEOIP_NETSPEED_EDITION_REV1, + [ + MIN_GEOIP_VERSION=1004008 +- ],[ +- ],[ ++ ],[],[ + #include + ]) + +@@ -104,8 +103,7 @@ + AC_CHECK_DECL(GEOIP_ACCURACYRADIUS_EDITION, + [ + MIN_GEOIP_VERSION=1005000 +- ],[ +- ],[ ++ ],[],[ + #include + ]) + +Index: trunk/geoip.c +=================================================================== +--- trunk/geoip.c (revision 333461) ++++ trunk/geoip.c (revision 337409) +@@ -117,7 +117,7 @@ + #endif + + GeoIP_setup_custom_directory(value); +- _GeoIP_setup_dbfilename(); ++ GeoIP_db_avail(GEOIP_COUNTRY_EDITION); + } + /* }}} */ + #endif +@@ -129,11 +129,19 @@ + { + if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { + GEOIP_G(set_runtime_custom_directory) = 1; ++#if PHP_MAJOR_VERSION >= 7 ++ geoip_change_custom_directory(new_value->val); ++#else + geoip_change_custom_directory(new_value); ++#endif + return SUCCESS; + } + ++#if PHP_MAJOR_VERSION >= 7 ++ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); ++#else + return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); ++#endif + } + /* }}} */ + #endif +@@ -168,7 +176,8 @@ + #ifdef HAVE_CUSTOM_DIRECTORY + GeoIP_setup_custom_directory(GEOIP_G(custom_directory)); + #endif +- _GeoIP_setup_dbfilename(); ++ /* This will initialize file structure */ ++ GeoIP_db_avail(GEOIP_COUNTRY_EDITION); + + /* For database type constants */ + REGISTER_LONG_CONSTANT("GEOIP_COUNTRY_EDITION", GEOIP_COUNTRY_EDITION, CONST_CS | CONST_PERSISTENT); +@@ -250,7 +259,7 @@ + /* {{{ proto boolean geoip_db_avail( [ int database ] ) */ + PHP_FUNCTION(geoip_db_avail) + { +- long edition; ++ zend_long edition; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { + return; +@@ -269,7 +278,7 @@ + /* {{{ proto string geoip_db_filename( [ int database ] ) */ + PHP_FUNCTION(geoip_db_filename) + { +- long edition; ++ zend_long edition; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { + return; +@@ -282,7 +291,11 @@ + } + + if (NULL != GeoIPDBFileName[edition]) ++#if PHP_MAJOR_VERSION >= 7 ++ RETURN_STRING(GeoIPDBFileName[edition]); ++#else + RETURN_STRING(GeoIPDBFileName[edition], 1); ++#endif + } + /* }}} */ + +@@ -297,16 +310,31 @@ + { + if (NULL != GeoIPDBDescription[i]) + { ++#if PHP_MAJOR_VERSION >= 7 ++ zval real_row; ++ zval *row = &real_row; ++ ++ array_init(row); ++#else + zval *row; + ALLOC_INIT_ZVAL(row); + array_init(row); ++#endif + + add_assoc_bool(row, "available", GeoIP_db_avail(i)); + if (GeoIPDBDescription[i]) { ++#if PHP_MAJOR_VERSION >= 7 ++ add_assoc_string(row, "description", (char *)GeoIPDBDescription[i]); ++#else + add_assoc_string(row, "description", (char *)GeoIPDBDescription[i], 1); ++#endif + } + if (GeoIPDBFileName[i]) { ++#if PHP_MAJOR_VERSION >= 7 ++ add_assoc_string(row, "filename", GeoIPDBFileName[i]); ++#else + add_assoc_string(row, "filename", GeoIPDBFileName[i], 1); ++#endif + } + + add_index_zval(return_value, i, row); +@@ -321,7 +349,7 @@ + { + GeoIP * gi; + char * db_info; +- long edition = GEOIP_COUNTRY_EDITION; ++ zend_long edition = GEOIP_COUNTRY_EDITION; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &edition) == FAILURE) { + return; +@@ -346,12 +374,17 @@ + db_info = GeoIP_database_info(gi); + GeoIP_delete(gi); + ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(db_info); ++#else + RETVAL_STRING(db_info, 1); ++#endif + free(db_info); + } + /* }}} */ + + /* {{{ */ ++#if PHP_MAJOR_VERSION >= 7 + #define GEOIPDEF(php_func, c_func, db_type) \ + PHP_FUNCTION(php_func) \ + { \ +@@ -358,6 +391,34 @@ + GeoIP * gi; \ + char * hostname = NULL; \ + const char * return_code; \ ++ size_t arglen; \ ++ \ ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { \ ++ return; \ ++ } \ ++ \ ++ if (GeoIP_db_avail(db_type)) { \ ++ gi = GeoIP_open_type(db_type, GEOIP_STANDARD); \ ++ } else { \ ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[db_type]); \ ++ return; \ ++ } \ ++ \ ++ return_code = c_func(gi, hostname); \ ++ GeoIP_delete(gi); \ ++ if (return_code == NULL) { \ ++ RETURN_FALSE; \ ++ } \ ++ RETURN_STRING((char*)return_code); \ ++ \ ++ } ++#else ++#define GEOIPDEF(php_func, c_func, db_type) \ ++ PHP_FUNCTION(php_func) \ ++ { \ ++ GeoIP * gi; \ ++ char * hostname = NULL; \ ++ const char * return_code; \ + int arglen; \ + \ + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { \ +@@ -379,6 +440,7 @@ + RETURN_STRING((char*)return_code, 1); \ + \ + } ++#endif + #include "geoip.def" + #undef GEOIPDEF + /* }}} */ +@@ -390,7 +452,11 @@ + GeoIP * gi; + char * hostname = NULL; + int id; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -408,7 +474,11 @@ + if (id == 0) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETURN_STRING((char *)GeoIP_country_continent[id]); ++#else + RETURN_STRING((char *)GeoIP_country_continent[id], 1); ++#endif + } + /* }}} */ + +@@ -419,7 +489,11 @@ + GeoIP * gi; + char * hostname = NULL; + char * org; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -437,7 +511,11 @@ + if (org == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(org); ++#else + RETVAL_STRING(org, 1); ++#endif + free(org); + } + /* }}} */ +@@ -449,7 +527,11 @@ + GeoIP * gi; + char * hostname = NULL; + char * org; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -467,7 +549,11 @@ + if (org == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(org); ++#else + RETVAL_STRING(org, 1); ++#endif + free(org); + } + /* }}} */ +@@ -479,7 +565,11 @@ + GeoIP * gi; + char * hostname = NULL; + char * org; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -497,7 +587,11 @@ + if (org == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(org); ++#else + RETVAL_STRING(org, 1); ++#endif + free(org); + } + /* }}} */ +@@ -510,7 +604,11 @@ + GeoIP * gi; + char * hostname = NULL; + char * org; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -528,7 +626,11 @@ + if (org == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(org); ++#else + RETVAL_STRING(org, 1); ++#endif + free(org); + } + /* }}} */ +@@ -540,7 +642,11 @@ + { + GeoIP * gi; + char * hostname = NULL; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + GeoIPRecord * gir; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { +@@ -566,9 +672,20 @@ + } + + array_init(return_value); +-#if LIBGEOIP_VERSION >= 1004003 ++#if PHP_MAJOR_VERSION >= 7 ++# if LIBGEOIP_VERSION >= 1004003 ++ add_assoc_string(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code); ++# endif ++ add_assoc_string(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code); ++ add_assoc_string(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3); ++ add_assoc_string(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name); ++ add_assoc_string(return_value, "region", (gir->region == NULL) ? "" : gir->region); ++ add_assoc_string(return_value, "city", (gir->city == NULL) ? "" : gir->city); ++ add_assoc_string(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code); ++#else ++# if LIBGEOIP_VERSION >= 1004003 + add_assoc_string(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code, 1); +-#endif ++# endif + add_assoc_string(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code, 1); + add_assoc_string(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3, 1); + add_assoc_string(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name, 1); +@@ -575,6 +692,7 @@ + add_assoc_string(return_value, "region", (gir->region == NULL) ? "" : gir->region, 1); + add_assoc_string(return_value, "city", (gir->city == NULL) ? "" : gir->city, 1); + add_assoc_string(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code, 1); ++#endif + add_assoc_double(return_value, "latitude", gir->latitude); + add_assoc_double(return_value, "longitude", gir->longitude); + #if LIBGEOIP_VERSION >= 1004005 +@@ -594,7 +712,11 @@ + { + GeoIP * gi; + char * hostname = NULL; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + int netspeed; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { +@@ -620,7 +742,11 @@ + { + GeoIP * gi; + char * hostname = NULL; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + GeoIPRegion * region; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { +@@ -646,9 +772,14 @@ + } + + array_init(return_value); ++#if PHP_MAJOR_VERSION >= 7 ++ add_assoc_string(return_value, "country_code", region->country_code); ++ add_assoc_string(return_value, "region", region->region); ++#else + add_assoc_string(return_value, "country_code", region->country_code, 1); + add_assoc_string(return_value, "region", region->region, 1); +- ++#endif ++ + GeoIPRegion_delete(region); + } + /* }}} */ +@@ -660,7 +791,11 @@ + GeoIP * gi; + char * hostname = NULL; + char * isp; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t arglen; ++#else + int arglen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { + return; +@@ -678,7 +813,11 @@ + if (isp == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETVAL_STRING(isp); ++#else + RETVAL_STRING(isp, 1); ++#endif + free(isp); + } + +@@ -690,7 +829,11 @@ + char * country_code = NULL; + char * region_code = NULL; + const char * region_name; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t countrylen, regionlen; ++#else + int countrylen, regionlen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &country_code, &countrylen, ®ion_code, ®ionlen) == FAILURE) { + return; +@@ -705,7 +848,11 @@ + if (region_name == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETURN_STRING((char*)region_name); ++#else + RETURN_STRING((char*)region_name, 1); ++#endif + } + /* }}} */ + #endif +@@ -718,7 +865,11 @@ + char * country = NULL; + char * region = NULL; + const char * timezone; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t countrylen, arg2len; ++#else + int countrylen, arg2len; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &country, &countrylen, ®ion, &arg2len) == FAILURE) { + return; +@@ -733,7 +884,11 @@ + if (timezone == NULL) { + RETURN_FALSE; + } ++#if PHP_MAJOR_VERSION >= 7 ++ RETURN_STRING((char*)timezone); ++#else + RETURN_STRING((char*)timezone, 1); ++#endif + } + /* }}} */ + #endif +@@ -744,7 +899,11 @@ + PHP_FUNCTION(geoip_setup_custom_directory) + { + char * dir = NULL; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t dirlen; ++#else + int dirlen; ++#endif + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &dir, &dirlen) == FAILURE) { + return; diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild similarity index 69% rename from dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild rename to dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild index d0498ba..dd73a2a 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild @@ -8,10 +8,11 @@ PHP_EXT_NAME="geoip" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS="README ChangeLog" +MY_PV="1.1.0" USE_PHP="php7-0" -inherit php-ext-pecl-r2 +inherit eutils php-ext-pecl-r2 KEYWORDS="~amd64 ~x86" @@ -22,3 +23,13 @@ IUSE="" DEPEND=">=dev-libs/geoip-1.4.0" RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}(${P}-patch-to-svn-r337409.patch" +) + +src_prepare() { + for p in "${PATCHES[@]}" ; do + epatch "${p}" + done +} From 48b066fef98e77a4b2be24d274951b70790e5406 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 11:23:42 +0200 Subject: [PATCH 5/6] Added ebuild for pecl-geoip that sould be compatible with PHP 7 Package-Manager: portage-2.2.28 --- dev-php/pecl-geoip/ChangeLog | 5 ++++ dev-php/pecl-geoip/Manifest | 7 ++--- ...eoip-1.1.0.9999-patch-to-svn-r337409.patch | 28 ------------------- .../pecl-geoip/pecl-geoip-1.1.0.9999.ebuild | 14 ++++++++-- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/dev-php/pecl-geoip/ChangeLog b/dev-php/pecl-geoip/ChangeLog index e69de29..26a83fc 100644 --- a/dev-php/pecl-geoip/ChangeLog +++ b/dev-php/pecl-geoip/ChangeLog @@ -0,0 +1,5 @@ + 07 Jun 2016; + files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch, + pecl-geoip-1.1.0.9999.ebuild: + Added ebuild for pecl-geoip that sould be compatible with PHP 7 + diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index de19715..ec07c1f 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,6 +1,5 @@ -AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 14488 SHA256 b9e1e157e4afb146c95843b13df31baa57ded2e2f84404b5d2e34f502092ada0 SHA512 1958be9b21fa467fd14ea868836a0da12f8f26acec6762b918e542d725fc7d571af8f4eb80796d19cb560975ed63b24aefc13b20bc8ab9ac99a22899560a019f WHIRLPOOL daead5d09a8122d38240172852934ea1545ecf802502d21b1ad2cabe70b6f28bb0022b2847ab9e68df1382e95e3230334562b0289c6d88ebb8bd034424d160e7 +AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 13475 SHA256 2a14d4bb09c1ded394ee588f37f8a1959262abcd2679cac84acf2d6638ff5924 SHA512 c37dd0b41df0fbf55a91575bbc6cbb1da92bef4d47e8e660c4e715fc0d424e53a7d2657c996878faedf03a5d92b4ff0b5d466097e22f525818c93483ac158c99 WHIRLPOOL 4f9f117f154ce73702ad92056b880189777494eee414455afe126d03135f8efbb3bc5aedadda5874536302896488e77642f9084930e4c9407426a8e82f27301f DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0.9999.ebuild 583 SHA256 214b34224cdcbde6090101c4350bc14883af407273dd451b6f0d23df21078f8c SHA512 74b3e841c5b652a1823770811daef0c74dbc804918559a7ec43109bbaeb551d622e8023fe0848dea9338ac661a67839f8f8d08042aab8a21c7ed3be438e2f445 WHIRLPOOL da01cb7f77eca193bc7ad2d9c01e02dddd9e01e9153c1262cafd7fbba8d263b6c9ebfe2a106a9b1454ec53aa9cdf79d75e0d2280ad2e18a12ffbe4f2fb2d0dd7 -MISC ChangeLog 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3 +EBUILD pecl-geoip-1.1.0.9999.ebuild 780 SHA256 2de773c29101b273afde935b70c1bb1e3a22c2409eca8646b2df2f7de0f66d61 SHA512 a579d0f7a36a84011dcc3d0d724776a3214c2309bb71c325ad39a5d6aa35246220cf0089e2e97c37eaee07e8166b3080386ecffc459c5e539e60d6abc9029af4 WHIRLPOOL a8c1882617a99917ce4dc789d23dc78ee854eaa93b8cb4843e8d25c52851e896ae6ea9689b199c83b27efbbe4ceef880015f1de67e1a1aa9e2edb3e410853137 +MISC ChangeLog 193 SHA256 233f3d15b90348119fc0a1f9950bd87c6a63f4aae1fb91ce1191d087e14ccba9 SHA512 5e94baa22d98096b3e2c7f8f4aa03023238d1d2646ff7917f440d962f6cc511fa8310a8c2dc7003570fc788531a876ffadfb6aa755b22c4d9c999471fbea6c1d WHIRLPOOL bd27a74bcec6a9f59f8440a38eada41b8094a2d03b740afbd30190174cc3b6bd7ecb97cdb85e1439e4acc77798660f6a22be3e4828f68c9df7c22c809eefc9e1 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 -MISC patch.diff 468 SHA256 e8093b73d790832b36ffcef999bef82c001e94dc469e82e15dfcbb4b7b3a33a6 SHA512 6a1965c336a84a6165e238b7be7bdcbc488568eb8b9d5a949fed6760c03ba70fd6a07c2b06faa1ad02089a7d0edca7e93d6b76f60a19b06989e36fc20d4857f2 WHIRLPOOL 6e42750c859e17a061ecdf18c3e4f450463eee26a3595751965cc3009bda9fdc5746b6337021d49201ac58f055d6f01f569bbba7718c53673210ded3d8bc03dc diff --git a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch index b609a7c..420165a 100644 --- a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch +++ b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch @@ -1,31 +1,3 @@ -Index: trunk/package.xml -=================================================================== ---- trunk/package.xml (revision 333461) -+++ trunk/package.xml (revision 337409) -@@ -18,7 +18,7 @@ - 2014-05-01 - - -- 1.1.0 -+ 1.1.1-dev - 1.0.3 - - -@@ -26,13 +26,7 @@ - stable - - PHP License -- * Add geoip_setup_custom_directory() to setup custom directories per request. --* Remove E_NOTICES for IPs not found in database. --* Fix a segfault with geoip_db_get_all_info() on newer libs (bug #64692). --* Add support for geoip_netspeedcell_by_name(), geoip_asnum_by_name() and geoip_domain_by_name() (bug #67121). --* Fix memory leak with custom directories (bug #67138). --* Support changing custom directory via ini_set() (bug #61607). -- -+ * - - - Index: trunk/geoip.def =================================================================== --- trunk/geoip.def (revision 333461) diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild index dd73a2a..2bf55f9 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild @@ -25,11 +25,19 @@ DEPEND=">=dev-libs/geoip-1.4.0" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}(${P}-patch-to-svn-r337409.patch" + "${FILESDIR}/${P}-patch-to-svn-r337409.patch" ) +# apply patches in unpack phase, or else the php7.0 dir won't get patched src_prepare() { - for p in "${PATCHES[@]}" ; do - epatch "${p}" + local slot + local p + for slot in $(php_get_slots) ; do + cd "${WORKDIR}/${slot}" + for p in "${PATCHES[@]}" ; do + epatch "${p}" + done done + + php-ext-source-r2_src_prepare } From 6c24a8877b21f548b90d6a24afe15d1967fae61f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 11:25:37 +0200 Subject: [PATCH 6/6] Updated digest in Manifest. Forgot that earlier, sorry. --- dev-php/pecl-geoip/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index ec07c1f..4f85f26 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,5 +1,5 @@ AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 13475 SHA256 2a14d4bb09c1ded394ee588f37f8a1959262abcd2679cac84acf2d6638ff5924 SHA512 c37dd0b41df0fbf55a91575bbc6cbb1da92bef4d47e8e660c4e715fc0d424e53a7d2657c996878faedf03a5d92b4ff0b5d466097e22f525818c93483ac158c99 WHIRLPOOL 4f9f117f154ce73702ad92056b880189777494eee414455afe126d03135f8efbb3bc5aedadda5874536302896488e77642f9084930e4c9407426a8e82f27301f DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 EBUILD pecl-geoip-1.1.0.9999.ebuild 780 SHA256 2de773c29101b273afde935b70c1bb1e3a22c2409eca8646b2df2f7de0f66d61 SHA512 a579d0f7a36a84011dcc3d0d724776a3214c2309bb71c325ad39a5d6aa35246220cf0089e2e97c37eaee07e8166b3080386ecffc459c5e539e60d6abc9029af4 WHIRLPOOL a8c1882617a99917ce4dc789d23dc78ee854eaa93b8cb4843e8d25c52851e896ae6ea9689b199c83b27efbbe4ceef880015f1de67e1a1aa9e2edb3e410853137 -MISC ChangeLog 193 SHA256 233f3d15b90348119fc0a1f9950bd87c6a63f4aae1fb91ce1191d087e14ccba9 SHA512 5e94baa22d98096b3e2c7f8f4aa03023238d1d2646ff7917f440d962f6cc511fa8310a8c2dc7003570fc788531a876ffadfb6aa755b22c4d9c999471fbea6c1d WHIRLPOOL bd27a74bcec6a9f59f8440a38eada41b8094a2d03b740afbd30190174cc3b6bd7ecb97cdb85e1439e4acc77798660f6a22be3e4828f68c9df7c22c809eefc9e1 +MISC ChangeLog 194 SHA256 ef807fc2efd88937acdbe810cf875fa658dfe2d3771332f46c20f03ce5b9c491 SHA512 334862d9aee9d514a2d3885df39a047fc6fafb140bf02df5f80cb658a736543d8c2f1ac7845d373403d98d3ee4bf90202c7a8d88dc569ba365f291f08b4a3c38 WHIRLPOOL a82649d1024ce77054e4a7326948377aaf4769ff5c4fb3232e519447eca04809479902a2f94f4313f650bfe0b7301f434aa59bd44b36d70e0f1c7865671b9e1e MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431