From fcb9259ce4b7f2b7d5bc3ecd32edd18dcd09afc4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Apr 2017 09:41:39 +0200 Subject: switch the specs --- REFLECTION | 154 +++++---- REFLECTION-PHP7 | 783 ------------------------------------------- memcached-fastlz.patch | 73 ---- php-pecl-memcached-php7.spec | 539 ----------------------------- php-pecl-memcached.spec | 155 +++++---- 5 files changed, 177 insertions(+), 1527 deletions(-) delete mode 100644 REFLECTION-PHP7 delete mode 100644 memcached-fastlz.patch delete mode 100644 php-pecl-memcached-php7.spec diff --git a/REFLECTION b/REFLECTION index 1b585a3..1be81da 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,26 +1,33 @@ -Extension [ extension #156 memcached version 2.2.0 ] { +Extension [ extension #167 memcached version 3.0.3 ] { + + - Dependencies { + Dependency [ session (Required) ] + Dependency [ igbinary (Required) ] + Dependency [ msgpack (Required) ] + Dependency [ spl (Required) ] + } - INI { Entry [ memcached.sess_locking ] Current = '1' } - Entry [ memcached.sess_consistent_hash ] - Current = '' - } - Entry [ memcached.sess_binary ] - Current = '' + Entry [ memcached.sess_lock_wait_min ] + Current = '1000' } - Entry [ memcached.sess_lock_wait ] - Current = '150000' + Entry [ memcached.sess_lock_wait_max ] + Current = '2000' } - Entry [ memcached.sess_lock_max_wait ] - Current = '0' + Entry [ memcached.sess_lock_retries ] + Current = '5' } Entry [ memcached.sess_lock_expire ] Current = '0' } - Entry [ memcached.sess_prefix ] - Current = 'memc.sess.key.' + Entry [ memcached.sess_binary_protocol ] + Current = '1' + } + Entry [ memcached.sess_consistent_hash ] + Current = '1' } Entry [ memcached.sess_number_of_replicas ] Current = '0' @@ -28,8 +35,11 @@ Extension [ extension #156 memcached version 2.2.0 ] { Entry [ memcached.sess_randomize_replica_read ] Current = '' } - Entry [ memcached.sess_remove_failed ] - Current = '1' + Entry [ memcached.sess_remove_failed_servers ] + Current = '' + } + Entry [ memcached.sess_server_failure_limit ] + Current = '0' } Entry [ memcached.sess_connect_timeout ] Current = '1000' @@ -40,6 +50,18 @@ Extension [ extension #156 memcached version 2.2.0 ] { Entry [ memcached.sess_sasl_password ] Current = '' } + Entry [ memcached.sess_prefix ] + Current = 'memc.sess.key.' + } + Entry [ memcached.sess_persistent ] + Current = '' + } + Entry [ memcached.sess_lock_wait ] + Current = 'not set' + } + Entry [ memcached.sess_lock_max_wait ] + Current = 'not set' + } Entry [ memcached.compression_type ] Current = 'fastlz' } @@ -52,29 +74,36 @@ Extension [ extension #156 memcached version 2.2.0 ] { Entry [ memcached.serializer ] Current = 'igbinary' } - Entry [ memcached.use_sasl ] - Current = '' - } Entry [ memcached.store_retry_count ] Current = '2' } + Entry [ memcached.default_consistent_hash ] + Current = '' + } + Entry [ memcached.default_binary_protocol ] + Current = '' + } + Entry [ memcached.default_connect_timeout ] + Current = '0' + } } - Classes [3] { Class [ class Memcached ] { - - Constants [130] { + - Constants [132] { Constant [ integer LIBMEMCACHED_VERSION_HEX ] { 16777240 } Constant [ integer OPT_COMPRESSION ] { -1001 } Constant [ integer OPT_COMPRESSION_TYPE ] { -1004 } Constant [ integer OPT_PREFIX_KEY ] { -1002 } Constant [ integer OPT_SERIALIZER ] { -1003 } + Constant [ integer OPT_USER_FLAGS ] { -1006 } Constant [ integer OPT_STORE_RETRY_COUNT ] { -1005 } - Constant [ integer HAVE_IGBINARY ] { 1 } - Constant [ integer HAVE_JSON ] { 1 } - Constant [ integer HAVE_MSGPACK ] { 1 } - Constant [ integer HAVE_SESSION ] { 1 } - Constant [ integer HAVE_SASL ] { 1 } + Constant [ boolean HAVE_IGBINARY ] { 1 } + Constant [ boolean HAVE_JSON ] { 1 } + Constant [ boolean HAVE_MSGPACK ] { 1 } + Constant [ boolean HAVE_SESSION ] { 1 } + Constant [ boolean HAVE_SASL ] { 1 } Constant [ integer OPT_HASH ] { 2 } Constant [ integer HASH_DEFAULT ] { 0 } Constant [ integer HASH_MD5 ] { 1 } @@ -162,6 +191,7 @@ Extension [ extension #156 memcached version 2.2.0 ] { Constant [ integer COMPRESSION_FASTLZ ] { 2 } Constant [ integer COMPRESSION_ZLIB ] { 1 } Constant [ integer GET_PRESERVE_ORDER ] { 1 } + Constant [ integer GET_EXTENDED ] { 2 } Constant [ integer ON_CONNECT ] { 0 } Constant [ integer ON_ADD ] { 1 } Constant [ integer ON_APPEND ] { 2 } @@ -228,43 +258,37 @@ Extension [ extension #156 memcached version 2.2.0 ] { Method [ public method get ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ $key ] Parameter #1 [ $cache_cb ] - Parameter #2 [ &$cas_token ] - Parameter #3 [ &$udf_flags ] + Parameter #2 [ $get_flags ] } } Method [ public method getByKey ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $server_key ] Parameter #1 [ $key ] Parameter #2 [ $cache_cb ] - Parameter #3 [ &$cas_token ] - Parameter #4 [ &$udf_flags ] + Parameter #3 [ $get_flags ] } } Method [ public method getMulti ] { - - Parameters [4] { + - Parameters [2] { Parameter #0 [ array $keys ] - Parameter #1 [ &$cas_tokens ] - Parameter #2 [ $flags ] - Parameter #3 [ &$udf_flags ] + Parameter #1 [ $get_flags ] } } Method [ public method getMultiByKey ] { - - Parameters [5] { + - Parameters [3] { Parameter #0 [ $server_key ] Parameter #1 [ array $keys ] - Parameter #2 [ &$cas_tokens ] - Parameter #3 [ $flags ] - Parameter #4 [ &$udf_flags ] + Parameter #2 [ $get_flags ] } } @@ -301,22 +325,20 @@ Extension [ extension #156 memcached version 2.2.0 ] { Method [ public method set ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ $key ] Parameter #1 [ $value ] Parameter #2 [ $expiration ] - Parameter #3 [ $udf_flags ] } } Method [ public method setByKey ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $server_key ] Parameter #1 [ $key ] Parameter #2 [ $value ] Parameter #3 [ $expiration ] - Parameter #4 [ $udf_flags ] } } @@ -339,64 +361,58 @@ Extension [ extension #156 memcached version 2.2.0 ] { Method [ public method setMulti ] { - - Parameters [3] { + - Parameters [2] { Parameter #0 [ array $items ] Parameter #1 [ $expiration ] - Parameter #2 [ $udf_flags ] } } Method [ public method setMultiByKey ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ $server_key ] Parameter #1 [ array $items ] Parameter #2 [ $expiration ] - Parameter #3 [ $udf_flags ] } } Method [ public method cas ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $cas_token ] Parameter #1 [ $key ] Parameter #2 [ $value ] Parameter #3 [ $expiration ] - Parameter #4 [ $udf_flags ] } } Method [ public method casByKey ] { - - Parameters [6] { + - Parameters [5] { Parameter #0 [ $cas_token ] Parameter #1 [ $server_key ] Parameter #2 [ $key ] Parameter #3 [ $value ] Parameter #4 [ $expiration ] - Parameter #5 [ $udf_flags ] } } Method [ public method add ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ $key ] Parameter #1 [ $value ] Parameter #2 [ $expiration ] - Parameter #3 [ $udf_flags ] } } Method [ public method addByKey ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $server_key ] Parameter #1 [ $key ] Parameter #2 [ $value ] Parameter #3 [ $expiration ] - Parameter #4 [ $udf_flags ] } } @@ -440,22 +456,20 @@ Extension [ extension #156 memcached version 2.2.0 ] { Method [ public method replace ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ $key ] Parameter #1 [ $value ] Parameter #2 [ $expiration ] - Parameter #3 [ $udf_flags ] } } Method [ public method replaceByKey ] { - - Parameters [5] { + - Parameters [4] { Parameter #0 [ $server_key ] Parameter #1 [ $key ] Parameter #2 [ $value ] Parameter #3 [ $expiration ] - Parameter #4 [ $udf_flags ] } } @@ -608,7 +622,8 @@ Extension [ extension #156 memcached version 2.2.0 ] { Method [ public method getStats ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $args ] } } @@ -707,7 +722,7 @@ Extension [ extension #156 memcached version 2.2.0 ] { } } - Class [ class MemcachedException extends RuntimeException ] { + Class [ class MemcachedException extends RuntimeException implements Throwable ] { - Constants [0] { } @@ -725,7 +740,7 @@ Extension [ extension #156 memcached version 2.2.0 ] { Property [ protected $line ] } - - Methods [9] { + - Methods [10] { Method [ public method __construct ] { - Parameters [3] { @@ -735,28 +750,31 @@ Extension [ extension #156 memcached version 2.2.0 ] { } } - Method [ final public method getMessage ] { + Method [ public method __wakeup ] { + } + + Method [ final public method getMessage ] { } - Method [ final public method getCode ] { + Method [ final public method getCode ] { } - Method [ final public method getFile ] { + Method [ final public method getFile ] { } - Method [ final public method getLine ] { + Method [ final public method getLine ] { } - Method [ final public method getTrace ] { + Method [ final public method getTrace ] { } - Method [ final public method getPrevious ] { + Method [ final public method getPrevious ] { } - Method [ final public method getTraceAsString ] { + Method [ final public method getTraceAsString ] { } - Method [ public method __toString ] { + Method [ public method __toString ] { } } } diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index 1be81da..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,783 +0,0 @@ -Extension [ extension #167 memcached version 3.0.3 ] { - - - Dependencies { - Dependency [ session (Required) ] - Dependency [ igbinary (Required) ] - Dependency [ msgpack (Required) ] - Dependency [ spl (Required) ] - } - - - INI { - Entry [ memcached.sess_locking ] - Current = '1' - } - Entry [ memcached.sess_lock_wait_min ] - Current = '1000' - } - Entry [ memcached.sess_lock_wait_max ] - Current = '2000' - } - Entry [ memcached.sess_lock_retries ] - Current = '5' - } - Entry [ memcached.sess_lock_expire ] - Current = '0' - } - Entry [ memcached.sess_binary_protocol ] - Current = '1' - } - Entry [ memcached.sess_consistent_hash ] - Current = '1' - } - Entry [ memcached.sess_number_of_replicas ] - Current = '0' - } - Entry [ memcached.sess_randomize_replica_read ] - Current = '' - } - Entry [ memcached.sess_remove_failed_servers ] - Current = '' - } - Entry [ memcached.sess_server_failure_limit ] - Current = '0' - } - Entry [ memcached.sess_connect_timeout ] - Current = '1000' - } - Entry [ memcached.sess_sasl_username ] - Current = '' - } - Entry [ memcached.sess_sasl_password ] - Current = '' - } - Entry [ memcached.sess_prefix ] - Current = 'memc.sess.key.' - } - Entry [ memcached.sess_persistent ] - Current = '' - } - Entry [ memcached.sess_lock_wait ] - Current = 'not set' - } - Entry [ memcached.sess_lock_max_wait ] - Current = 'not set' - } - Entry [ memcached.compression_type ] - Current = 'fastlz' - } - Entry [ memcached.compression_factor ] - Current = '1.3' - } - Entry [ memcached.compression_threshold ] - Current = '2000' - } - Entry [ memcached.serializer ] - Current = 'igbinary' - } - Entry [ memcached.store_retry_count ] - Current = '2' - } - Entry [ memcached.default_consistent_hash ] - Current = '' - } - Entry [ memcached.default_binary_protocol ] - Current = '' - } - Entry [ memcached.default_connect_timeout ] - Current = '0' - } - } - - - Classes [3] { - Class [ class Memcached ] { - - - Constants [132] { - Constant [ integer LIBMEMCACHED_VERSION_HEX ] { 16777240 } - Constant [ integer OPT_COMPRESSION ] { -1001 } - Constant [ integer OPT_COMPRESSION_TYPE ] { -1004 } - Constant [ integer OPT_PREFIX_KEY ] { -1002 } - Constant [ integer OPT_SERIALIZER ] { -1003 } - Constant [ integer OPT_USER_FLAGS ] { -1006 } - Constant [ integer OPT_STORE_RETRY_COUNT ] { -1005 } - Constant [ boolean HAVE_IGBINARY ] { 1 } - Constant [ boolean HAVE_JSON ] { 1 } - Constant [ boolean HAVE_MSGPACK ] { 1 } - Constant [ boolean HAVE_SESSION ] { 1 } - Constant [ boolean HAVE_SASL ] { 1 } - Constant [ integer OPT_HASH ] { 2 } - Constant [ integer HASH_DEFAULT ] { 0 } - Constant [ integer HASH_MD5 ] { 1 } - Constant [ integer HASH_CRC ] { 2 } - Constant [ integer HASH_FNV1_64 ] { 3 } - Constant [ integer HASH_FNV1A_64 ] { 4 } - Constant [ integer HASH_FNV1_32 ] { 5 } - Constant [ integer HASH_FNV1A_32 ] { 6 } - Constant [ integer HASH_HSIEH ] { 7 } - Constant [ integer HASH_MURMUR ] { 8 } - Constant [ integer OPT_DISTRIBUTION ] { 9 } - Constant [ integer DISTRIBUTION_MODULA ] { 0 } - Constant [ integer DISTRIBUTION_CONSISTENT ] { 1 } - Constant [ integer DISTRIBUTION_VIRTUAL_BUCKET ] { 6 } - Constant [ integer OPT_LIBKETAMA_COMPATIBLE ] { 16 } - Constant [ integer OPT_LIBKETAMA_HASH ] { 17 } - Constant [ integer OPT_TCP_KEEPALIVE ] { 32 } - Constant [ integer OPT_BUFFER_WRITES ] { 10 } - Constant [ integer OPT_BINARY_PROTOCOL ] { 18 } - Constant [ integer OPT_NO_BLOCK ] { 0 } - Constant [ integer OPT_TCP_NODELAY ] { 1 } - Constant [ integer OPT_SOCKET_SEND_SIZE ] { 4 } - Constant [ integer OPT_SOCKET_RECV_SIZE ] { 5 } - Constant [ integer OPT_CONNECT_TIMEOUT ] { 14 } - Constant [ integer OPT_RETRY_TIMEOUT ] { 15 } - Constant [ integer OPT_DEAD_TIMEOUT ] { 36 } - Constant [ integer OPT_SEND_TIMEOUT ] { 19 } - Constant [ integer OPT_RECV_TIMEOUT ] { 20 } - Constant [ integer OPT_POLL_TIMEOUT ] { 8 } - Constant [ integer OPT_CACHE_LOOKUPS ] { 6 } - Constant [ integer OPT_SERVER_FAILURE_LIMIT ] { 21 } - Constant [ integer OPT_AUTO_EJECT_HOSTS ] { 28 } - Constant [ integer OPT_HASH_WITH_PREFIX_KEY ] { 25 } - Constant [ integer OPT_NOREPLY ] { 26 } - Constant [ integer OPT_SORT_HOSTS ] { 12 } - Constant [ integer OPT_VERIFY_KEY ] { 13 } - Constant [ integer OPT_USE_UDP ] { 27 } - Constant [ integer OPT_NUMBER_OF_REPLICAS ] { 29 } - Constant [ integer OPT_RANDOMIZE_REPLICA_READ ] { 30 } - Constant [ integer OPT_REMOVE_FAILED_SERVERS ] { 35 } - Constant [ integer OPT_SERVER_TIMEOUT_LIMIT ] { 37 } - Constant [ integer RES_SUCCESS ] { 0 } - Constant [ integer RES_FAILURE ] { 1 } - Constant [ integer RES_HOST_LOOKUP_FAILURE ] { 2 } - Constant [ integer RES_UNKNOWN_READ_FAILURE ] { 7 } - Constant [ integer RES_PROTOCOL_ERROR ] { 8 } - Constant [ integer RES_CLIENT_ERROR ] { 9 } - Constant [ integer RES_SERVER_ERROR ] { 10 } - Constant [ integer RES_WRITE_FAILURE ] { 5 } - Constant [ integer RES_DATA_EXISTS ] { 12 } - Constant [ integer RES_NOTSTORED ] { 14 } - Constant [ integer RES_NOTFOUND ] { 16 } - Constant [ integer RES_PARTIAL_READ ] { 18 } - Constant [ integer RES_SOME_ERRORS ] { 19 } - Constant [ integer RES_NO_SERVERS ] { 20 } - Constant [ integer RES_END ] { 21 } - Constant [ integer RES_ERRNO ] { 26 } - Constant [ integer RES_BUFFERED ] { 32 } - Constant [ integer RES_TIMEOUT ] { 31 } - Constant [ integer RES_BAD_KEY_PROVIDED ] { 33 } - Constant [ integer RES_STORED ] { 15 } - Constant [ integer RES_DELETED ] { 22 } - Constant [ integer RES_STAT ] { 24 } - Constant [ integer RES_ITEM ] { 25 } - Constant [ integer RES_NOT_SUPPORTED ] { 28 } - Constant [ integer RES_FETCH_NOTFINISHED ] { 30 } - Constant [ integer RES_SERVER_MARKED_DEAD ] { 35 } - Constant [ integer RES_UNKNOWN_STAT_KEY ] { 36 } - Constant [ integer RES_INVALID_HOST_PROTOCOL ] { 34 } - Constant [ integer RES_MEMORY_ALLOCATION_FAILURE ] { 17 } - Constant [ integer RES_CONNECTION_SOCKET_CREATE_FAILURE ] { 11 } - Constant [ integer RES_E2BIG ] { 37 } - Constant [ integer RES_KEY_TOO_BIG ] { 39 } - Constant [ integer RES_SERVER_TEMPORARILY_DISABLED ] { 47 } - Constant [ integer RES_SERVER_MEMORY_ALLOCATION_FAILURE ] { 48 } - Constant [ integer RES_AUTH_PROBLEM ] { 40 } - Constant [ integer RES_AUTH_FAILURE ] { 41 } - Constant [ integer RES_AUTH_CONTINUE ] { 42 } - Constant [ integer RES_PAYLOAD_FAILURE ] { -1001 } - Constant [ integer SERIALIZER_PHP ] { 1 } - Constant [ integer SERIALIZER_IGBINARY ] { 2 } - Constant [ integer SERIALIZER_JSON ] { 3 } - Constant [ integer SERIALIZER_JSON_ARRAY ] { 4 } - Constant [ integer SERIALIZER_MSGPACK ] { 5 } - Constant [ integer COMPRESSION_FASTLZ ] { 2 } - Constant [ integer COMPRESSION_ZLIB ] { 1 } - Constant [ integer GET_PRESERVE_ORDER ] { 1 } - Constant [ integer GET_EXTENDED ] { 2 } - Constant [ integer ON_CONNECT ] { 0 } - Constant [ integer ON_ADD ] { 1 } - Constant [ integer ON_APPEND ] { 2 } - Constant [ integer ON_DECREMENT ] { 3 } - Constant [ integer ON_DELETE ] { 4 } - Constant [ integer ON_FLUSH ] { 5 } - Constant [ integer ON_GET ] { 6 } - Constant [ integer ON_INCREMENT ] { 7 } - Constant [ integer ON_NOOP ] { 8 } - Constant [ integer ON_PREPEND ] { 9 } - Constant [ integer ON_QUIT ] { 10 } - Constant [ integer ON_REPLACE ] { 11 } - Constant [ integer ON_SET ] { 12 } - Constant [ integer ON_STAT ] { 13 } - Constant [ integer ON_VERSION ] { 14 } - Constant [ integer RESPONSE_SUCCESS ] { 0 } - Constant [ integer RESPONSE_KEY_ENOENT ] { 1 } - Constant [ integer RESPONSE_KEY_EEXISTS ] { 2 } - Constant [ integer RESPONSE_E2BIG ] { 3 } - Constant [ integer RESPONSE_EINVAL ] { 4 } - Constant [ integer RESPONSE_NOT_STORED ] { 5 } - Constant [ integer RESPONSE_DELTA_BADVAL ] { 6 } - Constant [ integer RESPONSE_NOT_MY_VBUCKET ] { 7 } - Constant [ integer RESPONSE_AUTH_ERROR ] { 32 } - Constant [ integer RESPONSE_AUTH_CONTINUE ] { 33 } - Constant [ integer RESPONSE_UNKNOWN_COMMAND ] { 129 } - Constant [ integer RESPONSE_ENOMEM ] { 130 } - Constant [ integer RESPONSE_NOT_SUPPORTED ] { 131 } - Constant [ integer RESPONSE_EINTERNAL ] { 132 } - Constant [ integer RESPONSE_EBUSY ] { 133 } - Constant [ integer RESPONSE_ETMPFAIL ] { 134 } - Constant [ boolean GET_ERROR_RETURN_VALUE ] { } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [57] { - Method [ public method __construct ] { - - - Parameters [2] { - Parameter #0 [ $persistent_id ] - Parameter #1 [ $callback ] - } - } - - Method [ public method getResultCode ] { - - - Parameters [0] { - } - } - - Method [ public method getResultMessage ] { - - - Parameters [0] { - } - } - - Method [ public method get ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $cache_cb ] - Parameter #2 [ $get_flags ] - } - } - - Method [ public method getByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $cache_cb ] - Parameter #3 [ $get_flags ] - } - } - - Method [ public method getMulti ] { - - - Parameters [2] { - Parameter #0 [ array $keys ] - Parameter #1 [ $get_flags ] - } - } - - Method [ public method getMultiByKey ] { - - - Parameters [3] { - Parameter #0 [ $server_key ] - Parameter #1 [ array $keys ] - Parameter #2 [ $get_flags ] - } - } - - Method [ public method getDelayed ] { - - - Parameters [3] { - Parameter #0 [ array $keys ] - Parameter #1 [ $with_cas ] - Parameter #2 [ $value_cb ] - } - } - - Method [ public method getDelayedByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ array $keys ] - Parameter #2 [ $with_cas ] - Parameter #3 [ $value_cb ] - } - } - - Method [ public method fetch ] { - - - Parameters [0] { - } - } - - Method [ public method fetchAll ] { - - - Parameters [0] { - } - } - - Method [ public method set ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method setByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method touch ] { - - - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $expiration ] - } - } - - Method [ public method touchByKey ] { - - - Parameters [3] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method setMulti ] { - - - Parameters [2] { - Parameter #0 [ array $items ] - Parameter #1 [ $expiration ] - } - } - - Method [ public method setMultiByKey ] { - - - Parameters [3] { - Parameter #0 [ $server_key ] - Parameter #1 [ array $items ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method cas ] { - - - Parameters [4] { - Parameter #0 [ $cas_token ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method casByKey ] { - - - Parameters [5] { - Parameter #0 [ $cas_token ] - Parameter #1 [ $server_key ] - Parameter #2 [ $key ] - Parameter #3 [ $value ] - Parameter #4 [ $expiration ] - } - } - - Method [ public method add ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method addByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method append ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method appendByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method prepend ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method prependByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method replace ] { - - - Parameters [3] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] - Parameter #2 [ $expiration ] - } - } - - Method [ public method replaceByKey ] { - - - Parameters [4] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $value ] - Parameter #3 [ $expiration ] - } - } - - Method [ public method delete ] { - - - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $time ] - } - } - - Method [ public method deleteMulti ] { - - - Parameters [2] { - Parameter #0 [ $keys ] - Parameter #1 [ $time ] - } - } - - Method [ public method deleteByKey ] { - - - Parameters [3] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $time ] - } - } - - Method [ public method deleteMultiByKey ] { - - - Parameters [3] { - Parameter #0 [ $server_key ] - Parameter #1 [ $keys ] - Parameter #2 [ $time ] - } - } - - Method [ public method increment ] { - - - Parameters [4] { - Parameter #0 [ $key ] - Parameter #1 [ $offset ] - Parameter #2 [ $initial_value ] - Parameter #3 [ $expiry ] - } - } - - Method [ public method decrement ] { - - - Parameters [4] { - Parameter #0 [ $key ] - Parameter #1 [ $offset ] - Parameter #2 [ $initial_value ] - Parameter #3 [ $expiry ] - } - } - - Method [ public method incrementByKey ] { - - - Parameters [5] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $offset ] - Parameter #3 [ $initial_value ] - Parameter #4 [ $expiry ] - } - } - - Method [ public method decrementByKey ] { - - - Parameters [5] { - Parameter #0 [ $server_key ] - Parameter #1 [ $key ] - Parameter #2 [ $offset ] - Parameter #3 [ $initial_value ] - Parameter #4 [ $expiry ] - } - } - - Method [ public method addServer ] { - - - Parameters [3] { - Parameter #0 [ $host ] - Parameter #1 [ $port ] - Parameter #2 [ $weight ] - } - } - - Method [ public method addServers ] { - - - Parameters [1] { - Parameter #0 [ array $servers ] - } - } - - Method [ public method getServerList ] { - - - Parameters [0] { - } - } - - Method [ public method getServerByKey ] { - - - Parameters [1] { - Parameter #0 [ $server_key ] - } - } - - Method [ public method resetServerList ] { - - - Parameters [0] { - } - } - - Method [ public method quit ] { - - - Parameters [0] { - } - } - - Method [ public method flushBuffers ] { - - - Parameters [0] { - } - } - - Method [ public method getLastErrorMessage ] { - - - Parameters [0] { - } - } - - Method [ public method getLastErrorCode ] { - - - Parameters [0] { - } - } - - Method [ public method getLastErrorErrno ] { - - - Parameters [0] { - } - } - - Method [ public method getLastDisconnectedServer ] { - - - Parameters [0] { - } - } - - Method [ public method getStats ] { - - - Parameters [1] { - Parameter #0 [ $args ] - } - } - - Method [ public method getVersion ] { - - - Parameters [0] { - } - } - - Method [ public method getAllKeys ] { - - - Parameters [0] { - } - } - - Method [ public method flush ] { - - - Parameters [1] { - Parameter #0 [ $delay ] - } - } - - Method [ public method getOption ] { - - - Parameters [1] { - Parameter #0 [ $option ] - } - } - - Method [ public method setOption ] { - - - Parameters [2] { - Parameter #0 [ $option ] - Parameter #1 [ $value ] - } - } - - Method [ public method setOptions ] { - - - Parameters [1] { - Parameter #0 [ $options ] - } - } - - Method [ public method setBucket ] { - - - Parameters [3] { - Parameter #0 [ $host_map ] - Parameter #1 [ $forward_map ] - Parameter #2 [ $replicas ] - } - } - - Method [ public method setSaslAuthData ] { - - - Parameters [2] { - Parameter #0 [ $username ] - Parameter #1 [ $password ] - } - } - - Method [ public method isPersistent ] { - - - Parameters [0] { - } - } - - Method [ public method isPristine ] { - - - Parameters [0] { - } - } - } - } - - Class [ class MemcachedServer ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [2] { - Method [ public method run ] { - } - - Method [ public method on ] { - } - } - } - - Class [ class MemcachedException extends RuntimeException implements Throwable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ protected $message ] - Property [ protected $code ] - Property [ protected $file ] - Property [ protected $line ] - } - - - Methods [10] { - Method [ public method __construct ] { - - - Parameters [3] { - Parameter #0 [ $message ] - Parameter #1 [ $code ] - Parameter #2 [ $previous ] - } - } - - Method [ public method __wakeup ] { - } - - Method [ final public method getMessage ] { - } - - Method [ final public method getCode ] { - } - - Method [ final public method getFile ] { - } - - Method [ final public method getLine ] { - } - - Method [ final public method getTrace ] { - } - - Method [ final public method getPrevious ] { - } - - Method [ final public method getTraceAsString ] { - } - - Method [ public method __toString ] { - } - } - } - } -} - diff --git a/memcached-fastlz.patch b/memcached-fastlz.patch deleted file mode 100644 index 794b51a..0000000 --- a/memcached-fastlz.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ada08ebfe056514f9e67d84ec7690a8bb5987fc1 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 5 Sep 2014 19:42:54 +0200 -Subject: [PATCH] allow to use system FastLZ - ---- - config.m4 | 21 ++++++++++++++++++--- - php_memcached.c | 5 ++++- - 2 files changed, 22 insertions(+), 4 deletions(-) - -diff --git a/config.m4 b/config.m4 -index b484f29..94a0e7d 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -26,6 +26,9 @@ PHP_ARG_ENABLE(memcached-sasl, whether to enable memcached sasl support, - PHP_ARG_ENABLE(memcached-protocol, whether to enable memcached protocol support, - [ --enable-memcached-protocol Enable memcached protocoll support], no, no) - -+PHP_ARG_WITH(system-fastlz, wheter to use system FastLZ bibrary, -+[ --with-system-fastlz Use system FastLZ bibrary], no, no) -+ - if test -z "$PHP_ZLIB_DIR"; then - PHP_ARG_WITH(zlib-dir, for ZLIB, - [ --with-zlib-dir[=DIR] Set the path to ZLIB install prefix.], no) -@@ -336,7 +339,17 @@ if test "$PHP_MEMCACHED" != "no"; then - AC_MSG_RESULT([no]) - fi - -- PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c fastlz/fastlz.c g_fmt.c" -+ PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c g_fmt.c" -+ -+ if test "$PHP_SYSTEM_FASTLZ" != "no"; then -+ AC_CHECK_HEADERS([fastlz.h], [ac_cv_have_fastlz="yes"], [ac_cv_have_fastlz="no"]) -+ PHP_CHECK_LIBRARY(fastlz, fastlz_compress, -+ [PHP_ADD_LIBRARY(fastlz, 1, MEMCACHED_SHARED_LIBADD)], -+ [AC_MSG_ERROR(FastLZ library not found)]) -+ else -+ ac_cv_have_fastlz="no" -+ PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} fastlz/fastlz.c" -+ fi - - if test "$PHP_MEMCACHED_SESSION" != "no"; then - PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_session.c" -@@ -390,8 +403,10 @@ if test "$PHP_MEMCACHED" != "no"; then - PHP_SUBST(MEMCACHED_SHARED_LIBADD) - - PHP_NEW_EXTENSION(memcached, $PHP_MEMCACHED_FILES, $ext_shared,,$SESSION_INCLUDES $IGBINARY_INCLUDES $LIBEVENT_INCLUDES $MSGPACK_INCLUDES) -- PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1) -- -+ if test "ac_cv_have_fastlz" != "yes"; then -+ PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1) -+ fi -+ - ifdef([PHP_ADD_EXTENSION_DEP], - [ - PHP_ADD_EXTENSION_DEP(memcached, spl, true) -diff --git a/php_memcached.c b/php_memcached.c -index b21ecd4..2bd39d1 100644 ---- a/php_memcached.c -+++ b/php_memcached.c -@@ -30,8 +30,11 @@ - #ifdef HAVE_MEMCACHED_SESSION - # include "php_memcached_session.h" - #endif -- -+#ifdef HAVE_FASTLZ_H -+#include -+#else - #include "fastlz/fastlz.h" -+#endif - #include - - #ifdef HAVE_JSON_API diff --git a/php-pecl-memcached-php7.spec b/php-pecl-memcached-php7.spec deleted file mode 100644 index 7c235bc..0000000 --- a/php-pecl-memcached-php7.spec +++ /dev/null @@ -1,539 +0,0 @@ -# remirepo spec file for php-pecl-memcached -# With SCL compatibility, from: -# -# Fedora spec file for php-pecl-memcached -# -# Copyright (c) 2009-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-memcached -%else -%global _root_prefix %{_prefix} -%endif - -%global with_fastlz 1 -%global with_igbin 1 -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global with_tests 0%{!?_without_tests:1} -%global pecl_name memcached -# After 40-igbinary, 40-json, 40-msgpack -%global ini_name 50-%{pecl_name}.ini - -Summary: Extension to work with the Memcached caching daemon -Name: %{?sub_prefix}php-pecl-memcached -Version: 3.0.3 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/%{pecl_name} - -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz - -BuildRequires: %{?scl_prefix}php-devel >= 7 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: %{?scl_prefix}php-json -%if %{with_igbin} -BuildRequires: %{?sub_prefix}php-pecl-igbinary-devel -%endif -%ifnarch ppc64 -BuildRequires: %{?sub_prefix}php-pecl-msgpack-devel -%endif -BuildRequires: zlib-devel -BuildRequires: cyrus-sasl-devel -%if %{with_fastlz} -BuildRequires: fastlz-devel -%endif -%if %{with_tests} -BuildRequires: memcached -%endif - -BuildRequires: libevent-devel >= 2.0.2 -# To ensure use of libmemcached-last for --enable-memcached-protocol -BuildRequires: libmemcached-devel >= 1.0.16 - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -Requires: %{?scl_prefix}php-json%{?_isa} -%if %{with_igbin} -Requires: %{?sub_prefix}php-pecl-igbinary%{?_isa} -%endif -%ifnarch ppc64 -Requires: %{?sub_prefix}php-pecl-msgpack%{?_isa} -%endif -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_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} -%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} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif -%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 private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -This extension uses libmemcached library to provide API for communicating -with memcached servers. - -memcached is a high-performance, distributed memory object caching system, -generic in nature, but intended for use in speeding up dynamic web -applications by alleviating database load. - -It also provides a session handler (memcached). - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%setup -c -q -mv %{pecl_name}-%{version} NTS - -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ - -i package.xml - -cd NTS - -%if %{with_fastlz} -rm -r fastlz -sed -e '/name=.fastlz/d' -i ../package.xml -%endif - -# Check version as upstream often forget to update this -extver=$(sed -n '/#define PHP_MEMCACHED_VERSION/{s/.* "//;s/".*$//;p}' php_memcached.h) -if test "x${extver}" != "x%{version}%{?gh_date:-dev}%{?intver}"; then - : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. - : Update the pdover macro and rebuild. - exit 1 -fi -cd .. - -cat > %{ini_name} << 'EOF' -; Enable %{pecl_name} extension module -extension=%{pecl_name}.so - -; ----- Options to use the memcached session handler - -; RPM note : save_handler and save_path are defined -; for mod_php, in /etc/httpd/conf.d/php.conf -; for php-fpm, in %{_sysconfdir}/php-fpm.d/*conf - -; Use memcache as a session handler -;session.save_handler=memcached -; Defines a comma separated list of server urls to use for session storage -;session.save_path="localhost:11211" - -; ----- Configuration options -; http://php.net/manual/en/memcached.configuration.php - -EOF - -# default options with description from upstream -cat NTS/memcached.ini >>%{ini_name} - -%if %{with_zts} -cp -r NTS ZTS -%endif - - -%build -%{?dtsenable} - -# only needed for SCL -export PKG_CONFIG_PATH=%{_libdir}/pkgconfig - -peclconf() { -%configure \ -%if %{with_igbin} - --enable-memcached-igbinary \ -%endif - --enable-memcached-json \ - --enable-memcached-sasl \ -%ifnarch ppc64 - --enable-memcached-msgpack \ -%endif -%if 0 - --disable-memcached-protocol \ -%else - --enable-memcached-protocol \ -%endif -%if %{with_fastlz} - --with-system-fastlz \ -%endif - --with-php-config=$1 -} -cd NTS -%{_bindir}/phpize -peclconf %{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -peclconf %{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -%{?dtsenable} - -# Install the NTS extension -make install -C NTS INSTALL_ROOT=%{buildroot} - -# Drop in the bit of configuration -# rename to z-memcached to be load after msgpack -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -# Install the ZTS extension -%if %{with_zts} -make install -C ZTS INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Documentation -cd NTS -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 - - -%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 - - -%check -OPT="-n" -[ -f %{php_extdir}/igbinary.so ] && OPT="$OPT -d extension=igbinary.so" -[ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" -[ -f %{php_extdir}/msgpack.so ] && OPT="$OPT -d extension=msgpack.so" - -: Minimal load test for NTS extension -%{__php} $OPT \ - -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -%if %{with_zts} -: Minimal load test for ZTS extension -%{__ztsphp} $OPT \ - -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} -%endif - -%if %{with_tests} -# XFAIL and very slow so no value -rm ?TS/tests/expire.phpt - -ret=0 - -: Launch the Memcached service -port=$(%{__php} -r 'echo 10000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE;') -memcached -p $port -U $port -d -P $PWD/memcached.pid -sed -e "s/11211/$port/" -i ?TS/tests/* - -: Run the upstream test Suite for NTS extension -pushd NTS -rm tests/flush_buffers.phpt tests/touch_binary.phpt -TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff || ret=1 -popd - -%if %{with_zts} -: Run the upstream test Suite for ZTS extension -pushd ZTS -rm tests/flush_buffers.phpt tests/touch_binary.phpt -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff || ret=1 -popd -%endif - -# Cleanup -if [ -f memcached.pid ]; then - kill $(cat memcached.pid) -fi - -exit $ret -%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 - - -%changelog -* Mon Feb 20 2017 Remi Collet - 3.0.3-1 -- update to 3.0.3 (php 7, stable) -- build with --enable-memcached-protocol option - -* Mon Feb 13 2017 Remi Collet - 3.0.2-1 -- update to 3.0.2 (php 7, stable) - -* Thu Feb 9 2017 Remi Collet - 3.0.1-3 -- test build for https://github.com/php-memcached-dev/php-memcached/pull/320 - -* Thu Feb 9 2017 Remi Collet - 3.0.1-2 -- switch to pecl sources -- enable test suite -- open https://github.com/php-memcached-dev/php-memcached/pull/319 - fix test suite for 32bits build - -* Tue Feb 7 2017 Remi Collet - 3.0.1-1 -- update to 3.0.1 (php 7, stable) - -* Fri Dec 9 2016 Remi Collet - 3.0.0-0.4.20161207gite65be32 -- refresh to more recent snapshot - -* Thu Dec 1 2016 Remi Collet - 3.0.0-0.3.20160217git6ace07d -- rebuild with PHP 7.1.0 GA - -* Wed Sep 14 2016 Remi Collet - 3.0.0-0.2.20160217git6ace07d -- rebuild for PHP 7.1 new API version - -* Thu Mar 3 2016 Remi Collet - 3.0.0-0.1.20160217git6ace07d -- update to 3.0.0-dev -- switch back to php-memcached-dev sources - -* Wed Mar 2 2016 Remi Collet - 2.2.1-0.2.20150628git3c79a97 -- add patch for igbinary, see - https://github.com/rlerdorf/php-memcached/pull/3 - -* Sun Jan 10 2016 Remi Collet - 2.2.1-0.1.20150628git3c79a97 -- bump version to 2.2.1-dev, stability=devel - -* Tue Oct 13 2015 Remi Collet - 2.2.0-11.20150628git3c79a97 -- rebuild for PHP 7.0.0RC5 new API version - -* Fri Sep 18 2015 Remi Collet - 2.2.0-10.20150628git3c79a97 -- F23 rebuild with rh_layout - -* Wed Jul 22 2015 Remi Collet - 2.2.0-9.20150628git3c79a97 -- rebuild against php 7.0.0beta2 - -* Wed Jul 8 2015 Remi Collet - 2.2.0-8.20150628git3c79a97 -- new snapshot - -* Sat Jun 27 2015 Remi Collet - 2.2.0-7.20150423git4187e22 -- switch sources from pecl to github -- temporarily use rlerdorf fork (php7 compatibility) -- disable igbinary -- open https://github.com/rlerdorf/php-memcached/pull/2 - msgpack - -* Tue Jun 23 2015 Remi Collet - 2.2.0-6 -- allow build against rh-php56 (as more-php56) -- don't install/register tests -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet - 2.2.0-5.1 -- Fedora 21 SCL mass rebuild - -* Fri Aug 29 2014 Remi Collet - 2.2.0-5 -- test build with system fastlz - -* Fri Aug 29 2014 Remi Collet - 2.2.0-4 -- improve SCL build - -* Wed Apr 9 2014 Remi Collet - 2.2.0-3 -- add numerical prefix to extension configuration file - -* Wed Apr 2 2014 Remi Collet - 2.2.0-2 -- add all ini options in configuration file (comments) - -* Wed Apr 2 2014 Remi Collet - 2.2.0-1 -- update to 2.2.0 (stable) -- msgpack not available for ppc64 - -* Wed Mar 19 2014 Remi Collet - 2.2.0-0.3.RC1 -- allow SCL build - -* Thu Mar 13 2014 Remi Collet - 2.2.0-0.2.RC1 -- update to 2.2.0RC1 (beta) - -* Mon Nov 25 2013 Remi Collet - 2.2.0-0.1.b1 -- update to 2.2.0b1 (beta) -- cleanups for Copr -- install doc in pecl doc_dir -- install tests in pecl test_dir (in devel) -- add dependency on pecl/msgpack -- add --with tests option to run upstream test suite during build - -* Fri Nov 15 2013 Remi Collet - 2.1.0-7 -- drop requires libmemcached >= build version - as this can also be libmemcached-last - -* Mon Nov 19 2012 Remi Collet - 2.1.0-6 -- requires libmemcached >= build version - -* Sat Nov 17 2012 Remi Collet - 2.1.0-5 -- rebuild for libmemcached 1.0.14 (with SASL) -- switch to upstream patch -- add patch to report about SASL support in phpinfo - -* Fri Oct 19 2012 Remi Collet - 2.1.0-4 -- improve comment in configuration about session. - -* Sat Sep 22 2012 Remi Collet - 2.1.0-3 -- rebuild for new libmemcached -- drop sasl support - -* Sat Sep 8 2012 Remi Collet - 2.1.0-2 -- sync with rawhide, cleanups -- Obsoletes php53*, php54* on EL - -* Tue Aug 07 2012 Remi Collet - 2.1.0-1 -- update to 2.1.0 -- add patch to lower libmemcached required version - -* Sun Apr 22 2012 Remi Collet - 2.0.1-6 -- rebuild for libmemcached 1.0.6 (with SASL) and php 5.4 - -* Sun Apr 22 2012 Remi Collet - 2.0.1-5 -- rebuild for libmemcached 1.0.6 (with SASL) and php 5.3 - -* Sat Apr 21 2012 Remi Collet - 2.0.1-4 -- rebuild for libmemcached 1.0.6 and php 5.4 - -* Sat Apr 21 2012 Remi Collet - 2.0.1-3 -- rebuild for libmemcached 1.0.6 and php 5.3 - -* Sat Mar 03 2012 Remi Collet - 2.0.1-2 -- update to 2.0.1 for PHP 5.4 - -* Sat Mar 03 2012 Remi Collet - 2.0.1-1 -- update to 2.0.1 for PHP 5.3 - -* Sat Mar 03 2012 Remi Collet - 2.0.0-2 -- update to 2.0.0 for PHP 5.4 - -* Sat Mar 03 2012 Remi Collet - 2.0.0-1 -- update to 2.0.0 for PHP 5.3 - -* Wed Nov 16 2011 Remi Collet - 2.0.0-0.1.1736623 -- update to git snapshot (post 2.0.0b2) for php 5.4 build - -* Sun Oct 16 2011 Remi Collet - 1.0.2-10 -- rebuild against latest libmemcached (f16 only) - -* Tue Oct 04 2011 Remi Collet - 1.0.2-9 -- ZTS extension - -* Sat Sep 17 2011 Remi Collet - 1.0.2-8 -- allow relocation -- work for ZTS (not yet ok) - -* Sat Sep 17 2011 Remi Collet - 1.0.2-7 -- rebuild against libmemcached 0.52 -- adapted filter -- clean spec - -* Thu Jun 02 2011 Remi Collet - 1.0.2-6 -- rebuild against libmemcached 0.49 - -* Sat Feb 19 2011 Remi Collet - 1.0.2-3.2 -- rebuild for remi repo with SASL for fedora <= 10 and EL <= 5 - -* Sat Oct 02 2010 Remi Collet - 1.0.2-3.1 -- remove patch - -* Fri Oct 01 2010 Remi Collet - 1.0.2-3 -- rebuild against libmemcached 0.44 with SASL support - -* Wed Sep 29 2010 Remi Collet - 1.0.2-2 -- rebuild with igbinary support - -* Tue May 04 2010 Remi Collet - 1.0.2-1 -- update to 1.0.2 for libmemcached 0.40 - -* Sat Mar 13 2010 Remi Collet - 1.0.1-1 -- update to 1.0.1 for libmemcached 0.38 - -* Sun Feb 07 2010 Remi Collet - 1.0.0-3.1 -- bump release - -* Sat Feb 06 2010 Remi Collet - 1.0.0-3 -- rebuilt against new libmemcached -- add minimal %%check - -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Jul 12 2009 Remi Collet - 1.0.0-1 -- Update to 1.0.0 (First stable release) - -* Sat Jun 27 2009 Remi Collet - 0.2.0-1 -- Update to 0.2.0 + Patch for HAVE_JSON constant - -* Wed Apr 29 2009 Remi Collet - 0.1.5-1 -- Initial RPM - diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index d36f1e8..7c235bc 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -10,49 +10,36 @@ # 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-memcached %else %global _root_prefix %{_prefix} %endif %global with_fastlz 1 -%global with_zts 0%{?__ztsphp:1} -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%global with_igbin 1 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global with_tests 0%{!?_without_tests:1} %global pecl_name memcached -#global prever RC1 -#global intver rc1 -%if "%{php_version}" < "5.6" -# After igbinary, json, msgpack -%global ini_name z-%{pecl_name}.ini -%else # After 40-igbinary, 40-json, 40-msgpack -%global ini_name 50-%{pecl_name}.ini -%endif +%global ini_name 50-%{pecl_name}.ini Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached -Version: 2.2.0 -Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.0.3 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz - -# https://github.com/php-memcached-dev/php-memcached/pull/151 -Patch0: %{pecl_name}-fastlz.patch +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# 5.2.10 required to HAVE_JSON enabled -BuildRequires: %{?scl_prefix}php-devel >= 5.2.10 +BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json +%if %{with_igbin} BuildRequires: %{?sub_prefix}php-pecl-igbinary-devel +%endif %ifnarch ppc64 BuildRequires: %{?sub_prefix}php-pecl-msgpack-devel %endif @@ -65,32 +52,16 @@ BuildRequires: fastlz-devel BuildRequires: memcached %endif -%if 0%{?scl:1} && 0%{?fedora} < 15 && 0%{?rhel} < 7 && "%{?scl_vendor}" != "remi" -# Filter in the SCL collection -%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so} -# libvent from SCL as not available in system -BuildRequires: %{?sub_prefix}libevent-devel > 2 -Requires: %{?sub_prefix}libevent%{_isa} > 2 -BuildRequires: %{?sub_prefix}libmemcached-devel > 1 -Requires: %{?sub_prefix}libmemcached-libs%{_isa} > 1 -%if %{with_fastlz} -Requires: fastlz%{_isa} -%endif -Requires: cyrus-sasl-lib%{_isa} -%else BuildRequires: libevent-devel >= 2.0.2 -%if 0%{?rhel} == 5 -BuildRequires: libmemcached-devel > 1 -%else # To ensure use of libmemcached-last for --enable-memcached-protocol BuildRequires: libmemcached-devel >= 1.0.16 -%endif -%endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} +%if %{with_igbin} Requires: %{?sub_prefix}php-pecl-igbinary%{?_isa} +%endif %ifnarch ppc64 Requires: %{?sub_prefix}php-pecl-msgpack%{?_isa} %endif @@ -123,6 +94,10 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif +%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 @@ -147,8 +122,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -c -q - -mv %{pecl_name}-%{version}%{?prever} NTS +mv %{pecl_name}-%{version} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -156,17 +130,16 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .fastlz %if %{with_fastlz} rm -r fastlz -sed -e '/name="fastlz/d' -i ../package.xml +sed -e '/name=.fastlz/d' -i ../package.xml %endif # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_MEMCACHED_VERSION/{s/.* "//;s/".*$//;p}' php_memcached.h) -if test "x${extver}" != "x%{version}%{?intver}"; then - : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}. +if test "x${extver}" != "x%{version}%{?gh_date:-dev}%{?intver}"; then + : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. : Update the pdover macro and rebuild. exit 1 fi @@ -201,17 +174,22 @@ cp -r NTS ZTS %build +%{?dtsenable} + # only needed for SCL export PKG_CONFIG_PATH=%{_libdir}/pkgconfig peclconf() { -%configure --enable-memcached-igbinary \ +%configure \ +%if %{with_igbin} + --enable-memcached-igbinary \ +%endif --enable-memcached-json \ --enable-memcached-sasl \ %ifnarch ppc64 --enable-memcached-msgpack \ %endif -%if 0%{?rhel} == 5 +%if 0 --disable-memcached-protocol \ %else --enable-memcached-protocol \ @@ -235,6 +213,8 @@ make %{?_smp_mflags} %install +%{?dtsenable} + # Install the NTS extension make install -C NTS INSTALL_ROOT=%{buildroot} @@ -258,10 +238,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%clean -rm -rf %{buildroot} - - %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -301,10 +277,15 @@ OPT="-n" %endif %if %{with_tests} +# XFAIL and very slow so no value +rm ?TS/tests/expire.phpt + ret=0 : Launch the Memcached service -memcached -p 11211 -U 11211 -d -P $PWD/memcached.pid +port=$(%{__php} -r 'echo 10000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE;') +memcached -p $port -U $port -d -P $PWD/memcached.pid +sed -e "s/11211/$port/" -i ?TS/tests/* : Run the upstream test Suite for NTS extension pushd NTS @@ -313,7 +294,7 @@ TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php || ret=1 +%{__php} -n run-tests.php --show-diff || ret=1 popd %if %{with_zts} @@ -324,7 +305,7 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php || ret=1 +%{__ztsphp} -n run-tests.php --show-diff || ret=1 popd %endif @@ -338,7 +319,6 @@ exit $ret %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -353,15 +333,62 @@ exit $ret %changelog -* Tue Apr 12 2016 Remi Collet - 2.2.0-9 -- fix dependencies for more-php5* +* Mon Feb 20 2017 Remi Collet - 3.0.3-1 +- update to 3.0.3 (php 7, stable) +- build with --enable-memcached-protocol option + +* Mon Feb 13 2017 Remi Collet - 3.0.2-1 +- update to 3.0.2 (php 7, stable) + +* Thu Feb 9 2017 Remi Collet - 3.0.1-3 +- test build for https://github.com/php-memcached-dev/php-memcached/pull/320 + +* Thu Feb 9 2017 Remi Collet - 3.0.1-2 +- switch to pecl sources +- enable test suite +- open https://github.com/php-memcached-dev/php-memcached/pull/319 + fix test suite for 32bits build + +* Tue Feb 7 2017 Remi Collet - 3.0.1-1 +- update to 3.0.1 (php 7, stable) + +* Fri Dec 9 2016 Remi Collet - 3.0.0-0.4.20161207gite65be32 +- refresh to more recent snapshot + +* Thu Dec 1 2016 Remi Collet - 3.0.0-0.3.20160217git6ace07d +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet - 3.0.0-0.2.20160217git6ace07d +- rebuild for PHP 7.1 new API version + +* Thu Mar 3 2016 Remi Collet - 3.0.0-0.1.20160217git6ace07d +- update to 3.0.0-dev +- switch back to php-memcached-dev sources + +* Wed Mar 2 2016 Remi Collet - 2.2.1-0.2.20150628git3c79a97 +- add patch for igbinary, see + https://github.com/rlerdorf/php-memcached/pull/3 + +* Sun Jan 10 2016 Remi Collet - 2.2.1-0.1.20150628git3c79a97 +- bump version to 2.2.1-dev, stability=devel + +* Tue Oct 13 2015 Remi Collet - 2.2.0-11.20150628git3c79a97 +- rebuild for PHP 7.0.0RC5 new API version + +* Fri Sep 18 2015 Remi Collet - 2.2.0-10.20150628git3c79a97 +- F23 rebuild with rh_layout + +* Wed Jul 22 2015 Remi Collet - 2.2.0-9.20150628git3c79a97 +- rebuild against php 7.0.0beta2 -* Wed Mar 9 2016 Remi Collet - 2.2.0-8 -- adapt for F24 +* Wed Jul 8 2015 Remi Collet - 2.2.0-8.20150628git3c79a97 +- new snapshot -* Wed Aug 12 2015 Remi Collet - 2.2.0-7 -- add explicit dependency on fastlz for SCL on - https://www.softwarecollections.org/ +* Sat Jun 27 2015 Remi Collet - 2.2.0-7.20150423git4187e22 +- switch sources from pecl to github +- temporarily use rlerdorf fork (php7 compatibility) +- disable igbinary +- open https://github.com/rlerdorf/php-memcached/pull/2 - msgpack * Tue Jun 23 2015 Remi Collet - 2.2.0-6 - allow build against rh-php56 (as more-php56) -- cgit