diff -Nru php7.0-7.0.4/debian/changelog php7.0-7.0.4/debian/changelog --- php7.0-7.0.4/debian/changelog 2016-03-09 03:27:47.000000000 -0800 +++ php7.0-7.0.4/debian/changelog 2016-03-14 12:09:58.000000000 -0700 @@ -1,3 +1,33 @@ +php7.0 (7.0.4-5ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable (LP: #1553419). Remaining changes: + - Add support for independent source packages php7.0 and + php7.0-universe-source (LP #1555843): + + d/control{,.in}: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev and libzip-dev. + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-zip and their reverse dependencies. + + d/control{,.in}: add Build-Depends on dctrl-tools. + + d/rules.d/ext-interbase.mk: add pdo config to interbase's + config, as php7.0-universe-common will not use ext-common.mk. + - d/control{,.in}: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + - d/rules: do not generate debian/tests/control when building for + universe. + - d/rules: use grep-dctrl to remove binary packages not generated by + this source package during the build (dpkg-genchanges complains + otherwise). + * Drop: + - d/rules: use grep{,-dctrl} to filter out makefile snippets and + binary packages that require universe. + [ Not present ] + - Undocumented changes to debian/control. + [ Prior merge churn] + * php7.0-interbase: Do not install pdo.so, as it is provided + by php7.0-common (LP: #1556486). + + -- Nishanth Aravamudan Mon, 14 Mar 2016 11:38:20 -0700 + php7.0 (7.0.4-5) unstable; urgency=medium * Apply patch to make opcache lockfile path configurable @@ -70,6 +100,52 @@ -- Ondřej Surý Fri, 26 Feb 2016 10:39:12 +0100 +php7.0 (7.0.3-9ubuntu2) xenial; urgency=medium + + * Drop: + - Drop support for firebird, c-client, mcrypt, onig, qdbm and zip as + they are in universe (LP #1547245): + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-zip and their reverse dependencies. + + d/rules.d: drop makefile snippets for imap, interbase, mcrypt + and zip extensions. + * Add support for independent source packages php7.0 and + php7.0-universe-source (LP: #1555843): + - php7.0-imap, php7.0-interbase, php7.0-mcrypt and php7.0-zip will + be provided by the latter, which will reside in universe. + - d/control{,.in}: add Build-Depends on dctrl-tools. + - d/control.in: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev and libzip-dev. + - d/rules: use grep{,-dctrl} to filter out makefile snippets and + binary packages that require universe. + - d/rules.d/ext-interbase.mk: add pdo config to interbase's config, + as php7.0-universe-common will not use ext-common.mk. + * d/control.in: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + * d/rules: do not generate debian/tests/control when building for + universe. + * d/rules: use grep-dctrl to remove binary packages not generated by + this source package during the build (dpkg-genchanges complains + otherwise). + + -- Nishanth Aravamudan Thu, 10 Mar 2016 15:40:59 -0800 + +php7.0 (7.0.3-9ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable (LP: #1549407). Remaining changes: + - Drop support for firebird, c-client, mcrypt, onig, qdbm and zip as + they are in universe (LP #1547245): + + d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev and libzip-dev. + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-zip and their reverse dependencies. + + d/rules.d: drop makefile snippets for imap, interbase, mcrypt + and zip extensions. + - d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + + -- Nishanth Aravamudan Wed, 24 Feb 2016 09:02:55 -0800 + php7.0 (7.0.3-9) unstable; urgency=medium * Replace makefile magic with shell for loop when iterating through SAPI @@ -89,6 +165,34 @@ -- Ondřej Surý Tue, 23 Feb 2016 17:45:41 +0100 +php7.0 (7.0.3-7ubuntu1) xenial; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Drop support for firebird, c-client, mcrypt, onig, qdbm and zip as + they are in universe (LP #1547245): + + d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev, libxmlrpc-epi and + libzip-dev. + + d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-xmlrpc and their reverse dependencies. + + d/rules.d: drop makefile snippets for imap, interbase, mcrypt + and xmlrpc extensions. + - d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + * Dropped changes: + - Drop support for xmlrpc as it is in universe (LP #1547700): + + d/control: drop Build-Depends on libxmlrpc-epi + + d/control: drop binary package php7.0-xmlrpc and its reverse + dependencies. + + d/rules.d: drop makefile snippet for xmlrpc extension. + - d/rules: drop configuration of qdgm and zip. + + dropped in Debian. + * Drop support for zip as it is in universe (LP: #1547245). + - d/control: drop binary package php7.0-zip. + - d/rules.d: drop makefile snippet for zip extension. + + -- Nishanth Aravamudan Tue, 23 Feb 2016 15:02:28 -0800 + php7.0 (7.0.3-7) unstable; urgency=medium * bz2 extension pulls libbz2-1.0, so it's better to have it in separate @@ -126,6 +230,23 @@ -- Ondřej Surý Tue, 23 Feb 2016 07:49:00 +0100 +php7.0 (7.0.3-5ubuntu1) xenial; urgency=medium + + * Drop support for firebird, c-client, mcrypt, onig, qdbm, xmlrpc and + zip as they are in universe (LP: #1547245): + - d/control: drop Build-Depends on firebird-dev, libc-client-dev, + libmcrypt-dev, libonig-dev, libqdbm-dev, libxmlrpc-epi and + libzip-dev. + - d/control: drop binary packages php7.0-imap, php7.0-interbase, + php7.0-mcrypt and php7.0-xmlrpc and their reverse dependencies. + - d/rules: drop configuration of qdgm and zip. + - d/rules.d: drop makefile snippets for imap, interbase, mcrypt and + xmlrpc extensions. + * d/control: switch Build-Depends of netcat-traditional to + netcat-openbsd as only the latter is in main. + + -- Nishanth Aravamudan Thu, 18 Feb 2016 16:11:00 -0800 + php7.0 (7.0.3-5) unstable; urgency=medium [ Neal Gompa ] diff -Nru php7.0-7.0.4/debian/control php7.0-7.0.4/debian/control --- php7.0-7.0.4/debian/control 2016-03-09 03:27:47.000000000 -0800 +++ php7.0-7.0.4/debian/control 2016-03-14 12:09:58.000000000 -0700 @@ -1,7 +1,8 @@ Source: php7.0 Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Thijs Kinkhorst , Lior Kaplan @@ -13,14 +14,13 @@ debhelper (>= 9), dh-apache2, dh-systemd (>= 1.3), + dctrl-tools, dpkg-dev (>= 1.16.1~), - firebird-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.5-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.1-dev [!hurd-any !m68k !hppa !ppc64], flex, freetds-dev, libapparmor-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, - libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb-dev, libedit-dev (>= 2.11-20080614-4), @@ -37,16 +37,13 @@ libkrb5-dev, libldap2-dev, libmagic-dev, - libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient-dev | libmysqlclient15-dev, - libonig-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng-dev, libpq-dev, libpspell-dev, - libqdbm-dev, librecode-dev, libsasl2-dev, libsnmp-dev, @@ -61,11 +58,10 @@ libxmlrpc-epi-dev, libxmltok1-dev, libxslt1-dev (>= 1.0.18), - libzip-dev, locales-all | language-pack-de, mysql-server | virtual-mysql-server, netbase, - netcat-traditional, + netcat-openbsd | netcat, re2c, systemtap-sdt-dev [amd64 i386 powerpc armel armhf ia64], tzdata, @@ -425,28 +421,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-zip -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-zip:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-zip:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-zip:Replaces} -Breaks: ${php-zip:Breaks} -Conflicts: ${php-zip:Conflicts} -Provides: ${php-zip:Provides} -Description: Zip module for PHP - This package provides the Zip module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-sybase Architecture: any Depends: php-common (>= 1:33), @@ -535,28 +509,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-interbase -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-interbase:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-interbase:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-interbase:Replaces} -Breaks: ${php-interbase:Breaks} -Conflicts: ${php-interbase:Conflicts} -Provides: ${php-interbase:Provides} -Description: Interbase module for PHP - This package provides the Interbase module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-intl Architecture: any Depends: php-common (>= 1:33), @@ -601,28 +553,6 @@ open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. -Package: php7.0-mcrypt -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-mcrypt:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-mcrypt:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-mcrypt:Replaces} -Breaks: ${php-mcrypt:Breaks} -Conflicts: ${php-mcrypt:Conflicts} -Provides: ${php-mcrypt:Provides} -Description: libmcrypt module for PHP - This package provides the libmcrypt module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - Package: php7.0-snmp Architecture: any Depends: php-common (>= 1:33), @@ -753,28 +683,6 @@ . PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open source general-purpose scripting language that is especially suited - for web development and can be embedded into HTML. - -Package: php7.0-imap -Architecture: any -Depends: php-common (>= 1:33), - ucf, - ${misc:Depends}, - ${php:Depends}, - ${php-imap:Depends}, - ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends}, - ${php-imap:Pre-Depends} -Built-Using: ${php:Built-Using} -Replaces: ${php-imap:Replaces} -Breaks: ${php-imap:Breaks} -Conflicts: ${php-imap:Conflicts} -Provides: ${php-imap:Provides} -Description: IMAP module for PHP - This package provides the IMAP module(s) for PHP. - . - PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used - open source general-purpose scripting language that is especially suited for web development and can be embedded into HTML. Package: php7.0-bz2 diff -Nru php7.0-7.0.4/debian/control.in php7.0-7.0.4/debian/control.in --- php7.0-7.0.4/debian/control.in 2016-03-09 03:27:47.000000000 -0800 +++ php7.0-7.0.4/debian/control.in 2016-03-14 12:09:58.000000000 -0700 @@ -1,7 +1,8 @@ Source: php@PHP_VERSION@ Section: php Priority: optional -Maintainer: Debian PHP Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PHP Maintainers Uploaders: Ondřej Surý , Thijs Kinkhorst , Lior Kaplan @@ -13,14 +14,13 @@ debhelper (>= 9), dh-apache2, dh-systemd (>= 1.3), + dctrl-tools, dpkg-dev (>= 1.16.1~), - firebird-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.5-dev [!hurd-any !m68k !hppa !ppc64] | firebird2.1-dev [!hurd-any !m68k !hppa !ppc64], flex, freetds-dev, libapparmor-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, - libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb-dev, libedit-dev (>= 2.11-20080614-4), @@ -37,16 +37,13 @@ libkrb5-dev, libldap2-dev, libmagic-dev, - libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient-dev | libmysqlclient15-dev, - libonig-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng-dev, libpq-dev, libpspell-dev, - libqdbm-dev, librecode-dev, libsasl2-dev, libsnmp-dev, @@ -61,11 +58,10 @@ libxmlrpc-epi-dev, libxmltok1-dev, libxslt1-dev (>= 1.0.18), - libzip-dev, locales-all | language-pack-de, mysql-server | virtual-mysql-server, netbase, - netcat-traditional, + netcat-openbsd | netcat, re2c, systemtap-sdt-dev [amd64 i386 powerpc armel armhf ia64], tzdata, diff -Nru php7.0-7.0.4/debian/rules php7.0-7.0.4/debian/rules --- php7.0-7.0.4/debian/rules 2016-03-09 03:27:47.000000000 -0800 +++ php7.0-7.0.4/debian/rules 2016-03-14 12:09:58.000000000 -0700 @@ -1,8 +1,22 @@ #!/usr/bin/make -f +WITH_UNIVERSE := no + # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +export UNIVERSE_PACKAGES=imap interbase mcrypt zip +ifeq ($(WITH_UNIVERSE),yes) +export SRC_PREFIX=php-universe-source +else +export SRC_PREFIX=php +endif + +ifeq ($(WITH_UNIVERSE),yes) +DH_OPTIONS+=$(addprefix -pphp$(PHP_NAME_VERSION)-,$(UNIVERSE_PACKAGES)) +else +DH_OPTIONS+=$(addprefix -Nphp$(PHP_NAME_VERSION)-,$(UNIVERSE_PACKAGES)) +endif # This has to be exported to make some magic below work. export DH_OPTIONS @@ -31,7 +45,7 @@ PHP_RELEASE_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$3}') # Enable ZTS build if $(DEB_SOURCE) ends with -zts -ZTS=$(shell echo $(DEB_SOURCE) | sed 's/php$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION)//') +ZTS=$(shell echo $(DEB_SOURCE) | sed 's/$(SRC_PREFIX)$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION)//') ifeq ($(ZTS),-zts) $(warning Enabling ZTS build) CONFIGURE_ZTS := --enable-maintainer-zts @@ -40,10 +54,12 @@ PHP_NAME_VERSION := $(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION)$(ZTS) PHP_ZEND_VERSION := $(shell $(SED) -ne 's/\#define ZEND_MODULE_API_NO //p' Zend/zend_modules.h)$(ZTS) -ifneq ($(DEB_SOURCE),php$(PHP_NAME_VERSION)) -$(error $(DEB_SOURCE) != php$(PHP_NAME_VERSION)) +ifneq ($(DEB_SOURCE),$(SRC_PREFIX)$(PHP_NAME_VERSION)) +$(error $(DEB_SOURCE) != $(SRC_PREFIX)$(PHP_NAME_VERSION)) endif +ifeq ($(WITH_UNIVERSE),no) REAL_TARGETS := apache2 phpdbg embed fpm cgi cli +endif EXTRA_TARGETS := ext TARGETS := $(EXTRA_TARGETS) $(REAL_TARGETS) @@ -244,7 +260,11 @@ foreach($$e as $$i) { $$s .= " $$i"; } \ echo("php:Extensions=" . wordwrap($$s . ".\n", 75, "\$${Newline}")); -include $(CURDIR)/debian/rules.d/*.mk +ifeq ($(WITH_UNIVERSE),yes) +include $(filter $(addprefix %ext-,$(addsuffix .mk,$(UNIVERSE_PACKAGES))),$(wildcard $(CURDIR)/debian/rules.d/*.mk)) +else +include $(filter-out $(addprefix %ext-,$(addsuffix .mk,$(UNIVERSE_PACKAGES))),$(wildcard $(CURDIR)/debian/rules.d/*.mk)) +endif #extensions @@ -464,6 +484,11 @@ override_dh_installdirs: prepare-files-stamp dh_installdirs +ifeq ($(WITH_UNIVERSE),yes) +override_dh_install: remove-files-stamp + # pdo.so is provided by php7.0-common + dh_install -Xpdo.so +else override_dh_install: rename-files-stamp remove-files-stamp prepare-fpm-pools # install extra CGI-BIN install -d -m 755 debian/tmp/usr/lib/cgi-bin/ @@ -493,11 +518,13 @@ install -m 755 debian/$(PHP_FPM)-reopenlogs debian/$(PHP_FPM)/usr/lib/php/ dh_install --fail-missing +endif ifeq (yes,$(RUN_TESTS)) cp test-results.txt debian/$(PHP_COMMON)/usr/share/doc/$(PHP_COMMON)/ endif +ifeq ($(WITH_UNIVERSE),no) # shipping duplicate files from other packages is hell for security audits ln -sf /usr/share/misc/config.guess $(PHPIZE_BUILDDIR)/config.guess ln -sf /usr/share/misc/config.sub $(PHPIZE_BUILDDIR)/config.sub @@ -508,24 +535,38 @@ ln -sf /usr/share/libtool/config/ltmain.sh $(PHPIZE_BUILDDIR)/ltmain.sh; \ fi ln -sf /usr/bin/shtool $(PHPIZE_BUILDDIR)/shtool +endif override_dh_apache2: +ifeq ($(WITH_UNIVERSE),no) for sapi in apache2 cgi fpm; do \ $(SAPI_PACKAGE) \ < debian/$${versionless}.apache2 $(SED_REPLACEMENT) > debian/$${package}.apache2; \ done dh_apache2 --conditional=php_enable +endif override_dh_installdocs-indep: +ifeq ($(WITH_UNIVERSE),no) dh_installdocs -p$(PHP_COMMON) dh_installdocs -i --remaining-packages --link-doc=$(PHP_COMMON) +else + # can't link due to policy + dh_installdocs -i +endif override_dh_installdocs-arch: +ifeq ($(WITH_UNIVERSE),no) dh_installdocs -a --link-doc=$(PHP_COMMON) +else + # can't link due to policy + dh_installdocs -a +endif override_dh_compress: dh_compress -Xphp.ini +ifeq ($(WITH_UNIVERSE),no) override_dh_installchangelogs: dh_installchangelogs -p$(PHP_COMMON) NEWS @@ -556,19 +597,29 @@ fi dh_gencontrol -a +endif # $(WITH_UNIVERSE) + debian/control: debian/control.in debian/rules debian/changelog debian/source.lintian-overrides debian/rules.d/* debian/php-module.control.in +ifeq ($(WITH_UNIVERSE),yes) + $(SED) -e "s/@PHP_VERSION@/$(PHP_NAME_VERSION)/g" -e "s/@BUILT_USING@/$(BUILT_USING)/g" <$< | grep-dctrl -FSource:Package $(DEB_SOURCE) - >$@ +else $(SED) -e "s/@PHP_VERSION@/$(PHP_NAME_VERSION)/g" -e "s/@BUILT_USING@/$(BUILT_USING)/g" >$@ <$< +endif for ext in $(ext_PACKAGES); do \ package=php$(PHP_NAME_VERSION)-$${ext}; \ description=$$(eval echo \$${$${ext}_DESCRIPTION}); \ echo >>$@; \ $(SED) -e "s|@ext@|$${ext}|" -e "s|@package@|$${package}|" -e "s|@description@|$${description}|" >>$@ debian/tests/$${t}; \ done +else + rm -f debian/tests/control +endif debian/source.lintian-overrides: debian/source.lintian-overrides.in debian/rules debian/changelog $(SED) -e "s/@PHP_VERSION@/$(PHP_NAME_VERSION)/g" >$@ <$< diff -Nru php7.0-7.0.4/debian/rules.d/ext-interbase.mk php7.0-7.0.4/debian/rules.d/ext-interbase.mk --- php7.0-7.0.4/debian/rules.d/ext-interbase.mk 2016-03-09 03:27:47.000000000 -0800 +++ php7.0-7.0.4/debian/rules.d/ext-interbase.mk 2016-03-14 11:50:09.000000000 -0700 @@ -1,9 +1,12 @@ ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),hurd-i386 m68k hppa ppc64)) ext_PACKAGES += interbase interbase_DESCRIPTION := Interbase - interbase_EXTENSIONS := interbase pdo_firebird + interbase_EXTENSIONS := interbase pdo pdo_firebird interbase_config := --with-interbase=shared,/usr + pdo_config := --enable-pdo=shared + pdo_PRIORITY := 10 pdo_firebird_config := --with-pdo-firebird=shared,/usr + export pdo_PRIORITY export interbase_EXTENSIONS export interbase_DESCRIPTION endif