Skip to content
Snippets Groups Projects
Commit 1ebde417 authored by Andy Postnikov's avatar Andy Postnikov
Browse files

testing/php7-pecl-seaslog: upgrade to 2.2.0

parent dfd33d0f
No related branches found
No related tags found
1 merge request!17037testing/php7-pecl-seaslog: upgrade to 2.2.0 and modernize
Hide whitespace changes
Inline Side-by-side
testing/php7-pecl-seaslog/APKBUILD
+ 12
− 18
View file @ 1ebde417
# Contributor: viest <dev@service.viest.me>
# Maintainer: Chitao.Gao <neeke@php.net>
pkgname=php7-pecl-seaslog
_pkgreal=seaslog
pkgver=2.1.0
pkgrel=1
pkgdesc="An effective, fast, stable log extension for PHP."
_extname=seaslog
pkgver=2.2.0
pkgrel=0
pkgdesc="An effective, fast, stable log extension for PHP 7."
url="https://pecl.php.net/package/SeasLog"
arch="all"
license="PHP-3.01"
depends="php7-json"
makedepends="php7-dev re2c"
source="$pkgname-$pkgver.tar.gz::https://pecl.php.net/get/SeasLog-$pkgver.tgz
fix-32-bits-287.patch"
source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/SeasLog-$pkgver.tgz"
builddir="$srcdir"/SeasLog-$pkgver
# FIXME: on s390x 10 tests broken https://github.com/SeasX/SeasLog/issues/292
case "$CARCH" in
mips64|s390x) options="$options !check";;
esac
build() {
phpize7
./configure \
......@@ -31,15 +25,15 @@ check() {
make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
PHP_TEST_SHARED_EXTENSIONS=" \
-d extension=/usr/lib/php7/modules/json.so \
-d extension=modules/$_pkgreal.so"
php7 -d extension="$builddir"/modules/$_pkgreal.so --ri $_pkgreal
-d extension=modules/$_extname.so"
php7 -dextension=modules/$_extname.so --ri $_extname
}
package() {
make INSTALL_ROOT="$pkgdir/" install
install -d "$pkgdir"/etc/php7/conf.d
echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini
make INSTALL_ROOT="$pkgdir" install
local _confdir="$pkgdir"/etc/php7/conf.d
install -d $_confdir
echo "extension=$_extname" > $_confdir/$_extname.ini
}
sha512sums="f9342cda45b302f4bb8292a914f13df056ac3c6e23b54a99054df8c6387bcffa7e5787c56b32e48024720b5007af7e96a25dd7e3d842e171cef95576a674ff2e php7-pecl-seaslog-2.1.0.tar.gz
3bffdbfcb1f9db311281a3707dfdb052556b706d86855335ea2bf95288b1fa7708b9b7a8623350afc2a1f6dc46237c43ad13a8469618d06a8b4c5af41171537a fix-32-bits-287.patch"
sha512sums="5c1d7dd6641bd8b8f3bf2c52f4b427103643fa1b7407a89769de7f450e882f9a1484b5b8b1aecf13c8060966b3bbcb52cbaf1536b93a8bceca5104bfda547629 php-pecl-seaslog-2.2.0.tar.gz"
testing/php7-pecl-seaslog/fix-32-bits-287.patch deleted 100644 → 0
+ 0
− 237
View file @ dfd33d0f
From bc7aba9f57f455ecf77fd2e3d2623e4818328829 Mon Sep 17 00:00:00 2001
From: dinosaur <thedinosaurmail@gmail.com>
Date: Thu, 2 Jan 2020 17:19:08 +0800
Subject: [PATCH 1/2] fix ulong conflicting
---
include/SeasLog.h | 4 ++--
include/php7_wrapper.h | 9 ++++-----
src/Buffer.c | 2 +-
src/Common.c | 2 +-
src/Logger.c | 2 +-
src/StreamWrapper.c | 4 ++--
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/include/SeasLog.h b/include/SeasLog.h
index 6e61f49..8bf1992 100644
--- a/include/SeasLog.h
+++ b/include/SeasLog.h
@@ -155,7 +155,7 @@
typedef struct _logger_entry_t
{
- ulong logger_hash;
+ SEASLOG_ULONG logger_hash;
char *folder;
char *logger;
int logger_len;
@@ -168,7 +168,7 @@ typedef struct _stream_entry_t
{
char *opt;
int opt_len;
- ulong stream_entry_hash;
+ SEASLOG_ULONG stream_entry_hash;
php_stream *stream;
int can_delete;
} stream_entry_t;
diff --git a/include/php7_wrapper.h b/include/php7_wrapper.h
index 331dade..54986bc 100644
--- a/include/php7_wrapper.h
+++ b/include/php7_wrapper.h
@@ -16,13 +16,12 @@
#ifndef _PHP_SEASLOG_PHP7_WRAPPER_H_
#define _PHP_SEASLOG_PHP7_WRAPPER_H_
-#if PHP_VERSION_ID >= 70000
-
#if PHP_VERSION_ID >= 70400
-#ifndef ulong
-typedef zend_ulong ulong;
-#endif
+typedef zend_ulong SEASLOG_ULONG;
+#else
+typedef ulong SEASLOG_ULONG;
#endif
+#if PHP_VERSION_ID >= 70000
#if PHP_VERSION_ID >= 70200
typedef uint32_t SEASLOG_UINT;
diff --git a/src/Buffer.c b/src/Buffer.c
index b1123ba..8bbad76 100644
--- a/src/Buffer.c
+++ b/src/Buffer.c
@@ -226,7 +226,7 @@ void seaslog_shutdown_buffer(int re_init TSRMLS_DC)
while (zend_hash_get_current_data(ht, (void **)&ppzval) == SUCCESS)
{
char *key = NULL;
- ulong idx = 0;
+ SEASLOG_ULONG idx = 0;
zend_hash_get_current_key(ht, &key, &idx, 0);
convert_to_array_ex(ppzval);
diff --git a/src/Common.c b/src/Common.c
index 7a8758e..0b87c24 100644
--- a/src/Common.c
+++ b/src/Common.c
@@ -192,7 +192,7 @@ char* php_strtr_array(char *str, int slen, HashTable *hash)
zval **entry;
char *string_key, *string_key_tmp = NULL;
uint string_key_len;
- ulong num_key;
+ SEASLOG_ULONG num_key;
HashPosition hpos;
char *tmp = estrdup(str);
diff --git a/src/Logger.c b/src/Logger.c
index e7f6a7d..ddc3d1b 100644
--- a/src/Logger.c
+++ b/src/Logger.c
@@ -177,7 +177,7 @@ void seaslog_clear_logger_list(TSRMLS_D)
logger_entry_t *process_logger(char *logger, int logger_len, int last_or_tmp TSRMLS_DC)
{
- ulong logger_entry_hash = zend_inline_hash_func(logger, logger_len);
+ SEASLOG_ULONG logger_entry_hash = zend_inline_hash_func(logger, logger_len);
logger_entry_t *logger_entry;
HashTable *ht_list;
HashTable *ht_logger;
diff --git a/src/StreamWrapper.c b/src/StreamWrapper.c
index 0cf00a9..c571bc2 100644
--- a/src/StreamWrapper.c
+++ b/src/StreamWrapper.c
@@ -111,7 +111,7 @@ int seaslog_clear_stream(int destroy, int model, char *opt TSRMLS_DC)
#if PHP_VERSION_ID >= 70000
zend_ulong num_key;
#else
- ulong num_key;
+ SEASLOG_ULONG num_key;
#endif
#if PHP_VERSION_ID >= 70000
@@ -187,7 +187,7 @@ int seaslog_clear_stream(int destroy, int model, char *opt TSRMLS_DC)
php_stream *process_stream(char *opt, int opt_len TSRMLS_DC)
{
- ulong stream_entry_hash;
+ SEASLOG_ULONG stream_entry_hash;
php_stream *stream = NULL;
HashTable *ht_list;
php_stream_statbuf dest_s;
From c483bc972a8ca96aab11238eed043868d2d32fd4 Mon Sep 17 00:00:00 2001
From: dinosaur <thedinosaurmail@gmail.com>
Date: Fri, 3 Jan 2020 12:39:55 +0800
Subject: [PATCH 2/2] replace ulong by zend_ulong
---
include/SeasLog.h | 4 ++--
include/php7_wrapper.h | 6 +-----
src/Buffer.c | 2 +-
src/Common.c | 2 +-
src/Logger.c | 2 +-
src/StreamWrapper.c | 6 +-----
6 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/include/SeasLog.h b/include/SeasLog.h
index 8bf1992..556fbfd 100644
--- a/include/SeasLog.h
+++ b/include/SeasLog.h
@@ -155,7 +155,7 @@
typedef struct _logger_entry_t
{
- SEASLOG_ULONG logger_hash;
+ zend_ulong logger_hash;
char *folder;
char *logger;
int logger_len;
@@ -168,7 +168,7 @@ typedef struct _stream_entry_t
{
char *opt;
int opt_len;
- SEASLOG_ULONG stream_entry_hash;
+ zend_ulong stream_entry_hash;
php_stream *stream;
int can_delete;
} stream_entry_t;
diff --git a/include/php7_wrapper.h b/include/php7_wrapper.h
index 54986bc..05cade7 100644
--- a/include/php7_wrapper.h
+++ b/include/php7_wrapper.h
@@ -16,11 +16,7 @@
#ifndef _PHP_SEASLOG_PHP7_WRAPPER_H_
#define _PHP_SEASLOG_PHP7_WRAPPER_H_
-#if PHP_VERSION_ID >= 70400
-typedef zend_ulong SEASLOG_ULONG;
-#else
-typedef ulong SEASLOG_ULONG;
-#endif
+
#if PHP_VERSION_ID >= 70000
#if PHP_VERSION_ID >= 70200
diff --git a/src/Buffer.c b/src/Buffer.c
index 8bbad76..e4604f5 100644
--- a/src/Buffer.c
+++ b/src/Buffer.c
@@ -226,7 +226,7 @@ void seaslog_shutdown_buffer(int re_init TSRMLS_DC)
while (zend_hash_get_current_data(ht, (void **)&ppzval) == SUCCESS)
{
char *key = NULL;
- SEASLOG_ULONG idx = 0;
+ zend_ulong idx = 0;
zend_hash_get_current_key(ht, &key, &idx, 0);
convert_to_array_ex(ppzval);
diff --git a/src/Common.c b/src/Common.c
index 0b87c24..84808d3 100644
--- a/src/Common.c
+++ b/src/Common.c
@@ -192,7 +192,7 @@ char* php_strtr_array(char *str, int slen, HashTable *hash)
zval **entry;
char *string_key, *string_key_tmp = NULL;
uint string_key_len;
- SEASLOG_ULONG num_key;
+ zend_ulong num_key;
HashPosition hpos;
char *tmp = estrdup(str);
diff --git a/src/Logger.c b/src/Logger.c
index ddc3d1b..2ddbe5c 100644
--- a/src/Logger.c
+++ b/src/Logger.c
@@ -177,7 +177,7 @@ void seaslog_clear_logger_list(TSRMLS_D)
logger_entry_t *process_logger(char *logger, int logger_len, int last_or_tmp TSRMLS_DC)
{
- SEASLOG_ULONG logger_entry_hash = zend_inline_hash_func(logger, logger_len);
+ zend_ulong logger_entry_hash = zend_inline_hash_func(logger, logger_len);
logger_entry_t *logger_entry;
HashTable *ht_list;
HashTable *ht_logger;
diff --git a/src/StreamWrapper.c b/src/StreamWrapper.c
index c571bc2..6d39b65 100644
--- a/src/StreamWrapper.c
+++ b/src/StreamWrapper.c
@@ -108,11 +108,7 @@ int seaslog_clear_stream(int destroy, int model, char *opt TSRMLS_DC)
stream_entry_t *stream_entry;
int result = FAILURE;
-#if PHP_VERSION_ID >= 70000
zend_ulong num_key;
-#else
- SEASLOG_ULONG num_key;
-#endif
#if PHP_VERSION_ID >= 70000
if (IS_ARRAY == Z_TYPE(SEASLOG_G(stream_list)))
@@ -187,7 +183,7 @@ int seaslog_clear_stream(int destroy, int model, char *opt TSRMLS_DC)
php_stream *process_stream(char *opt, int opt_len TSRMLS_DC)
{
- SEASLOG_ULONG stream_entry_hash;
+ zend_ulong stream_entry_hash;
php_stream *stream = NULL;
HashTable *ht_list;
php_stream_statbuf dest_s;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment