[arch-commits] Commit in php-geoip/trunk (PKGBUILD php8.patch)

[Evangelos Foutras]

    Date: Friday, January 8, 2021 @ 21:14:49
  Author: foutrelis
Revision: 814086

upgpkg: php-geoip 1.1.1-6: PHP 8 rebuild; add split pkg for PHP 7

Added:
  php-geoip/trunk/php8.patch
Modified:
  php-geoip/trunk/PKGBUILD

------------+
 PKGBUILD   |   51 +++++++++++++++++++++++--------
 php8.patch |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-08 20:18:45 UTC (rev 814085)
+++ PKGBUILD	2021-01-08 21:14:49 UTC (rev 814086)
@@ -1,32 +1,57 @@
 # Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
 
-pkgname=php-geoip
+pkgname=('php-geoip' 'php7-geoip')
 pkgver=1.1.1
-pkgrel=5
+pkgrel=6
 pkgdesc="GeoIP module for PHP"
 arch=('x86_64')
 url="https://pecl.php.net/package/geoip"
 license=('PHP')
-depends=('php' 'geoip')
-makedepends=('subversion')
-backup=('etc/php/conf.d/geoip.ini')
-source=(https://pecl.php.net/get/geoip-$pkgver.tgz)
-sha256sums=('b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06')
+depends=('geoip')
+makedepends=('php' 'php7')
+source=(https://pecl.php.net/get/geoip-$pkgver.tgz
+        php8.patch)
+sha256sums=('b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06'
+            'da576049b0c69b3c22c0defa7313a22c0244fbf3a10555e6549f7957f7a429c6')
 
+prepare() {
+  patch -Np0 -d geoip-$pkgver <php8.patch
+  cp -a geoip-$pkgver{,-php7}
+}
+
 build() {
-  cd "$srcdir/geoip-$pkgver"
-
+  cd geoip-$pkgver
   phpize
   ./configure --prefix=/usr
   make
+
+  cd ../geoip-$pkgver-php7
+  phpize7
+  ./configure --prefix=/usr
+  make
 }
 
-package() {
-  cd "$srcdir/geoip-$pkgver"
+package_php-geoip() {
+  depends+=('php')
+  backup=('etc/php/conf.d/geoip.ini')
 
+  cd geoip-$pkgver
+
   make INSTALL_ROOT="$pkgdir" install
-  echo ';extension=geoip.so' >geoip.ini
-  install -Dm644 geoip.ini "$pkgdir/etc/php/conf.d/geoip.ini"
+  install -d "$pkgdir/etc/php/conf.d"
+  echo ';extension=geoip.so' >"$pkgdir/etc/php/conf.d/geoip.ini"
 }
 
+package_php7-geoip() {
+  pkgdesc=${pkgdesc/PHP/PHP 7}
+  depends+=('php7')
+  backup=('etc/php7/conf.d/geoip.ini')
+
+  cd geoip-$pkgver-php7
+
+  make INSTALL_ROOT="$pkgdir" install
+  install -d "$pkgdir/etc/php7/conf.d"
+  echo ';extension=geoip.so' >"$pkgdir/etc/php7/conf.d/geoip.ini"
+}
+
 # vim:set ts=2 sw=2 et:

Added: php8.patch
===================================================================
--- php8.patch	                        (rev 0)
+++ php8.patch	2021-01-08 21:14:49 UTC (rev 814086)
@@ -0,0 +1,95 @@
+Index: geoip.c
+===================================================================
+--- geoip.c	(revision 351081)
++++ geoip.c	(revision 351082)
+@@ -34,41 +34,72 @@
+ #include "ext/standard/info.h"
+ #include "php_geoip.h"
+ 
++/* For PHP 8 */
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#endif
+ 
+-
+ ZEND_DECLARE_MODULE_GLOBALS(geoip)
+ 
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0)
++	ZEND_ARG_INFO(0, database)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1)
++	ZEND_ARG_INFO(0, database)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1)
++	ZEND_ARG_INFO(0, host)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2)
++	ZEND_ARG_INFO(0, country_code)
++	ZEND_ARG_INFO(0, region_code)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1)
++	ZEND_ARG_INFO(0, directory)
++ZEND_END_ARG_INFO()
++
+ static int le_geoip;
+ 
+ /* {{{ */
+ zend_function_entry geoip_functions[] = {
+-	PHP_FE(geoip_database_info,   NULL)   
++	PHP_FE(geoip_database_info,           arginfo_geoip_database_opt)   
+ #define GEOIPDEF(php_func, c_func, db_type) \
+-	PHP_FE(php_func,	NULL)
++	PHP_FE(php_func,	                  arginfo_geoip_host)
+ #include "geoip.def"
+ #undef GEOIPDEF
+-	PHP_FE(geoip_continent_code_by_name,   NULL)
+-	PHP_FE(geoip_org_by_name,   NULL)
+-	PHP_FE(geoip_record_by_name,   NULL)
+-	PHP_FE(geoip_id_by_name,   NULL)
+-	PHP_FE(geoip_region_by_name,   NULL)
+-	PHP_FE(geoip_isp_by_name,   NULL)
+-	PHP_FE(geoip_db_avail,	NULL)
+-	PHP_FE(geoip_db_get_all_info,	NULL)
+-	PHP_FE(geoip_db_filename,	NULL)
++	PHP_FE(geoip_continent_code_by_name,   arginfo_geoip_host)
++	PHP_FE(geoip_org_by_name,              arginfo_geoip_host)
++	PHP_FE(geoip_record_by_name,           arginfo_geoip_host)
++	PHP_FE(geoip_id_by_name,               arginfo_geoip_host)
++	PHP_FE(geoip_region_by_name,           arginfo_geoip_host)
++	PHP_FE(geoip_isp_by_name,              arginfo_geoip_host)
++	PHP_FE(geoip_db_avail,	               arginfo_geoip_database)
++	PHP_FE(geoip_db_get_all_info,	       arginfo_geoip_void)
++	PHP_FE(geoip_db_filename,	           arginfo_geoip_database)
+ #if LIBGEOIP_VERSION >= 1004001
+-	PHP_FE(geoip_region_name_by_code,	NULL)
+-	PHP_FE(geoip_time_zone_by_country_and_region,	NULL)
++	PHP_FE(geoip_region_name_by_code,      arginfo_geoip_region)
++	PHP_FE(geoip_time_zone_by_country_and_region,	arginfo_geoip_region)
+ #endif
+ #ifdef HAVE_CUSTOM_DIRECTORY
+-    PHP_FE(geoip_setup_custom_directory,	NULL)
++    PHP_FE(geoip_setup_custom_directory,   arginfo_geoip_directory)
+ #endif
+-	PHP_FE(geoip_asnum_by_name,   NULL)
+-	PHP_FE(geoip_domain_by_name,   NULL)
++	PHP_FE(geoip_asnum_by_name,            arginfo_geoip_host)
++	PHP_FE(geoip_domain_by_name,           arginfo_geoip_host)
+ #if LIBGEOIP_VERSION >= 1004008
+-	PHP_FE(geoip_netspeedcell_by_name, NULL)
++	PHP_FE(geoip_netspeedcell_by_name,     arginfo_geoip_host)
+ #endif
++#ifdef PHP_FE_END
++	PHP_FE_END
++#else
+ 	{NULL, NULL, NULL}
++#endif
+ };
+ /* }}} */
+