Upload to Plucky

debian/changelog

@@ -1,3 +1,16 @@
+lxqt-sudo (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream version.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:17 -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.

debian/control

@@ -1,6 +1,6 @@
 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: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
@@ -10,14 +10,14 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libkf6windowsystem-dev,
-               liblxqt2-dev (>= 1.4.0),
+               liblxqt2-dev (>= 2.1.0),
                libx11-dev,
-               qt6-svg-dev
+               qt6-svg-dev (>= 6.6.0)
 Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-sudo-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
+Debian-Vcs-Browser: https://salsa.debian.org/cgit/pkg-team/lxqt-sudo
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-sudo.git
 Homepage: https://github.com/lxqt/lxqt-sudo
 Rules-Requires-Root: no
 

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
-@@ -83,6 +83,7 @@ namespace
+@@ -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"
@@ -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())
-@@ -113,8 +114,13 @@ namespace
+@@ -114,8 +115,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, ","});
-@@ -195,6 +201,10 @@ int Sudo::main()
+@@ -196,6 +202,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
-@@ -286,11 +296,11 @@ void Sudo::child()
+@@ -287,11 +297,13 @@ void Sudo::child()
      switch (mBackend)
      {
          case BACK_SUDO:
@@ -54,12 +54,14 @@ 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);
-+                *(param_arg++) = preserve_env_param.c_str(); //preserve environment
++            } else {
++                preserve_env_param = "--preserve-env";
 +            }
++            *(param_arg++) = preserve_env_param.c_str();
              *(param_arg++) = "/bin/sh";
              break;
          case BACK_DOAS:
-@@ -298,7 +308,7 @@ void Sudo::child()
+@@ -299,7 +311,7 @@ void Sudo::child()
              [[fallthrough]];
          case BACK_SU:
          case BACK_NONE: