Update build deps

This reverts commit 3f6e60c63fabf715e01e329904279a9cd195cdac.

debian/changelog

@@ -1,48 +1,153 @@
-lxqt-sudo (0.15.0-0ubuntu1) groovy; urgency=medium
+lxqt-sudo (2.2.0-0ubuntu1) questing; urgency=medium
 
   * New upstream release.
-    - Update upstream signing key.
+    - Update build dependencies.
-    - Update LXQt build dependencies.
+  * Update copyright file.
-  * Update Standards-version to 4.5.0, no changes needed.
+  * Update Standards-Version to 4.7.2, no changes needed.
-  * Migrate to debhelper-compat.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:15:22 -0500
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 31 Jul 2025 16:30:59 -0500
 
-lxqt-sudo (0.14.1-0ubuntu1) disco; urgency=medium
+lxqt-sudo (2.1.0-0ubuntu3) plucky; urgency=medium
 
-  * New upstream release.
+  * Update Standards-Version to 4.7.1, no changes needed.
-  * Run wrap-and-sort.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 13:20:31 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:53:25 -0600
 
-lxqt-sudo (0.14.0-0ubuntu1) disco; urgency=medium
+lxqt-sudo (2.1.0-0ubuntu2) plucky; urgency=medium
 
-  * New upstream release.
+  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:59:31 -0600
+
+lxqt-sudo (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream version.
     - Bump build dependencies.
-    - Remove reverse-applicable patches.
-  * Bump Standards-version to 4.3.0, no changes needed.
-  * Bump debhelper compat to 12, no changes needed.
-  * Add a new lxqt-sudo-l10n package.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:55:00 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:17 -0600
 
-lxqt-sudo (0.13.0-0ubuntu2) cosmic; urgency=medium
+lxqt-sudo (2.0.0-0ubuntu2) plucky; urgency=medium
 
-  * Change Uploaders to Ubuntu uploaders.
+  * Update the patch to pass through env vars.
-  * Bump Standards-version to 4.2.0, no changes needed.
-  * Run wrap-and-sort.
-  * Fix the layout and line break so text isn't cut off.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 20 Aug 2018 23:47:43 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Oct 2024 17:09:37 -0500
 
-lxqt-sudo (0.13.0-0ubuntu1) cosmic; urgency=medium
+lxqt-sudo (2.0.0-0ubuntu1) oracular; urgency=medium
 
   * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
+  * Update copyright file.
-  * Update build dependencies.
+  * Drop enable-bidirectional-communication.patch, applied upstream.
-  * Update copyright.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust dependencies.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:52:43 -0500
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:43:15 -0500
+
+lxqt-sudo (1.4.0-0ubuntu2) noble; urgency=medium
+
+  * Patch in bidirectional communication support (see
+    https://github.com/lxqt/lxqt-sudo/pull/210)
+  * Updated copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 11 Jan 2024 19:26:41 +0000
+
+lxqt-sudo (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Update copyright years.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 19:13:47 -0600
+
+lxqt-sudo (1.3.0-0ubuntu1.1) mantic; urgency=medium
+
+  * Add a -E option, exposing all environment variables (LP: #2039093).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 11 Oct 2023 12:02:21 -0500
+
+lxqt-sudo (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+  * Install new lxqtdoas binary.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:51:31 -0500
+
+lxqt-sudo (1.2.0-1ubuntu1) lunar; urgency=medium
+
+  * Reverted a sync from Debian.
+  * Bumped Standards-Version to 4.6.2, no changes necessary.
+  * Removed obsolete 'override_dh_missing' section from debian/rules.
+  * Updated copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 16 Feb 2023 20:20:33 -0600
+
+lxqt-sudo (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build dependencies in debian/control.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:51:41 -0600
+
+lxqt-sudo (1.1.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Removed trailing whitespace from changelog.
+  * Ran wrap-and-sort.
+  * Upstreamed packaging changes from Ubuntu, modifying the following files:
+    - control
+    - copyright
+    - rules
+    - upstream/*
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:57:33 -0500
+
+lxqt-sudo (0.16.0-1) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * Switched to gbp
+  * Bumped Standards-Version to 4.4.0, no changes needed
+
+  [ Andrew Lee (李健秋) ]
+  * New upstream release. (Closes: #978214)
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 18:17:56 +0800
+
+lxqt-sudo (0.14.1-2) unstable; urgency=medium
+
+  * Set HOME right, don't strip TERM (Closes: #928941)
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 13 May 2019 19:56:39 +0200
+
+lxqt-sudo (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.1.
+  * Bumped minimum version liblxqt0-dev (>= 0.14.1~)
+  * Extended package description a bit
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 24 Feb 2019 22:25:49 +0100
+
+lxqt-sudo (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.14.0.
+  * Bumped Standards to 4.3.0, no changes needed
+  * Dropped d/compat, use debhelper-compat = 12, no changes needed
+  * Fixed years in d/copyright
+  * Bumped minimum version liblxqt0-dev (>= 0.14.0~)
+  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+  * Added l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 19:32:15 +0100
+
+lxqt-sudo (0.13.0-1) unstable; urgency=medium
+
+  * Cherry-picking new upstream version 0.13.0.
+  * Bumped build dependency liblxqt0-dev to >= 0.13.0~
+  * Bumped year in copyright
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 25 May 2018 00:02:41 +0200
 
 lxqt-sudo (0.12.0-4) unstable; urgency=medium
 

debian/control

@@ -1,21 +1,25 @@
 Source: lxqt-sudo
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
-               libkf5windowsystem-dev,
+               libkf6windowsystem-dev,
-               liblxqt0-dev (>= 0.15.0),
+               liblxqt2-dev (>= 2.2.0),
-               libqt5svg5-dev,
+               libx11-dev,
-               libqt5x11extras5-dev,
+               qt6-svg-dev (>= 6.6.0)
-               libx11-dev
+Standards-Version: 4.7.2
-Standards-Version: 4.5.0
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-sudo/
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging.git
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-sudo.git
+Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
-XS-Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
 Homepage: https://github.com/lxqt/lxqt-sudo
+Rules-Requires-Root: no
 
 Package: lxqt-sudo
 Architecture: any
@@ -32,8 +36,8 @@ Package: lxqt-sudo-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
-Breaks: lxqt-sudo (<< 0.11.0)
-Replaces: lxqt-sudo (<< 0.11.0)
 Description: Language package for lxqt-sudo
+ The l10n files for lxqt-sudo.
+ .
  This package contains the l10n files needed by lxqt-sudo.

debian/copyright

@@ -3,13 +3,16 @@ Upstream-Name: lxqt-sudo
 Source: https://github.com/lxqt/lxqt-sudo
 
 Files: *
-Copyright: 2015-2018 LXQt team
+Copyright: 2015-2025 LXQt team
+           2015-2018 Palo Kisa <palo.kisa@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2015-2018 Alf Gaida <agaida@siduction.org>
+Copyright: 2021-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2015-2019 Alf Gaida <agaida@siduction.org>
                 2015 Andrew Lee (李健秋) <ajqlee@debian.org>
                 2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+                2025 Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+

debian/lxqt-sudo.install

@@ -1,6 +1,8 @@
+usr/bin/lxdoas
 usr/bin/lxqt-sudo
 usr/bin/lxsu
 usr/bin/lxsudo
+usr/share/man/man1/lxdoas.1
 usr/share/man/man1/lxqt-sudo.1
 usr/share/man/man1/lxsu.1
 usr/share/man/man1/lxsudo.1

debian/patches/bypass-envvar-allowlist.patch

@@ -0,0 +1,82 @@
+Description: Add a -E option, exposing all environment variables
+ Some system tools (such as ubuntu-release-upgrader) read XDG* (etc.), so allow the user to opt-in to preserving those.
+Author: Simon Quigley <tsimonq2@lubuntu.me>
+Origin: upstream
+Forwarded: https://github.com/lxqt/lxqt-sudo/pull/204
+Last-Update: 2023-10-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sudo.cpp
++++ b/sudo.cpp
+@@ -84,6 +84,7 @@ namespace
+                     "    -s|--su        Use %3(1) as backend.\n"
+                     "    -d|--sudo      Use %2(8) as backend.\n"
+                     "    -a|--doas      Use %4(1) as backend.\n"
++                    "    -E|--keep-env  Preserve all existing environment variables.\n"
+                     "  command          Command to run.\n"
+                     "  arguments        Optional arguments for command.\n\n").arg(app_master).arg(sudo_prog).arg(su_prog).arg(doas_prog);
+         if (!err.isEmpty())
+@@ -114,8 +115,13 @@ namespace
+     };
+     assert_helper h;
+ 
+-    inline std::string env_workarounds()
++    inline std::string env_workarounds(bool preserveEnv)
+     {
++        if (preserveEnv) {
++            std::cerr << LXQTSUDO << ": Preserving all environment variables.\n";
++            return "";
++        }
++
+         std::cerr << LXQTSUDO << ": Stripping child environment except for: ";
+         std::ostringstream left_env_params;
+         std::copy(ALLOWED_VARS, ALLOWED_END - 1, std::ostream_iterator<const char *>{left_env_params, ","});
+@@ -196,6 +202,10 @@ int Sudo::main()
+         {
+             mBackend = BACK_DOAS;
+             mArgs.removeAt(0);
++        } else if (QStringLiteral("-E") == arg1 || QStringLiteral("--keep-env") == arg1)
++        {
++            mPreserveEnv = true;
++            mArgs.removeAt(0);
+         }
+     }
+     //any other arguments we simply forward to su/sudo
+@@ -287,11 +297,13 @@ void Sudo::child()
+     switch (mBackend)
+     {
+         case BACK_SUDO:
+-            preserve_env_param = "--preserve-env=";
+-
+-            preserve_env_param += env_workarounds();
+-
+-            *(param_arg++) = preserve_env_param.c_str(); //preserve environment
++            if(!mPreserveEnv) {
++                preserve_env_param = "--preserve-env=";
++                preserve_env_param += env_workarounds(mPreserveEnv);
++            } else {
++                preserve_env_param = "--preserve-env";
++            }
++            *(param_arg++) = preserve_env_param.c_str();
+             *(param_arg++) = "/bin/sh";
+             break;
+         case BACK_DOAS:
+@@ -299,7 +311,7 @@ void Sudo::child()
+             [[fallthrough]];
+         case BACK_SU:
+         case BACK_NONE:
+-            env_workarounds();
++            env_workarounds(mPreserveEnv);
+             break;
+ 
+     }
+--- a/sudo.h
++++ b/sudo.h
+@@ -81,6 +81,7 @@ private:
+     int mChildPid;
+     int mPwdFd;
+     int mRet;
++    bool mPreserveEnv = false;
+ };
+ 
+ #endif //SUDO_H

debian/patches/series

@@ -0,0 +1 @@
+bypass-envvar-allowlist.patch

debian/rules

@@ -2,7 +2,6 @@
 # export DH_VERBOSE=1
 
 export LC_ALL=C.UTF-8
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
@@ -10,6 +9,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DPULL_TRANSLATIONS=OFF \
 		-DUPDATE_TRANSLATIONS=OFF \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo

debian/salsa-ci.yml

@@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: lxqt-sudo
+Bug-Database: https://github.com/lxqt/lxqt-sudo/issues
+Bug-Submit: https://github.com/lxqt/lxqt-sudo/issues/new
+Changelog: https://github.com/lxqt/lxqt-sudo/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-sudo

debian/watch

@@ -1,3 +1,5 @@
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
+opts="searchmode=plain, \
-https://github.com/lxqt/lxqt-sudo/releases .*/lxqt-sudo-([\d\.]+).tar.xz
+pgpsigurlmangle=s/$/.asc/, \
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz