Backport to Mantic.

debian/changelog

@@ -1,33 +1,8 @@
-lxqt-sudo (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-sudo (1.4.0-0ubuntu1~ppa1) mantic; urgency=medium
 
-  * New upstream version.
+  * Backport to Mantic.
-    - Bump build dependencies.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:17 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 16 Nov 2023 15:11:07 -0600
-
-lxqt-sudo (2.0.0-0ubuntu2) plucky; urgency=medium
-
-  * Update the patch to pass through env vars.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Oct 2024 17:09:37 -0500
-
-lxqt-sudo (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Drop enable-bidirectional-communication.patch, applied upstream.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust dependencies.
-
- -- 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
 

debian/control

@@ -1,6 +1,6 @@
 Source: lxqt-sudo
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
@@ -9,15 +9,16 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libkf6windowsystem-dev,
+               libkf5windowsystem-dev,
-               liblxqt2-dev (>= 2.1.0),
+               liblxqt1-dev (>= 1.4.0),
-               libx11-dev,
+               libqt5svg5-dev,
-               qt6-svg-dev (>= 6.6.0)
+               libqt5x11extras5-dev,
-Standards-Version: 4.7.0
+               libx11-dev
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging.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
 
@@ -36,7 +37,7 @@ Package: lxqt-sudo-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-sudo
  The l10n files for lxqt-sudo.
  .

debian/copyright

@@ -3,12 +3,12 @@ Upstream-Name: lxqt-sudo
 Source: https://github.com/lxqt/lxqt-sudo
 
 Files: *
-Copyright: 2015-2024 LXQt team
+Copyright: 2015-2023 LXQt team
            2015-2018 Palo Kisa <palo.kisa@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2023 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>

debian/patches/bypass-envvar-allowlist.patch

@@ -8,7 +8,7 @@ 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
+@@ -83,6 +83,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"
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                      "  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
+@@ -113,8 +114,13 @@ namespace
      };
      assert_helper h;
  
@@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          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()
+@@ -195,6 +201,10 @@ int Sudo::main()
          {
              mBackend = BACK_DOAS;
              mArgs.removeAt(0);
@@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          }
      }
      //any other arguments we simply forward to su/sudo
-@@ -287,11 +297,13 @@ void Sudo::child()
+@@ -286,11 +296,11 @@ void Sudo::child()
      switch (mBackend)
      {
          case BACK_SUDO:
@@ -54,14 +54,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +            if(!mPreserveEnv) {
 +                preserve_env_param = "--preserve-env=";
 +                preserve_env_param += env_workarounds(mPreserveEnv);
-+            } else {
++                *(param_arg++) = preserve_env_param.c_str(); //preserve environment
-+                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()
+@@ -298,7 +308,7 @@ void Sudo::child()
              [[fallthrough]];
          case BACK_SU:
          case BACK_NONE: