Merge ~jchittum/ubuntu/+source/byobu:plucky-lp-2052610 into ubuntu/+source/byobu:ubuntu/devel

[John Chittum]

lp: #2052610

Unmerged commits

7d4db62... by John Chittum on 2025-03-04

d/control update maintainers

f6ca4e7... by John Chittum on 2025-03-04

d/changelog update

3c3a8be... by John Chittum on 2025-03-03

d/patches/lp-2052610: strip by digits

strip time EPOCHREALTIME by digit not decimal separator
original code stripped only by period defined decimal.
Some locales separate by comma. The goal is to strip to a
non-decimal, so instead only using allowing digits,
and using start of string ensures safety. LP: #2052610

diff --git a/debian/changelog b/debian/changelog
index 9a0718e..a2a5e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+byobu (6.11-0ubuntu2) plucky; urgency=medium
+
+  * d/patches/lp-2052610: substitute only digits.
+    Original code hardcoded a period as the decimal
+    separator. This breaks in locales that use commas.
+    Thank you gh: jakubskopal LP: #2052610
+
+ -- John Chittum <[e-mail]>  Mon, 03 Mar 2025 14:50:35 -0500
+
 byobu (6.11-0ubuntu1) noble; urgency=medium
 
   * usr/share/byobu/profiles/bashrc:
diff --git a/debian/control b/debian/control
index fa02a92..3086919 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: byobu
 Section: misc
 Priority: optional
-Maintainer: Dustin Kirkland <[e-mail]>
+Maintainers: Ubuntu Developers <[e-mail]>
+Original-Maintainers: Dustin Kirkland <[e-mail]>
 Uploaders: Antoine Beaupré <[e-mail]>
 Standards-Version: 4.1.3
 Build-Depends: debhelper (>= 13), gettext-base, automake, autoconf, dh-python, python3
diff --git a/debian/patches/lp-2052610-locale-time-estimation.patch b/debian/patches/lp-2052610-locale-time-estimation.patch
new file mode 100644
index 0000000..8acaccf
--- /dev/null
+++ b/debian/patches/lp-2052610-locale-time-estimation.patch
@@ -0,0 +1,37 @@
+Description: strip time EPOCHREALTIME by digit not decimal separator
+    original code stripped only by period defined decimal.
+    Some locales separate by comma. The goal is to strip to a
+    non-decimal, so instead only allowing digits,
+    and using start of string ensures safety.
+Author: jakubskopal
+Origin: uptream, https://github.com/dustinkirkland/byobu/pull/71
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/byobu/+bug/2052610
+Reviewed-by: John Chittum, [e-mail]
+Last-Update: 2025-03-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc
+index cf31b46..324e794 100644
+--- a/usr/share/byobu/profiles/bashrc
++++ b/usr/share/byobu/profiles/bashrc
+@@ -36,8 +36,9 @@ byobu_prompt_runtime() {
+ 	local starttime endtime duration days hours minutes seconds microseconds nanoseconds str
+ 	[ ! -r $BYOBU_RUN_DIR/timer.$$ ] && printf "[0.000s]" && return
+ 	read starttime < $BYOBU_RUN_DIR/timer.$$ 2>/dev/null || true
+-	endtime=${EPOCHREALTIME/./}
+-	starttime=${starttime/./}
++	# strip to non-decimal time. avoids LP: #2052610
++	endtime=${EPOCHREALTIME/[^0-9]/}
++	starttime=${starttime/[^0-9]/}
+ 	duration=$((endtime - starttime))
+ 	days=$((duration/1000000/60/60/24))
+ 	hours=$((duration/1000000/60/60%24))
+@@ -54,7 +55,7 @@ byobu_prompt_runtime() {
+ 	printf "[%s]" "$str" 1>&2
+ }
+ # Requires Bash 4.x
+-export PS0='$(printf "%s" ${EPOCHREALTIME/./} >"$BYOBU_RUN_DIR/timer.$$")'
++export PS0='$(printf "%s" ${EPOCHREALTIME/[^0-9]/} >"$BYOBU_RUN_DIR/timer.$$")'
+ 
+ case "$BYOBU_DISTRO" in
+ 	"Ubuntu")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef38806
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp-2052610-locale-time-estimation.patch