[neon/kf6/kf6-kdbusaddons/Neon/release_jammy] debian/patches: Update env_vars_leaking_in_snaps with patch that has landed in master
Carlos De Maine
null at kde.org
Tue Aug 13 12:26:26 BST 2024
Git commit 29c94e692d149846ffc63d0314762a3a3f2c6002 by Carlos De Maine.
Committed on 13/08/2024 at 11:26.
Pushed by carlosdem into branch 'Neon/release_jammy'.
Update env_vars_leaking_in_snaps with patch that has landed in master
M +0 -28 debian/patches/env_vars_leaking_in_snaps
https://invent.kde.org/neon/kf6/kf6-kdbusaddons/-/commit/29c94e692d149846ffc63d0314762a3a3f2c6002
diff --git a/debian/patches/env_vars_leaking_in_snaps b/debian/patches/env_vars_leaking_in_snaps
index 08da67c..279643d 100644
--- a/debian/patches/env_vars_leaking_in_snaps
+++ b/debian/patches/env_vars_leaking_in_snaps
@@ -8,31 +8,3 @@ index 981666e51bf6d4e40f349d60e7b78770239fb18d..6af300301dab70e2273f672e74f6629a
static bool isPosixName(const QString &name);
+ static bool isProcessConfinementName(const QString &name);
static bool isSystemdApprovedValue(const QString &value);
-
- KUpdateLaunchEnvironmentJob *q;
-@@ -71,6 +72,10 @@ void KUpdateLaunchEnvironmentJob::start()
- qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name contains unsupported characters";
- continue;
- }
-+ if (KUpdateLaunchEnvironmentJobPrivate::isProcessConfinementName(varName)) {
-+ qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name is related to process specific confinement";
-+ continue;
-+ }
- const QString value = d->environment.value(varName);
-
- // plasma-session
-@@ -137,6 +142,14 @@ bool KUpdateLaunchEnvironmentJobPrivate::isPosixName(const QString &name)
- return !first;
- }
-
-+bool KUpdateLaunchEnvironmentJobPrivate::isProcessConfinementName(const QString &name)
-+{
-+ if (name == QStringLiteral("SNAP") || name.startsWith(QStringLiteral("SNAP_"))) {
-+ return true;
-+ }
-+ return false;
-+}
-+
- bool KUpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(const QString &value)
- {
- // systemd code checks that a value contains no control characters except \n \t
More information about the Neon-commits
mailing list