Date: Sunday, April 30, 2023 @ 18:56:04
Author: foutrelis
Revision: 1455478
archrelease: copy trunk to community-x86_64
Added:
php-memcache/repos/community-x86_64/PKGBUILD
(from rev 1455477, php-memcache/trunk/PKGBUILD)
php-memcache/repos/community-x86_64/php-legacy-memcache.install
(from rev 1455477, php-memcache/trunk/php-legacy-memcache.install)
php-memcache/repos/community-x86_64/php-memcache.install
(from rev 1455477, php-memcache/trunk/php-memcache.install)
Deleted:
php-memcache/repos/community-x86_64/PKGBUILD
php-memcache/repos/community-x86_64/php-8.2.patch
php-memcache/repos/community-x86_64/php-legacy-memcache.install
php-memcache/repos/community-x86_64/php-memcache.install
-----------------------------+
PKGBUILD | 157 ++++++++++++++++++++----------------------
php-8.2.patch | 64 -----------------
php-legacy-memcache.install | 20 ++---
php-memcache.install | 20 ++---
4 files changed, 96 insertions(+), 165 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-30 18:55:58 UTC (rev 1455477)
+++ PKGBUILD 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -1,81 +0,0 @@
-# Maintainer: Evangelos Foutras <[email protected]>
-
-pkgname=('php-memcache' 'php-legacy-memcache')
-pkgver=8.0
-pkgrel=4
-pkgdesc="Memcache module for PHP"
-arch=('x86_64')
-url="https://pecl.php.net/package/memcache";
-license=('PHP')
-makedepends=('php' 'php-legacy')
-checkdepends=('memcached')
-source=(https://pecl.php.net/get/memcache-$pkgver.tgz
- 'php-8.2.patch')
-sha256sums=('defe33e6f7831d82b7283b95e14a531070531acbf21278f3f0d7050505cf3395'
- 'faa23fc8fca696264b5e1159e44cfda772adca0b97ce43c9b6ee2b57d7e0ea4e')
-
-prepare() {
- # Fix test: https://github.com/websupport-sk/pecl-memcache/issues/91
- sed -i 's/memcache_connect(\$domainsocket,
null)/memcache_connect(\$domainsocket, 0)/' memcache-$pkgver/tests/035.phpt
- patch -p1 -d memcache-$pkgver -i "$srcdir/php-8.2.patch"
- cp -a memcache-$pkgver{,-php-legacy}
-}
-
-build() {
- cd memcache-$pkgver
- phpize
- ./configure --prefix=/usr
- make
-
- cd ../memcache-$pkgver-php-legacy
- phpize-legacy
- ./configure --prefix=/usr
- make
-}
-
-check() {
- sed -i "s|^\(\$domainsocket =\) .*|\1 'unix://$PWD/memcached.sock';|" \
- memcache-$pkgver{,-php-legacy}/tests/connect.inc
-
- memcached_pids=()
- memcached -p 11211 -U 11211 >/dev/null & memcached_pids+=($!)
- memcached -p 11212 -U 11212 >/dev/null & memcached_pids+=($!)
- memcached -s "$PWD/memcached.sock" >/dev/null & memcached_pids+=($!)
-
- local ret=0 dir=
- for dir in memcache-$pkgver{,-php-legacy}; do
- cd "$srcdir/$dir"
- make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1 || ret=1
- done
-
- kill ${memcached_pids[@]}
-
- return $ret
-}
-
-package_php-memcache() {
- depends+=('php')
- backup=('etc/php/conf.d/memcache.ini')
- install=$pkgname.install
-
- cd memcache-$pkgver
-
- make INSTALL_ROOT="$pkgdir" install
- install -d "$pkgdir/etc/php/conf.d"
- echo ';extension=memcache.so' >"$pkgdir/etc/php/conf.d/memcache.ini"
-}
-
-package_php-legacy-memcache() {
- pkgdesc=${pkgdesc/PHP/PHP Legacy}
- depends+=('php-legacy')
- backup=('etc/php-legacy/conf.d/memcache.ini')
- install=$pkgname.install
-
- cd memcache-$pkgver-php-legacy
-
- make INSTALL_ROOT="$pkgdir" install
- install -d "$pkgdir/etc/php-legacy/conf.d"
- echo ';extension=memcache.so' >"$pkgdir/etc/php-legacy/conf.d/memcache.ini"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: php-memcache/repos/community-x86_64/PKGBUILD (from rev 1455477,
php-memcache/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -0,0 +1,76 @@
+# Maintainer: Evangelos Foutras <[email protected]>
+
+pkgname=('php-memcache' 'php-legacy-memcache')
+pkgver=8.2
+pkgrel=1
+pkgdesc="Memcache module for PHP"
+arch=('x86_64')
+url="https://pecl.php.net/package/memcache";
+license=('PHP')
+makedepends=('php' 'php-legacy')
+checkdepends=('memcached')
+source=(https://pecl.php.net/get/memcache-$pkgver.tgz)
+sha256sums=('b3f0640eacdeb9046c6c86a1546d7fb8a4e9f219e5d9a36a287e59b2dd8208e5')
+
+prepare() {
+ cp -a memcache-$pkgver{,-php-legacy}
+}
+
+build() {
+ cd memcache-$pkgver
+ phpize
+ ./configure --prefix=/usr
+ make
+
+ cd ../memcache-$pkgver-php-legacy
+ phpize-legacy
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ sed -i "s|^\(\$domainsocket =\) .*|\1 'unix://$PWD/memcached.sock';|" \
+ memcache-$pkgver{,-php-legacy}/tests/connect.inc
+
+ memcached_pids=()
+ memcached -p 11211 -U 11211 >/dev/null & memcached_pids+=($!)
+ memcached -p 11212 -U 11212 >/dev/null & memcached_pids+=($!)
+ memcached -s "$PWD/memcached.sock" >/dev/null & memcached_pids+=($!)
+
+ local ret=0 dir=
+ for dir in memcache-$pkgver{,-php-legacy}; do
+ cd "$srcdir/$dir"
+ make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1 || ret=1
+ done
+
+ kill ${memcached_pids[@]}
+
+ return $ret
+}
+
+package_php-memcache() {
+ depends+=('php')
+ backup=('etc/php/conf.d/memcache.ini')
+ install=$pkgname.install
+
+ cd memcache-$pkgver
+
+ make INSTALL_ROOT="$pkgdir" install
+ install -d "$pkgdir/etc/php/conf.d"
+ echo ';extension=memcache.so' >"$pkgdir/etc/php/conf.d/memcache.ini"
+}
+
+package_php-legacy-memcache() {
+ pkgdesc=${pkgdesc/PHP/PHP Legacy}
+ depends+=('php-legacy')
+ backup=('etc/php-legacy/conf.d/memcache.ini')
+ install=$pkgname.install
+
+ cd memcache-$pkgver-php-legacy
+
+ make INSTALL_ROOT="$pkgdir" install
+ install -d "$pkgdir/etc/php-legacy/conf.d"
+ echo ';extension=memcache.so' >"$pkgdir/etc/php-legacy/conf.d/memcache.ini"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: php-8.2.patch
===================================================================
--- php-8.2.patch 2023-04-30 18:55:58 UTC (rev 1455477)
+++ php-8.2.patch 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -1,64 +0,0 @@
-From 26c0f5130050649762c550e0dac07d4f371e68d5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <[email protected]>
-Date: Tue, 25 Oct 2022 11:54:24 +0200
-Subject: [PATCH] trivial/minimal fix for PHP 8.2 (#104)
-
----
- src/memcache.c | 6 ++++++
- tests/029.phpt | 2 +-
- tests/045.phpt | 4 +++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/memcache.c b/src/memcache.c
-index c05105a..c43e48f 100644
---- a/src/memcache.c
-+++ b/src/memcache.c
-@@ -733,9 +733,15 @@ PHP_MINIT_FUNCTION(memcache)
-
- INIT_CLASS_ENTRY(ce, "MemcachePool", php_memcache_pool_class_functions);
- memcache_pool_ce = zend_register_internal_class(&ce);
-+#if PHP_VERSION_ID >= 80200
-+ memcache_pool_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
-+#endif
-
- INIT_CLASS_ENTRY(ce, "Memcache", php_memcache_class_functions);
- memcache_ce = zend_register_internal_class_ex(&ce, memcache_pool_ce);
-+#if PHP_VERSION_ID >= 80200
-+ memcache_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
-+#endif
-
- le_memcache_pool =
zend_register_list_destructors_ex(_mmc_pool_list_dtor, NULL, "memcache
connection", module_number);
- le_memcache_server = zend_register_list_destructors_ex(NULL,
_mmc_server_list_dtor, "persistent memcache connection", module_number);
-diff --git a/tests/029.phpt b/tests/029.phpt
-index bcacf33..4427948 100644
---- a/tests/029.phpt
-+++ b/tests/029.phpt
-@@ -44,7 +44,7 @@ if (is_array($result))
- sort($result);
- var_dump($result);
-
--$result = ini_set('memcache.allow_failover', "abc");
-+$result = @ini_set('memcache.allow_failover', "abc");
- var_dump($result);
-
- ?>
-diff --git a/tests/045.phpt b/tests/045.phpt
-index e1c10ec..ddc5531 100644
---- a/tests/045.phpt
-+++ b/tests/045.phpt
-@@ -8,6 +8,8 @@ Nested get's in __wakeup()
- include 'connect.inc';
-
- class testclass {
-+ public $result = null;
-+
- function __wakeup() {
- global $memcache;
- $this->result = $memcache->get('_test_key3');
-@@ -48,4 +50,4 @@ array(2) {
- [0]=>
- int(123)
- }
--}
-\ No newline at end of file
-+}
Deleted: php-legacy-memcache.install
===================================================================
--- php-legacy-memcache.install 2023-04-30 18:55:58 UTC (rev 1455477)
+++ php-legacy-memcache.install 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -1,10 +0,0 @@
-post_install() {
- echo '
- ==> PHP Legacy extension
-
- A config file was stored under /etc/php-legacy/conf.d/. In order to use
this
- extension make sure to uncomment it from its config file.
- '
-}
-
-# vim:set ts=2 sw=2 et:
Copied: php-memcache/repos/community-x86_64/php-legacy-memcache.install (from
rev 1455477, php-memcache/trunk/php-legacy-memcache.install)
===================================================================
--- php-legacy-memcache.install (rev 0)
+++ php-legacy-memcache.install 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -0,0 +1,10 @@
+post_install() {
+ echo '
+ ==> PHP Legacy extension
+
+ A config file was stored under /etc/php-legacy/conf.d/. In order to use
this
+ extension make sure to uncomment it from its config file.
+ '
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: php-memcache.install
===================================================================
--- php-memcache.install 2023-04-30 18:55:58 UTC (rev 1455477)
+++ php-memcache.install 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -1,10 +0,0 @@
-post_install() {
- echo '
- ==> PHP extension
-
- A config file was stored under /etc/php/conf.d/. In order to use this
- extension make sure to uncomment it from its config file.
- '
-}
-
-# vim:set ts=2 sw=2 et:
Copied: php-memcache/repos/community-x86_64/php-memcache.install (from rev
1455477, php-memcache/trunk/php-memcache.install)
===================================================================
--- php-memcache.install (rev 0)
+++ php-memcache.install 2023-04-30 18:56:04 UTC (rev 1455478)
@@ -0,0 +1,10 @@
+post_install() {
+ echo '
+ ==> PHP extension
+
+ A config file was stored under /etc/php/conf.d/. In order to use this
+ extension make sure to uncomment it from its config file.
+ '
+}
+
+# vim:set ts=2 sw=2 et:
