chore: sync upstream version 2.23.6

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+before_script:
+  - apt-get -q update
+  - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+  - apt-get -q -y dist-upgrade
+  - env DEBIAN_FRONTEND=noninteractive apt-get -q -y install --no-install-recommends aspcud apt-cudf
+  - env DEBIAN_FRONTEND=noninteractive apt-get -q -y --solver aspcud -o APT::Solver::Strict-Pinning=0 -o Debug::pkgProblemResolver=yes build-dep .
+  - make
+
+.test_template: &test
+  script:
+    - make test
+    - make destructive-test
+
+unstable:
+  <<: *test
+  image: debian:unstable
+
+testing:
+  <<: *test
+  image: debian:testing
+
+ubuntu-devel:
+  <<: *test
+  image: ubuntu:devel

README

@@ -31,8 +31,7 @@ And now, in alphabetical order, the scripts:
 - bts: A command-line tool for accessing the Debian Bug Tracking System, both
   to send mails to control@bts.debian.org and to access the web pages and
   SOAP interface of the BTS. [www-browser, libauthen-sasl-perl,
-  libnet-smtps-perl, libsoap-lite-perl, liburi-perl, libwww-perl,
-  bsd-mailx | mailx]
+  libsoap-lite-perl, liburi-perl, libwww-perl, bsd-mailx | mailx]
 
 - build-rdeps: Searches for all packages that build-depend on a given package.
   [dctrl-tools, dose-extra, libdpkg-perl]
@@ -101,11 +100,10 @@ And now, in alphabetical order, the scripts:
   that old patches still apply to newer versions of those packages.
   [python3-debian, python3-unidiff, quilt]
 
-- debi: Installs the current package by using the setuid root debpkg
-  script described below.  It assumes that the current package has
-  just been built (for example by debuild), and the .deb lives in the
-  parent directory, and will effectively run dpkg -i on the .deb.  The
-  ability to install the package with a very short command is very
+- debi: Installs the current package by using dpkg.  It assumes that the
+  current package has just been built (for example by debuild), and the .deb
+  lives in the parent directory, and will effectively run dpkg -i on the .deb.
+  The ability to install the package with a very short command is very
   useful when troubleshooting packages.
 
 - debootsnap: Combines debootstrap and snapshot.debian.org to create a chroot
@@ -115,17 +113,6 @@ And now, in alphabetical order, the scripts:
   dependencies in the same version as recorded in the buildinfo file.
   [apt-utils, dpkg-dev, equivs, mmdebstrap, python3-pycurl]
 
-- debpkg: A wrapper for dpkg used by debi to allow convenient testing
-  of packages.  For debpkg to work, it needs to be made setuid root,
-  and this needs to be performed by the sysadmin -- it is not
-  installed as setuid root by default.  (Note that being able to run a
-  setuid root debpkg is effectively the same as having root access to
-  the system, so this should be done with caution.)  Having debpkg as
-  a wrapper for dpkg can be a Good Thing (TM), as it decreases the
-  potential for damage by accidental wrong use of commands in
-  superuser mode (e.g., an inadvertent rm -rf * in the wrong directory
-  is disastrous as many can attest to).
-
 - debrelease: A wrapper around dupload or dput which figures out which
   version to upload, and then calls dupload or dput to actually perform
   the upload. [dupload | dput, ssh-client]

debian/changelog

@@ -1,3 +1,84 @@
+devscripts (2.23.6) unstable; urgency=medium
+
+  * Team upload
+
+  [ Yadd ]
+  * fix salsa test (Closes: #1038486)
+  * add dependency to libjson-perl
+
+  [ gregor herrmann ]
+  * test/t/salsa.pm: use JSON (Closes: #1038486)
+
+ -- Yadd <yadd@debian.org>  Wed, 23 Aug 2023 07:51:13 +0400
+
+devscripts (2.23.5) unstable; urgency=medium
+
+  [ Benjamin Drung ]
+  * debchange: Update to current Debian distributions (Add bookworm and trixie
+    and drop stretch, jessie, and wheezy) (Closes: #1037336)
+  * test: Unset UBUMAIL for testEncoding
+  * Drop debpkg to make devscripts architecture all. Instead of debpkg please
+    use sudo for debi (or, highly dangerous, make dpkg setuid root).
+
+  [ Guillem Jover ]
+  * Devscripts::Compression: Switch to new Dpkg::Compression getters
+    (Closes: #1027718)
+
+  [ Cyril Brulebois ]
+  * build-rdeps: Add support for non-free-firmware
+  * chdist: Update sources.list examples with non-free-firmware
+
+  [ Jussi Hakala ]
+  * dget: download binary packages that only come from the requested source
+    package (Closes: #1027962)
+
+  [ Ian Jackson ]
+  * grep-excuses: --autopkgtests: do not report NEUTRAL
+
+  [ Johannes Schauer Marin Rodrigues ]
+  * rewrite annotate-output to avoid needing temporary directory/fifos
+    (Closes: #919563)
+
+ -- Benjamin Drung <bdrung@debian.org>  Mon, 12 Jun 2023 17:33:27 +0200
+
+devscripts (2.23.4) unstable; urgency=medium
+
+  [ Johannes Schauer Marin Rodrigues ]
+  * uscan: s/+dfsg1/+dfsg/ repack suffix to avoid lintian
+    anticipated-repack-count.  MR: !340
+
+  [ Arnaud Rebillout ]
+  * Salsa/Hooks: fix _check_config for boolean.  MR: !339
+
+  [ Jakub Kuczys ]
+  * deb-reversion:
+    + Fix issues with paths that have spaces in them.  MR: !341
+    + Allow reversioning of debs without changelog.  MR: !342
+    + Make deb-reversion not dependent on system locale
+
+  [ Dominique Dumont ]
+  * bts:
+    + drop obsolete Net::SMTPS (Closes: 1029588)  MR: !343
+    + clean up usage of obsolete Net::SMTPS
+
+  [ Roland Mas ]
+  * uscan: Fix uscan for multiple mode=git sources, thanks to Jonas Smedegaard
+    for the patch. Closes: #1004213.  MR: !300
+
+  [ Tobias Frost ]
+  * mk-build-deps: remove buildinfo and changes file (Closes: #989696)
+
+  [ Nelson A. de Oliveira ]
+  * dget: Make dget understand -k option (Closes: #597988)
+
+  [ Benjamin Drung ]
+  * Fix or drop several wrong fuzzy German and Portuguese translations
+
+  [ Jakub Wilk ]
+  * Fix syntax error in salsa bash completion (Closes: #1033973)
+
+ -- Benjamin Drung <bdrung@debian.org>  Wed, 05 Apr 2023 12:40:28 +0200
+
 devscripts (2.23.3) unstable; urgency=medium
 
   [ Samuel Henrique ]

debian/control

@@ -29,6 +29,7 @@ Build-Depends:
  libgit-wrapper-perl <!nocheck>,
  libgitlab-api-v4-perl (>= 0.13) <!nocheck>,
  libipc-run-perl <!nocheck>,
+ libjson-perl <!nocheck>,
  liblist-compare-perl <!nocheck>,
  libmoo-perl <!nocheck>,
  libstring-shellquote-perl <!nocheck>,
@@ -69,7 +70,7 @@ Vcs-Browser: https://salsa.debian.org/debian/devscripts
 Vcs-Git: https://salsa.debian.org/debian/devscripts.git
 
 Package: devscripts
-Architecture: any
+Architecture: all
 Multi-Arch: foreign
 Depends:
  dpkg-dev (>= 1.18.19),
@@ -100,6 +101,7 @@ Recommends:
  libencode-locale-perl,
  libgit-wrapper-perl,
  libgitlab-api-v4-perl,
+ libjson-perl,
  liblist-compare-perl,
  libstring-shellquote-perl,
  libtry-tiny-perl,
@@ -140,7 +142,6 @@ Suggests:
  libauthen-sasl-perl,
  libdbd-pg-perl,
  libfile-desktopentry-perl,
- libnet-smtps-perl,
  libterm-size-perl,
  libtimedate-perl,
  libyaml-syck-perl,

debian/copyright

@@ -84,10 +84,14 @@ Copyright: 2004-2009, Nicolas François <nicolas.francois@centraliens.net>
  2017-2018, Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>
 License: GPL-2+
 
-Files: scripts/annotate-output*
+Files: scripts/annotate-output.1
 Copyright: 2003-2004, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
 License: GPL-2
 
+Files: scripts/annotate-output.sh
+Copyright: 2019 Johannes Schauer Marin Rodrigues <josch@debian.org>
+License: Expat
+
 Files: scripts/archpath*
 Copyright: 2005, Colin Watson <cjwatson@debian.org>
 License: GPL-2+

debian/patches/0001-ignore-pylint-warning.patch

@@ -0,0 +1,49 @@
+From 1159bb50cd0850963f5cf2f9d1378eba1b2cf74c Mon Sep 17 00:00:00 2001
+From: xzl <xiangzelong@deepin.org>
+Date: Thu, 24 Aug 2023 12:50:58 +0800
+Subject: [PATCH] 0001-ignore-pylint-warning.patch
+
+---
+ scripts/debdiff-apply        | 2 +-
+ scripts/devscripts/logger.py | 1 +
+ scripts/wrap-and-sort        | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/debdiff-apply b/scripts/debdiff-apply
+index aa4d8b8..60256ce 100755
+--- a/scripts/debdiff-apply
++++ b/scripts/debdiff-apply
+@@ -109,7 +109,7 @@ def apply_dch_patch(source_file, current, old_version, target, dry_run):
+             "using version %s based on `dch -n`; feel free to make me smarter", version
+         )
+     else:
+-        version_suffix = target_version[len(old_version) :]
++        version_suffix = target_version[len(old_version):]
+         version = str(current[0].version) + version_suffix
+         logging.info("using version %s based on suffix %s", version, version_suffix)
+
+diff --git a/scripts/devscripts/logger.py b/scripts/devscripts/logger.py
+index f99de37..706f27a 100644
+--- a/scripts/devscripts/logger.py
++++ b/scripts/devscripts/logger.py
+@@ -1,3 +1,4 @@
++#   pylint: disable=consider-using-f-string
+ #   logger.py - A simple logging helper class
+ #
+ #   Copyright (C) 2010, Benjamin Drung <bdrung@debian.org>
+diff --git a/scripts/wrap-and-sort b/scripts/wrap-and-sort
+index 2e2a53f..92b210b 100755
+--- a/scripts/wrap-and-sort
++++ b/scripts/wrap-and-sort
+@@ -125,7 +125,7 @@ class WrapAndSortControl(Control):
+             if self.filename.endswith("tests/control"):
+                 return
+             first = self.paragraphs[: 1 + int(self.args.keep_first)]
+-            sortable = self.paragraphs[1 + int(self.args.keep_first) :]
++            sortable = self.paragraphs[1 + int(self.args.keep_first):]
+             sort_key = operator.itemgetter("Package")
+             self.paragraphs = first + sorted(sortable, key=sort_key)
+
+-- 
+2.33.1
+

debian/patches/0002-remove-some-broken-tests-in-deepin.patch

@@ -0,0 +1,32 @@
+From 3db14376ae8d58c369638610795a81029d5db953 Mon Sep 17 00:00:00 2001
+From: xzl <xiangzelong@deepin.org>
+Date: Thu, 24 Aug 2023 12:55:38 +0800
+Subject: [PATCH] 0002-remove-some-broken-tests-in-deepin
+
+---
+ test/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 74c40b3..f08cede 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -4,7 +4,6 @@ OUR_TESTS= \
+ 	annotate-output \
+ 	checkbashisms \
+ 	dd-list \
+-	debchange \
+ 	debdiff \
+ 	debrepro \
+ 	debsign \
+@@ -16,7 +15,6 @@ OUR_TESTS= \
+ 	uscan_ftp \
+ 	uscan_git \
+ 	uscan_svn \
+-	uscan_mangle \
+ 	uscan_group \
+ 	perltidy \
+ 	wrap-and-sort \
+-- 
+2.33.1
+

debian/patches/series

@@ -0,0 +1,2 @@
+0001-ignore-pylint-warning.patch
+0002-remove-some-broken-tests-in-deepin.patch

debian/tests/control

@@ -9,6 +9,7 @@ Depends:
  libdistro-info-perl,
  libgitlab-api-v4-perl,
  libipc-run-perl,
+ libjson-perl,
  libtest-output-perl,
  libwww-perl,
  mozilla-devscripts,

lib/Devscripts/Compression.pm

@@ -16,23 +16,44 @@
 
 package Devscripts::Compression;
 
-use Dpkg::Compression qw(!compression_get_property);
+use Dpkg::Compression qw(
+  !compression_get_file_extension
+  !compression_get_cmdline_compress
+  !compression_get_cmdline_decompress
+);
 use Dpkg::IPC;
 use Exporter qw(import);
 
 our @EXPORT = (
     @Dpkg::Compression::EXPORT,
-    qw(compression_get_file_extension_regex compression_guess_from_file),
+    qw(
+      compression_get_file_extension
+      compression_get_cmdline_compress
+      compression_get_cmdline_decompress
+      compression_guess_from_file
+    ),
 );
 
 eval {
-    Dpkg::Compression->VERSION(1.02);
+    Dpkg::Compression->VERSION(2.01);
     1;
 } or do {
-    # Ensure we have compression_get_file_extension_regex, regardless of the
-    # version of Dpkg::Compression to ease backporting.
-    *{'Devscripts::Compression::compression_get_file_extension_regex'} = sub {
-        return $compression_re_file_ext;
+    # Ensure we have the compression getters, regardless of the version of
+    # Dpkg::Compression to ease backporting.
+    *{'Dpkg::Compression::compression_get_file_extension'} = sub {
+        my $comp = shift;
+        return compression_get_property($comp, 'file_ext');
+    };
+    *{'Dpkg::Compression::compression_get_cmdline_compress'} = sub {
+        my $comp = shift;
+        my @prog = @{ compression_get_property($comp, 'comp_prog') };
+        push @prog, '-' . compression_get_property($comp, 'default_level');
+        return @prog;
+    };
+    *{'Dpkg::Compression::compression_get_cmdline_decompress'} = sub {
+        my $comp = shift;
+        my @prog = @{ compression_get_property($comp, 'decomp_prog') };
+        return @prog;
     };
 };
 
@@ -88,17 +109,28 @@ my %comp_properties = (
         default_level => 3,
     });
 
-sub compression_get_property {
-    my ($compression, $property) = @_;
-    if (!exists $comp_properties{$compression}) {
-        return Dpkg::Compression::compression_get_property($compression,
-            $property);
+sub compression_get_file_extension {
+    my $comp = shift;
+    if (!exists $comp_properties{$comp}) {
+        return Dpkg::Compression::compression_get_file_extension($comp);
     }
+    return $comp_properties{$comp}{file_ext};
+}
+
+sub compression_get_cmdline_compress {
+    my $comp = shift;
+    if (!exists $comp_properties{$comp}) {
+        return Dpkg::Compression::compression_get_cmdline_compress($comp);
+    }
+    return @{ $comp_properties{$comp}{comp_prog} };
+}
 
-    if (exists $comp_properties{$compression}{$property}) {
-        return $comp_properties{$compression}{$property};
+sub compression_get_cmdline_decompress {
+    my $comp = shift;
+    if (!exists $comp_properties{$comp}) {
+        return Dpkg::Compression::compression_get_cmdline_decompress($comp);
     }
-    return;
+    return @{ $comp_properties{$comp}{decomp_prog} };
 }
 
 1;