Ubuntu
php-defaults package

Merge ~bryce/ubuntu/+source/php-defaults:7.4-transition into ubuntu/+source/php-defaults:ubuntu/focal-devel

  1. Git
  2. lp:~bryce/ubuntu/+source/php-defaults
  3. 7.4-transition
  4. Merge into ubuntu/focal-devel
Proposed by Bryce Harrington
Status: Rejected
Rejected by: Bryce Harrington
Proposed branch: ~bryce/ubuntu/+source/php-defaults:7.4-transition
Merge into: ubuntu/+source/php-defaults:ubuntu/focal-devel
Diff against target: 1000 lines (+403/-0) (has conflicts)
4 files modified
debian/changelog (+30/-0)
debian/control (+277/-0)
debian/rules (+5/-0)
php-maintscript-helper (+91/-0)
Conflict in debian/changelog
Conflict in debian/control
Conflict in debian/rules
Conflict in php-maintscript-helper
Reviewer Review Type Date Requested Status
Andreas Hasenack Needs Fixing
Canonical Server packageset reviewers Pending
Review via email: mp+379430@code.launchpad.net

Description of the change

This shows the changes for the php-defaults update for initiating the transition to php7.4.

This MP is just for review purposes. We haven't typically maintained php-defaults in git ubuntu, and since this is pulling from Debian's git repo, it's a bit different than our usual package merges.

Before this can land, php7.4 will need to finish migration, and be seeded into main. A spreadsheet with status of php dependencies is at:

https://docs.google.com/spreadsheets/d/11E6f6MTs0eTN-Nskap6iYT3l8QxTEuhYPlhy_z8Hd5s/edit#gid=1663657511

PPA for testing:

https://launchpad.net/~bryce/+archive/ubuntu/php7.4-transition

Bug report for tracking purposes is at:

https://bugs.launchpad.net/ubuntu/+source/php-defaults/+bug/1855020

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This has conflicts, and I also see a "~ppa1" in d/changelog

review: Needs Fixing
~bryce/ubuntu/+source/php-defaults:7.4-transition updated
5640be4... by Bryce Harrington

  * Transition supported PHP version to php7.3

93611a1... by Bryce Harrington

  * Revert default and supported PHP version to 7.2

507fda6... by Bryce Harrington

merge-changelogs

d69fb6e... by Bryce Harrington

reconstruct-changelog

c9eb96f... by Bryce Harrington

update-maintainer

a8a4c70... by Bryce Harrington

  * Drop support for PHP 7.3

0060cb7... by Bryce Harrington

changelog

Revision history for this message
Bryce Harrington (bryce) wrote :

Yeah, like I mentioned, this hasn't been maintained in git ubuntu previously, and is against Debian's upstream git repo. Thus the messy diff.

However, I think I might know how to make `git ubuntu merge` to work against arbitrary git repos like this. (Either it'll work and we can maintain php-defaults via git ubuntu, or it won't work and I'll have a devel task for git ubuntu.)

Revision history for this message
Bryce Harrington (bryce) wrote :

Not sure if this will update properly, but I've done a git ubuntu style merge using Debian's git repository as source.

Usual tags should be present, but please doublecheck.

I've also pushed the new package to the PPA as ~ppa2:
  https://launchpad.net/~bryce/+archive/ubuntu/php7.4-transition

Unmerged commits

0060cb7... by Bryce Harrington

changelog

a8a4c70... by Bryce Harrington

  * Drop support for PHP 7.3

c9eb96f... by Bryce Harrington

update-maintainer

d69fb6e... by Bryce Harrington

reconstruct-changelog

507fda6... by Bryce Harrington

merge-changelogs

5640be4... by Bryce Harrington

  * Transition supported PHP version to php7.3

93611a1... by Bryce Harrington

  * Revert default and supported PHP version to 7.2

5f1073c... by Ondřej Surý

Update changelog for 72 release

c3ef50b... by Ondřej Surý

Fix porting error that prevented PHP SAPIs to be restarted on upgrade

Thanks goes to Stefan Schlesinger, who debugged the issue and noticed the
apache2->php porting error where $rcd_action was tested, but never set,
thus effectively disabling dpkg-trigger.

67a973b... by Ondřej Surý

Update changelog for 71 release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 5863509..9af1a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
1<<<<<<< debian/changelog
2=======
3php-defaults (72ubuntu1) focal; urgency=medium
4
5 * Transition to PHP 7.4
6 - Drop previous Ubuntu migrations
7 - Merge with Debian's git repository
8 - Drop support for PHP 7.3
9
10 -- Bryce Harrington <bryce@canonical.com> Wed, 19 Feb 2020 19:41:22 +0000
11
12php-defaults (72) unstable; urgency=medium
13
14 * Fix porting error that prevented PHP SAPIs to be restarted on upgrade
15
16 -- Ondřej Surý <ondrej@debian.org> Wed, 22 Jan 2020 13:25:56 +0100
17
18php-defaults (71) unstable; urgency=medium
19
20 * Switch default PHP to 7.4
21
22 -- Ondřej Surý <ondrej@debian.org> Wed, 18 Dec 2019 15:06:21 +0100
23
24php-defaults (70) unstable; urgency=medium
25
26 * Start soft transition to PHP 7.4
27
28 -- Ondřej Surý <ondrej@sury.org> Wed, 14 Aug 2019 08:50:10 +0200
29
30>>>>>>> debian/changelog
1php-defaults (69ubuntu2) eoan; urgency=medium31php-defaults (69ubuntu2) eoan; urgency=medium
232
3 [ Bryce Harrington ]33 [ Bryce Harrington ]
diff --git a/debian/control b/debian/control
index a17eeae..1db1b00 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,11 @@ Vcs-Browser: https://salsa.debian.org/php-team/php-defaults
1313
14Package: libapache2-mod-php14Package: libapache2-mod-php
15Architecture: all15Architecture: all
16<<<<<<< debian/control
16Depends: libapache2-mod-php7.3,17Depends: libapache2-mod-php7.3,
18=======
19Depends: libapache2-mod-php7.4,
20>>>>>>> debian/control
17 ${misc:Depends}21 ${misc:Depends}
18Description: server-side, HTML-embedded scripting language (Apache 2 module) (default)22Description: server-side, HTML-embedded scripting language (Apache 2 module) (default)
19 This package provides the PHP module for the Apache 2 webserver.23 This package provides the PHP module for the Apache 2 webserver.
@@ -23,11 +27,19 @@ Description: server-side, HTML-embedded scripting language (Apache 2 module) (de
23 for web development and can be embedded into HTML.27 for web development and can be embedded into HTML.
24 .28 .
25 This package is a dependency package, which depends on latest stable29 This package is a dependency package, which depends on latest stable
30<<<<<<< debian/control
26 PHP version (currently 7.3).31 PHP version (currently 7.3).
2732
28Package: libphp-embed33Package: libphp-embed
29Architecture: all34Architecture: all
30Depends: libphp7.3-embed,35Depends: libphp7.3-embed,
36=======
37 PHP version (currently 7.4).
38
39Package: libphp-embed
40Architecture: all
41Depends: libphp7.4-embed,
42>>>>>>> debian/control
31 ${misc:Depends}43 ${misc:Depends}
32Description: HTML-embedded scripting language (Embedded SAPI library) (default)44Description: HTML-embedded scripting language (Embedded SAPI library) (default)
33 This package provides the library /usr/lib/libphp.so which can45 This package provides the library /usr/lib/libphp.so which can
@@ -38,11 +50,19 @@ Description: HTML-embedded scripting language (Embedded SAPI library) (default)
38 for web development and can be embedded into HTML.50 for web development and can be embedded into HTML.
39 .51 .
40 This package is a dependency package, which depends on latest stable52 This package is a dependency package, which depends on latest stable
53<<<<<<< debian/control
41 PHP version (currently 7.3).54 PHP version (currently 7.3).
4255
43Package: php56Package: php
44Architecture: all57Architecture: all
45Depends: php7.3,58Depends: php7.3,
59=======
60 PHP version (currently 7.4).
61
62Package: php
63Architecture: all
64Depends: php7.4,
65>>>>>>> debian/control
46 ${misc:Depends}66 ${misc:Depends}
47Description: server-side, HTML-embedded scripting language (default)67Description: server-side, HTML-embedded scripting language (default)
48 PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used68 PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
@@ -50,12 +70,21 @@ Description: server-side, HTML-embedded scripting language (default)
50 for web development and can be embedded into HTML.70 for web development and can be embedded into HTML.
51 .71 .
52 This package is a dependency package, which depends on latest stable72 This package is a dependency package, which depends on latest stable
73<<<<<<< debian/control
53 PHP version (currently 7.3).74 PHP version (currently 7.3).
5475
55Package: php-all-dev76Package: php-all-dev
56Architecture: all77Architecture: all
57Depends: php7.3-dev,78Depends: php7.3-dev,
58 php7.3-json,79 php7.3-json,
80=======
81 PHP version (currently 7.4).
82
83Package: php-all-dev
84Architecture: all
85Depends: php7.4-dev,
86 php7.4-json,
87>>>>>>> debian/control
59 ${misc:Depends}88 ${misc:Depends}
60Description: package depending on all supported PHP development packages89Description: package depending on all supported PHP development packages
61 This package is a dependency package used as a build dependency for other90 This package is a dependency package used as a build dependency for other
@@ -65,7 +94,11 @@ Description: package depending on all supported PHP development packages
65Package: php-bcmath94Package: php-bcmath
66Architecture: all95Architecture: all
67Depends: php-common,96Depends: php-common,
97<<<<<<< debian/control
68 php7.3-bcmath,98 php7.3-bcmath,
99=======
100 php7.4-bcmath,
101>>>>>>> debian/control
69 ${misc:Depends}102 ${misc:Depends}
70Description: Bcmath module for PHP [default]103Description: Bcmath module for PHP [default]
71 This package provides a Bcmath module for PHP.104 This package provides a Bcmath module for PHP.
@@ -75,12 +108,20 @@ Description: Bcmath module for PHP [default]
75 for web development and can be embedded into HTML.108 for web development and can be embedded into HTML.
76 .109 .
77 This package is a dependency package, which depends on Debian's default110 This package is a dependency package, which depends on Debian's default
111<<<<<<< debian/control
78 PHP version (currently 7.3).112 PHP version (currently 7.3).
113=======
114 PHP version (currently 7.4).
115>>>>>>> debian/control
79116
80Package: php-bz2117Package: php-bz2
81Architecture: all118Architecture: all
82Depends: php-common,119Depends: php-common,
120<<<<<<< debian/control
83 php7.3-bz2,121 php7.3-bz2,
122=======
123 php7.4-bz2,
124>>>>>>> debian/control
84 ${misc:Depends}125 ${misc:Depends}
85Description: bzip2 module for PHP [default]126Description: bzip2 module for PHP [default]
86 This package provides a bzip2 module for PHP.127 This package provides a bzip2 module for PHP.
@@ -90,11 +131,19 @@ Description: bzip2 module for PHP [default]
90 for web development and can be embedded into HTML.131 for web development and can be embedded into HTML.
91 .132 .
92 This package is a dependency package, which depends on Debian's default133 This package is a dependency package, which depends on Debian's default
134<<<<<<< debian/control
93 PHP version (currently 7.3).135 PHP version (currently 7.3).
94136
95Package: php-cgi137Package: php-cgi
96Architecture: all138Architecture: all
97Depends: php7.3-cgi,139Depends: php7.3-cgi,
140=======
141 PHP version (currently 7.4).
142
143Package: php-cgi
144Architecture: all
145Depends: php7.4-cgi,
146>>>>>>> debian/control
98 ${misc:Depends}147 ${misc:Depends}
99Description: server-side, HTML-embedded scripting language (CGI binary) (default)148Description: server-side, HTML-embedded scripting language (CGI binary) (default)
100 This package provides the /usr/lib/cgi-bin/php CGI interpreter built149 This package provides the /usr/lib/cgi-bin/php CGI interpreter built
@@ -107,11 +156,19 @@ Description: server-side, HTML-embedded scripting language (CGI binary) (default
107 for web development and can be embedded into HTML.156 for web development and can be embedded into HTML.
108 .157 .
109 This package is a dependency package, which depends on latest stable158 This package is a dependency package, which depends on latest stable
159<<<<<<< debian/control
110 PHP version (currently 7.3).160 PHP version (currently 7.3).
111161
112Package: php-cli162Package: php-cli
113Architecture: all163Architecture: all
114Depends: php7.3-cli,164Depends: php7.3-cli,
165=======
166 PHP version (currently 7.4).
167
168Package: php-cli
169Architecture: all
170Depends: php7.4-cli,
171>>>>>>> debian/control
115 ${misc:Depends}172 ${misc:Depends}
116Description: command-line interpreter for the PHP scripting language (default)173Description: command-line interpreter for the PHP scripting language (default)
117 This package provides the /usr/bin/php command interpreter, useful for174 This package provides the /usr/bin/php command interpreter, useful for
@@ -122,7 +179,11 @@ Description: command-line interpreter for the PHP scripting language (default)
122 for web development and can be embedded into HTML.179 for web development and can be embedded into HTML.
123 .180 .
124 This package is a dependency package, which depends on latest stable181 This package is a dependency package, which depends on latest stable
182<<<<<<< debian/control
125 PHP version (currently 7.3).183 PHP version (currently 7.3).
184=======
185 PHP version (currently 7.4).
186>>>>>>> debian/control
126187
127Package: php-common188Package: php-common
128Architecture: all189Architecture: all
@@ -165,7 +226,11 @@ Description: Common files for PHP packages
165Package: php-curl226Package: php-curl
166Architecture: all227Architecture: all
167Depends: php-common,228Depends: php-common,
229<<<<<<< debian/control
168 php7.3-curl,230 php7.3-curl,
231=======
232 php7.4-curl,
233>>>>>>> debian/control
169 ${misc:Depends}234 ${misc:Depends}
170Description: CURL module for PHP [default]235Description: CURL module for PHP [default]
171 This package provides a CURL module for PHP.236 This package provides a CURL module for PHP.
@@ -175,11 +240,19 @@ Description: CURL module for PHP [default]
175 for web development and can be embedded into HTML.240 for web development and can be embedded into HTML.
176 .241 .
177 This package is a dependency package, which depends on Debian's default242 This package is a dependency package, which depends on Debian's default
243<<<<<<< debian/control
178 PHP version (currently 7.3).244 PHP version (currently 7.3).
179245
180Package: php-dev246Package: php-dev
181Architecture: all247Architecture: all
182Depends: php7.3-dev,248Depends: php7.3-dev,
249=======
250 PHP version (currently 7.4).
251
252Package: php-dev
253Architecture: all
254Depends: php7.4-dev,
255>>>>>>> debian/control
183 ${misc:Depends}256 ${misc:Depends}
184Description: Files for PHP module development (default)257Description: Files for PHP module development (default)
185 Headers and other PHP needed for compiling additional modules.258 Headers and other PHP needed for compiling additional modules.
@@ -189,12 +262,20 @@ Description: Files for PHP module development (default)
189 for web development and can be embedded into HTML.262 for web development and can be embedded into HTML.
190 .263 .
191 This package is a dependency package, which depends on latest stable264 This package is a dependency package, which depends on latest stable
265<<<<<<< debian/control
192 PHP version (currently 7.3).266 PHP version (currently 7.3).
267=======
268 PHP version (currently 7.4).
269>>>>>>> debian/control
193270
194Package: php-enchant271Package: php-enchant
195Architecture: all272Architecture: all
196Depends: php-common,273Depends: php-common,
274<<<<<<< debian/control
197 php7.3-enchant,275 php7.3-enchant,
276=======
277 php7.4-enchant,
278>>>>>>> debian/control
198 ${misc:Depends}279 ${misc:Depends}
199Description: Enchant module for PHP [default]280Description: Enchant module for PHP [default]
200 This package provides a Enchant module for PHP.281 This package provides a Enchant module for PHP.
@@ -204,11 +285,19 @@ Description: Enchant module for PHP [default]
204 for web development and can be embedded into HTML.285 for web development and can be embedded into HTML.
205 .286 .
206 This package is a dependency package, which depends on Debian's default287 This package is a dependency package, which depends on Debian's default
288<<<<<<< debian/control
207 PHP version (currently 7.3).289 PHP version (currently 7.3).
208290
209Package: php-fpm291Package: php-fpm
210Architecture: all292Architecture: all
211Depends: php7.3-fpm,293Depends: php7.3-fpm,
294=======
295 PHP version (currently 7.4).
296
297Package: php-fpm
298Architecture: all
299Depends: php7.4-fpm,
300>>>>>>> debian/control
212 ${misc:Depends}301 ${misc:Depends}
213Description: server-side, HTML-embedded scripting language (FPM-CGI binary) (default)302Description: server-side, HTML-embedded scripting language (FPM-CGI binary) (default)
214 This package provides the Fast Process Manager interpreter that runs303 This package provides the Fast Process Manager interpreter that runs
@@ -219,12 +308,20 @@ Description: server-side, HTML-embedded scripting language (FPM-CGI binary) (def
219 for web development and can be embedded into HTML.308 for web development and can be embedded into HTML.
220 .309 .
221 This package is a dependency package, which depends on latest stable310 This package is a dependency package, which depends on latest stable
311<<<<<<< debian/control
222 PHP version (currently 7.3).312 PHP version (currently 7.3).
313=======
314 PHP version (currently 7.4).
315>>>>>>> debian/control
223316
224Package: php-gd317Package: php-gd
225Architecture: all318Architecture: all
226Depends: php-common,319Depends: php-common,
320<<<<<<< debian/control
227 php7.3-gd,321 php7.3-gd,
322=======
323 php7.4-gd,
324>>>>>>> debian/control
228 ${misc:Depends}325 ${misc:Depends}
229Description: GD module for PHP [default]326Description: GD module for PHP [default]
230 This package provides a GD module for PHP.327 This package provides a GD module for PHP.
@@ -234,12 +331,20 @@ Description: GD module for PHP [default]
234 for web development and can be embedded into HTML.331 for web development and can be embedded into HTML.
235 .332 .
236 This package is a dependency package, which depends on Debian's default333 This package is a dependency package, which depends on Debian's default
334<<<<<<< debian/control
237 PHP version (currently 7.3).335 PHP version (currently 7.3).
336=======
337 PHP version (currently 7.4).
338>>>>>>> debian/control
238339
239Package: php-gmp340Package: php-gmp
240Architecture: all341Architecture: all
241Depends: php-common,342Depends: php-common,
343<<<<<<< debian/control
242 php7.3-gmp,344 php7.3-gmp,
345=======
346 php7.4-gmp,
347>>>>>>> debian/control
243 ${misc:Depends}348 ${misc:Depends}
244Description: GMP module for PHP [default]349Description: GMP module for PHP [default]
245 This package provides a GMP module for PHP.350 This package provides a GMP module for PHP.
@@ -249,12 +354,20 @@ Description: GMP module for PHP [default]
249 for web development and can be embedded into HTML.354 for web development and can be embedded into HTML.
250 .355 .
251 This package is a dependency package, which depends on Debian's default356 This package is a dependency package, which depends on Debian's default
357<<<<<<< debian/control
252 PHP version (currently 7.3).358 PHP version (currently 7.3).
359=======
360 PHP version (currently 7.4).
361>>>>>>> debian/control
253362
254Package: php-imap363Package: php-imap
255Architecture: all364Architecture: all
256Depends: php-common,365Depends: php-common,
366<<<<<<< debian/control
257 php7.3-imap,367 php7.3-imap,
368=======
369 php7.4-imap,
370>>>>>>> debian/control
258 ${misc:Depends}371 ${misc:Depends}
259Description: IMAP module for PHP [default]372Description: IMAP module for PHP [default]
260 This package provides a IMAP module for PHP.373 This package provides a IMAP module for PHP.
@@ -264,12 +377,20 @@ Description: IMAP module for PHP [default]
264 for web development and can be embedded into HTML.377 for web development and can be embedded into HTML.
265 .378 .
266 This package is a dependency package, which depends on Debian's default379 This package is a dependency package, which depends on Debian's default
380<<<<<<< debian/control
267 PHP version (currently 7.3).381 PHP version (currently 7.3).
382=======
383 PHP version (currently 7.4).
384>>>>>>> debian/control
268385
269Package: php-interbase386Package: php-interbase
270Architecture: all387Architecture: all
271Depends: php-common,388Depends: php-common,
389<<<<<<< debian/control
272 php7.3-interbase,390 php7.3-interbase,
391=======
392 php7.4-interbase,
393>>>>>>> debian/control
273 ${misc:Depends}394 ${misc:Depends}
274Description: Interbase module for PHP [default]395Description: Interbase module for PHP [default]
275 This package provides a Interbase module for PHP.396 This package provides a Interbase module for PHP.
@@ -279,12 +400,20 @@ Description: Interbase module for PHP [default]
279 for web development and can be embedded into HTML.400 for web development and can be embedded into HTML.
280 .401 .
281 This package is a dependency package, which depends on Debian's default402 This package is a dependency package, which depends on Debian's default
403<<<<<<< debian/control
282 PHP version (currently 7.3).404 PHP version (currently 7.3).
405=======
406 PHP version (currently 7.4).
407>>>>>>> debian/control
283408
284Package: php-intl409Package: php-intl
285Architecture: all410Architecture: all
286Depends: php-common,411Depends: php-common,
412<<<<<<< debian/control
287 php7.3-intl,413 php7.3-intl,
414=======
415 php7.4-intl,
416>>>>>>> debian/control
288 ${misc:Depends}417 ${misc:Depends}
289Description: Internationalisation module for PHP [default]418Description: Internationalisation module for PHP [default]
290 This package provides a Internationalisation module for PHP.419 This package provides a Internationalisation module for PHP.
@@ -294,12 +423,20 @@ Description: Internationalisation module for PHP [default]
294 for web development and can be embedded into HTML.423 for web development and can be embedded into HTML.
295 .424 .
296 This package is a dependency package, which depends on Debian's default425 This package is a dependency package, which depends on Debian's default
426<<<<<<< debian/control
297 PHP version (currently 7.3).427 PHP version (currently 7.3).
428=======
429 PHP version (currently 7.4).
430>>>>>>> debian/control
298431
299Package: php-json432Package: php-json
300Architecture: all433Architecture: all
301Depends: php-common,434Depends: php-common,
435<<<<<<< debian/control
302 php7.3-json,436 php7.3-json,
437=======
438 php7.4-json,
439>>>>>>> debian/control
303 ${misc:Depends}440 ${misc:Depends}
304Description: JSON module for PHP [default]441Description: JSON module for PHP [default]
305 This package provides a JSON module for PHP.442 This package provides a JSON module for PHP.
@@ -309,12 +446,20 @@ Description: JSON module for PHP [default]
309 for web development and can be embedded into HTML.446 for web development and can be embedded into HTML.
310 .447 .
311 This package is a dependency package, which depends on Debian's default448 This package is a dependency package, which depends on Debian's default
449<<<<<<< debian/control
312 PHP version (currently 7.3).450 PHP version (currently 7.3).
451=======
452 PHP version (currently 7.4).
453>>>>>>> debian/control
313454
314Package: php-ldap455Package: php-ldap
315Architecture: all456Architecture: all
316Depends: php-common,457Depends: php-common,
458<<<<<<< debian/control
317 php7.3-ldap,459 php7.3-ldap,
460=======
461 php7.4-ldap,
462>>>>>>> debian/control
318 ${misc:Depends}463 ${misc:Depends}
319Description: LDAP module for PHP [default]464Description: LDAP module for PHP [default]
320 This package provides a LDAP module for PHP.465 This package provides a LDAP module for PHP.
@@ -324,12 +469,20 @@ Description: LDAP module for PHP [default]
324 for web development and can be embedded into HTML.469 for web development and can be embedded into HTML.
325 .470 .
326 This package is a dependency package, which depends on Debian's default471 This package is a dependency package, which depends on Debian's default
472<<<<<<< debian/control
327 PHP version (currently 7.3).473 PHP version (currently 7.3).
474=======
475 PHP version (currently 7.4).
476>>>>>>> debian/control
328477
329Package: php-mbstring478Package: php-mbstring
330Architecture: all479Architecture: all
331Depends: php-common,480Depends: php-common,
481<<<<<<< debian/control
332 php7.3-mbstring,482 php7.3-mbstring,
483=======
484 php7.4-mbstring,
485>>>>>>> debian/control
333 ${misc:Depends}486 ${misc:Depends}
334Description: MBSTRING module for PHP [default]487Description: MBSTRING module for PHP [default]
335 This package provides a MBSTRING module for PHP.488 This package provides a MBSTRING module for PHP.
@@ -339,12 +492,20 @@ Description: MBSTRING module for PHP [default]
339 for web development and can be embedded into HTML.492 for web development and can be embedded into HTML.
340 .493 .
341 This package is a dependency package, which depends on Debian's default494 This package is a dependency package, which depends on Debian's default
495<<<<<<< debian/control
342 PHP version (currently 7.3).496 PHP version (currently 7.3).
497=======
498 PHP version (currently 7.4).
499>>>>>>> debian/control
343500
344Package: php-mysql501Package: php-mysql
345Architecture: all502Architecture: all
346Depends: php-common,503Depends: php-common,
504<<<<<<< debian/control
347 php7.3-mysql,505 php7.3-mysql,
506=======
507 php7.4-mysql,
508>>>>>>> debian/control
348 ${misc:Depends}509 ${misc:Depends}
349Description: MySQL module for PHP [default]510Description: MySQL module for PHP [default]
350 This package provides a MySQL module for PHP.511 This package provides a MySQL module for PHP.
@@ -354,12 +515,20 @@ Description: MySQL module for PHP [default]
354 for web development and can be embedded into HTML.515 for web development and can be embedded into HTML.
355 .516 .
356 This package is a dependency package, which depends on Debian's default517 This package is a dependency package, which depends on Debian's default
518<<<<<<< debian/control
357 PHP version (currently 7.3).519 PHP version (currently 7.3).
520=======
521 PHP version (currently 7.4).
522>>>>>>> debian/control
358523
359Package: php-odbc524Package: php-odbc
360Architecture: all525Architecture: all
361Depends: php-common,526Depends: php-common,
527<<<<<<< debian/control
362 php7.3-odbc,528 php7.3-odbc,
529=======
530 php7.4-odbc,
531>>>>>>> debian/control
363 ${misc:Depends}532 ${misc:Depends}
364Description: ODBC module for PHP [default]533Description: ODBC module for PHP [default]
365 This package provides a ODBC module for PHP.534 This package provides a ODBC module for PHP.
@@ -369,12 +538,20 @@ Description: ODBC module for PHP [default]
369 for web development and can be embedded into HTML.538 for web development and can be embedded into HTML.
370 .539 .
371 This package is a dependency package, which depends on Debian's default540 This package is a dependency package, which depends on Debian's default
541<<<<<<< debian/control
372 PHP version (currently 7.3).542 PHP version (currently 7.3).
543=======
544 PHP version (currently 7.4).
545>>>>>>> debian/control
373546
374Package: php-pgsql547Package: php-pgsql
375Architecture: all548Architecture: all
376Depends: php-common,549Depends: php-common,
550<<<<<<< debian/control
377 php7.3-pgsql,551 php7.3-pgsql,
552=======
553 php7.4-pgsql,
554>>>>>>> debian/control
378 ${misc:Depends}555 ${misc:Depends}
379Description: PostgreSQL module for PHP [default]556Description: PostgreSQL module for PHP [default]
380 This package provides a PostgreSQL module for PHP.557 This package provides a PostgreSQL module for PHP.
@@ -384,11 +561,19 @@ Description: PostgreSQL module for PHP [default]
384 for web development and can be embedded into HTML.561 for web development and can be embedded into HTML.
385 .562 .
386 This package is a dependency package, which depends on Debian's default563 This package is a dependency package, which depends on Debian's default
564<<<<<<< debian/control
387 PHP version (currently 7.3).565 PHP version (currently 7.3).
388566
389Package: php-phpdbg567Package: php-phpdbg
390Architecture: all568Architecture: all
391Depends: php7.3-phpdbg,569Depends: php7.3-phpdbg,
570=======
571 PHP version (currently 7.4).
572
573Package: php-phpdbg
574Architecture: all
575Depends: php7.4-phpdbg,
576>>>>>>> debian/control
392 ${misc:Depends}577 ${misc:Depends}
393Description: server-side, HTML-embedded scripting language (PHPDBG binary) (default)578Description: server-side, HTML-embedded scripting language (PHPDBG binary) (default)
394 This package provides the /usr/bin/phpdbg command interpreter, useful for579 This package provides the /usr/bin/phpdbg command interpreter, useful for
@@ -399,12 +584,20 @@ Description: server-side, HTML-embedded scripting language (PHPDBG binary) (defa
399 for web development and can be embedded into HTML.584 for web development and can be embedded into HTML.
400 .585 .
401 This package is a dependency package, which depends on latest stable586 This package is a dependency package, which depends on latest stable
587<<<<<<< debian/control
402 PHP version (currently 7.3).588 PHP version (currently 7.3).
589=======
590 PHP version (currently 7.4).
591>>>>>>> debian/control
403592
404Package: php-pspell593Package: php-pspell
405Architecture: all594Architecture: all
406Depends: php-common,595Depends: php-common,
596<<<<<<< debian/control
407 php7.3-pspell,597 php7.3-pspell,
598=======
599 php7.4-pspell,
600>>>>>>> debian/control
408 ${misc:Depends}601 ${misc:Depends}
409Description: pspell module for PHP [default]602Description: pspell module for PHP [default]
410 This package provides a pspell module for PHP.603 This package provides a pspell module for PHP.
@@ -414,12 +607,20 @@ Description: pspell module for PHP [default]
414 for web development and can be embedded into HTML.607 for web development and can be embedded into HTML.
415 .608 .
416 This package is a dependency package, which depends on Debian's default609 This package is a dependency package, which depends on Debian's default
610<<<<<<< debian/control
417 PHP version (currently 7.3).611 PHP version (currently 7.3).
612=======
613 PHP version (currently 7.4).
614>>>>>>> debian/control
418615
419Package: php-readline616Package: php-readline
420Architecture: all617Architecture: all
421Depends: php-common,618Depends: php-common,
619<<<<<<< debian/control
422 php7.3-readline,620 php7.3-readline,
621=======
622 php7.4-readline,
623>>>>>>> debian/control
423 ${misc:Depends}624 ${misc:Depends}
424Description: readline module for PHP [default]625Description: readline module for PHP [default]
425 This package provides a readline module for PHP.626 This package provides a readline module for PHP.
@@ -429,12 +630,20 @@ Description: readline module for PHP [default]
429 for web development and can be embedded into HTML.630 for web development and can be embedded into HTML.
430 .631 .
431 This package is a dependency package, which depends on Debian's default632 This package is a dependency package, which depends on Debian's default
633<<<<<<< debian/control
432 PHP version (currently 7.3).634 PHP version (currently 7.3).
635=======
636 PHP version (currently 7.4).
637>>>>>>> debian/control
433638
434Package: php-recode639Package: php-recode
435Architecture: all640Architecture: all
436Depends: php-common,641Depends: php-common,
642<<<<<<< debian/control
437 php7.3-recode,643 php7.3-recode,
644=======
645 php7.4-recode,
646>>>>>>> debian/control
438 ${misc:Depends}647 ${misc:Depends}
439Description: recode module for PHP [default]648Description: recode module for PHP [default]
440 This package provides a recode module for PHP.649 This package provides a recode module for PHP.
@@ -444,12 +653,20 @@ Description: recode module for PHP [default]
444 for web development and can be embedded into HTML.653 for web development and can be embedded into HTML.
445 .654 .
446 This package is a dependency package, which depends on Debian's default655 This package is a dependency package, which depends on Debian's default
656<<<<<<< debian/control
447 PHP version (currently 7.3).657 PHP version (currently 7.3).
658=======
659 PHP version (currently 7.4).
660>>>>>>> debian/control
448661
449Package: php-snmp662Package: php-snmp
450Architecture: all663Architecture: all
451Depends: php-common,664Depends: php-common,
665<<<<<<< debian/control
452 php7.3-snmp,666 php7.3-snmp,
667=======
668 php7.4-snmp,
669>>>>>>> debian/control
453 ${misc:Depends}670 ${misc:Depends}
454Description: SNMP module for PHP [default]671Description: SNMP module for PHP [default]
455 This package provides a SNMP module for PHP.672 This package provides a SNMP module for PHP.
@@ -459,12 +676,20 @@ Description: SNMP module for PHP [default]
459 for web development and can be embedded into HTML.676 for web development and can be embedded into HTML.
460 .677 .
461 This package is a dependency package, which depends on Debian's default678 This package is a dependency package, which depends on Debian's default
679<<<<<<< debian/control
462 PHP version (currently 7.3).680 PHP version (currently 7.3).
681=======
682 PHP version (currently 7.4).
683>>>>>>> debian/control
463684
464Package: php-soap685Package: php-soap
465Architecture: all686Architecture: all
466Depends: php-common,687Depends: php-common,
688<<<<<<< debian/control
467 php7.3-soap,689 php7.3-soap,
690=======
691 php7.4-soap,
692>>>>>>> debian/control
468 ${misc:Depends}693 ${misc:Depends}
469Description: SOAP module for PHP [default]694Description: SOAP module for PHP [default]
470 This package provides a SOAP module for PHP.695 This package provides a SOAP module for PHP.
@@ -474,12 +699,20 @@ Description: SOAP module for PHP [default]
474 for web development and can be embedded into HTML.699 for web development and can be embedded into HTML.
475 .700 .
476 This package is a dependency package, which depends on Debian's default701 This package is a dependency package, which depends on Debian's default
702<<<<<<< debian/control
477 PHP version (currently 7.3).703 PHP version (currently 7.3).
704=======
705 PHP version (currently 7.4).
706>>>>>>> debian/control
478707
479Package: php-sqlite3708Package: php-sqlite3
480Architecture: all709Architecture: all
481Depends: php-common,710Depends: php-common,
711<<<<<<< debian/control
482 php7.3-sqlite3,712 php7.3-sqlite3,
713=======
714 php7.4-sqlite3,
715>>>>>>> debian/control
483 ${misc:Depends}716 ${misc:Depends}
484Description: SQLite3 module for PHP [default]717Description: SQLite3 module for PHP [default]
485 This package provides a SQLite3 module for PHP.718 This package provides a SQLite3 module for PHP.
@@ -489,12 +722,20 @@ Description: SQLite3 module for PHP [default]
489 for web development and can be embedded into HTML.722 for web development and can be embedded into HTML.
490 .723 .
491 This package is a dependency package, which depends on Debian's default724 This package is a dependency package, which depends on Debian's default
725<<<<<<< debian/control
492 PHP version (currently 7.3).726 PHP version (currently 7.3).
727=======
728 PHP version (currently 7.4).
729>>>>>>> debian/control
493730
494Package: php-sybase731Package: php-sybase
495Architecture: all732Architecture: all
496Depends: php-common,733Depends: php-common,
734<<<<<<< debian/control
497 php7.3-sybase,735 php7.3-sybase,
736=======
737 php7.4-sybase,
738>>>>>>> debian/control
498 ${misc:Depends}739 ${misc:Depends}
499Description: Sybase module for PHP [default]740Description: Sybase module for PHP [default]
500 This package provides a Sybase module for PHP.741 This package provides a Sybase module for PHP.
@@ -504,12 +745,20 @@ Description: Sybase module for PHP [default]
504 for web development and can be embedded into HTML.745 for web development and can be embedded into HTML.
505 .746 .
506 This package is a dependency package, which depends on Debian's default747 This package is a dependency package, which depends on Debian's default
748<<<<<<< debian/control
507 PHP version (currently 7.3).749 PHP version (currently 7.3).
750=======
751 PHP version (currently 7.4).
752>>>>>>> debian/control
508753
509Package: php-tidy754Package: php-tidy
510Architecture: all755Architecture: all
511Depends: php-common,756Depends: php-common,
757<<<<<<< debian/control
512 php7.3-tidy,758 php7.3-tidy,
759=======
760 php7.4-tidy,
761>>>>>>> debian/control
513 ${misc:Depends}762 ${misc:Depends}
514Description: tidy module for PHP [default]763Description: tidy module for PHP [default]
515 This package provides a tidy module for PHP.764 This package provides a tidy module for PHP.
@@ -519,12 +768,20 @@ Description: tidy module for PHP [default]
519 for web development and can be embedded into HTML.768 for web development and can be embedded into HTML.
520 .769 .
521 This package is a dependency package, which depends on Debian's default770 This package is a dependency package, which depends on Debian's default
771<<<<<<< debian/control
522 PHP version (currently 7.3).772 PHP version (currently 7.3).
773=======
774 PHP version (currently 7.4).
775>>>>>>> debian/control
523776
524Package: php-xml777Package: php-xml
525Architecture: all778Architecture: all
526Depends: php-common,779Depends: php-common,
780<<<<<<< debian/control
527 php7.3-xml,781 php7.3-xml,
782=======
783 php7.4-xml,
784>>>>>>> debian/control
528 ${misc:Depends}785 ${misc:Depends}
529Description: DOM, SimpleXML, WDDX, XML, and XSL module for PHP [default]786Description: DOM, SimpleXML, WDDX, XML, and XSL module for PHP [default]
530 This package provides a DOM, SimpleXML, WDDX, XML, and XSL module for PHP.787 This package provides a DOM, SimpleXML, WDDX, XML, and XSL module for PHP.
@@ -534,12 +791,20 @@ Description: DOM, SimpleXML, WDDX, XML, and XSL module for PHP [default]
534 for web development and can be embedded into HTML.791 for web development and can be embedded into HTML.
535 .792 .
536 This package is a dependency package, which depends on Debian's default793 This package is a dependency package, which depends on Debian's default
794<<<<<<< debian/control
537 PHP version (currently 7.3).795 PHP version (currently 7.3).
796=======
797 PHP version (currently 7.4).
798>>>>>>> debian/control
538799
539Package: php-xmlrpc800Package: php-xmlrpc
540Architecture: all801Architecture: all
541Depends: php-common,802Depends: php-common,
803<<<<<<< debian/control
542 php7.3-xmlrpc,804 php7.3-xmlrpc,
805=======
806 php7.4-xmlrpc,
807>>>>>>> debian/control
543 ${misc:Depends}808 ${misc:Depends}
544Description: XMLRPC-EPI module for PHP [default]809Description: XMLRPC-EPI module for PHP [default]
545 This package provides a XMLRPC-EPI module for PHP.810 This package provides a XMLRPC-EPI module for PHP.
@@ -549,12 +814,20 @@ Description: XMLRPC-EPI module for PHP [default]
549 for web development and can be embedded into HTML.814 for web development and can be embedded into HTML.
550 .815 .
551 This package is a dependency package, which depends on Debian's default816 This package is a dependency package, which depends on Debian's default
817<<<<<<< debian/control
552 PHP version (currently 7.3).818 PHP version (currently 7.3).
819=======
820 PHP version (currently 7.4).
821>>>>>>> debian/control
553822
554Package: php-zip823Package: php-zip
555Architecture: all824Architecture: all
556Depends: php-common,825Depends: php-common,
826<<<<<<< debian/control
557 php7.3-zip,827 php7.3-zip,
828=======
829 php7.4-zip,
830>>>>>>> debian/control
558 ${misc:Depends}831 ${misc:Depends}
559Description: Zip module for PHP [default]832Description: Zip module for PHP [default]
560 This package provides a Zip module for PHP.833 This package provides a Zip module for PHP.
@@ -564,4 +837,8 @@ Description: Zip module for PHP [default]
564 for web development and can be embedded into HTML.837 for web development and can be embedded into HTML.
565 .838 .
566 This package is a dependency package, which depends on Debian's default839 This package is a dependency package, which depends on Debian's default
840<<<<<<< debian/control
567 PHP version (currently 7.3).841 PHP version (currently 7.3).
842=======
843 PHP version (currently 7.4).
844>>>>>>> debian/control
diff --git a/debian/rules b/debian/rules
index b589119..976edbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,13 @@
99
10include /usr/share/dpkg/default.mk10include /usr/share/dpkg/default.mk
1111
12<<<<<<< debian/rules
12PHP_DEFAULT_VERSION := 7.313PHP_DEFAULT_VERSION := 7.3
13PHP_SUPPORTED_VERSIONS := 7.314PHP_SUPPORTED_VERSIONS := 7.3
15=======
16PHP_DEFAULT_VERSION := 7.4
17PHP_SUPPORTED_VERSIONS := 7.4
18>>>>>>> debian/rules
1419
15, := ,20, := ,
16PHP_DEV_PACKAGES := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))21PHP_DEV_PACKAGES := $(addprefix php,$(addsuffix -dev$(,),$(PHP_SUPPORTED_VERSIONS))), $(addprefix php,$(addsuffix -json$(,),$(PHP_SUPPORTED_VERSIONS)))
diff --git a/php-maintscript-helper b/php-maintscript-helper
index 84818a7..25e61c6 100644
--- a/php-maintscript-helper
+++ b/php-maintscript-helper
@@ -37,11 +37,14 @@
37# will be defined by php-maintscript-helper37# will be defined by php-maintscript-helper
38# to avoid inclusion loops. Do not set this38# to avoid inclusion loops. Do not set this
39# variable manually39# variable manually
40<<<<<<< php-maintscript-helper
40# * PHP_NEED_ACTION:41# * PHP_NEED_ACTION:
41# will be defined if a function call wants to42# will be defined if a function call wants to
42# override the behavior of php_needs_action.43# override the behavior of php_needs_action.
43# Do not rely on this variable. It is considered44# Do not rely on this variable. It is considered
44# an implementation detail.45# an implementation detail.
46=======
47>>>>>>> php-maintscript-helper
45# * PHP_MAINTSCRIPT_NAME48# * PHP_MAINTSCRIPT_NAME
46# * PHP_MAINTSCRIPT_PACKAGE49# * PHP_MAINTSCRIPT_PACKAGE
47# * PHP_MAINTSCRIPT_METHOD50# * PHP_MAINTSCRIPT_METHOD
@@ -102,7 +105,11 @@ else
102 fi105 fi
103106
104 case "$PHP_MAINTSCRIPT_METHOD" in107 case "$PHP_MAINTSCRIPT_METHOD" in
108<<<<<<< php-maintscript-helper
105 install|upgrade|abort-upgrade|configure|abort-remove|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)109 install|upgrade|abort-upgrade|configure|abort-remove|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)
110=======
111 install|upgrade|abort-upgrade|configure|abort-remove|abort-deconfigure|remove|failed-upgrade|purge|disappear|abort-install)
112>>>>>>> php-maintscript-helper
106 # yay - recognized script113 # yay - recognized script
107 ;;114 ;;
108 *)115 *)
@@ -141,9 +148,15 @@ fi
141# this function always returns 0148# this function always returns 0
142# Since: 5.5.0+dfsg-7149# Since: 5.5.0+dfsg-7
143php_msg()150php_msg()
151<<<<<<< php-maintscript-helper
144{152{
145 local PRIORITY="$1"153 local PRIORITY="$1"
146 local MSG="$2"154 local MSG="$2"
155=======
156(
157 PRIORITY="$1"
158 MSG="$2"
159>>>>>>> php-maintscript-helper
147 case "$PRIORITY" in160 case "$PRIORITY" in
148 debug|info|notice|warning|err|crit|alert|emerg)161 debug|info|notice|warning|err|crit|alert|emerg)
149 ;;162 ;;
@@ -151,11 +164,21 @@ php_msg()
151 PRIORITY="warning"164 PRIORITY="warning"
152 ;;165 ;;
153 esac166 esac
167<<<<<<< php-maintscript-helper
154 [ -z "$PHP_MAINTSCRIPT_HELPER_QUIET" ] && ( [ -n "${PHP_MAINTSCRIPT_DEBUG:-}" ] || [ "$PRIORITY" != "debug" ] ) && echo "$MSG" >&2168 [ -z "$PHP_MAINTSCRIPT_HELPER_QUIET" ] && ( [ -n "${PHP_MAINTSCRIPT_DEBUG:-}" ] || [ "$PRIORITY" != "debug" ] ) && echo "$MSG" >&2
155 [ -x /usr/bin/logger ] || return 0169 [ -x /usr/bin/logger ] || return 0
156 local LOGGER="/usr/bin/logger -p daemon.$PRIORITY -t $PHP_MAINTSCRIPT_PACKAGE "170 local LOGGER="/usr/bin/logger -p daemon.$PRIORITY -t $PHP_MAINTSCRIPT_PACKAGE "
157 $LOGGER "$MSG" || return 0171 $LOGGER "$MSG" || return 0
158}172}
173=======
174 if [ -n "${PHP_MAINTSCRIPT_DEBUG:-}" ] || [ "$PRIORITY" != "debug" ]; then
175 [ -z "$PHP_MAINTSCRIPT_HELPER_QUIET" ] && echo "$MSG" >&2
176 fi
177 [ -x /usr/bin/logger ] || return 0
178 LOGGER="/usr/bin/logger -p daemon.$PRIORITY -t $PHP_MAINTSCRIPT_PACKAGE "
179 $LOGGER "$MSG" || return 0
180)
181>>>>>>> php-maintscript-helper
159182
160#183#
161# Function php_invoke184# Function php_invoke
@@ -181,6 +204,7 @@ php_msg()
181# 1 otherwise204# 1 otherwise
182# Since: 5.5.0+dsfg-7205# Since: 5.5.0+dsfg-7
183php_invoke()206php_invoke()
207<<<<<<< php-maintscript-helper
184{208{
185 local CMD=$1209 local CMD=$1
186 local VERSION=$2210 local VERSION=$2
@@ -191,11 +215,20 @@ php_invoke()
191 local rcd_action=""215 local rcd_action=""
192 local rcd_scripts=""216 local rcd_scripts=""
193 local sapi_list=""217 local sapi_list=""
218=======
219(
220 CMD=$1
221 VERSION=$2
222 SAPI=$3
223 MOD=$4
224 sapi_list=""
225>>>>>>> php-maintscript-helper
194226
195 [ -x "/usr/sbin/php$CMD" ] || return 1227 [ -x "/usr/sbin/php$CMD" ] || return 1
196 [ -x "/usr/sbin/phpquery" ] || return 1228 [ -x "/usr/sbin/phpquery" ] || return 1
197229
198 case "$VERSION" in230 case "$VERSION" in
231<<<<<<< php-maintscript-helper
199 ALL)232 ALL)
200 version_list=$(phpquery -V)233 version_list=$(phpquery -V)
201 ;;234 ;;
@@ -216,6 +249,27 @@ php_invoke()
216 case "$CMD" in249 case "$CMD" in
217 enmod|dismod)250 enmod|dismod)
218 php$CMD -q -v "$version" -m -r "$MOD" || return 1251 php$CMD -q -v "$version" -m -r "$MOD" || return 1
252=======
253 ALL)
254 version_list=$(phpquery -V)
255 ;;
256 *)
257 version_list="$VERSION"
258 # FIXME - check if the version is supported
259 ;;
260 esac
261
262 for version in $version_list; do
263 case "$SAPI" in
264 apache2|apache2filter|fpm|cli|cgi|embed|phpdbg)
265 sapi_list="$SAPI"
266 ;;
267 ALL)
268 sapi_list=$(phpquery -S -v "$version")
269 case "$CMD" in
270 enmod|dismod)
271 "php$CMD" -q -v "$version" -m -r "$MOD" || return 1
272>>>>>>> php-maintscript-helper
219 ;;273 ;;
220 *)274 *)
221 return 1275 return 1
@@ -230,11 +284,19 @@ php_invoke()
230 for sapi in $sapi_list; do284 for sapi in $sapi_list; do
231 case "$CMD" in285 case "$CMD" in
232 enmod)286 enmod)
287<<<<<<< php-maintscript-helper
233 local phpquery_ret=0288 local phpquery_ret=0
234 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?289 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
235 if [ "$phpquery_ret" -eq 0 ] ; then290 if [ "$phpquery_ret" -eq 0 ] ; then
236 # configuration is already enabled291 # configuration is already enabled
237 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1292 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
293=======
294 phpquery_ret=0
295 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
296 if [ "$phpquery_ret" -eq 0 ] ; then
297 # configuration is already enabled
298 "php$CMD" -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
299>>>>>>> php-maintscript-helper
238 php_msg "debug" "php_invoke $MOD: already enabled for PHP $version $sapi sapi"300 php_msg "debug" "php_invoke $MOD: already enabled for PHP $version $sapi sapi"
239 PHP_NEED_ACTION=1301 PHP_NEED_ACTION=1
240 elif [ "$phpquery_ret" -eq 32 ] ; then302 elif [ "$phpquery_ret" -eq 32 ] ; then
@@ -246,21 +308,37 @@ php_invoke()
246 # a) we have no clue about the module (e.g. for upgrades prior to maintscript-helper308 # a) we have no clue about the module (e.g. for upgrades prior to maintscript-helper
247 # b) it's a fresh install309 # b) it's a fresh install
248 PHP_NEED_ACTION=1310 PHP_NEED_ACTION=1
311<<<<<<< php-maintscript-helper
249 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1312 php$CMD -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
313=======
314 "php$CMD" -m -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 || return 1
315>>>>>>> php-maintscript-helper
250 php_msg "debug" "php_invoke: Enabled module $MOD for $sapi sapi"316 php_msg "debug" "php_invoke: Enabled module $MOD for $sapi sapi"
251 fi317 fi
252 ;;318 ;;
253 dismod)319 dismod)
320<<<<<<< php-maintscript-helper
254 local phpquery_ret=0321 local phpquery_ret=0
255 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?322 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
256 if [ "$phpquery_ret" -eq 0 ] ; then323 if [ "$phpquery_ret" -eq 0 ] ; then
257 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then324 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
258 php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" || return 1325 php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" || return 1
326=======
327 phpquery_ret=0
328 phpquery -v "$version" -s "$sapi" -m "$MOD" > /dev/null 2>&1 || phpquery_ret=$?
329 if [ "$phpquery_ret" -eq 0 ] ; then
330 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
331 "php$CMD" -p -f -v "$version" -s "$sapi" -q "$MOD" || return 1
332>>>>>>> php-maintscript-helper
259 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging module $MOD for PHP $version $sapi sapi"333 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging module $MOD for PHP $version $sapi sapi"
260 PHP_NEED_ACTION=1334 PHP_NEED_ACTION=1
261 elif [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'prerm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'preinst' ] ; then335 elif [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'prerm' ] || [ "$PHP_MAINTSCRIPT_NAME" = 'preinst' ] ; then
262 if [ "$PHP_MAINTSCRIPT_METHOD" = "remove" ] || [ "$PHP_MAINTSCRIPT_METHOD" = "upgrade" ] ; then336 if [ "$PHP_MAINTSCRIPT_METHOD" = "remove" ] || [ "$PHP_MAINTSCRIPT_METHOD" = "upgrade" ] ; then
337<<<<<<< php-maintscript-helper
263 php$CMD -m -f -v "$version" -s "$sapi" -q "$MOD" || return 1338 php$CMD -m -f -v "$version" -s "$sapi" -q "$MOD" || return 1
339=======
340 "php$CMD" -m -f -v "$version" -s "$sapi" -q "$MOD" || return 1
341>>>>>>> php-maintscript-helper
264 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Disabled module $MOD for PHP $version $sapi sapi"342 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Disabled module $MOD for PHP $version $sapi sapi"
265 PHP_NEED_ACTION=1343 PHP_NEED_ACTION=1
266 fi344 fi
@@ -272,7 +350,11 @@ php_invoke()
272 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then350 if [ "$PHP_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$PHP_MAINTSCRIPT_METHOD" = "purge" ] ; then
273 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging state for $MOD for PHP $version $sapi sapi"351 php_msg "debug" "php_invoke $PHP_MAINTSCRIPT_NAME: Purging state for $MOD for PHP $version $sapi sapi"
274 # this will return RC=1352 # this will return RC=1
353<<<<<<< php-maintscript-helper
275 ( php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 )354 ( php$CMD -p -f -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 )
355=======
356 ( "php$CMD" -p -f -v "$version" -s "$sapi" -q "$MOD" > /dev/null 2>&1 )
357>>>>>>> php-maintscript-helper
276 else358 else
277 php_msg "debug" "php_invoke $MOD $PHP_MAINTSCRIPT_NAME: No action required for PHP $version $sapi sapi"359 php_msg "debug" "php_invoke $MOD $PHP_MAINTSCRIPT_NAME: No action required for PHP $version $sapi sapi"
278 fi360 fi
@@ -284,11 +366,20 @@ php_invoke()
284 return 1366 return 1
285 ;;367 ;;
286 esac368 esac
369<<<<<<< php-maintscript-helper
287 if [ -n "${PHP_NEED_ACTION:-}" -a -n "$rcd_action" ]; then370 if [ -n "${PHP_NEED_ACTION:-}" -a -n "$rcd_action" ]; then
288 dpkg-trigger /etc/php/$version/$sapi/conf.d371 dpkg-trigger /etc/php/$version/$sapi/conf.d
289 fi372 fi
290 done373 done
291 done374 done
292}375}
376=======
377 if [ -n "${PHP_NEED_ACTION:-}" ]; then
378 dpkg-trigger "/etc/php/$version/$sapi/conf.d"
379 fi
380 done
381 done
382)
383>>>>>>> php-maintscript-helper
293384
294# vim: syntax=sh sw=8 sts=8 sr noet385# vim: syntax=sh sw=8 sts=8 sr noet

Subscribers

People subscribed via source and target branches