Bug#682342: Latest patch successfully tested
On 22.08.2019 [21:45:26 +0200], Philipp Kern wrote:
> On 8/16/2019 8:34 PM, Nishanth Aravamudan wrote:
> > On 15.08.2019 [17:08:39 +0200], Cyril Brulebois wrote:
> >> Nishanth Aravamudan (2019-08-14):
> >>> We are able to reproduce this issue at will in Ubuntu Bionic's
> >>> installer (not identical to Debian's, but code-wise in this path the
> >>> same). While quite a while after the last update from Philipp, we
> >>> tested the patch (netcfg_dhcp_domain.patch) after updating it to avoid
> >>> a compilation issue, we found it did fix the problem for us.
> >>>
> >>> I am not sure if I can get Debian into our infrastructure to test
> >>> explicitly, but I will work on it; at the same time, the code change
> >>> seems straightforward.
> >>
> >> Thanks for your feedback. Care to share the fixed version? :)
> >
> > D'oh! I'm sorry, I thought I did. The patch we tested was:
> >
> > diff -Naur a/dhcp.c b/dhcp.c
> > --- a/dhcp.c2017-10-10 14:01:42.0 +
> > +++ b/dhcp.c2019-08-14 01:04:58.339325357 +
> > @@ -590,7 +590,7 @@
> > preseed_hostname_from_fqdn(client, buf);
> > }
> >
> > -if (netcfg_get_hostname (client, "netcfg/get_hostname",
> > hostname, 1)) {
> > +if (netcfg_get_hostname (client, "netcfg/get_hostname",
> > hostname, !have_domain)) {
> > /*
> > * Going back to POLL wouldn't make much sense.
> > * However, it does make sense to go to the retry
> > diff -Naur a/netcfg-common.c b/netcfg-common.c
> > --- a/netcfg-common.c 2017-10-10 14:04:08.0 +
> > +++ b/netcfg-common.c 2019-08-13 20:01:13.606510273 +
> > @@ -1060,14 +1060,24 @@
> > continue;
> > }
> >
> > -if (accept_domain && (s = strchr(hostname, '.'))) {
> > -di_info("Detected we have an FQDN; splitting and setting
> > domain");
> > -if (s[1] == '\0') { /* "somehostname." <- . should be ignored
> > */
> > +if ((s = strchr(hostname, '.'))) {
> > +di_info("Detected an FQDN in hostname");
> > +if (s[1] == '\0') {
> > +/* "somehostname." <- . should be ignored */
> > *s = '\0';
> > -} else { /* assume we have a valid domain name given */
> > -strncpy(domain, s + 1, MAXHOSTNAMELEN);
> > -debconf_set(client, "netcfg/get_domain", domain);
> > -have_domain = 1;
> > +di_info("Stripped trailing dot from hostname");
> > +} else {
> > +/* assume that the domain is valid and copy it if
> > + * accept_domain is set; just use the hostname if
> > + * it is unset
> > + */
> > +if (accept_domain) {
> > +strncpy(domain, s + 1, MAXHOSTNAMELEN);
> > + di_info("Setting domain to %s", domain);
>
> This needs indenting fix-up.
Thank you, fixed below, I believe.
diff -Naur a/dhcp.c b/dhcp.c
--- a/dhcp.c2017-10-10 14:01:42.0 +
+++ b/dhcp.c2019-08-14 01:04:58.339325357 +
@@ -590,7 +590,7 @@
preseed_hostname_from_fqdn(client, buf);
}
-if (netcfg_get_hostname (client, "netcfg/get_hostname",
hostname, 1)) {
+if (netcfg_get_hostname (client, "netcfg/get_hostname",
hostname, !have_domain)) {
/*
* Going back to POLL wouldn't make much sense.
* However, it does make sense to go to the retry
diff -Naur a/netcfg-common.c b/netcfg-common.c
--- a/netcfg-common.c 2017-10-10 14:04:08.0 +
+++ b/netcfg-common.c 2019-08-13 20:01:13.606510273 +
@@ -1060,14 +1060,24 @@
continue;
}
-if (accept_domain && (s = strchr(hostname, '.'))) {
-di_info("Detected we have an FQDN; splitting and setting domain");
-if (s[1] == '\0') { /* "somehostname." <- . should be ignored */
+if ((s = strchr(hostname, '.'))) {
+di_info("Detected an FQDN in hostname");
+if (s[1] == '\0') {
+
Bug#682342: Latest patch successfully tested
On 15.08.2019 [17:08:39 +0200], Cyril Brulebois wrote:
> Hi,
>
> Nishanth Aravamudan (2019-08-14):
> > We are able to reproduce this issue at will in Ubuntu Bionic's
> > installer (not identical to Debian's, but code-wise in this path the
> > same). While quite a while after the last update from Philipp, we
> > tested the patch (netcfg_dhcp_domain.patch) after updating it to avoid
> > a compilation issue, we found it did fix the problem for us.
> >
> > I am not sure if I can get Debian into our infrastructure to test
> > explicitly, but I will work on it; at the same time, the code change
> > seems straightforward.
>
> Thanks for your feedback. Care to share the fixed version? :)
D'oh! I'm sorry, I thought I did. The patch we tested was:
diff -Naur a/dhcp.c b/dhcp.c
--- a/dhcp.c2017-10-10 14:01:42.0 +
+++ b/dhcp.c2019-08-14 01:04:58.339325357 +
@@ -590,7 +590,7 @@
preseed_hostname_from_fqdn(client, buf);
}
-if (netcfg_get_hostname (client, "netcfg/get_hostname",
hostname, 1)) {
+if (netcfg_get_hostname (client, "netcfg/get_hostname",
hostname, !have_domain)) {
/*
* Going back to POLL wouldn't make much sense.
* However, it does make sense to go to the retry
diff -Naur a/netcfg-common.c b/netcfg-common.c
--- a/netcfg-common.c 2017-10-10 14:04:08.0 +
+++ b/netcfg-common.c 2019-08-13 20:01:13.606510273 +
@@ -1060,14 +1060,24 @@
continue;
}
-if (accept_domain && (s = strchr(hostname, '.'))) {
-di_info("Detected we have an FQDN; splitting and setting domain");
-if (s[1] == '\0') { /* "somehostname." <- . should be ignored */
+if ((s = strchr(hostname, '.'))) {
+di_info("Detected an FQDN in hostname");
+if (s[1] == '\0') {
+/* "somehostname." <- . should be ignored */
*s = '\0';
-} else { /* assume we have a valid domain name given */
-strncpy(domain, s + 1, MAXHOSTNAMELEN);
-debconf_set(client, "netcfg/get_domain", domain);
-have_domain = 1;
+di_info("Stripped trailing dot from hostname");
+} else {
+/* assume that the domain is valid and copy it if
+ * accept_domain is set; just use the hostname if
+ * it is unset
+ */
+if (accept_domain) {
+strncpy(domain, s + 1, MAXHOSTNAMELEN);
+ di_info("Setting domain to %s", domain);
+debconf_set(client, "netcfg/get_domain", domain);
+have_domain = 1;
+}
+/* strip the domain from the hostname */
*s = '\0';
}
}
> I'm a little reluctant to blindly merging this patch (originally
> labeled “untested”) without a go from its author. Philipp, should
> I go ahead?
Totally understood! I just wanted to make sure to revive this issue, as
I'd also like to get it fixed in Ubuntu! Like I said, I will do my best
to test and reproduce the fix with stock Debian.
-Nish
Bug#682342: Latest patch successfully tested
We are able to reproduce this issue at will in Ubuntu Bionic's installer (not identical to Debian's, but code-wise in this path the same). While quite a while after the last update from Philipp, we tested the patch (netcfg_dhcp_domain.patch) after updating it to avoid a compilation issue, we found it did fix the problem for us. I am not sure if I can get Debian into our infrastructure to test explicitly, but I will work on it; at the same time, the code change seems straightforward. Thanks! -Nish
Bug#898288: php-horde-activesync: PHPUnit 6 compatibility
Package: php-horde-activesync
Version: 2.39.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/phpunit6_removed_setExpectedException.patch: PHPUnit6
has removed setExpectedException.
* d/t/phpunit: explicitly specify bootstrap file.
Thanks for considering the patch.
*** /tmp/tmptAScrg/php-horde-activesync_2.39.0-1ubuntu1.debdiff
diff -Nru
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
---
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
1969-12-31 16:00:00.0 -0800
+++
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
2018-02-14 11:53:17.0 -0800
@@ -0,0 +1,45 @@
+Description: PHPUnit6 has removed setExpectedException
+ Replaced with expectException.
+Author: Nishanth Aravamudan
+Last-Update: 2018-02-14
+
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/CacheTest.php
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/CacheTest.php
+@@ -30,7 +30,7 @@ class Horde_ActiveSync_CacheTest extends
+
+ public function testInvalidPropertyAccess()
+ {
+-$this->setExpectedException('InvalidArgumentException');
++$this->expectException('InvalidArgumentException');
+ $cache = new Horde_ActiveSync_SyncCache($this->_state, 'devid',
'userone');
+ $cache->collections;
+ }
+@@ -55,4 +55,4 @@ class Horde_ActiveSync_CacheTest extends
+ $this->assertEquals(false, $cache->validateTimestamps());
+ }
+
+-}
+\ No newline at end of file
++}
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/ContactTest.php
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/ContactTest.php
+@@ -15,7 +15,7 @@ class Horde_ActiveSync_ContactTest exten
+ {
+ $contact = new Horde_ActiveSync_Message_Contact();
+
+-$this->setExpectedException('InvalidArgumentException');
++$this->expectException('InvalidArgumentException');
+ $contact->unknown = 'test';
+ $test = $contact->unknown;
+ }
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/StateTest/Base.php
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/StateTest/Base.php
+@@ -16,7 +16,7 @@ class Horde_ActiveSync_StateTest_Base ex
+ // First with no existing deivce.
+ $this->assertEquals(false,
(boolean)self::$state->deviceExists('dev123', 'mike'));
+
+-// Can't use setExpectedException here since it stops the rest
++// Can't use expectException here since it stops the rest
+ // of the method from running when it's thrown.
+ try {
+ self::$state->loadDeviceInfo('dev123', 'mike');
diff -Nru php-horde-activesync-2.39.0/debian/patches/series
php-horde-activesync-2.39.0/debian/patches/series
--- php-horde-activesync-2.39.0/debian/patches/series 1969-12-31
16:00:00.0 -0800
+++ php-horde-activesync-2.39.0/debian/patches/series 2018-02-14
11:52:48.0 -0800
@@ -0,0 +1 @@
+phpunit6_removed_setExpectedException.patch
diff -Nru php-horde-activesync-2.39.0/debian/tests/phpunit
php-horde-activesync-2.39.0/debian/tests/phpunit
--- php-horde-activesync-2.39.0/debian/tests/phpunit2017-12-16
07:56:23.0 -0800
+++ php-horde-activesync-2.39.0/debian/tests/phpunit2018-02-14
11:51:34.0 -0800
@@ -9,4 +9,4 @@
mysql -e "create database IF NOT EXISTS test; ALTER USER 'root'@'localhost'
IDENTIFIED WITH 'mysql_native_password' BY 'r00t';" -uroot
cd Horde_ActiveSync*/test/./Horde/ActiveSync
-phpunit -v .
+phpunit --bootstrap bootstrap.php -v .
-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Bug#898285: php-horde-text-filter-jsmin: PHPUnit 6 compatibility
Package: php-horde-text-filter-jsmin
Version: 1.0.2-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced
classes.
Thanks for considering the patch.
*** /tmp/tmpiyhsiF/php-horde-text-filter-jsmin_1.0.2-3ubuntu1.debdiff
diff -Nru
php-horde-text-filter-jsmin-1.0.2/debian/patches/phpunit6_compat.patch
php-horde-text-filter-jsmin-1.0.2/debian/patches/phpunit6_compat.patch
--- php-horde-text-filter-jsmin-1.0.2/debian/patches/phpunit6_compat.patch
1969-12-31 16:00:00.0 -0800
+++ php-horde-text-filter-jsmin-1.0.2/debian/patches/phpunit6_compat.patch
2018-02-20 14:55:19.0 -0800
@@ -0,0 +1,16 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-20
+
+---
php-horde-text-filter-jsmin-1.0.2.orig/Horde_Text_Filter_Jsmin-1.0.2/test/Horde/Text/Filter/Jsmin/JsminTest.php
php-horde-text-filter-jsmin-1.0.2/Horde_Text_Filter_Jsmin-1.0.2/test/Horde/Text/Filter/Jsmin/JsminTest.php
+@@ -9,7 +9,7 @@
+ * @subpackage UnitTests
+ */
+
+-class Horde_Text_Filter_Jsmin_JsminTest extends PHPUnit_Framework_TestCase
++class Horde_Text_Filter_Jsmin_JsminTest extends PHPUnit\Framework\TestCase
+ {
+ public function testJsmin()
+ {
diff -Nru php-horde-text-filter-jsmin-1.0.2/debian/patches/series
php-horde-text-filter-jsmin-1.0.2/debian/patches/series
--- php-horde-text-filter-jsmin-1.0.2/debian/patches/series 1969-12-31
16:00:00.0 -0800
+++ php-horde-text-filter-jsmin-1.0.2/debian/patches/series 2018-02-20
14:55:25.0 -0800
@@ -0,0 +1 @@
+phpunit6_compat.patch
-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Bug#898274: php-horde-javascriptminify-jsmin: PHPUnit 6 compatibility
Package: php-horde-javascriptminify-jsmin
Version: 1.0.2-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has
namespaced classes.
Thanks for considering the patch.
*** /tmp/tmpcL3QuF/php-horde-javascriptminify-jsmin_1.0.2-3ubuntu1.debdiff
diff -Nru
php-horde-javascriptminify-jsmin-1.0.2/debian/patches/phpunit6_compatibility.patch
php-horde-javascriptminify-jsmin-1.0.2/debian/patches/phpunit6_compatibility.patch
---
php-horde-javascriptminify-jsmin-1.0.2/debian/patches/phpunit6_compatibility.patch
1969-12-31 16:00:00.0 -0800
+++
php-horde-javascriptminify-jsmin-1.0.2/debian/patches/phpunit6_compatibility.patch
2018-02-16 15:48:55.0 -0800
@@ -0,0 +1,16 @@
+Description: PHPUnit 6 has namespaced classes
+Author: Nishanth Aravamudan
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-16
+
+---
php-horde-javascriptminify-jsmin-1.0.2.orig/Horde_JavascriptMinify_Jsmin-1.0.2/test/Horde/JavascriptMinify/Jsmin/JsminTest.php
php-horde-javascriptminify-jsmin-1.0.2/Horde_JavascriptMinify_Jsmin-1.0.2/test/Horde/JavascriptMinify/Jsmin/JsminTest.php
+@@ -9,7 +9,7 @@
+ * @subpackage UnitTests
+ */
+
+-class Horde_JavascriptMinify_Jsmin_JsminTest extends
PHPUnit_Framework_TestCase
++class Horde_JavascriptMinify_Jsmin_JsminTest extends
PHPUnit\Framework\TestCase
+ {
+ public function testJsmin()
+ {
diff -Nru php-horde-javascriptminify-jsmin-1.0.2/debian/patches/series
php-horde-javascriptminify-jsmin-1.0.2/debian/patches/series
--- php-horde-javascriptminify-jsmin-1.0.2/debian/patches/series
1969-12-31 16:00:00.0 -0800
+++ php-horde-javascriptminify-jsmin-1.0.2/debian/patches/series
2018-02-16 15:44:50.0 -0800
@@ -0,0 +1 @@
+phpunit6_compatibility.patch
-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Bug#895560: s3cmd has a runtime dependency on python3-distutils
Package: s3cmd
Version: 2.0.1-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
As reported in Ubuntu, s3cmd on Debian also does not run by default (it
spits an error about distutils.spawn). This is because (I think) python2
had distutils as part of the core, while python3 does not.
In Ubuntu, the attached patch was applied to achieve the following:
* d/control: add run-time dependency on python3-distutils.
- Upstream has required it in s3cmd since 2007.
- LP: #1763398
Thanks for considering the patch.
*** /tmp/tmpLFbq1d/s3cmd_2.0.1-1ubuntu1.debdiff
diff -Nru s3cmd-2.0.1/debian/control s3cmd-2.0.1/debian/control
--- s3cmd-2.0.1/debian/control 2017-10-25 23:48:32.0 -0700
+++ s3cmd-2.0.1/debian/control 2018-04-12 09:03:35.0 -0700
@@ -16,7 +16,7 @@
Package: s3cmd
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, python3-distutils
Description: command-line Amazon S3 client
Command-line tool to upload, retrieve and manage data in Amazon S3 service
(http://www.amazon.com/s3/), designed for use in scripts. Features:
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#895051: liblldb-6.0-dev: missing API/*.h files
Package: llvm-toolchain-6.0
Version: 1:6.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/install-lldb-sb-headers.patch: Install lldb's
SB headers (pr36630). Thanks to Pavel Labath .
LP: #1761009
Thanks for considering the patch.
*** /tmp/tmp5CXR4z/llvm-toolchain-6.0_1:6.0-1ubuntu2.debdiff
diff -Nru llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch
llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch
--- llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch
1969-12-31 16:00:00.0 -0800
+++ llvm-toolchain-6.0-6.0/debian/patches/install-lldb-sb-headers.patch
2018-04-05 15:05:20.0 -0700
@@ -0,0 +1,58 @@
+From 8f577000b2fe2f5bf5d08e352a2f15f9421f9c82 Mon Sep 17 00:00:00 2001
+From: Pavel Labath
+Date: Thu, 8 Mar 2018 15:52:46 +
+Subject: [PATCH] Install lldb's SB headers (pr36630)
+
+These were removed in r309021 in what looks like an accidentally
+committed change. This brings them back.
+
+I also rename the header component to lldb-headers (instead of
+lldb_headers) to match the llvm style and add a special
+install-lldb-headers target, which installs just the headers.
+
+git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@327016
91177308-0d34-0410-b5e6-96231b3b80d8
+Origin: upstream,
https://github.com/llvm-mirror/lldb/commit/8f577000b2fe2f5bf5d08e352a2f15f9421f9c82.patch
+Bug-Ubuntu: https://launchpad.net/bugs/1761009
+Forwarded: will be done by Nishanth Aravamudan
+Last-Update: 2018-04-05
+
+--- llvm-toolchain-6.0-6.0.orig/lldb/cmake/modules/LLDBConfig.cmake
llvm-toolchain-6.0-6.0/lldb/cmake/modules/LLDBConfig.cmake
+@@ -277,27 +277,31 @@ include_directories(BEFORE
+
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+ install(DIRECTORY include/
+-COMPONENT lldb_headers
++COMPONENT lldb-headers
+ DESTINATION include
+ FILES_MATCHING
+ PATTERN "*.h"
+ PATTERN ".svn" EXCLUDE
+ PATTERN ".cmake" EXCLUDE
+ PATTERN "Config.h" EXCLUDE
+-PATTERN "lldb-*.h" EXCLUDE
+-PATTERN "API/*.h" EXCLUDE
+ )
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
+-COMPONENT lldb_headers
++COMPONENT lldb-headers
+ DESTINATION include
+ FILES_MATCHING
+ PATTERN "*.h"
+ PATTERN ".svn" EXCLUDE
+ PATTERN ".cmake" EXCLUDE
+-PATTERN "lldb-*.h" EXCLUDE
+-PATTERN "API/*.h" EXCLUDE
+ )
++
++ add_custom_target(lldb-headers)
++ set_target_properties(lldb-headers PROPERTIES FOLDER "Misc")
++
++ if (NOT CMAKE_CONFIGURATION_TYPES)
++add_llvm_install_targets(install-lldb-headers
++ COMPONENT lldb-headers)
++ endif()
+ endif()
+
+ if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows"))
diff -Nru llvm-toolchain-6.0-6.0/debian/patches/series
llvm-toolchain-6.0-6.0/debian/patches/series
--- llvm-toolchain-6.0-6.0/debian/patches/series2018-02-27
00:08:44.0 -0800
+++ llvm-toolchain-6.0-6.0/debian/patches/series2018-04-05
15:03:28.0 -0700
@@ -47,3 +47,4 @@
silent-llvm-isel-fuzzer.diff
test-keep-alive.diff
sparc64-add-missing-tls-get-addr.diff
+install-lldb-sb-headers.patch
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#894841: pg-repack: fix failing dep8 tests with postgresql 10.3
Package: pg-repack Version: 1.4.2-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to fix DEP8 regressions with Postgresql 10.3. * debian/patches/always_qualify_relation_names.patch: Always qualify relation names. Thanks to Masahiko Sawada . Thanks for considering the patch. *** /tmp/tmpB3TGJW/pg-repack_1.4.2-1ubuntu1.debdiff diff -Nru pg-repack-1.4.2/debian/patches/always_qualify_relation_names.patch pg-repack-1.4.2/debian/patches/always_qualify_relation_names.patch --- pg-repack-1.4.2/debian/patches/always_qualify_relation_names.patch 1969-12-31 16:00:00.0 -0800 +++ pg-repack-1.4.2/debian/patches/always_qualify_relation_names.patch 2018-04-04 10:22:56.0 -0700 @@ -0,0 +1,2905 @@ +Description: Always qualify relation names + Due to change at PostgreSQL 10.3, 9.6.8, 9.5.12, 9.4.17 and 9.3.22, + relation names passed by PostgreSQL function such as + pg_get_indexdef_string() are schema-qualified, which could be cause + of a parse error. +Author: Masahiko Sawada +Origin: upstream, https://github.com/reorg/pg_repack/pull/172 +Bug: https://github.com/reorg/pg_repack/issues/169 +Bug: https://github.com/reorg/pg_repack/issues/174 +Forwarded: not-needed +Last-Update: 2018-04-04 + +--- a/lib/pg_repack.sql.in b/lib/pg_repack.sql.in +@@ -16,6 +16,30 @@ + $$SELECT 'pg_repack REPACK_VERSION'::text$$ + LANGUAGE SQL IMMUTABLE STRICT; + ++CREATE FUNCTION repack.pg_version(version_str text DEFAULT NULL) RETURNS integer ++AS $$ ++-- Return the server version number in a format similar to PG_VERSION_NUM. ++-- Call with no argument for the server version, pass an argument for testing ++select (case ++when array_length(tokens, 1) = 2 then ++to_char(tokens[1], 'FM00') || ++'00' || to_char(tokens[2], 'FM00') ++when array_length(tokens, 1) = 3 then ++to_char(tokens[1], 'FM00') || ++to_char(tokens[2], 'FM00') || ++to_char(tokens[3], 'FM00') ++else ++-- This will raise an error which we can read ++'unexpected version string: ' || coalesce($1, version()) ++end)::int ++from ( ++select string_to_array(substring( ++split_part(coalesce($1, version()), ' ', 2) ++from '\d+\.\d+(?:\.\d+)?'), '.')::int[] ++) as x (tokens); ++$$ ++LANGUAGE SQL IMMUTABLE; ++ + CREATE AGGREGATE repack.array_accum ( + sfunc = array_append, + basetype = anyelement, +--- a/lib/repack.c b/lib/repack.c +@@ -354,11 +354,30 @@ + Oid nsp = get_rel_namespace(relid); + char *nspname; + ++ /* ++ * Relation names given by PostgreSQL core are always ++ * qualified since some minor releases. Note that this change ++ * doesn't introduce to PostgreSQL 9.2 and 9.1 releases. ++ */ ++#if ((PG_VERSION_NUM >= 10 && PG_VERSION_NUM < 13) || \ ++ (PG_VERSION_NUM >= 90600 && PG_VERSION_NUM < 90608) || \ ++ (PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 90512) || \ ++ (PG_VERSION_NUM >= 90400 && PG_VERSION_NUM < 90417) || \ ++ (PG_VERSION_NUM >= 90300 && PG_VERSION_NUM < 90322) || \ ++ (PG_VERSION_NUM >= 90200 && PG_VERSION_NUM < 90300) || \ ++ (PG_VERSION_NUM >= 90100 && PG_VERSION_NUM < 90200)) + /* Qualify the name if not visible in search path */ + if (RelationIsVisible(relid)) + nspname = NULL; + else + nspname = get_namespace_name(nsp); ++#else ++ /* Qualify the name */ ++ if (OidIsValid(nsp)) ++ nspname = get_namespace_name(nsp); ++ else ++ nspname = NULL; ++#endif + + return quote_qualified_identifier(nspname, get_rel_name(relid)); + } +--- a/regress/expected/repack.out b/regress/expected/repack.out +@@ -1,14 +1,19 @@ + -- Test output file identifier. +-SELECT CASE +- WHEN split_part(version(), ' ', 2) ~ '^(10)' +- THEN 'repack_2.out' +- WHEN split_part(version(), ' ', 2) ~ '^(9\.6|9\.5)' +- THEN 'repack.out' +- WHEN split_part(version(), ' ', 2) ~ '^(9\.4|9\.3|9\.2|9\.1)' +- THEN 'repack_1.out' +- ELSE version() +-END AS testfile; +- testfile ++select filename from (values ++( 90100, 90300, 'repack_1.out'), ++( 90300, 90322, 'repack_6.out'), ++( 90322, 90400, 'repack_5.out'), ++( 90400, 90417, 'repack_1.out'), ++( 90417, 90500, 'repack_5.out'), ++( 90500, 90512, 'repack.out'), ++( 90512, 90600, 'repack_4.out'), ++( 90600, 90608, 'repack.out'), ++( 90608, 10, 'repack_4.out'), ++(10, 13, 'repack_2.out'), ++(13, 11, 'repack_3.out') ++) as x (min, max, filename) ++where min <= repack.pg_version() and repack.pg_version() < max; ++ filename + + repack.out + (1 row) +--- a/regress/expected/repack_1.out
Bug#890433: php-pear: PEAR/RunTest.php uses count() on non-Countable
Package: php-pear
Version: 1:1.10.5+submodules+notgz-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/php72_count_of_notcountable.patch: PHP7.2 warns when
count() is called on non-Countable.
Thanks for considering the patch.
Description: PHP7.2 warns when count() is called on non-Countable
As described on http://php.net/manual/en/migration72.incompatible.php
Author: Nishanth Aravamudan
Forwarded: Will be done by Nishanth Aravamudan
Last-Update: 2018-02-14
--- php-pear-1.10.5+submodules+notgz.orig/PEAR/RunTest.php
+++ php-pear-1.10.5+submodules+notgz/PEAR/RunTest.php
@@ -343,7 +343,7 @@ class PEAR_RunTest
// Check if test should be skipped.
$res = $this->_runSkipIf($section_text, $temp_skipif, $tested,
$ini_settings);
-if (count($res) != 2) {
+if (!is_array($res) || count($res) != 2) {
return $res;
}
$info = $res['info'];
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#882944: php-monolog FTBFS with phpunit 6.4.4-2
Package: php-monolog
Version: 1.23.0-1
Followup-For: Bug #882944
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/phpunit6_compatibility_changes.patch: PHPUnit 6 is
not backwards compatible in various ways. Closes LP: #1749001.
* debian/patches/mongodb_fixes.patch: Multiple upstream MongoDB
handler changes.
I had to backport a lot of changes from upstream to get the build to
succeed and to get the DEP8 tests to pass.
I'm most unhappy with the redis/predis stuff, but I think it's actually
a bug in libphp-predis, which does not ship an autoload.php file?
Thanks for considering the patch.
*** /tmp/tmpXKFgpx/php-monolog_1.23.0-1ubuntu1.debdiff
diff -Nru php-monolog-1.23.0/debian/patches/mongodb_fixes.patch
php-monolog-1.23.0/debian/patches/mongodb_fixes.patch
--- php-monolog-1.23.0/debian/patches/mongodb_fixes.patch 1969-12-31
16:00:00.0 -0800
+++ php-monolog-1.23.0/debian/patches/mongodb_fixes.patch 2018-02-12
21:09:52.0 -0800
@@ -0,0 +1,207 @@
+Description: Multiple upstream MongoDB handler changes
+Author: Nishanth Aravamudan
+Origin: upstream,
https://github.com/Seldaek/monolog/commit/ad37c8e6638d6d21cf4deaca1aafb8c4a29a6d1b.patch
+Origin: upstream,
https://github.com/Seldaek/monolog/commit/f6a9fdbb2c9ad9ef7f26269a1edb1de1c3b6d3cc.patch
+Origin: upstream,
https://github.com/Seldaek/monolog/commit/d860b763cb0419930e9bce71cec7408f215d5a6d.patch
+Origin: upstream,
https://github.com/Seldaek/monolog/commit/aa6ab660bdb32f4568514ad8ed0167b86a57809b.patch
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-13
+
+--- a/composer.json
b/composer.json
+@@ -38,8 +38,8 @@
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search
server",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP
server using php-amqplib",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+
required)",
+-"ext-mongo": "Allow sending log messages to a MongoDB server",
+-"mongodb/mongodb": "Allow sending log messages to a MongoDB server
via PHP Driver",
++"ext-mongodb": "Allow sending log messages to a MongoDB server (via
driver)",
++"mongodb/mongodb": "Allow sending log messages to a MongoDB server
(via library)",
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like
DynamoDB",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "php-console/php-console": "Allow sending log messages to Google
Chrome"
+--- a/src/Monolog/Handler/MongoDBHandler.php
b/src/Monolog/Handler/MongoDBHandler.php
+@@ -11,41 +11,66 @@
+
+ namespace Monolog\Handler;
+
++use MongoDB\Driver\BulkWrite;
++use MongoDB\Driver\Manager;
++use MongoDB\Client;
+ use Monolog\Logger;
+ use Monolog\Formatter\NormalizerFormatter;
+
+ /**
+ * Logs to a MongoDB database.
+ *
+- * usage example:
++ * Usage example:
+ *
+- * $log = new Logger('application');
+- * $mongodb = new MongoDBHandler(new \Mongo("mongodb://localhost:27017"),
"logs", "prod");
++ * $log = new \Monolog\Logger('application');
++ * $client = new \MongoDB\Client('mongodb://localhost:27017');
++ * $mongodb = new \Monolog\Handler\MongoDBHandler($client, 'logs', 'prod');
+ * $log->pushHandler($mongodb);
+ *
+- * @author Thomas Tourlourat
++ * The above examples uses the MongoDB PHP library's client class; however,
the
++ * MongoDB\Driver\Manager class from ext-mongodb is also supported.
+ */
+ class MongoDBHandler extends AbstractProcessingHandler
+ {
+-protected $mongoCollection;
++private $collection;
++private $manager;
++private $namespace;
+
+-public function __construct($mongo, $database, $collection, $level =
Logger::DEBUG, $bubble = true)
++/**
++ * Constructor.
++ *
++ * @param Client|Manager $mongodbMongoDB library or driver client
++ * @param string $database Database name
++ * @param string $collection Collection name
++ * @param int$level The minimum logging level at which
this handler will be triggered
++ * @param Boolean$bubble Whether the messages that are
handled can bubble up the stack or not
++ */
++public function __construct($mongodb, $database, $collection, $level =
Logger::DEBUG, $bubble = true)
+ {
+-if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo ||
$mongo instanceof \MongoDB\Client)) {
+-throw new \InvalidArgumentException('MongoClient, Mongo or
Bug#889858: pkg-php-tools: needs update for PHPUnit 6
18-02-07
15:37:08.0 -0800
@@ -30,7 +30,7 @@
* @author Mathieu Parent
* @license Expat http://www.jclark.com/xml/copying.txt
*/
-class PhppearCliTest extends PHPUnit_Framework_TestCase {
+class PhppearCliTest extends PHPUnit\Framework\TestCase {
protected $_cli;
protected function setUp() {
diff -Nru pkg-php-tools-1.35/tests/PhppearSourceTest.php
pkg-php-tools-1.35ubuntu1/tests/PhppearSourceTest.php
--- pkg-php-tools-1.35/tests/PhppearSourceTest.php 2016-12-26
23:01:08.0 -0800
+++ pkg-php-tools-1.35ubuntu1/tests/PhppearSourceTest.php 2018-02-07
15:37:42.0 -0800
@@ -32,7 +32,7 @@
* @author Mathieu Parent
* @license Expat http://www.jclark.com/xml/copying.txt
*/
-class PhppearSourceTest extends PHPUnit_Framework_TestCase {
+class PhppearSourceTest extends PHPUnit\Framework\TestCase {
/**
* @expectedException InvalidArgumentException
* @expectedExceptionMessage package.xml not found
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#889833: twig: phpab needed for dep8 tests
Package: twig Version: 2.4.4-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/control: phpab is needed to run tests. Thanks for considering the patch. *** /tmp/tmpmwJtIH/twig_2.4.4-2ubuntu1.debdiff diff -Nru twig-2.4.4/debian/tests/control twig-2.4.4/debian/tests/control --- twig-2.4.4/debian/tests/control 2017-11-30 16:37:17.0 -0800 +++ twig-2.4.4/debian/tests/control 2018-02-07 09:13:01.0 -0800 @@ -3,4 +3,5 @@ locales-all, php-psr-container, php-symfony-phpunit-bridge (>= 3.3), - phpunit + phpunit, + phpab -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#889799: php-doctrine-cache-bundle needs php-symfony-yaml for dep8 too
Package: php-doctrine-cache-bundle Version: 1.3.2-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/control: add php-symfony-yaml as test dependency to match build-depends. Thanks for considering the patch. *** /tmp/tmp9Djyep/php-doctrine-cache-bundle_1.3.2-2ubuntu3.debdiff diff -Nru php-doctrine-cache-bundle-1.3.2/debian/tests/control php-doctrine-cache-bundle-1.3.2/debian/tests/control --- php-doctrine-cache-bundle-1.3.2/debian/tests/control2017-11-27 19:56:55.0 -0800 +++ php-doctrine-cache-bundle-1.3.2/debian/tests/control2018-02-06 19:53:51.0 -0800 @@ -1,3 +1,3 @@ Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --template debian/autoload.ci.php.tpl Tests && phpunit Restrictions: rw-build-tree -Depends: @, libphp-predis, php-memcache, php-memcached, php-sqlite3, php-symfony-console, php-symfony-framework-bundle, php-symfony-security-acl, phpab, phpunit, redis-server +Depends: @, libphp-predis, php-memcache, php-memcached, php-sqlite3, php-symfony-console, php-symfony-framework-bundle, php-symfony-security-acl, php-symfony-yaml, phpab, phpunit, redis-server -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#889181: cacti changes for PHP7.2 and dep8 tests
Package: cacti
Version: 1.1.31+ds1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/php72_count_bc_changes.patch: PHP7.2 has deprecated
count() of non-Countable objects.
* debian/patches/update-cactisql.patch: Update cacti.sql for
readstring to community change.
Note that even with this change, the DEP8 tests fail on Ubuntu 18.04,
with:
Unexpected output in /var/log/cacti/cacti.log:
02/02/2018 16:40:07 - AUTOM8 ERROR: The Network ID: 1 is disabled. You must use
the 'force' option to force it's execution.
Which I think might be because we need to pass force to some URL or
check a network enabled box in the script?
Thanks for considering the patch.
*** /tmp/tmp6E1xYI/cacti_1.1.31+ds1-1ubuntu1.debdiff
diff -Nru cacti-1.1.31+ds1/debian/patches/php72_count_bc_changes.patch
cacti-1.1.31+ds1/debian/patches/php72_count_bc_changes.patch
--- cacti-1.1.31+ds1/debian/patches/php72_count_bc_changes.patch
1969-12-31 16:00:00.0 -0800
+++ cacti-1.1.31+ds1/debian/patches/php72_count_bc_changes.patch
2018-02-02 08:21:41.0 -0800
@@ -0,0 +1,106 @@
+Description: PHP7.2 has deprecated count() of non-Countable objects
+Author: Nishanth Aravamudan
+Origin: upstream,
https://github.com/Cacti/cacti/commit/202163bf7c8541f1b2827bdd62c584cc4d25124a.patch
+Bug: https://github.com/Cacti/cacti/issues/1040
+Last-Update: 2018-02-02
+
+--- cacti-1.1.31+ds1.orig/graphs_new.php
cacti-1.1.31+ds1/graphs_new.php
+@@ -757,7 +757,7 @@ function graphs() {
+ $num_input_fields = 0;
+ $num_visible_fields = 0;
+
+- if ($xml_array != false) {
++ if (sizeof($xml_array)) {
+ /* loop through once so we can find out
how many input fields there are */
+ foreach ($xml_array['fields'] as
$field_name => $field_array) {
+ if ($field_array['direction']
== 'input' || $field_array['direction'] == 'input-output') {
+--- cacti-1.1.31+ds1.orig/lib/api_automation.php
cacti-1.1.31+ds1/lib/api_automation.php
+@@ -760,7 +760,7 @@ function display_new_graphs($rule, $url)
+* for a dropdown selection
+*/
+ $xml_array = get_data_query_array($rule['snmp_query_id']);
+- if ($xml_array != false) {
++ if (sizeof($xml_array)) {
+ /* loop through once so we can find out how many input fields
there are */
+ foreach ($xml_array['fields'] as $field_name => $field_array) {
+ if ($field_array['direction'] == 'input' ||
$field_array['direction'] == 'input-output') {
+@@ -1898,7 +1898,7 @@ function global_item_edit($rule_id, $rul
+ $xml_array =
get_data_query_array($automation_rule['snmp_query_id']);
+ $fields = array();
+
+- if (sizeof($xml_array['fields'])) {
++ if (sizeof($xml_array) && sizeof($xml_array['fields'])) {
+ foreach($xml_array['fields'] as $key => $value) {
+ # ... work on all input fields
+ if (isset($value['direction']) &&
($value['direction'] == 'input' || $value['direction'] == 'input-output')) {
+--- cacti-1.1.31+ds1.orig/lib/data_query.php
cacti-1.1.31+ds1/lib/data_query.php
+@@ -27,7 +27,7 @@ function run_data_query($host_id, $snmp_
+
+ /* required for upgrading old versions of cacti */
+ if (!db_column_exists('host', 'poller_id')) {
+- return;
++ return false;
+ }
+
+ /* don't run/rerun the query if the host is down, or disabled */
+@@ -205,7 +205,7 @@ function get_data_query_array($snmp_quer
+
+ if (!file_exists($xml_file_path)) {
+ query_debug_timer_offset('data_query', "Could not find
data query XML file at '$xml_file_path'");
+- return false;
++ return array();
+ }
+
+ query_debug_timer_offset('data_query', "Found data query XML
file at '$xml_file_path'");
+@@ -1227,7 +1227,7 @@ function get_formatted_data_query_indexe
+ /* in case no unique index is available, fallback to first field in XML
*/
+ if ($sort_cache['sort_field'] == ''){
+ $snmp_queries = get_data_query_array($data_query_id);
+- if (isset($snmp_queries['index_ord
Bug#889165: php-horde-test: PHPUnit 6.0.0 renamed many classes
Package: php-horde-test
Version: 2.6.3+debian0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
## REPLACE THIS WITH ACTUAL INFORMATION -
## Please add all necessary information about why the change needed to go in
## Ubuntu, quote policy, spec or any other background material and why it can
## and should be used in Debian too. If the patch is composed of multiple
## independent pieces, please send them as separate bug reports.
## REPLACE THIS WITH ACTUAL INFORMATION -
* debian/patches/phpunit_renamed_phpunit_classes.patch: PHPUnit 6 has
renamed a number of classes to be namespaced.
Thanks for considering the patch.
*** /tmp/tmpXMG2z4/php-horde-test_2.6.3+debian0-1ubuntu1.debdiff
diff -Nru
php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch
php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch
---
php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch
1969-12-31 16:00:00.0 -0800
+++
php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch
2018-02-02 13:04:04.0 -0800
@@ -0,0 +1,47 @@
+Description: PHPUnit 6 has renamed a number of classes to be namespaced
+ Relevenat PHPUnit change:
https://github.com/sebastianbergmann/phpunit/commit/ba2241e6e0a634dc333b6e1d2fd6d0e8c16c2f57
+Author: Nishanth Aravamudan
+Last-Update: 2018-02-02
+
+---
php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/AllTests.php
php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/AllTests.php
+@@ -81,7 +81,7 @@ class Horde_Test_AllTests
+ chdir($this->_dir);
+ $old_error = error_reporting();
+ $suite = $this->suite();
+-$runner = new PHPUnit_TextUI_TestRunner();
++$runner = new PHPUnit\TextUI\TestRunner();
+ $result = $runner->doRun($suite, array('colors' => 'auto'), false);
+ error_reporting($old_error);
+ chdir($old_dir);
+@@ -91,7 +91,7 @@ class Horde_Test_AllTests
+ /**
+ * Collect the unit tests of this directory into a new suite.
+ *
+- * @return PHPUnit_Framework_TestSuite The test suite.
++ * @return PHPUnit\Framework\TestSuite The test suite.
+ */
+ public function suite()
+ {
+---
php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/AllTests/TestRunner.php
php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/AllTests/TestRunner.php
+@@ -22,7 +22,7 @@
+ * @link http://www.horde.org/components/Horde_Test
+ * @package Test
+ */
+-class Horde_Test_AllTests_TestRunner extends PHPUnit_Runner_BaseTestRunner
++class Horde_Test_AllTests_TestRunner extends PHPUnit\Runner\BaseTestRunner
+ {
+ /**
+ * Get the test suite.
+--- php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/Case.php
php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/Case.php
+@@ -27,7 +27,7 @@
+ * @license http://www.horde.org/licenses/lgpl21 LGPL
+ * @link http://www.horde.org/components/Horde_Test
+ */
+-class Horde_Test_Case extends PHPUnit_Framework_TestCase
++class Horde_Test_Case extends PHPUnit\Framework\TestCase
+ {
+ /**
+ * Useful shorthand if you are mocking a class with a private constructor
diff -Nru php-horde-test-2.6.3+debian0/debian/patches/series
php-horde-test-2.6.3+debian0/debian/patches/series
--- php-horde-test-2.6.3+debian0/debian/patches/series 1969-12-31
16:00:00.0 -0800
+++ php-horde-test-2.6.3+debian0/debian/patches/series 2018-02-02
13:03:02.0 -0800
@@ -0,0 +1 @@
+phpunit_renamed_phpunit_classes.patch
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#889162: tests: do not rely on directory order
Package: php-horde-compress
Version: 2.2.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/tests_dont_rely_on_directory_order.patch: don't rely
on directory order. Thanks to Remi Collet .
Thanks for considering the patch.
*** /tmp/tmp8z9ngU/php-horde-compress_2.2.1-1ubuntu1.debdiff
diff -Nru php-horde-compress-2.2.1/debian/patches/series
php-horde-compress-2.2.1/debian/patches/series
--- php-horde-compress-2.2.1/debian/patches/series 1969-12-31
16:00:00.0 -0800
+++ php-horde-compress-2.2.1/debian/patches/series 2018-02-02
12:50:44.0 -0800
@@ -0,0 +1 @@
+tests_dont_rely_on_directory_order.patch
diff -Nru
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
---
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
1969-12-31 16:00:00.0 -0800
+++
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
2018-02-02 12:53:41.0 -0800
@@ -0,0 +1,29 @@
+Description: don't rely on directory order
+Author: Remi Collet
+Origin: upstream,
https://github.com/horde/Compress/commit/795f908809c4181b7d267bc9df3682e3b4ed45d0.patch
+Last-Update: 2018-02-02
+
+---
php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
+@@ -111,6 +111,9 @@ class Horde_Compress_TarTest extends Hor
+ $this->assertNotEmpty($tar_data);
+
+ $list = $compress->decompress($tar_data);
++usort($list, function ($a, $b) {
++return strcmp($a['name'], $b['name']);
++});
+ $this->assertCount(3, $list);
+ $this->assertEquals('one.txt', $list[0]['name']);
+ $this->assertEquals(4, $list[0]['size']);
+---
php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
+@@ -142,6 +142,9 @@ class Horde_Compress_ZipTest extends Hor
+ $list = $compress->decompress(
+ $zip_data, array('action' => Horde_Compress_Zip::ZIP_LIST)
+ );
++usort($list, function ($a, $b) {
++ return strcmp($a['name'], $b['name']);
++});
+ $this->assertCount(3, $list);
+ $this->assertEquals('one.txt', $list[0]['name']);
+ $this->assertEquals(4, $list[0]['size']);
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#889113: phpunit-object-enumerator dep8 tests need phpab
Package: phpunit-object-enumerator Version: 3.0.3-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/control: phpab is needed to run the DEP8 tests. Thanks for considering the patch. *** /tmp/tmpq_42bg/phpunit-object-enumerator_3.0.3-2ubuntu3.debdiff diff -Nru phpunit-object-enumerator-3.0.3/debian/tests/control phpunit-object-enumerator-3.0.3/debian/tests/control --- phpunit-object-enumerator-3.0.3/debian/tests/control2017-08-23 22:26:36.0 -0700 +++ phpunit-object-enumerator-3.0.3/debian/tests/control2018-02-01 20:19:00.0 -0800 @@ -1,3 +1,3 @@ Test-Command: mkdir --parents vendor && phpab --template debian/autoload.php.ci.in --output vendor/autoload.php tests/_fixture/ && phpunit Restrictions: rw-build-tree -Depends: @, phpunit +Depends: @, phpunit, phpab -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#888407: celery tests are run with pytest not nosetest
Package: celery Version: 4.1.0-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/upstream: tests are now run with pytest. With this, the DEP8 tests pass again. Thanks for considering the patch. *** /tmp/tmpsI8Noq/celery_4.1.0-2ubuntu1.debdiff diff -Nru celery-4.1.0/debian/tests/upstream celery-4.1.0/debian/tests/upstream --- celery-4.1.0/debian/tests/upstream 2017-11-15 05:58:01.0 -0800 +++ celery-4.1.0/debian/tests/upstream 2018-01-24 21:26:34.0 -0800 @@ -1,3 +1,14 @@ #!/bin/sh -nosetests -v -P celery.tests +# distro tests appear to be intentional to fail: +# https://github.com/celery/celery/issues/2517 +# integration tests require a rabbitmq-server: +# https://github.com/celery/celery/issues/3917 + +for p in $(pyversions -s); do + $p $(which pytest) --ignore t/distro --ignore t/integration t +done + +for p in $(py3versions -s); do + $p $(which pytest-3) --ignore t/distro --ignore t/integration t +done -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#887563: corosync prerm will stop pacemaker and not start it again
Source: corosync Severity: normal Dear Maintainer, We have a report in Ubuntu, https://bugs.launchpad.net/charm-hacluster/+bug/1740892, which I believe is reproducible in Debian Sid as well. In particular, I set up a Sid LXD: # apt install corosync pacemaker ... # systemctl status corosync pacemaker ● corosync.service - Corosync Cluster Engine ... Active: active (running) since Wed 2018-01-17 23:14:56 UTC; 9s ago ... ● pacemaker.service - Pacemaker High Availability Cluster Manager ... Active: active (running) since Wed 2018-01-17 23:15:00 UTC; 5s ago # apt install --reinstall corosync ... # systemctl status corosync pacemaker ● corosync.service - Corosync Cluster Engine ... Active: active (running) since Wed 2018-01-17 23:15:23 UTC; 3s ago ● pacemaker.service - Pacemaker High Availability Cluster Manager ... Active: inactive (dead) since Wed 2018-01-17 23:15:22 UTC; 4s ago I believe this is because the prerm of corosync.service has # Automatically added by dh_installinit if [ -x "/etc/init.d/corosync" ]; then invoke-rc.d corosync stop || exit $? fi which unconditionally stops corosync for all Debian and Ubuntu releases (as the init script is installed even if unused by systemd). When corosync stops, pacemaker fails to connect to corosync (and the pacemaker systemd unit file specifies that pacemaker Requires corosync) and also stops. When the postinst for corosync runs: if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then if [ -x "/etc/init.d/corosync" ]; then update-rc.d corosync defaults >/dev/null invoke-rc.d corosync start || exit $? fi fi corosync will start, but there is no connection between corosync starting (systemd or SysV) and pacemaker. I think there are two necessary changes to the packaging/upstream to fix this: 1) The systemd unit file should indicate pacemaker is PartOf corosync, which will propogate restarts of corosync to pacemaker. This will also propogate stops, but as mentioned above, pacemaker already stops when corosync stops, so I think it's harmless. Additionally, the SysV init file should be updated to check if the pacemaker SysV status was running before stopping corosync in the restart path and start pacemaker as well after starting corosync. 2) d/rules should call dh_installinit with --restart-after-upgrade. This is the default in compat >= 10 (2.4.2-3 is still at 9). That will change the prerm and postinst to not stop/start the service on upgrade, but simply restart it in the postinst (removals will still stop the service). Now, neither of these actually fix the existing packages unfortunately, which will stop pacemaker on the upgrade to a fixed package and thus stop pacemaker. I have no idea if there actually is any way to fix this for existing packages, since the 'old' prerm will be invoked by dpkg on the upgrade path. -- System Information: Debian Release: buster/sid APT prefers bionic APT policy: (500, 'bionic') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#881010: kopanocore: drop versioned php-dev build-dependency
Package: kopanocore Version: 8.3.4-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch Dear Maintainer, Much like the changes in recent kopanocore uploads for the binary dependencies, the build-dependencies do not need to be versioned. Thanks for considering the patch. *** /tmp/tmpezTwhs/kopanocore_8.3.4-4ubuntu1.debdiff diff -Nru kopanocore-8.3.4/debian/control kopanocore-8.3.4/debian/control --- kopanocore-8.3.4/debian/control 2017-10-19 11:39:05.0 -0700 +++ kopanocore-8.3.4/debian/control 2017-11-06 16:07:00.0 -0800 @@ -34,7 +34,7 @@ libvmime-dev (>= 0.9.2-4), libxml2-dev, m4, - php7.0-dev, + php-dev, pkg-config (>= 0.18), python-dev, swig, -- System Information: Debian Release: stretch/sid APT prefers artful-updates APT policy: (500, 'artful-updates'), (500, 'artful-security'), (500, 'artful') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#874615: pristine-tar: pristine-bz2 failed to reproduce build of /path/to/perl_5.16.0.orig.tar.bz2
Package: pristine-tar Version: 1.40 Severity: normal Dear Maintainer, In git-ubuntu, which uses pristine-tar as in the forthcoming Ubuntu Artful (17.10), we are encountering the following failure to use `gbp import-orig --pristine-tar`: 09/07/2017 23:04:55 - INFO:Importing patches-unapplied 5.16.0-1 to debian/experimental 09/07/2017 23:06:27 - ERROR:Command exited 1: gbp import-orig --no-merge --upstream-branch do-not-push --pristine-tar --no-interactive --no-symlink-orig '--upstream-tag=importer/upstream/debian/%(version)s.bz2' /tmp/tmpjxa3xdz_/.git/git-ubuntu-cache/perl_5.16.0.orig.tar.bz2 09/07/2017 23:06:27 - ERROR:stdout: gbp:info: Importing '/tmp/tmpjxa3xdz_/.git/git-ubuntu-cache/perl_5.16.0.orig.tar.bz2' to branch 'do-not-push'... gbp:info: Source package is perl gbp:info: Upstream version is 5.16.0 gbp:info: Rolling back branch do-not-push by resetting it to 175d7589b54d8c0732cd5682a0fb9acb616cfa1e gbp:info: Rolling back branch pristine-tar by resetting it to 8442e7f38d36473f4a0ac2b642cb0a58a98cb5e4 09/07/2017 23:06:27 - ERROR:stderr: gbp:error: Import of /tmp/tmpjxa3xdz_/.git/git-ubuntu-cache/perl_5.16.0.orig.tar.bz2 failed: Couldn't commit to 'pristine-tar' with upstream '0c9799299a9a8bccec0c3eca804618a99e5adcb7': pristine-bz2 failed to reproduce build of /tmp/tmpjxa3xdz_/.git/git-ubuntu-cache/perl_5.16.0.orig.tar.bz2 (Please file a bug report.) pristine-tar: command failed: pristine-bz2 --no-verbose --no-debug --no-keep gendelta /tmp/tmpjxa3xdz_/.git/git-ubuntu-cache/perl_5.16.0.orig.tar.bz2 /tmp/pristine-tar.zIp5kBWl9R/wrapper pristine-tar: failed to generate delta gbp:error: Error detected, Will roll back changes. gbp:error: Rolled back changes after import error. I'm tracking as many cases as I encounter from historical imports at: https://bugs.launchpad.net/bugs/1699887 . What's the best way for me to help drive these to resolution? I'm happy to work on code to solve this, but am not sure where the underlying error is.
Bug#872872: python-pika-pool: add missing test dependency
Package: python-pika-pool Version: 0.1.3-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu artful ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/tests/control: add python3-all as depedency of pika-pool-unit-tests. Thanks for considering the patch. *** /tmp/tmpknmYDd/python-pika-pool_0.1.3-1ubuntu2.debdiff diff -Nru python-pika-pool-0.1.3/debian/tests/control python-pika-pool-0.1.3/debian/tests/control --- python-pika-pool-0.1.3/debian/tests/control 2016-03-04 12:20:20.0 -0800 +++ python-pika-pool-0.1.3/debian/tests/control 2017-06-12 17:37:30.0 -0700 @@ -1,3 +1,3 @@ Tests: pika-pool-unit-tests -Depends: python-pytest, python3-pytest, python-pika, python3-pika, rabbitmq-server +Depends: python-pytest, python3-pytest, python-pika, python3-pika, rabbitmq-server, python3-all Restrictions: needs-root -- System Information: Debian Release: stretch/sid APT prefers artful APT policy: (500, 'artful') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.12.0-11-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#867363: d/t/basic: do not assume local filesystem size supports ocfs2 blocksize
Package: ocfs2-tools Version: 1.8.5-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu artful ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: - d/t/basic: do not assume local filesystem blocksize will support the mkfs.ocfs2 blocksize (e.g., 4k disks will not support a 1k blocksize). Thanks for considering the patch. *** /tmp/tmpUzk4dx/ocfs2-tools_1.8.5-1ubuntu1.debdiff diff -Nru ocfs2-tools-1.8.5/debian/tests/basic ocfs2-tools-1.8.5/debian/tests/basic --- ocfs2-tools-1.8.5/debian/tests/basic2016-10-21 09:24:13.0 -0700 +++ ocfs2-tools-1.8.5/debian/tests/basic2017-07-05 17:21:52.0 -0700 @@ -16,7 +16,7 @@ # test tools echo "=== mkfs ===" -mkfs.ocfs2 --force --mount local $DISK 2>&1 +mkfs.ocfs2 --force --mount local --block-size $(stat -f $DISK --format='%s') $DISK 2>&1 echo "=== fsck ===" yes | fsck.ocfs2 -f -y -F $DISK 2>&1 -- System Information: Debian Release: stretch/sid APT prefers artful APT policy: (500, 'artful') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#865573: git-buildpackage: gbp import-orig git_2.13.1.orig.tar.xz fails
Package: git-buildpackage Version: 0.8.12.2 Severity: normal Dear Maintainer, The Ubuntu git importer is unable to import the orig tarballs for the latest uploads to Debian for src:git, as pristine-tar is unable to recreate the provided orig tarball. Verbose log is: # gbp import-orig ../git_2.13.1.orig.tar.xz --pristine-tar --verbose gbp:debug: ['git', 'rev-parse', '--show-cdup'] gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] gbp:debug: ['git', 'rev-parse', '--git-dir'] gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'status', '--porcelain'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master:debian/changelog'] What will be the source package name? [git] What is the upstream version? [2.13.1] gbp:debug: ['git', 'tag', '-l', 'upstream/2.13.1'] gbp:debug: tar ['-C', '../tmphDjmdz', '-a', '-xf', '../git_2.13.1.orig.tar.xz'] [] gbp:debug: Unpacked '../git_2.13.1.orig.tar.xz' to '../tmphDjmdz/git-2.13.1' gbp:info: Importing '../git_2.13.1.orig.tar.xz' to branch 'upstream'... gbp:info: Source package is git gbp:info: Upstream version is 2.13.1 gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'add', '-f', '.'] gbp:debug: ['git', 'write-tree'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] gbp:debug: Will create missing branch 'upstream'... gbp:debug: ['git', 'commit-tree', '517e235ade1f8ffecdaf048f7f7adb494383bbca'] gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 2.13.1', 'refs/heads/upstream', '0ae0e594ef4d5a2756ca561e56c68c0ddee8e6ba'] gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar'] gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] gbp:debug: ['git', 'mktree', '-z'] gbp:debug: /usr/bin/pristine-tar [] ['commit', '../git_2.13.1.orig.tar.xz', '517e235ade1f8ffecdaf048f7f7adb494383bbca'] gbp:error: Couldn't commit to 'pristine-tar' with upstream '517e235ade1f8ffecdaf048f7f7adb494383bbca': pristine-xz failed to reproduce build of ../git_2.13.1.orig.tar.xz (Please file a bug report.) pristine-tar: command failed: pristine-xz --no-verbose --no-debug --no-keep gendelta ../git_2.13.1.orig.tar.xz /tmp/pristine-tar.DKOKI61g5N/wrapper pristine-tar: failed to generate delta gbp:error: Import of ../git_2.13.1.orig.tar.xz failed: Couldn't commit to 'pristine-tar' with upstream '517e235ade1f8ffecdaf048f7f7adb494383bbca': pristine-xz failed to reproduce build of ../git_2.13.1.orig.tar.xz (Please file a bug report.) pristine-tar: command failed: pristine-xz --no-verbose --no-debug --no-keep gendelta ../git_2.13.1.orig.tar.xz /tmp/pristine-tar.DKOKI61g5N/wrapper pristine-tar: failed to generate delta gbp:error: Error detected, Will roll back changes. gbp:info: Rolling back branch upstream by deleting it gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'branch', '-D', 'upstream'] gbp:info: Rolling back branch pristine-tar by deleting it gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar'] gbp:error: Rolled back changes after import error. gbp:debug: rm ['-rf', '../tmphDjmdz'] [] And I'm reporting the bug as requested :) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#863441: symfony: fix testsuite failures with PHP7.1
Package: symfony
Version: 2.8.7+dfsg-1.2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/fix-php-7.1-vardumper-failures: Fix VarDumper and
VarDumper tests on PHP7.1. Thanks to Nicolas Grekas
.
* debian/patches/fix-php-7.1-classloader-failures: Fix ClassLoader
tests with PHP7.1. Thanks to Nicolas Grekas
..
* debian/patches/fix-php-7.1-filesystem-failures: Fix Filesystem test
with PHP7.1.
Thanks for considering the patch.
*** /tmp/tmpnCEGox/symfony_2.8.7+dfsg-1.2ubuntu2.debdiff
diff -Nru symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-classloader-failures
symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-classloader-failures
--- symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-classloader-failures
1969-12-31 16:00:00.0 -0800
+++ symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-classloader-failures
2017-05-26 11:55:05.0 -0700
@@ -0,0 +1,52 @@
+Description: Fix ClassLoader tests with PHP7.1
+Author: Nicolas Grekas .
+Origin: upstream,
https://github.com/symfony/symfony/commit/0f95708a1dea343784f5b7b8533faf4240e0f7da
+Reviewed-by: Nishanth Aravamudan
+Last-Update: 2017-05-26
+
+---
symfony-2.8.7+dfsg.orig/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
symfony-2.8.7+dfsg/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
+@@ -31,14 +31,14 @@ class ClassCollectionLoaderTest extends
+ $m = $r->getMethod('getOrderedClasses');
+ $m->setAccessible(true);
+
+-$ordered =
$m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader',
array('CTFoo'));
++$ordered = $m->invoke(null, array('CTFoo'));
+
+ $this->assertEquals(
+ array('TD', 'TC', 'TB', 'TA', 'TZ', 'CTFoo'),
+ array_map(function ($class) { return $class->getName(); },
$ordered)
+ );
+
+-$ordered =
$m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader',
array('CTBar'));
++$ordered = $m->invoke(null, array('CTBar'));
+
+ $this->assertEquals(
+ array('TD', 'TZ', 'TC', 'TB', 'TA', 'CTBar'),
+@@ -62,7 +62,7 @@ class ClassCollectionLoaderTest extends
+ $m = $r->getMethod('getOrderedClasses');
+ $m->setAccessible(true);
+
+-$ordered =
$m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
++$ordered = $m->invoke(null, $classes);
+
+ $this->assertEquals($expected, array_map(function ($class) { return
$class->getName(); }, $ordered));
+ }
+@@ -120,7 +120,7 @@ class ClassCollectionLoaderTest extends
+ $m = $r->getMethod('getOrderedClasses');
+ $m->setAccessible(true);
+
+-$ordered =
$m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
++$ordered = $m->invoke(null, $classes);
+
+ $this->assertEquals($expected, array_map(function ($class) { return
$class->getName(); }, $ordered));
+ }
+@@ -162,7 +162,7 @@ class ClassCollectionLoaderTest extends
+ $m = $r->getMethod('getOrderedClasses');
+ $m->setAccessible(true);
+
+-$ordered =
$m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
++$ordered = $m->invoke(null, $classes);
+
+ $this->assertEquals($expected, array_map(function ($class) { return
$class->getName(); }, $ordered));
+ }
diff -Nru symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-filesystem-failures
symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-filesystem-failures
--- symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-filesystem-failures
1969-12-31 16:00:00.0 -0800
+++ symfony-2.8.7+dfsg/debian/patches/fix-php-7.1-filesystem-failures
2017-05-26 14:30:59.0 -0700
@@ -0,0 +1,21 @@
+Description: Fix Filesystem test with PHP7.1
+ PHP7.1 has changed tempnam() to print a notice when falling back to the
+ system temporary directory. This leads to a testcase failure. For
+ reference, PHP bug/feature change is
+ https://bugs.php.net/bug.php?id=69489.
+Author: Nishanth Aravamudan
+Origin: vendor
+Forwarded: yes, https://github.com/symfony/symfony/pull/22923
+Last-Update: 2017-05-26
+
+--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+@@ -1091,7 +1091,7 @@
+ $scheme = 'file://';
+ $dirname =
$scheme.$this->workspace.DIRECTORY_SEPARATOR.'does_not_exist';
+
+-$filename = $this->filesystem->tempnam($dirname, 'bar
Bug#862420: postgresql-common: Add Ubuntu 17.10 as a supported version for posgresql-9.6
Package: postgresql-common Version: 181 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu artful ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * debian/supported-versions: add Ubuntu 17.10. Thanks for considering the patch. *** /tmp/tmpI43ma1/postgresql-common_181ubuntu1.debdiff diff -Nru postgresql-common-181/debian/supported-versions postgresql-common-181ubuntu1/debian/supported-versions --- postgresql-common-181/debian/supported-versions 2017-04-09 00:30:31.0 -0700 +++ postgresql-common-181ubuntu1/debian/supported-versions 2017-05-11 15:41:35.0 -0700 @@ -82,7 +82,7 @@ 12.04) /bin/echo -e "9.1" ;; 14.04) /bin/echo -e "9.3" ;; 16.04|16.10) /bin/echo -e "9.5" ;; -17.04) /bin/echo -e "9.6" ;; +17.04|17.10) /bin/echo -e "9.6" ;; *) echo "supported-versions: WARNING: Unknown Ubuntu release: $1" >&2 /bin/echo -e "$DEFAULT" ;; -- System Information: Debian Release: stretch/sid APT prefers zesty-updates APT policy: (500, 'zesty-updates'), (500, 'zesty-security'), (500, 'zesty'), (100, 'zesty-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-20-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861849: kopanocore: d/p/OpenSSL-Make-SSLv2-conditional.patch has obvious logic bug
Package: kopanocore Severity: normal Dear Maintainer, The d/p/OpenSSL-Make-SSLv2-conditional.patch appears to be logiclly buggy: In the case that SSL_TXT_SSLV2 is true, the 'else if' blocks have no contents and result in syntax errors. As Ubuntu has not yet migrated OpenSSL versions, and kopanocore is auto-synced, this results in a FTBFS on Ubuntu 17.10. I believe both #ifdef SSL_TXT_SSLV2 should contain a last line of ssl_proto = 0x02; -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861775: kopanocore: src:kopanocore has a harcoded php7.0-mapi binary
Package: kopanocore Severity: normal Dear Maintainer, It would appear kopanocore doesn't follow many other PHP packages and explicitly names it's binary package php7.0-mapi rather than php-mapi. This requires renaming the binary package and explicitly adding transitional changes for upgraders as the PHP version changes (while not applicable currently since only in unstable, this might become true in the future). Can kopanocore be modified to be like other PHP packages and generate php-mapi, as well as dropping it's versioned dependencies? Ubuntu 17.10 intends to ship with PHP7.1 and I believe Debian will be going through this transition as well. -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861637: sassphp: src:sassphp explicitly creates a php7.0 binary package
Package: sassphp Version: 0.5.10-2 Severity: normal Dear Maintainer, It would appear that sassphp doesn't follow many other PHP packages and explicitly names it's binary package php7.0-sassphp rather than php-sassphp. This requires renaming the binary package and explicitly adding transitional changes for upgraders as the PHP version changes. Can sassphp be modified to be like other PHP packages and generate php-sassphp? Thanks, Nish -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861364: dgit: empty directories are not representable
Package: dgit Version: 3.10 Severity: normal Dear Maintainer, At least src:software-properties has at one time had empty directories in the source package, e.g. in 0.96.20.5 in xenial on Ubuntu, and git (and thus dgit (via import-dsc) and the Ubuntu git importer) fail to properly represent the srcpkg's contents in the import. Specifically, tests/aptroot/etc/apt/apt.conf.d/ is missing from either import. Given that git does not represent empty directories, I'm not sure what we should do here? Thanks! -Nish
Bug#861362: src:jsusfx: unnecessary versioned b-d on php7.0-cli?
Source: jsusfx Severity: minor Dear Maintainer, While not critical, the line in d/control php7.0-cli [amd64] | php-cli [amd64], seems unnecessary? That is, can't it just be php-cli? Thanks, Nish -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861361: ruby-riddle: update build-depend to unversioned php-cli
Package: ruby-riddle Version: 1.5.12-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu artful ubuntu-patch Dear Maintainer, Ubuntu 17.10 (and eventually Debian) are switching the default PHP to 7.1. To that end, it is better to depend on the php-cli metapackage, unless explicit version-specific dependencies exist (for the CLI this seems unlikely). In Ubuntu, the attached patch was applied to achieve the following: * d/control: change b-d from php7.0 to php-cli, as there is no specific need for PHP7.0. Thanks for considering the patch. *** /tmp/tmpOL60I7/ruby-riddle_1.5.12-4ubuntu1.debdiff diff -Nru ruby-riddle-1.5.12/debian/control ruby-riddle-1.5.12/debian/control --- ruby-riddle-1.5.12/debian/control 2017-01-04 00:34:26.0 -0800 +++ ruby-riddle-1.5.12/debian/control 2017-04-27 16:29:30.0 -0700 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10~), default-mysql-server | virtual-mysql-server, gem2deb, - php7.0-cli, + php-cli, procps, rake, ruby-mysql2, -- System Information: Debian Release: stretch/sid APT prefers zesty-updates APT policy: (500, 'zesty-updates'), (500, 'zesty-security'), (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-20-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#861360: tsmarty2c: update dependency to php-cli
Package: smarty-gettext
Version: 1.5.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch
Dear Maintainer,
As Ubuntu is transitioning to PHP7.1 in 17.10, we have applied the
following patch. I believe Debian will want to do something similar so
as to always depend on the current php-cli binary package, rather than a
specific PHP7.x version.
In Ubuntu, the attached patch was applied to achieve the following:
* debian/control:
+ Update dependency to be php-cli, as it does not depend on PHP7.0
functionality.
Thanks for considering the patch.
*** /tmp/tmpCKu12w/smarty-gettext_1.5.0-2ubuntu1.debdiff
diff -Nru smarty-gettext-1.5.0/debian/control
smarty-gettext-1.5.0/debian/control
--- smarty-gettext-1.5.0/debian/control 2016-12-06 07:44:48.0 -0800
+++ smarty-gettext-1.5.0/debian/control 2017-04-27 16:22:56.0 -0700
@@ -28,7 +28,7 @@
Package: tsmarty2c
Architecture: all
Depends: ${misc:Depends},
- php7.0-cli,
+ php-cli,
Breaks: smarty-gettext (<< 1.5.0-1~),
Replaces: smarty-gettext (<< 1.5.0-1~),
Description: Smarty Gettext's translation string ripper
-- System Information:
Debian Release: stretch/sid
APT prefers zesty-updates
APT policy: (500, 'zesty-updates'), (500, 'zesty-security'), (500, 'zesty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.10.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#858305: celeryd: celerdy should depend on python-celery-common?
Package: celeryd Severity: normal Dear Maintainer, It seems like celeryd incorrectly only depends on python-celery (which appears to just the python2 library code), but the init scripts in celeryd invoke celery and celeryd, which are (now?) in python-celery-common. Thanks, Nish -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#858298: celeryd: /etc/init.d/celeryd has syntax error on dash
Package: celeryd Severity: normal Dear Maintainer, In my quick testing in a Debian container (where sh -> dash), /etc/init.d/celeryd reports an error for line 46, fixed upstream. "/etc/init.d/celeryd: 46: /etc/init.d/celeryd: [[: not found" https://github.com/celery/celery/commit/f399d076a102d9022ef61cbdc5dfce9795496b1b and backported to the 3.1 series in: https://github.com/celery/celery/commit/44c0ebf9c46406988e5002f8a78aa2dd506451d6 I think this is worth fixing in the Debian package. -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#858287: dep3changelog: parsing is too strict about blank lines
Package: devscripts Version: 2.16.8ubuntu1 Severity: normal Tags: patch Dear Maintainer, dep3changelog currently fails to extract bug information from `git format-patch` output, including the first example from http://dep.debian.net/deps/dep3/. This is because dep3changelog exits its main processing loop upon seeing a line matching /^---/ (correctly) or /^\s*$/ (incorrectly). The DEP3 spec has a specific structure mentioned, which refers to one or two headers, where a headers start on a non-empty line and ends on an empty line, but also says "Any parser that expect those fields in patch headers should also accept non-structured content and simply append the non-structured content to the value of the Description field." I believe the example from the dep3 page (as well as most `git format-patch` output) will include non-structured content in the form of the commit message. Given that we only care about the first line of the commit message (we really only want the shorthand), I think it is ok to just skip any empty lines until we see the /^---/. We could extend the parser to count headers and also stop after the second header, but this seems like overkill for a fairly simple parser (that doesn't really care about the header count, it just needs to not quit before seeing all the structured fields). Thanks, Nish -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#856998: samba-vfs-modules does not contain ceph module
Package: samba Version: 2:4.5.4+dfsg-1 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu zesty ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/control: add libcephfs-dev as b-d to build vfs_ceph (LP: #1668940). Thanks for considering the patch. *** /tmp/tmpBr5eua/samba_2:4.5.4+dfsg-1ubuntu2.debdiff diff -Nru samba-4.5.4+dfsg/debian/control samba-4.5.4+dfsg/debian/control --- samba-4.5.4+dfsg/debian/control 2017-01-26 17:20:15.0 -0800 +++ samba-4.5.4+dfsg/debian/control 2017-03-06 11:13:41.0 -0800 @@ -25,6 +24,7 @@ libblkid-dev, libbsd-dev, libcap-dev [linux-any], + libcephfs-dev, libcups2-dev, libgnutls28-dev, libgpgme11-dev, -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#856437: postgresql-plproxy: autopkgtest depends on newpid which fails to install LXD runners
Package: postgresql-plproxy Version: 2.7-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu zesty ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/control: the newpid package fails to install in LXD environments (relies on fs capabilities which are disallowed by the kernel in user namespaces), so use unshare instead. Thanks for considering the patch. *** /tmp/tmp9Ftaz0/postgresql-plproxy_2.7-1ubuntu2.debdiff diff -Nru postgresql-plproxy-2.7/debian/tests/control postgresql-plproxy-2.7/debian/tests/control --- postgresql-plproxy-2.7/debian/tests/control 2017-02-28 10:19:53.0 -0800 +++ postgresql-plproxy-2.7/debian/tests/control 2017-02-28 16:28:57.0 -0800 @@ -1,3 +1,3 @@ Tests: installcheck -Depends: @, postgresql-server-dev-all, newpid +Depends: @, postgresql-server-dev-all, util-linux Restrictions: allow-stderr needs-root diff -Nru postgresql-plproxy-2.7/debian/tests/installcheck postgresql-plproxy-2.7/debian/tests/installcheck --- postgresql-plproxy-2.7/debian/tests/installcheck2017-02-28 10:19:53.0 -0800 +++ postgresql-plproxy-2.7/debian/tests/installcheck2017-02-28 16:28:57.0 -0800 @@ -32,7 +32,7 @@ if ! chmod o+w $AUTOPKGTEST_TMP && \ PG_CLUSTER_CONF_ROOT=$AUTOPKGTEST_TMP \ PG_CONFIG=/usr/lib/postgresql/$v/bin/pg_config \ - newnet pg_virtualenv -c "-p 5432 --locale C -s $AUTOPKGTEST_TMP" -i '--auth trust' -v $v \ + unshare -inu pg_virtualenv -c "-p 5432 --locale C -s $AUTOPKGTEST_TMP" -i '--auth trust' -v $v \ make -f $PWD/Makefile installcheck; then \ head -n 500 regression.diffs exit 1 -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#856423: postgresql-plproxy: autopkgtest failures since move to newnet (2.6-2)
Package: postgresql-plproxy Version: 2.7-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu zesty ubuntu-patch Dear Maintainer, The autopkgtests for postgresql-plproxy have been failing ever since 2.6-2 because postgres is not network namespace aware. In Ubuntu, the attached patch was applied to achieve the following: * d/t/installcheck fixes: - Passing a port to pg_virtualenv even with newnet does not avoid port collisions, as pg_virtualenv (via pg_createcluster) is only looking at the configured clusters on the filesystem, not what is running in the current network namespace. Set an alternative PG_CLUSTER_CONF_ROOT instead, and set it before we call pg_virtualenv. - Set the socket directory for pg_createcluster, as we are using the standard port and that can lead to conflicts. This also requires making the AUTOPKGTEST_TMP directory world-writeable so the postgres user can write socket information there. Thanks for considering the patch. *** /tmp/tmpnVHESZ/postgresql-plproxy_2.7-1ubuntu1.debdiff diff -Nru postgresql-plproxy-2.7/debian/tests/installcheck postgresql-plproxy-2.7/debian/tests/installcheck --- postgresql-plproxy-2.7/debian/tests/installcheck2016-09-25 14:04:41.0 -0700 +++ postgresql-plproxy-2.7/debian/tests/installcheck2017-02-28 10:19:53.0 -0800 @@ -21,9 +21,19 @@ ;; esac - if ! newnet pg_virtualenv -c '-p 5432 --locale C' -i '--auth trust' -v $v \ - make -f $PWD/Makefile \ - installcheck PG_CONFIG=/usr/lib/postgresql/$v/bin/pg_config; then + # AUTOPKGTEST_TMP is not writeable by any user except root, but + # we want to use it for storing the Postgres socket + # Set PG_CLUSTER_CONF_ROOT, because although we are running in a + # network namespace (so we can reuse the default port), + # pg_virtualenv/pg_createcluster looks at the configured + # databases on the filesystem + # Set the socket directory because we are to re-use the port and + # there can be conflicts in the normal socket directory + if ! chmod o+w $AUTOPKGTEST_TMP && \ + PG_CLUSTER_CONF_ROOT=$AUTOPKGTEST_TMP \ + PG_CONFIG=/usr/lib/postgresql/$v/bin/pg_config \ + newnet pg_virtualenv -c "-p 5432 --locale C -s $AUTOPKGTEST_TMP" -i '--auth trust' -v $v \ + make -f $PWD/Makefile installcheck; then \ head -n 500 regression.diffs exit 1 fi -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.10.0-8-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#855886: libembperl-perl: failing autopkgtests
Package: libembperl-perl Version: 2.5.0-10 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu zesty ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/t/pkg-perl/use-whitelist: specify whitelist for DynaLoader redefinition messages when PERL_DL_NONLAZY=1 is set (LP: #1667121). The autopkgtests for libembperl-perl have been failing for some time and in debugging the issue, I found that the failures started with the update from pkg-perl-autopkgtest 0.34. That update started running an iteration of the tests with PERL_DL_NONLAZY=1. This package, though, emits redefinition warnings (correctly as far as I can tell), and so we need to add those warnings to the whitelist. Thanks for considering the patch. *** /tmp/tmptOsR6I/libembperl-perl_2.5.0-10ubuntu1.debdiff diff -Nru libembperl-perl-2.5.0/debian/tests/pkg-perl/use-whitelist libembperl-perl-2.5.0/debian/tests/pkg-perl/use-whitelist --- libembperl-perl-2.5.0/debian/tests/pkg-perl/use-whitelist 1969-12-31 16:00:00.0 -0800 +++ libembperl-perl-2.5.0/debian/tests/pkg-perl/use-whitelist 2017-02-22 11:47:02.0 -0800 @@ -0,0 +1 @@ +DynaLoader.*redefined -- System Information: Debian Release: stretch/sid APT prefers zesty APT policy: (500, 'zesty') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-15-generic (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#855467: php7.0-snmp generates many warnings without snmp installed.
Package: php7.0
Followup-For: Bug #855467
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
I believe the following patch fixes snmp (and in theory any other
affected extensions, but there are none) to include its recommends.
Note, I think the resulting d/control file for most packages will have
an empty Recommends, but that seems ok and is dropped at build-time.
* d/php-module.control.in: add Recommends to extension substitution.
Closes: #855467.
Thanks for considering the patch.
*** /tmp/tmpiZK86k/php7.0_7.0.16-3.debdiff
diff -Nru php7.0-7.0.16/debian/php-module.control.in
php7.0-7.0.16/debian/php-module.control.in
--- php7.0-7.0.16/debian/php-module.control.in 2017-02-18 04:48:34.0
-0800
+++ php7.0-7.0.16/debian/php-module.control.in 2017-02-21 11:20:55.0
-0800
@@ -13,6 +13,7 @@
Breaks: ${php-@ext@:Breaks}
Conflicts: ${php-@ext@:Conflicts}
Provides: ${php-@ext@:Provides}
+Recommends: ${php-@ext@:Recommends}
Description: @description@ module for PHP
This package provides the @description@ module(s) for PHP.
.
-- System Information:
Debian Release: stretch/sid
APT prefers zesty
APT policy: (500, 'zesty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#854821: iconv: behavior change with C.UTF-8
Package: libc-bin Version: 2.24-9 Severity: normal Dear Maintainer, I am trying to track down the root cause of a FTBFS in phpmyadmin (e.g, https://launchpadlibrarian.net/301371947/buildlog_ubuntu-zesty-amd64.phpmyadmin_4%3A4.6.5.2-1_BUILDING.txt.gz, which is due to a testcase failure at build-time: "iconv(): Detected an illegal character in input string" The test in question is basically doing: $ echo "This is the Euro symbol '€'" |iconv -f UTF-8 -t ISO-8859-1//TRANSLIT Since the builders default to C.UTF-8, if one prefaces this with $ export LC_ALL=C.UTF-8 in various environments, we get: Yakkety (libc.bin == 2.24-3ubuntu2) produces: This is the Euro symbol 'EUR' Zesty (libc.bin == 2.24-7ubuntu2) produces: This is the Euro symbol 'iconv: illegal input sequence at position 25 Stretch & Sid (libc.bin == 2.24.9) produce: This is the Euro symbol 'iconv: illegal input sequence at position 25 Given that phpmyadmin did build in Sid (earlier), I'm guessing that on the next rebuild of phpmyadmin, it will fail in the same way as Ubuntu. If the LC_ALL is set to POSIX or en_US.UTF-8 or C, the testcase passes in all environments. I am not sure if this is due to the change back to combining for transliteration in C.UTF-8, the update to Unicode 9, or a combination of the two, but I think this behavior change was unintended? The following is from my reporting system (running Ubuntu), but I am able to reproduce the issue in a Sid schroot, as mentioned. -- System Information: Debian Release: stretch/sid APT prefers yakkety-updates APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500, 'yakkety'), (100, 'yakkety-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-37-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages libc-bin depends on: ii libc6 2.24-3ubuntu2 libc-bin recommends no packages. Versions of packages libc-bin suggests: ii manpages 4.07-1 -- no debconf information -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#854707: php-imagick: Fix autopkgtest segmentation faults
Package: php-imagick Version: 3.4.3~rc2-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu zesty ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * debian/patches/no-openmp-threads.patch: limit the number of openmp threads used to 1. I believe this is the only sane way forward for now. We need to figure out why parallelism breaks the test-suite, but if the test-suite fails with parallelism (with segmentation faults!), it feels irresponsible to let people use parallelism in the field, even if it's a behavioral change. * debian/tests/control: - Restore Restriction: needs-recommends since the tests require the -extra libmagickcore package This is a regression from the recent updates to debian & ubuntu packages. Accepting this patch would also close 826998, I believe. Thanks for considering the patch. *** /tmp/tmpKtrIlw/php-imagick_3.4.3~rc2-2ubuntu2.debdiff diff -Nru php-imagick-3.4.3~rc2/debian/patches/no-openmp-threads.patch php-imagick-3.4.3~rc2/debian/patches/no-openmp-threads.patch --- php-imagick-3.4.3~rc2/debian/patches/no-openmp-threads.patch 1969-12-31 16:00:00.0 -0800 +++ php-imagick-3.4.3~rc2/debian/patches/no-openmp-threads.patch 2017-02-08 17:35:02.0 -0800 @@ -0,0 +1,21 @@ +Description: limit the number of openmp threads used to 1 + The php-imagick 3.4.0 test suite fails with various segfaults when openmp + threads are in use. Force the openmp thread count to 1 to avoid this + problem. + . + This patch is a workaround only; it is currently unknown if the root bug + lies in php-imagick or in imagemagick. +Author: Steve Langasek +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942 + +--- a/imagick-3.4.3RC2/imagick.c b/imagick-3.4.3RC2/imagick.c +@@ -3689,6 +3689,8 @@ + checkImagickVersion(); + } + ++ SetMagickResourceLimit(ThreadResource, 1); ++ + return SUCCESS; + } + diff -Nru php-imagick-3.4.3~rc2/debian/patches/series php-imagick-3.4.3~rc2/debian/patches/series --- php-imagick-3.4.3~rc2/debian/patches/series 2017-01-24 03:47:41.0 -0800 +++ php-imagick-3.4.3~rc2/debian/patches/series 2017-02-08 17:35:02.0 -0800 @@ -1,2 +1,3 @@ 0001-Hardcode-path-to-usrsharefontstruetypettf-dejavuDeja.patch 0002-Skip-version-check-by-default.patch +no-openmp-threads.patch diff -Nru php-imagick-3.4.3~rc2/debian/tests/control php-imagick-3.4.3~rc2/debian/tests/control --- php-imagick-3.4.3~rc2/debian/tests/control 2017-01-24 03:47:41.0 -0800 +++ php-imagick-3.4.3~rc2/debian/tests/control 2017-02-08 17:35:02.0 -0800 @@ -1,2 +1,5 @@ Test-Command: cd imagick-*/tests && phpunit --verbose . Depends: php-cli, php-imagick, gsfonts, imagemagick-6.q16, phpunit +# The tests needs the -extra libmagickcore package but it gets +# renamed on soname bumps. imagemagick-6.q16 recommends it though. +Restrictions: needs-recommends -- System Information: Debian Release: stretch/sid APT prefers yakkety-updates APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500, 'yakkety'), (100, 'yakkety-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-37-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#849151: php-horde-crypt: add gnupg as an explicit test dep, update for gnupg2
Package: php-horde-crypt
Version: 2.7.5-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
autopkgtests for php-horde-crypt are currently failing on Ubuntu but
passing on Debian. This appears to be because our images have
/usr/bin/gpg present (with version 2.x) which the current tests fail on.
It seems like gnupg should be listed as a test dep and the tests should
be updated to be compatible with 2.x. I have sent the patch below
upstream in a ticket and verified that the resulting source package does
pass in Unstable.
In Ubuntu, the attached patch was applied to achieve the following:
* d/t/control: add explicit dependency on gnupg for tests
* debian/patches/update_tests_gnupg2.patch: Update tests for gnupg2
changes. Closes LP: #1652133.
Thanks for considering the patch.
*** /tmp/tmpe2HfZ0/php-horde-crypt_2.7.5-1ubuntu1.debdiff
diff -Nru php-horde-crypt-2.7.5/debian/patches/series
php-horde-crypt-2.7.5/debian/patches/series
--- php-horde-crypt-2.7.5/debian/patches/series 1969-12-31 16:00:00.0
-0800
+++ php-horde-crypt-2.7.5/debian/patches/series 2016-12-22 10:33:31.0
-0800
@@ -0,0 +1 @@
+update_tests_gnupg2.patch
diff -Nru php-horde-crypt-2.7.5/debian/patches/update_tests_gnupg2.patch
php-horde-crypt-2.7.5/debian/patches/update_tests_gnupg2.patch
--- php-horde-crypt-2.7.5/debian/patches/update_tests_gnupg2.patch
1969-12-31 16:00:00.0 -0800
+++ php-horde-crypt-2.7.5/debian/patches/update_tests_gnupg2.patch
2016-12-22 10:37:12.0 -0800
@@ -0,0 +1,64 @@
+Description: Update tests for gnupg2 changes
+ The tests currently rely on gpg1 behavior, so pass parameters to gpg
+ that make gpg2 emulate the behavior of gpg1 as necessary. Thanks to
+ https://github.com/keybase/keybase-issues/issues/1712 for related, but
+ not identical, issues and solution suggestions.
+ .
+ Split testVerifyPassphrase() into two tests: gpg2 always spawns a
+ gpg-agent, which caches passphrases. So the first correct passphrase
+ ends up leading to the second bad passphrase attempt passing.
+Author: Nishanth Aravamudan
+Bug: https://bugs.horde.org/ticket/14548
+Bug-Ubuntu: https://launchpad.net/bugs/1652133
+Forwarded:
https://bugs.horde.org/view.php?actionID=view_file&type=patch&file=update_tests_gnupg2.patch&ticket=14548
+Last-Update: 2016-12-22
+
+--- a/Horde_Crypt-2.7.5/lib/Horde/Crypt/Pgp/Backend/Binary.php
b/Horde_Crypt-2.7.5/lib/Horde/Crypt/Pgp/Backend/Binary.php
+@@ -75,8 +75,15 @@
+ '--no-options',
+ '--no-default-keyring',
+ '--yes',
+-'--homedir ' . $this->_tempdir
++'--homedir ' . $this->_tempdir,
++'--keyid-format short'
+ );
++
++$result = $this->_callGpg(array('--version'), 'r', null, false,
false, true);
++/* gpg > 1.x requires specifying the pinentry-mode */
++if (!preg_match('/gpg \(GnuPG\) = (1\.[0-9\.]+)/', $result->stdout,
$m)) {
++ $this->_gnupg[] = '--pinentry-mode loopback';
++}
+ }
+
+ /**
+@@ -678,6 +685,7 @@
+ if ($parseable) {
+ putenv('LANGUAGE=C');
+ }
++putenv('GPG_TTY=$(tty)');
+ if ($mode == 'w') {
+ if ($fp = popen($cmdline, 'w')) {
+ putenv('LANGUAGE=' . $language);
+--- a/Horde_Crypt-2.7.5/test/Horde/Crypt/Pgp/TestBase.php
b/Horde_Crypt-2.7.5/test/Horde/Crypt/Pgp/TestBase.php
+@@ -511,7 +511,7 @@
+ $this->assertNotEmpty($out->result);
+ }
+
+-public function testVerifyPassphrase()
++public function testVerifyPassphraseCorrect()
+ {
+ $this->assertTrue(
+ $this->_pgp->verifyPassphrase(
+@@ -520,7 +520,10 @@
+ 'Secret'
+ )
+ );
++}
+
++public function testVerifyPassphraseIncorrect()
++{
+ $this->assertFalse(
+ $this->_pgp->verifyPassphrase(
+ $this->_getPublicKey(),
diff -Nru php-horde-crypt-2.7.5/debian/tests/control
php-horde-crypt-2.7.5/debian/tests/control
--- php-horde-crypt-2.7.5/debian/tests/control 2016-12-17 14:04:22.0
-0800
+++ php-horde-crypt-2.7.5/debian/tests/control 2016-12-22 10:37:12.0
-0800
@@ -1,3 +1,3 @@
Tests: phpunit
Restrictions: needs-recommends
-Depends: @, php-cli, php-horde-test
+Depends: @, php-cli, php-horde-test, gnupg
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (100, 'yakkety-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-30-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#591419: librmagick-ruby should not be installable with imagemagick
Package: ruby-rmagick
Version: 2.15.4+dfsg-2
Followup-For: Bug #591419
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
I think this should do what is expected. Basically, AIUI, there is a
more-than-ABI-specifiable (due to issues upstream and possibly in the
Debian package itself (cf.:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846385) dependency
between ruby-rmagick and the version of imagemagick compiled against. To
that end, add an overriding dependency at build-time.
I think what's actually needed currently in ruby-rmagick's case in
Debian is a rebuild against the bumped version of imagemagick; if that's
done, the autopkgtests would pass. But expressing this dependency
explicilty would have caught that and prevented imagemagick from
changing in Debian until ruby-rmagick had been rebuilt?
Comments more than welcome and appreciated.
Thanks!
-Nish
## REPLACE THIS WITH ACTUAL INFORMATION -
## Please add all necessary information about why the change needed to go in
## Ubuntu, quote policy, spec or any other background material and why it can
## and should be used in Debian too. If the patch is composed of multiple
## independent pieces, please send them as separate bug reports.
## REPLACE THIS WITH ACTUAL INFORMATION -
* d/{control,rules}: use a new substitution variable to specify the
hard-dependency on the version of ImageMagick built against
(Closes: #591419). Thanks to Adam Conrad for the shell code.
Thanks for considering the patch.
*** /tmp/tmp6FrTwc/ruby-rmagick_2.15.4+dfsg-2ubuntu1.debdiff
diff -Nru ruby-rmagick-2.15.4+dfsg/debian/control
ruby-rmagick-2.15.4+dfsg/debian/control
--- ruby-rmagick-2.15.4+dfsg/debian/control 2016-08-16 07:29:37.0
-0700
+++ ruby-rmagick-2.15.4+dfsg/debian/control 2016-12-01 15:36:05.0
-0800
@@ -28,7 +28,8 @@
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${imagemagick:Depends}
Description: ImageMagick API for Ruby
RMagick is an interface between the Ruby programming language and the
ImageMagick image processing library.
diff -Nru ruby-rmagick-2.15.4+dfsg/debian/rules
ruby-rmagick-2.15.4+dfsg/debian/rules
--- ruby-rmagick-2.15.4+dfsg/debian/rules 2016-08-16 07:29:37.0
-0700
+++ ruby-rmagick-2.15.4+dfsg/debian/rules 2016-12-01 15:36:05.0
-0800
@@ -12,3 +12,11 @@
find debian/*/usr/share/doc/ruby-rmagick-doc/ \
-type f -executable -exec \
chmod -x '{}' ';'
+
+override_dh_gencontrol:
+ $(eval IMAGEMAGICK_DEP := \
+ $(shell find debian/ruby-rmagick/ -name RMagick2.so -exec ldd
'{}' ';' | \
+ awk '/\/libMagickCore/ {print $$3}' | xargs dpkg -S | \
+ awk '{print $$1}' | sed 's/:$$//' | xargs dpkg-query -W \
+ -f='$${Package} (>= $${Version})'))
+ dh_gencontrol -- -Vimagemagick:Depends='$(IMAGEMAGICK_DEP)'
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (100, 'yakkety-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-27-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#846385: imagemagick: Potential ABI break upstream (without SONAME change)
Package: imagemagick Version: 6.9.9.6+dfsg-1 Severity: normal Dear Maintainer, We recently merged imagemagick 6.9.9.6+dfsg-1 in Ubuntu 17.04; however we see autopkgtest failures in ruby-rmagick and php-imagick with this version (note that Debian is seeing similar failures). At least for ruby-rmagick, it seems like (possibly) upstream made an ABI change without bumping the SONAME for libmagickcore, and ruby-rmagick ends up pulling in the wrong dependency (https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-zesty/zesty/armhf/r/ruby-rmagick/20161130_032804_d2177@/log.gz). More specifically, we are building against imagemagick 8:6.9.6.6+dfsg-1ubuntu2: https://launchpadlibrarian.net/295470626/buildlog_ubuntu-zesty-arm64.ruby-rmagick_2.15.4+dfsg-2build1_BUILDING.txt.gz. During the build, the tests pass succesfully (using the above version of imagemagick), but you can see that the the resulting binary package has dependencies that are more relaxed than that specific version: Depends: ruby (>= 1:2.3~0), libc6 (>= 2.17), libmagickcore-6.q16-2 (>= 8:6.8.8.9), libruby2.3 (>= 2.3.0~preview2) Therefore, when the autopkgtest runs: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-zesty/zesty/armhf/r/ruby-rmagick/20161130_032804_d2177@/log.gz, imagemagick 8:6.8.9.9-7ubuntu9 is used, and a segmentation fault occurs. Thanks to Marc Deslauriers' research, it seems like there might have been at least one ABI breakage upsream in libmagickcore: https://abi-laboratory.pro/tracker/compat_report/imagemagick/6.9.1-10/6.9.2-10/67f2f/abi_compat_report.html, which might be related. What is your opinion on this as the Debian maintainer? Should the SONAME be bumped and symbols files be updated? Thanks for your time! -Nish -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#846292: keepalived: Fix netlink message truncation with large page sizes
Package: keepalived
Version: 1:1.2.24-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/fix_message_truncation_with_large_pagesizes.patch:
Resolve "Netlink: error: message truncated" messages. Thanks to
David Wilder . Closes LP: #1642763.
Thanks for considering the patch.
diff -Nru
keepalived-1.2.24/debian/patches/fix_message_truncation_with_large_pagesizes.patch
keepalived-1.2.24/debian/patches/fix_message_truncation_with_large_pagesizes.patch
---
keepalived-1.2.24/debian/patches/fix_message_truncation_with_large_pagesizes.patch
1969-12-31 16:00:00.0 -0800
+++
keepalived-1.2.24/debian/patches/fix_message_truncation_with_large_pagesizes.patch
2016-11-29 09:45:12.0 -0800
@@ -0,0 +1,71 @@
+Description: Resolve "Netlink: error: message truncated" messages
+Author: David Wilder
+Origin: upstream,
https://github.com/acassen/keepalived/commit/9f327bbf3e86def1055a106eda0633638bda0345
+Bug-Ubuntu: https://launchpad.net/bugs/1642763
+Forwarded: not-needed
+Last-Update: 2016-11-29
+
+--- keepalived-1.2.24.orig/keepalived/core/main.c
keepalived-1.2.24/keepalived/core/main.c
+@@ -39,6 +39,7 @@
+ #if HAVE_DECL_CLONE_NEWNET
+ #include "namespaces.h"
+ #endif
++#include "vrrp_netlink.h"
+
+ #define LOG_FACILITY_MAX7
+ #define VERSION_STRING PACKAGE_NAME " v" PACKAGE_VERSION " ("
VERSION_DATE ")"
+@@ -735,6 +736,8 @@ keepalived_main(int argc, char **argv)
+ /* Handle any core file requirements */
+ core_dump_init();
+
++netlink_set_recv_buf_size();
++
+ /* Check we can read the configuration file(s).
+ NOTE: the working directory will be / if we
+ forked, but will be the current working directory
+--- keepalived-1.2.24.orig/keepalived/include/vrrp_netlink.h
keepalived-1.2.24/keepalived/include/vrrp_netlink.h
+@@ -68,6 +68,7 @@ extern nl_handle_t nl_cmd; /* Command ch
+ extern int netlink_error_ignore; /* If we get this error, ignore it */
+
+ /* prototypes */
++extern void netlink_set_recv_buf_size(void);
+ extern int addattr_l(struct nlmsghdr *, size_t, int, void *, size_t);
+ extern int addattr8(struct nlmsghdr *, size_t, int, uint8_t);
+ extern int addattr32(struct nlmsghdr *, size_t, int, uint32_t);
+--- keepalived-1.2.24.orig/keepalived/vrrp/vrrp_netlink.c
keepalived-1.2.24/keepalived/vrrp/vrrp_netlink.c
+@@ -58,6 +58,23 @@ int netlink_error_ignore; /* If we get t
+
+ /* Static vars */
+ static nl_handle_t nl_kernel; /* Kernel reflection channel */
++static size_t nlmsg_buf_size; /* Size of netlink message buffer */
++
++void
++netlink_set_recv_buf_size(void)
++{
++ /* The size of the read buffer for the NL socket is based on page
++ * size however, it should not exceed 8192. See the comment in:
++ * linux/include/linux/netlink.h (copied below):
++ * skb should fit one page. This choice is good for headerless malloc
++ * But we should limit to 8K so that userspace does not have to
++ * use enormous buffer sizes on recvmsg() calls just to avoid
++ * MSG_TRUNC when PAGE_SIZE is very large.
++ */
++ nlmsg_buf_size = getpagesize();
++ if (nlmsg_buf_size > 8192)
++ nlmsg_buf_size = 8192;
++}
+
+ /* Create a socket to netlink interface_t */
+ static int
+@@ -513,7 +530,7 @@ netlink_parse_info(int (*filter) (struct
+ int error;
+
+ while (1) {
+- char buf[4096];
++ char buf[nlmsg_buf_size];
+ struct iovec iov = {
+ .iov_base = buf,
+ .iov_len = sizeof buf
diff -Nru keepalived-1.2.24/debian/patches/series
keepalived-1.2.24/debian/patches/series
--- keepalived-1.2.24/debian/patches/series 2015-08-15 06:01:53.0
-0700
+++ keepalived-1.2.24/debian/patches/series 2016-11-29 09:45:12.0
-0800
@@ -0,0 +1 @@
+fix_message_truncation_with_large_pagesizes.patch
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (400, 'yakkety-proposed'), (100, 'yakkety-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-27-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#846261: imagemagick: also clean up quantum control file fragments during update_pkg
Package: imagemagick
Version: 8:6.9.6.6+dfsg-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Properly clean-up quantum control file fragments from `debian/rules
update_pkg`
I noticed during a build here that running `debian/rules update_pkg`
left stray debian/control.d/quantum.{q16,q16hdri} files around.
Thanks for considering the patch.
*** /tmp/tmpORIMwv/imagemagick_8:6.9.6.6+dfsg-1ubuntu2.debdiff
diff -Nru imagemagick-6.9.6.6+dfsg/debian/rules
imagemagick-6.9.6.6+dfsg/debian/rules
--- imagemagick-6.9.6.6+dfsg/debian/rules 2016-11-28 12:32:14.0
-0800
+++ imagemagick-6.9.6.6+dfsg/debian/rules 2016-11-29 08:43:07.0
-0800
@@ -235,6 +235,7 @@
UCQUANTUMDEPTH=$(call UC,$*) \
$(DH_EXEC_SUBST)
$(CURDIR)/debian/tests.d/perlmagick-IMVERSION.QUANTUMDEPTH.in >
$(CURDIR)/debian/tests/perlmagick-$(IMVERSION).$*
chmod +x $(CURDIR)/debian/tests/perlmagick-$(IMVERSION).$*
+ rm -f $(CURDIR)/debian/control.d/quantum.$*
update_pkg: $(foreach Q,$(QUANTUMDEPTH),update_pkg.$Q)
$(DH_EXEC_SUBST) $(CURDIR)/debian/control.d/noquantum.in >>
$(CURDIR)/debian/control.d/noquantum
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (400, 'yakkety-proposed'), (100, 'yakkety-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-27-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#710895: freeradius: Added autopkgtests
Package: freeradius
Version: 3.0.12+dfsg-3
Followup-For: Bug #710895
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/t: update tests for 3.x (Closes: #710895)
- Password must be provided as 'User-Password'.
- Configuration is stored in /etc/freeradius/3.0/.
- Response strings do not contain 'code X' any longer.
* d/freeradius.postinst: revert incorrect removal of /var/log file creation
- 42abc545 ('Remove all use of dpkg-statoverride') included a
non-dpkg-statoverride-related removal.
Thanks for considering the patch.
*** /tmp/tmpu9VegU/freeradius_3.0.12+dfsg-3ubuntu2.debdiff
diff -Nru freeradius-3.0.12+dfsg/debian/freeradius.postinst
freeradius-3.0.12+dfsg/debian/freeradius.postinst
--- freeradius-3.0.12+dfsg/debian/freeradius.postinst 2016-11-11
17:09:56.0 -0800
+++ freeradius-3.0.12+dfsg/debian/freeradius.postinst 2016-11-17
11:04:24.0 -0800
@@ -11,6 +11,10 @@
# start after services which may be used and stop before them.
update-rc.d freeradius start 50 2 3 4 5 . stop 19 0 1 6 . >/dev/null
+ for file in radius.log radwtmp; do
+[ ! -f "/var/log/freeradius/${file}" ] && install -o freerad -g
freerad -m 644 /dev/null /var/log/freeradius/${file}
+ done
+
action="start"
else
action="restart"
diff -Nru freeradius-3.0.12+dfsg/debian/tests/test-freeradius.py
freeradius-3.0.12+dfsg/debian/tests/test-freeradius.py
--- freeradius-3.0.12+dfsg/debian/tests/test-freeradius.py 2016-11-11
17:09:56.0 -0800
+++ freeradius-3.0.12+dfsg/debian/tests/test-freeradius.py 2016-11-17
11:04:09.0 -0800
@@ -47,11 +47,11 @@
def setUp(self):
'''Set up prior to each test_* function'''
self.tmpdir = tempfile.mkdtemp(prefix='freeradius-', dir='/tmp')
-self.auth_approved = "code 2"
-self.auth_denied = "code 3"
+self.auth_approved = "Access-Accept"
+self.auth_denied = "Access-Reject"
# Add a default user
-self.users_file = "/etc/freeradius/users"
+self.users_file = "/etc/freeradius/3.0/users"
self.test_user = "testuser"
self.test_pass = "testpassword"
config_line = '%s Cleartext-Password := "%s"' % (self.test_user,
self.test_pass)
@@ -70,7 +70,7 @@
def _test_auth(self, username, password, expected_string, expected_rc=0):
'''Tests authentication'''
-handle, tmpname = testlib.mkstemp_fill("User-Name=%s,Password=%s" %
(username, password), dir=self.tmpdir)
+handle, tmpname = testlib.mkstemp_fill("User-Name=%s,User-Password=%s"
% (username, password), dir=self.tmpdir)
# can't use radtest as there's no way to set a timeout or number of
retries
rc, report = testlib.cmd(['/usr/bin/radclient', '-r', '2', '-f',
tmpname, '-s', 'localhost:1812', 'auth', 'testing123'])
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (400, 'yakkety-proposed'), (100, 'yakkety-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-27-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#822749: heimdal ftbfs on all 32bit architectures
Package: heimdal
Version: 1.7~git20160703+dfsg-1
Followup-For: Bug #822749
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu zesty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/use_off_t_for_constants.patch: Use off_t in for
constants used in iprop log seeks. Thanks to Nicolas Williams
. Closes: #822749, LP: #1629055.
Thanks for considering the patch.
diff -Nru heimdal-1.7~git20160703+dfsg/debian/patches/series
heimdal-1.7~git20160703+dfsg/debian/patches/series
--- heimdal-1.7~git20160703+dfsg/debian/patches/series 2016-07-03
07:28:39.0 -0700
+++ heimdal-1.7~git20160703+dfsg/debian/patches/series 2016-11-09
17:02:46.0 -0800
@@ -16,3 +16,4 @@
061_disable_test_plugin
062_disable_test_iprop
parallel-build
+use_off_t_for_constants.patch
diff -Nru
heimdal-1.7~git20160703+dfsg/debian/patches/use_off_t_for_constants.patch
heimdal-1.7~git20160703+dfsg/debian/patches/use_off_t_for_constants.patch
--- heimdal-1.7~git20160703+dfsg/debian/patches/use_off_t_for_constants.patch
1969-12-31 16:00:00.0 -0800
+++ heimdal-1.7~git20160703+dfsg/debian/patches/use_off_t_for_constants.patch
2016-11-09 17:05:47.0 -0800
@@ -0,0 +1,35 @@
+Description: Use off_t in for constants used in iprop log seeks
+ On 32-bit architectures with _FILE_OFFSET_BITS=64,
+ sizeof(off_t) > sizeof(size_t) .
+ .
+ LOG_HEADER_SZ was #define'd as an expression of type size_t, so in
+ order to get the sign extension right we need -(off_t)LOG_HEADER_SZ
+ instead of (off_t)(-LOG_HEADER_SZ). However, we can just define the
+ *_SZ macros to cast to off_t, then we don't need to worry about
+ negation.
+Author: Nicolas Williams
+Origin: upstream,
https://github.com/heimdal/heimdal/commit/7c8b66d76b562912c09c0955a53da2f26afbc8f7
+Bug: https://github.com/heimdal/heimdal/issues/175
+Bug-Debian: https://bugs.debian.org/822749
+Bug-Ubuntu: https://launchpad.net/bugs/1629055
+Last-Update: 2016-11-10
+
+--- heimdal-1.7~git20160703+dfsg.orig/lib/kadm5/log.c
heimdal-1.7~git20160703+dfsg/lib/kadm5/log.c
+@@ -174,11 +174,11 @@ RCSID("$Id$");
+ * will deadlock with ipropd-slave -- don't do that.
+ */
+
+-#define LOG_HEADER_SZ (sizeof(uint32_t) * 4)
+-#define LOG_TRAILER_SZ (sizeof(uint32_t) * 2)
+-#define LOG_WRAPPER_SZ (LOG_HEADER_SZ + LOG_TRAILER_SZ)
+-#define LOG_UBER_LEN(sizeof(uint64_t) + sizeof(uint32_t) * 2)
+-#define LOG_UBER_SZ (LOG_WRAPPER_SZ + LOG_UBER_LEN)
++#define LOG_HEADER_SZ ((off_t)(sizeof(uint32_t) * 4))
++#define LOG_TRAILER_SZ ((off_t)(sizeof(uint32_t) * 2))
++#define LOG_WRAPPER_SZ ((off_t)(LOG_HEADER_SZ + LOG_TRAILER_SZ))
++#define LOG_UBER_LEN((off_t)(sizeof(uint64_t) + sizeof(uint32_t) * 2))
++#define LOG_UBER_SZ ((off_t)(LOG_WRAPPER_SZ + LOG_UBER_LEN))
+
+ #define LOG_NOPEEK 0
+ #define LOG_DOPEEK 1
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety-updates
APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500,
'yakkety'), (400, 'yakkety-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#843829: dpkg-parsechangelog incorrectly claims May is only a 'full' month on date parse failure
Package: dpkg
Version: 1.18.10ubuntu1
Severity: important
Tags: patch
Dear Maintainer,
Running dpkg-parsechangelog on changelogs that produce date parsing
problems, e.g.:
Tue, 17 May 2008 10:93:55 -0500
(don't ask me how it got there, but it happened in one Ubuntu publish).
ends up with an error like, "uses full instead of abbreviated month name
'May'", which is obviously not the actual problem. I think there is
actually a bug in dpkg (introduced in:
https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/scripts/Dpkg/Changelog/Entry/Debian.pm?id=21f5898d846a1cd69bdc6849e2097168cde02fdf),
in that if a full month is found to be used, it's not checked that the
full month is *also* an abbreviated month (only true for May, though).
I tested a fix with below patch on my local system. It feels like it
might be cleaner to special-case May as the only affected month, but I
think the logic was simply incorrect before either way -- it only makes
sense to check if a full month was used if an abbreviated month wasn't.
Thanks,
Nish
--- /usr/share/perl5/Dpkg/Changelog/Entry/Debian.pm.bak 2016-11-02
17:07:08.195115132 -0700
+++ /usr/share/perl5/Dpkg/Changelog/Entry/Debian.pm 2016-11-02
17:08:14.020173675 -0700
@@ -226,11 +226,13 @@ sub parse_trailer {
# Validate the month. Date::Parse used to accept both abbreviated
# and full months, but Time::Piece strptime() implementation only
# matches the abbreviated one with %b, which is what we want anyway.
- if (exists $month_name{$8}) {
- push @errors, sprintf(g_('uses full instead of abbreviated
month name \'%s\''),
- $8, $month_name{$8});
- } elsif (not exists $month_abbrev{$8}) {
- push @errors, sprintf(g_('invalid abbreviated month name
\'%s\''), $8);
+ if (not exists $month_abbrev{$8}) {
+if (exists $month_name{$8}) {
+ push @errors, sprintf(g_('uses full instead of abbreviated
month name \'%s\''),
+ $8, $month_name{$8});
+} else {
+ push @errors, sprintf(g_('invalid abbreviated month name
\'%s\''), $8);
+}
}
push @errors, sprintf(g_("cannot parse non-comformant date '%s'"),
$7);
};
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#829059: php-guzzlehttp-ringphp: FTBFS: LaTeX Error: File `iftex.sty' not found.
Package: php-guzzlehttp-ringphp Version: 1.1.0-2 Followup-For: Bug #829059 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/control: add explicit b-d on texlive-generic-extra for iftex.sty. LP: #1631194. Thanks for considering the patch. *** /tmp/tmpcMI2d2/php-guzzlehttp-ringphp_1.1.0-2ubuntu2.debdiff diff -Nru php-guzzlehttp-ringphp-1.1.0/debian/control php-guzzlehttp-ringphp-1.1.0/debian/control --- php-guzzlehttp-ringphp-1.1.0/debian/control 2016-03-29 12:47:32.0 -0700 +++ php-guzzlehttp-ringphp-1.1.0/debian/control 2016-10-06 16:04:21.0 -0700 @@ -16,6 +15,7 @@ python-sphinx (>= 1.3.1-3~), python-sphinx-rtd-theme (>= 0.1.8-2~), texlive-fonts-recommended, + texlive-generic-extra, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended -- System Information: Debian Release: stretch/sid APT prefers yakkety APT policy: (500, 'yakkety'), (400, 'yakkety-proposed') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-17-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#825542: php-arc: FTBFS: Tests: 40, Assertions: 87, Errors: 5.
Package: php-arc
Version: 2.2.5-1
Followup-For: Bug #825542
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/pass_variable_by_reference.patch: PHP7 is strict
about passing by reference. Closes LP: #1631190.
Thanks for considering the patch.
diff -Nru php-arc-2.2.5/debian/patches/pass_variable_by_reference.patch
php-arc-2.2.5/debian/patches/pass_variable_by_reference.patch
--- php-arc-2.2.5/debian/patches/pass_variable_by_reference.patch
1969-12-31 16:00:00.0 -0800
+++ php-arc-2.2.5/debian/patches/pass_variable_by_reference.patch
2016-10-06 15:53:02.0 -0700
@@ -0,0 +1,16 @@
+Description: PHP7 is strict about passing by reference
+Author: Nishanth Aravamudan
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1631190
+
+--- php-arc-2.2.5.orig/tests/unit/ARC2_ClassTest.php
php-arc-2.2.5/tests/unit/ARC2_ClassTest.php
+@@ -6,7 +6,8 @@ require_once ARC2_DIR . '/ARC2_Class.php
+ class ARC2_ClassTest extends PHPUnit_Framework_TestCase {
+
+ public function setUp() {
+- $this->arc2 = new ARC2_Class(array(), new stdClass);
++ $obj = new stdClass;
++ $this->arc2 = new ARC2_Class(array(), $obj);
+ }
+
+ public function testCamelCase() {
diff -Nru php-arc-2.2.5/debian/patches/series
php-arc-2.2.5/debian/patches/series
--- php-arc-2.2.5/debian/patches/series 1969-12-31 16:00:00.0 -0800
+++ php-arc-2.2.5/debian/patches/series 2016-10-06 15:52:36.0 -0700
@@ -0,0 +1 @@
+pass_variable_by_reference.patch
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety'), (400, 'yakkety-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#839789: loganalyzer: update for syntax removals in PHP7.0
Package: loganalyzer
Version: 3.6.6+dfsg-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/update_for_php7_removals.patch: PHP7.0 has removed
same-named constructors and the \e modifier to preg_replace. Closes
LP: #1575543.
Thanks for considering the patch.
*** /tmp/tmpms9N8N/loganalyzer_3.6.6+dfsg-3ubuntu1.debdiff
diff -Nru loganalyzer-3.6.6+dfsg/debian/patches/series
loganalyzer-3.6.6+dfsg/debian/patches/series
--- loganalyzer-3.6.6+dfsg/debian/patches/series2016-05-22
01:05:53.0 -0700
+++ loganalyzer-3.6.6+dfsg/debian/patches/series2016-10-04
15:13:22.0 -0700
@@ -1 +1,2 @@
01-remove-tracking-image.patch
+update_for_php7_removals.patch
diff -Nru loganalyzer-3.6.6+dfsg/debian/patches/update_for_php7_removals.patch
loganalyzer-3.6.6+dfsg/debian/patches/update_for_php7_removals.patch
--- loganalyzer-3.6.6+dfsg/debian/patches/update_for_php7_removals.patch
1969-12-31 16:00:00.0 -0800
+++ loganalyzer-3.6.6+dfsg/debian/patches/update_for_php7_removals.patch
2016-10-04 15:13:31.0 -0700
@@ -0,0 +1,68 @@
+Description: PHP7.0 has removed same-named constructors and the \e modifier to
preg_replace
+Author: Nishanth Aravamudan
+Bug: https://github.com/rsyslog/loganalyzer/issues/14
+Bug-Ubuntu: https://launchpad.net/bugs/1575543
+
+--- a/src/classes/class_template.php
b/src/classes/class_template.php
+@@ -59,7 +59,7 @@
+ var $extension = '';
+ var $template, $vars, $page;
+
+- function Template ($fname = '') {
++ function __construct ($fname = '') {
+ if ($fname)
+ $this->filename = $fname;
+ }
+@@ -200,7 +200,7 @@
+ $template =
str_replace('{'.$k.'}', "$v", $template);
+
+ // Replace variables with
options, use Callback function!
+- $template = preg_replace(
'/{'.$k.':(.*?):(.*?)}/ie', 'InsertTemplateVariable("$v", "\\1", "\\2")',
$template );
++ $template =
preg_replace_callback( '/{'.$k.':(.*?):(.*?)}/i', function ($m) { return
InsertTemplateVariable("$v", "$m[1]", "$m[2]"); }, $template );
+ }
+ }
+ }
+@@ -334,4 +334,4 @@
+ return $szResult;
+ }
+
+-?>
+\ No newline at end of file
++?>
+--- a/src/classes/logstreamdisk.class.php
b/src/classes/logstreamdisk.class.php
+@@ -63,7 +63,7 @@
+ private $_lastPageUID = -1;
+
+ // Constructor
+- public function LogStreamDisk($streamConfigObj) {
++ public function __construct($streamConfigObj) {
+ $this->_logStreamConfigObj = $streamConfigObj;
+ }
+
+@@ -1086,4 +1086,4 @@
+ $this->_p_buffer = -1;
+ }
+ }
+-?>
+\ No newline at end of file
++?>
+--- a/src/classes/logstreamlineparsersyslog.class.php
b/src/classes/logstreamlineparsersyslog.class.php
+@@ -52,7 +52,7 @@
+ //protected $_arrProperties = null;
+
+ // Constructor
+- public function LogStreamLineParsersyslog() {
++ public function __construct() {
+ return; // Nothing
+ }
+
+@@ -148,4 +148,4 @@
+
+ }
+
+-?>
+\ No newline at end of file
++?>
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety'), (400, 'yakkety-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#838715: pacemaker: properly remove CTS python files for all versions
Package: pacemaker Version: 1.1.15-1 Severity: serious Tags: patch Justification: fails to build from source (but built successfully in the past) User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/rules: update CTS python files' path for python3 and possibly site-packages. If the code is updated to use setuptools, cts should continue to not be shipped. Fixes FTBFS for arch-only builds (LP: #1627125). Thanks for considering the patch. diff -Nru pacemaker-1.1.15/debian/rules pacemaker-1.1.15/debian/rules --- pacemaker-1.1.15/debian/rules 2016-06-23 13:47:01.0 -0700 +++ pacemaker-1.1.15/debian/rules 2016-09-23 13:51:00.0 -0700 @@ -37,8 +37,11 @@ override_dh_auto_test: override_dh_install: + # remove any possible python CTS files, including site-packages. + # If the code is updated to use setuptools, CTS should + # continue to not be shipped. rm -r debian/tmp/usr/share/pacemaker/tests \ - debian/tmp/usr/lib/python2.7/dist-packages/cts \ + debian/tmp/usr/lib/python*/*packages/cts \ debian/tmp/usr/lib/*/lib*.la \ debian/tmp/usr/share/doc/pacemaker/COPYING \ debian/tmp/usr/share/doc/pacemaker/COPYING.LIB -- System Information: Debian Release: stretch/sid APT prefers yakkety APT policy: (500, 'yakkety'), (400, 'yakkety-proposed') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-15-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#821992: icinga: Build arch:all+arch:any but is missing build-{arch, indep} targets
Package: icinga Version: 1.13.3-2 Followup-For: Bug #821992 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Add build-arch and build-indep targets to d/rules (Closes: #821992). Thanks for considering the patch. *** /tmp/tmpMNLVWQ/icinga_1.13.3-2ubuntu2.debdiff diff -u icinga-1.13.3/debian/rules icinga-1.13.3/debian/rules --- icinga-1.13.3/debian/rules +++ icinga-1.13.3/debian/rules @@ -101,7 +101,9 @@ $(CONFIGURE) touch configure-stamp -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: patch-stamp configure-stamp dh_testdir -a @echo "Doing $@" @@ -238 +240 @@ -.PHONY: binary-indep binary-arch build configure binary install patch unpatch +.PHONY: binary-indep binary-arch build build-arch build-indep configure binary install patch unpatch -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-31-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#831363: jquery-goodies: Update to PHP7.0 dependencies
Package: jquery-goodies
Version: 11-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
- Update to PHP7.0 dependencies (LP #1544352).
Thanks for considering the patch.
*** /tmp/tmp3yXe_I/jquery-goodies_11-2ubuntu1.debdiff
diff -Nru jquery-goodies-11/debian/control jquery-goodies-11/debian/control
--- jquery-goodies-11/debian/control2016-05-21 19:02:33.0 -0700
+++ jquery-goodies-11/debian/control2016-07-14 16:45:58.0 -0700
@@ -58,7 +58,7 @@
Package: libjs-jquery-jfeed
Architecture: all
Depends: ${misc:Depends}, libjs-jquery
-Recommends: javascript-common, php5
+Recommends: javascript-common, php
Homepage: http://hovinne.com/articles/jfeed-jquery-rss-atom-feed-parser-plugin
Description: jQuery RSS/Atom feed parser plugin
jFeed is a generic RSS/Atom feed parser, currently parses RSS 0.91, 0.92,
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#831332: icinga-cgi-bin: fix menu hiding (jquery 1.11 incompatibility)
Package: icinga
Version: 1.13.3-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
icinga-cgi-bin in Debian Sid, Ubuntu Yakkety (and Ubuntu Xenial) is
affected by an upstream bug where the left-hand menu in the Classic
icinga web interface disappears immediately after the page finishes
loading. Upstream has provided a fix and in my testing this resolves the
issue (which is due to current code incompatibilty with jQuery versions
in Debian and Ubuntu).
In Ubuntu, the attached patch was applied to achieve the following:
* Backport 'Classic UI: fixed menu disappear with jQuery 1.11+'.
Closes LP: #1593319.
- Do not backport the jQuery source change, as it's not strictly
necessary to fix the syntax; we depend on the system jQuery.
- https://dev.icinga.org/issues/11732
-
https://git.icinga.org/?p=icinga-core.git;a=commitdiff;h=d3158e0140b19bc578556d0172a5ec69c943d4d1;js=1
Thanks for considering the patch.
*** /tmp/tmpKQpPwH/icinga_1.13.3-2ubuntu0.1.debdiff
only in patch2:
unchanged:
--- icinga-1.13.3.orig/html/js/menu.js
+++ icinga-1.13.3/html/js/menu.js
@@ -9,11 +9,14 @@
elem.prepend( img )
.css( "cursor", "pointer" )
- .toggle( function() {
- img.attr('src', 'images/menu_more.gif');
- list.slideToggle("slow");
- }, function() {
- img.attr('src', 'images/menu_less.gif');
+ .click( function() {
+ if($(this).hasClass("collapsed")) {
+ img.attr('src', 'images/menu_less.gif');
+ $(this).removeClass("collapsed");
+ } else {
+ img.attr('src', 'images/menu_more.gif');
+ $(this).addClass("collapsed");
+ }
list.slideToggle("slow");
});
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#830999: bacula-director-mysql db-config installation fails with reference to ${db_name}
Package: bacula-director-mysql
Severity: important
Dear Maintainer,
Ubuntu 16.10 is currently in-sync with Debian unstable's packaging and
I am seeing an installation failure with bacula-director-mysql.
In partciular, I believe the following to be true:
/usr/share/dbconfig-common/data/bacula-director-mysql/install/mysql:
USE ${db_name};
--
-- Note, we use BLOB rather than TEXT because in MySQL,
-- BLOBs are identical to TEXT except that BLOB is case
-- sensitive in sorts, which is what we want, and TEXT
-- is case insensitive.
--
CREATE TABLE Filename (
FilenameId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
Name BLOB NOT NULL,
PRIMARY KEY(FilenameId),
INDEX (Name(255))
);
...
This comes from debian/rules:
$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig
$(db))) # new installs
which in turn calls debian/scripts/install-dbconfig:
sub install {
make_path("debian/bacula-director-$db/$DBC/bacula-director-$db/install");
extract_here("src/cats/make_".$longdb."_tables",
"debian/bacula-director-$db/$DBC/bacula-director-$db/install/$db");
}
...
sub extract_here {
my $input = shift;
my $output = shift;
my $found = 0;
open (INPUT, '<', $input);
open (OUTPUT, '>', $output);
while () {
if (m/END.OF.DATA/ && !$found) {$found = 1; next;};
last if (m/END.OF.DATA/);
print OUTPUT $_ if $found;
}
close (INPUT);
}
which in turn ends up chomping on src/cats/make_mysql_tables:
bindir=@MYSQL_BINDIR@
PATH="$bindir:$PATH"
db_name=${db_name:-@db_name@}
if mysql $* -f <http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.4&id=074419ac0c9dbbde2e4d2f5ccb6d4ca85c6ec8a9
which maybe let Debian drop it's USE sed lines from debian/rules. But
then, at least since 2015,
http://www.bacula.org/git/cgit.cgi/bacula/commit/bacula/src/cats/make_mysql_tables.in?h=Branch-7.4&id=4d2b94fa3e8018d1a462756ad6e1df7e12a29d20
caused it to revert back?
Talking to Kern offlist, they mentioned that this was from the normal
syncing of enterprise to the community version.
Note, the Ubuntu bug I've filed is at:
https://bugs.launchpad.net/ubuntu/+source/bacula/+bug/1596034
Historical Debian bugs that seem related:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679855
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=489578
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=441995
Thanks,
Nish
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#830507: fence-agents: debian/watch file should be updated for move to github
Package: fence-agents Severity: important Dear Maintainer, The debian/watch file refers to fedorahosted: version=3 https://fedorahosted.org/releases/f/e/fence-agents/fence-agents-([\d\.]*)\.tar\.xz but based upon https://git.fedorahosted.org/cgit/fence-agents.git/tree/README, https://github.com/ClusterLabs/fence-agents/releases should be used. Thanks, Nish -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#830505: cobbler: src:cobbler incorrectly builds power templates into pxe directory
Source: cobbler
Severity: important
Tags: patch
Dear Maintainer,
Seems like an obvious typo in the packaging, c&p from the previous
stanza.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
diff -Nru cobbler-2.6.6+dfsg1/debian/rules cobbler-2.6.6+dfsg1/debian/rules
--- cobbler-2.6.6+dfsg1/debian/rules2016-01-31 00:15:42.0 -0800
+++ cobbler-2.6.6+dfsg1/debian/rules2016-07-08 10:13:58.0 -0700
@@ -56,7 +56,7 @@
# Fix the /etc/cobbler/pxe folder
rm $(CURDIR)/debian/cobbler-common/etc/cobbler/pxe/*
- cp $(CURDIR)/debian/power/*
$(CURDIR)/debian/cobbler-common/etc/cobbler/pxe
+ cp $(CURDIR)/debian/pxe/*
$(CURDIR)/debian/cobbler-common/etc/cobbler/pxe
# Move /etc/cobbler/{users.digest, settings} to /usr/share since we
want to use
# debconf for configuring them.
Bug#830302: cobbler using wrong URL
Source: cobbler
Severity: important
Tags: patch
Dear Maintainer,
Executing `cobbler get-loaders` or `cobbler signature update` with
2.6.6+dfsg1-12 results in:
Exception occured:
Exception value: [Errno 14] PYCURL ERROR 6 - "Could not resolve host:
www.cobblerd.org"
Exception Info:
File "/usr/lib/python2.7/dist-packages/cobbler/api.py", line 601, in
signature_update
response = urlgrabber.grabber.urlopen(self.settings().signature_url,
proxies=proxies)
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
628, in urlopen
return default_grabber.urlopen(url, **kwargs)
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
926, in urlopen
return self._retry(opts, retryfunc, url)
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
886, in _retry
r = apply(func, (opts,) + args, {})
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
925, in retryfunc
return PyCurlFileObject(url, filename=None, opts=opts)
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
1063, in __init__
self._do_open()
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
1355, in _do_open
self._do_grab()
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
1485, in _do_grab
self._do_perform()
File "/usr/lib/python2.7/dist-packages/urlgrabber/grabber.py", line
1342, in _do_perform
raise err
This was fixed upstream in 1c680061f85365dcf01d133286f1ff4c6e2acd64.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
diff -Nru cobbler-2.6.6+dfsg1/debian/changelog
cobbler-2.6.6+dfsg1/debian/changelog
--- cobbler-2.6.6+dfsg1/debian/changelog2016-01-31 00:15:42.0
-0800
+++ cobbler-2.6.6+dfsg1/debian/changelog2016-07-07 18:02:42.0
-0700
@@ -1,3 +1,10 @@
+cobbler (2.6.6+dfsg1-12.1) unstable; urgency=medium
+
+ * debian/patches/remove_cobblerd.org_references.patch: Remove
+references to cobblerd.org.
+
+ -- Nishanth Aravamudan Thu, 07 Jul 2016
18:02:33 -0700
+
cobbler (2.6.6+dfsg1-12) unstable; urgency=medium
* koan now depends on libvirt-daemon-system instead of libvirt-bin.
diff -Nru
cobbler-2.6.6+dfsg1/debian/patches/remove_cobblerd.org_references.patch
cobbler-2.6.6+dfsg1/debian/patches/remove_cobblerd.org_references.patch
--- cobbler-2.6.6+dfsg1/debian/patches/remove_cobblerd.org_references.patch
1969-12-31 16:00:00.0 -0800
+++ cobbler-2.6.6+dfsg1/debian/patches/remove_cobblerd.org_references.patch
2016-07-07 18:02:25.0 -0700
@@ -0,0 +1,151 @@
+Description: Remove references to cobblerd.org
+ Upstream URL has moved from www.cobblerd.org to cobbler.github.io.
+Author: Nishanth Aravamudan
+Origin: upstream,
https://github.com/cobbler/cobbler/commit/1c680061f85365dcf01d133286f1ff4c6e2acd64
+
+--- cobbler-2.6.6+dfsg1.orig/README
cobbler-2.6.6+dfsg1/README
+@@ -2,7 +2,7 @@ Cobbler
+
+ Cobbler is a Linux installation server that allows for rapid setup of network
installation environments. It glues together and automates many associated
Linux tasks so you do not have to hop between lots of various commands and
applications when rolling out new systems, and, in some cases, changing
existing ones. It can help with installation, DNS, DHCP, package updates, power
management, configuration management orchestration, and much more.
+
+-Read more at http://www.cobblerd.org
++Read more at http://cobbler.github.io
+
+ To view the manpages, install the RPM and run "man cobbler" or run "perldoc
cobbler.pod" from a source checkout. "koan" also has a manpage.
+
+--- cobbler-2.6.6+dfsg1.orig/cobbler/action_dlcontent.py
cobbler-2.6.6+dfsg1/cobbler/action_dlcontent.py
+@@ -46,7 +46,7 @@ class ContentDownloader:
+ they can still source their cross-arch bootloader content manually.
+ """
+
+-content_server = "http://www.cobblerd.org/loaders";
++content_server = "http://cobbler.github.io/loaders";
+ dest = "/var/lib/cobbler/loaders"
+
+ files = (
+--- cobbler-2.6.6+dfsg1.orig/cobbler/settings.py
cobbler-2.6.6+dfsg1/cobbler/settings.py
+@@ -126,7 +126,7 @@ DEFAULTS = {
+ "server" : ["127.0.0.1","str"],
+ "sign_puppet_certs_automat
Bug#829764: php-monolog: add stage1 and nocheck build profiles
Package: php-monolog Version: 1.19.0-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, * Add nocheck and stage1 build profiles. This allows for bootstrapping of monolog when PHP versions change (and phpunit has not yet been rebuilt). Thanks for considering the patch. *** /tmp/tmpLf__kc/php-monolog_1.19.0-2ubuntu1.debdiff diff -Nru php-monolog-1.19.0/debian/control php-monolog-1.19.0/debian/control --- php-monolog-1.19.0/debian/control 2016-06-25 21:43:11.0 -0700 +++ php-monolog-1.19.0/debian/control 2016-07-05 13:18:59.0 -0700 @@ -9,7 +9,7 @@ php-psr-log (>= 1.0.0-2~), php-swiftmailer, phpab, - phpunit, + phpunit , pkg-php-tools (>= 1.30~) Standards-Version: 3.9.8 Homepage: https://github.com/Seldaek/monolog diff -Nru php-monolog-1.19.0/debian/rules php-monolog-1.19.0/debian/rules --- php-monolog-1.19.0/debian/rules 2016-04-12 14:22:36.0 -0700 +++ php-monolog-1.19.0/debian/rules 2016-07-05 13:17:58.0 -0700 @@ -12,7 +12,7 @@ tests/Monolog override_dh_auto_test: -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) +ifeq (,$(filter nocheck stage1, $(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES))) phpunit --bootstrap autoload.php --include-path src else @echo "** tests disabled" -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-28-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#829264: php-horde-activesync: update for MySQL 5.7 compatibility by setting root password
Package: php-horde-activesync
Version: 2.34.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Update test compatibility with MySQL 5.7 (LP: #1568015).
Thanks for considering the patch.
*** /tmp/tmpvIXQYx/php-horde-activesync_2.34.0-1ubuntu1.debdiff
diff -Nru php-horde-activesync-2.34.0/debian/tests/control
php-horde-activesync-2.34.0/debian/tests/control
--- php-horde-activesync-2.34.0/debian/tests/control2016-06-08
12:00:51.0 -0700
+++ php-horde-activesync-2.34.0/debian/tests/control2016-07-01
12:28:02.0 -0700
@@ -1,3 +1,3 @@
Tests: phpunit
-Restrictions: needs-recommends isolation-container
+Restrictions: needs-recommends needs-root isolation-container
Depends: @, php-cli, php-horde-test, php-sqlite3, mysql-server, php-mysql
diff -Nru php-horde-activesync-2.34.0/debian/tests/phpunit
php-horde-activesync-2.34.0/debian/tests/phpunit
--- php-horde-activesync-2.34.0/debian/tests/phpunit2016-06-08
12:00:51.0 -0700
+++ php-horde-activesync-2.34.0/debian/tests/phpunit2016-07-01
12:04:20.0 -0700
@@ -2,11 +2,11 @@
set -e
-export
ACTIVESYNC_SQL_MYSQL_TEST_CONFIG='{"activesync":{"sql":{"mysql":{"adapter":"mysql","host":"localhost","username":"root","password":"","dbname":"test","charset":"utf-8"'
-export
ACTIVESYNC_SQL_MYSQLI_TEST_CONFIG='{"activesync":{"sql":{"mysqli":{"adapter":"mysqli","host":"localhost","username":"root","password":"","dbname":"test","charset":"utf-8"'
-export
ACTIVESYNC_SQL_PDO_MYSQL_TEST_CONFIG='{"activesync":{"sql":{"pdo_mysql":{"adapter":"pdo_mysql","host":"localhost","username":"root","password":"","dbname":"test","charset":"utf-8"'
+export
ACTIVESYNC_SQL_MYSQL_TEST_CONFIG='{"activesync":{"sql":{"mysql":{"adapter":"mysql","host":"localhost","username":"root","password":"r00t","dbname":"test","charset":"utf-8"'
+export
ACTIVESYNC_SQL_MYSQLI_TEST_CONFIG='{"activesync":{"sql":{"mysqli":{"adapter":"mysqli","host":"localhost","username":"root","password":"r00t","dbname":"test","charset":"utf-8"'
+export
ACTIVESYNC_SQL_PDO_MYSQL_TEST_CONFIG='{"activesync":{"sql":{"pdo_mysql":{"adapter":"pdo_mysql","host":"localhost","username":"root","password":"r00t","dbname":"test","charset":"utf-8"'
-mysql -e 'create database IF NOT EXISTS test;' -uroot
+mysql -e "create database IF NOT EXISTS test; ALTER USER 'root'@'localhost'
IDENTIFIED WITH 'mysql_native_password' BY 'r00t';" -uroot
cd Horde_ActiveSync*/test/./Horde/ActiveSync
phpunit -v .
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#829028: openipmi: fix upstream bugs and stop using legacy paths
), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#829005: ganglia-webfrontend: runtime dependency on php-xml
Package: ganglia-web
Version: 3.6.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* ganglia-webfrontend: Add run-time dependency on php-xml as the code
calls xml_parser_create(), etc (LP: #1577916).
Thanks for considering the patch.
*** /tmp/tmp07pMEk/ganglia-web_3.6.1-2ubuntu1.debdiff
diff -Nru ganglia-web-3.6.1/debian/control ganglia-web-3.6.1/debian/control
--- ganglia-web-3.6.1/debian/control2016-05-22 22:57:02.0 -0700
+++ ganglia-web-3.6.1/debian/control2016-06-29 10:32:29.0 -0700
@@ -11,7 +11,7 @@
Package: ganglia-webfrontend
Architecture: all
-Depends: ${misc:Depends}, apache | apache-ssl | apache-perl | apache2 |
httpd-cgi, php | php-cgi | libapache2-mod-php, rrdtool, debconf (>= 0.5)
+Depends: ${misc:Depends}, apache | apache-ssl | apache-perl | apache2 |
httpd-cgi, php | php-cgi | libapache2-mod-php, php-xml, rrdtool, debconf (>=
0.5)
Recommends: gmetad, php-gd
Description: cluster monitoring toolkit - web front-end
Ganglia is a scalable, real-time cluster monitoring environment
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#828918: php-sabredav: fix autopkgtest failure
Package: php-sabredav
Version: 1.8.12-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to fix autopkgtest failures
(which also are occurring with Debian).
- d/p/DEP-8/Use-installed-class-for-DEP-8-tests.patch: fix
include_path (LP #1568026).
Thanks for considering the patch.
*** /tmp/tmpj8mrZ8/php-sabredav_1.8.12-3ubuntu1.debdiff
diff -Nru
php-sabredav-1.8.12/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
php-sabredav-1.8.12/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
---
php-sabredav-1.8.12/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
2016-05-06 05:29:31.0 -0700
+++
php-sabredav-1.8.12/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
2016-06-16 17:53:22.0 -0700
@@ -16,7 +16,7 @@
define('SABRE_MYSQLPASS','');
-set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ .
PATH_SEPARATOR . get_include_path());
-+set_include_path(get_include_path() . __DIR__ . '/../lib/' . PATH_SEPARATOR .
__DIR__ . PATH_SEPARATOR);
++set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/../lib/' .
PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR);
include 'Sabre/autoload.php';
include 'Sabre/TestUtil.php';
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#828869: src:php7.0: run tests during build
Package: php7.0
Version: 7.0.8-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Re-enable test suite, thanks to Marc Deslauriers
- debian/rules, debian/setup-mysql.sh: updated for new MySQL version
and new layout.
Thanks for considering the patch.
*** /tmp/tmpTBf45P/php7.0_7.0.8-2ubuntu1.debdiff
diff -Nru php7.0-7.0.8/debian/rules php7.0-7.0.8/debian/rules
--- php7.0-7.0.8/debian/rules 2016-06-24 04:42:02.0 -0700
+++ php7.0-7.0.8/debian/rules 2016-06-28 08:54:49.0 -0700
@@ -90,7 +90,7 @@
LIBTOOL_VERSION := $(shell dpkg-query -f'$${Version}' -W libtool)
# Disable the test now
-RUN_TESTS := no
+RUN_TESTS := yes
ifeq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
$(warning Disabling checks due DEB_BUILD_OPTIONS)
RUN_TESTS := no
@@ -101,12 +101,12 @@
endif
ifeq (yes,$(RUN_TESTS))
- MYSQL_PORT ?= $(shell for i in $$(seq 1025 3600 | sort -R); do nc -z
localhost $$i || { echo $$i; exit; } ; done)
- MYSQL_DATA_DIR ?= $(shell readlink -f mysql_db)
+ MYSQL_PORT := $(shell for i in $$(seq 1025 3600 | sort -R); do nc -z
localhost $$i || { echo $$i; exit; } ; done)
+ MYSQL_DATA_DIR := $(shell readlink -f mysql_db)
ifeq (,$(MYSQL_PORT))
$(error Could not find available port for mysql server)
endif
- MYSQL_SOCKET ?= $(MYSQL_DATA_DIR)/mysql.sock
+ MYSQL_SOCKET := $(MYSQL_DATA_DIR)/mysql.sock
endif
ifeq (linux,$(DEB_HOST_ARCH_OS))
@@ -343,7 +343,7 @@
# start our own mysql server for the tests
$(SHELL) -x debian/setup-mysql.sh $(MYSQL_PORT) $(MYSQL_DATA_DIR)
extensions=""; \
- for f in $(CURDIR)/apache2-build/modules/*.so; do \
+ for f in $(CURDIR)/ext-build/modules/*.so; do \
ext=`basename "$$f"`; \
test -d "$(CURDIR)/ext/$${ext%.so}/tests" || continue; \
test "$$ext" != "imap.so" || continue; \
@@ -357,11 +357,15 @@
test "$$ext" != "pdo_pgsql.so" || continue; \
test "$$ext" != "snmp.so" || continue; \
test "$$ext" != "opcache.so" || continue; \
+ test "$$ext" != "mysqlnd.so" || continue; \
+ test "$$ext" != "mysqli.so" || continue; \
+ test "$$ext" != "pdo_mysql.so" || continue; \
+ test "$$ext" != "wddx.so" || continue; \
extensions="$$extensions -d extension=$$ext"; \
done; \
[ "$$extensions" ] || { echo "extensions list is empty"; exit 1; }; \
- env MYSQL_TEST_HOST=127.0.0.1 MYSQL_TEST_PORT=$(MYSQL_PORT)
MYSQL_TEST_SOCKET=$(MYSQL_SOCKET) PDO_MYSQL_TEST_HOST=127.0.0.1
PDO_MYSQL_TEST_PORT=$(MYSQL_PORT) PDO_MYSQL_TEST_SOCKET=$(MYSQL_SOCKET)
NO_INTERACTION=1
TEST_PHP_CGI_EXECUTABLE=$(CURDIR)/cgi-build/sapi/cgi/cgi-bin.php$(PHP_NAME_VERSION)
TEST_PHP_EXECUTABLE=$(CURDIR)/cli-build/sapi/cli/php \
- $(CURDIR)/cli-build/sapi/cli/php run-tests.php -n -d
mysql.default_host=127.0.0.1 -d mysql.default_socket=$(MYSQL_SOCKET) -d
mysqli.default_socket=$(MYSQL_SOCKET) -d
extension_dir=$(CURDIR)/apache2-build/modules/ $$extensions| tee
test-results.txt
+ env MYSQL_TEST_HOST=127.0.0.1 MYSQL_TEST_PORT=$(MYSQL_PORT)
MYSQL_TEST_SOCKET=$(MYSQL_SOCKET) PDO_MYSQL_TEST_HOST=127.0.0.1
PDO_MYSQL_TEST_PORT=$(MYSQL_PORT) PDO_MYSQL_TEST_SOCKET=$(MYSQL_SOCKET)
NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=$(CURDIR)/cgi-build/sapi/php-cgi
TEST_PHP_EXECUTABLE=$(CURDIR)/cli-build/sapi/cli/php \
+ $(CURDIR)/cli-build/sapi/cli/php run-tests.php -n -d
mysql.default_host=127.0.0.1 -d mysql.default_socket=$(MYSQL_SOCKET) -d
mysqli.default_socket=$(MYSQL_SOCKET) -d
extension_dir=$(CURDIR)/ext-build/modules/ $$extensions| tee test-results.txt
rm -rf temp_session_store
@for test in `find . -name '*.log' -a '!' -name 'config.log' -a '!'
-name 'bootstrap.log' -a '!' -name 'run.log'`; do \
echo; \
diff -Nru php7.0-7.0.8/debian/setup-mysql.sh php7.0-7.0.8/debian/setup-mysql.sh
--- php7.0-7.0.8/debian/setup-mysql.sh 2016-06-24 04:42:02.0 -0700
+++ php7.0-7.0.8/debian/setup-mysql.sh 2016-06-28 08:57:39.0 -0700
@@ -36,12 +36,12 @@
chmod go-rx $datadir
chown $user: $datadir
-mysql_install_db --no-defaults --user=$user --datadir=$datadir --rpm --force
+mysql_install_db --no-defaults --user=$user --datadir=$datadir
--mysqld-file=/usr/sbin/mysqld --random-password-file=$datadir/.mysql_secret
tmpf=$(mktemp)
cat > "$tmpf" <
Bug#821485: fusiondirectory: PHP 7.0 Transition
Package: fusiondirectory
Version: 1.0.8.8-3
Followup-For: Bug #821485
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Further PHP7.0 fixes (LP: #1549942)
+ src: update to PHP7.0 package naming and apache module path
(https://github.com/fusiondirectory/fusiondirectory/issues/12)
+ src: fix typo in pt_BR translation
(https://github.com/fusiondirectory/fusiondirectory/issues/13)
Thanks for considering the patch.
*** /tmp/tmpwtTF7s/fusiondirectory_1.0.8.8-3ubuntu2.debdiff
diff -Nru
fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch
fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch
---
fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch
1969-12-31 16:00:00.0 -0800
+++
fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch
2016-03-08 15:09:23.0 -0800
@@ -0,0 +1,357 @@
+Description: php5- -> php- in all package name references
+Author: Nishanth Aravamudan
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942
+Bug: https://github.com/fusiondirectory/fusiondirectory/issues/12
+
+---
fusiondirectory-1.0.8.8.orig/core/contrib/apache/fusiondirectory-apache.conf
fusiondirectory-1.0.8.8/core/contrib/apache/fusiondirectory-apache.conf
+@@ -1,7 +1,7 @@
+ # Include FusionDirectory to your web service
+ Alias /fusiondirectory /usr/share/fusiondirectory/html
+
+-
++
+
+ php_admin_flag engine on
+ php_admin_flag register_globals off
+--- fusiondirectory-1.0.8.8.orig/core/html/progress.php
fusiondirectory-1.0.8.8/core/html/progress.php
+@@ -51,8 +51,8 @@ if ($y < 3 || $y > 700) {
+ }
+
+ if (!function_exists("imagecreate")) {
+- syslog(LOG_ERR, "FusionDirectory is missing the gd library, please install
php5-gd to be able to see progress images.");
+- echo "Please install the php5-gd library, FusionDirectory can't create
images without it.";
++ syslog(LOG_ERR, "FusionDirectory is missing the gd library, please install
php-gd to be able to see progress images.");
++ echo "Please install the php-gd library, FusionDirectory can't create
images without it.";
+ exit();
+ } else {
+
+--- fusiondirectory-1.0.8.8.orig/core/include/class_config.inc
fusiondirectory-1.0.8.8/core/include/class_config.inc
+@@ -1142,7 +1142,7 @@ class config {
+ if (!session::is_set("snapshotFailMessageSend")) {
+ session::set("snapshotFailMessageSend", TRUE);
+ msg_dialog::display(_("Configuration error"),
+- sprintf(_("The snapshot functionality is enabled, but the
required compression module is missing. Please install '%s'."), "php5-zip /
php5-gzip"), ERROR_DIALOG);
++ sprintf(_("The snapshot functionality is enabled, but the
required compression module is missing. Please install '%s'."), "php-zip /
php-gzip"), ERROR_DIALOG);
+ }
+ return FALSE;
+ }
+--- fusiondirectory-1.0.8.8.orig/core/include/simpleplugin/class_attribute.inc
fusiondirectory-1.0.8.8/core/include/simpleplugin/class_attribute.inc
+@@ -1696,7 +1696,7 @@ class ImageAttribute extends FileAttribu
+ }
+ } else {
+ msg_dialog::display(_("Error"),
+-_("Cannot save user picture, FusionDirectory requires the
package 'php5-imagick' to be installed!"),
++_("Cannot save user picture, FusionDirectory requires the
package 'php-imagick' to be installed!"),
+ ERROR_DIALOG);
+ }
+ }
+--- fusiondirectory-1.0.8.8.orig/core/locale/ar/fusiondirectory.po
fusiondirectory-1.0.8.8/core/locale/ar/fusiondirectory.po
+@@ -1392,7 +1392,7 @@ msgstr ""
+ #: include/simpleplugin/class_attribute.inc:1699
+ msgid ""
+ "Cannot save user picture, FusionDirectory requires the package "
+-"'php5-imagick' to be installed!"
++"'php-imagick' to be installed!"
+ msgstr ""
+
+ #: plugins/personal/generic/class_user.inc:985
+--- fusiondirectory-1.0.8.8.orig/core/locale/ca/fusiondirectory.po
fusiondirectory-1.0.8.8/core/locale/ca/fusiondirectory.po
+@@ -1393,7 +1393,7 @@ msgstr ""
+ #: include/simpleplugin/class_attribute.inc:1699
+ msgid ""
+ "Cannot save user picture, FusionDirectory requires the package "
+-"'php5-imagick' to be installed!"
++"'php-imagick' to be installed!"
+ msgstr ""
+
+ #: plugins/personal/generic/class_user.inc:985
+--- fusiondirectory-1.0.8.8.orig/core/locale/cs_CZ/fusiondirectory.po
fusiondirectory-1.0.8.8/core/locale/cs_CZ/fusiondirectory.po
+
Bug#821544: phamm: Further fixes for PHP7.0
Package: phamm
Version: 0.6.2-2
Followup-For: Bug #821544
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
Further changes are needed to phamm to be PHP7 compliant.
In Ubuntu, the attached patch was applied to achieve the following:
* Update to PHP7.0 dependencies (LP #1562950).
- Fix Apache configuration to use mod_php7.c, not mod_php.c (Ubuntu
issue).
* debian/patches/php7_has_removed_ereg.patch: PHP7.0 has removed ereg
as an API. Closes LP: #1570968.
Thanks for considering the patch.
*** /tmp/tmp6G_YmL/phamm_0.6.2-2ubuntu1.debdiff
diff -Nru phamm-0.6.2/debian/conf/phamm.conf phamm-0.6.2/debian/conf/phamm.conf
--- phamm-0.6.2/debian/conf/phamm.conf 2014-07-14 22:38:41.0 -0700
+++ phamm-0.6.2/debian/conf/phamm.conf 2016-06-23 16:03:01.0 -0700
@@ -23,7 +23,7 @@
-
+
AddType application/x-httpd-php .php
php_flag magic_quotes_gpc Off
@@ -32,12 +32,12 @@
php_value include_path .
-
+
AddType application/x-httpd-php .php
-Action application/x-httpd-php /cgi-bin/php5
+Action application/x-httpd-php /cgi-bin/php
diff -Nru phamm-0.6.2/debian/patches/php7_has_removed_ereg.patch
phamm-0.6.2/debian/patches/php7_has_removed_ereg.patch
--- phamm-0.6.2/debian/patches/php7_has_removed_ereg.patch 1969-12-31
16:00:00.0 -0800
+++ phamm-0.6.2/debian/patches/php7_has_removed_ereg.patch 2016-06-23
16:03:08.0 -0700
@@ -0,0 +1,62 @@
+Description: PHP7.0 has removed ereg as an API.
+Author: Nishanth Aravamudan
+Bug-Ubuntu: https://launchpad.net/bugs/1570968
+
+--- phamm-0.6.2.orig/controllers/helpers.php
phamm-0.6.2/controllers/helpers.php
+@@ -259,7 +259,7 @@ function check_syntax ($type,$arg,$lengt
+ // IP Address
+ if ($type == 'ip')
+ {
+-if (!ereg
("^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$", $arg))
++if (!preg_match
("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", $arg))
+ {
+ return FALSE;
+ }
+@@ -282,7 +282,7 @@ function check_syntax ($type,$arg,$lengt
+ // DOMAIN
+ elseif ($type == 'domain')
+ {
+-if (!eregi("^([0-9a-z][0-9a-z-]+\.)+[a-z]{2,7}$", $arg))
++if (!preg_match ("/^([0-9a-z][0-9a-z-]+\.)+[a-z]{2,7}$/i", $arg))
+ {
+ return FALSE;
+ }
+@@ -296,7 +296,7 @@ function check_syntax ($type,$arg,$lengt
+ // ALIAS and ACCOUNT
+ elseif ($type == 'account')
+ {
+-if (!eregi("^[\._a-z0-9-]+$", $arg))
++if (!preg_match ("/^[\._a-z0-9-]+$/i", $arg))
+ {
+ return FALSE;
+ }
+@@ -310,7 +310,7 @@ function check_syntax ($type,$arg,$lengt
+ // Password
+ elseif ($type == 'password')
+ {
+-if (!eregi("^[\._a-z0-9-]+$", $arg))
++if (!preg_match ("/^[\._a-z0-9-]+$/i", $arg))
+ return false;
+
+ return true;
+@@ -319,7 +319,7 @@ function check_syntax ($type,$arg,$lengt
+ // Email
+ elseif ($type == 'email')
+ {
+-if (!eregi("^[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,4}$", $arg))
++if (!preg_match
("/^[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,4}$/i", $arg))
+ return false;
+
+ return true;
+--- phamm-0.6.2.orig/views/helpers.php
phamm-0.6.2/views/helpers.php
+@@ -1386,7 +1386,7 @@ function refresh ($url, $force_meta = fa
+ $PROTOCOL = 'http';
+
+ // HTTP/1.1 requires an absolute URI
+-$uri = ereg ( '^http', $url ) ? $url : "$PROTOCOL://".
++$uri = preg_match ( '/^http/', $url ) ? $url : "$PROTOCOL://".
+$_SERVER['HTTP_HOST'];
+
+ // Server Root Check
diff -Nru phamm-0.6.2/debian/patches/series phamm-0.6.2/debian/patches/series
--- phamm-0.6.2/debian/patches/series 1969-12-31 16:00:00.0 -0800
+++ phamm-0.6.2/debian/patches/series 2016-06-23 16:03:08.0 -0700
@@ -0,0 +1 @@
+php7_has_removed_ereg.patch
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#827491: php-horde-db: make test mysql-5.7 compatible
Package: php-horde-db
Version: 2.3.1-5
Followup-For: Bug #827491
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
After syncing the Debian 2.3.1-5 to Ubuntu, we are seeing autopkgtest
failures
(ihttps://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-yakkety/yakkety/amd64/p/php-horde-db/20160621_180107@/log.gz).
Our prior version (2.3.1-4ubuntu1)'s delta simply made root have an
empty password, so we didn't notice the dependencies on non-MYSQLI
config changes.
In Ubuntu, the attached patch leads to a successful autopkgtest run.
Thanks for considering the patch.
*** /tmp/tmpmuZaYs/php-horde-db_2.3.1-6.debdiff
diff -Nru php-horde-db-2.3.1/debian/tests/phpunit
php-horde-db-2.3.1/debian/tests/phpunit
--- php-horde-db-2.3.1/debian/tests/phpunit 2016-06-18 13:46:07.0
-0700
+++ php-horde-db-2.3.1/debian/tests/phpunit 2016-06-21 15:22:23.0
-0700
@@ -2,9 +2,9 @@
set -e
-export
DB_ADAPTER_MYSQL_TEST_CONFIG='{"db":{"adapter":{"mysql":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}'
+export
DB_ADAPTER_MYSQL_TEST_CONFIG='{"db":{"adapter":{"mysql":{"test":{"host":"localhost","username":"root","password":"r00t","dbname":"test"}'
export
DB_ADAPTER_MYSQLI_TEST_CONFIG='{"db":{"adapter":{"mysqli":{"test":{"host":"localhost","username":"root","password":"r00t","dbname":"test"}'
-export
DB_ADAPTER_PDO_MYSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"mysql":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}}'
+export
DB_ADAPTER_PDO_MYSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"mysql":{"test":{"host":"localhost","username":"root","password":"r00t","dbname":"test"}}'
export
DB_ADAPTER_PDO_PGSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"pgsql":{"test":{"host":"localhost","username":"test","password":"test","dbname":"test"}}'
mysql -e "create database IF NOT EXISTS test; ALTER USER 'root'@'localhost'
IDENTIFIED WITH 'mysql_native_password' BY 'r00t';" -uroot
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#827782: symfony: src:symfony Build-Conflicts with non-existing php-mongo
Package: symfony Version: 2.8.7+dfsg-1 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, Ubuntu currently maintains a delta for src:symfony because it is defined to have a Build-Conflicts with php-mongo. I think this was a false renamed from php5-mongo -> php-mongo, while the PHP7-compliant package is php-mongodb. I believe the attached patch applies to Debian and fixes this issue. Thanks for considering the patch. *** /tmp/tmprjaZKd/symfony_2.8.7+dfsg-1ubuntu1.debdiff diff -Nru symfony-2.8.7+dfsg/debian/control symfony-2.8.7+dfsg/debian/control --- symfony-2.8.7+dfsg/debian/control 2016-06-07 17:37:09.0 -0700 +++ symfony-2.8.7+dfsg/debian/control 2016-06-20 14:29:58.0 -0700 @@ -39,7 +39,7 @@ php-twig (>= 1.23), phpab, phpunit (>= 5) -Build-Conflicts: php-mongo +Build-Conflicts: php-mongodb Homepage: https://symfony.com/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/symfony.git Vcs-Git: git://anonscm.debian.org/pkg-php/symfony.git -b 2.8 -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#827695: zendframework: Rename zend-framework in Ubuntu to allow for a package sync
Package: zendframework
Version: 1.12.18+dfsg-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
For reference:
https://bugs.launchpad.net/ubuntu/+source/zend-framework/+bug/1593024
I am hoping to get rid of the Ubuntu zend-framework package and simply
sync the zendframework package from Debian. Said package is currently
blacklisted in Ubuntu due to
https://bugs.launchpad.net/ubuntu/+source/zendframework/+bug/580507 (and
some more details in
https://bugs.launchpad.net/ubuntu/+source/zend-framework/+bug/1052423).
To that end, per https://wiki.debian.org/Renaming_a_Package Method 2, I
would like to see if you would consider taking the following patch,
which allows for proper upgrading from 16.04 -> 16.10 via:
* zend-framework -> zendframework transition (LP: #1593024):
- Define transitionaly dummy packages for zend-framework,
libzend-framework-php, and zend-framework-bin, which were all
binary packages from src:zend-framework.
- Modify the definitions of zendframework and zendframework-bin to
Replace & Break the zend-framework versions before this one.
I did also have one question, before you apply the same patch, though:
the zend-framework package in Ubuntu used a different upstream tarball
which included the 'extras' library from ZF1. Is there any interest in
Debian packaging the same? Either way, I probably need to modify the
patch to also B/R libzend-framework-zend-php -- I asked in the Ubuntu
bug just recently on the best way forward, as semantically zendframework
does break libzend-framework-zend-php (versioned), but doesn't replace
it.
Thanks for considering the patch.
*** /tmp/tmpZP39jt/zendframework_1.12.18+dfsg-1ubuntu1.debdiff
diff -Nru zendframework-1.12.18+dfsg/debian/control
zendframework-1.12.18+dfsg/debian/control
--- zendframework-1.12.18+dfsg/debian/control 2016-04-13 13:38:23.0
-0700
+++ zendframework-1.12.18+dfsg/debian/control 2016-06-19 00:50:42.0
-0700
@@ -28,8 +28,8 @@
php-xml,
php-zip,
${phpcomposer:Debian-suggest}
-Replaces: ${phpcomposer:Debian-replace}
-Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
+Replaces: zend-framework (<< 1.12.18+dfsg-1~), libzend-framework-php (<<
1.12.18+dfsg-1~), ${phpcomposer:Debian-replace}
+Breaks: zend-framework (<< 1.12.18+dfsg-1~), libzend-framework-php (<<
1.12.18+dfsg-1~), ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
Provides: zend-framework, ${phpcomposer:Debian-provide}
Description: powerful PHP framework
Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -42,6 +42,8 @@
Package: zendframework-bin
Architecture: all
Depends: php-cli, zendframework, ${misc:Depends}
+Replaces: zend-framework-bin (<< 1.12.18+dfsg-1~)
+Breaks: zend-framework-bin (<< 1.12.18+dfsg-1~)
Description: binary scripts for zendframework
Extending the art & spirit of PHP, Zend Framework is based on simplicity,
object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -60,3 +62,27 @@
reliable, and modern Web 2.0 applications & web services, and consuming widely
available APIs from leading vendors like Google, Amazon, Yahoo!, Flickr, as
well as API providers and cataloguers like StrikeIron and ProgrammableWeb.
+
+Package: libzend-framework-php
+Depends: zendframework, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: zend-framework
+Depends: zendframework, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: zend-framework-bin
+Depends: zendframework-bin, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
Bug#827496: php-net-ldap2: runtime dependency on php-pear
Package: php-net-ldap2
Version: 2.2.0-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
We found failures in the autopkgtests because the package uses PEAR
directly at runtime.
In Ubuntu, the attached patch was applied to achieve the following:
* Add run-time dependency on php-pear (LP: #1564984).
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru php-net-ldap2-2.2.0/debian/control php-net-ldap2-2.2.0/debian/control
--- php-net-ldap2-2.2.0/debian/control 2015-11-15 07:25:09.0 -0800
+++ php-net-ldap2-2.2.0/debian/control 2016-04-01 09:10:39.0 -0700
@@ -12,7 +12,7 @@
Package: php-net-ldap2
Architecture: all
-Depends: ${misc:Depends}, ${phppear:Debian-Depends}
+Depends: ${misc:Depends}, ${phppear:Debian-Depends}, php-pear
Recommends: ${phppear:Debian-Recommends}
Breaks: ${phppear:Debian-Breaks}
Description: ${phppear:summary}
Bug#827492: php-horde-http: use fully-qualified non-existent domain
Package: php-horde-http
Version: 2.1.6-3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
We found a failure in the php-horde-http autopkgtest without the
following.
In Ubuntu, the attached patch was applied to achieve the following:
- fix_test_domain.patch: use a fully-qualified inexistent domain for
test suite to prevent test failure in autopkgtest environment.
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru php-horde-http-2.1.6/debian/patches/fix_test_domain.patch php-horde-http-2.1.6/debian/patches/fix_test_domain.patch
--- php-horde-http-2.1.6/debian/patches/fix_test_domain.patch 1969-12-31 16:00:00.0 -0800
+++ php-horde-http-2.1.6/debian/patches/fix_test_domain.patch 2016-06-16 16:25:46.0 -0700
@@ -0,0 +1,14 @@
+Description: use a fully-qualified inexistent domain
+Author: Marc Deslauriers
+
+--- php-horde-http-2.1.6.orig/Horde_Http-2.1.6/test/Horde/Http/TestBase.php
php-horde-http-2.1.6/Horde_Http-2.1.6/test/Horde/Http/TestBase.php
+@@ -74,7 +74,7 @@ class Horde_Http_TestBase extends Horde_
+ $client = new Horde_Http_Client(
+ array('request' => new self::$_requestClass())
+ );
+-$client->get('http://doesntexist/');
++$client->get('http://doesntexist.ubuntu.com/');
+ }
+
+ /**
diff -Nru php-horde-http-2.1.6/debian/patches/series php-horde-http-2.1.6/debian/patches/series
--- php-horde-http-2.1.6/debian/patches/series 1969-12-31 16:00:00.0 -0800
+++ php-horde-http-2.1.6/debian/patches/series 2016-06-16 16:23:51.0 -0700
@@ -0,0 +1 @@
+fix_test_domain.patch
Bug#827491: php-horde-db: make test mysql-5.7 compatible
Package: php-horde-db
Version: 2.3.1-4
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
The php-horde-db tests will fail due to an incompatible change in MySQL
5.7.
In Ubuntu, the attached patch was applied to achieve the following:
- Update test compatibility with MySQL 5.7 (LP #1568015).
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru php-horde-db-2.3.1/debian/tests/phpunit php-horde-db-2.3.1/debian/tests/phpunit
--- php-horde-db-2.3.1/debian/tests/phpunit 2016-06-07 13:34:12.0 -0700
+++ php-horde-db-2.3.1/debian/tests/phpunit 2016-06-16 15:59:08.0 -0700
@@ -7,7 +7,7 @@
export DB_ADAPTER_PDO_MYSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"mysql":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}}'
export DB_ADAPTER_PDO_PGSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"pgsql":{"test":{"host":"localhost","username":"test","password":"test","dbname":"test"}}'
-mysql -e 'create database IF NOT EXISTS test;' -uroot
+mysql -e "create database IF NOT EXISTS test; ALTER USER 'root'@'localhost' IDENTIFIED WITH 'mysql_native_password' BY '';" -uroot
su postgres --command 'createdb test'
su postgres --command "psql -c \"CREATE USER test WITH PASSWORD 'test';\""
su postgres --command "psql -c \"GRANT ALL ON DATABASE test TO test;\""
Bug#827485: phing: properly handle Ubuntu versions in changelog
Package: phing Version: 2.13.0-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, The upstream regex fails for Ubuntu versions. Simple fix was tested in 16.04. In Ubuntu, the attached patch was applied to achieve the following: * Correctly update regex (LP: #1563098). Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru phing-2.13.0/debian/rules phing-2.13.0/debian/rules --- phing-2.13.0/debian/rules 2016-03-29 10:11:45.0 -0700 +++ phing-2.13.0/debian/rules 2016-03-31 12:44:10.0 -0700 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -UPSTREAM := $(shell head -1 debian/changelog | sed 's/.*(//;s/-[^)-]\+).*//') +UPSTREAM := $(shell head -1 debian/changelog | sed 's/.*(//;s/-[^-]*).*//') %: dh $@ --buildsystem=phppear --with phppear
Bug#827483: php-horde-mapi: fix autopkgtest errors
Package: php-horde-mapi Version: 1.0.8-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, autopkgtests in Debian and Ubuntu are failing, due to a deprecation warning being emitted on stderr during the test. In Ubuntu, the attached patch was applied to achieve the following: * d/tests/control: allow stderr output, as deprecated warnings from BigInteger are reported with PHP7.0 (LP: #1593003). Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru php-horde-mapi-1.0.8/debian/tests/control php-horde-mapi-1.0.8/debian/tests/control --- php-horde-mapi-1.0.8/debian/tests/control 2016-06-08 00:09:58.0 -0700 +++ php-horde-mapi-1.0.8/debian/tests/control 2016-06-16 13:58:08.0 -0700 @@ -1,3 +1,3 @@ Tests: phpunit -Restrictions: needs-recommends +Restrictions: needs-recommends, allow-stderr Depends: @, php-cli, php-horde-test
Bug#827482: symfony: add stage1 build profile
Package: symfony
Version: 2.8.7+dfsg-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d: add nocheck and stage1 build profiles (LP #1544279).
* d/control: add php-symfony-security-acl to the stage1 build, as it
depends on php-symfony-security-core from this source package.
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru symfony-2.8.7+dfsg/debian/control symfony-2.8.7+dfsg/debian/control
--- symfony-2.8.7+dfsg/debian/control 2016-06-07 17:37:09.0 -0700
+++ symfony-2.8.7+dfsg/debian/control 2016-06-16 13:59:16.0 -0700
@@ -13,9 +13,9 @@
locales-all,
parallel,
php-apcu-bc,
- php-doctrine-bundle (>= 1.5),
- php-doctrine-data-fixtures (>= 1.1.1-2~),
- php-doctrine-orm (>= 2.4.8),
+ php-doctrine-bundle (>= 1.5) ,
+ php-doctrine-data-fixtures (>= 1.1.1-2~) ,
+ php-doctrine-orm (>= 2.4.8) ,
php-email-validator (>= 1.2.8),
php-intl,
php-ldap,
@@ -35,10 +35,10 @@
php-symfony-polyfill-php56,
php-symfony-polyfill-php70,
php-symfony-polyfill-util,
- php-symfony-security-acl,
+ php-symfony-security-acl ,
php-twig (>= 1.23),
phpab,
- phpunit (>= 5)
+ phpunit (>= 5)
Build-Conflicts: php-mongo
Homepage: https://symfony.com/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/symfony.git
@@ -735,6 +735,7 @@
Breaks: ${phpcomposer:Debian-conflict},
${phpcomposer:Debian-replace}
Provides: ${phpcomposer:Debian-provide}
+Build-Profiles:
Description: integration for Doctrine with Symfony Components
The ${phpcomposer:description} integrates the Doctrine Project
with various Symfony Components.
@@ -771,6 +772,7 @@
Breaks: ${phpcomposer:Debian-conflict},
${phpcomposer:Debian-replace}
Provides: ${phpcomposer:Debian-provide}
+Build-Profiles:
Description: integration for PHPUnit with Symfony Components
The ${phpcomposer:description} integrates PHPUnit with various
Symfony Components.
diff -Nru symfony-2.8.7+dfsg/debian/rules symfony-2.8.7+dfsg/debian/rules
--- symfony-2.8.7+dfsg/debian/rules 2016-06-07 17:37:09.0 -0700
+++ symfony-2.8.7+dfsg/debian/rules 2016-06-16 11:47:05.0 -0700
@@ -68,7 +68,7 @@
override_dh_auto_test:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nocheck stage1, $(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
ln -s ./src/Symfony ./Symfony
mkdir --parents vendor
ln -s ../debian/autoload.build.php ./vendor/autoload.php
Bug#827420: php-zeta-console-tools: patch needed for phpunit script
Package: php-zeta-console-tools Version: 1.7-3 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, The phpunit autopkgtest script uses patch, but doesn't list it as a dependency. It is not always present (e.g., Ubuntu builds). In Ubuntu, the attached patch was applied to fix this: * d/t/control: patch is needed to run the phpunit script. Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru php-zeta-console-tools-1.7/debian/tests/control php-zeta-console-tools-1.7/debian/tests/control --- php-zeta-console-tools-1.7/debian/tests/control 2016-03-23 12:56:00.0 -0700 +++ php-zeta-console-tools-1.7/debian/tests/control 2016-06-15 16:38:54.0 -0700 @@ -1,3 +1,3 @@ Tests: phpunit Restrictions: rw-build-tree -Depends: @, php-zeta-unit-test, phpunit +Depends: @, php-zeta-unit-test, phpunit, patch
Bug#827409: php-text-captcha depends on php-pear
Package: php-text-captcha
Version: 1.0.2-3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
autopkgtests for php-text-captcha in both Ubuntu and Debian are failing.
In Ubuntu, the attached patch was applied to achieve the following:
* Text/CAPTCHA/Driver/Figlet.php uses PEAR() and
Text/CAPTCHA/Exception.php requires PEAR/Exception.php
(LP: #1592972).
Thanks for considering the patch.
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru php-text-captcha-1.0.2/debian/control php-text-captcha-1.0.2/debian/control
--- php-text-captcha-1.0.2/debian/control 2016-03-19 08:03:58.0 -0700
+++ php-text-captcha-1.0.2/debian/control 2016-06-15 13:27:19.0 -0700
@@ -18,8 +18,9 @@
Package: php-text-captcha
Architecture: all
-Depends: ${misc:Depends},
- ${phppear:Debian-Depends}
+Depends: php-pear,
+ ${misc:Depends},
+ ${phppear:Debian-Depends},
Recommends: ${phppear:Debian-Recommends}
Breaks: ${phppear:Debian-Breaks}
Description: ${phppear:summary}
Bug#827390: php-pimple: Fully remove php5-pimple autopkgtest
Package: php-pimple Version: 3.0.2-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, php-pimple currently fails it's autopkgtests in Debian and Ubuntu. I believe this is because https://anonscm.debian.org/cgit/pkg-php/php-pimple.git/commit/debian/tests/control?id=469bbde52066f24557d792b69af810aec37c60e4 did not remove the php5-pimple test stanza fully. Running phpunit with the pimple autoload file will fail, as it will attempt to uses classes defined in the src/Pimple/Tests subdirectory, which have been excluded correctly from the system-wide autoload file. In Ubuntu, the attached patch was applied to achieve the following: * d/t/control: remove entire stanza for testing php5-pimple (LP: #1592890). Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru php-pimple-3.0.2/debian/tests/control php-pimple-3.0.2/debian/tests/control --- php-pimple-3.0.2/debian/tests/control 2016-04-09 18:34:56.0 -0700 +++ php-pimple-3.0.2/debian/tests/control 2016-06-15 09:09:28.0 -0700 @@ -1,6 +1,3 @@ Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --template debian/autoload.php.tpl --basedir vendor src/Pimple/Tests && phpunit Restrictions: rw-build-tree allow-stderr Depends: php-pimple, phpab, phpunit - -Test-Command: phpunit --bootstrap /usr/share/php/Pimple/autoload.php -Depends: phpunit
Bug#826998: php-imagick: properly avoid openmp threads and use a non-soname dependency
Package: php-imagick Version: 3.4.2-2 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Merge with Debian unstable (LP: #1590618). Remaining changes: - Use libmagickwand-6.q16-dev | libmagickwand-dev as the test dependency instead of hard-coding an soname that will require us to update the tests file for each new ABI. [ This is ostensibly cleaner than what I provided to Debian in Bug #816724 ] - debian/patches/no-openmp-threads.patch: limit the number of openmp threads used to 1. [ As is this. If we can't trust the tests to run with > 1 OpenMP threads, we should probably limit it at all times with this library. ] - Fix failures in autopkgtests (LP #1549942) + imagick-3.4.0RC6/tests/025-get-color.phpt: Do not do version check, as Ubuntu has backported the referenced fixes. [ I did not include this delta here, but I would like to. I do not believe there has been any movement in Debian wrt. my submissions in Debian #811308 or #816701. And, in fact, #811308 has been re-marked fix, but that seems false, as the version that fixes it is wheezy-security upload? I might just missing something in the Debian process. ] * Do not manually set MAGICK_THREAD_LIMIT in d/t/control, as the number of threads are limited in the source. [ superseded by the source change ] * d/patches/: update 3.4.0RC6 to 3.4.2 for new upstream version. [ if the imagemagick changes get picked by Debian, I'll send this with a follow-on debdiff. ] Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-22-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru php-imagick-3.4.2/debian/patches/no-openmp-threads.patch php-imagick-3.4.2/debian/patches/no-openmp-threads.patch --- php-imagick-3.4.2/debian/patches/no-openmp-threads.patch 1969-12-31 16:00:00.0 -0800 +++ php-imagick-3.4.2/debian/patches/no-openmp-threads.patch 2016-06-09 16:47:41.0 -0700 @@ -0,0 +1,23 @@ +Description: limit the number of openmp threads used to 1 + The php-imagick 3.4.0 test suite fails with various segfaults when openmp + threads are in use. Force the openmp thread count to 1 to avoid this + problem. + . + This patch is a workaround only; it is currently unknown if the root bug + lies in php-imagick or in imagemagick. +Author: Steve Langasek +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942 + +Index: php-imagick-3.4.0~rc6/imagick-3.4.2/imagick.c +=== +--- php-imagick-3.4.0~rc6.orig/imagick-3.4.2/imagick.c php-imagick-3.4.0~rc6/imagick-3.4.2/imagick.c +@@ -3579,6 +3579,8 @@ + checkImagickVersion(); + } + ++ SetMagickResourceLimit(ThreadResource, 1); ++ + return SUCCESS; + } + diff -Nru php-imagick-3.4.2/debian/patches/series php-imagick-3.4.2/debian/patches/series --- php-imagick-3.4.2/debian/patches/series 2016-04-29 02:17:36.0 -0700 +++ php-imagick-3.4.2/debian/patches/series 2016-06-09 16:47:41.0 -0700 @@ -1 +1,2 @@ 0001-Hardcode-path-to-usrsharefontstruetypettf-dejavuDeja.patch +no-openmp-threads.patch diff -Nru php-imagick-3.4.2/debian/tests/control php-imagick-3.4.2/debian/tests/control --- php-imagick-3.4.2/debian/tests/control 2016-04-29 02:17:36.0 -0700 +++ php-imagick-3.4.2/debian/tests/control 2016-06-09 16:47:41.0 -0700 @@ -1,2 +1,2 @@ -Test-Command: cd imagick-*/tests && MAGICK_THREAD_LIMIT=1 phpunit --verbose . -Depends: php-cli, php-imagick, gsfonts, libmagickcore-6.q16-2-extra, phpunit +Test-Command: cd imagick-*/tests && phpunit --verbose . +Depends: php-cli, php-imagick, gsfonts, libmagickwand-6.q16-dev | libmagickwand-dev, phpunit
Bug#697225: smbldap-tools: config(ure).pl script not included
Package: smbldap-tools Version: 0.9.9-1 Followup-For: Bug #697225 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to re-add smbldap-config.pl to the binary package. * debian/patches/0022_read_smbldap-config.patch: Install smbldap- config command. Closes: #697225, LP: #997172. * debian/patches/0023_add_pod_smbldap-config.patch: Add POD to smbldap- config.pl. Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-22-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch --- smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch 1969-12-31 16:00:00.0 -0800 +++ smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch 2016-05-17 16:23:08.0 -0700 @@ -0,0 +1,29 @@ +Description: Install smbldap-config command +Author: Nishanth Aravamudan +Bug-Ubuntu: https://bugs.launchpad.net/bugs/997172 +Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools/trunk/Makefile.in?r1=155&r2=156&; +Bug-Debian: https://bugs.debian.org/697225 + +Index: gitwd/Makefile.in +=== +--- gitwd.orig/Makefile.in gitwd/Makefile.in +@@ -17,7 +17,6 @@ BUILD_TARGETS= \ + $(BUILD_PERL_MOD_TARGETS) \ + $(BUILD_PERL_CMD_TARGETS) \ + $(BUILD_PERL_MAN_TARGETS) \ +- smbldap-config.cmd \ + smbldap-upgrade-0.9.6.cmd \ + doc/smb.conf.example \ + doc/smb.smbldap.conf.example \ +@@ -43,7 +42,9 @@ PERL_CMD_SOURCES= \ + smbldap-userinfo.pl \ + smbldap-userlist.pl \ + smbldap-usermod.pl \ +- smbldap-usershow.pl ++ smbldap-usershow.pl \ ++ smbldap-config.pl \ ++ # + + PERL_MAN_SECTION= 8 + diff -Nru smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch --- smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch 1969-12-31 16:00:00.0 -0800 +++ smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch 2016-05-17 16:26:22.0 -0700 @@ -0,0 +1,31 @@ +Description: Add POD to smbldap-config.pl + Build fails otherwise. +Author: Nishanth Aravamudan +Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools?view=revision&revision=172 +Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools?view=revision&revision=173 +Bug: https://gna.org/support/?3013 + +--- smbldap-tools-0.9.9.orig/smbldap-config.pl smbldap-tools-0.9.9/smbldap-config.pl +@@ -557,3 +557,21 @@ print " $smbldap_bind_conf done.\n"; + $mode=0600; + chmod $mode,"$smbldap_bind_conf","$smbldap_bind_conf.old"; + ++_END_ ++ ++=head1 NAME ++ ++smbldap-config - Configure the smbldap-tools ++ ++=head1 SYNOPSIS ++ ++smbldap-config ++ ++=head1 DESCRIPTION ++ ++An interactive script to configure the smbldap-tools to work with your ++existing LDAP server(s). Before running it, you should ensure that your ++samba controller is up and running, and that the domain SID is defined ++(you can check it by running 'net getlocalsid'). ++ ++=cut diff -Nru smbldap-tools-0.9.9/debian/patches/series smbldap-tools-0.9.9/debian/patches/series --- smbldap-tools-0.9.9/debian/patches/series 2012-12-07 02:45:19.0 -0800 +++ smbldap-tools-0.9.9/debian/patches/series 2016-05-17 16:25:05.0 -0700 @@ -1,3 +1,5 @@ 0001_debian_nobody.patch 0020_original_doc_html_index.patch 0021_smbldap-useradd_flush_nscd_cache.patch +0022_read_smbldap-config.patch +0023_add_pod_smbldap-config.patch
Bug#816724: php-imagick: update d/tests/control
Source: php-imagick Version: 3.4.0~rc6-2 Severity: important Tags: patch Dear Maintainer, php-imagick's autopkgtests currently fail, due to some missing steps to properly run phpunit and missing test dependencies. P.S. Additionally, two imagemagick bugs need fixing in order to fully pass the tests (#811308 which is marked fixed but the included backport is missing key fixes from upstream; and a bug I just filed to backport a fix for a segfault [will update this bug with that # once I've received it]. diff -Nru php-imagick-3.4.0~rc6/debian/changelog php-imagick-3.4.0~rc6/debian/changelog --- php-imagick-3.4.0~rc6/debian/changelog 2016-02-29 13:17:05.0 -0800 +++ php-imagick-3.4.0~rc6/debian/changelog 2016-03-04 08:56:40.0 -0800 @@ -1,3 +1,15 @@ +php-imagick (3.4.0~rc6-3) unstable; urgency=medium + + * Fix failures in autopkgtests (LP: #1549942) +- d/tests/control: run phpunit from tests/ subdirectory to pick up + the SKIP helper. +- d/tests/control: limit imagemagick to 1 thread to avoid openmp + related segfaults. +- d/tests/control: add gsfonts and libmagickcore-6.q16-2-extra as + test dependencies. + + -- Nishanth Aravamudan Fri, 04 Mar 2016 08:55:49 -0800 + php-imagick (3.4.0~rc6-2) unstable; urgency=medium * Force rebuild with dh_php >= 0.7 diff -Nru php-imagick-3.4.0~rc6/debian/tests/control php-imagick-3.4.0~rc6/debian/tests/control --- php-imagick-3.4.0~rc6/debian/tests/control 2016-02-29 13:17:05.0 -0800 +++ php-imagick-3.4.0~rc6/debian/tests/control 2016-03-04 08:55:08.0 -0800 @@ -1,2 +1,2 @@ -Test-Command: cd imagick-* && phpunit --verbose tests -Depends: php5-cli, php5-imagick, phpunit +Test-Command: cd imagick-*/tests && MAGICK_THREAD_LIMIT=1 phpunit --verbose . +Depends: php-cli, php-imagick, gsfonts, libmagickcore-6.q16-2-extra, phpunit
Bug#816701: imagemagick: php-imagick testcase segfault in imagemagick
Package: imagemagick Version: 8:6.8.9.9-7 Severity: important Dear Maintainer, The php-imagick auto tests currently segmentation fault (and have for some time, since 12/21): https://ci.debian.net/packages/p/php-imagick/unstable/amd64/. Some of these are fixed by passing MAGICK_THREAD_LIMIT=1, but there are is at least 1 missing backport to Debian that fixes the remaining segfaults in Ubuntu: https://github.com/ImageMagick/ImageMagick/commit/a54fe0e8600eaf3dc6fe717d3c0398001507f723. Please consider backporting this to Debian's package as well. -Nish P.S. Note that to fully fix the tests w/ imagemagick, my comments in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811308 also need to be addressed, as the current release is buggy wrt. the backport of the fixes for https://github.com/ImageMagick/ImageMagick/issues/54.
Bug#811308: imagemagick: Missing upstream fix for 'PixelColor off by one on i386'
Package: imagemagick Version: 8:6.8.9.9-7 Followup-For: Bug #811308 Dear Maintainer, While working on Ubuntu 16.04, I noticed that the currently sync'd version of imagemagick, 8:6.8.9.9-7 has backported the fixes for https://github.com/ImageMagick/ImageMagick/issues/54, but missed one change: https://github.com/ImageMagick/ImageMagick/commit/95c8394eaacc8c2f272177269416daf0b2ba004f. The patches git commit in question is: http://anonscm.debian.org/cgit/collab-maint/imagemagick.git/commit/?h=debian-patches/6.8.9.9-7&id=f40ae7899afa53437ea99f7be105e549e85b0c47 Note also that since the bugfix in question came from a version greater than 0x689 but the Debian package's version number has not been modified, I think that other packages (e.g., php-imagick) can't use the version number any longer to determine if/when a test has been fixed.
Bug#815842: php-rrd source incorrectly references imagick-*
Source: php-rrd Version: 2.0.0+1.1.3-2 Severity: serious Justification: fails to build from source (but built successfully in the past) Dear Maintainer, debian/tests/control lists: Test-Command: cd imagick-* && phpunit --verbose tests Depends: php-cli, php-imagick, phpunit which I believe has been copied unaltered from php-imagick. This obviously fails with php-rrd. -Nish
Bug#815104: fusiondirectory: FTBFS due to patch fuzz
Source: fusiondirectory Version: 1.0.8.8-3 Severity: serious Tags: patch Justification: fails to build from source Dear Maintainer, While working on the PHP7.0 migration with Ubuntu, I ran into: dpkg-source: info: building fusiondirectory using existing ./fusiondirectory_1.0.8.8.orig-core.tar.gz ./fusiondirectory_1.0.8.8.orig-plugins.tar.gz ./fusiondirectory_1.0.8.8.orig.tar.gz patching file core/contrib/apache/fusiondirectory-apache.conf Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED dpkg-source: info: the patch has fuzz which is not allowed, or is malformed dpkg-source: info: if patch '2001_fusiondirectory-apache.patch' is correctly applied by quilt, use 'quilt refresh' to update it I believe this only is noticed now because the package hasn't been rebuilt recently? -Nish diff --git a/debian/patches/2004_fusiondirectory-setup.patch b/debian/patches/2004_fusiondirectory-setup.patch index 9eeaee6..b44d535 100644 --- a/debian/patches/2004_fusiondirectory-setup.patch +++ b/debian/patches/2004_fusiondirectory-setup.patch @@ -1,9 +1,11 @@ Author: Benoit Mortier Description: put the FusionDirectory Debian directory in the fd_home variable a/core/contrib/bin/fusiondirectory-setup -+++ b/core/contrib/bin/fusiondirectory-setup -@@ -31,7 +31,7 @@ +Index: gitwd/core/contrib/bin/fusiondirectory-setup +=== +--- gitwd.orig/core/contrib/bin/fusiondirectory-setup gitwd/core/contrib/bin/fusiondirectory-setup +@@ -59,7 +59,7 @@ use Term::ReadKey; # fd's directory and class.cache file's path declaration my %vars = ( diff --git a/debian/patches/2004_fusiondirectory-setup.patch b/debian/patches/2004_fusiondirectory-setup.patch index 9eeaee6..b44d535 100644 --- a/debian/patches/2004_fusiondirectory-setup.patch +++ b/debian/patches/2004_fusiondirectory-setup.patch @@ -1,9 +1,11 @@ Author: Benoit Mortier Description: put the FusionDirectory Debian directory in the fd_home variable a/core/contrib/bin/fusiondirectory-setup -+++ b/core/contrib/bin/fusiondirectory-setup -@@ -31,7 +31,7 @@ +Index: gitwd/core/contrib/bin/fusiondirectory-setup +=== +--- gitwd.orig/core/contrib/bin/fusiondirectory-setup gitwd/core/contrib/bin/fusiondirectory-setup +@@ -59,7 +59,7 @@ use Term::ReadKey; # fd's directory and class.cache file's path declaration my %vars = (
Bug#814952: numactl: Fix FTBS when all file timestamps are updated
Source: numactl
Version: 2.0.11-1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)
Dear Maintainer,
I was recently working to sync the Ubuntu numactl with Debian's version,
and we noticed an odd build failure.
Under sbuild, the Ubuntu and Debian numactl's build fine, but when in a
schroot and manually running `debian/rules build`, our clone of the
debian/sid tree would fail.
After some debugging, where I had two source-identical trees with one
failing to build (our clone) and one successfully building (`apt-get
source`), I tried to update the timestamps in the apt-get'd version and
noticed that it also failed. That is,
# apt-get source numactl
# cd numactl-2.0.11
# find . -exec touch {} \;
# debian/rules build
...
make[1]: Entering directory '/root/numactl-2.0.11'
CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash
/root/numactl-2.0.11/build-aux/missing aclocal-1.14 -I m4
/root/numactl-2.0.11/build-aux/missing: line 81: aclocal-1.14: command not found
WARNING: 'aclocal-1.14' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
<http://www.gnu.org/software/automake>
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
<http://www.gnu.org/software/autoconf>
<http://www.gnu.org/software/m4/>
<http://www.perl.org/>
Makefile:724: recipe for target 'aclocal.m4' failed
make[1]: *** [aclocal.m4] Error 127
make[1]: Leaving directory '/root/numactl-2.0.11'
/usr/share/cdbs/1/class/makefile.mk:47: recipe for target
'debian/stamp-makefile-build' failed
make: *** [debian/stamp-makefile-build] Error 2
This error does *not* occur if the timestamps on the files are left
alone.
The following simple fix, suggested by Serge Hallyn, fixes the issue for
me.
autoreconfigure the sources before building, to pull in the current
version of the build tools. This adds dh-autoreconf as a
build-dependency to support calling dh_autoreconf during build.
Signed-off-by: Nishanth Aravamudan
diff --git a/debian/control b/debian/control
index 03e6f8d..8f81463 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Al Stone
Standards-Version: 3.9.6
Build-Depends: cdbs,
autotools-dev,
+ dh-autoreconf,
debhelper (>= 9~),
dh-buildinfo, debhelper (>= 9)
diff --git a/debian/rules b/debian/rules
index acd4155..63b583d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
# Including this file gets us a simple patch system. You can just
# drop patches in debian/patches, and they will be automatically
Bug#813125: php-proxy-manager 2.0.0* has a dependency on a new PHP API PackageVersions
Package: php-proxy-manager Version: 2.0.0-* Severity: serious Justification: fails to build from source (but built successfully in the past) Dear Maintainer, While updating the packages in an Ubuntu Xenial PPA to use PHP7.0 by default, I ran into phpunit failures with the php-proxy-manager package. The same issues should be seen with Debian unstable. I see that per https://packages.qa.debian.org/p/php-proxy-manager.html, there is a 2.0.0~beta1 available to package. Per https://github.com/Ocramius/ProxyManager/issues/286, that version will be released officially soon, but it has a dependency that prevents it from successfully packaging currently. The upstream code has introduced a new dependency on https://github.com/Ocramius/PackageVersions, which I am guessing would need to be packaged as a new package, i.e., php-package-versions. Note that the new version of php-proxy-manager also depends on php-zend-code >= 3.0, which is currently only available in experimental. -- Nishanth Aravamudan Ubuntu Server Canonical Ltd
Bug#307329: Bug resolved - configuration error
Apparently this was a configuration error. Although I have not heard from anyone at Debian, I assume everyone is rather busy... The issue was including a pam_tally.so line in both common-auth and common-account. By only having it in common-auth, sudo ceased to segfault *and* I noticed that "Tally underflowed from user" ceased to show up in the /var/log/auth.log. Thanks, Nish -- Nishanth Aravamudan <[EMAIL PROTECTED]> IBM Linux Technology Center -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#307329: strace context
The strace I posted yesterday was obtained by commenting out this line: auth sufficient pam_rootok.so in /etc/pam.d/su With that line in, root can su just fine. Thanks, Nish -- Nishanth Aravamudan <[EMAIL PROTECTED]> IBM Linux Technology Center -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#307329: strace of `su -` as root
0x37f7f000
17104 _llseek(3, 0, [0], SEEK_SET) = 0
17104 read(3, "\1\0\0\0pts/2\0\0\0\0\0\0\0\260n\376D\0\0\0\0\0\0\0\0\0"...,
4096) = 4096
17104 _llseek(3, 4096, [4096], SEEK_SET) = 0
17104 _llseek(3, -4096, [0], SEEK_CUR) = 0
17104 write(3, "\0\0\0\0pts/2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 24) = 24
17104 close(3) = 0
17104 munmap(0x37f7f000, 4096) = 0
17104 lstat64("/var/log/faillog", {st_mode=S_IFREG|0660, st_size=26784, ...}) = 0
17104 open("/var/log/faillog", O_RDWR) = 3
17104 fstat64(3, {st_mode=S_IFREG|0660, st_size=26784, ...}) = 0
17104 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
= 0x37f7f000
17104 _llseek(3, 0, [0], SEEK_SET) = 0
17104 read(3, "\0\0\0\0pts/2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"...,
4096) = 4096
17104 _llseek(3, 4096, [4096], SEEK_SET) = 0
17104 _llseek(3, -4096, [0], SEEK_CUR) = 0
17104 write(3, "\0\0\0\0\0ts/2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 24) = 24
17104 close(3) = 0
17104 munmap(0x37f7f000, 4096) = 0
17104 rt_sigaction(SIGINT, {SIG_DFL}, {SIG_IGN}, 8) = 0
17104 rt_sigaction(SIGQUIT, {SIG_DFL}, {SIG_IGN}, 8) = 0
17104 open("/etc/login.defs", O_RDONLY|O_LARGEFILE) = 3
17104 fstat64(3, {st_mode=S_IFREG|0666, st_size=9707, ...}) = 0
17104 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
= 0x37f7f000
17104 read(3, "#\n# /etc/login.defs - Configurat"..., 4096) = 4096
17104 read(3, "e them by issuing \n# the \"mesg y"..., 4096) = 4096
17104 read(3, "...\n#\n# This variable is used by"..., 4096) = 1515
17104 read(3, "", 4096) = 0
17104 close(3) = 0
17104 munmap(0x37f7f000, 4096) = 0
17104 time([1157525168])= 1157525168
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 socket(PF_FILE, SOCK_DGRAM, 0)= 3
17104 fcntl64(3, F_SETFD, FD_CLOEXEC) = 0
17104 connect(3, {sa_family=AF_FILE, path="/dev/log"}, 16) = 0
17104 send(3, "<38>Sep 5 23:46:08 su[17104]: S"..., 61, MSG_NOSIGNAL) = 61
17104 time([1157525168])= 1157525168
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 send(3, "<38>Sep 5 23:46:08 su[17104]: +"..., 48, MSG_NOSIGNAL) = 48
17104 setgid32(0) = 0
17104 open("/proc/sys/kernel/ngroups_max", O_RDONLY) = 4
17104 read(4, "65536\n", 31)= 6
17104 close(4) = 0
17104 socket(PF_FILE, SOCK_STREAM, 0) = 4
17104 fcntl64(4, F_GETFL) = 0x2 (flags O_RDWR)
17104 fcntl64(4, F_SETFL, O_RDWR|O_NONBLOCK) = 0
17104 connect(4, {sa_family=AF_FILE, path="/var/run/nscd/socket"}, 110) = -1
ENOENT (No such file or directory)
17104 close(4) = 0
17104 socket(PF_FILE, SOCK_STREAM, 0) = 4
17104 fcntl64(4, F_GETFL) = 0x2 (flags O_RDWR)
17104 fcntl64(4, F_SETFL, O_RDWR|O_NONBLOCK) = 0
17104 connect(4, {sa_family=AF_FILE, path="/var/run/nscd/socket"}, 110) = -1
ENOENT (No such file or directory)
17104 close(4) = 0
17104 open("/etc/group", O_RDONLY) = 4
17104 fcntl64(4, F_GETFD) = 0
17104 fcntl64(4, F_SETFD, FD_CLOEXEC) = 0
17104 _llseek(4, 0, [0], SEEK_CUR) = 0
17104 fstat64(4, {st_mode=S_IFREG|0644, st_size=1697, ...}) = 0
17104 mmap2(NULL, 1697, PROT_READ, MAP_SHARED, 4, 0) = 0x37f7f000
17104 _llseek(4, 1697, [1697], SEEK_SET) = 0
17104 fstat64(4, {st_mode=S_IFREG|0644, st_size=1697, ...}) = 0
17104 munmap(0x37f7f000, 1697) = 0
17104 close(4) = 0
17104 setgroups32(1, [0]) = 0
17104 open("/etc/security/pam_env.conf", O_RDONLY) = 4
17104 fstat64(4, {st_mode=S_IFREG|0644, st_size=3099, ...}) = 0
17104 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
= 0x37f7f000
17104 read(4, "# $Date: 2004/11/16 14:27:41 $\n#"..., 4096) = 3099
17104 read(4, "", 4096) = 0
17104 close(4) = 0
17104 munmap(0x37f7f000, 4096) = 0
17104 open("/etc/environment", O_RDONLY) = 4
17104 fstat64(4, {st_mode=S_IFREG|0644, st_size=8, ...}) = 0
17104 mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
= 0x37f7f000
17104 read(4, "\nLANG=C\n", 4096) = 8
17104 read(4, "", 4096) = 0
17104 close(4) = 0
17104 munmap(0x37f7f000, 4096) = 0
17104 time([1157525168])= 1157525168
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 stat64("/etc/localtime", {st_mode=S_IFREG|0644, st_size=1017, ...}) = 0
17104 send(3, "<35>Sep 5 23:46:08 pam_tally[17"..., 78, MSG_NOSIGNAL) = 78
17104 close(3) = 0
17104 open("/etc/passwd", O_RDONLY) = 3
17104 fcntl64(3, F_GETFD) = 0
17104 fcntl64(3, F_SETFD, FD_CLOEXEC) = 0
17104 _llseek(3, 0, [0], SEEK_CUR) = 0
17104 fstat64(3, {st_mode=S_IFREG|0644, st_size=7747, ...}) = 0
17104 mmap2(NULL, 7747, PROT_READ, MAP_SHARED, 3, 0) = 0x37f7e000
17104 _llseek(3, 7747, [7747], SEEK_SET) = 0
17104 munmap(0x37f7e000, 7747) = 0
17104 close(3) = 0
17104 --- SIGSEGV (Segmentation fault) @ 0 (0) ---
17104 +++ killed by SIGSEGV +++
--
Nishanth Aravamudan <[EMAIL PROTECTED]>
IBM Linux Technology Center
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#307329: Further context
I forgot to mention that after the dist-upgrade, PAM was definitely unhappy with its configuration. It took us about an hour to get the setup back to what it was before, configuration wise, but sudo seems to be affected. Perhaps it is a PAM issue? I'm willing to do a purge and reinstall, if need be, to see if that is the case. Thanks, Nish -- Nishanth Aravamudan <[EMAIL PROTECTED]> IBM Linux Technology Center -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#307329: sudo: reproducible segfault after sarge->etch dist-upgrade
Package: sudo Version: 1.6.8p12-4 Followup-For: Bug #307329 I can reproduce this bug on a system dist-upgraded from sarge to etch over the weekend. The first invocation of `sudo` will segfault, that is whenever I have to enter a password (so it also segfaults after running `sudo -k`), but succeed thereafter. I just noticed that `su` also segfaults. -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.17.8-1:3split Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Versions of packages sudo depends on: ii libc62.3.6.ds1-4 GNU C Library: Shared libraries ii libpam-modules 0.79-3.1Pluggable Authentication Modules f ii libpam0g 0.79-3.1Pluggable Authentication Modules l sudo recommends no packages. -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
