From 6440200c9f1c91fc507817b289d42cf8a224807f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Mar 2017 10:49:53 +0100 Subject: switch the spec --- REFLECTION | 78 ++------ REFLECTION-PHP7 | 244 ------------------------- apcu.ini | 72 -------- php-pecl-apcu-php7.spec | 469 ------------------------------------------------ php-pecl-apcu.spec | 226 +++++++++++++---------- 5 files changed, 149 insertions(+), 940 deletions(-) delete mode 100644 REFLECTION-PHP7 delete mode 100644 apcu.ini delete mode 100644 php-pecl-apcu-php7.spec diff --git a/REFLECTION b/REFLECTION index d044901..a97afe5 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #75 apcu version 4.0.11 ] { +Extension [ extension #73 apcu version 5.1.8 ] { - INI { Entry [ apc.enabled ] @@ -23,29 +23,14 @@ Extension [ extension #75 apcu version 4.0.11 ] { Current = '0' } Entry [ apc.mmap_file_mask ] - Current = '/tmp/apc.kbxxpZ' + Current = '/tmp/apc.XXXXXX' } Entry [ apc.enable_cli ] - Current = '1' + Current = '0' } Entry [ apc.slam_defense ] Current = '1' } - Entry [ apc.rfc1867 ] - Current = '0' - } - Entry [ apc.rfc1867_prefix ] - Current = 'upload_' - } - Entry [ apc.rfc1867_name ] - Current = 'APC_UPLOAD_PROGRESS' - } - Entry [ apc.rfc1867_freq ] - Current = '0' - } - Entry [ apc.rfc1867_ttl ] - Current = '3600' - } Entry [ apc.preload_path ] Current = '' } @@ -63,8 +48,7 @@ Extension [ extension #75 apcu version 4.0.11 ] { } } - - Constants [19] { - Constant [ integer ] { 140239091571008 } + - Constants [15] { Constant [ integer APC_LIST_ACTIVE ] { 1 } Constant [ integer APC_LIST_DELETED ] { 2 } Constant [ integer APC_ITER_TYPE ] { 1 } @@ -80,23 +64,18 @@ Extension [ extension #75 apcu version 4.0.11 ] { Constant [ integer APC_ITER_TTL ] { 1024 } Constant [ integer APC_ITER_NONE ] { 0 } Constant [ integer APC_ITER_ALL ] { 4294967295 } - Constant [ integer APC_BIN_VERIFY_MD5 ] { 1 } - Constant [ integer APC_BIN_VERIFY_CRC32 ] { 2 } - Constant [ boolean APCU_APC_FULL_BC ] { 1 } } - Functions { Function [ function apcu_cache_info ] { - - Parameters [2] { - Parameter #0 [ $type ] - Parameter #1 [ $limited ] + - Parameters [1] { + Parameter #0 [ $limited ] } } Function [ function apcu_clear_cache ] { - - Parameters [1] { - Parameter #0 [ $cache ] + - Parameters [0] { } } Function [ function apcu_sma_info ] { @@ -175,40 +154,18 @@ Extension [ extension #75 apcu version 4.0.11 ] { Parameter #0 [ $keys ] } } - Function [ function apcu_bin_dump ] { - - - Parameters [1] { - Parameter #0 [ $user_vars ] - } - } - Function [ function apcu_bin_load ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $flags ] - } - } - Function [ function apcu_bin_dumpfile ] { - - - Parameters [4] { - Parameter #0 [ $user_vars ] - Parameter #1 [ $filename ] - Parameter #2 [ $flags ] - Parameter #3 [ $context ] - } - } - Function [ function apcu_bin_loadfile ] { + Function [ function apcu_entry ] { - Parameters [3] { - Parameter #0 [ $filename ] - Parameter #1 [ $context ] - Parameter #2 [ $flags ] + Parameter #0 [ $key ] + Parameter #1 [ callable $generator ] + Parameter #2 [ integer $ttl ] } } } - Classes [1] { - Class [ class APCIterator implements Iterator, Traversable ] { + Class [ class APCuIterator implements Iterator, Traversable ] { - Constants [0] { } @@ -225,12 +182,11 @@ Extension [ extension #75 apcu version 4.0.11 ] { - Methods [9] { Method [ public method __construct ] { - - Parameters [5] { - Parameter #0 [ $cache ] - Parameter #1 [ $search ] - Parameter #2 [ $format ] - Parameter #3 [ $chunk_size ] - Parameter #4 [ $list ] + - Parameters [4] { + Parameter #0 [ $search ] + Parameter #1 [ $format ] + Parameter #2 [ $chunk_size ] + Parameter #3 [ $list ] } } diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index a97afe5..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,244 +0,0 @@ -Extension [ extension #73 apcu version 5.1.8 ] { - - - INI { - Entry [ apc.enabled ] - Current = '1' - } - Entry [ apc.shm_segments ] - Current = '1' - } - Entry [ apc.shm_size ] - Current = '32M' - } - Entry [ apc.entries_hint ] - Current = '4096' - } - Entry [ apc.gc_ttl ] - Current = '3600' - } - Entry [ apc.ttl ] - Current = '0' - } - Entry [ apc.smart ] - Current = '0' - } - Entry [ apc.mmap_file_mask ] - Current = '/tmp/apc.XXXXXX' - } - Entry [ apc.enable_cli ] - Current = '0' - } - Entry [ apc.slam_defense ] - Current = '1' - } - Entry [ apc.preload_path ] - Current = '' - } - Entry [ apc.coredump_unmap ] - Current = '0' - } - Entry [ apc.use_request_time ] - Current = '1' - } - Entry [ apc.serializer ] - Current = 'php' - } - Entry [ apc.writable ] - Current = '/tmp' - } - } - - - Constants [15] { - Constant [ integer APC_LIST_ACTIVE ] { 1 } - Constant [ integer APC_LIST_DELETED ] { 2 } - Constant [ integer APC_ITER_TYPE ] { 1 } - Constant [ integer APC_ITER_KEY ] { 2 } - Constant [ integer APC_ITER_VALUE ] { 4 } - Constant [ integer APC_ITER_NUM_HITS ] { 8 } - Constant [ integer APC_ITER_MTIME ] { 16 } - Constant [ integer APC_ITER_CTIME ] { 32 } - Constant [ integer APC_ITER_DTIME ] { 64 } - Constant [ integer APC_ITER_ATIME ] { 128 } - Constant [ integer APC_ITER_REFCOUNT ] { 256 } - Constant [ integer APC_ITER_MEM_SIZE ] { 512 } - Constant [ integer APC_ITER_TTL ] { 1024 } - Constant [ integer APC_ITER_NONE ] { 0 } - Constant [ integer APC_ITER_ALL ] { 4294967295 } - } - - - Functions { - Function [ function apcu_cache_info ] { - - - Parameters [1] { - Parameter #0 [ $limited ] - } - } - Function [ function apcu_clear_cache ] { - - - Parameters [0] { - } - } - Function [ function apcu_sma_info ] { - - - Parameters [1] { - Parameter #0 [ $limited ] - } - } - Function [ function apcu_key_info ] { - - - Parameters [1] { - Parameter #0 [ $key ] - } - } - Function [ function apcu_enabled ] { - - - Parameters [0] { - } - } - Function [ function apcu_store ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $var ] - Parameter #2 [ $ttl ] - } - } - Function [ function apcu_fetch ] { - - - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ &$success ] - } - } - Function [ function apcu_delete ] { - - - Parameters [1] { - Parameter #0 [ $keys ] - } - } - Function [ function apcu_add ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $var ] - Parameter #2 [ $ttl ] - } - } - Function [ function apcu_inc ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $step ] - Parameter #2 [ &$success ] - } - } - Function [ function apcu_dec ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $step ] - Parameter #2 [ &$success ] - } - } - Function [ function apcu_cas ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $old ] - Parameter #2 [ $new ] - } - } - Function [ function apcu_exists ] { - - - Parameters [1] { - Parameter #0 [ $keys ] - } - } - Function [ function apcu_entry ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ callable $generator ] - Parameter #2 [ integer $ttl ] - } - } - } - - - Classes [1] { - Class [ class APCuIterator implements Iterator, Traversable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [9] { - Method [ public method __construct ] { - - - Parameters [4] { - Parameter #0 [ $search ] - Parameter #1 [ $format ] - Parameter #2 [ $chunk_size ] - Parameter #3 [ $list ] - } - } - - Method [ public method rewind ] { - - - Parameters [0] { - } - } - - Method [ public method current ] { - - - Parameters [0] { - } - } - - Method [ public method key ] { - - - Parameters [0] { - } - } - - Method [ public method next ] { - - - Parameters [0] { - } - } - - Method [ public method valid ] { - - - Parameters [0] { - } - } - - Method [ public method getTotalHits ] { - - - Parameters [0] { - } - } - - Method [ public method getTotalSize ] { - - - Parameters [0] { - } - } - - Method [ public method getTotalCount ] { - - - Parameters [0] { - } - } - } - } - } -} - diff --git a/apcu.ini b/apcu.ini deleted file mode 100644 index 4a7484a..0000000 --- a/apcu.ini +++ /dev/null @@ -1,72 +0,0 @@ -; Enable APCu extension module -extension = apcu.so - -; This can be set to 0 to disable APCu -apc.enabled=1 - -; Setting this enables APCu for the CLI version of PHP -; (Mostly for testing and debugging). -;apc.enable_cli=0 - -; Sets the path to text files containing caches to load from disk upon -; initialization of APCu. preload_path should be a directory where each -; file follows $key.data where $key should be used as the entry name -; and the contents of the file contains serialized data to use as the value -; of the entry. -;apc.preload_path= - -; The size of each shared memory segment, with M/G suffixe -;apc.shm_size=32M - -; The number of seconds a cache entry is allowed to idle in a slot in case -; this cache entry slot is needed by another entry. -;apc.ttl=0 - -; The number of seconds that a cache entry may remain on the -; garbage-collection list. -;apc.gc_ttl=3600 - -; If you begin to get low on resources, an expunge of the cache -; is performed if it is less than half full. This is not always -; a suitable way of determining if an expunge of the cache -; should be per apc.smart allows you to set a runtime configuration -; value which is used to determine if an expunge should be run -; if (available_size < apc.smart * requested_size) -;apc.smart=0 - -; A "hint" about the number variables expected in the cache. -; Set to zero or omit if you are not sure; -;apc.entries_hint=4096 - -; The mktemp-style file_mask to pass to the mmap module -apc.mmap_file_mask=/tmp/apc.XXXXXX - -; On very busy servers whenever you start the server or -; modify files you can create a race of many processes -; all trying to cache the same data at the same time. -; By default, APCu attempts to prevent "slamming" of a key. -; A key is considered "slammed" if it was the last key set, -; and a context other than the current one set it ( ie. it -; was set by another process or thread ) -;apc.slam_defense=1 - -; Defines which serializer should be used -; Default is the standard PHP serializer. -;apc.serializer='default' - -; use the SAPI request start time for TTL -;apc.use_request_time=1 - -; Enables APCu handling of signals, such as SIGSEGV, that write core files -; when signaled. APCu will attempt to unmap the shared memory segment in -; order to exclude it from the core file -;apc.coredump_unmap=0 - - -; RFC1867 File Upload Progress hook handler -;apc.rfc1867=0 -;apc.rfc1867_prefix =upload_ -;apc.rfc1867_name=APC_UPLOAD_PROGRESS -;apc.rfc1867_freq=0 -;apc.rfc1867_ttl=3600 - diff --git a/php-pecl-apcu-php7.spec b/php-pecl-apcu-php7.spec deleted file mode 100644 index 8cbdfc7..0000000 --- a/php-pecl-apcu-php7.spec +++ /dev/null @@ -1,469 +0,0 @@ -# remirepo spec file for php-pecl-apcu -# with SCL compatibility, from: -# -# Fedora spec file for php-pecl-apcu -# -# Copyright (c) 2013-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-apcu -%endif - -%global bootstrap 0 -%global gh_commit b771cd50a7fe519b6aaccbe5dc97594e68e0c88f -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner krakjoe -%global gh_project apcu -#global gh_date 20161018 -%global pecl_name apcu -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global ini_name 40-%{pecl_name}.ini - -Name: %{?sub_prefix}php-pecl-apcu -Summary: APC User Cache -Version: 5.1.8 -%if 0%{?gh_date:1} -Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -%else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -%endif -Source1: %{pecl_name}-5.1.2.ini -Source2: %{pecl_name}-panel.conf -Source3: %{pecl_name}.conf.php - -License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/APCu - -BuildRequires: %{?scl_prefix}php-devel > 7 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: pcre-devel - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -%if ! %{bootstrap} -# For user experience -Requires: %{?scl_prefix}php-pecl-apcu-bc%{?_isa} -%endif - -Obsoletes: %{?scl_prefix}php-apcu < 4.0.0-1 -Provides: %{?scl_prefix}php-apcu = %{version} -Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(apcu) = %{version} -Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-apcu = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-apcu%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -APCu is userland caching: APC stripped of opcode caching. - -APCu only supports userland caching of variables. - -The %{?sub_prefix}php-pecl-apcu-bc package provides a drop -in replacement for APC. - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%package devel -Summary: APCu developer files (header) -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{?scl_prefix}php-devel%{?_isa} - -Obsoletes: %{?scl_prefix}php-pecl-apc-devel < 4 -Provides: %{?scl_prefix}php-pecl-apc-devel = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-apc-devel%{?_isa} = %{version}-%{release} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-apcu-devel = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-apcu-devel%{?_isa} = %{version}-%{release} -%endif - -%description devel -These are the files needed to compile programs using APCu. - - -%if 0%{!?scl:1} -%package -n apcu-panel -Summary: APCu control panel -Group: Applications/Internet -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -BuildArch: noarch -%endif -Requires: %{name} = %{version}-%{release} -Requires: mod_php -Requires: php-gd -Requires: httpd - -Obsoletes: apc-panel < 4 -Provides: apc-panel = %{version}-%{release} - -%description -n apcu-panel -This package provides the APCu control panel, with Apache -configuration, available on http://localhost/apcu-panel/ -%endif - - -%prep -%setup -qc -%if 0%{?gh_date:1} -mv %{gh_project}-%{gh_commit} NTS -mv NTS/package.xml . -%else -mv %{pecl_name}-%{version} NTS -%endif - -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} - -cd NTS - -# Sanity check, really often broken -extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) -if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. - exit 1 -fi -cd .. - -%if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS -%endif - -%if 0%{!?scl:1} -# Fix path to configuration file -sed -e s:apc.conf.php:%{_sysconfdir}/apcu-panel/conf.php:g \ - -i NTS/apc.php -%else -# Provide the control panel as doc -sed -e '/"apc.php"/s/role="src"/role="doc"/' -i package.xml -%endif - -%build -cd NTS -%{_bindir}/phpize -%configure \ - --enable-apcu \ - --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure \ - --enable-apcu \ - --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -# Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} - -%if %{with_zts} -# Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Install the package XML file -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -%if 0%{!?scl:1} -# Install the Control Panel -# Pages -install -D -m 644 -p NTS/apc.php \ - %{buildroot}%{_datadir}/apcu-panel/index.php -# Apache config -install -D -m 644 -p %{SOURCE2} \ - %{buildroot}%{_sysconfdir}/httpd/conf.d/apcu-panel.conf -# Panel config -install -D -m 644 -p %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/apcu-panel/conf.php -%endif - - -# Test & Documentation -cd NTS -for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i - [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i -done -for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - -%check -cd NTS -%{_bindir}/php -n \ - -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep 'apcu' - -# Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{_bindir}/php -n run-tests.php --show-diff - -%if %{with_zts} -cd ../ZTS -%{__ztsphp} -n \ - -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep 'apcu' - -# Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff -%endif - - -%if 0%{?fedora} < 24 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%files -%{?_licensedir:%license NTS/LICENSE} -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%files devel -%doc %{pecl_testdir}/%{pecl_name} -%{php_incldir}/ext/%{pecl_name} - -%if %{with_zts} -%{php_ztsincldir}/ext/%{pecl_name} -%endif - - -%if 0%{!?scl:1} -%files -n apcu-panel -# Need to restrict access, as it contains a clear password -%attr(550,apache,root) %dir %{_sysconfdir}/apcu-panel -%config(noreplace) %{_sysconfdir}/apcu-panel/conf.php -%config(noreplace) %{_sysconfdir}/httpd/conf.d/apcu-panel.conf -%{_datadir}/apcu-panel -%endif - - -%changelog -* Mon Jan 16 2017 Remi Collet - 5.1.8-1 -- Update to 5.1.8 (php 7, stable) - -* Thu Dec 1 2016 Remi Collet - 5.1.7-2 -- rebuild with PHP 7.1.0 GA - -* Fri Oct 21 2016 Remi Collet - 5.1.7-1 -- Update to 5.1.7 (php 7, stable) - -* Tue Oct 18 2016 Remi Collet - 5.1.7-0.1.20161018gitb771cd5 -- test for upcoming 5.1.7 - -* Thu Oct 6 2016 Remi Collet - 5.1.6-1 -- Update to 5.1.6 (php 7, stable) - -* Wed Sep 14 2016 Remi Collet - 5.1.5-4 -- rebuild for PHP 7.1 new API version - -* Mon Jul 25 2016 Remi Collet - 5.1.5-3 -- add patch for PHP 7.1 and ZTS - -* Sat Jul 23 2016 Remi Collet - 5.1.5-2 -- disable ZTS build with PHP 7.1 - -* Tue Jun 7 2016 Remi Collet - 5.1.5-1 -- Update to 5.1.5 (php 7, stable) - -* Thu May 12 2016 Remi Collet - 5.1.4-1 -- Update to 5.1.4 (php 7, stable) - -* Sat Mar 5 2016 Remi Collet - 5.1.3-2 -- adapt for F24 - -* Fri Jan 15 2016 Remi Collet - 5.1.3-1 -- Update to 5.1.3 (stable) - -* Sat Jan 9 2016 Remi Collet - 5.1.2-2 -- add upstream patches to fix issues with apcu_inc / apcu_dec - https://github.com/krakjoe/apcu/issues/158 - negative step hangs - https://github.com/krakjoe/apcu/issues/164 - huge step performance - -* Mon Dec 7 2015 Remi Collet - 5.1.2-1 -- Update to 5.1.2 (stable) - -* Mon Dec 7 2015 Remi Collet - 5.1.2-0.2 -- test build of upcomming 5.1.2 - -* Fri Dec 4 2015 Remi Collet - 5.1.2-0.1.20151204gitba021db -- test build of upcomming 5.1.2 - -* Fri Nov 20 2015 Remi Collet - 5.1.0-1 -- Update to 5.1.0 (beta) - -* Fri Nov 20 2015 Remi Collet - 5.1.0-0.1.20151120gitba683bc -- test build for upcoming 5.1.0 - -* Fri Nov 6 2015 Remi Collet - 5.0.0-0.6.20151106gitffb4fc8 -- new snapshot - -* Fri Nov 6 2015 Remi Collet - 5.0.0-0.5.20151106gite032e7b -- new snapshot - -* Wed Oct 14 2015 Remi Collet - 5.0.0-0.4.20151014git9c361d2 -- new snapshot (with apcu and apc extensions) - -* Tue Oct 13 2015 Remi Collet - 5.0.0-0.3.20150921gitea10226 -- rebuild for PHP 7.0.0RC5 new API version -- new snapshot - -* Mon Sep 21 2015 Remi Collet - 5.0.0-0.2.20150921gitea10226 -- new snapshot - -* Mon Sep 21 2015 Remi Collet - 5.0.0-0.1.20150921gita3128da -- update to 5.0.0-dev for PHP 7 -- sources from github - -* Fri Jun 19 2015 Remi Collet - 4.0.7-3 -- allow build against rh-php56 (as more-php56) - -* Tue Jun 9 2015 Remi Collet - 4.0.7-2 -- upstream fix for the control panel -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet - 4.0.7-1.1 -- Fedora 21 SCL mass rebuild - -* Sat Oct 11 2014 Remi Collet - 4.0.7-1 -- Update to 4.0.7 - -* Sun Aug 24 2014 Remi Collet - 4.0.6-2 -- improve SCL stuff - -* Thu Jun 12 2014 Remi Collet - 4.0.6-1 -- Update to 4.0.6 (beta) - -* Wed Jun 11 2014 Remi Collet - 4.0.5-1 -- Update to 4.0.5 (beta) -- open https://github.com/krakjoe/apcu/pull/74 (PHP 5.4) - -* Sun Jun 8 2014 Remi Collet - 4.0.4-3 -- add build patch for php 5.6.0beta4 - -* Wed Apr 9 2014 Remi Collet - 4.0.4-2 -- add numerical prefix to extension configuration file - -* Sat Mar 01 2014 Remi Collet - 4.0.4-1 -- Update to 4.0.4 (beta) - -* Mon Jan 27 2014 Remi Collet - 4.0.3-1 -- Update to 4.0.3 (beta) -- install doc in pecl doc_dir -- install tests in pecl test_dir (in devel) -- drop panel sub-package in SCL -- add SCL stuff - -* Mon Sep 16 2013 Remi Collet - 4.0.2-2 -- fix perm on config dir -- always provides php-pecl-apc-devel and apc-panel - -* Mon Sep 16 2013 Remi Collet - 4.0.2-1 -- Update to 4.0.2 - -* Fri Aug 30 2013 Remi Collet - 4.0.1-3 -- rebuild to have NEVR > EPEL (or Fedora) - -* Thu Jul 4 2013 Remi Collet - 4.0.1-2 -- obsoletes APC with php 5.5 -- restore APC serializers ABI (patch merged upstream) - -* Tue Apr 30 2013 Remi Collet - 4.0.1-1 -- Update to 4.0.1 -- add missing scriptlet -- fix Conflicts - -* Thu Apr 25 2013 Remi Collet - 4.0.0-2 -- fix segfault when used from command line - -* Wed Mar 27 2013 Remi Collet - 4.0.0-1 -- first pecl release -- rename from php-apcu to php-pecl-apcu - -* Tue Mar 26 2013 Remi Collet - 4.0.0-0.4.git4322fad -- new snapshot (test before release) - -* Mon Mar 25 2013 Remi Collet - 4.0.0-0.3.git647cb2b -- new snapshot with our pull request -- allow to run test suite simultaneously on 32/64 arch -- build warning free - -* Mon Mar 25 2013 Remi Collet - 4.0.0-0.2.git6d20302 -- new snapshot with full APC compatibility - -* Sat Mar 23 2013 Remi Collet - 4.0.0-0.1.git44e8dd4 -- initial package, version 4.0.0 diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 47e573b..8cbdfc7 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -10,39 +10,31 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif +%scl_package php-pecl-apcu %endif -%{?scl: %scl_package php-pecl-apcu} -%{!?scl: %global pkg_name %{name}} -%global gh_commit d7b65bf289e7dd3cd22350554b5eb99fc3bb2a9c +%global bootstrap 0 +%global gh_commit b771cd50a7fe519b6aaccbe5dc97594e68e0c88f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner krakjoe %global gh_project apcu -#global gh_date 20151120 +#global gh_date 20161018 %global pecl_name apcu -%global with_zts 0%{?__ztsphp:1} -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%endif Name: %{?sub_prefix}php-pecl-apcu Summary: APC User Cache -Version: 4.0.11 +Version: 5.1.8 %if 0%{?gh_date:1} Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif -Source1: %{pecl_name}.ini +Source1: %{pecl_name}-5.1.2.ini Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php @@ -50,47 +42,43 @@ License: PHP Group: Development/Languages URL: http://pecl.php.net/package/APCu -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} +%if ! %{bootstrap} +# For user experience +Requires: %{?scl_prefix}php-pecl-apcu-bc%{?_isa} +%endif -Obsoletes: %{?scl_prefix}php-apcu < 4.0.0-1 -Provides: %{?scl_prefix}php-apcu = %{version} -Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(apcu) = %{version} +Obsoletes: %{?scl_prefix}php-apcu < 4.0.0-1 +Provides: %{?scl_prefix}php-apcu = %{version} +Provides: %{?scl_prefix}php-apcu%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(apcu) = %{version} Provides: %{?scl_prefix}php-pecl(apcu)%{?_isa} = %{version} %if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-apcu = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-apcu%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-apcu = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-apcu%{?_isa} = %{version}-%{release} %endif -Obsoletes: %{?scl_prefix}php-pecl-apc < 4 - -# Same provides than APC, this is a drop in replacement -Provides: %{?scl_prefix}php-apc = %{version} -Provides: %{?scl_prefix}php-apc%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl-apc = %{version} -Provides: %{?scl_prefix}php-pecl-apc%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(APC) = %{version} -Provides: %{?scl_prefix}php-pecl(APC)%{?_isa} = %{version} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -102,24 +90,12 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %description -APCu is userland caching: APC stripped of opcode caching in preparation -for the deployment of Zend OPcache as the primary solution to opcode -caching in future versions of PHP. - -APCu has a revised and simplified codebase, by the time the PECL release -is available, every part of APCu being used will have received review and -where necessary or appropriate, changes. +APCu is userland caching: APC stripped of opcode caching. -Simplifying and documenting the API of APCu completely removes the barrier -to maintenance and development of APCu in the future, and additionally allows -us to make optimizations not possible previously because of APC's inherent -complexity. +APCu only supports userland caching of variables. -APCu only supports userland caching (and dumping) of variables, providing an -upgrade path for the future. When O+ takes over, many will be tempted to use -3rd party solutions to userland caching, possibly even distributed solutions; -this would be a grave error. The tried and tested APC codebase provides far -superior support for local storage of PHP variables. +The %{?sub_prefix}php-pecl-apcu-bc package provides a drop +in replacement for APC. Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. @@ -129,9 +105,14 @@ Summary: APCu developer files (header) Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?scl_prefix}php-devel%{?_isa} -Obsoletes: %{?scl_prefix}php-pecl-apc-devel < 4 -Provides: %{?scl_prefix}php-pecl-apc-devel = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-apc-devel%{?_isa} = %{version}-%{release} + +Obsoletes: %{?scl_prefix}php-pecl-apc-devel < 4 +Provides: %{?scl_prefix}php-pecl-apc-devel = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-apc-devel%{?_isa} = %{version}-%{release} +%if "%{?scl_prefix}" != "%{?sub_prefix}" +Provides: %{?scl_prefix}php-pecl-apcu-devel = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-apcu-devel%{?_isa} = %{version}-%{release} +%endif %description devel These are the files needed to compile programs using APCu. @@ -148,6 +129,7 @@ Requires: %{name} = %{version}-%{release} Requires: mod_php Requires: php-gd Requires: httpd + Obsoletes: apc-panel < 4 Provides: apc-panel = %{version}-%{release} @@ -172,8 +154,8 @@ cd NTS # Sanity check, really often broken extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}. +if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. exit 1 fi cd .. @@ -183,28 +165,34 @@ cd .. cp -pr NTS ZTS %endif +%if 0%{!?scl:1} # Fix path to configuration file sed -e s:apc.conf.php:%{_sysconfdir}/apcu-panel/conf.php:g \ - -i NTS/apc.php - + -i NTS/apc.php +%else +# Provide the control panel as doc +sed -e '/"apc.php"/s/role="src"/role="doc"/' -i package.xml +%endif %build cd NTS %{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config +%configure \ + --enable-apcu \ + --with-php-config=%{_bindir}/php-config make %{?_smp_mflags} %if %{with_zts} cd ../ZTS %{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config +%configure \ + --enable-apcu \ + --with-php-config=%{_bindir}/zts-php-config make %{?_smp_mflags} %endif %install -rm -rf %{buildroot} - # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} @@ -235,7 +223,8 @@ install -D -m 644 -p %{SOURCE3} \ # Test & Documentation cd NTS for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i + [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i done for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i @@ -244,37 +233,32 @@ done %check cd NTS - -# Check than both extensions are reported (BC mode) -%{_bindir}/php -n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so -m | grep 'apcu' -%{_bindir}/php -n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so -m | grep 'apc$' +%{_bindir}/php -n \ + -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ + -m | grep 'apcu' # Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{_bindir}/php -n run-tests.php --show-diff %if %{with_zts} cd ../ZTS - -%{__ztsphp} -n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so -m | grep 'apcu' -%{__ztsphp} -n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so -m | grep 'apc$' +%{__ztsphp} -n \ + -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ + -m | grep 'apcu' # Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__ztsphp} -n run-tests.php --show-diff %endif -%clean -rm -rf %{buildroot} - - %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -296,7 +280,6 @@ fi %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -305,13 +288,12 @@ fi %{php_extdir}/%{pecl_name}.so %if %{with_zts} -%{php_ztsextdir}/%{pecl_name}.so %config(noreplace) %{php_ztsinidir}/%{ini_name} +%{php_ztsextdir}/%{pecl_name}.so %endif %files devel -%defattr(-,root,root,-) %doc %{pecl_testdir}/%{pecl_name} %{php_incldir}/ext/%{pecl_name} @@ -322,7 +304,6 @@ fi %if 0%{!?scl:1} %files -n apcu-panel -%defattr(-,root,root,-) # Need to restrict access, as it contains a clear password %attr(550,apache,root) %dir %{_sysconfdir}/apcu-panel %config(noreplace) %{_sysconfdir}/apcu-panel/conf.php @@ -332,23 +313,80 @@ fi %changelog -* Wed May 4 2016 Remi Collet - 4.0.11-2 -- always obsoletes apc +* Mon Jan 16 2017 Remi Collet - 5.1.8-1 +- Update to 5.1.8 (php 7, stable) + +* Thu Dec 1 2016 Remi Collet - 5.1.7-2 +- rebuild with PHP 7.1.0 GA + +* Fri Oct 21 2016 Remi Collet - 5.1.7-1 +- Update to 5.1.7 (php 7, stable) + +* Tue Oct 18 2016 Remi Collet - 5.1.7-0.1.20161018gitb771cd5 +- test for upcoming 5.1.7 + +* Thu Oct 6 2016 Remi Collet - 5.1.6-1 +- Update to 5.1.6 (php 7, stable) + +* Wed Sep 14 2016 Remi Collet - 5.1.5-4 +- rebuild for PHP 7.1 new API version + +* Mon Jul 25 2016 Remi Collet - 5.1.5-3 +- add patch for PHP 7.1 and ZTS + +* Sat Jul 23 2016 Remi Collet - 5.1.5-2 +- disable ZTS build with PHP 7.1 + +* Tue Jun 7 2016 Remi Collet - 5.1.5-1 +- Update to 5.1.5 (php 7, stable) -* Wed Apr 20 2016 Remi Collet - 4.0.11-1 -- Update to 4.0.11 (stable) +* Thu May 12 2016 Remi Collet - 5.1.4-1 +- Update to 5.1.4 (php 7, stable) -* Mon Mar 7 2016 Remi Collet - 4.0.10-2 +* Sat Mar 5 2016 Remi Collet - 5.1.3-2 - adapt for F24 -* Mon Dec 7 2015 Remi Collet - 4.0.10-1 -- Update to 4.0.10 (stable) +* Fri Jan 15 2016 Remi Collet - 5.1.3-1 +- Update to 5.1.3 (stable) + +* Sat Jan 9 2016 Remi Collet - 5.1.2-2 +- add upstream patches to fix issues with apcu_inc / apcu_dec + https://github.com/krakjoe/apcu/issues/158 - negative step hangs + https://github.com/krakjoe/apcu/issues/164 - huge step performance + +* Mon Dec 7 2015 Remi Collet - 5.1.2-1 +- Update to 5.1.2 (stable) + +* Mon Dec 7 2015 Remi Collet - 5.1.2-0.2 +- test build of upcomming 5.1.2 + +* Fri Dec 4 2015 Remi Collet - 5.1.2-0.1.20151204gitba021db +- test build of upcomming 5.1.2 + +* Fri Nov 20 2015 Remi Collet - 5.1.0-1 +- Update to 5.1.0 (beta) + +* Fri Nov 20 2015 Remi Collet - 5.1.0-0.1.20151120gitba683bc +- test build for upcoming 5.1.0 + +* Fri Nov 6 2015 Remi Collet - 5.0.0-0.6.20151106gitffb4fc8 +- new snapshot + +* Fri Nov 6 2015 Remi Collet - 5.0.0-0.5.20151106gite032e7b +- new snapshot + +* Wed Oct 14 2015 Remi Collet - 5.0.0-0.4.20151014git9c361d2 +- new snapshot (with apcu and apc extensions) + +* Tue Oct 13 2015 Remi Collet - 5.0.0-0.3.20150921gitea10226 +- rebuild for PHP 7.0.0RC5 new API version +- new snapshot -* Fri Nov 20 2015 Remi Collet - 4.0.8-1 -- Update to 4.0.8 (stable) +* Mon Sep 21 2015 Remi Collet - 5.0.0-0.2.20150921gitea10226 +- new snapshot -* Fri Nov 20 2015 Remi Collet - 4.0.8-0.1.20151120git0911f48 -- test build for upcoming 4.0.8 +* Mon Sep 21 2015 Remi Collet - 5.0.0-0.1.20150921gita3128da +- update to 5.0.0-dev for PHP 7 - sources from github * Fri Jun 19 2015 Remi Collet - 4.0.7-3 -- cgit