Bug#1005449: awl: FTBFS: TypeError: implode(): Argument #2 ($array) must be of type ?array, string given - in tests/myCalendarTest.php:61

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-mycalendar-test.patch: Cherrypick upstream fix for failing
myCalendar test, fixing FTBFS on rebuild.

Thanks for considering the patch.

Logan
diff -Nru awl-0.62/debian/patches/fix-mycalendar-test.patch 
awl-0.62/debian/patches/fix-mycalendar-test.patch
--- awl-0.62/debian/patches/fix-mycalendar-test.patch   1969-12-31 
19:00:00.0 -0500
+++ awl-0.62/debian/patches/fix-mycalendar-test.patch   2022-08-20 
23:35:14.0 -0400
@@ -0,0 +1,13 @@
+diff --git a/tests/myCalendarTest.php b/tests/myCalendarTest.php
+index 
aa1795a027a57c36add737fa1474cb99658d0c9c..3d795147f234e298498e7444e54c386fb9df5ab3
 100644
+--- a/tests/myCalendarTest.php
 b/tests/myCalendarTest.php
+@@ -58,7 +58,7 @@ class myCalendarTest extends PHPUnit_Framework_TestCase {
+ 
+ $data = 
explode("\n",$this->getData('tests/data/0244-MOZ-POST-FB.test'));
+ 
+-$data = implode($data, "\r\n");
++$data = implode("\r\n", $data);
+ 
+ $mycalendar = new vCalendar($data);
+ //foreach($mycalendar->GetComponents() as $comp){
diff -Nru awl-0.62/debian/patches/series awl-0.62/debian/patches/series
--- awl-0.62/debian/patches/series  1969-12-31 19:00:00.0 -0500
+++ awl-0.62/debian/patches/series  2022-08-20 23:35:37.0 -0400
@@ -0,0 +1 @@
+fix-mycalendar-test.patch

Bug#973059: logging-tree: FTBFS: dh_auto_test: error: pybuild --test -i python{version} -p "3.9 3.8" returned exit code 13

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/python-3.9.patch: Cherrypick upstream commit to fix FTBFS/test failure
with Python 3.9.

Thanks for considering the patch.

Logan
diff -Nru logging-tree-1.8.1/debian/patches/python-3.9.patch 
logging-tree-1.8.1/debian/patches/python-3.9.patch
--- logging-tree-1.8.1/debian/patches/python-3.9.patch  1969-12-31 
19:00:00.0 -0500
+++ logging-tree-1.8.1/debian/patches/python-3.9.patch  2021-04-10 
18:51:22.0 -0400
@@ -0,0 +1,57 @@
+From dfde23eca7288c1878d3b63a26f98e9764f5ba6c Mon Sep 17 00:00:00 2001
+From: Logan Rosen 
+Date: Sat, 10 Apr 2021 04:26:32 -0400
+Subject: [PATCH] Fix compatibility with Python 3.9 (#27)
+
+---
+ .travis.yml   | 1 +
+ logging_tree/tests/test_format.py | 4 ++--
+ setup.py  | 1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 1bc5bf5..bcff67e 100644
+--- a/.travis.yml
 b/.travis.yml
+@@ -11,6 +11,7 @@ python:
+   - "3.6"
+   - "3.7"
+   - "3.8"
++  - "3.9"
+ 
+ script:
+   - "python -m unittest logging_tree.tests.test_format 
logging_tree.tests.test_node"
+diff --git a/logging_tree/tests/test_format.py 
b/logging_tree/tests/test_format.py
+index c47..fec6c2d 100644
+--- a/logging_tree/tests/test_format.py
 b/logging_tree/tests/test_format.py
+@@ -13,7 +13,7 @@
+ 
+ 
+ class FakeFile(StringIO):
+-def __init__(self, filename, mode, encoding=None):
++def __init__(self, filename, *args, **kwargs):
+ self.filename = filename
+ StringIO.__init__(self)
+ 
+@@ -154,7 +154,7 @@ def test_2_dot_5_handlers(self):
+Level WARNING
+Handler TimedRotatingFile '/bar/two.txt' when='H' interval=3600 
backupCount=0
+ '''
+-if sys.version_info >= (3, 8):
++if sys.version_info == (3, 8):
+ # Apparently the design of the TimedRotatingFileHandler has
+ # become a bit more ambitious as of Python 3.8.
+ expected += '''\
+diff --git a/setup.py b/setup.py
+index 65da834..15cb6b1 100644
+--- a/setup.py
 b/setup.py
+@@ -24,6 +24,7 @@
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
++'Programming Language :: Python :: 3.9',
+ 'Topic :: System :: Logging',
+ ],
+   packages=['logging_tree', 'logging_tree.tests'],
diff -Nru logging-tree-1.8.1/debian/patches/series 
logging-tree-1.8.1/debian/patches/series
--- logging-tree-1.8.1/debian/patches/series1969-12-31 19:00:00.0 
-0500
+++ logging-tree-1.8.1/debian/patches/series2021-04-10 18:51:22.0 
-0400
@@ -0,0 +1 @@
+python-3.9.patch

Bug#986511: python-jenkinsapi: FTBFS: Unable to create file /sbuild-nonexistent/.pylint.d/jenkinsapi.views1.stats: [Errno 2] No such file or directory: '/sbuild-nonexistent/.pylint.d/jenkinsapi.views1

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/pylint-fixes.patch: Update to incorporate fix for new use-a-generator
failures.

Thanks for considering the patch.

Logan
diff -Nru python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch 
python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch
--- python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch  2020-10-27 
23:19:59.0 -0400
+++ python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch  2021-04-10 
13:53:15.0 -0400
@@ -1,6 +1,5 @@
-diff -Naur a/jenkinsapi/credential.py b/jenkinsapi/credential.py
 a/jenkinsapi/credential.py 2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/credential.py 2020-10-27 21:03:49.025512695 -0600
+--- a/jenkinsapi/credential.py
 b/jenkinsapi/credential.py
 @@ -83,7 +83,7 @@
  
  def __init__(self, cred_dict):
@@ -70,9 +69,8 @@
  }
 -return super(AmazonWebServicesCredentials, 
self)._get_attributes_xml(data)
 +return super()._get_attributes_xml(data)
-diff -Naur a/jenkinsapi/credentials.py b/jenkinsapi/credentials.py
 a/jenkinsapi/credentials.py2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/credentials.py2020-10-27 21:04:33.021889279 -0600
+--- a/jenkinsapi/credentials.py
 b/jenkinsapi/credentials.py
 @@ -100,8 +100,8 @@
  except JenkinsAPIException as jae:
  raise JenkinsAPIException('Latest version of Credentials '
@@ -104,9 +102,8 @@
  self.poll()
  self.credentials = self._data['credentials']
  if description in self:
-diff -Naur a/jenkinsapi/fingerprint.py b/jenkinsapi/fingerprint.py
 a/jenkinsapi/fingerprint.py2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/fingerprint.py2020-10-27 20:59:57.595597808 -0600
+--- a/jenkinsapi/fingerprint.py
 b/jenkinsapi/fingerprint.py
 @@ -96,14 +96,14 @@
  def validate(self):
  try:
@@ -126,9 +123,8 @@
  return True
  
  def get_info(self):
-diff -Naur a/jenkinsapi/jenkinsbase.py b/jenkinsapi/jenkinsbase.py
 a/jenkinsapi/jenkinsbase.py2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/jenkinsbase.py2020-10-27 20:58:54.431099252 -0600
+--- a/jenkinsapi/jenkinsbase.py
 b/jenkinsapi/jenkinsbase.py
 @@ -84,9 +84,9 @@
  response.raise_for_status()
  try:
@@ -141,9 +137,8 @@
  
  def pprint(self):
  """
-diff -Naur a/jenkinsapi/job.py b/jenkinsapi/job.py
 a/jenkinsapi/job.py2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/job.py2020-10-27 20:58:21.502844386 -0600
+--- a/jenkinsapi/job.py
 b/jenkinsapi/job.py
 @@ -89,7 +89,7 @@
  return branches
  
@@ -196,9 +191,8 @@
  
  def __delitem__(self, build_number):
  self.delete_build(build_number)
-diff -Naur a/jenkinsapi/node.py b/jenkinsapi/node.py
 a/jenkinsapi/node.py   2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/node.py   2020-10-27 20:54:01.232984206 -0600
+--- a/jenkinsapi/node.py
 b/jenkinsapi/node.py
 @@ -118,10 +118,10 @@
  credential = self.jenkins.credentials[
  na['credential_description']
@@ -212,9 +206,8 @@
  
  retries = na['max_num_retries'] if 'max_num_retries' in na else ''
  re_wait = na['retry_wait_time'] if 'retry_wait_time' in na else ''
-diff -Naur a/jenkinsapi/nodes.py b/jenkinsapi/nodes.py
 a/jenkinsapi/nodes.py  2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/nodes.py  2020-10-27 20:50:45.423835163 -0600
+--- a/jenkinsapi/nodes.py
 b/jenkinsapi/nodes.py
 @@ -75,8 +75,8 @@
  nodename = item['displayName']
  try:
@@ -237,9 +230,8 @@
  
  def values(self):
  """
-diff -Naur a/jenkinsapi/plugins.py b/jenkinsapi/plugins.py
 a/jenkinsapi/plugins.py2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/plugins.py2020-10-27 20:49:44.063536416 -0600
+--- a/jenkinsapi/plugins.py
 b/jenkinsapi/plugins.py
 @@ -82,8 +82,8 @@
  def __getitem__(self, plugin_name):
  try:
@@ -251,9 +243,30 @@
  
  def __setitem__(self, shortName, plugin):
  """
-diff -Naur a/jenkinsapi/queue.py b/jenkinsapi/queue.py
 a/jenkinsapi/queue.py  2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/queue.py  2020-10-27 20:48:12.011156888 -0600
+@@ -138,7 +138,7 @@
+ jobs = self.update_center_install_status['data']['jobs']
+ except JenkinsAPIException:
+ return True  # Jenkins 1.X has no update_center
+-return any([job for job in jobs if job['requiresRestart'] == 'true'])
++return any(job for job in jobs if job['requiresRestart'] == 'true')
+ 
+ def _install_specific_version(self, plugin):
+ """
+@@ -208,9 +208,9 @@
+ jobs = self.update_center_install_status['data']['jobs']
+ except JenkinsAPIException:
+ return 

Bug#908017: network-manager-iodine FTBFS with glib 2.58

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/rules: Set --enable-more-warnings to "yes" so that it doesn't default to
"error," which turns every warning into an error and causes an FTBFS due
to deprecated declarations.

Thanks for considering the patch.

Logan
diff -Nru network-manager-iodine-1.2.0/debian/rules 
network-manager-iodine-1.2.0/debian/rules
--- network-manager-iodine-1.2.0/debian/rules   2018-01-22 03:55:32.0 
-0500
+++ network-manager-iodine-1.2.0/debian/rules   2021-04-07 14:10:53.0 
-0400
@@ -11,7 +11,8 @@
dh_auto_configure -- \
--libexecdir=/usr/lib/NetworkManager \
--disable-static \
-   --without-libnm-glib
+   --without-libnm-glib \
+   --enable-more-warnings=yes
 
 override_dh_makeshlibs:
dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/

Bug#957817: smbc: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * static_str.{c,h}: Fix multiple definitions of variables causing FTBFS with
GCC 10.

Thanks for considering the patch.

Logan
diff -Nru smbc-1.2.2/src/static_str.c smbc-1.2.2/src/static_str.c
--- smbc-1.2.2/src/static_str.c 2005-06-29 08:14:02.0 -0400
+++ smbc-1.2.2/src/static_str.c 2021-04-06 18:22:24.0 -0400
@@ -21,6 +21,32 @@
 #include "static_str.h"
 #include "fnet.h"
 
+char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
+
+ *Rm18, *Rm19,
+ *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,
+ *Rm30, *Rm31, *Rm32, *Rm33, *Rm34, *Rm35, *Rm36, *Rm37, *Rm38, *Rm39,
+ *Rm40, *Rm41, *Rm42, *Rm43, *Rm44, *Rm45, *Rm46,*Rm48, *Rm49,
+ *Rm50, *Rm51, *Rm52, *Rm53, *Rm54, *Rm55,   *Rm58, *Rm59,
+ *Rm60, *Rm61, *Rm62, *Rm63, *Rm64, *Rm65,*Rm67, *Rm68, *Rm69,
+ *Rm70, *Rm71, *Rm72, *Rm73, *Rm74, *Rm75, *Rm76, *Rm77, *Rm78, *Rm79,
+ *Rm80, *Rm81, *Rm82, *Rm83, *Rm84, *Rm85, *Rm86, *Rm87, *Rm88,
+ *Rm90, *Rm91, *Rm92, *Rm93, *Rm94, *Rm95, *Rm96, *Rm97, *Rm98, *Rm99,
+ *Rm100, *Rm101, *Rm102, *Rm103, *Rm104, *Rm105, *Rm106, *Rm107, *Rm108,
+ *Rm111, *Rm113, *Rm114, *Rm115, *Rm116, *Rm117, *Rm118, 
*Rm119,
+ *Rm121, *Rm123, *Rm124, *Rm125, 
*Rm129,
+ *Rm131, *Rm133, *Rm134, *Rm135, *Rm136, *Rm137, *Rm138, 
*Rm139,
+ *Rm140, *Rm141, *Rm142, *Rm143, *Rm144, *Rm145, *Rm146, *Rm147, *Rm148, 
*Rm149,
+ *Rm150, *Rm151, *Rm152, *Rm153, *Rm154, *Rm156, *Rm157, *Rm158, 
*Rm159,
+ *Rm160, *Rm162, *Rm163, *Rm168, 
*Rm169,
+ *Rm170, *Rm171, *Rm172, *Rm173, *Rm175, *Rm176, *Rm177, *Rm178, 
*Rm179,
+ *Rm180, *Rm181, *Rm182,
+
+ *Rm231, *Rm232, *Rm233, *Rm234, *Rm235, *Rm236, *Rm237, *Rm238, *Rm239,
+ *Rm240, *Rm241, *Rm242, *Rm243, *Rm244, *Rm245,
+
+ *Rm300, *Rm301, *Rm302, *Rm303, *Rm304, *Rm305, *Rm306, *Rm307;
+
 void 
 RinitStrings()
 {
diff -Nru smbc-1.2.2/src/static_str.h smbc-1.2.2/src/static_str.h
--- smbc-1.2.2/src/static_str.h 2005-06-29 08:14:02.0 -0400
+++ smbc-1.2.2/src/static_str.h 2021-04-06 18:22:24.0 -0400
@@ -9,7 +9,7 @@
 */
 // ---
 
-char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
+extern char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
 
  *Rm18, *Rm19,
  *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,

Bug#978334: php-finder-facade: FTBFS: Call to undefined method SebastianBergmann\Timer\Timer::resourceUsage()

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/0009-Compatibility-with-php-timer-4.0.patch: Cherrypick upstream
commit to fix compatibility with php-timer >= 4.0.

Thanks for considering the patch.

Logan
diff -Nru 
phpdox-0.12.0/debian/patches/0009-Compatibility-with-php-timer-4.0.patch 
phpdox-0.12.0/debian/patches/0009-Compatibility-with-php-timer-4.0.patch
--- phpdox-0.12.0/debian/patches/0009-Compatibility-with-php-timer-4.0.patch
1969-12-31 19:00:00.0 -0500
+++ phpdox-0.12.0/debian/patches/0009-Compatibility-with-php-timer-4.0.patch
2021-04-04 18:35:45.0 -0400
@@ -0,0 +1,54 @@
+From a71dfe4ffce072eb8402e5fd5303e6b3076ee0e7 Mon Sep 17 00:00:00 2001
+From: homerjsimpson000 
+Date: Mon, 14 Dec 2020 09:13:14 +0100
+Subject: [PATCH] Update ShellProgressLogger.php
+
+Use ResourceUsageFormatter instead of Timer::resourceUsage to enable updating 
to use both Timer ^2.0 and Timer 5.0.*
+---
+ src/logger/ShellProgressLogger.php | 26 +-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/src/logger/ShellProgressLogger.php 
b/src/logger/ShellProgressLogger.php
+index 1017dda1..d76fdfd4 100644
+--- a/src/logger/ShellProgressLogger.php
 b/src/logger/ShellProgressLogger.php
+@@ -1,6 +1,7 @@
+ resourceUsage();
+ print "\n\n";
+ }
++
++/**
++ * @return string
++ */
++private function resourceUsage(): string {
++$result = '';
++
++if(
++class_exists(ResourceUsageFormatter::class) &&
++method_exists(ResourceUsageFormatter::class, 
'resourceUsageSinceStartOfRequest')
++) {
++/** @var ResourceUsageFormatter $resource */
++$resource = new ResourceUsageFormatter();
++$result = $resource->resourceUsageSinceStartOfRequest();
++} else if(
++class_exists(Timer::class) &&
++method_exists(Timer::class, 'resourceUsage')
++) {
++$result = Timer::resourceUsage();
++}
++
++return $result;
++}
+ }
diff -Nru phpdox-0.12.0/debian/patches/series 
phpdox-0.12.0/debian/patches/series
--- phpdox-0.12.0/debian/patches/series 2020-12-21 07:03:11.0 -0500
+++ phpdox-0.12.0/debian/patches/series 2021-04-04 18:35:45.0 -0400
@@ -6,3 +6,4 @@
 0006-Compatibility-with-recent-PHPUnit-8.patch
 0007-Drop-versioned-dependency-that-can-t-be-satisfied.patch
 0008-Adapt-to-recent-version-of-PHPUnit-9.patch
+0009-Compatibility-with-php-timer-4.0.patch

Bug#957547: mlucas: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.diff: Remove duplicate variable declaration to fix FTBFS with
GCC 10.

Thanks for considering the patch.

Logan
diff -Nru mlucas-17.1/debian/patches/gcc-10.diff 
mlucas-17.1/debian/patches/gcc-10.diff
--- mlucas-17.1/debian/patches/gcc-10.diff  1969-12-31 19:00:00.0 
-0500
+++ mlucas-17.1/debian/patches/gcc-10.diff  2021-04-03 17:44:31.0 
-0400
@@ -0,0 +1,10 @@
+--- a/src/gcd_lehmer.c
 b/src/gcd_lehmer.c
+@@ -49,7 +49,6 @@
+   WARNING: level-2 diagnostics not recommended for large 
vectors!
+ */
+   int fft_gcd_debug = 0;
+-  FILE *fp;
+   static char *file_access_mode[2] = {"a","w"};
+   char string0[STR_MAX_LEN];
+ #if GCD_DEBUG >= 1
diff -Nru mlucas-17.1/debian/patches/series mlucas-17.1/debian/patches/series
--- mlucas-17.1/debian/patches/series   2020-01-10 12:32:35.0 -0500
+++ mlucas-17.1/debian/patches/series   2021-04-03 17:44:31.0 -0400
@@ -3,3 +3,4 @@
 fix-c-identifier-typo.diff
 display-verbose-test-log.diff
 python2.diff
+gcc-10.diff

Bug#957397: kannel-sqlbox: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/1005_gcc_10.patch: Fix FTBFS with GCC 10 by unconditionally marking
variable as extern in header files.

Thanks for considering the patch.

Logan
diff -Nru kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch 
kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch
--- kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch1969-12-31 
19:00:00.0 -0500
+++ kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch2021-04-02 
13:43:20.0 -0400
@@ -0,0 +1,72 @@
+--- a/gw/sqlbox_mssql.h
 b/gw/sqlbox_mssql.h
+@@ -47,8 +47,5 @@
+ Msg *mssql_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_mssql(Cfg *cfg);
+-#ifndef sqlbox_mssql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_mysql.h
 b/gw/sqlbox_mysql.h
+@@ -49,8 +49,5 @@
+ Msg *mysql_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_mysql(Cfg *cfg);
+-#ifndef sqlbox_mysql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_pgsql.h
 b/gw/sqlbox_pgsql.h
+@@ -46,8 +46,5 @@
+ void sql_shutdown();
+ struct server_type *sqlbox_init_pgsql(Cfg *cfg);
+ void sqlbox_configure_pgsql(Cfg* cfg);
+-#ifndef sqlbox_pgsql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sdb.h
 b/gw/sqlbox_sdb.h
+@@ -22,8 +22,5 @@
+ Msg *sdb_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sdb(Cfg *cfg);
+-#ifndef sqlbox_sdb_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sqlite.h
 b/gw/sqlbox_sqlite.h
+@@ -42,8 +42,5 @@
+ Msg *sqlite_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sqlite(Cfg *cfg);
+-#ifndef sqlbox_sqlite_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sqlite3.h
 b/gw/sqlbox_sqlite3.h
+@@ -42,8 +42,5 @@
+ Msg *sqlite3_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sqlite3(Cfg *cfg);
+-#ifndef sqlbox_sqlite3_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
diff -Nru kannel-sqlbox-0.7.2/debian/patches/series 
kannel-sqlbox-0.7.2/debian/patches/series
--- kannel-sqlbox-0.7.2/debian/patches/series   2018-10-07 18:37:08.0 
-0400
+++ kannel-sqlbox-0.7.2/debian/patches/series   2021-04-02 13:39:55.0 
-0400
@@ -2,3 +2,4 @@
 1002_gwlib_autoonf.patch
 1003_clang_FTBFS_Wreturn-type.patch
 1004_allow_changing_db_type.patch
+1005_gcc_10.patch

Bug#948875: ignore-me: FTBFS: dh: unable to load addon python3

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on dh-python to fix FTBFS.

Thanks for considering the patch.

Logan
diff -Nru ignore-me-0.1.2/debian/control ignore-me-0.1.2/debian/control
--- ignore-me-0.1.2/debian/control  2017-12-16 03:00:06.0 -0500
+++ ignore-me-0.1.2/debian/control  2021-04-01 22:34:48.0 -0400
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Sascha Manns 
-Build-Depends: debhelper (>= 10), python3-all, xsltproc, itstool, docbook-xsl, 
docbook-xml
+Build-Depends: debhelper (>= 10), python3-all, xsltproc, itstool, docbook-xsl, 
docbook-xml, dh-python
 Standards-Version: 4.1.3
 Homepage: https://launchpad.net/ignore-me
 Vcs-Git: https://git.launchpad.net/ignore-me

Bug#984490: test-archive.t fails in the autopkg tests

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/python-3.9.2.patch: Use "&" instead of ";" as query string separator
in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
default.

Thanks for considering the patch.

Logan
diff -Nru mercurial-5.6.1/debian/patches/python-3.9.2.patch 
mercurial-5.6.1/debian/patches/python-3.9.2.patch
--- mercurial-5.6.1/debian/patches/python-3.9.2.patch   1969-12-31 
19:00:00.0 -0500
+++ mercurial-5.6.1/debian/patches/python-3.9.2.patch   2021-03-02 
23:00:32.0 -0500
@@ -0,0 +1,15 @@
+--- a/tests/test-archive.t
 b/tests/test-archive.t
+@@ -334,10 +334,10 @@
+   > pass
+   > if len(sys.argv) <= 3:
+   > node, archive = sys.argv[1:]
+-  > requeststr = 'cmd=archive;node=%s;type=%s' % (node, archive)
++  > requeststr = 'cmd=archive=%s=%s' % (node, archive)
+   > else:
+   > node, archive, file = sys.argv[1:]
+-  > requeststr = 'cmd=archive;node=%s;type=%s;file=%s' % (node, archive, 
file)
++  > requeststr = 'cmd=archive=%s=%s=%s' % (node, archive, 
file)
+   > try:
+   > stdout = sys.stdout.buffer
+   > except AttributeError:
diff -Nru mercurial-5.6.1/debian/patches/series 
mercurial-5.6.1/debian/patches/series
--- mercurial-5.6.1/debian/patches/series   2021-02-01 11:46:24.0 
-0500
+++ mercurial-5.6.1/debian/patches/series   2021-03-02 23:00:01.0 
-0500
@@ -4,3 +4,4 @@
 deb_specific__optional-dependencies
 deb_specific__disable_libdir_replacement.patch
 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch
+python-3.9.2.patch

Bug#983205: golang-github-go-ping-ping: Some tests require network access

[Logan Rosen]

Package: golang-github-go-ping-ping
Version: 0+git20201106.b6486c6-2
Severity: serious
Tags: patch
Justification: Policy 4.9
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch

Hi,

python-rfc6555 currently requires network access during build for some of its
tests, which causes the build to fail in Ubuntu [1] (and reproducible
builds [2]) and is a violation of Debian policy.

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/skip-tests-requiring-network-access.patch: Skip tests that require
network access since Ubuntu's buildds don't have it.

Thanks for considering the patch.

Logan

[1] 
https://launchpad.net/ubuntu/+source/golang-github-go-ping-ping/0+git20201106.b6486c6-2/+build/20988534
[2] 
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/golang-github-go-ping-ping.html
diff -Nru 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/series 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/series
--- golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/series  
1969-12-31 19:00:00.0 -0500
+++ golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/series  
2021-02-20 23:04:52.0 -0500
@@ -0,0 +1 @@
+skip-tests-requiring-network-access.patch
diff -Nru 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/skip-tests-requiring-network-access.patch
 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/skip-tests-requiring-network-access.patch
--- 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/skip-tests-requiring-network-access.patch
   1969-12-31 19:00:00.0 -0500
+++ 
golang-github-go-ping-ping-0+git20201106.b6486c6/debian/patches/skip-tests-requiring-network-access.patch
   2021-02-20 23:05:17.0 -0500
@@ -0,0 +1,18 @@
+--- a/ping_test.go
 b/ping_test.go
+@@ -227,6 +227,7 @@
+ }
+ 
+ func TestNewPingerValid(t *testing.T) {
++  t.Skip("Requires network access")
+   p := New("www.google.com")
+   err := p.Resolve()
+   AssertNoError(t, err)
+@@ -344,6 +345,7 @@
+ }
+ 
+ func TestSetIPAddr(t *testing.T) {
++  t.Skip("Requires network access")
+   googleaddr, err := net.ResolveIPAddr("ip", "www.google.com")
+   if err != nil {
+   t.Fatal("Can't resolve www.google.com, can't run tests")

Bug#980972: xxsds-dynamic: Changelog entry missing trailer line

[Logan Rosen]

Source: xxsds-dynamic
Version: 1.0~alpha.1+2020072524git5390b6c-2
Severity: serious
Justification: Policy 4.4

Hi,

The changelog entry for 1.0~alpha.1+2020072524git5390b6c-2 is missing a
trailer line with maintainer and date information, which violates Debian
policy and caused the package to fail to upload to the Ubuntu archive.

Can you please add a trailer line accordingly? I added one in Ubuntu
based on the information I could garner about the upload. [1]

Thanks,
Logan

[1] 
http://launchpadlibrarian.net/519371489/xxsds-dynamic_1.0~alpha.1+2020072524git5390b6c-2_1.0~alpha.1+2020072524git5390b6c-2ubuntu1.diff.gz

Bug#979037: python-pgpy: Missing build dependency on python3-wheel

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Add missing build dependency on python3-wheel to fix FTBFS.

Thanks for considering the patch.

Logan
diff -Nru python-pgpy-0.5.3/debian/control python-pgpy-0.5.3/debian/control
--- python-pgpy-0.5.3/debian/control2021-01-01 20:15:55.0 -0500
+++ python-pgpy-0.5.3/debian/control2021-01-24 17:02:05.0 -0500
@@ -22,6 +22,7 @@
  python3-setuptools,
  python3-six (>= 1.9.0),
  python3-sphinx ,
+ python3-wheel
 Standards-Version: 4.5.1
 Vcs-Git: https://github.com/SecurityInnovation/PGPy.git -b debian/master
 Vcs-Browser: https://github.com/SecurityInnovation/PGPy

Bug#957055: bristol: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/04-gcc_10.patch: Fix FTBFS with GCC 10 by adjusting some variables.

Thanks for considering the patch.

Logan
diff -Nru bristol-0.60.11/debian/patches/04-gcc_10.patch 
bristol-0.60.11/debian/patches/04-gcc_10.patch
--- bristol-0.60.11/debian/patches/04-gcc_10.patch  1969-12-31 
19:00:00.0 -0500
+++ bristol-0.60.11/debian/patches/04-gcc_10.patch  2021-01-20 
22:48:15.0 -0500
@@ -0,0 +1,243 @@
+--- a/brighton/brightonCLI.c
 b/brighton/brightonCLI.c
+@@ -136,7 +136,6 @@
+ //if (RESOURCES->resources[btty.p].devlocn[btty.i].to == 1.0f)
+ //if (DEVICE(btty.i).to == 1.0f)
+ 
+-brightonEvent event;
+ extern void printBrightonHelp(int);
+ 
+ typedef int (*clicom)();
+--- a/brighton/brightonMixerMenu.c
 b/brighton/brightonMixerMenu.c
+@@ -1179,11 +1179,10 @@
+   return(NULL);
+ }
+ 
+-brightonEvent event;
+-
+ int
+ doAlarm()
+ {
++  brightonEvent event;
+   event.type = BRIGHTON_FLOAT;
+   event.value = 0.0;
+ 
+--- a/include/bristol/bristolblo.h
 b/include/bristol/bristolblo.h
+@@ -39,7 +39,7 @@
+ #define BLO_COSINE6
+ #define BLO_PULSE 7
+ 
+-struct {
++struct blo {
+   int flags;
+   int harmonics;
+   int cutin;
+@@ -47,7 +47,8 @@
+   int min;
+   float fraction;
+   float samplerate;
+-} blo;
++};
++extern struct blo blo;
+ 
+ extern float blosine[BRISTOL_BLO_SIZE];
+ extern float blosquare[BRISTOL_BLO_SIZE];
+--- a/bristol/blo.c
 b/bristol/blo.c
+@@ -33,6 +33,8 @@
+ 
+ static int init = 1;
+ 
++struct blo blo;
++
+ float blosine[BRISTOL_BLO_SIZE];
+ float blocosine[BRISTOL_BLO_SIZE];
+ float blosquare[BRISTOL_BLO_SIZE];
+--- a/bristol/arpdco.c
 b/bristol/arpdco.c
+@@ -39,7 +39,8 @@
+ #include "bristolblo.h"
+ #include "arpdco.h"
+ 
+-float note_diff, *zbuf;
++static float note_diff;
++float *zbuf;
+ 
+ #define BRISTOL_SQR 4
+ 
+--- a/bristol/cs80osc.c
 b/bristol/cs80osc.c
+@@ -41,8 +41,8 @@
+ #include "cs80osc.h"
+ #include "bristolcs80.h"
+ 
+-float note_diff;
+-int samplecount;
++static float note_diff;
++static int samplecount;
+ 
+ static void fillWave(float *, int, int);
+ static void buildCs80Sound(bristolOP *, bristolOPParams *);
+--- a/bristol/dco.c
 b/bristol/dco.c
+@@ -39,7 +39,7 @@
+ #include "bristolblo.h"
+ #include "dco.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ /*
+  * The name of this operator, IO count, and IO names.
+--- a/bristol/expdco.c
 b/bristol/expdco.c
+@@ -40,7 +40,7 @@
+ #include "bristolblo.h"
+ #include "expdco.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ /*
+  * The name of this operator, IO count, and IO names.
+--- a/bristol/filter2.c
 b/bristol/filter2.c
+@@ -147,7 +147,6 @@
+ }
+ 
+ #define ROOT2 1.4142135623730950488
+-double pidsr;
+ 
+ /*
+  * Reset any local memory information.
+--- a/bristol/granulardco.c
 b/bristol/granulardco.c
+@@ -38,8 +38,8 @@
+ #include "bristol.h"
+ #include "granulardco.h"
+ 
+-float note_diff;
+-float samplerate;
++static float note_diff;
++static float samplerate;
+ 
+ #define BRISTOL_SQR 4
+ 
+--- a/bristol/hammond.c
 b/bristol/hammond.c
+@@ -45,8 +45,8 @@
+ #include "bristol.h"
+ #include "hammond.h"
+ 
+-float note_diff;
+-int samplecount;
++static float note_diff;
++static int samplecount;
+ 
+ static void fillWave(float *, int, int);
+ static void buildHammondSound(bristolOP *, unsigned char);
+@@ -70,8 +70,8 @@
+ static int *waveindex;
+ static int *percussion;
+ 
+-float *wave1;
+-float *wave2;
++static float *wave1;
++static float *wave2;
+ 
+ /*
+  * This can be a single list, it is used to generate the different pipes.
+--- a/bristol/junodco.c
 b/bristol/junodco.c
+@@ -39,7 +39,7 @@
+ #include "bristolblo.h"
+ #include "junodco.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ #define BRISTOL_SQR 8
+ 
+--- a/bristol/lfo.c
 b/bristol/lfo.c
+@@ -38,7 +38,7 @@
+ #include "bristol.h"
+ #include "lfo.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ /*
+  * The name of this operator, IO count, and IO names.
+--- a/bristol/midihandlers.c
 b/bristol/midihandlers.c
+@@ -633,7 +633,7 @@
+  *previous frequency * (2^^(1/12))
+  * Since A is constand whole numbers we can calcuate each octave from A.
+  */
+-float samplerate;
++static float samplerate;
+ 
+ int
+ initFrequencyTable(float rate)
+--- a/bristol/prophetdco.c
 b/bristol/prophetdco.c
+@@ -47,7 +47,7 @@
+ #include "bristolblo.h"
+ #include "prophetdco.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ #define BRISTOL_SQR 4
+ 
+--- a/bristol/sdco.c
 b/bristol/sdco.c
+@@ -41,7 +41,7 @@
+ #include "bristol.h"
+ #include "sdco.h"
+ 
+-float note_diff;
++static float note_diff;
+ 
+ /*
+  * The name of this operator, IO count, and IO names.
+--- a/bristol/trilogyosc.c
 b/bristol/trilogyosc.c
+@@ -40,8 +40,8 @@
+ #include "bristolblo.h"
+ #include "trilogyosc.h"
+ 
+-float note_diff;
+-int 

Bug#957070: cde: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc_10: Mark variables as extern to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru cde-0.1+git9-g551e54d/debian/patches/gcc_10 
cde-0.1+git9-g551e54d/debian/patches/gcc_10
--- cde-0.1+git9-g551e54d/debian/patches/gcc_10 1969-12-31 19:00:00.0 
-0500
+++ cde-0.1+git9-g551e54d/debian/patches/gcc_10 2021-01-20 22:27:38.0 
-0500
@@ -0,0 +1,24 @@
+--- a/strace-4.6/defs.h
 b/strace-4.6/defs.h
+@@ -34,8 +34,8 @@
+ #define CDE_OPTIONS_VERSION_NUM "# cde.options v1"
+ #define CDE_ROOT_NAME "cde-root"
+ // pgbovine - these are both ABSOLUTE paths
+-char* CDE_PACKAGE_DIR;
+-char* CDE_ROOT_DIR;
++extern char* CDE_PACKAGE_DIR;
++extern char* CDE_ROOT_DIR;
+ 
+ 
+ #ifdef HAVE_CONFIG_H
+--- a/readelf-mini/dwarf.c
 b/readelf-mini/dwarf.c
+@@ -61,7 +61,7 @@
+ int do_debug_macinfo;
+ int do_debug_str;
+ int do_debug_loc;
+-int do_wide;
++extern int do_wide;
+ 
+ /* Values for do_debug_lines.  */
+ #define FLAG_DEBUG_LINES_RAW   1
diff -Nru cde-0.1+git9-g551e54d/debian/patches/series 
cde-0.1+git9-g551e54d/debian/patches/series
--- cde-0.1+git9-g551e54d/debian/patches/series 2013-11-17 20:49:30.0 
-0500
+++ cde-0.1+git9-g551e54d/debian/patches/series 2021-01-20 22:27:16.0 
-0500
@@ -1,2 +1,3 @@
 up_ignore-noMakefile_on_clean
 deb_install_usr
+gcc_10

Bug#957116: cyclades-serial-client: ftbfs with GCC-10

[Logan Rosen]

Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix FTBFS with GCC 10 due to multiple definitions.

Thanks for considering the patch.

Logan
diff -Nru cyclades-serial-client-0.93ubuntu2/inc/dev.h 
cyclades-serial-client-0.93ubuntu3/inc/dev.h
--- cyclades-serial-client-0.93ubuntu2/inc/dev.h2003-08-05 
00:25:11.0 -0400
+++ cyclades-serial-client-0.93ubuntu3/inc/dev.h2021-01-19 
23:13:52.0 -0500
@@ -47,12 +47,12 @@
 /* handle for pty slave */
 EXTERN int P_sfd;
 /* handle for control socket listener */
-EXTERN int P_contr_listen;
+extern int P_contr_listen;
 /* handle for control socket */
 #define MAX_CONTROL_SOCKS 32
-EXTERN int P_contr[MAX_CONTROL_SOCKS];
+extern int P_contr[MAX_CONTROL_SOCKS];
 /* struct for port information */
-EXTERN struct comport  Comport;
+extern struct comport  Comport;
 /* device name */
 EXTERN charP_devname[NAMESIZE];
 /* control socket name */
diff -Nru cyclades-serial-client-0.93ubuntu2/inc/telnet.h 
cyclades-serial-client-0.93ubuntu3/inc/telnet.h
--- cyclades-serial-client-0.93ubuntu2/inc/telnet.h 2003-07-25 
08:25:09.0 -0400
+++ cyclades-serial-client-0.93ubuntu3/inc/telnet.h 2021-01-19 
23:11:37.0 -0500
@@ -42,7 +42,7 @@
 
 # define NVT_NUMOPTS   256
 
-int NvtOptions[NVT_NUMOPTS];
+extern int NvtOptions[NVT_NUMOPTS];
 
 # define I_WILL0x01/* I desire to support it */
 # define I_DO  0x02/* I do support it */
@@ -123,7 +123,7 @@
  * State control of NVT Com Port Commands
  */
 
-int CmdState[NUM_COMCMDS];
+extern int CmdState[NUM_COMCMDS];
 
 # define CMD_INACTIVE  0
 # define CMD_ACTIVE1
diff -Nru cyclades-serial-client-0.93ubuntu2/inc/tsrio.h 
cyclades-serial-client-0.93ubuntu3/inc/tsrio.h
--- cyclades-serial-client-0.93ubuntu2/inc/tsrio.h  2003-07-25 
08:24:37.0 -0400
+++ cyclades-serial-client-0.93ubuntu3/inc/tsrio.h  2021-01-19 
23:10:50.0 -0500
@@ -273,9 +273,9 @@
 # define MAX_EVENTS20
 # define EVENT_PARAMSZ 128
 
-struct event   Eventpoll[MAX_EVENTS];
+extern struct eventEventpoll[MAX_EVENTS];
 
-struct event   Evhead;
+extern struct eventEvhead;
 
 # define INIT_EVENTS() Evhead.ev_last = Evhead.ev_next = 
 
diff -Nru cyclades-serial-client-0.93ubuntu2/telnet.c 
cyclades-serial-client-0.93ubuntu3/telnet.c
--- cyclades-serial-client-0.93ubuntu2/telnet.c 2003-07-25 08:25:49.0 
-0400
+++ cyclades-serial-client-0.93ubuntu3/telnet.c 2021-01-19 23:11:29.0 
-0500
@@ -79,6 +79,10 @@
 unsigned char Comibuf[SOCK_MAXIOSZ];
 unsigned char Comobuf[SOCK_MAXIOSZ];
 
+int NvtOptions[NVT_NUMOPTS];
+
+int CmdState[NUM_COMCMDS];
+
 /*
  * Telnet Protocol Access Routines 
  */
diff -Nru cyclades-serial-client-0.93ubuntu2/tsrio.c 
cyclades-serial-client-0.93ubuntu3/tsrio.c
--- cyclades-serial-client-0.93ubuntu2/tsrio.c  2003-07-25 08:24:08.0 
-0400
+++ cyclades-serial-client-0.93ubuntu3/tsrio.c  2021-01-19 23:10:46.0 
-0500
@@ -90,6 +90,10 @@
 "EV_RNWROK",
 };
 
+struct event   Eventpoll[MAX_EVENTS];
+
+struct event   Evhead;
+
 /*
  * Main Scheduler Routines
  */

Bug#980515: dump1090-mutability: FTBFS with GCC 10

[Logan Rosen]

Source: dump1090-mutability
Version: 1.15~20180310.4a16df3+dfsg-6
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch

Hi,

dump1090-mutability FTBFS with GCC 10. [1] This is due to multiple
defintions of a variable (GCC 10 enables -fno-common by default).

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/05-gcc-10.patch: Cherrypick upstream Git commit to fix FTBFS with GCC
10.

Thanks for considering the patch.

Logan

[1] 
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/dump1090-mutability.html
diff -Nru 
dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/05-gcc-10.patch 
dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/05-gcc-10.patch
--- 
dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/05-gcc-10.patch   
1969-12-31 19:00:00.0 -0500
+++ 
dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/05-gcc-10.patch   
2021-01-19 22:36:11.0 -0500
@@ -0,0 +1,72 @@
+From 0793c64ee8ebbcea86b7a9dc71c7e28ec08db618 Mon Sep 17 00:00:00 2001
+From: Oliver Jowett 
+Date: Sat, 6 Jun 2020 21:52:04 +0800
+Subject: [PATCH] Clean up linkage of struct Modes to actually make sense.
+
+(how did this work before? But it's been unchanged since at least
+2013..)
+
+Maybe fixes #65
+---
+ dump1090.c | 2 ++
+ dump1090.h | 6 --
+ faup1090.c | 2 ++
+ view1090.c | 3 +++
+ 4 files changed, 11 insertions(+), 2 deletions(-)
+
+--- a/dump1090.c
 b/dump1090.c
+@@ -55,6 +55,8 @@
+ 
+ static int verbose_device_search(char *s);
+ 
++struct _Modes Modes;
++
+ //
+ // = Utility functions ==
+ //
+--- a/dump1090.h
 b/dump1090.h
+@@ -263,7 +263,7 @@
+ };
+ 
+ // Program global state
+-struct { // Internal state
++struct _Modes { // Internal state
+ pthread_t   reader_thread;
+ 
+ pthread_mutex_t data_mutex;  // Mutex to synchronize buffer access
+@@ -378,7 +378,9 @@
+ int stats_latest_1min;
+ struct stats stats_5min;
+ struct stats stats_15min;
+-} Modes;
++};
++
++extern struct _Modes Modes;
+ 
+ // The struct we use to store information about a decoded message.
+ struct modesMessage {
+--- a/faup1090.c
 b/faup1090.c
+@@ -49,6 +49,8 @@
+ 
+ #include "dump1090.h"
+ 
++struct _Modes Modes;
++
+ #include 
+ 
+ //
+--- a/view1090.c
 b/view1090.c
+@@ -28,6 +28,9 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //
+ #include "dump1090.h"
++
++struct _Modes Modes;
++
+ //
+ // = Utility functions ==
+ //
diff -Nru dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/series 
dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/series
--- dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/series
2018-12-21 04:34:58.0 -0500
+++ dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/series
2021-01-19 22:36:06.0 -0500
@@ -2,3 +2,4 @@
 02-excanvas.patch
 03-gcc7.patch
 04-link-order.patch
+05-gcc-10.patch

Bug#957157: dvi2ps: ftbfs with GCC-10

[Logan Rosen]

Package: dvi2ps
Version: 5.1j-1.3
Followup-For: Bug #957157
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Mark variable as extern to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru dvi2ps-5.1j/debian/patches/gcc-10.patch 
dvi2ps-5.1j/debian/patches/gcc-10.patch
--- dvi2ps-5.1j/debian/patches/gcc-10.patch 1969-12-31 19:00:00.0 
-0500
+++ dvi2ps-5.1j/debian/patches/gcc-10.patch 2021-01-19 22:25:16.0 
-0500
@@ -0,0 +1,11 @@
+--- a/global.h
 b/global.h
+@@ -126,7 +126,7 @@
+  * Interface with device driver
+  */
+ /* ps.c */
+-BOOLEAN landscape;
++extern BOOLEAN landscape;
+ float dev_fontmag();
+ 
+ /* psspecial.c */
diff -Nru dvi2ps-5.1j/debian/patches/series dvi2ps-5.1j/debian/patches/series
--- dvi2ps-5.1j/debian/patches/series   2019-02-17 07:29:43.0 -0500
+++ dvi2ps-5.1j/debian/patches/series   2021-01-19 22:23:52.0 -0500
@@ -5,3 +5,4 @@
 08_kpse_set_program_name.patch
 09_freetype_header.patch
 freetype2_pkg-config.patch
+gcc-10.patch

Bug#957165: efax-gtk: ftbfs with GCC-10

[Logan Rosen]

Package: efax-gtk
Version: 3.2.8-2.1
Followup-For: Bug #957165
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10: Cherrypick/adapt upstream Git commit to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru efax-gtk-3.2.8/debian/patches/gcc-10 
efax-gtk-3.2.8/debian/patches/gcc-10
--- efax-gtk-3.2.8/debian/patches/gcc-101969-12-31 19:00:00.0 
-0500
+++ efax-gtk-3.2.8/debian/patches/gcc-102021-01-19 22:05:35.0 
-0500
@@ -0,0 +1,36 @@
+From 2158c724571bb424b0c20a071c3de17da5f2becb Mon Sep 17 00:00:00 2001
+From: Chris Vine 
+Date: Tue, 2 Jun 2020 23:37:47 +0100
+Subject: [PATCH] Fix build for gcc-10
+
+---
+ ChangeLog   |   6 ++
+ efax/Makefile.am|   3 +-
+ efax/efaxlib.c  |   2 +
+ efax/efaxlib.h  |   2 +-
+ efax/efaxlib.h.orig | 226 
+ 5 files changed, 237 insertions(+), 2 deletions(-)
+ create mode 100644 efax/efaxlib.h.orig
+
+--- a/efax/efaxlib.c
 b/efax/efaxlib.c
+@@ -27,6 +27,8 @@
+ #define DEFWIDTH  1728/* 215x297 mm image at fax resolution */
+ #define DEFHEIGHT 2287
+ 
++uchar reversebits [ 256 ], normalbits [ 256 ] ;
++
+ extern t4tab wtab [ ( 64 + 27 + 13 ) + 1 ] ; /* T.4 coding tables */
+ extern t4tab btab [ ( 64 + 27 + 13 ) + 1 ] ;
+ 
+--- a/efax/efaxlib.h
 b/efax/efaxlib.h
+@@ -208,7 +208,7 @@
+ /* Bit reversal lookup tables (note that the `normalbits' array
+is the one actually used for the bit reversal.  */
+ 
+-uchar reversebits [ 256 ], normalbits [ 256 ] ;
++extern uchar reversebits [ 256 ], normalbits [ 256 ] ;
+ 
+ void initbittab(void) ;
+ 
diff -Nru efax-gtk-3.2.8/debian/patches/series 
efax-gtk-3.2.8/debian/patches/series
--- efax-gtk-3.2.8/debian/patches/series2010-11-13 14:26:08.0 
-0500
+++ efax-gtk-3.2.8/debian/patches/series2021-01-19 22:03:48.0 
-0500
@@ -1,2 +1,3 @@
 desktop
 efax-manpages
+gcc-10

Bug#967133: fbpanel: Unversioned Python removal in sid/bullseye

[Logan Rosen]

Package: fbpanel
Version: 7.0-4
Followup-For: Bug #967133
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build using python2.

Thanks for considering the patch.

Logan
diff -Nru fbpanel-7.0/debian/control fbpanel-7.0/debian/control
--- fbpanel-7.0/debian/control  2017-10-12 07:54:27.0 -0400
+++ fbpanel-7.0/debian/control  2020-04-03 12:14:06.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ulises Vitulli  
 Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libxmu-dev, 
- libxpm-dev, python-minimal, python-argparse
+ libxpm-dev, python2
 Standards-Version: 4.1.1
 Homepage: https://github.com/aanatoly/fbpanel
 
diff -Nru fbpanel-7.0/debian/patches/python2.diff 
fbpanel-7.0/debian/patches/python2.diff
--- fbpanel-7.0/debian/patches/python2.diff 1969-12-31 19:00:00.0 
-0500
+++ fbpanel-7.0/debian/patches/python2.diff 2020-04-03 12:14:06.0 
-0400
@@ -0,0 +1,40 @@
+Index: b/.config/help
+===
+--- a/.config/help
 b/.config/help
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import re, os, sys, textwrap
+ # Formats help message
+Index: b/.config/repl.py
+===
+--- a/.config/repl.py
 b/.config/repl.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import re, sys
+ 
+Index: b/.config/tar.py
+===
+--- a/.config/tar.py
 b/.config/tar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import subprocess as sp
+ import re, tempfile
+Index: b/configure
+===
+--- a/configure
 b/configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import sys
+ if sys.version_info < (2, 7):
diff -Nru fbpanel-7.0/debian/patches/series fbpanel-7.0/debian/patches/series
--- fbpanel-7.0/debian/patches/series   2017-10-12 07:54:27.0 -0400
+++ fbpanel-7.0/debian/patches/series   2020-04-03 12:14:06.0 -0400
@@ -5,3 +5,4 @@
 plugins_volume_oss+alsa_hint.patch
 ftbfs-hurd.patch
 nolibexec.patch
+python2.diff

Bug#957193: fbpanel: ftbfs with GCC-10

[Logan Rosen]

Package: fbpanel
Version: 7.0-4
Followup-For: Bug #957193
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Mark variable as extern to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru fbpanel-7.0/debian/patches/gcc-10.patch 
fbpanel-7.0/debian/patches/gcc-10.patch
--- fbpanel-7.0/debian/patches/gcc-10.patch 1969-12-31 19:00:00.0 
-0500
+++ fbpanel-7.0/debian/patches/gcc-10.patch 2021-01-18 20:13:32.0 
-0500
@@ -0,0 +1,11 @@
+--- a/panel/plugin.h
 b/panel/plugin.h
+@@ -9,7 +9,7 @@
+ #include 
+ #include "panel.h"
+ 
+-struct _plugin_instance *stam;
++extern struct _plugin_instance *stam;
+ 
+ typedef struct {
+ /* common */
diff -Nru fbpanel-7.0/debian/patches/series fbpanel-7.0/debian/patches/series
--- fbpanel-7.0/debian/patches/series   2017-10-12 07:54:27.0 -0400
+++ fbpanel-7.0/debian/patches/series   2021-01-18 20:13:19.0 -0500
@@ -4,3 +4,4 @@
 plugins_volume_oss+alsa_hint.patch
 ftbfs-hurd.patch
 nolibexec.patch
+gcc-10.patch

Bug#957248: gadmin-proftpd: ftbfs with GCC-10

[Logan Rosen]

Package: gadmin-proftpd
Version: 1:0.4.2-1
Followup-For: Bug #957248
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/05_gcc-10.patch: Mark variables as extern to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru gadmin-proftpd-0.4.2/debian/patches/05-gcc_10.patch 
gadmin-proftpd-0.4.2/debian/patches/05-gcc_10.patch
--- gadmin-proftpd-0.4.2/debian/patches/05-gcc_10.patch 1969-12-31 
19:00:00.0 -0500
+++ gadmin-proftpd-0.4.2/debian/patches/05-gcc_10.patch 2021-01-18 
19:54:22.0 -0500
@@ -0,0 +1,15 @@
+--- a/src/apply_user.c
 b/src/apply_user.c
+@@ -51,10 +51,10 @@
+ extern gchar *homedir;
+ 
+ /* The directory checkbox values */
+-gchar *dir_val[19];
++extern gchar *dir_val[19];
+ extern long num_rows;
+ extern int row_pos;
+-char *user_profile;
++extern char *user_profile;
+ 
+ 
+ /* Check if the user exists in the selected server */
diff -Nru gadmin-proftpd-0.4.2/debian/patches/series 
gadmin-proftpd-0.4.2/debian/patches/series
--- gadmin-proftpd-0.4.2/debian/patches/series  2011-03-11 21:56:35.0 
-0500
+++ gadmin-proftpd-0.4.2/debian/patches/series  2021-01-18 19:53:51.0 
-0500
@@ -2,3 +2,4 @@
 02-icondir.patch
 03-desktop.patch
 04-spell_in_binary.patch
+05-gcc_10.patch

Bug#957281: gnomad2: ftbfs with GCC-10

[Logan Rosen]

Package: gnomad2
Version: 2.9.6-5
Followup-For: Bug #957281
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix FTBFS with GCC 10 due to multiple definitions.

Thanks for considering the patch.

Logan
diff -Nru gnomad2-2.9.6/debian/patches/gcc-10.patch 
gnomad2-2.9.6/debian/patches/gcc-10.patch
--- gnomad2-2.9.6/debian/patches/gcc-10.patch   1969-12-31 19:00:00.0 
-0500
+++ gnomad2-2.9.6/debian/patches/gcc-10.patch   2021-01-18 14:01:39.0 
-0500
@@ -0,0 +1,56 @@
+--- a/src/common.h
 b/src/common.h
+@@ -130,25 +130,25 @@
+ } playlist_widgets_t;
+ 
+ /* Globally known widgets */
+-transfer_widgets_t transfer_widgets;
+-data_widgets_t data_widgets;
+-playlist_widgets_t playlist_widgets;
++extern transfer_widgets_t transfer_widgets;
++extern data_widgets_t data_widgets;
++extern playlist_widgets_t playlist_widgets;
+ 
+ /* Global progress bar - not so good but... */
+-GtkWidget *progress_bar;
++extern GtkWidget *progress_bar;
+ 
+ /* Global playlist selection for the popup, not good either ... */
+-GList *jukebox_playlist;
+-GList *selected_target_playlists;
++extern GList *jukebox_playlist;
++extern GList *selected_target_playlists;
+ 
+ /* Global lock variable for the jukebox */
+-gboolean volatile jukebox_locked;
++extern gboolean volatile jukebox_locked;
+ 
+ /* Global cancellation variable for jukebox operations */
+-gboolean volatile cancel_jukebox_operation;
++extern gboolean volatile cancel_jukebox_operation;
+ 
+ /* Global debug level variable (standard = 7) */
+-gint gnomad_debug;
++extern gint gnomad_debug;
+ 
+ /* A proc for hiding dialog windows */
+ GCallback dispose_of_dialog_window(GtkButton * button, gpointer data);
+--- a/src/gnomad2.c
 b/src/gnomad2.c
+@@ -34,7 +34,15 @@
+ guint uevent_device_hooked = 0;
+ #endif
+ 
+-/* This one should be global really */
++transfer_widgets_t transfer_widgets;
++data_widgets_t data_widgets;
++playlist_widgets_t playlist_widgets;
++GtkWidget *progress_bar;
++GList *jukebox_playlist;
++GList *selected_target_playlists;
++gboolean volatile jukebox_locked;
++gboolean volatile cancel_jukebox_operation;
++gint gnomad_debug;
+ GtkWidget *main_window;
+ 
+ /* Local variables */
diff -Nru gnomad2-2.9.6/debian/patches/series 
gnomad2-2.9.6/debian/patches/series
--- gnomad2-2.9.6/debian/patches/series 2016-06-02 03:22:31.0 -0400
+++ gnomad2-2.9.6/debian/patches/series 2021-01-18 13:57:38.0 -0500
@@ -1,3 +1,4 @@
 0001-werror_format_security.patch
 1001-gtk_set_can_default.patch
 1002-gtk2_to_gtk3.patch
+gcc-10.patch

Bug#957312: gringotts: ftbfs with GCC-10

[Logan Rosen]

Package: gringotts
Version: 1.2.10-3
Followup-For: Bug #957312
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-build-with-gcc10.patch: Cherrypick/modify upstream Git commit to
fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru gringotts-1.2.10/debian/patches/fix-build-with-gcc-10.patch 
gringotts-1.2.10/debian/patches/fix-build-with-gcc-10.patch
--- gringotts-1.2.10/debian/patches/fix-build-with-gcc-10.patch 1969-12-31 
19:00:00.0 -0500
+++ gringotts-1.2.10/debian/patches/fix-build-with-gcc-10.patch 2021-01-17 
22:14:40.0 -0500
@@ -0,0 +1,225 @@
+From dfeb8b6a4b2fdc9ba61ed64a72a73c44cc5a9faf Mon Sep 17 00:00:00 2001
+From: Shlomi Fish 
+Date: Tue, 26 May 2020 12:23:14 +0300
+Subject: [PATCH] extern decls fix for recent gcc.
+
+---
+ src/grg_attachs.h|  2 +-
+ src/grg_entries.h|  2 +-
+ src/grg_menus.c  | 15 +++
+ src/grg_menus.h  | 14 +++---
+ src/grg_pix.h| 14 +++---
+ src/grg_prefs.h  | 36 ++--
+ src/grg_recent_dox.h |  8 
+ src/grg_widgets.h|  2 +-
+ src/gringotts.h  |  6 +++---
+ 10 files changed, 58 insertions(+), 42 deletions(-)
+
+diff --git a/src/grg_attachs.h b/src/grg_attachs.h
+index d8df7ac..1442ff9 100644
+--- a/src/grg_attachs.h
 b/src/grg_attachs.h
+@@ -24,7 +24,7 @@
+ 
+ #include 
+ 
+-gint current_attach_ID;
++extern gint current_attach_ID;
+ 
+ gint grg_attach_file (gchar * path, GtkWidget * parent);
+ void grg_remove_attachment (void);
+diff --git a/src/grg_entries.h b/src/grg_entries.h
+index 63102d3..dc3872a 100644
+--- a/src/grg_entries.h
 b/src/grg_entries.h
+@@ -24,7 +24,7 @@
+ 
+ /* current element. */
+ /* MUST BE USED ONLY BY grg_attachs.h  */
+-GList *current;
++extern GList *current;
+ 
+ /* Appends a new entry to the list */
+ void grg_entries_append (void);
+diff --git a/src/grg_menus.c b/src/grg_menus.c
+index f952e2a..50163a1 100644
+--- a/src/grg_menus.c
 b/src/grg_menus.c
+@@ -31,6 +31,21 @@
+ 
+ #include 
+ 
++/* menu File */
++GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++
++/* menu Edit */
++GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++
++/* menu Navigation */
++GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++
++/* menu Tools */
++GtkWidget *bwipe;
++
++/* menu Help */
++GtkWidget *babo;
++
+ #define NEW_MENU_ITEM(var, text, cb, data, parent, img, key, mod) \
+   var = gtk_image_menu_item_new_with_mnemonic(text); \
+   gtk_menu_shell_append (GTK_MENU_SHELL (parent), var); \
+diff --git a/src/grg_menus.h b/src/grg_menus.h
+index 47e5088..eb1ca45 100644
+--- a/src/grg_menus.h
 b/src/grg_menus.h
+@@ -25,22 +25,22 @@
+ #include 
+ 
+ /* menu File */
+-GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++extern GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
+ 
+ /* menu Edit */
+-GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++extern GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, 
*bpref;
+ 
+ /* menu Navigation */
+-GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++extern GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
+ 
+ /* menu Tools */
+-GtkWidget *bwipe;
++extern GtkWidget *bwipe;
+ 
+ /* menu Help */
+-GtkWidget *babo;
++extern GtkWidget *babo;
+ 
+ /*Makes a menubar, within a handlebox, and returns the GtkWidget */
+-GtkWidget *grg_menu_create (GtkWidget * window);
++extern GtkWidget *grg_menu_create (GtkWidget * window);
+ 
+-void grg_menu_update (void);
++extern void grg_menu_update (void);
+ #endif
+diff --git a/src/grg_pix.h b/src/grg_pix.h
+index bbb92b2..23937b6 100644
+--- a/src/grg_pix.h
 b/src/grg_pix.h
+@@ -22,13 +22,13 @@
+ #ifndef GRG_PIX_H
+ #define GRG_PIX_H
+ 
+-const char *red_xpm[58];
+-const char *yellow_xpm[58];
+-const char *green_xpm[58];
+-const char *optimal_xpm[94];
++extern const char *red_xpm[58];
++extern const char *yellow_xpm[58];
++extern const char *green_xpm[58];
++extern const char *optimal_xpm[94];
+ 
+-const char *splash_xpm[180];
++extern const char *splash_xpm[180];
+ 
+-const char *wait_xpm[82];
+-const char *clip_xpm[17];
++extern const char *wait_xpm[82];
++extern const char *clip_xpm[17];
+ #endif
+diff --git a/src/grg_prefs.h b/src/grg_prefs.h
+index 7510633..cf37ced 100644
+--- a/src/grg_prefs.h
 b/src/grg_prefs.h
+@@ -24,24 +24,24 @@
+ 
+ #include 
+ 
+-gboolean grg_prefs_warn4overwrite;
+-gboolean grg_prefs_bak_files;
+-gboolean grg_prefs_splash;
+-gboolean grg_prefs_tray;
+-gboolean grg_prefs_clip_clear_on_close;
+-gboolean grg_prefs_clip_clear_on_quit;
+-gint grg_prefs_xpire;
+-gint grg_prefs_wipe_passes;
+-gint grg_prefs_mainwin_width, grg_prefs_mainwin_height;
++extern gboolean grg_prefs_warn4overwrite;
++extern gboolean 

Bug#968131: hdate-applet FTBFS with gcc-10

[Logan Rosen]

Package: hdate-applet
Version: 0.15.11-3
Followup-For: Bug #968131
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10: Fix FTBFS with GCC 10 due to multiple definitions.

Thanks for considering the patch.

Logan
diff -Nru hdate-applet-0.15.11/debian/patches/gcc-10 
hdate-applet-0.15.11/debian/patches/gcc-10
--- hdate-applet-0.15.11/debian/patches/gcc-10  1969-12-31 19:00:00.0 
-0500
+++ hdate-applet-0.15.11/debian/patches/gcc-10  2021-01-17 22:00:18.0 
-0500
@@ -0,0 +1,51 @@
+--- a/src/ghcal-interface.c
 b/src/ghcal-interface.c
+@@ -33,6 +33,18 @@
+ #include "ghcal-callbacks.h"
+ #include "ghcal-interface.h"
+ 
++hdate_struct today;
++GtkWidget *label_month;
++GtkWidget *label_year;
++GtkWidget *combobox_month;
++GtkWidget *spinbutton_year;
++GtkWidget *label_hebrew_month_and_year;
++int index_day_of_month[42];
++hdate_struct hdate_day_of_month[42];
++GtkWidget *label_day_of_month[42];
++GtkWidget *event_box_day_of_month[42];
++GtkTooltips *tooltip_day_of_month[42];
++
+ GtkWidget *
+ create_window (void)
+ {
+--- a/src/ghcal-interface.h
 b/src/ghcal-interface.h
+@@ -42,16 +42,16 @@
+ #  define N_(String) (String)
+ #endif
+ 
+-hdate_struct today;
+-GtkWidget *label_month;
+-GtkWidget *label_year;
+-GtkWidget *combobox_month;
+-GtkWidget *spinbutton_year;
+-GtkWidget *label_hebrew_month_and_year;
+-int index_day_of_month[42];
+-hdate_struct hdate_day_of_month[42];
+-GtkWidget *label_day_of_month[42];
+-GtkWidget *event_box_day_of_month[42];
+-GtkTooltips *tooltip_day_of_month[42];
++extern hdate_struct today;
++extern GtkWidget *label_month;
++extern GtkWidget *label_year;
++extern GtkWidget *combobox_month;
++extern GtkWidget *spinbutton_year;
++extern GtkWidget *label_hebrew_month_and_year;
++extern int index_day_of_month[42];
++extern hdate_struct hdate_day_of_month[42];
++extern GtkWidget *label_day_of_month[42];
++extern GtkWidget *event_box_day_of_month[42];
++extern GtkTooltips *tooltip_day_of_month[42];
+ 
+ GtkWidget *create_window (void);
diff -Nru hdate-applet-0.15.11/debian/patches/series 
hdate-applet-0.15.11/debian/patches/series
--- hdate-applet-0.15.11/debian/patches/series  2018-07-30 02:28:28.0 
-0400
+++ hdate-applet-0.15.11/debian/patches/series  2021-01-17 21:58:42.0 
-0500
@@ -3,3 +3,4 @@
 swedish-translation
 use-locale
 no-bonobo.patch
+gcc-10

Bug#957384: jabber-muc: ftbfs with GCC-10

[Logan Rosen]

Package: jabber-muc
Version: 0.8-7
Followup-For: Bug #957384
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc_10.diff: Fix FTBFS with GCC 10 due to multiple definitions.

Thanks for considering the patch.

Logan
diff -Nru jabber-muc-0.8/debian/patches/gcc_10.diff 
jabber-muc-0.8/debian/patches/gcc_10.diff
--- jabber-muc-0.8/debian/patches/gcc_10.diff   1969-12-31 19:00:00.0 
-0500
+++ jabber-muc-0.8/debian/patches/gcc_10.diff   2021-01-17 18:13:34.0 
-0500
@@ -0,0 +1,51 @@
+--- a/include/jcomp-compat.h
 b/include/jcomp-compat.h
+@@ -66,6 +66,6 @@
+ handel hds;
+ };
+ 
+-int deliver__flag;
++extern int deliver__flag;
+ 
+ typedef void(*shutdown_func)(void *arg);
+--- a/src/conference_user.c
 b/src/conference_user.c
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include "conference.h"
+-extern int deliver__flag;
++int deliver__flag;
+ 
+ cnu con_user_new(cnr room, jid id)
+ {
+--- a/include/jcomp.h
 b/include/jcomp.h
+@@ -98,7 +98,7 @@
+ #define _STREAM_ERROR4
+ #define _STREAM_SHUTDOWN   5
+ 
+-jcr_instance jcr;
++extern jcr_instance jcr;
+ 
+ void log_debug(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
+ void log_warn(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
+--- a/src/conference.c
 b/src/conference.c
+@@ -20,6 +20,8 @@
+ 
+ #include "conference.h"
+ 
++jcr_instance jcr;
++
+ void con_server_browsewalk(gpointer key, gpointer data, gpointer arg)
+ {
+   cnr room = (cnr)data;
+@@ -1064,7 +1066,6 @@
+ /*** everything starts here ***/
+ void conference(instance i, xmlnode x)
+ {
+-  extern jcr_instance jcr;
+   cni master;
+   xmlnode cfg;
+   jid sadmin;
diff -Nru jabber-muc-0.8/debian/patches/series 
jabber-muc-0.8/debian/patches/series
--- jabber-muc-0.8/debian/patches/series2019-05-12 04:13:37.0 
-0400
+++ jabber-muc-0.8/debian/patches/series2021-01-17 18:09:44.0 
-0500
@@ -1,2 +1,3 @@
 cflags_hardening.diff
 cross.diff
+gcc_10.diff

Bug#957383: jamin: ftbfs with GCC-10

[Logan Rosen]

Package: jamin
Version: 0.98.9~git20170111~199091~repack1-1
Followup-For: Bug #957383
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc_10.patch: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru jamin-0.98.9~git20170111~199091~repack1/debian/patches/gcc_10.patch 
jamin-0.98.9~git20170111~199091~repack1/debian/patches/gcc_10.patch
--- jamin-0.98.9~git20170111~199091~repack1/debian/patches/gcc_10.patch 
1969-12-31 19:00:00.0 -0500
+++ jamin-0.98.9~git20170111~199091~repack1/debian/patches/gcc_10.patch 
2021-01-16 20:57:51.0 -0500
@@ -0,0 +1,21 @@
+--- a/src/hdeq.h
 b/src/hdeq.h
+@@ -65,7 +65,7 @@
+ int get_current_notebook1_page ();
+ 
+ 
+-GtkNotebook *l_notebook1;
++extern GtkNotebook *l_notebook1;
+ 
+ 
+ #endif
+--- a/src/callbacks.c
 b/src/callbacks.c
+@@ -71,6 +71,7 @@
+ static GtkWidget*scene_name_dialog, *about_dialog;
+ static GtkEntry *l_scene_name_entry;
+ static GdkColor l_main_color, l_eq_color, l_comp_color[XO_NBANDS], 
l_limiter_color;
++GtkNotebook *l_notebook1;
+ 
+ 
+ void
diff -Nru jamin-0.98.9~git20170111~199091~repack1/debian/patches/series 
jamin-0.98.9~git20170111~199091~repack1/debian/patches/series
--- jamin-0.98.9~git20170111~199091~repack1/debian/patches/series   
2017-01-11 15:31:55.0 -0500
+++ jamin-0.98.9~git20170111~199091~repack1/debian/patches/series   
2021-01-16 20:57:34.0 -0500
@@ -5,3 +5,4 @@
 1005_desktop_file.patch
 NEWS.patch
 fix_typos.patch
+gcc_10.patch

Bug#957478: libsml: ftbfs with GCC-10

[Logan Rosen]

Package: libsml
Version: 0.1.1+git20180125-1
Followup-For: Bug #957478
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Cherrypick upstream Git commit to fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru libsml-0.1.1+git20180125/debian/patches/gcc-10.patch 
libsml-0.1.1+git20180125/debian/patches/gcc-10.patch
--- libsml-0.1.1+git20180125/debian/patches/gcc-10.patch1969-12-31 
19:00:00.0 -0500
+++ libsml-0.1.1+git20180125/debian/patches/gcc-10.patch2021-01-16 
20:21:25.0 -0500
@@ -0,0 +1,200 @@
+From 0738cd50632eadb9cd2c21e07b70f984a9cf444b Mon Sep 17 00:00:00 2001
+From: r00t 
+Date: Mon, 28 Dec 2020 01:03:43 +0100
+Subject: [PATCH] [test] fix building with -fno-common (gcc10 default),
+
+see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
+---
+ test/src/sml_boolean_test.c  | 2 +-
+ test/src/sml_buffer_test.c   | 2 +-
+ test/src/sml_file_test.c | 2 +-
+ test/src/sml_get_profile_pack_request_test.c | 2 +-
+ test/src/sml_list_test.c | 4 ++--
+ test/src/sml_message_test.c  | 2 +-
+ test/src/sml_number_test.c   | 2 +-
+ test/src/sml_octet_string_test.c | 2 +-
+ test/src/sml_open_request_test.c | 2 +-
+ test/src/sml_status_test.c   | 2 +-
+ test/src/sml_time_test.c | 2 +-
+ test/src/sml_tree_test.c | 2 +-
+ test/src/sml_value_test.c| 2 +-
+ 13 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/test/src/sml_boolean_test.c b/test/src/sml_boolean_test.c
+index 90b5f3d..0fbebf1 100644
+--- a/test/src/sml_boolean_test.c
 b/test/src/sml_boolean_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_boolean);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_boolean) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_buffer_test.c b/test/src/sml_buffer_test.c
+index bf8e714..45eacc2 100644
+--- a/test/src/sml_buffer_test.c
 b/test/src/sml_buffer_test.c
+@@ -22,7 +22,7 @@
+ TEST_GROUP(sml_buffer);
+ 
+ int buffer_len = 512;
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_buffer) {
+   buf = sml_buffer_init(buffer_len);
+diff --git a/test/src/sml_file_test.c b/test/src/sml_file_test.c
+index 1b1bb15..9ded16f 100644
+--- a/test/src/sml_file_test.c
 b/test/src/sml_file_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_file);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_file) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_get_profile_pack_request_test.c 
b/test/src/sml_get_profile_pack_request_test.c
+index c03d6ab..44f1f07 100644
+--- a/test/src/sml_get_profile_pack_request_test.c
 b/test/src/sml_get_profile_pack_request_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_get_profile_pack_request);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_get_profile_pack_request) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_list_test.c b/test/src/sml_list_test.c
+index 9a5f583..56d6ed2 100644
+--- a/test/src/sml_list_test.c
 b/test/src/sml_list_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_list);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_list) {
+   buf = sml_buffer_init(512);
+@@ -100,7 +100,7 @@ TEST_GROUP_RUNNER(sml_list) {
+ 
+ TEST_GROUP(sml_sequence);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_sequence) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_message_test.c b/test/src/sml_message_test.c
+index 7462435..3d4bb07 100644
+--- a/test/src/sml_message_test.c
 b/test/src/sml_message_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_message);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_message) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_number_test.c b/test/src/sml_number_test.c
+index 9a5eece..09c00ca 100644
+--- a/test/src/sml_number_test.c
 b/test/src/sml_number_test.c
+@@ -23,7 +23,7 @@
+ 
+ TEST_GROUP(sml_number);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_number) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_octet_string_test.c 
b/test/src/sml_octet_string_test.c
+index 2a47632..c37d219 100644
+--- a/test/src/sml_octet_string_test.c
 b/test/src/sml_octet_string_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_octet_string);
+ 
+-sml_buffer *buf;
++static sml_buffer *buf;
+ 
+ TEST_SETUP(sml_octet_string) {
+   buf = sml_buffer_init(512);
+diff --git a/test/src/sml_open_request_test.c 
b/test/src/sml_open_request_test.c
+index 89beba5..23b917f 100644
+--- a/test/src/sml_open_request_test.c
 b/test/src/sml_open_request_test.c
+@@ -22,7 +22,7 @@
+ 
+ TEST_GROUP(sml_open_request);
+ 
+-sml_buffer 

Bug#957577: nast: ftbfs with GCC-10

[Logan Rosen]

Package: nast
Version: 0.2.0-7
Followup-For: Bug #957577
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru nast-0.2.0/debian/patches/gcc-10 nast-0.2.0/debian/patches/gcc-10
--- nast-0.2.0/debian/patches/gcc-101969-12-31 19:00:00.0 -0500
+++ nast-0.2.0/debian/patches/gcc-102021-01-15 23:30:25.0 -0500
@@ -0,0 +1,327 @@
+--- a/include/nast.h
 b/include/nast.h
+@@ -95,32 +95,32 @@
+ void init_scr(void);
+ 
+ /* variable */
+-FILE *logd;
+-short offset;
+-int npkt;
+-u_char *packet;
+-u_char *buf;
+-struct pcap_pkthdr hdr;
+-pcap_t* descr;
+-pcap_dumper_t *dumper;
+-struct pcap_stat statistic;
+-bpf_u_int32 maskp;  /* subnet mask   */
+-bpf_u_int32 netp; /* ip*/
+-int datalink;
+-struct bpf_program fp;  /* hold compiled program */
+-char *logname;
+-char *tcpdl;
+-u_short tr,tl;
+-u_short graph;  /* global var for ncurses mode */
+-u_short cont;
++extern FILE *logd;
++extern short offset;
++extern int npkt;
++extern u_char *packet;
++extern u_char *buf;
++extern struct pcap_pkthdr hdr;
++extern pcap_t* descr;
++extern pcap_dumper_t *dumper;
++extern struct pcap_stat statistic;
++extern bpf_u_int32 maskp;  /* subnet mask   */
++extern bpf_u_int32 netp;  /* ip*/
++extern int datalink;
++extern struct bpf_program fp;  /* hold compiled program */
++extern char *logname;
++extern char *tcpdl;
++extern u_short tr,tl;
++extern u_short graph;  /* global var for ncurses mode */
++extern u_short cont;
+ /* golbal var*/
+-int stream_glob;
+-int bc_glob;
+-int sniff_glob;
+-int rst_glob;
+-int arp_glob;
+-pthread_t pt[2];
+-int lg;
++extern int stream_glob;
++extern int bc_glob;
++extern int sniff_glob;
++extern int rst_glob;
++extern int arp_glob;
++extern pthread_t pt[2];
++extern int lg;
+ 
+ struct host
+ {
+@@ -129,13 +129,13 @@
+ };
+ 
+ /* time variable */
+-time_t tm;
+-char timed[60];
++extern time_t tm;
++extern char timed[60];
+ 
+ /* for demonize nast */
+-u_short demonize;
++extern u_short demonize;
+ 
+-int line_s;
+-int row_s;
++extern int line_s;
++extern int row_s;
+ 
+ 
+--- a/main.c
 b/main.c
+@@ -26,6 +26,43 @@
+ # include "missing/getopt.h"
+ #endif
+ 
++/* variable */
++FILE *logd;
++short offset;
++int npkt;
++u_char *packet;
++u_char *buf;
++struct pcap_pkthdr hdr;
++pcap_t* descr;
++struct pcap_stat statistic;
++bpf_u_int32 maskp;  /* subnet mask   */
++bpf_u_int32 netp; /* ip*/
++int datalink;
++struct bpf_program fp;  /* hold compiled program */
++char *logname;
++char *tcpdl;
++u_short tr,tl;
++u_short graph;  /* global var for ncurses mode */
++u_short cont;
++/* golbal var*/
++int stream_glob;
++int bc_glob;
++int sniff_glob;
++int rst_glob;
++int arp_glob;
++pthread_t pt[2];
++int lg;
++
++/* time variable */
++time_t tm;
++char timed[60];
++
++/* for demonize nast */
++u_short demonize;
++
++int line_s;
++int row_s;
++
+ void usage(char *name);
+ 
+ int main(int argc,char **argv)
+--- a/ncurses/n_nast.c
 b/ncurses/n_nast.c
+@@ -21,6 +21,48 @@
+ 
+ #ifdef HAVE_LIBNCURSES
+ 
++WINDOW *query;
++WINDOW *werror;
++WINDOW *help;
++N_SCROLLWIN *princ;
++N_SCROLLWIN *winfo;
++N_SCROLLWIN *wstream;
++N_SCROLLWIN *wconn;
++
++MENU *my_nmenu;
++ITEM *curr_item;
++WINDOW *my_nmenu_win;
++WINDOW *pop_up;
++
++u_short mvar;
++u_short promisc,hex,ascii,ld,f,lr,l;
++u_short flg;
++int linm;
++int fileds;
++char dev[10];
++char n_filter[60];
++char ldfile[50];
++char tcpdfile[50];
++char reportl[50];
++char logfile[50];
++/*descriptor for stream*/
++pcap_t* str;
++pcap_dumper_t *dumper;
++
++/* thread for database connections */
++pthread_t thID[7];
++
++struct thread_conn th_data[1];
++struct thread_conn_rst th_r_data[1];
++struct thread_arp th_arp_data[1];
++
++struct connections c_inf[30];
++
++struct cnn sf[30];
++
++/* num max of db connections */
++int nmax;
++
+ void init_curs(void);
+ void title(void);
+ int get_info(void);
+--- a/ncurses/n_nast.h
 b/ncurses/n_nast.h
+@@ -84,36 +84,36 @@
+ int shutdown_thread(void);
+ void help_win(void);
+ 
+-WINDOW *query;
+-WINDOW *werror;
+-WINDOW *help;
+-N_SCROLLWIN *princ;
+-N_SCROLLWIN *winfo;
+-N_SCROLLWIN *wstream;
+-N_SCROLLWIN *wconn;
+-
+-MENU *my_nmenu;
+-ITEM *curr_item;
+-WINDOW *my_nmenu_win;
+-WINDOW *pop_up;
+-
+-u_short mvar;
+-u_short promisc,hex,ascii,ld,f,lr,l;
+-u_short flg;
+-int linm;
+-int fileds;
+-char dev[10];
+-char n_filter[60];
+-char ldfile[50];
+-char tcpdfile[50];
+-char reportl[50];
+-char logfile[50];
++extern WINDOW *query;
++extern WINDOW *werror;
++extern WINDOW *help;
++extern N_SCROLLWIN *princ;
++extern N_SCROLLWIN *winfo;
++extern N_SCROLLWIN *wstream;

Bug#957585: ncurses-hexedit: ftbfs with GCC-10

[Logan Rosen]

Package: ncurses-hexedit
Version: 0.9.7+orig-7
Followup-For: Bug #957585
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc_10.patch: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch 
ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch
--- ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch  1969-12-31 
19:00:00.0 -0500
+++ ncurses-hexedit-0.9.7+orig/debian/patches/gcc_10.patch  2021-01-15 
23:13:37.0 -0500
@@ -0,0 +1,44 @@
+--- a/src/hexedit.h
 b/src/hexedit.h
+@@ -343,7 +343,7 @@
+ 
+ 
+/* Global structure, keep most global variables here. */
+-struct
++struct Globals_t
+ {
+WINDOW *wmain, *wstatus, *whelp; /* three windows used throughout. */
+unsigned long filesize;  /* size of the file buffer. */
+@@ -365,7 +365,9 @@
+ /* buf end. */
+int beeping; /* Allow beeping or not. */
+int help_msg_count;  /* Number of messages in help menu. */
+-} Globals;
++};
++
++extern struct Globals_t Globals;
+ 
+ 
+ struct foundit
+@@ -400,7 +402,9 @@
+int s;
+struct Change *base;
+struct Change *top;
+-} UndoStack;
++};
++
++extern struct ChangeLog UndoStack;
+ 
+ 
+ struct FileNames
+--- a/src/init.c
 b/src/init.c
+@@ -35,6 +35,8 @@
+ 
+ extern char **environ;
+ 
++struct ChangeLog UndoStack;
++struct Globals_t Globals;
+ 
+/* This is called once at the start of the program.  Handles HEXEDIT
+ * Environment variable, command line arguments, sets up signal
diff -Nru ncurses-hexedit-0.9.7+orig/debian/patches/series 
ncurses-hexedit-0.9.7+orig/debian/patches/series
--- ncurses-hexedit-0.9.7+orig/debian/patches/series2019-01-30 
22:29:46.0 -0500
+++ ncurses-hexedit-0.9.7+orig/debian/patches/series2021-01-15 
23:11:19.0 -0500
@@ -16,3 +16,4 @@
 enforce_readonly_mode.patch
 fix_buffer_overruns.patch
 fix_spelling_errors.patch
+gcc_10.patch

Bug#957596: netdiag: ftbfs with GCC-10

[Logan Rosen]

Package: netdiag
Version: 1.2-1
Followup-For: Bug #957596
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.diff: Fix FTBFS with GCC 10.
  * d/p/pcap_init.diff: Rename pcap_init() to traf_pcap_init() to avoid
conflict with libpcap.

Thanks for considering the patch.

Logan
diff -u netdiag-1.2/debian/patches/series netdiag-1.2/debian/patches/series
--- netdiag-1.2/debian/patches/series
+++ netdiag-1.2/debian/patches/series
@@ -6,3 +6,5 @@
 adapt_netload_to_bsd.diff
 adaption_to_kfreebsd.diff 
 clang-ftbfs.diff
+gcc-10.diff
+pcap_init.diff
only in patch2:
unchanged:
--- netdiag-1.2.orig/debian/patches/gcc-10.diff
+++ netdiag-1.2/debian/patches/gcc-10.diff
@@ -0,0 +1,39 @@
+--- a/netwatch-1.3.1-2/netwatch.c
 b/netwatch-1.3.1-2/netwatch.c
+@@ -151,6 +151,10 @@
+ #include "netresolv.h"
+ #include "netwatch.h"
+ 
++struct port_info *tcp_port_types[TCPHASH];
++
++struct port_info *udp_port_types[UDPHASH];
++
+ extern int errno;
+ 
+ #define MAXFILENAME 256
+--- a/netwatch-1.3.1-2/netwatch.h
 b/netwatch-1.3.1-2/netwatch.h
+@@ -209,10 +209,10 @@
+ };
+ 
+ #define TCPHASH 1786
+-struct port_info *tcp_port_types[TCPHASH];
++EXTERN_DEF struct port_info *tcp_port_types[TCPHASH];
+ 
+ #define UDPHASH 1786
+-struct port_info *udp_port_types[UDPHASH];
++EXTERN_DEF struct port_info *udp_port_types[UDPHASH];
+ 
+ int hashport( int port, int hash);
+ void initlist(struct port_info *first[], int hash);
+--- a/netwatch-1.3.1-2/dispdata.c
 b/netwatch-1.3.1-2/dispdata.c
+@@ -178,7 +178,7 @@
+ extern int simchange;
+ extern int simfwdir;
+ extern int simarr[8];
+-char *simfmt;
++extern char *simfmt;
+ extern int iseth;
+ extern int nw_logall;
+ extern char nw_allname[256];
only in patch2:
unchanged:
--- netdiag-1.2.orig/debian/patches/pcap_init.diff
+++ netdiag-1.2/debian/patches/pcap_init.diff
@@ -0,0 +1,29 @@
+--- a/trafshow-5.2.3/trafshow.c
 b/trafshow-5.2.3/trafshow.c
+@@ -58,7 +58,7 @@
+ static void vers();
+ static void usage();
+ static pcap_if_t *pcap_matchdev(pcap_if_t *dp, const char *name);
+-static int pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
++static int traf_pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
+ static void *pcap_feed(void *arg); /* PCAP_HANDLER *ph */
+ #ifdefHAVE_PCAP_GET_SELECTABLE_FD
+ static void *pcap_feed2(void *arg); /* PCAP_HANDLER *ph */
+@@ -172,7 +172,7 @@
+   }
+ 
+   /* initialize list of pcap handlers */
+-  if ((op = pcap_init(_list, dev_list)) < 1) {
++  if ((op = traf_pcap_init(_list, dev_list)) < 1) {
+   fprintf(stderr, "No packet capture device available (no 
permission?)\n");
+   exit(1);
+   }
+@@ -301,7 +301,7 @@
+ }
+ 
+ static int
+-pcap_init(ph_list, dp)
++traf_pcap_init(ph_list, dp)
+   PCAP_HANDLER **ph_list;
+   pcap_if_t *dp;
+ {

Bug#957599: netpbm-free: ftbfs with GCC-10

[Logan Rosen]

Package: netpbm-free
Version: 2:10.0-15.3
Followup-For: Bug #957599
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -u netpbm-free-10.0/debian/patches/series 
netpbm-free-10.0/debian/patches/series
--- netpbm-free-10.0/debian/patches/series
+++ netpbm-free-10.0/debian/patches/series
@@ -18,3 +18,4 @@
 bufferoverflow.patch
 648131libpng16.patch
 
+gcc-10.patch
only in patch2:
unchanged:
--- netpbm-free-10.0.orig/debian/patches/gcc-10.patch
+++ netpbm-free-10.0/debian/patches/gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/pnm/fiasco/output/mc.c
 b/pnm/fiasco/output/mc.c
+@@ -26,7 +26,7 @@
+ 
+ #include "mc.h"
+ 
+-int mv_code_table [33][2];/* VLC table for coordinates, mwfa.c */
++extern int mv_code_table [33][2]; /* VLC table for coordinates, 
mwfa.c */
+ 
+ /*
+ 

Bug#957610: nn: ftbfs with GCC-10

[Logan Rosen]

Source: nn
Version: 6.7.3-12
Followup-For: Bug #957610
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/07-gcc-10.diff: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru nn-6.7.3/debian/patches/07-gcc-10.diff 
nn-6.7.3/debian/patches/07-gcc-10.diff
--- nn-6.7.3/debian/patches/07-gcc-10.diff  1969-12-31 19:00:00.0 
-0500
+++ nn-6.7.3/debian/patches/07-gcc-10.diff  2021-01-12 23:33:20.0 
-0500
@@ -0,0 +1,114 @@
+--- a/global.h
 b/global.h
+@@ -172,7 +172,7 @@
+ extern group_header *current_group, *group_sequence, *rc_sequence;
+ 
+ 
+-int l_g_index, s_g_first;
++extern int l_g_index, s_g_first;
+ 
+ #define   Loop_Groups_Number(num) \
+ for (num = 0; num < master.number_of_groups; num++)
+--- a/db.c
 b/db.c
+@@ -130,6 +130,8 @@
+ static char*group_position = NULL;
+ static article_number current_digest_article = 0;
+ 
++int l_g_index, s_g_first;
++
+ int
+ init_group(register group_header * gh)
+ {
+--- a/nn_term.h
 b/nn_term.h
+@@ -48,7 +48,7 @@
+  */
+ 
+ 
+-int prompt_line;  /* prompt line */
++extern int prompt_line;   /* prompt line */
+ 
+ #define   P_MOVE  (char *)1
+ #define P_REDRAW  (char *)5
+--- a/term.c
 b/term.c
+@@ -140,6 +140,7 @@
+ int show_current_time = 1;
+ int conf_dont_sleep = 0;
+ int prompt_length;
++int prompt_line;
+ int terminal_speed = 0;
+ int slow_speed = 1200;
+ int any_message = 0;
+--- a/articles.c
 b/articles.c
+@@ -33,6 +33,9 @@
+ int body_search_header = 0;
+ int cross_post_limit = 0;
+ 
++article_number  n_articles;
++article_header **articles;
++
+ extern int  ignore_fancy_select;
+ extern int  killed_articles;
+ 
+--- a/articles.h
 b/articles.h
+@@ -10,8 +10,8 @@
+ 
+ /* article headers */
+ 
+-article_number  n_articles;
+-article_header **articles;
++extern article_number  n_articles;
++extern article_header **articles;
+ 
+ 
+ typedef struct thunk {
+--- a/news.h
 b/news.h
+@@ -44,7 +44,9 @@
+ char   *ng_xlines;/* lines (from header)   */
+ int ng_lines; /* lines (decoded)   */
+ char   *ng_comment;   /* comment-to (rfmail)   */
+-}   news;
++};
++
++extern struct news_header news;
+ 
+ 
+ /*
+@@ -62,7 +64,9 @@
+ char   *dg_to;/* to*/
+ 
+ int dg_lines; /* lines (pseudo field)  */
+-}   digest;
++};
++
++extern struct digest_header digest;
+ 
+ 
+ #define   NEWS_HEADER_BUFFER  4096
+--- a/digest.c
 b/digest.c
+@@ -23,6 +23,8 @@
+ 
+ /* digest.c */
+ 
++struct digest_header digest;
++
+ static char   **dg_hdr_field(register char *lp, int all);
+ 
+ int strict_from_parse = 2;
+--- a/news.c
 b/news.c
+@@ -22,6 +22,8 @@
+ 
+ /* news.c */
+ 
++struct news_header news;
++
+ static char   **art_hdr_field(register char *lp, int all);
+ 
+ 
diff -Nru nn-6.7.3/debian/patches/series nn-6.7.3/debian/patches/series
--- nn-6.7.3/debian/patches/series  2020-04-04 05:57:39.0 -0400
+++ nn-6.7.3/debian/patches/series  2021-01-12 23:25:33.0 -0500
@@ -5,3 +5,4 @@
 04-spelling.diff
 05-fix-compile.diff
 06-maintainers-additions.diff
+07-gcc-10.diff

Bug#980024: pdmenu: FTBFS with GCC 10

[Logan Rosen]

Source: pdmenu
Version: 1.3.4
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)

Hi,

pdmenu currently FTBFS in unstable with GCC 10 as default. There is a
patch in the linked VCS repo from September that has not been uploaded -
can you please consider uploading it? We applied it successfully in
Ubuntu but would prefer not to carry a delta.

Thanks,
Logan

Bug#980023: petri-foo: FTBFS with GCC 10

[Logan Rosen]

Source: petri-foo
Version: 0.1.87-4
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com

Hi,

petri-foo currently FTBFS on rebuild in unstable with GCC 10 as default
because of a variable being defined multiple times.

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru petri-foo-0.1.87/debian/control petri-foo-0.1.87/debian/control
--- petri-foo-0.1.87/debian/control 2018-02-05 11:51:44.0 -0500
+++ petri-foo-0.1.87/debian/control 2021-01-12 22:37:28.0 -0500
@@ -1,8 +1,7 @@
 Source: petri-foo
 Section: sound
 Priority: optional
-Maintainer: Ubuntu Developers 
-XSBC-Original-Maintainer: Debian Multimedia Maintainers 

+Maintainer: Debian Multimedia Maintainers 

 Uploaders:
  Alessio Treglia ,
  Jaromír Mikeš 
diff -Nru petri-foo-0.1.87/debian/patches/gcc-10.patch 
petri-foo-0.1.87/debian/patches/gcc-10.patch
--- petri-foo-0.1.87/debian/patches/gcc-10.patch1969-12-31 
19:00:00.0 -0500
+++ petri-foo-0.1.87/debian/patches/gcc-10.patch2021-01-12 
22:37:27.0 -0500
@@ -0,0 +1,21 @@
+--- a/gui/gui.c
 b/gui/gui.c
+@@ -93,6 +93,8 @@
+ /* current patch, makes passing patch id to sample editor easier */
+ static int cur_patch = -1;
+ 
++GtkRecentManager *recent_manager;
++
+ 
+ GtkWidget* gui_title_new(const char* msg)
+ {
+--- a/gui/gui.h
 b/gui/gui.h
+@@ -107,6 +107,6 @@
+ 
+ void gui_set_session_mode(void);
+ 
+-GtkRecentManager *recent_manager;
++extern GtkRecentManager *recent_manager;
+  
+ #endif /* __GUI_H__ */
diff -Nru petri-foo-0.1.87/debian/patches/series 
petri-foo-0.1.87/debian/patches/series
--- petri-foo-0.1.87/debian/patches/series  2016-12-23 10:09:46.0 
-0500
+++ petri-foo-0.1.87/debian/patches/series  2021-01-12 22:36:12.0 
-0500
@@ -1,2 +1,3 @@
 0003-desktop_file_fix.patch
 0005-spelling.patch
+gcc-10.patch

Bug#974207: psi-plus: FTBFS with Qt 5.15

[Logan Rosen]

Package: psi-plus
Version: 1.4.554-4
Followup-For: Bug #974207
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/qt-5.15.patch: Explicitly include QPainterPath to fix FTBFS with Qt
5.15.

Thanks for considering the patch.

Logan
diff -Nru psi-plus-1.4.554/debian/patches/qt-5.15.patch 
psi-plus-1.4.554/debian/patches/qt-5.15.patch
--- psi-plus-1.4.554/debian/patches/qt-5.15.patch   1969-12-31 
19:00:00.0 -0500
+++ psi-plus-1.4.554/debian/patches/qt-5.15.patch   2021-01-11 
22:20:22.0 -0500
@@ -0,0 +1,51 @@
+--- a/src/plugins/generic/screenshotplugin/screenshot.cpp
 b/src/plugins/generic/screenshotplugin/screenshot.cpp
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ 
+ #include "screenshot.h"
+--- a/src/avatars.cpp
 b/src/avatars.cpp
+@@ -35,6 +35,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "xmpp_xmlcommon.h"
+ #include "xmpp_vcard.h"
+--- a/src/contactlistdragview.cpp
 b/src/contactlistdragview.cpp
+@@ -45,6 +45,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ ContactListDragView::ContactListDragView(QWidget* parent)
+ : ContactListView(parent)
+--- a/src/rosteravatarframe.cpp
 b/src/rosteravatarframe.cpp
+@@ -23,6 +23,8 @@
+ #include "iconset.h"
+ #include "qpainter.h"
+ 
++#include 
++
+ 
+ RosterAvatarFrame::RosterAvatarFrame(QWidget *parent)
+ : QFrame(parent)
+--- a/src/whiteboarding/wbnewpath.cpp
 b/src/whiteboarding/wbnewpath.cpp
+@@ -23,6 +23,7 @@
+ #include "../sxe/sxesession.h"
+ 
+ #include 
++#include 
+ 
+ WbNewPath::WbNewPath(QGraphicsScene* s, QPointF startPos, int strokeWidth, 
const QColor , const QColor ) : WbNewItem(s) {
+ controlPoint_ = 0;
diff -Nru psi-plus-1.4.554/debian/patches/series 
psi-plus-1.4.554/debian/patches/series
--- psi-plus-1.4.554/debian/patches/series  2020-02-25 19:49:20.0 
-0500
+++ psi-plus-1.4.554/debian/patches/series  2021-01-11 22:19:52.0 
-0500
@@ -2,3 +2,4 @@
 fix-autoscroll-in-chats.patch
 send-unavailable-presence-on-program-exit.patch
 change-omemo-initialization-vector-length.patch
+qt-5.15.patch

Bug#979747: rtpproxy: FTBFS with GCC 10

[Logan Rosen]

Package: rtpproxy
Version: 1.2.1-2.2
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com

Hi,

rtpproxy currently FTBFS in Debian unstable with GCC 10 as default.

>From a local build:
gcc -std=gnu99 -Wall -Wno-uninitialized -g -O2 -ffile-prefix-map=/build/rtpproxy
-1.2.1=. -fstack-protector-strong -Wformat -Werror=format-security  -Wl,-z,relro
 -Wl,-z,now -o rtpproxy main.o rtp_server.o rtpp_record.o rtpp_util.o rtp.o rtp_
resizer.o rtpp_session.o rtpp_command.o rtpp_log.o rtpp_syslog_async.o -lm -lpth
read
/usr/bin/ld: rtpp_record.o:./rtpp_record.h:84: multiple definition of `__packed'
; main.o:./rtpp_record.h:84: first defined here
/usr/bin/ld: rtpp_session.o:./rtpp_record.h:84: multiple definition of `__packed
'; main.o:./rtpp_record.h:84: first defined here
/usr/bin/ld: rtpp_command.o:./rtpp_record.h:84: multiple definition of `__packed
'; main.o:./rtpp_record.h:84: first defined here
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:455: rtpproxy] Error 1
make[2]: Leaving directory '/build/rtpproxy-1.2.1'
make[1]: *** [Makefile:354: all] Error 2
make[1]: Leaving directory '/build/rtpproxy-1.2.1'
dh_auto_build: error: make -j8 returned exit code 2
make: *** [debian/rules:6: build] Error 25

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru rtpproxy-1.2.1/debian/patches/gcc-10.patch 
rtpproxy-1.2.1/debian/patches/gcc-10.patch
--- rtpproxy-1.2.1/debian/patches/gcc-10.patch  1969-12-31 19:00:00.0 
-0500
+++ rtpproxy-1.2.1/debian/patches/gcc-10.patch  2021-01-10 20:42:24.0 
-0500
@@ -0,0 +1,11 @@
+--- a/rtpp_record.h
 b/rtpp_record.h
+@@ -81,7 +81,7 @@
+ uint32_t family;
+ struct ip iphdr;
+ struct udphdr udphdr;
+-} __packed;
++};
+ 
+ struct pkt_hdr_adhoc {
+ union sockaddr_in_s addr;   /* Source address */
diff -Nru rtpproxy-1.2.1/debian/patches/series 
rtpproxy-1.2.1/debian/patches/series
--- rtpproxy-1.2.1/debian/patches/series2014-02-15 22:57:22.0 
-0500
+++ rtpproxy-1.2.1/debian/patches/series2021-01-10 20:38:05.0 
-0500
@@ -1 +1,2 @@
 syslog_format.patch
+gcc-10.patch

Bug#957781: scantool: ftbfs with GCC-10

[Logan Rosen]

Package: scantool
Version: 2.1-2
Followup-For: Bug #957781
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru scantool-2.1/debian/patches/gcc-10.patch 
scantool-2.1/debian/patches/gcc-10.patch
--- scantool-2.1/debian/patches/gcc-10.patch1969-12-31 19:00:00.0 
-0500
+++ scantool-2.1/debian/patches/gcc-10.patch2021-01-09 21:44:33.0 
-0500
@@ -0,0 +1,121 @@
+--- a/globals.h
 b/globals.h
+@@ -37,19 +37,19 @@
+ #define C_LIGHT_GRAY55
+ 
+ //
+-int is_not_genuine_scan_tool;
++extern int is_not_genuine_scan_tool;
+ 
+ // Options
+-int system_of_measurements;
+-int display_mode;
++extern int system_of_measurements;
++extern int display_mode;
+ 
+ // File names
+-char *options_file_name;
+-char *data_file_name;
+-char *code_defs_file_name;
+-char log_file_name[20];
++extern char *options_file_name;
++extern char *data_file_name;
++extern char *code_defs_file_name;
++extern char log_file_name[20];
+ #ifdef LOG_COMMS
+-char comm_log_file_name[20];
++extern char comm_log_file_name[20];
+ #endif
+ 
+ void write_log(const char *log_string);
+@@ -58,6 +58,6 @@
+ void write_comm_log(const char *marker, const char *data);
+ #endif
+ 
+-DATAFILE *datafile;
++extern DATAFILE *datafile;
+ 
+ #endif
+--- a/main.c
 b/main.c
+@@ -16,6 +16,23 @@
+ 
+ #define WINDOW_TITLE   "ScanTool.net " SCANTOOL_VERSION_EX_STR
+ 
++int is_not_genuine_scan_tool;
++
++// Options
++int system_of_measurements;
++int display_mode;
++
++// File names
++char *options_file_name;
++char *data_file_name;
++char *code_defs_file_name;
++char log_file_name[20];
++#ifdef LOG_COMMS
++char comm_log_file_name[20];
++#endif
++
++DATAFILE *datafile;
++
+ 
+ void write_log(const char *log_string)
+ {
+--- a/serial.h
 b/serial.h
+@@ -77,13 +77,15 @@
+ int display_error_message(int error, int retry);
+ 
+ // variables
+-volatile int serial_time_out;
+-volatile int serial_timer_running;
++extern volatile int serial_time_out;
++extern volatile int serial_timer_running;
+ 
+ struct COMPORT {
+int number;
+int baud_rate;
+int status;// READY, NOT_OPEN, USER_IGNORED
+-} comport;
++};
++
++extern struct COMPORT comport;
+ 
+ #endif
+--- a/serial.c
 b/serial.c
+@@ -24,6 +24,11 @@
+ #define TX_TIMEOUT_MULTIPLIER0
+ #define TX_TIMEOUT_CONSTANT  1000
+ 
++volatile int serial_time_out;
++volatile int serial_timer_running;
++
++struct COMPORT comport;
++
+ 
+ 
+ //timer interrupt handler for sensor data
+--- a/error_handlers.h
 b/error_handlers.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_HANDLERS_H
+ #define ERROR_HANDLERS_H
+ 
+-char temp_error_buf[256];
++extern char temp_error_buf[256];
+ 
+ void fatal_error(char *msg);
+ 
+--- a/error_handlers.c
 b/error_handlers.c
+@@ -3,6 +3,8 @@
+ #include "error_handlers.h"
+ 
+ 
++char temp_error_buf[256];
++
+ void fatal_error(char *msg)
+ {
+if (datafile != NULL)
diff -Nru scantool-2.1/debian/patches/series scantool-2.1/debian/patches/series
--- scantool-2.1/debian/patches/series  1969-12-31 19:00:00.0 -0500
+++ scantool-2.1/debian/patches/series  2021-01-09 21:33:51.0 -0500
@@ -0,0 +1 @@
+gcc-10.patch

Bug#957786: sdlbasic: ftbfs with GCC-10

[Logan Rosen]

Package: sdlbasic
Version: 0.0.20070714-6
Followup-For: Bug #957786
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru sdlbasic-0.0.20070714/debian/patches/gcc-10.patch 
sdlbasic-0.0.20070714/debian/patches/gcc-10.patch
--- sdlbasic-0.0.20070714/debian/patches/gcc-10.patch   1969-12-31 
19:00:00.0 -0500
+++ sdlbasic-0.0.20070714/debian/patches/gcc-10.patch   2021-01-09 
21:27:45.0 -0500
@@ -0,0 +1,41 @@
+--- a/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.h
 b/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.h
+@@ -315,14 +315,14 @@
+ void crossfadehandler(int s);
+ int hit_pixelperfect(SDL_Surface *imga,int xa1,int ya1,int xa2,int 
ya2,SDL_Surface *imgb,int xb1,int yb1,int xb2,int yb2);
+ 
+-Uint32(*getpixel)(SDL_Surface *surface, int x, int y);
++extern Uint32(*getpixel)(SDL_Surface *surface, int x, int y);
+ Uint32 getpixel8(SDL_Surface *surface, int x, int y);
+ Uint32 getpixel16(SDL_Surface *surface, int x, int y);
+ Uint32 getpixel24BE(SDL_Surface *surface, int x, int y);
+ Uint32 getpixel24(SDL_Surface *surface, int x, int y);
+ Uint32 getpixel32(SDL_Surface *surface, int x, int y);
+ 
+-void (*putpixel)(SDL_Surface *surface, int x, int y, Uint32 col );
++extern void (*putpixel)(SDL_Surface *surface, int x, int y, Uint32 col );
+ void putpixel8(SDL_Surface *surface, int x, int y, Uint32 col );
+ void putpixel16(SDL_Surface *surface, int x, int y, Uint32 col );
+ void putpixel24BE(SDL_Surface *surface, int x, int y, Uint32 col );
+@@ -337,7 +337,7 @@
+ void draw_ellipse(SDL_Surface *surface,int vx,int vy,int Xradius,int 
Yradius,Uint32 color);
+ void draw_fillellipse(SDL_Surface *surface,int vx,int vy,int Xradius,int 
Yradius,Uint32 color);
+ 
+-Uint32 (*rrgb)(int col);
++extern Uint32 (*rrgb)(int col);
+ Uint32 rrgb8(int col);
+ Uint32 rrgb16(int col);
+ Uint32 rrgb24(int col);
+--- a/src/sdlBasic/src/sdlBrt/SDLengine/screen.c
 b/src/sdlBasic/src/sdlBrt/SDLengine/screen.c
+@@ -28,6 +28,10 @@
+ 
+ #include "SDLengine.h"
+ 
++Uint32(*getpixel)(SDL_Surface *surface, int x, int y);
++void (*putpixel)(SDL_Surface *surface, int x, int y, Uint32 col );
++Uint32 (*rrgb)(int col);
++
+ 
//_
+ 
+ //SCREEN
diff -Nru sdlbasic-0.0.20070714/debian/patches/series 
sdlbasic-0.0.20070714/debian/patches/series
--- sdlbasic-0.0.20070714/debian/patches/series 2017-11-29 18:15:20.0 
-0500
+++ sdlbasic-0.0.20070714/debian/patches/series 2021-01-09 21:25:21.0 
-0500
@@ -9,3 +9,4 @@
 quickhelp.patch
 link_gmodule_libs.patch
 useless_links.patch
+gcc-10.patch

Bug#957801: siproxd: ftbfs with GCC-10

[Logan Rosen]

Package: siproxd
Version: 1:0.8.1-4.1
Followup-For: Bug #957801
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru siproxd-0.8.1/debian/control siproxd-0.8.1/debian/control
--- siproxd-0.8.1/debian/control2018-04-03 08:43:31.0 -0400
+++ siproxd-0.8.1/debian/control2021-01-09 19:35:35.0 -0500
@@ -1,8 +1,7 @@
 Source: siproxd
 Section: net
 Priority: optional
-Maintainer: Ubuntu Developers 
-XSBC-Original-Maintainer: Debian VoIP Team 
 
+Maintainer: Debian VoIP Team  
 Uploaders: Mark Purcell , Kilian Krause , 
Mikael Magnusson , Faidon Liambotis 

 Build-Depends: debhelper (>= 9), libosip2-dev (>= 3.1.0), automake, 
dh-autoreconf, autoconf, docbook-utils, libltdl3-dev
 Standards-Version: 3.8.4
diff -Nru siproxd-0.8.1/debian/patches/gcc-10.patch 
siproxd-0.8.1/debian/patches/gcc-10.patch
--- siproxd-0.8.1/debian/patches/gcc-10.patch   1969-12-31 19:00:00.0 
-0500
+++ siproxd-0.8.1/debian/patches/gcc-10.patch   2021-01-09 19:35:34.0 
-0500
@@ -0,0 +1,11 @@
+--- a/src/accessctl.c
 b/src/accessctl.c
+@@ -34,7 +34,7 @@
+ static char const ident[]="$Id: accessctl.c 424 2009-03-28 09:37:47Z hb9xar 
$";
+ 
+ /* configuration storage */
+-struct siproxd_config configuration;
++extern struct siproxd_config configuration;
+ 
+ 
+ /*
diff -Nru siproxd-0.8.1/debian/patches/series 
siproxd-0.8.1/debian/patches/series
--- siproxd-0.8.1/debian/patches/series 2013-05-26 01:05:43.0 -0400
+++ siproxd-0.8.1/debian/patches/series 2021-01-09 19:35:21.0 -0500
@@ -2,3 +2,4 @@
 non-empty-dependency_libs-in-la-file.diff
 siproxd-libtool-2.4.patch
 debian-user-1.diff
+gcc-10.patch

Bug#979681: soapaligner: FTBFS with GCC 10

[Logan Rosen]

Source: soapaligner
Version: 2.20-4
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com

Hi,

soapaligner currently FTBFS with GCC 10 (which is now the default in
unstable). [1]

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan

[1] 
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/soapaligner.html
diff -Nru soapaligner-2.20/debian/patches/gcc-10.patch 
soapaligner-2.20/debian/patches/gcc-10.patch
--- soapaligner-2.20/debian/patches/gcc-10.patch1969-12-31 
19:00:00.0 -0500
+++ soapaligner-2.20/debian/patches/gcc-10.patch2021-01-09 
18:46:50.0 -0500
@@ -0,0 +1,36 @@
+--- a/extratools.h
 b/extratools.h
+@@ -59,12 +59,12 @@
+   HITITEM *itemList;
+ }HITTABLE;
+ 
+-BWT * occBwt;
+-HASHTABLE * occHashtable;
+-unsigned int * occCollector;
+-unsigned int occCollected;
++extern BWT * occBwt;
++extern HASHTABLE * occHashtable;
++extern unsigned int * occCollector;
++extern unsigned int occCollected;
+ 
+-FILE * textPositionFile;
++extern FILE * textPositionFile;
+ void registerTPFile(FILE * filePtr,unsigned int searchMode);
+ 
+ void registerQIndex(unsigned int queryIndex);
+--- a/extratools.c
 b/extratools.c
+@@ -5,6 +5,13 @@
+ // Hash Table
+ // All things like those
+ 
++BWT * occBwt;
++HASHTABLE * occHashtable;
++unsigned int * occCollector;
++unsigned int occCollected;
++
++FILE * textPositionFile;
++
+ void LoadLookupTable(LOOKUPTABLE * lookupTable, const char * fileName, const 
int tableSize)  {
+ (*lookupTable).tableSize = tableSize;
+   unsigned long long NR_TOP = 1 << (tableSize * 2);
diff -Nru soapaligner-2.20/debian/patches/series 
soapaligner-2.20/debian/patches/series
--- soapaligner-2.20/debian/patches/series  2020-04-17 05:45:00.0 
-0400
+++ soapaligner-2.20/debian/patches/series  2021-01-09 18:43:23.0 
-0500
@@ -2,3 +2,4 @@
 linkerror.patch
 UsageDoublette.patch
 spelling.patch
+gcc-10.patch

Bug#957839: sptk: ftbfs with GCC-10

[Logan Rosen]

Package: sptk
Version: 3.9-2
Followup-For: Bug #957839
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru sptk-3.9/debian/patches/gcc-10.patch 
sptk-3.9/debian/patches/gcc-10.patch
--- sptk-3.9/debian/patches/gcc-10.patch1969-12-31 19:00:00.0 
-0500
+++ sptk-3.9/debian/patches/gcc-10.patch2021-01-09 17:36:40.0 
-0500
@@ -0,0 +1,22 @@
+--- a/bin/psgr/psgr.h
 b/bin/psgr/psgr.h
+@@ -48,7 +48,7 @@
+int bottom;
+int left;
+int right;
+-} bbm;
++};
+ 
+ struct page_media {
+char *size;
+--- a/bin/psgr/psgr.c
 b/bin/psgr/psgr.c
+@@ -106,6 +106,8 @@
+"Landscape",
+ };
+ 
++struct bbmargin bbm;
++
+ 
+ /* Default Values */
+ #define MEDIA   "FALSE"
diff -Nru sptk-3.9/debian/patches/series sptk-3.9/debian/patches/series
--- sptk-3.9/debian/patches/series  2018-05-08 09:13:22.0 -0400
+++ sptk-3.9/debian/patches/series  2021-01-09 17:36:16.0 -0500
@@ -2,3 +2,4 @@
 1005_support_stdin_and_stout_on_getfp.patch
 1008_add_peak_cross_correlation_output_to_pitch.patch
 1009_add_nacorr_and_str_commands.patch
+gcc-10.patch

Bug#966877: termtris: FTBFS: ld: src/game.o:/<>/src/game.h:21: multiple definition of `quit'; src/ansi.o:/<>/src/game.h:21: first defined here

[Logan Rosen]

Package: termtris
Version: 1.3-1
Followup-For: Bug #966877
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru termtris-1.3/debian/patches/gcc-10.patch 
termtris-1.3/debian/patches/gcc-10.patch
--- termtris-1.3/debian/patches/gcc-10.patch1969-12-31 19:00:00.0 
-0500
+++ termtris-1.3/debian/patches/gcc-10.patch2021-01-08 17:44:33.0 
-0500
@@ -0,0 +1,46 @@
+--- a/src/game.h
 b/src/game.h
+@@ -18,12 +18,12 @@
+ #ifndef GAME_H_
+ #define GAME_H_
+ 
+-int quit;
+-long tick_interval;
+-int use_bell;
+-int monochrome;
++extern int quit;
++extern long tick_interval;
++extern int use_bell;
++extern int monochrome;
+ 
+-int term_width, term_height;
++extern int term_width, term_height;
+ 
+ int init_game(void);
+ void cleanup_game(void);
+--- a/src/game.c
 b/src/game.c
+@@ -26,6 +26,9 @@
+ #include "ansi.h"
+ #include "scoredb.h"
+ 
++int quit;
++long tick_interval;
++
+ enum {
+   G_DIAMOND   = 0x04,
+   G_CHECKER   = 0xb1,
+--- a/src/main.c
 b/src/main.c
+@@ -35,6 +35,11 @@
+ #define USE_JOYSTICK
+ #endif
+ 
++int use_bell;
++int monochrome;
++
++int term_width, term_height;
++
+ int init(void);
+ void cleanup(void);
+ int parse_args(int argc, char **argv);
diff -Nru termtris-1.3/debian/patches/series termtris-1.3/debian/patches/series
--- termtris-1.3/debian/patches/series  2019-06-06 03:01:11.0 -0400
+++ termtris-1.3/debian/patches/series  2021-01-08 17:44:04.0 -0500
@@ -1 +1,2 @@
 0001_install_to_usr_game.patch
+gcc-10.patch

Bug#957902: uronode: ftbfs with GCC-10

[Logan Rosen]

Package: uronode
Version: 2.10-1
Followup-For: Bug #957902
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru uronode-2.10/debian/patches/gcc-10.patch 
uronode-2.10/debian/patches/gcc-10.patch
--- uronode-2.10/debian/patches/gcc-10.patch1969-12-31 19:00:00.0 
-0500
+++ uronode-2.10/debian/patches/gcc-10.patch2021-01-08 17:16:03.0 
-0500
@@ -0,0 +1,13 @@
+--- a/util.c
 b/util.c
+@@ -17,8 +17,8 @@
+ #include "procinfo.h"
+ 
+ static char buf[256];
+-char *HostName;
+-char *Prompt;
++extern char *HostName;
++extern char *Prompt;
+ 
+ void node_msg(const char *fmt, ...)
+ {
diff -Nru uronode-2.10/debian/patches/series uronode-2.10/debian/patches/series
--- uronode-2.10/debian/patches/series  2019-08-17 17:43:25.0 -0400
+++ uronode-2.10/debian/patches/series  2021-01-08 17:15:15.0 -0500
@@ -4,3 +4,4 @@
 install-dir-creation
 makefile-install-locations
 
+gcc-10.patch

Bug#966861: vilistextum: FTBFS: ld: html.o:./src/text.h:16: multiple definition of `ch'; charset.o:./src/text.h:16: first defined here

[Logan Rosen]

Package: vilistextum
Version: 2.6.9-1.2
Followup-For: Bug #966861
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -u vilistextum-2.6.9/debian/patches/series 
vilistextum-2.6.9/debian/patches/series
--- vilistextum-2.6.9/debian/patches/series
+++ vilistextum-2.6.9/debian/patches/series
@@ -1 +1,2 @@
 01-add-format-arguments.patch
+gcc-10.patch
only in patch2:
unchanged:
--- vilistextum-2.6.9.orig/debian/patches/gcc-10.patch
+++ vilistextum-2.6.9/debian/patches/gcc-10.patch
@@ -0,0 +1,120 @@
+--- a/src/main.h
 b/src/main.h
+@@ -3,22 +3,22 @@
+ 
+ #include "multibyte.h"
+ 
+-int palm;
+-int   convert_tags;
+-int errorlevel;
+-int convert_characters;
+-int shrink_lines;
+-int remove_empty_alt;
+-int option_links;
+-int option_links_inline;
+-int option_title;
+-int sevenbit;
+-int transliteration;
++extern int palm;
++extern intconvert_tags;
++extern int errorlevel;
++extern int convert_characters;
++extern int shrink_lines;
++extern int remove_empty_alt;
++extern int option_links;
++extern int option_links_inline;
++extern int option_title;
++extern int sevenbit;
++extern int transliteration;
+ 
+-int option_no_image;
+-int option_no_alt;
+-int option_output_utf8;
++extern int option_no_image;
++extern int option_no_alt;
++extern int option_output_utf8;
+ 
+-CHAR *default_image;
++extern CHAR *default_image;
+ 
+ #endif
+--- a/src/text.h
 b/src/text.h
+@@ -9,23 +9,23 @@
+ 
+ #include "multibyte.h"
+ 
+-int LEFT;  
+-int CENTER;
+-int RIGHT;
+-
+-CHAR ch;
+-
+-int paragraph;
+-int div_test;
+-int nooutput;
++extern int LEFT;  
++extern int CENTER;
++extern int RIGHT;
++
++extern CHAR ch;
++
++extern int paragraph;
++extern int div_test;
++extern int nooutput;
+ 
+-int breite;
+-int hr_breite;
++extern int breite;
++extern int hr_breite;
+ 
+ void status();
+ 
+-int tab;
+-int spaces;  
++extern int tab;
++extern int spaces;  
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- a/src/html.h
 b/src/html.h
+@@ -4,13 +4,13 @@
+ #include "text.h"
+ #include "multibyte.h"
+ 
+-int pre;
++extern int pre;
+ 
+ int get_attr();
+ int get_new_attr(CHAR *name, CHAR *content);
+ 
+-CHAR attr_name[DEF_STR_LEN];
+-CHAR attr_ctnt[DEF_STR_LEN];
++extern CHAR attr_name[DEF_STR_LEN];
++extern CHAR attr_ctnt[DEF_STR_LEN];
+ 
+ void html();
+ void check_for_center();
+--- a/src/text.c
 b/src/text.c
+@@ -47,6 +47,8 @@
+   anz_leere_zeilen=0, /* how many line were blank */
+   noleadingblanks=0;  /* remove blanks lines at the start of the output */
+ 
++CHAR ch;
++
+ /*  */
+ 
+ void center_zeile()
+--- a/src/main.c
 b/src/main.c
+@@ -134,6 +134,8 @@
+ CHAR *default_image=STRING("Image"); /* Default string for IMG without 
ALT-tag */
+ CHAR user_image[DEF_STR_LEN]; /* string supplied by user */
+ 
++int transliteration;
++
+ char help_text[] = 
+ "Usage: vilistextum [OPTIONS] [inputfile|-] [outputfile|-]\n"
+ "\n"

Bug#957923: webalizer: ftbfs with GCC-10

[Logan Rosen]

Package: webalizer
Version: 2.23.08-3.1
Followup-For: Bug #957923
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru webalizer-2.23.08/debian/patches/gcc-10.patch 
webalizer-2.23.08/debian/patches/gcc-10.patch
--- webalizer-2.23.08/debian/patches/gcc-10.patch   1969-12-31 
19:00:00.0 -0500
+++ webalizer-2.23.08/debian/patches/gcc-10.patch   2021-01-07 
22:26:24.0 -0500
@@ -0,0 +1,18 @@
+--- a/dns_resolv.c
 b/dns_resolv.c
+@@ -78,11 +78,11 @@
+ 
+ struct   dns_child child[MAXCHILD];/* DNS child pipe data  */
+ 
+-DNODEPTR host_table[MAXHASH];  /* hostname/ip hash table   */
++extern DNODEPTR host_table[MAXHASH];   /* hostname/ip hash table   */
+ 
+-char buffer[BUFSIZE];  /* log file record buffer   */
+-char tmp_buf[BUFSIZE]; /* used to temp save above  */
+-struct   utsname system_info;  /* system info structure*/
++extern char buffer[BUFSIZE];   /* log file record buffer   */
++extern char tmp_buf[BUFSIZE];  /* used to temp save above  */
++extern struct   utsname system_info;   /* system info structure*/
+ 
+ int  raiseSigChild = 1;
+ 
diff -Nru webalizer-2.23.08/debian/patches/series 
webalizer-2.23.08/debian/patches/series
--- webalizer-2.23.08/debian/patches/series 2018-10-15 11:03:02.0 
-0400
+++ webalizer-2.23.08/debian/patches/series 2021-01-07 22:24:40.0 
-0500
@@ -15,3 +15,4 @@
 24_gettext_generated.diff
 25_add_convertlang2po.diff
 26_gettext_po_files.diff
+gcc-10.patch

Bug#957954: wmwave: ftbfs with GCC-10

[Logan Rosen]

Package: wmwave
Version: 0.4-11
Followup-For: Bug #957954
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru wmwave-0.4/debian/patches/gcc-10.patch 
wmwave-0.4/debian/patches/gcc-10.patch
--- wmwave-0.4/debian/patches/gcc-10.patch  1969-12-31 19:00:00.0 
-0500
+++ wmwave-0.4/debian/patches/gcc-10.patch  2021-01-07 22:03:15.0 
-0500
@@ -0,0 +1,22 @@
+--- a/wmgeneral.h
 b/wmgeneral.h
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
++extern Display*display;
+ 
+   /***/
+  /* Function Prototypes */
+--- a/wmwave.c
 b/wmwave.c
+@@ -79,6 +79,8 @@
+ 
+ int mode = 0;// default: no card detected
+ 
++Display *display;
++
+ void usage(void);
+ void printversion(void);
+ void BlitString(char *name, int x, int y);
diff -Nru wmwave-0.4/debian/patches/series wmwave-0.4/debian/patches/series
--- wmwave-0.4/debian/patches/series2019-10-25 17:28:57.0 -0400
+++ wmwave-0.4/debian/patches/series2021-01-07 22:02:43.0 -0500
@@ -1,2 +1,3 @@
 Debian-delta.patch
 Move-libraries-to-the-end.patch
+gcc-10.patch

Bug#957991: xneur: ftbfs with GCC-10

[Logan Rosen]

Package: xneur
Version: 0.20.0-2
Followup-For: Bug #957991
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru xneur-0.20.0/debian/patches/gcc-10.patch 
xneur-0.20.0/debian/patches/gcc-10.patch
--- xneur-0.20.0/debian/patches/gcc-10.patch1969-12-31 19:00:00.0 
-0500
+++ xneur-0.20.0/debian/patches/gcc-10.patch2021-01-07 21:50:23.0 
-0500
@@ -0,0 +1,40 @@
+--- a/lib/main/program.c
 b/lib/main/program.c
+@@ -315,7 +315,7 @@
+ 
+   p->buffer->save_and_clear(p->buffer, p->last_window);
+   p->correction_buffer->clear(p->correction_buffer);
+-  p->correction_action = ACTION_NONE;
++  p->correction_action = CORRECTION_NONE;
+ 
+   if (status == FOCUS_NONE)
+   return;
+@@ -426,7 +426,7 @@
+   p->correction_buffer = 
buffer_init(xconfig->handle, main_window->keymap);
+   p->correction_buffer->handle = xconfig->handle;
+   p->correction_buffer->keymap = 
main_window->keymap;
+-  p->correction_action = ACTION_NONE;
++  p->correction_action = CORRECTION_NONE;
+ 
+   //log_message (DEBUG, _("Now layouts count 
%d"), xconfig->handle->total_languages);
+   log_message(LOG, _("Keyboard layouts present in 
system:"));
+@@ -609,7 +609,7 @@
+   //{
+   
p->buffer->save_and_clear(p->buffer, p->focus->owner_window);
+   
p->correction_buffer->clear(p->correction_buffer);
+-  p->correction_action = 
ACTION_NONE;
++  p->correction_action = 
CORRECTION_NONE;
+   if 
((Window)p->focus->get_focused_window(p->focus) != 
(Window)p->focus->owner_window)
+   {
+   p->update(p);
+--- a/lib/lib/xneur.h
 b/lib/lib/xneur.h
+@@ -32,7 +32,7 @@
+ # include 
+ #endif
+ 
+-struct _window *main_window;
++extern struct _window *main_window;
+ 
+ struct _xneur_language
+ {
diff -Nru xneur-0.20.0/debian/patches/series xneur-0.20.0/debian/patches/series
--- xneur-0.20.0/debian/patches/series  2016-12-03 19:51:50.0 -0500
+++ xneur-0.20.0/debian/patches/series  2021-01-07 21:49:26.0 -0500
@@ -1 +1,2 @@
 01-fix-arg-parsing.patch
+gcc-10.patch

Bug#957326: gwc: ftbfs with GCC-10

[Logan Rosen]

Package: gwc
Version: 0.22.04-1
Followup-For: Bug #957326
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix compilation with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru gwc-0.22.04/debian/patches/gcc-10.patch 
gwc-0.22.04/debian/patches/gcc-10.patch
--- gwc-0.22.04/debian/patches/gcc-10.patch 1969-12-31 19:00:00.0 
-0500
+++ gwc-0.22.04/debian/patches/gcc-10.patch 2021-01-07 20:00:50.0 
-0500
@@ -0,0 +1,50 @@
+--- a/gwc.h
 b/gwc.h
+@@ -185,12 +185,12 @@
+ int ready ;
+ } DENOISE_DATA ;
+ 
+-gchar *tmpdir;
+-gchar *CLIPBOARD_FILE ;
++extern gchar *tmpdir;
++extern gchar *CLIPBOARD_FILE ;
+ 
+ void print_denoise(char *header, struct denoise_prefs *pDnprefs) ;
+ 
+-GtkWidget *main_window;
++extern GtkWidget *main_window;
+ 
+ GtkWidget *add_number_entry_with_label(char *entry_text, char *label_text, 
GtkWidget *table, int row) ;
+ GtkWidget *add_number_entry_with_label_int(int value, char *label_text, 
GtkWidget *table, int row) ;
+--- a/gwc.c
 b/gwc.c
+@@ -84,6 +84,7 @@
+ GtkWidget *hscrollbar;
+ GtkWidget *detect_only_widget;
+ GtkWidget *leave_click_marks_widget;
++GtkWidget *main_window;
+ 
+ GtkWidget *l_file_time;
+ GtkWidget *l_file_samples;
+@@ -147,6 +148,8 @@
+ gchar wave_filename[PATH_MAX+1];
+ gchar last_filename[PATH_MAX+1];
+ gchar *file_extension;
++gchar *tmpdir;
++gchar *CLIPBOARD_FILE;
+ 
+ long markers[MAX_MARKERS];
+ long n_markers = 0;
+--- a/markers.c
 b/markers.c
+@@ -39,8 +39,8 @@
+ 
+ /* The file selection widget and the string to store the chosen filename */
+ 
+-GtkWidget *file_selector;
+-gchar *selected_filename;
++extern GtkWidget *file_selector;
++extern gchar *selected_filename;
+ gchar save_cdrdao_toc_filename[PATH_MAX+1];
+ extern long num_song_markers, song_markers[] ;
+ extern gchar wave_filename[] ;
diff -Nru gwc-0.22.04/debian/patches/series gwc-0.22.04/debian/patches/series
--- gwc-0.22.04/debian/patches/series   2019-09-15 12:47:29.0 -0400
+++ gwc-0.22.04/debian/patches/series   2021-01-07 19:57:21.0 -0500
@@ -1 +1,2 @@
 02-no_extra_docs.patch
+gcc-10.patch

Bug#957161: echoping: ftbfs with GCC-10

[Logan Rosen]

Package: echoping
Version: 6.0.2-10
Followup-For: Bug #957161
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc-10.patch: Fix FTBFS with GCC 10.

Thanks for considering the patch.

Logan
diff -Nru echoping-6.0.2/debian/patches/gcc-10.patch 
echoping-6.0.2/debian/patches/gcc-10.patch
--- echoping-6.0.2/debian/patches/gcc-10.patch  1969-12-31 19:00:00.0 
-0500
+++ echoping-6.0.2/debian/patches/gcc-10.patch  2021-01-07 19:08:48.0 
-0500
@@ -0,0 +1,112 @@
+--- a/echoping.h
 b/echoping.h
+@@ -121,7 +121,7 @@
+   struct timeval timevalue;
+ };
+ 
+-boolean timeout_flag;
++extern boolean timeout_flag;
+ struct echoping_struct
+ {
+   boolean udp;/* Use the UDP protocol (TCP is the 
default) */
+@@ -136,21 +136,21 @@
+ /* Initializes the plugin with its arguments. Returns the port name or number 
or NULL if the plugin wants to use the raw interface. */
+ typedef char *(*init_f) (const int argc, const char **argv,
+const echoping_options global_options);
+-init_f plugin_init;
++extern init_f plugin_init;
+ typedef void (*start_f) (struct addrinfo *);
+-start_f plugin_start;
++extern start_f plugin_start;
+ typedef void (*start_raw_f) ();
+-start_raw_f plugin_raw_start;
++extern start_raw_f plugin_raw_start;
+ typedef int (*execute_f) ();
+-execute_f plugin_execute;
++extern execute_f plugin_execute;
+ typedef void (*terminate_f) ();
+-terminate_f plugin_terminate;
++extern terminate_f plugin_terminate;
+ #endif
+ 
+ #endif
+ 
+-struct timeval null_timeval;
+-struct timeval max_timeval;
++extern struct timeval null_timeval;
++extern struct timeval max_timeval;
+ 
+ #define   ECHO_TCP_PORT   "echo"
+ #define   DISCARD_TCP_PORT"discard"
+@@ -173,9 +173,9 @@
+ 
+ #define CHARGENERATED " 
!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg";
+ 
+-char *server;
++extern char *server;
+ #ifdef LIBIDN
+-char *locale_server, *ace_server, *utf8_server;
++extern char *locale_server, *ace_server, *utf8_server;
+ #endif
+ 
+ /* My functions */
+@@ -233,6 +233,8 @@
+ 
+ extern boolean timeout_flag;
+ 
++extern char big_recvline[MAXTOREAD];
++
+ #include "compilation.h"
+ 
+ #ifndef HEADER_INCLUDED
+--- a/echoping.c
 b/echoping.c
+@@ -38,6 +38,26 @@
+ struct timeval  good_results[MAX_ITERATIONS];
+ extern int  tvcmp();
+ 
++boolean timeout_flag;
++
++#ifndef IN_PLUGIN
++init_f  plugin_init;
++start_f plugin_start;
++start_raw_f plugin_raw_start;
++execute_f   plugin_execute;
++terminate_f plugin_terminate;
++#endif
++
++struct timeval  null_timeval;
++struct timeval  max_timeval;
++
++char*server;
++#ifdef LIBIDN
++char*locale_server, *ace_server, *utf8_server;
++#endif
++
++charbig_recvline[MAXTOREAD];
++
+ int
+ main(argc, argv)
+   int argc;
+--- a/http.c
 b/http.c
+@@ -6,8 +6,6 @@
+ #include "HTParse.h"
+ 
+ 
+-charbig_recvline[MAXTOREAD];
+-
+ char   *
+ make_http_sendline(char *url, char *host, int port, int nocache)
+ {
+--- a/smtp.c
 b/smtp.c
+@@ -8,8 +8,6 @@
+ 
+ #ifdef SMTP
+ 
+-charbig_recvline[MAXTOREAD];
+-
+ int
+ smtp_read_response_from_server(FILE * fs)
+ {
diff -Nru echoping-6.0.2/debian/patches/series 
echoping-6.0.2/debian/patches/series
--- echoping-6.0.2/debian/patches/series2018-10-14 16:24:57.0 
-0400
+++ echoping-6.0.2/debian/patches/series2021-01-07 19:08:48.0 
-0500
@@ -1,3 +1,4 @@
+gcc-10.patch
 006_reproducible-build.diff
 005_gnutls34.diff
 004-only-append-port-number-if-port-is-not-80.diff

Bug#979270: python-rfc6555: Requires network access during build

[Logan Rosen]

Source: python-rfc6555
Version: 0.0~git20190913.1a181b4-2
Severity: serious
Justification: Policy 4.9
X-Debbugs-Cc: lo...@ubuntu.com

Hi,

python-rfc6555 currently requires network access during build for some of its
tests, which causes the build to fail in Ubuntu [1] (and reproducible
builds [2]) and is a violation of Debian policy.

Please look into skipping/adjusting these tests.

Thanks,
Logan

Bug#966988: uftrace: FTBFS: test failed

[Logan Rosen]

Package: uftrace
Version: 0.9.4-0.2
Followup-For: Bug #966988
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/0001-test-Robustify-mcount_wrap_dlopen-test.patch: Import patch from
upstream Git to fix a failing test.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy-updates
  APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru 
uftrace-0.9.4/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch 
uftrace-0.9.4/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch
--- 
uftrace-0.9.4/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch  
1969-12-31 19:00:00.0 -0500
+++ 
uftrace-0.9.4/debian/patches/0001-test-Robustify-mcount_wrap_dlopen-test.patch  
2021-01-02 18:47:36.0 -0500
@@ -0,0 +1,28 @@
+From 6483d9ac46bd6ed65bb4ad7ba5788fbe4533d414 Mon Sep 17 00:00:00 2001
+From: Namhyung Kim 
+Date: Fri, 20 Nov 2020 22:36:03 +0900
+Subject: [PATCH] test: Robustify mcount_wrap_dlopen test
+
+I found that it fails in some environment, which seems to call dlopen
+internally somewhere.  As its purpose is to check whether the hookup
+code is called, we can reset the real_dlopen pointer to NULL and check
+the value after the call.
+
+Signed-off-by: Namhyung Kim 
+---
+ libmcount/wrap.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/libmcount/wrap.c
 b/libmcount/wrap.c
+@@ -535,7 +535,9 @@
+ {
+   void *handle;
+ 
+-  TEST_EQ(real_dlopen, NULL);
++  /* In some environment, dlopen() is called already */
++  if (unlikely(real_dlopen != NULL))
++  real_dlopen = NULL;
+ 
+   handle= dlopen(NULL, RTLD_LAZY);
+ 
diff -Nru uftrace-0.9.4/debian/patches/series 
uftrace-0.9.4/debian/patches/series
--- uftrace-0.9.4/debian/patches/series 1969-12-31 19:00:00.0 -0500
+++ uftrace-0.9.4/debian/patches/series 2021-01-02 18:47:36.0 -0500
@@ -0,0 +1 @@
+0001-test-Robustify-mcount_wrap_dlopen-test.patch

Bug#972958: pipemeter FTBFS: error: format not a string literal and no format arguments

[Logan Rosen]

Package: pipemeter
Version: 1.1.4-1
Followup-For: Bug #972958
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/format-security-error.patch: Fix format-security error by using fputs
instead of fprintf.
  * d/p/fix-make-install.patch: Fix issues with make install by using DESTDIR
and adjusting install arguments.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy-updates
  APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru pipemeter-1.1.4/debian/patches/fix-make-install.patch 
pipemeter-1.1.4/debian/patches/fix-make-install.patch
--- pipemeter-1.1.4/debian/patches/fix-make-install.patch   1969-12-31 
19:00:00.0 -0500
+++ pipemeter-1.1.4/debian/patches/fix-make-install.patch   2020-12-31 
00:13:00.0 -0500
@@ -0,0 +1,13 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -24,8 +24,8 @@
+   
+ 
+ install: pipemeter pipemeter.1
+-  install -p pipemeter $(PREFIX)/bin
+-  install -p pipemeter.1 $(PREFIX)/man/man1
++  install -Dp -t $(DESTDIR)$(PREFIX)/bin pipemeter
++  install -Dp -t $(DESTDIR)$(PREFIX)/man/man1 pipemeter.1
+ 
+ dist: pipemeter
+   sh pkgpipemeter.sh
diff -Nru pipemeter-1.1.4/debian/patches/format-security-error.patch 
pipemeter-1.1.4/debian/patches/format-security-error.patch
--- pipemeter-1.1.4/debian/patches/format-security-error.patch  1969-12-31 
19:00:00.0 -0500
+++ pipemeter-1.1.4/debian/patches/format-security-error.patch  2020-12-31 
00:12:44.0 -0500
@@ -0,0 +1,29 @@
+--- a/pipemeter.c
 b/pipemeter.c
+@@ -397,7 +397,7 @@
+ fprintf(stderr,"\n");
+ exit(1);
+   } else {
+-fprintf(stderr,trailer);
++fputs(trailer,stderr);
+   }
+ }
+  
+@@ -487,7 +487,7 @@
+   }
+ 
+   strncpy(progressbar+1,progressfill,progress);
+-  fprintf(stderr, progressbar);
++  fputs(progressbar,stderr);
+   fprintf(stderr," %s/s",buf2);
+   formatbytes(buf2,bytes);
+   fprintf(stderr," %s",buf2);
+@@ -497,7 +497,7 @@
+ fprintf(stderr,"\n");
+ exit(0);
+   } else {
+-fprintf(stderr,trailer);
++fputs(trailer,stderr);
+   }
+ }
+ 
diff -Nru pipemeter-1.1.4/debian/patches/series 
pipemeter-1.1.4/debian/patches/series
--- pipemeter-1.1.4/debian/patches/series   1969-12-31 19:00:00.0 
-0500
+++ pipemeter-1.1.4/debian/patches/series   2020-12-31 00:13:00.0 
-0500
@@ -0,0 +1,2 @@
+format-security-error.patch
+fix-make-install.patch

Bug#978194: openms: FTBFS: glpk.h:36:16: error: using typedef-name ‘glp_prob’ after ‘struct’

[Logan Rosen]

Package: openms
Version: 2.6.0+cleaned1-1
Followup-For: Bug #978194
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-glpk-version-check.patch: Fix GLPK version check that doesn't
account for major version, fixing FTBFS against GLPK 5.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy-updates
  APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch 
openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch
--- openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch   
1969-12-31 19:00:00.0 -0500
+++ openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch   
2020-12-30 13:01:49.0 -0500
@@ -0,0 +1,11 @@
+--- a/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h
 b/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h
+@@ -51,7 +51,7 @@
+ #define GLP_PROB_DEFINED
+ // depending on the glpk version
+ // define glp_prob as forward or struct
+-#if OPENMS_GLPK_VERSION_MINOR < 48
++#if OPENMS_GLPK_VERSION_MAJOR == 4 && OPENMS_GLPK_VERSION_MINOR < 48
+ typedef struct
+ {
+   double _opaque_prob[100];
diff -Nru openms-2.6.0+cleaned1/debian/patches/series 
openms-2.6.0+cleaned1/debian/patches/series
--- openms-2.6.0+cleaned1/debian/patches/series 2020-12-15 08:29:00.0 
-0500
+++ openms-2.6.0+cleaned1/debian/patches/series 2020-12-30 13:00:56.0 
-0500
@@ -1,2 +1,3 @@
 sonameAndNameLinkSkipCmakeBuildSystem.patch
 installDirsSettingsCmakeBuildSystem.patch
+fix-glpk-version-check.patch

Bug#976915: (no subject)

[Logan Rosen]

Control: tags -1 patch

Subject: Re: service-wrapper-java: FTBFS on ppc64el:  [exec] 
wrapper.c:(.text+0x3598): undefined reference to `pow'
Followup-For: Bug #976915
Package: service-wrapper-java
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Version: 3.5.30-1

Dear Maintainer,

In Ubuntu, the attached patch (from Dimitri John Ledkov ) was 
applied to achieve the following:

  * Fix as-needed linking in ppc64el and s390x per-arch Makefiles too.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: bullseye/sid
  APT prefers groovy-updates
  APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500, 
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.128-microsoft-standard (SMP w/8 CPU threads)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch 
service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch
--- service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch  
2016-12-19 07:17:55.0 -0500
+++ service-wrapper-java-3.5.30/debian/patches/fix-as-needed-ppc.patch  
2017-06-20 06:22:53.0 -0400
@@ -3,10 +3,9 @@
 Author: Andreas Moog 
 Bug: https://sourceforge.net/p/wrapper/bugs/285/
 
-diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make 
wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make
 wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make   2015-01-04 
01:21:32.915068936 +0100
-+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make2015-01-04 
01:23:18.271591362 +0100
-@@ -33,7 +33,7 @@ init:
+--- a/src/c/Makefile-linux-ppc-32.make
 b/src/c/Makefile-linux-ppc-32.make
+@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
  
  wrapper: $(wrapper_SOURCE)
@@ -15,10 +14,9 @@
  
  libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o 
$(LIB)/libwrapper.so
-diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make 
wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make
 wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make   2015-01-04 
01:21:32.915068936 +0100
-+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make2015-01-04 
01:23:02.287512123 +0100
-@@ -33,7 +33,7 @@ init:
+--- a/src/c/Makefile-linux-ppc-64.make
 b/src/c/Makefile-linux-ppc-64.make
+@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
  
  wrapper: $(wrapper_SOURCE)
@@ -27,3 +25,25 @@
  
  libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o 
$(LIB)/libwrapper.so
+--- a/src/c/Makefile-linux-ppcle-64.make
 b/src/c/Makefile-linux-ppcle-64.make
+@@ -33,7 +33,7 @@
+   if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-  $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++  $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+   ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+--- a/src/c/Makefile-linux-s390x-64.make
 b/src/c/Makefile-linux-s390x-64.make
+@@ -34,7 +34,7 @@
+   if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-  $(COMPILE) -lm -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper
++  $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -lm -o $(BIN)/wrapper
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+   ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o 
$(LIB)/libwrapper.so

Bug#961387: FTBFS due to usage of array::into_iter()

[Logan Rosen]

Source: rust-ring
Version: 0.16.9-3
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu groovy ubuntu-patch

Hi,

rust-ring currently FTBFS due to usage of array::into_iter() instead of
array::iter(). See build log: 
https://buildd.debian.org/status/fetch.php?pkg=rust-ring=amd64=0.16.9-3=1587387625=0

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/use-array-iter.patch: Cherrypick upstream commit to use array::iter,
fixing FTBFS.

Thanks for considering the patch.

Logan
diff -Nru rust-ring-0.16.9/debian/patches/series 
rust-ring-0.16.9/debian/patches/series
--- rust-ring-0.16.9/debian/patches/series  2020-04-20 08:16:05.0 
-0400
+++ rust-ring-0.16.9/debian/patches/series  2020-05-23 17:01:04.0 
-0400
@@ -1,2 +1,3 @@
 relax-deps.patch
 built-using.patch
+use-array-iter.patch
diff -Nru rust-ring-0.16.9/debian/patches/use-array-iter.patch 
rust-ring-0.16.9/debian/patches/use-array-iter.patch
--- rust-ring-0.16.9/debian/patches/use-array-iter.patch1969-12-31 
19:00:00.0 -0500
+++ rust-ring-0.16.9/debian/patches/use-array-iter.patch2020-05-23 
17:00:40.0 -0400
@@ -0,0 +1,23 @@
+From c250e3125e2621cbe947e811e3de0fc5fa1904aa Mon Sep 17 00:00:00 2001
+From: lzutao 
+Date: Wed, 30 Oct 2019 14:51:17 +0700
+Subject: [PATCH] Use array::iter
+
+See clippy::into_iter lint and https://github.com/rust-lang/rust/pull/65819
+---
+ build.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.rs b/build.rs
+index c6cb3a700..f7eded9de 100644
+--- a/build.rs
 b/build.rs
+@@ -418,7 +418,7 @@ fn build_c_code(target: , pregenerated: PathBuf, 
out_dir: ) {
+ 
+ // XXX: Ideally, ring-test would only be built for `cargo test`, but Cargo
+ // can't do that yet.
+-libs.into_iter()
++libs.iter()
+ .for_each(|&(lib_name, srcs, additional_srcs)| {
+ build_library(
+ ,

Bug#960758: libcamera FTBFS: missing boost build dependencies

[Logan Rosen]

Package: libcamera
Version: 0~git20200513+924778e-1
Followup-For: Bug #960758
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu groovy ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on libboost-dev to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal-updates
  APT policy: (500, 'focal-updates'), (500, 'focal-security'), (500, 'focal'), 
(100, 'focal-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-29-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru libcamera-0~git20200513+924778e/debian/control 
libcamera-0~git20200513+924778e/debian/control
--- libcamera-0~git20200513+924778e/debian/control  2020-05-15 
10:24:53.0 -0400
+++ libcamera-0~git20200513+924778e/debian/control  2020-05-23 
15:03:08.0 -0400
@@ -13,7 +13,8 @@
python3-sphinx,
python3-yaml,
libjs-jquery,
-   libjs-underscore
+   libjs-underscore,
+   libboost-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Section: libs

Bug#952353: swiftsc: FTBFS: dh: error: unable to load addon python3: Can't locate Debian/Debhelper/Sequence/python3.pm in @INC (you may need to install the Debian::Debhelper::Sequence::python3 module)

[Logan Rosen]

Package: swiftsc
Version: 0.5-1.1
Followup-For: Bug #952353
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on dh-python to fix FTBFS due to missing python3.pm.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-25-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru swiftsc-0.5/debian/control swiftsc-0.5/debian/control
--- swiftsc-0.5/debian/control  2019-10-29 09:31:26.0 -0400
+++ swiftsc-0.5/debian/control  2020-04-20 22:04:15.0 -0400
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Kouhei Maeda 
-Build-Depends: debhelper (>= 8.0.0), pep8, python3-all, python3-setuptools, 
python3-requests, python3-magic, python3-pytest, python3-mock
+Build-Depends: debhelper (>= 8.0.0), dh-python, pep8, python3-all, 
python3-setuptools, python3-requests, python3-magic, python3-pytest, 
python3-mock
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6, >= 3.2
 Homepage: https://github.com/mkouhei/swiftsc

Bug#952336: photocollage: FTBFS: dh: error: unable to load addon python3: Can't locate Debian/Debhelper/Sequence/python3.pm in @INC (you may need to install the Debian::Debhelper::Sequence::python3 mo

[Logan Rosen]

Package: photocollage
Version: 1.4.3-2.1
Followup-For: Bug #952336
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on dh-python to fix FTBFS due to missing python3.pm.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru photocollage-1.4.3/debian/control photocollage-1.4.3/debian/control
--- photocollage-1.4.3/debian/control   2018-12-21 16:49:53.0 -0500
+++ photocollage-1.4.3/debian/control   2020-04-12 22:26:53.0 -0400
@@ -4,6 +4,7 @@
 Maintainer: Adrien Vergé 
 Build-Depends:
  debhelper (>=9),
+ dh-python,
  gettext,
  python3-all,
 Standards-Version: 3.9.8

Bug#951936: egl-wayland: FTBFS: ../src/wayland-eglsurface.c:1521:10: error: ‘EGL_WAYLAND_Y_INVERTED_WL’ undeclared (first use in this function)

[Logan Rosen]

Package: egl-wayland
Version: 1:1.1.3-1
Followup-For: Bug #951936
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/missing-definitions.patch: Cherrypick upstream Git commit to add
missing definitions that used to be provided by mesa, fixing FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru egl-wayland-1.1.3/debian/patches/add-missing-definitions.patch 
egl-wayland-1.1.3/debian/patches/add-missing-definitions.patch
--- egl-wayland-1.1.3/debian/patches/add-missing-definitions.patch  
1969-12-31 19:00:00.0 -0500
+++ egl-wayland-1.1.3/debian/patches/add-missing-definitions.patch  
2020-04-06 22:52:57.0 -0400
@@ -0,0 +1,56 @@
+From 4a343a4b563e84c6258efbddf1d910f9dd6e0300 Mon Sep 17 00:00:00 2001
+From: Erik Kurzinger 
+Date: Wed, 25 Mar 2020 08:38:09 -0700
+Subject: [PATCH] add EGL_WL_bind_wayland_display definitions to
+ wayland-egl-ext.h
+
+The definitions for the EGL_WL_bind_wayland_display extension were previously
+provided by eglmesaext.h, included through eglext.h. However, recent versions
+of the eglext.h header shipped with mesa (which most distributions use) no
+longer include platform headers. This causes the build to fail due to undefined
+symbols.
+
+This change adds the required definitions to wayland-egl-ext.h ensuring they're
+always available. This also avoids having a dependency on the aforementioned
+mesa header.
+
+Signed-off-by: Erik Kurzinger 
+---
+ wayland-egl/wayland-egl-ext.h | 24 
+ 1 file changed, 24 insertions(+)
+
+diff --git a/wayland-egl/wayland-egl-ext.h b/wayland-egl/wayland-egl-ext.h
+index 6688e45..a258bf4 100644
+--- a/wayland-egl/wayland-egl-ext.h
 b/wayland-egl/wayland-egl-ext.h
+@@ -23,6 +23,30 @@
+ #ifndef WAYLAND_EGL_EXT_H
+ #define WAYLAND_EGL_EXT_H
+ 
++#ifndef EGL_WL_bind_wayland_display
++#define EGL_WL_bind_wayland_display 1
++#define PFNEGLBINDWAYLANDDISPLAYWL PFNEGLBINDWAYLANDDISPLAYWLPROC
++#define PFNEGLUNBINDWAYLANDDISPLAYWL PFNEGLUNBINDWAYLANDDISPLAYWLPROC
++#define PFNEGLQUERYWAYLANDBUFFERWL PFNEGLQUERYWAYLANDBUFFERWLPROC
++struct wl_display;
++struct wl_resource;
++#define EGL_WAYLAND_BUFFER_WL 0x31D5
++#define EGL_WAYLAND_PLANE_WL  0x31D6
++#define EGL_TEXTURE_Y_U_V_WL  0x31D7
++#define EGL_TEXTURE_Y_UV_WL   0x31D8
++#define EGL_TEXTURE_Y_XUXV_WL 0x31D9
++#define EGL_TEXTURE_EXTERNAL_WL   0x31DA
++#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB
++typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWLPROC) (EGLDisplay 
dpy, struct wl_display *display);
++typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWLPROC) 
(EGLDisplay dpy, struct wl_display *display);
++typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWLPROC) (EGLDisplay 
dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
++#ifdef EGL_EGLEXT_PROTOTYPES
++EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL (EGLDisplay dpy, struct 
wl_display *display);
++EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL (EGLDisplay dpy, 
struct wl_display *display);
++EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL (EGLDisplay dpy, struct 
wl_resource *buffer, EGLint attribute, EGLint *value);
++#endif
++#endif /* EGL_WL_bind_wayland_display */
++
+ #ifndef EGL_WL_wayland_eglstream
+ #define EGL_WL_wayland_eglstream 1
+ #define EGL_WAYLAND_EGLSTREAM_WL  0x334B
diff -Nru egl-wayland-1.1.3/debian/patches/series 
egl-wayland-1.1.3/debian/patches/series
--- egl-wayland-1.1.3/debian/patches/series 2019-07-08 07:46:16.0 
-0400
+++ egl-wayland-1.1.3/debian/patches/series 2020-04-06 22:53:09.0 
-0400
@@ -1 +1,2 @@
 fix-pkgconfig-target.diff
+add-missing-definitions.patch

Bug#903413: debbugs: FTBFS in buster/sid (dh_installdocs: Cannot find "UPGRADE")

[Logan Rosen]

Package: debbugs
Version: 2.6.0
Followup-For: Bug #903413
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/docs: Replace UPGRADE with UPGRADE.md to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru debbugs-2.6.0/debian/docs debbugs-2.6.0ubuntu1/debian/docs
--- debbugs-2.6.0/debian/docs   2018-01-04 14:01:02.0 -0500
+++ debbugs-2.6.0ubuntu1/debian/docs2020-04-06 22:36:07.0 -0400
@@ -1 +1 @@
-UPGRADE debian/README.mail
+UPGRADE.md debian/README.mail

Bug#916049: cloop FTBFS with glibc 2.28

[Logan Rosen]

Package: cloop
Version: 3.14.1.2
Followup-For: Bug #916049
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * extract_compressed_fs.c: Define _DEFAULT_SOURCE to fix FTBFS with glibc
2.28+ due to loff_t only being defined when that macro is defined.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru cloop-3.14.1.2ubuntu2/extract_compressed_fs.c 
cloop-3.14.1.2ubuntu3/extract_compressed_fs.c
--- cloop-3.14.1.2ubuntu2/extract_compressed_fs.c   2015-05-03 
07:22:21.0 -0400
+++ cloop-3.14.1.2ubuntu3/extract_compressed_fs.c   2020-04-06 
22:15:51.0 -0400
@@ -4,6 +4,7 @@
 
 #define _LARGEFILE64_SOURCE
 #define _XOPEN_SOURCE 600
+#define _DEFAULT_SOURCE
 
 #include 
 #include 

Bug#952354: brebis: FTBFS: dh: error: unable to load addon python3: Can't locate Debian/Debhelper/Sequence/python3.pm in @INC (you may need to install the Debian::Debhelper::Sequence::python3 module)

[Logan Rosen]

Package: brebis
Version: 0.10-1
Followup-For: Bug #952354
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on dh-python to fix FTBFS due to missing python3.pm.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru brebis-0.10/debian/control brebis-0.10/debian/control
--- brebis-0.10/debian/control  2015-07-21 23:31:22.0 -0400
+++ brebis-0.10/debian/control  2020-04-06 21:48:31.0 -0400
@@ -1,9 +1,9 @@
 Source: brebis
 Priority: optional
 Section: python
 Maintainer: Carl Chenet 
 Uploaders: Python Applications Packaging Team 

-Build-Depends: debhelper (>= 9), python3-all
+Build-Depends: debhelper (>= 9), python3-all, dh-python
 X-Python3-Version: >= 3.4
 Standards-Version: 3.9.6.1
 Homepage: http://www.brebisproject.org/

Bug#952348: backupchecker: FTBFS: dh: error: unable to load addon python3: Can't locate Debian/Debhelper/Sequence/python3.pm in @INC (you may need to install the Debian::Debhelper::Sequence::python3 m

[Logan Rosen]

Package: backupchecker
Version: 1.7-1
Followup-For: Bug #952348
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on dh-python to fix FTBFS due to missing python3.pm.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru backupchecker-1.7/debian/control backupchecker-1.7/debian/control
--- backupchecker-1.7/debian/control2015-02-15 17:50:59.0 -0500
+++ backupchecker-1.7/debian/control2020-04-06 21:40:38.0 -0400
@@ -3,7 +3,7 @@
 Section: python
 Maintainer: Carl Chenet 
 Uploaders: Python Applications Packaging Team 

-Build-Depends: debhelper (>= 9), python3-all
+Build-Depends: debhelper (>= 9), python3-all, dh-python
 X-Python3-Version: >= 3.4
 Standards-Version: 3.9.6.1
 Homepage: https://github.com/backupchecker/backupchecker

Bug#952313: arduino-builder: FTBFS: failed to initialize build cache at /sbuild-nonexistent/.cache/go-build: mkdir /sbuild-nonexistent: permission denied

[Logan Rosen]

Package: arduino-builder
Version: 1.3.25-1
Followup-For: Bug #952313
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Export a writable home directory to fix FTBFS initializing build cache.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-21-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru arduino-builder-1.3.25/debian/rules 
arduino-builder-1.3.25/debian/rules
--- arduino-builder-1.3.25/debian/rules 2018-03-29 12:01:11.0 -0400
+++ arduino-builder-1.3.25/debian/rules 2020-04-05 18:29:35.0 -0400
@@ -2,6 +2,7 @@
 
 # Output every command that modifies files on the build system.
 export DH_VERBOSE = 1
+export HOME = $(CURDIR)
 
 EXCLUDED_TESTS := add_build_board_property_if_missing_test.go \
   builder_test.go \

Bug#892344: literki: Please use 'pkg-config' to find FreeType 2

[Logan Rosen]

Package: literki
Version: 0.0.0+20100113.git1da40724-1.2
Followup-For: Bug #892344
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Build-depend on pkg-config.
  * d/p/06_use_pkg-config.patch: Use pkg-config instead of removed
freetype-config to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-18-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru literki-0.0.0+20100113.git1da40724/debian/control 
literki-0.0.0+20100113.git1da40724/debian/control
--- literki-0.0.0+20100113.git1da40724/debian/control   2016-01-24 
07:42:40.0 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/control   2020-03-22 
23:17:53.0 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian freesmartphone.org Team 

 Uploaders: Timo Jyrinki 
-Build-Depends: debhelper (>= 7), libfreetype6-dev, libpng-dev, libfakekey-dev, 
libxi-dev, libxcb1-dev, libxrender-dev, libxrandr-dev, libpng++-dev
+Build-Depends: debhelper (>= 7), libfreetype6-dev, libpng-dev, libfakekey-dev, 
libxi-dev, libxcb1-dev, libxrender-dev, libxrandr-dev, libpng++-dev, pkg-config
 Standards-Version: 3.8.4
 Homepage: http://git.senfdax.de/?p=literki
 Vcs-Git: http://git.debian.org/git/pkg-fso/literki.git
diff -Nru 
literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch 
literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch
--- literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch   
1969-12-31 19:00:00.0 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch   
2020-03-22 23:17:53.0 -0400
@@ -0,0 +1,13 @@
+--- a/Makefile
 b/Makefile
+@@ -4,8 +4,8 @@
+ 
+ CXXCOMPILE=g++
+ 
+-CFLAGS=-g `freetype-config --cflags`
+-LDFLAGS=-g `freetype-config --libs`
++CFLAGS=-g `pkg-config --cflags freetype2`
++LDFLAGS=-g `pkg-config --libs freetype2`
+ 
+ %.o: %.cpp
+   $(CXXCOMPILE) $(CFLAGS) -c $<
diff -Nru literki-0.0.0+20100113.git1da40724/debian/patches/series 
literki-0.0.0+20100113.git1da40724/debian/patches/series
--- literki-0.0.0+20100113.git1da40724/debian/patches/series2016-01-26 
11:23:32.0 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/patches/series2020-03-22 
23:17:36.0 -0400
@@ -3,3 +3,4 @@
 04_fix_desktop.diff
 05_fix_ftbfs_binutils-gold.patch
 libpng16.patch
+06_use_pkg-config.patch

Bug#954639: gftp: FTBFS: pty.c:65:10: fatal error: stropts.h: No such file or directory

[Logan Rosen]

Package: gftp
Version: 2.0.19-5
Followup-For: Bug #954639
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/glibc-2.30.patch: Fix FTBFS against glibc >= 2.30 with cherrypicked
patch from upstream Git.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-18-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru gftp-2.0.19/debian/patches/glibc-2.30.patch 
gftp-2.0.19/debian/patches/glibc-2.30.patch
--- gftp-2.0.19/debian/patches/glibc-2.30.patch 1969-12-31 19:00:00.0 
-0500
+++ gftp-2.0.19/debian/patches/glibc-2.30.patch 2020-03-22 20:49:10.0 
-0400
@@ -0,0 +1,24 @@
+From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001
+From: Brian Masney 
+Date: Thu, 21 Jul 2016 05:05:18 -0400
+Subject: [PATCH] fixed compiling on some versions of Linux. Patch picked up
+ from the Fedora Project at
+ https://github.com/repoforge/rpms/blob/master/specs/gftp/gftp-stropts.patch
+
+---
+ lib/pty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pty.c b/lib/pty.c
+index f7cb1f9..f9d609b 100644
+--- a/lib/pty.c
 b/lib/pty.c
+@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
+ 
+ #elif HAVE_GRANTPT
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || 
defined(__linux__))
+ #include 
+ #endif
+ 
diff -Nru gftp-2.0.19/debian/patches/series gftp-2.0.19/debian/patches/series
--- gftp-2.0.19/debian/patches/series   2016-11-29 14:24:17.0 -0500
+++ gftp-2.0.19/debian/patches/series   2020-03-22 20:49:23.0 -0400
@@ -1,3 +1,4 @@
 01-hurd_do_not_use_PATH_MAX.patch
 desktop-file-binary
 fix-configure.in.patch
+glibc-2.30.patch

Bug#952099: tootle: FTBFS: ../../src/Views/AbstractView.vala:24.5-24.23: error: Creation method of abstract class cannot be public.

[Logan Rosen]

Package: tootle
Version: 0.2.0-2
Followup-For: Bug #952099
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/vala-0.46.patch: Make constructor for AbstractView protected to fix
FTBFS against Vala >= 0.46.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru tootle-0.2.0/debian/patches/series tootle-0.2.0/debian/patches/series
--- tootle-0.2.0/debian/patches/series  2018-12-01 09:02:47.0 -0500
+++ tootle-0.2.0/debian/patches/series  2020-03-15 22:15:06.0 -0400
@@ -1,2 +1,3 @@
 001-insert-icon-search-path.patch
 002-browser-not-found-fallback.patch
+vala-0.46.patch
diff -Nru tootle-0.2.0/debian/patches/vala-0.46.patch 
tootle-0.2.0/debian/patches/vala-0.46.patch
--- tootle-0.2.0/debian/patches/vala-0.46.patch 1969-12-31 19:00:00.0 
-0500
+++ tootle-0.2.0/debian/patches/vala-0.46.patch 2020-03-15 22:15:39.0 
-0400
@@ -0,0 +1,11 @@
+--- a/src/Views/AbstractView.vala
 b/src/Views/AbstractView.vala
+@@ -21,7 +21,7 @@
+ });
+ }
+ 
+-public AbstractView () {
++protected AbstractView () {
+ show_all ();
+ }
+ 

Bug#954039: prayer: FTBFS against glibc 2.30

[Logan Rosen]

Package: prayer
Version: 1.3.5-dfsg1-6
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

prayer currently FTBFS against glibc 2.30 in unstable. This is due to
stropts.h being removed.

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/glibc-2.30.patch: Fix FTBFS against glibc 2.30 by checking for
existence of stropts.h.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru prayer-1.3.5-dfsg1/debian/patches/glibc-2.30.patch 
prayer-1.3.5-dfsg1/debian/patches/glibc-2.30.patch
--- prayer-1.3.5-dfsg1/debian/patches/glibc-2.30.patch  1969-12-31 
19:00:00.0 -0500
+++ prayer-1.3.5-dfsg1/debian/patches/glibc-2.30.patch  2020-03-15 
21:04:19.0 -0400
@@ -0,0 +1,13 @@
+--- a/lib/os_linux.h
 b/lib/os_linux.h
+@@ -9,7 +9,10 @@
+ #include 
+ #include 
+ #include 
++
++#ifdef HAVE_STROPTS_H
+ #include 
++#endif
+ 
+ #include 
+ 
diff -Nru prayer-1.3.5-dfsg1/debian/patches/series 
prayer-1.3.5-dfsg1/debian/patches/series
--- prayer-1.3.5-dfsg1/debian/patches/series2018-12-16 16:27:47.0 
-0500
+++ prayer-1.3.5-dfsg1/debian/patches/series2020-03-15 21:02:32.0 
-0400
@@ -10,3 +10,4 @@
 openssl1.1.patch
 no-referrer.patch
 glibc-2.28.patch
+glibc-2.30.patch

Bug#954037: openwince-jtag: FTBFS against glibc 2.30

[Logan Rosen]

Package: openwince-jtag
Version: 0.5.1-7
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

openwince-jtag FTBFS against glibc 2.30 in unstable due to the removal
of stropts.h.

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/glibc-2.30.patch: Fix FTBFS against glibc 2.30 by checking for
existence of stropts.h.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openwince-jtag-0.5.1/debian/patches/glibc-2.30.patch 
openwince-jtag-0.5.1/debian/patches/glibc-2.30.patch
--- openwince-jtag-0.5.1/debian/patches/glibc-2.30.patch1969-12-31 
19:00:00.0 -0500
+++ openwince-jtag-0.5.1/debian/patches/glibc-2.30.patch2020-03-15 
20:39:50.0 -0400
@@ -0,0 +1,14 @@
+--- a/src/tap/parport/ppdev.c
 b/src/tap/parport/ppdev.c
+@@ -28,7 +28,11 @@
+ #ifdef HAVE_LINUX_PPDEV_H
+ 
+ #include 
++
++#ifdef HAVE_STROPTS_H
+ #include 
++#endif
++
+ #include 
+ #include 
+ #include 
diff -Nru openwince-jtag-0.5.1/debian/patches/series 
openwince-jtag-0.5.1/debian/patches/series
--- openwince-jtag-0.5.1/debian/patches/series  2016-12-10 06:26:15.0 
-0500
+++ openwince-jtag-0.5.1/debian/patches/series  2020-03-15 20:39:25.0 
-0400
@@ -1,2 +1,3 @@
 0.5.1-6.patch
 format-security.patch
+glibc-2.30.patch

Bug#953395: python-tinyalign: FTBFS due to various build dependency issues

[Logan Rosen]

Package: python-tinyalign
Version: 0.2-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

python-tinyalign currently fails to build from source due to multiple
build dependency issues. It requires python3-setuptools-scm and cython3
for setup.py and needs python3-all-dev because its code includes
Python.h.

In Ubuntu, the attached patch was applied to achieve the following:

  * Adjust build dependencies to fix FTBFS:
- Build-depend on python3-setuptools-scm and cython3.
- Build-depend on python3-all-dev instead of python3-all.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-tinyalign-0.2/debian/control 
python-tinyalign-0.2/debian/control
--- python-tinyalign-0.2/debian/control 2020-02-02 15:33:44.0 -0500
+++ python-tinyalign-0.2/debian/control 2020-03-08 18:22:07.0 -0400
@@ -3,10 +3,12 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team 

 Uploaders: Steffen Moeller 
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: cython3,
+   debhelper-compat (= 12),
dh-python,
python3-setuptools,
-   python3-all
+   python3-setuptools-scm,
+   python3-all-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/marcelm/tinyalign
 Vcs-Browser: https://salsa.debian.org/med-team/tinyalign

Bug#953393: node-rollup-plugin-alias: FTBFS due to missing build dependency on node-slash

[Logan Rosen]

Package: node-rollup-plugin-alias
Version: 1.5.2-2
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

node-rollup-plugin-alias currently FTBFS due to a missing build
dependency on node-slash: 
https://buildd.debian.org/status/logs.php?arch=all=node-rollup-plugin-alias=1.5.2-2

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on node-slash to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru node-rollup-plugin-alias-1.5.2/debian/control 
node-rollup-plugin-alias-1.5.2/debian/control
--- node-rollup-plugin-alias-1.5.2/debian/control   2020-02-24 
15:56:29.0 -0500
+++ node-rollup-plugin-alias-1.5.2/debian/control   2020-03-08 
18:08:37.0 -0400
@@ -5,6 +5,7 @@
 Uploaders: Pirate Praveen 
 Build-Depends:
  debhelper-compat (= 12)
+ , node-slash
  , nodejs (>= 10)
  , rollup (>> 0.68.2+ds~)
  , pkg-js-tools (>= 0.9.16~),

Bug#952299: golang-go-dbus: FTBFS: failed to initialize build cache at /sbuild-nonexistent/.cache/go-build: mkdir /sbuild-nonexistent: permission denied

[Logan Rosen]

Package: golang-go-dbus
Version: 1~bzr20150122-1
Followup-For: Bug #952299
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/rules: Export home directory to fix FTBFS initializing build cache.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru golang-go-dbus-1~bzr20150203/debian/rules 
golang-go-dbus-1~bzr20150203/debian/rules
--- golang-go-dbus-1~bzr20150203/debian/rules   2015-01-26 12:11:27.0 
-0500
+++ golang-go-dbus-1~bzr20150203/debian/rules   2020-03-07 00:21:40.0 
-0500
@@ -6,6 +6,7 @@
 
 export DH_GOPKG := launchpad.net/go-dbus/v1
 export BUILDDIR := build
+export HOME = $(CURDIR)
 
 %:
dh $@ --buildsystem=golang --with=golang --builddirectory=$(BUILDDIR)

Bug#952268: appmenu-gtk-module: FTBFS: dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstat

[Logan Rosen]

Package: appmenu-gtk-module
Version: 0.7.3-1
Followup-For: Bug #952268
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on gtk-doc-tools to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-14-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru appmenu-gtk-module-0.7.3/debian/control 
appmenu-gtk-module-0.7.3/debian/control
--- appmenu-gtk-module-0.7.3/debian/control 2019-08-04 16:04:46.0 
-0400
+++ appmenu-gtk-module-0.7.3/debian/control 2020-02-23 22:20:02.0 
-0500
@@ -8,6 +8,7 @@
 Build-Depends: meson (>= 0.49.0),
debhelper-compat (= 12),
dpkg-dev (>= 1.16.1.1~),
+   gtk-doc-tools,
libx11-dev,
libglib2.0-dev (>= 2.50.0),
libgtk2.0-dev (>= 2.24.0),

Bug#951681: python-jenkinsapi: FTBFS due to missing build deps and pylint command

[Logan Rosen]

Package: python-jenkinsapi
Version: 0.3.11-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

python-jenkinsapi currently fails to build from source after the Python
3 changes. There are a few tweaks that need to be made to get it
building again.

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix FTBFS:
- Build-depend on dh-python and python3-pbr.
- Use pylint instead of pylint3.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: buster/sid
  APT prefers eoan-updates
  APT policy: (500, 'eoan-updates'), (500, 'eoan-security'), (500, 'eoan'), 
(100, 'eoan-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.3.0-29-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-jenkinsapi-0.3.11/debian/control 
python-jenkinsapi-0.3.11/debian/control
--- python-jenkinsapi-0.3.11/debian/control 2020-02-16 18:39:59.0 
-0500
+++ python-jenkinsapi-0.3.11/debian/control 2020-02-19 22:01:41.0 
-0500
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Al Stone 
 Build-Depends: debhelper (>= 12), python3-all-dev, python3-lxml, 
- python3-setuptools, python3-pytest, pylint3
+ python3-setuptools, python3-pytest, pylint3, dh-python, python3-pbr
 Standards-Version: 4.5.0
 Homepage: http://pypi.python.org/pypi/jenkinsapi
 Vcs-Git: https://github.com/ahs3/python-jenkinsapi
diff -Nru python-jenkinsapi-0.3.11/debian/patches/codestyle.patch 
python-jenkinsapi-0.3.11/debian/patches/codestyle.patch
--- python-jenkinsapi-0.3.11/debian/patches/codestyle.patch 2020-02-16 
18:39:59.0 -0500
+++ python-jenkinsapi-0.3.11/debian/patches/codestyle.patch 2020-02-19 
22:01:41.0 -0500
@@ -1,11 +1,10 @@
-diff -Naur orig-jenkinsapi/Makefile fixed-jenkinsapi/Makefile
 orig-jenkinsapi/Makefile   2020-02-16 17:49:45.404336646 -0700
-+++ fixed-jenkinsapi/Makefile  2020-02-16 17:50:25.352625604 -0700
+--- a/Makefile
 b/Makefile
 @@ -1,7 +1,6 @@
  .PHONY: lint tox dist
  
  lint:
 -  pycodestyle
-   pylint3 jenkinsapi/*.py
+   pylint jenkinsapi/*.py
  
  tox:
diff -Nru python-jenkinsapi-0.3.11/debian/patches/install.patch 
python-jenkinsapi-0.3.11/debian/patches/install.patch
--- python-jenkinsapi-0.3.11/debian/patches/install.patch   2020-02-16 
18:39:59.0 -0500
+++ python-jenkinsapi-0.3.11/debian/patches/install.patch   2020-02-19 
22:01:41.0 -0500
@@ -1,12 +1,11 @@
-diff -Naur orig-jenkinsapi/Makefile fixed-jenkinsapi/Makefile
 orig-jenkinsapi/Makefile   2020-02-16 18:11:36.225956771 -0700
-+++ fixed-jenkinsapi/Makefile  2020-02-16 18:13:10.706654980 -0700
+--- a/Makefile
 b/Makefile
 @@ -1,4 +1,4 @@
 -.PHONY: lint tox dist
 +.PHONY: lint tox dist install
  
  lint:
-   pylint3 jenkinsapi/*.py
+   pylint jenkinsapi/*.py
 @@ -9,3 +9,5 @@
  dist:
python3 setup.py sdist bdist_wheel
diff -Nru python-jenkinsapi-0.3.11/debian/patches/python3.patch 
python-jenkinsapi-0.3.11/debian/patches/python3.patch
--- python-jenkinsapi-0.3.11/debian/patches/python3.patch   2020-02-16 
18:39:59.0 -0500
+++ python-jenkinsapi-0.3.11/debian/patches/python3.patch   2020-02-19 
22:01:41.0 -0500
@@ -1,7 +1,6 @@
-diff -Naur python-jenkinsapi.github/Makefile fixed-jenkinsapi/Makefile
 python-jenkinsapi.github/Makefile  2020-02-16 16:46:46.767307926 -0700
-+++ fixed-jenkinsapi/Makefile  2020-02-16 17:02:37.545891630 -0700
-@@ -1,17 +1,17 @@
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
  .PHONY: test lint tox coverage dist
  
  test:
@@ -10,10 +9,7 @@
  
  lint:
pycodestyle
--  pylint jenkinsapi/*.py
-+  pylint3 jenkinsapi/*.py
- 
- tox:
+@@ -11,7 +11,7 @@
tox
  
  dist:

Bug#916002: xnbd FTBFS with glibc 2.28

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/glibc-2.28.patch: Fix FTBFS against glibc 2.28.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru xnbd-0.3.0/debian/patches/glibc-2.28.patch 
xnbd-0.3.0/debian/patches/glibc-2.28.patch
--- xnbd-0.3.0/debian/patches/glibc-2.28.patch  1969-12-31 19:00:00.0 
-0500
+++ xnbd-0.3.0/debian/patches/glibc-2.28.patch  2019-01-12 23:33:17.0 
-0500
@@ -0,0 +1,19 @@
+Description: Fix build with glibc 2.28
+Author: Logan Rosen 
+Forwarded: https://bitbucket.org/hirofuchi/xnbd/pull-requests/1
+Last-Update: 2019-01-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/io.h
 b/lib/io.h
+@@ -35,6 +35,10 @@
+ #include 
+ #include 
+ 
++#ifdef __GNU_LIBRARY__
++#include 
++#endif
++
+ 
+ void read_all(int fd, void *buf, size_t len);
+ void write_all(int fd, const void *buf, size_t len);
diff -Nru xnbd-0.3.0/debian/patches/series xnbd-0.3.0/debian/patches/series
--- xnbd-0.3.0/debian/patches/series2013-05-20 10:47:09.0 -0400
+++ xnbd-0.3.0/debian/patches/series2019-01-12 23:32:30.0 -0500
@@ -0,0 +1 @@
+glibc-2.28.patch

Bug#916079: hyperic-sigar FTBFS with glibc 2.28

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/ftbfs-glibc-2.28.diff: Fix FTBFS against glibc 2.28.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/patches/ftbfs-glibc-2.28.diff 
hyperic-sigar-1.6.4+dfsg/debian/patches/ftbfs-glibc-2.28.diff
--- hyperic-sigar-1.6.4+dfsg/debian/patches/ftbfs-glibc-2.28.diff   
1969-12-31 19:00:00.0 -0500
+++ hyperic-sigar-1.6.4+dfsg/debian/patches/ftbfs-glibc-2.28.diff   
2019-01-11 22:38:38.0 -0500
@@ -0,0 +1,22 @@
+Description: Fix FTBFS against glibc 2.28
+Author: Logan Rosen 
+Forwarded: https://github.com/hyperic/sigar/pull/127
+Last-Update: 2019-01-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/os/linux/linux_sigar.c
 b/src/os/linux/linux_sigar.c
+@@ -22,8 +22,13 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
++#ifdef __GNU_LIBRARY__
++#include 
++#endif
++
+ #include "sigar.h"
+ #include "sigar_private.h"
+ #include "sigar_util.h"
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/patches/series 
hyperic-sigar-1.6.4+dfsg/debian/patches/series
--- hyperic-sigar-1.6.4+dfsg/debian/patches/series  2014-11-03 
00:25:28.0 -0500
+++ hyperic-sigar-1.6.4+dfsg/debian/patches/series  2019-01-11 
22:36:13.0 -0500
@@ -3,3 +3,4 @@
 0003-bindings-java-Use-sane-name-for-JNI-library.patch
 0004-make-the-package-compile-on-MIPS.patch
 no-m64-mips-arm.diff
+ftbfs-glibc-2.28.diff

Bug#917492: fam: FTBFS ('minor' was not declared in this scope)

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/19_glibc_2.28.patch: Fix FTBFS with glibc 2.28.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
only in patch2:
unchanged:
--- fam-2.7.0.orig/debian/patches/19_glibc_2.28.patch
+++ fam-2.7.0/debian/patches/19_glibc_2.28.patch
@@ -0,0 +1,17 @@
+## Description: Fix FTBFS against glibc 2.28
+## Origin/Author: Logan Rosen 
+## Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917492
+diff -Nur -x '*.orig' -x '*~' fam-2.7.0/build-tree/fam-2.7.0/src/DNotify.c++ 
fam-2.7.0.new/build-tree/fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0/src/DNotify.c++  2019-01-08 23:35:20.513574095 -0500
 fam-2.7.0/src/DNotify.c++  2019-01-08 23:36:37.568605429 -0500
+@@ -36,6 +36,10 @@
+ #include 
+ #include 
+ 
++#ifdef __GNU_LIBRARY__
++#include 
++#endif
++
+ #include "DNotify.h"
+ 
+ #include "Interest.h"

Bug#917055: blktool FTBFS with glibc 2.28

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Add patch to fix FTBFS with glibc-2.28.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru blktool-4/debian/control blktool-4/debian/control
--- blktool-4/debian/control2018-04-03 08:15:06.0 -0400
+++ blktool-4/debian/control2019-01-06 21:50:30.0 -0500
@@ -1,8 +1,7 @@
 Source: blktool
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers 
-XSBC-Original-Maintainer: Azat Khuzhin 
+Maintainer: Azat Khuzhin 
 Build-Depends: cdbs, debhelper (>= 9), libglib2.0-dev
 Standards-Version: 3.9.6
 Homepage: http://sourceforge.net/projects/gkernel/files/blktool/
diff -Nru blktool-4/debian/patches/0004-fix-FTBFS-with-glibc-2.28.patch 
blktool-4/debian/patches/0004-fix-FTBFS-with-glibc-2.28.patch
--- blktool-4/debian/patches/0004-fix-FTBFS-with-glibc-2.28.patch   
1969-12-31 19:00:00.0 -0500
+++ blktool-4/debian/patches/0004-fix-FTBFS-with-glibc-2.28.patch   
2019-01-06 21:50:28.0 -0500
@@ -0,0 +1,13 @@
+--- a/blktool.c
 b/blktool.c
+@@ -22,6 +22,10 @@
+ #include 
+ #include 
+ 
++#ifdef __GNU_LIBRARY__
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
diff -Nru blktool-4/debian/patches/series blktool-4/debian/patches/series
--- blktool-4/debian/patches/series 2015-06-12 18:05:10.0 -0400
+++ blktool-4/debian/patches/series 2019-01-06 21:47:12.0 -0500
@@ -1,3 +1,4 @@
 0001-fix-typos-in-manpage.patch
 0002-fix-string-error.patch
 0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
+0004-fix-FTBFS-with-glibc-2.28.patch

Bug#867504: beanbag FTBFS with python 3.6 as supported version

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Grab PR from upstream Git to fix Python 3.6 compatibility, fixing FTBFS.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru beanbag-1.9.2/debian/patches/python-3.6-compat 
beanbag-1.9.2/debian/patches/python-3.6-compat
--- beanbag-1.9.2/debian/patches/python-3.6-compat  1969-12-31 
19:00:00.0 -0500
+++ beanbag-1.9.2/debian/patches/python-3.6-compat  2019-01-06 
21:03:30.0 -0500
@@ -0,0 +1,27 @@
+Description: Fix failing unit tests with Python 3.6+
+Author: Charalampos Stratakis 
+Bug: https://github.com/ajtowns/beanbag/pull/10
+Last-Update: 2019-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/beanbag/namespace.py
 b/beanbag/namespace.py
+@@ -102,6 +102,9 @@
+ basebases = (NamespaceBase,)
+ 
+ qn = None
++
++classcell = nmspc.pop('__classcell__', None)
++
+ if "__qualname__" in nmspc:
+ qn = nmspc["__qualname__"]
+ nmspc["__qualname__"] = qn + "Base"
+@@ -114,6 +117,8 @@
+ conv_nmspc["__module__"] = nmspc["__module__"]
+ if qn is not None:
+ conv_nmspc["__qualname__"] = qn
++if classcell is not None:
++conv_nmspc['__classcell__'] = classcell
+ 
+ cls = type.__new__(mcls, name, bases, conv_nmspc)
+ basecls.Namespace = cls
diff -Nru beanbag-1.9.2/debian/patches/series 
beanbag-1.9.2/debian/patches/series
--- beanbag-1.9.2/debian/patches/series 2017-03-09 07:17:47.0 -0500
+++ beanbag-1.9.2/debian/patches/series 2019-01-06 13:12:42.0 -0500
@@ -1 +1,2 @@
 fix-code-in-example-file
+python-3.6-compat

Bug#909828: actiona FTBFS with Qt 5.11

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Grab patch from upstream to fix FTBFS with Qt 5.11.
  * debian/docs: Change README to README.md.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru actiona-3.9.4/debian/docs actiona-3.9.4/debian/docs
--- actiona-3.9.4/debian/docs   2018-06-14 08:44:41.0 -0400
+++ actiona-3.9.4/debian/docs   2019-01-06 13:01:52.0 -0500
@@ -1 +1 @@
-README
+README.md
diff -Nru actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch 
actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch
--- actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch1969-12-31 
19:00:00.0 -0500
+++ actiona-3.9.4/debian/patches/fix-ftbfs-qt-5.11.patch2019-01-06 
13:01:52.0 -0500
@@ -0,0 +1,32 @@
+Description: Fix compilation with Qt 5.11
+Author: Jmgr 
+Origin: upstream
+Bug: https://github.com/Jmgr/actiona/issues/78
+Applied-Upstream: 
https://github.com/Jmgr/actiona/commit/26437ea8e0ce7ff957e500b0cc0ec3d655d5c3c5
+Last-Update: 2019-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/actiontools/abstractcodeeditor.h 
b/actiontools/abstractcodeeditor.h
+index 0b9737e7..690a118a 100644
+--- a/actiontools/abstractcodeeditor.h
 b/actiontools/abstractcodeeditor.h
+@@ -24,6 +24,7 @@
+ #include "actiontools_global.h"
+ 
+ #include 
++#include 
+ 
+ class QAbstractItemModel;
+ 
+diff --git a/actiontools/coloredit.cpp b/actiontools/coloredit.cpp
+index e961885e..9f0d5824 100644
+--- a/actiontools/coloredit.cpp
 b/actiontools/coloredit.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ #include 
diff -Nru actiona-3.9.4/debian/patches/series 
actiona-3.9.4/debian/patches/series
--- actiona-3.9.4/debian/patches/series 2018-06-14 08:44:41.0 -0400
+++ actiona-3.9.4/debian/patches/series 2019-01-06 13:01:47.0 -0500
@@ -0,0 +1 @@
+fix-ftbfs-qt-5.11.patch

Bug#915279: golang-github-nats-io-gnatsd FTBFS: cannot find package "github.com/nats-io/jwt"

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on golang-github-nats-io-jwt-dev to fix FTBFS.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru golang-github-nats-io-gnatsd-1.3.0+git20181112.3c52dc8/debian/control 
golang-github-nats-io-gnatsd-1.3.0+git20181112.3c52dc8/debian/control
--- golang-github-nats-io-gnatsd-1.3.0+git20181112.3c52dc8/debian/control   
2018-11-20 15:01:49.0 -0500
+++ golang-github-nats-io-gnatsd-1.3.0+git20181112.3c52dc8/debian/control   
2018-12-30 18:49:49.0 -0500
@@ -6,6 +6,7 @@
 Build-Depends: debhelper (>= 11),
dh-golang,
golang-any,
+   golang-github-nats-io-jwt-dev,
golang-github-nats-io-nkeys-dev,
golang-github-nats-io-nuid-dev,
golang-golang-x-crypto-dev

Bug#917845: fortune-zh: FTBFS - needs build dependency on python3

[Logan Rosen]

Package: fortune-zh
Version: 2.90
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Maintainer,

fortune-zh currently fails to build from source in a clean environment
because it requires the python3 binary but does not build-depend on the
python3 package. You can see an example failure here [1] (I was able to
reproduce this locally in a sid chroot as well).

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on python3 to fix FTBFS.

Thanks for considering the patch.

Logan Rosen

[1] 
https://launchpadlibrarian.net/404195059/buildlog_ubuntu-disco-amd64.fortune-zh_2.90_BUILDING.txt.gz


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru fortune-zh-2.90/debian/control fortune-zh-2.90ubuntu1/debian/control
--- fortune-zh-2.90/debian/control  2018-12-30 02:45:38.0 -0500
+++ fortune-zh-2.90ubuntu1/debian/control   2018-12-30 18:38:58.0 
-0500
@@ -5,6 +5,7 @@
 Uploaders: Mo Zhou 
 Build-Depends: debhelper (>= 11~),
fortune-mod,
+   python3
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/chinese-team/fortunes-zh
 Vcs-Git: https://salsa.debian.org/chinese-team/fortunes-zh.git

Bug#914112: [debian-mysql] Bug#914112: galera-3 FTBFS: error: no matching function for call to 'asio::ssl::context::context(asio::io_service&, asio::ssl::context_base::method)'

[Logan Rosen]

Hi Otto,

Just submitted a merge request on Salsa
. Thanks
for the clear documentation on how to set up the CI pipeline in my forked
repo. One issue I noticed, though, is that the GitLab CI configuration file
is called debian/.gitlab-ci.yml, while it's debian/gitlab-ci.yml in the
other MariaDB projects. The wiki page
 only mentions the latter path
- maybe we should standardize galera-3 with that one as well?

Thanks,
Logan


On Wed, Dec 19, 2018 at 2:49 AM Otto Kekäläinen  wrote:

> Hello!
>
> Feel free to open a merge request on Salsa for whatever change to want
> to have in the packaging. I wrote instructions with screenshots at
> https://wiki.debian.org/Teams/MySQL/patches so it would be as easy as
> possible to contribute.
>
> I am also grateful for meta-contributions to the contribution process
> itself: the wiki texts, READMEs inside the packaging, gitlab-ci.yml
> tweaks to make the testing more extensive and reliable etc.
>

Bug#914112: galera-3 FTBFS: error: no matching function for call to 'asio::ssl::context::context(asio::io_service&, asio::ssl::context_base::method)'

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/rules: Use bundled asio, since system asio is too new (> 1.10.8).
  * debian/control: Remove build-dependency of libasio-dev (for now).

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru galera-3-25.3.24/debian/control galera-3-25.3.24/debian/control
--- galera-3-25.3.24/debian/control 2018-10-15 09:23:16.0 -0400
+++ galera-3-25.3.24/debian/control 2018-11-17 20:37:31.0 -0500
@@ -6,7 +6,6 @@
 Standards-Version: 4.2.1
 Build-Depends: check,
debhelper (>= 9.20151219~),
-   libasio-dev,
libboost-dev (>= 1.41),
libboost-program-options-dev (>= 1.41),
libssl-dev,
diff -Nru galera-3-25.3.24/debian/rules galera-3-25.3.24/debian/rules
--- galera-3-25.3.24/debian/rules   2018-10-15 04:27:36.0 -0400
+++ galera-3-25.3.24/debian/rules   2018-11-17 20:36:49.0 -0500
@@ -3,6 +3,9 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
+# Use bundled asio, since system asio is too new (> 1.10.8)
+SCONS_ARGS += system_asio=0
+
 # Parallel build support as adviced
 # at 
https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

Bug#913377: python-louvain: FTBFS (No module named 'networkx')

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on python3-networkx to fix FTBFS.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru python-louvain-0.0+20181013git3fc1f575/debian/control 
python-louvain-0.0+20181013git3fc1f575/debian/control
--- python-louvain-0.0+20181013git3fc1f575/debian/control   2018-10-15 
15:12:11.0 -0400
+++ python-louvain-0.0+20181013git3fc1f575/debian/control   2018-12-15 
23:00:43.0 -0500
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 11),
  dh-python,
  python3-all, python3-setuptools,
- python3-nose
+ python3-nose, python3-networkx
 Standards-Version: 4.2.1
 Homepage: https://github.com/taynaud/python-louvain
 Vcs-Browser: https://salsa.debian.org/debian/python-louvain

Bug#914410: ruby-validate-url FTBFS: test failure

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on ruby-activerecord to fix FTBFS.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ruby-validate-url-1.0.2+git/debian/control 
ruby-validate-url-1.0.2+git/debian/control
--- ruby-validate-url-1.0.2+git/debian/control  2018-11-22 06:50:13.0 
-0500
+++ ruby-validate-url-1.0.2+git/debian/control  2018-12-15 21:53:53.0 
-0500
@@ -6,6 +6,7 @@
 Build-Depends: debhelper (>= 9~),
gem2deb,
ruby-activemodel,
+   ruby-activerecord,
ruby-addressable,
ruby-diff-lcs,
ruby-rspec,

Bug#914358: schroedinger-maeparser: FTBFS (cmake: not found)

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on cmake, libboost-dev and libboost-test-dev to fix FTBFS.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru schroedinger-maeparser-1.0.1/debian/control 
schroedinger-maeparser-1.0.1/debian/control
--- schroedinger-maeparser-1.0.1/debian/control 2018-12-06 09:00:18.0 
-0500
+++ schroedinger-maeparser-1.0.1/debian/control 2018-12-15 17:26:12.0 
-0500
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Science Team 

 Uploaders: Steffen Moeller 
-Build-Depends: debhelper (>= 11)
+Build-Depends: debhelper (>= 11), cmake, libboost-dev, libboost-test-dev
 Standards-Version: 4.2.1
 Section: libs
 Homepage: https://www.schrodinger.com/maestro
@@ -39,4 +39,4 @@
   * Ligand-based search applications, such as Phase and Phase Shape
   * Quantum Mechanics applications, such as Jaguar
   * Protein-Protein Docking applications
-  * ... many other backends used in both Life and Material Sciences
\ No newline at end of file
+  * ... many other backends used in both Life and Material Sciences

Bug#916251: dvd+rw-tools: FTBFS with glibc 2.28

[Logan Rosen]

Source: dvd+rw-tools
Version: 7.1-13
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Maintainer,

dvd+rw-tools currently fails to build from source with glibc 2.28
because they changed the way the 'major' and 'minor' macros can be
accessed. [1] Specifically:

* The macros 'major', 'minor', and 'makedev' are now only available from
  the header ; not from  or various other
  headers that happen to include .  These macros are rarely
  used, not part of POSIX nor XSI, and their names frequently collide with
  user code; see https://sourceware.org/bugzilla/show_bug.cgi?id=19239 for
  further explanation.

   is a GNU extension.  Portable programs that require
  these macros should first include , and then include
   if __GNU_LIBRARY__ is defined.

We saw the following errors while building in Ubuntu accordingly:
growisofs.o growisofs_mmc.o  -lpthread -o growisofs
/usr/bin/ld: growisofs.o: in function `find_raw_device':
./growisofs.c:658: undefined reference to `major'
/usr/bin/ld: ./growisofs.c:659: undefined reference to `minor'
/usr/bin/ld: growisofs.o: in function `grab_sg':
./growisofs.c:704: undefined reference to `minor'
collect2: error: ld returned 1 exit status

This is reproducible in sid as well.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/glibc-2.28.patch: Fix FTBFS with glibc >= 2.28.

Thanks for considering the patch.

Logan Rosen

[1] https://www.sourceware.org/ml/libc-alpha/2018-08/msg3.html

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru dvd+rw-tools-7.1/debian/patches/glibc-2.28.patch 
dvd+rw-tools-7.1/debian/patches/glibc-2.28.patch
--- dvd+rw-tools-7.1/debian/patches/glibc-2.28.patch1969-12-31 
19:00:00.0 -0500
+++ dvd+rw-tools-7.1/debian/patches/glibc-2.28.patch2018-12-11 
23:42:00.0 -0500
@@ -0,0 +1,26 @@
+--- a/growisofs.c
 b/growisofs.c
+@@ -444,6 +444,10 @@
+ #include 
+ #include "mp.h"
+ 
++#if defined(__GNU_LIBRARY__)
++# include 
++#endif
++
+ #if defined(__unix) || defined(__unix__)
+ # include 
+ # include 
+--- a/transport.hxx
 b/transport.hxx
+@@ -53,6 +53,10 @@
+ #define ENV_LOCALE".OCP"
+ #endif
+ 
++#if defined(__GNU_LIBRARY__)
++# include 
++#endif
++
+ #include "asctable.h"
+ 
+ #define CREAM_ON_ERRNO_NAKED(s)   \
diff -Nru dvd+rw-tools-7.1/debian/patches/series 
dvd+rw-tools-7.1/debian/patches/series
--- dvd+rw-tools-7.1/debian/patches/series  2018-10-09 10:05:01.0 
-0400
+++ dvd+rw-tools-7.1/debian/patches/series  2018-12-11 23:38:51.0 
-0500
@@ -10,3 +10,4 @@
 ignore_pseudo_overwrite.patch
 10-blue-ray-bug713016.patch
 fix_burning_bd-r_discs.patch
+glibc-2.28.patch

Bug#915980: gudhi: FTBFS with "expected primary-expression before '>' token"

[Logan Rosen]

Source: gudhi
Version: 2.3.0+dfsg-2
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)

Dear Maintainer,

gudhi currently fails to build from source in a clean sid chroot with
the following error:

In file included from /usr/include/eigen3/Eigen/SparseCore:50,
 from /usr/include/eigen3/Eigen/Sparse:26,
 from /usr/include/eigen3/Eigen/Eigen:2,
 from 
/build/gudhi-2.3.0+dfsg/include/gudhi/Tangential_complex/utilities.h:33,
 from 
/build/gudhi-2.3.0+dfsg/include/gudhi/Tangential_complex/Simplicial_complex.h:27,
 from 
/build/gudhi-2.3.0+dfsg/include/gudhi/Tangential_complex.h:27,
 from 
/build/gudhi-2.3.0+dfsg/example/Tangential_complex/example_with_perturb.cpp:1:
/usr/include/eigen3/Eigen/src/SparseCore/SparseBlock.h: In member function 
'Eigen::internal::sparse_matrix_block_impl::BlockType& 
Eigen::internal::sparse_matrix_block_impl::operator=(const BlockType&)':
/usr/include/eigen3/Eigen/src/SparseCore/SparseBlock.h:216:33: error: expected 
primary-expression before '>' token
   return operator=(other);
 ^
This was reproduced in Ubuntu as well: 
https://launchpad.net/ubuntu/+source/gudhi/2.3.0+dfsg-2

Can you please look into this build failure?

Thanks,
Logan

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-11-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Bug#915946: python-escript: FTBFS with openmpi >= 3.1.3-3 (multiarch)

[Logan Rosen]

Source: python-escript
Version: 5.2-3
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)

Dear Maintainer,

python-escript currently fails to build from source against openmpi >=
3.1.3-3, since it made a change in that version to have the symlink be
/usr/include/$ma/openmpi instead of /usr/include/openmpi [1]. This is
causing the following failure [2]:

RuntimeError: mpi.h not found under /usr/include:
  File "/<>/SConstruct", line 496:
env=checkOptionalLibraries(env)
  File "/<>/site_scons/dependencies.py", line 497:
mpi_inc_path,mpi_lib_path=findLibWithHeader(env, env['mpi_libs'], 'mpi.h', 
env['mpi_prefix'], lang='c++')
  File "/<>/site_scons/site_init.py", line 44:
raise RuntimeError('%s not found under %s'%(header,paths))
make[1]: *** [debian/rules:78: override_dh_auto_build] Error 2
make[1]: Leaving directory '/<>'
make: *** [debian/rules:30: build] Error 2
dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2

Can you please look into making python-escript aware of the multiarch
path for openmpi?

Thanks,
Logan

[1] 
https://tracker.debian.org/news/1007552/accepted-openmpi-313-3-source-amd64-all-into-unstable/
[2] 
https://launchpadlibrarian.net/400657334/buildlog_ubuntu-disco-amd64.python-escript_5.2-3_BUILDING.txt.gz

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-11-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Bug#915686: src:bmap-tools: FTBFS with Python 3.7 as default

[Logan Rosen]

Package: src:bmap-tools
Version: 3.5-1
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)

Dear Maintainer,

bmap-tools fails to build from source with the new Python 3.7 default.
You can see the Ubuntu build failure (which I was able to reproduce in a clean
sid chroot) here. [1]

The tests are failing with this error:
RuntimeError: generator raised StopIteration

Thanks,
Logan

[1] 
https://launchpadlibrarian.net/399583193/buildlog_ubuntu-disco-amd64.bmap-tools_3.5-1_BUILDING.txt.gz

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-11-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Bug#915316: ansible: FTBFS due to missing build dependency on python-jinja2

[Logan Rosen]

Package: ansible
Version: 2.7.1+dfsg-2
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 disco ubuntu-patch

Dear Maintainer,

ansible currently fails to build from source in a clean chroot due to a
lack of a build dependency on python-jinja2. I tested that sid has the
same failure as Ubuntu, which you can see here [1].

In Ubuntu, the attached patch was applied to achieve the following:

  * Build-depend on python-jinja2 to fix FTBFS.

Thanks for considering the patch.

Logan

[1] 
https://launchpadlibrarian.net/399587454/buildlog_ubuntu-disco-amd64.ansible_2.7.1+dfsg-2_BUILDING.txt.gz

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 
'cosmic'), (400, 'cosmic-proposed'), (100, 'cosmic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-11-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ansible-2.7.1+dfsg/debian/control ansible-2.7.1+dfsg/debian/control
--- ansible-2.7.1+dfsg/debian/control   2018-11-13 05:02:13.0 -0500
+++ ansible-2.7.1+dfsg/debian/control   2018-12-02 12:53:19.0 -0500
@@ -12,6 +12,7 @@
python-yaml,
python-nose,
python-passlib,
+   python-jinja2,
dh-python
 Standards-Version: 4.1.1
 Vcs-Browser: https://salsa.debian.org/debian/ansible

Bug#911876: asyncpg FTBFS: tests fail

[Logan Rosen]

Package: asyncpg
Version: 0.17.0-1
Followup-For: Bug #911876
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-large-oid-test.patch: Grab patch from upstream Git to fix large
OID test with PostgreSQL 11.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: buster/sid
  APT prefers cosmic-updates
  APT policy: (500, 'cosmic-updates'), (500, 'cosmic-security'), (500, 'cosmic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru asyncpg-0.17.0/debian/patches/fix-large-oid-test.patch 
asyncpg-0.17.0/debian/patches/fix-large-oid-test.patch
--- asyncpg-0.17.0/debian/patches/fix-large-oid-test.patch  1969-12-31 
19:00:00.0 -0500
+++ asyncpg-0.17.0/debian/patches/fix-large-oid-test.patch  2018-11-19 
22:00:06.0 -0500
@@ -0,0 +1,47 @@
+From ddb0ec2918c370ba6fc2f569835fd02078132058 Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus 
+Date: Mon, 22 Oct 2018 19:07:06 -0400
+Subject: [PATCH] Fix large OID test under PostgreSQL 11
+
+PostgreSQL 11 seems to be automatically creating array types for domains
+with OIDs that _precede_ the OID of the array element type, so
+the large OID test trips over with an off-by-one assertion error.
+---
+ tests/test_codecs.py | 14 --
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_codecs.py b/tests/test_codecs.py
+index 9aac5ea..5498b40 100644
+--- a/tests/test_codecs.py
 b/tests/test_codecs.py
+@@ -1727,10 +1727,12 @@ def _decoder(value):
+ 
+ @unittest.skipIf(os.environ.get('PGHOST'), 'using remote cluster for testing')
+ class TestCodecsLargeOIDs(tb.ConnectedTestCase):
++LARGE_OID = 2147483648
++
+ @classmethod
+ def setup_cluster(cls):
+ cls.cluster = cls.new_cluster(pg_cluster.TempCluster)
+-cls.cluster.reset_wal(oid=2147483648)
++cls.cluster.reset_wal(oid=cls.LARGE_OID)
+ cls.start_cluster(cls.cluster)
+ 
+ async def test_custom_codec_large_oid(self):
+@@ -1739,7 +1741,15 @@ def setup_cluster(cls):
+ oid = await self.con.fetchval('''
+ SELECT oid FROM pg_type WHERE typname = 'test_domain_t'
+ ''')
+-self.assertEqual(oid, 2147483648)
++
++expected_oid = self.LARGE_OID
++if self.server_version >= (11, 0):
++# PostgreSQL 11 automatically create a domain array type
++# _before_ the domain type, so the expected OID is
++# off by one.
++expected_oid += 1
++
++self.assertEqual(oid, expected_oid)
+ 
+ # Test that introspection handles large OIDs
+ v = await self.con.fetchval('SELECT $1::test_domain_t', 10)
diff -Nru asyncpg-0.17.0/debian/patches/series 
asyncpg-0.17.0/debian/patches/series
--- asyncpg-0.17.0/debian/patches/series1969-12-31 19:00:00.0 
-0500
+++ asyncpg-0.17.0/debian/patches/series2018-11-19 22:00:15.0 
-0500
@@ -0,0 +1 @@
+fix-large-oid-test.patch

Bug#870586: behave: FTBFS with Python 3.6 (ValueError: cannot use LOCALE flag with a str pattern)

[Logan Rosen]

Package: behave
Version: 1.2.5-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 artful ubuntu-patch

Dear Maintainer,

Currently, behave fails to build from source in unstable due to the
tests failing with Python 3.6.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/0002-Python-3.6-compatibility.patch: Apply patch from
upstream to provide compatibility with Python 3.6 and fix FTBFS.

Thanks for considering the patch.

Logan Rosen

-- 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-28-generic (SMP w/8 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)
diff -Nru behave-1.2.5/debian/patches/0002-Python-3.6-compatibility.patch 
behave-1.2.5/debian/patches/0002-Python-3.6-compatibility.patch
--- behave-1.2.5/debian/patches/0002-Python-3.6-compatibility.patch 
1969-12-31 16:00:00.0 -0800
+++ behave-1.2.5/debian/patches/0002-Python-3.6-compatibility.patch 
2017-08-02 21:50:23.0 -0700
@@ -0,0 +1,23 @@
+From f52cc2f59df8e21a5caf21b268bbd9ca6fa3e1e1 Mon Sep 17 00:00:00 2001
+From: jenisys <jeni...@users.noreply.github.com>
+Date: Sat, 1 Oct 2016 12:42:11 +0200
+Subject: [PATCH] PREPARE for Python 3.6: re.LOCALE was removed
+
+---
+ behave/configuration.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/behave/configuration.py
 b/behave/configuration.py
+@@ -661,8 +661,10 @@
+ :param names: List of name parts or regular expressions (as text).
+ :return: Compiled regular expression to use.
+ """
++# -- NOTE: re.LOCALE is removed in Python 3.6 (deprecated in Python 
3.5)
++# flags = (re.UNICODE | re.LOCALE)
+ pattern = u"|".join(names)
+-return re.compile(pattern, flags=(re.UNICODE | re.LOCALE))
++return re.compile(pattern, flags=re.UNICODE)
+ 
+ def exclude(self, filename):
+ if isinstance(filename, FileLocation):
diff -Nru behave-1.2.5/debian/patches/series behave-1.2.5/debian/patches/series
--- behave-1.2.5/debian/patches/series  2017-06-12 22:01:28.0 -0700
+++ behave-1.2.5/debian/patches/series  2017-08-02 21:50:17.0 -0700
@@ -1 +1,2 @@
 0001-docs-disable-use-of-sphincontrib.cheeseshop.patch
+0002-Python-3.6-compatibility.patch

Bug#865292: apt-offline FTBFS: dh_auto_clean: failed to run pyversions

[Logan Rosen]

Package: apt-offline
Version: 1.8.0
Followup-For: Bug #865292
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/rules: Switch to pybuild buildsystem to avoid needing pyversions.

Thanks for considering the patch.

Logan Rosen



-- 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-24-generic (SMP w/8 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)
diff -Nru apt-offline-1.8.0/debian/rules apt-offline-1.8.0ubuntu1/debian/rules
--- apt-offline-1.8.0/debian/rules  2017-05-21 22:12:10.0 -0700
+++ apt-offline-1.8.0ubuntu1/debian/rules   2017-06-20 23:07:01.0 
-0700
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 %:
-   dh $@ --with python3
+   dh $@ --with python3 --buildsystem=pybuild
 

Bug#811890: FTBFS: storage size of 'hints' isn't known

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * httpfs2.c: Pass -D_POSIX_C_SOURCE=200112L to CPPFLAGS to fix FTBFS due to
implicit declarations.

Thanks for considering the patch.

Logan Rosen
diff -u httpfs2-0.1.4/Makefile httpfs2-0.1.4/Makefile
--- httpfs2-0.1.4/Makefile
+++ httpfs2-0.1.4/Makefile
@@ -1,6 +1,6 @@
 CC=gcc -g 
 CFLAGS :=  -Os -Wall $(shell pkg-config fuse --cflags)
-CPPFLAGS := -Wall -DUSE_AUTH -D_XOPEN_SOURCE=500 -D_ISOC99_SOURCE
+CPPFLAGS := -Wall -DUSE_AUTH -D_XOPEN_SOURCE=500 -D_ISOC99_SOURCE 
-D_POSIX_C_SOURCE=200112L
 THR_CPPFLAGS := -DUSE_THREAD
 THR_LDFLAGS := -lpthread
 SSL_CPPFLAGS := -DUSE_SSL $(shell pkg-config openssl --cflags)

Bug#817473: gdeskcal: Removal of debhelper compat 4

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/compat: Bump to 10.
  * debian/control:
- Bump debhelper to (>= 10) and move to Build-Depends.
- Build-depend-indep on dh-python.
- Depend on ${misc:Depends}.
  * debian/rules:
- Add recommended build-arch and build-indep targets.
- Use dh_prep instead of dh_clean -k.

Thanks for considering the patch.

Logan Rosen
diff -u gdeskcal-0.57.1/debian/rules gdeskcal-0.57.1/debian/rules
--- gdeskcal-0.57.1/debian/rules
+++ gdeskcal-0.57.1/debian/rules
@@ -2,7 +2,9 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-build: 
+build: build-arch build-indep
+build-arch:
+build-indep:
 
 clean:
dh_testdir
@@ -14,7 +16,7 @@
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
mkdir -p debian/gdeskcal/usr/share/gdeskcal/code
install -m 0755 gdeskcal debian/gdeskcal/usr/share/gdeskcal
diff -u gdeskcal-0.57.1/debian/compat gdeskcal-0.57.1/debian/compat
--- gdeskcal-0.57.1/debian/compat
+++ gdeskcal-0.57.1/debian/compat
@@ -1 +1 @@
-4
+10
diff -u gdeskcal-0.57.1/debian/control gdeskcal-0.57.1/debian/control
--- gdeskcal-0.57.1/debian/control
+++ gdeskcal-0.57.1/debian/control
@@ -1,13 +1,14 @@
 Source: gdeskcal
 Section: x11
 Priority: optional
 Maintainer: Sebastien Bacher <seb...@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.65), python-all-dev (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 10)
+Build-Depends-Indep: python-all-dev (>= 2.6.6-3~), dh-python
 Standards-Version: 3.7.2
 
 Package: gdeskcal
 Architecture: all
-Depends: ${python:Depends}, python-gtk2 (>= 1.99.17-2)
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 1.99.17-2)
 Recommends: gdesklets
 Description: A desktop calendar featuring transparency with smooth 
alpha-blending
  gDeskCal is a cute little eye-candy calendar for your desktop. 

Bug#817718: wayv: Removal of debhelper compat 4

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/rules:
- Remove legacy DH_COMPAT export.
- Add recommended build-arch and build-indep targets.
- Use dh_prep instead of dh_clean -k.
- Don't allow distclean to ignore all errors.
  * debian/compat: Indicate compatibility level of 10.
  * debian/control:
- Build-depend on debhelper (>= 10).
- Depend on ${misc:Depends}.

Thanks for considering the patch.

Logan Rosen
diff -u wayv-0.3/config.sub wayv-0.3/config.sub
--- wayv-0.3/config.sub
+++ wayv-0.3/config.sub
@@ -1,44 +1,40 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2016-11-04'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patc...@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches to <config-patc...@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -57,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-   $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -72,8 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +114,18 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
 os=-$maybe_os
 bas

Bug#817579: mendexk: Removal of debhelper compat 4

[Logan Rosen]

Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/compat: Bump to 10.
  * debian/control:
- Build-depend on debhelper (>= 10).
- Depend on ${misc:Depends}.
  * debian/rules:
- Use dh_prep instead of dh_clean -k.
- Add recommended build-arch and build-indep targets.

Thanks for considering the patch.

Logan Rosen
diff -u mendexk-2.6e/debian/compat mendexk-2.6e/debian/compat
--- mendexk-2.6e/debian/compat
+++ mendexk-2.6e/debian/compat
@@ -1 +1 @@
-4
+10
diff -u mendexk-2.6e/debian/control mendexk-2.6e/debian/control
--- mendexk-2.6e/debian/control
+++ mendexk-2.6e/debian/control
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Masayuki Hatta (mhatta) <mha...@debian.org>
 Standards-Version: 3.8.0
-Build-Depends: libkpathsea-dev, debhelper (>> 4.0.0)
+Build-Depends: libkpathsea-dev, debhelper (>= 10)
 
 Package: mendexk
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: a replacement for makeindex with many enhancements
  This is an upper-compatible(but slow) substitute for the makeindex program
  which forms part of standard TeX distribution.  Mendex features better 
diff -u mendexk-2.6e/debian/rules mendexk-2.6e/debian/rules
--- mendexk-2.6e/debian/rules
+++ mendexk-2.6e/debian/rules
@@ -7,7 +7,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
dh_testdir
 
@@ -30,7 +32,7 @@
 install-stamp: build-stamp
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
 
# Add here commands to install the package into debian/mendexk.