Skip to content
Snippets Groups Projects
Commit 8a6d2048 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

upgpkg: 8.0-4

parent 2d245700
No related branches found
No related tags found
No related merge requests found
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=('php-memcache' 'php7-memcache')
pkgname=('php-memcache' 'php-legacy-memcache')
pkgver=8.0
pkgrel=3
pkgrel=4
pkgdesc="Memcache module for PHP"
arch=('x86_64')
url="https://pecl.php.net/package/memcache"
license=('PHP')
makedepends=('php' 'php7')
makedepends=('php' 'php-legacy')
checkdepends=('memcached')
source=(https://pecl.php.net/get/memcache-$pkgver.tgz)
sha256sums=('defe33e6f7831d82b7283b95e14a531070531acbf21278f3f0d7050505cf3395')
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
cp -a memcache-$pkgver{,-php7}
patch -p1 -d memcache-$pkgver -i "$srcdir/php-8.2.patch"
cp -a memcache-$pkgver{,-php-legacy}
}
build() {
......@@ -24,15 +27,15 @@ build() {
./configure --prefix=/usr
make
cd ../memcache-$pkgver-php7
phpize7
cd ../memcache-$pkgver-php-legacy
phpize-legacy
./configure --prefix=/usr
make
}
check() {
sed -i "s|^\(\$domainsocket =\) .*|\1 'unix://$PWD/memcached.sock';|" \
memcache-$pkgver{,-php7}/tests/connect.inc
memcache-$pkgver{,-php-legacy}/tests/connect.inc
memcached_pids=()
memcached -p 11211 -U 11211 >/dev/null & memcached_pids+=($!)
......@@ -40,7 +43,7 @@ check() {
memcached -s "$PWD/memcached.sock" >/dev/null & memcached_pids+=($!)
local ret=0 dir=
for dir in memcache-$pkgver{,-php7}; do
for dir in memcache-$pkgver{,-php-legacy}; do
cd "$srcdir/$dir"
make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1 || ret=1
done
......@@ -62,17 +65,17 @@ package_php-memcache() {
echo ';extension=memcache.so' >"$pkgdir/etc/php/conf.d/memcache.ini"
}
package_php7-memcache() {
pkgdesc=${pkgdesc/PHP/PHP 7}
depends+=('php7')
backup=('etc/php7/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-php7
cd memcache-$pkgver-php-legacy
make INSTALL_ROOT="$pkgdir" install
install -d "$pkgdir/etc/php7/conf.d"
echo ';extension=memcache.so' >"$pkgdir/etc/php7/conf.d/memcache.ini"
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:
From 26c0f5130050649762c550e0dac07d4f371e68d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
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
+}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment