up to 3.0.9 snap from NON_BLOCKING_IO_php7 branch (73623c3)

this adds php7 support

diff --git a/memcache-faulty-inline.diff b/memcache-faulty-inline.diff
deleted file mode 100644 (file)
index 8e72510..0000000
--- a/memcache-faulty-inline.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN memcache-3.0.8.org/memcache_pool.c memcache-3.0.8/memcache_pool.c
---- memcache-3.0.8.org/memcache_pool.c 2013-04-08 04:12:54.000000000 +0200
-+++ memcache-3.0.8/memcache_pool.c     2015-09-26 22:22:07.977632801 +0200
-@@ -40,7 +40,7 @@
- 
- ZEND_DECLARE_MODULE_GLOBALS(memcache)
- 
--inline void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size)  /*
-+void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size)  /*
-       ensures space for an additional size bytes {{{ */
- {
-       register size_t newlen;
-@@ -48,7 +48,7 @@
- }
- /* }}} */
- 
--inline void mmc_buffer_free(mmc_buffer_t *buffer)  /* {{{ */
-+void mmc_buffer_free(mmc_buffer_t *buffer)  /* {{{ */
- {
-       if (buffer->value.c != NULL) {
-               smart_str_free(&(buffer->value));
-@@ -1676,7 +1676,7 @@
- }
- /* }}} */
- 
--inline int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len)  /* {{{ */
-+int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len)  /* {{{ */
- {
-       unsigned int i;
-       if (key_len == 0) {
-@@ -1694,7 +1694,7 @@
- }
- /* }}} */
- 
--inline int mmc_prepare_key(zval *key, char *result, unsigned int *result_len)  /* {{{ */
-+int mmc_prepare_key(zval *key, char *result, unsigned int *result_len)  /* {{{ */
- {
-       if (Z_TYPE_P(key) == IS_STRING) {
-               return mmc_prepare_key_ex(Z_STRVAL_P(key), Z_STRLEN_P(key), result, result_len);
-diff -urN memcache-3.0.8.org/memcache_pool.h memcache-3.0.8/memcache_pool.h
---- memcache-3.0.8.org/memcache_pool.h 2013-04-08 04:12:54.000000000 +0200
-+++ memcache-3.0.8/memcache_pool.h     2015-09-26 22:22:28.461473438 +0200
-@@ -135,8 +135,8 @@
- #define mmc_buffer_release(b) memset((b), 0, sizeof(*(b)))
- #define mmc_buffer_reset(b) (b)->value.len = (b)->idx = 0
- 
--inline void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
--inline void mmc_buffer_free(mmc_buffer_t *);
-+void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
-+void mmc_buffer_free(mmc_buffer_t *);
- 
- /* stream handlers */
- typedef struct mmc_stream mmc_stream_t;
-@@ -391,8 +391,8 @@
- double timeval_to_double(struct timeval tv);
- struct timeval double_to_timeval(double sec);
- 
--inline int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
--inline int mmc_prepare_key(zval *, char *, unsigned int *);
-+int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
-+int mmc_prepare_key(zval *, char *, unsigned int *);
- 
- #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)
- 
-diff -urN memcache-3.0.8.org/memcache_queue.h memcache-3.0.8/memcache_queue.h
---- memcache-3.0.8.org/memcache_queue.h        2013-04-08 04:12:54.000000000 +0200
-+++ memcache-3.0.8/memcache_queue.h    2015-09-26 22:22:54.378781973 +0200
-@@ -40,7 +40,7 @@
- #ifdef PHP_WIN32
- #define MMC_QUEUE_INLINE
- #else
--#define MMC_QUEUE_INLINE inline
-+#define MMC_QUEUE_INLINE
- #endif
- 
- MMC_QUEUE_INLINE void mmc_queue_push(mmc_queue_t *, void *);

diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 89c1b52c3822eb97ec7a41bf587a7c4b42443591..3df2f04ac8a81d1f53ca3a42a4120405329c9f9b 100644 (file)
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -5,18 +5,18 @@
 Summary:       %{modname} - a memcached extension
 Summary(pl.UTF-8):     %{modname} - rozszerzenie memcached
 Name:          %{php_name}-pecl-%{modname}
-Version:       3.0.8
-Release:       8
+Version:       3.0.9
+Release:       1
 License:       PHP 3.01
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 24505e9b263d2c77f8ae5e9b4725e7d1
+#Source0:      http://pecl.php.net/get/%{modname}-%{version}.tgz
+Source0:       https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.tar.gz
+# Source0-md5: 7751d8191302a726449d7c6506b8783d
 Source1:       %{modname}.ini
 Source2:       %{modname}-apache.conf
 Source3:       %{modname}-lighttpd.conf
 Source4:       config.php
 Patch0:                %{modname}-webapp.patch
-Patch1:                memcache-faulty-inline.diff
 URL:           http://pecl.php.net/package/memcache/
 BuildRequires: %{php_name}-devel >= 3:5.0.0
 BuildRequires: %{php_name}-xml
@@ -76,10 +76,9 @@ Via this web interface script you can manage and view statistics of
 memcache.
 
 %prep
-%setup -q -c
-mv %{modname}-%{version}/* .
+%setup -qc
+mv pecl-%{modname}-*/{.??*,*} .
 %patch0 -p1
-%patch1 -p1
 
 %build
 packagexml2cl package.xml > ChangeLog
@@ -93,15 +92,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{_examplesdir}/%{name}-%{version}}
 install -p modules/%{modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
 # we use "session_" prefix in inifile to get loader *after* session extension
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/session_%{modname}.ini
-cp -a example.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/session_%{modname}.ini
+cp -p example.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
-cp -a memcache.php $RPM_BUILD_ROOT%{_appdir}
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p memcache.php $RPM_BUILD_ROOT%{_appdir}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT