8000 Fix mkdeb.sh script to create package to php 7.0 and 7.1 · phpredis/phpredis@6a791a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6a791a4

Browse files
eugene-nuwbereugene-nuwber
committed
Fix mkdeb.sh script to create package to php 7.0 and 7.1
1 parent 6e83c11 commit 6a791a4

File tree

9 files changed

+297
-105
lines changed

9 files changed

+297
-105
lines changed

‎debian.control

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎debian/changelog

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,167 @@
1+
phpredis 3.1.3
2+
3+
phpredis 3.1.2
4+
* RedisArray segfault fix [564ce3] (Pavlo Yatsukhnenko)
5+
* Small memory leak fix [645888b] (Mike Grunder)
6+
* Segfault fix when recreating RedisCluster objects [abf7d4] (Michael Grunder)
7+
* Fix for RedisCluster bulk response parsing [4121c4] (Alberto Fernández)
8+
* Re allow single array for sInterStore [6ef0c2, d01966] (Michael Grunder)
9+
* Better TravisCI integration [4fd2f6] (Pavlo Yatsukhnenko)
10+
11+
phpredis 3.1.1RC2
12+
* Additional test updates for 32 bit systems (@remicollet)
13+
* ARM rounding issue in tests (@remicollet)
14+
* Use new zend_list_close instead of zend_list_delete when reconnecting.
15+
* Refactoring of redis_boolean_response_impl and redis_sock_write (@yatsukhnenko)
16+
17+
phpredis 3.1.1.RC1
18+
19+
This release contains mostly fixes for issues introduced when merging
20+
the php 5 and 7 codebase into a single branch.
21+
22+
* Fixed a segfault in igbinary serialization (@yatsukhnenko)
23+
* Restore 2.2.8/3.0.0 functionality to distinguish between an error
24+
and simply empty session data. (@remicollet)
25+
* Fix double to string conversion function (@yatsukhnenko)
26+
* Use PHP_FE_END definition when available (@remicollet)
27+
* Fixed various 'static function declared but not used' warnings
28+
* Fixes to various calls which were typecasting pointers to the
29+
wrong size. (@remicollet)
30+
31+
* Added php session unit test (@yatsukhnenko)
32+
* Added explicit module dependancy for igbinary (@remicollet)
33+
* Added phpinfo serialization information (@remicollet)
34+
35+
phpredis 3.1.1RC1
36+
This release contains mostly fixes for issues introduced when merging
37+
the php 5 and 7 codebase into a single branch.
38+
39+
* Fixed a segfault in igbinary serialization (@yatsukhnenko)
40+
* Restore 2.2.8/3.0.0 functionality to distinguish between an error
41+
and simply empty session data. (@remicollet)
42+
* Fix double to string conversion function (@yatsukhnenko)
43+
* Use PHP_FE_END definition when available (@remicollet)
44+
* Fixed various 'static function declared but not used' warnings
45+
* Fixes to various calls which were typecasting pointers to the
46+
wrong size. (@remicollet)
47+
48+
* Added php session unit test (@yatsukhnenko)
49+
* Added explicit module dependancy for igbinary (@remicollet)
50+
* Added phpinfo serialization information (@remicollet)
51+
52+
phpredis 3.0.0
53+
54+
This version of phpredis supports cluster and is intended for php versions
55+
7.0.0 and higher. To compile cluster-enabled phpredis for older versions
56+
of php, please use the 2.2.8 pecl package.
57+
58+
A huge thanks goes out to Sean DuBois for doing all the work required to get
59+
phpredis working in php 7.0!
60+
61+
-- Improvements ---
62+
63+
* PHP 7 Support (Sean DuBois) [3159bd2, 567dc2f, daa4d9f, f2711e3, 9cb9d07,
64+
9d51c89, 9ff8f49, 33bb629, cbdf65a, f30b7fd, c687a51, 6b3e773, 2bf8241,
65+
771bd3d, 9221ca4, 4e00df6, e2407ca, 97fcfe6, 77e6200]
66+
* Redis Cluster support
67+
* Allow SINTERSTORE to take a single array argument again
68+
* IPv6 support
69+
70+
--- Fixes ---
71+
72+
* config.w32 fix (Jan-E) [495d308, c9e0b682]
73+
* Exception handling improvement (Jan-E) [314a2c3c]
74+
* Unit test fix for max int value (Jan-E) [659ea2aa]
75+
* unsigned long -> zend_ulong fix (Jan-E) [4d66e3d4]
76+
* Visual Stuio 14 fixes (Jan-E) [ea98401c]
77+
* Segfault fix when looking up our socket (ephemeralsnow) [0126481a]
78+
* Allow '-' and '+' in ZRANGEBYLEX (Patrick Pokatilo) [8bfa2188]
79+
* Documentation fixes (Ares) [54b9a0ec]
80+
* php7 related memory leak fix (Stuart Carnie) [b75bf3b4]
81+
* Potential segfault fix in cluster session (Sergei Lomakov) [661fb5b1]
82+
* php7 related serialization leak fix (Adam Harvey) [c40fc1d8]
83+
84+
phpredis 2.2.7
85+
86+
-- Improvements ---
87+
88+
* Implemented PFADD, PFMERGE, and PFCOUNT command handling
89+
* Implemented ZRANGEBYLEX command (holding off on ZREVRANGEBYLEX
90+
as that won't be out until 3.0)
91+
* Implemented getMode() so clients can detect whether we're in
92+
ATOMIC/MULTI/PIPELINE mode.
93+
* Implemented rawCommand() so clients can send arbitrary things to
94+
the redis server
95+
* Implemented DEBUG OBJECT (@michael-grunder, @isage)
96+
* Added/abide by connect timeout for RedisArray
97+
* Select to the last selected DB when phpredis reconnects
98+
99+
-- Fixes ---
100+
101+
* Fix a possible invalid free in _serialize
102+
* Added SAVE and BGSAVE to "distributable" commands for RedisArray
103+
* @welting -- Fixed invalid "argc" calculation re HLL commands
104+
* Allow clients to break out of the subscribe loop and return context.
105+
* Fixes a memory leak in SCAN when OPT_SCAN_RETRY id.
106+
* @remicollet -- Fix possible segfault when igbinary is enabled.
107+
* Add a couple of cases where we throw on an error (LOADING/NOAUTH/MASTERDOWN)
108+
* Fix several issues with serialization NARY
109+
* @itcom -- Fix missing TSRMLS_CC and a TSRMLS_DC/TSRMLS_CC typo
110+
111+
phpredis 2.2.5
112+
113+
This is a minor release with several bug fixes as well as additions to support
114+
new commands that have been introduced to Redis since our last release.
115+
116+
A special thanks to everyone who helps the project by commenting on issues and
117+
submitting pull requests! :)
118+
119+
[NEW] Support for the BITPOS command
120+
[NEW] Connection timeout option for RedisArray (@MikeToString)
121+
[NEW] A _serialize method, to complement our existing _unserialize method
122+
[NEW] Support for the PUBSUB command
123+
[NEW] Support for SCAN, SSCAN, HSCAN, and ZSCAN
124+
[NEW] Support for the WAIT command
125+
126+
[FIX] Handle the COPY and REPLACE arguments for the MIGRATE command
127+
128+
[DOC] Fix syntax error in documentation for the SET command (@mithunsatheesh)
129+
[DOC] Homebrew documentation instructions (@mathias)
130+
131+
phpredis 2.2.4
132+
133+
**
134+
** Features / Improvements
135+
**
136+
137+
* Randomized reconnect delay for RedisArray @mobli
138+
This feature adds an optional parameter when constructing a RedisArray object
139+
such that a random delay will be introduced if reconnections are made,
140+
mitigating any 'thundering herd' type problems.
141+
142+
* Lazy connections to RedisArray servers @mobli
143+
By default, RedisArray will attempt to connect to each server you pass in
144+
the ring on construction. This feature lets you specify that you would
145+
rather have RedisArray only attempt a connection when it needs to get data
146+
from a particular node (throughput/performance improvement).
147+
148+
* Allow LONG and STRING keys in MGET/MSET
149+
* Extended SET options for Redis >= 2.6.12
150+
* Persistent connections and UNIX SOCKET support for RedisArray
151+
* Allow aggregates for ZUNION/ZINTER without weights @mheijkoop
152+
* Support for SLOWLOG command
153+
* Reworked MGET algorithm to run in linear time regardless of key count.
154+
* Reworked ZINTERSTORE/ZUNIONSTORE algorithm to run in linear time
155+
156+
**
157+
** Bug fixes
158+
**
159+
160+
* C99 Compliance (or rather lack thereof) fix @mobli
161+
* Added ZEND_ACC_CTOR and ZEND_ACC_DTOR @euskadi31
162+
* Stop throwing and clearing an exception on connect failure @matmoi
163+
* Fix a false positive unit test failure having to do with TTL returns
164+
1165
php5-redis (2.2.2-1) unstable; urgency=low
2166

3167
* Non-maintainer upload.

‎debian/control

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
Source: php5-redis
1+
Package: php7.0-redis
2+
Version: 3.1.3
23
Section: web
34
Priority: optional
4-
Maintainer: Nicolas Favre-Felix <n.favre-felix@owlient.eu>
5-
Build-Depends: debhelper (>= 7), php5-dev
6-
Standards-Version: 3.8.0
7-
Homepage: https://github.com/nicolasff/phpredis
8-
9-
Package: php5-redis
10-
Architecture: any
11-
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php5:Depends}
12-
Recommends: php5
13-
Provides: php5-redis
5+
Architecture: all
6+
Essential: no
7+
Depends: php7.0-dev
8+
Build-Depends:
9+
Pre-Depends: php7.0-dev
10+
Recommends: php7.0
11+
Suggests:
12+
Installed-Size:
13+
Maintainer: Eugene Kirdzei [masterjus@gmail.com]
1414
Conflicts: phpredis
1515
Replaces: phpredis
16-
Description: Redis C extension for PHP5.
16+
Provides: php7.0-redis
17+
Description: Redis C extension for PHP7.0

‎debian/copyright

Lines changed: 68 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,68 @@
1-
This package was debianized by:
2-
3-
Simon Effenberg <savar@schuldeigen.de> on Mon, 22 Sep 2010 14:24:03 +0100
4-
5-
It was downloaded from:
6-
7-
http://github.com/owlient/phpredis
8-
9-
Upstream Author(s):
10-
11-
Nicolas Favre-Felix <n.favre-felix@owlient.eu>
12-
Nasreddine Bouafif <n.bouafif@owlient.eu>
13-
14-
Copyright:
15-
16-
<Copyright (C) YYYY Firtname Lastname>
17-
<likewise for another author>
18-
19-
License:
20-
21-
### SELECT: ###
22-
This package is free software; you can redistribute it and/or modify
23-
it under the terms of the GNU General Public License as published by
24-
the Free Software Foundation; either version 2 of the License, or
25-
(at your option) any later version.
26-
### OR ###
27-
This package is free software; you can redistribute it and/or modify
28-
it under the terms of the GNU General Public License version 2 as
29-
published by the Free Software Foundation.
30-
##########
31-
32-
This package is distributed in the hope that it will be useful,
33-
but WITHOUT ANY WARRANTY; without even the implied warranty of
34-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
35-
GNU General Public License for more details.
36-
37-
You should have received a copy of the GNU General Public License
38-
along with this package; if not, write to the Free Software
39-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
40-
41-
On Debian systems, the complete text of the GNU General
42-
Public License can be found in `/usr/share/common-licenses/GPL'.
43-
44-
The Debian packaging is:
45-
46-
Copyright C) 2010, Simon Effenberg <savar@schuldeigen.de>
47-
48-
and is licensed under the GPL, see above.
49-
50-
51-
# Please also look if there are files or directories which have a
52-
# different copyright/license attached and list them here.
53-
1+
--------------------------------------------------------------------
2+
The PHP License, version 3.01
3+
Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
4+
--------------------------------------------------------------------
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, is permitted provided that the following conditions
8+
are met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
18+
3. The name "PHP" must not be used to endorse or promote products
19+
derived from this software without prior written permission. For
20+
written permission, please contact group@php.net.
21+
22+
4. Products derived from this software may not be called "PHP", nor
23+
may "PHP" appear in their name, without prior written permission
24+
from group@php.net. You may indicate that your software works in
25+
conjunction with PHP by saying "Foo for PHP" instead of calling
26+
it "PHP Foo" or "phpfoo"
27+
28+
5. The PHP Group may publish revised and/or new versions of the
29+
license from time to time. Each version will be given a
30+
distinguishing version number.
31+
Once covered code has been published under a particular version
32+
of the license, you may always continue to use it under the terms
33+
of that version. You may also choose to use such covered code
34+
under the terms of any subsequent version of the license
35+
published by the PHP Group. No one other than the PHP Group has
36+
the right to modify the terms applicable to covered code created
37+
under this License.
38+
39+
6. Redistributions of any form whatsoever must retain the following
40+
acknowledgment:
41+
"This product includes PHP software, freely available from
42+
<http://www.php.net/software/>".
43+
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45+
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55+
OF THE POSSIBILITY OF SUCH DAMAGE.
56+
57+
--------------------------------------------------------------------
58+
59+
This software consists of voluntary contributions made by many
60+
individuals on behalf of the PHP Group.
61+
62+
The PHP Group can be contacted via Email at group@php.net.
63+
64+
For more information on the PHP Group and the PHP project,
65+
please see <http://www.php.net>.
66+
67+
PHP includes the Zend Engine, freely available at
68+
<http://www.zend.com>.

‎debian/postinst

100644100755
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ set -e
1717
# for details, see http://www.debian.org/doc/debian-policy/ or
1818
# the debian-policy package
1919

20+
PHP_VERSION=`php-config --version | cut -d'-' -f1 | cut -d"." -f1,2`
21+
2022
case "$1" in
2123
configure)
22-
cat > /etc/php5/conf.d/redis.ini <<EOF
24+
cat > /etc/php/$PHP_VERSION/mods-available/redis.ini <<EOF
2325
; uncomment the next line to enable the module
2426
extension=redis.so
2527
EOF
28+
phpenmod -v $PHP_VERSION redis
2629
;;
2730

2831
abort-upgrade|abort-remove|abort-deconfigure)

‎debian/postrm

100644100755
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ set -e
1818
# for details, see http://www.debian.org/doc/debian-policy/ or
1919
# the debian-policy package
2020

21+
PHP_VERSION=`php-config --version | cut -d'-' -f1 | cut -d"." -f1,2`
22+
2123
case "$1" in
2224
purge)
23-
if [ -e /etc/php5/conf.d/redis.ini ]; then
24-
rm -f /etc/php5/conf.d/redis.ini
25+
if [ -e /etc/php/$PHP_VERSION/mods-available/redis.ini ]; then
26+
phpdismod -v $PHP_VERSION redis
27+
rm -f /etc/php/$PHP_VERSION/mods-available/redis.ini
2528
fi
2629
;;
2730
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

0 commit comments

Comments
 (0)
0