[Pkg-xfce-commits] [Git][xfce-team/desktop/xfce4-session][debian/master] 3 commits: d/patches: import upstream patch to fix bashism in xflock4

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / xfce4-session


Commits:
3a7d141f by Yves-Alexis Perez at 2025-03-29T09:38:18+01:00
d/patches: import upstream patch to fix bashism in xflock4

Closes: #1101192

- - - - -
5b171b79 by Yves-Alexis Perez at 2025-03-29T09:38:39+01:00
finalize changelog

- - - - -
ee21c870 by Yves-Alexis Perez at 2025-03-29T09:45:36+01:00
upload xfce4-session 4.20.2-2 to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-Use-syntax-compatible-with-most-sh-shells.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+xfce4-session (4.20.2-2) unstable; urgency=high
+
+  * Urgency=high for security fix.
+  * d/patches: import upstream patch to fix bashism in xflock4
+    (Closes: #1101192)
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 29 Mar 2025 09:38:45 +0100
+
 xfce4-session (4.20.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001-Use-syntax-compatible-with-most-sh-shells.patch
=====================================
@@ -0,0 +1,36 @@
+From 53d6e20a29948ae7aa179447cef0704786b77f8b Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad at madpilot.net>
+Date: Wed, 26 Mar 2025 09:55:05 +0100
+Subject: [PATCH] Use syntax compatible with most sh shells.
+
+The `**` syntax is a bash extension.
+
+Reported by: Tijl Coosemans <tijl at FreeBSD.org> (patch also suggested by him)
+
+(cherry picked from commit e084c7694554ad64462dd8675bb9fc466bb32ce7)
+---
+ scripts/xflock4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/xflock4 b/scripts/xflock4
+index 45c2d063..d1f7cef9 100755
+--- a/scripts/xflock4
++++ b/scripts/xflock4
+@@ -47,12 +47,12 @@ esac
+ [ -t 0 ] && sleep 1
+ 
+ # echo is used to strip blanks
+-# $((2**31 - 1)) is MAXINT, which disables timeout: see
++# $(((1<<31)-1)) is MAXINT, which disables timeout: see
+ # https://dbus.freedesktop.org/doc/api/html/group__DBusPendingCall.html
+ ret=$(echo $(dbus-send --session \
+                        --dest=org.xfce.SessionManager \
+                        --print-reply=literal \
+-                       --reply-timeout=$((2**31 - 1)) \
++                       --reply-timeout=$(((1<<31)-1)) \
+                        --type=method_call \
+                        /org/xfce/SessionManager \
+                        org.xfce.Session.Manager.Lock))
+-- 
+2.49.0
+


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Use-syntax-compatible-with-most-sh-shells.patch



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/56409a91bb2edf93e7af0a18fa1e3eef6dfeaa30...ee21c870b5fcf6f6c3ca9f37bfc2e3fcbec7a91e

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/xfce4-session/-/compare/56409a91bb2edf93e7af0a18fa1e3eef6dfeaa30...ee21c870b5fcf6f6c3ca9f37bfc2e3fcbec7a91e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20250329/a6590184/attachment-0001.htm>