Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Julian Gilbey <j...@debian.org>, Carlos Maddela
<e7ap...@gmail.com>
This adds the #1040940 fix to the #1040939 upload for an unrelated
issue that is already included for the next point release.
#1040940 happens with python3.11/sid but not with python3.11/bookworm,
but it is unclear which python3.11 change caused it or whether this
might at some point get backported as part of a security fix to
python3.11/bookworm. The fix is an obvious off-by-one fix.
Regarding the versioning:
My debdiff is against the already approved #1040939,
but I am changing the versioning from 2.9.0-2.3+deb12u*
to 2.9.0-2.5~deb12u1 for two reasons:
1. it documents that this is a backport of a version, and
2. people won't see the same changes twice in apt-listchanges
These are not very strong reasons, I wouldn't have made such a change
had 2.9.0-2.3+deb12u1 already been released.
diffstat for rmlint-2.9.0 rmlint-2.9.0
changelog | 19
++++++-
patches/0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch | 26
++++++++++
patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch | 9
---
patches/series | 1
4 files changed, 46 insertions(+), 9 deletions(-)
diff -Nru rmlint-2.9.0/debian/changelog rmlint-2.9.0/debian/changelog
--- rmlint-2.9.0/debian/changelog 2023-07-12 18:18:40.000000000 +0300
+++ rmlint-2.9.0/debian/changelog 2023-09-30 15:52:45.000000000 +0300
@@ -1,10 +1,25 @@
-rmlint (2.9.0-2.3+deb12u1) bookworm; urgency=medium
+rmlint (2.9.0-2.5~deb12u1) bookworm; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for bookworm.
+
+ -- Adrian Bunk <b...@debian.org> Sat, 30 Sep 2023 15:52:45 +0300
+
+rmlint (2.9.0-2.5) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add upstream fix for GUI startup failure with recent python3.11.
+ (Closes: #1040940)
+
+ -- Adrian Bunk <b...@debian.org> Sat, 05 Aug 2023 17:16:05 +0300
+
+rmlint (2.9.0-2.4) unstable; urgency=medium
* Non-maintainer upload.
* Fix error in other packages caused by invalid python package version
number (cherry-picking upstream patch; closes: #1040179)
- -- Julian Gilbey <j...@debian.org> Wed, 12 Jul 2023 16:18:40 +0100
+ -- Julian Gilbey <j...@debian.org> Wed, 05 Jul 2023 09:31:46 +0100
rmlint (2.9.0-2.3) unstable; urgency=medium
diff -Nru
rmlint-2.9.0/debian/patches/0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch
rmlint-2.9.0/debian/patches/0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch
---
rmlint-2.9.0/debian/patches/0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch
1970-01-01 02:00:00.000000000 +0200
+++
rmlint-2.9.0/debian/patches/0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch
2023-08-05 17:13:47.000000000 +0300
@@ -0,0 +1,26 @@
+From e811a34bdf81f0f5366b07077432f8ab9c776ddd Mon Sep 17 00:00:00 2001
+From: Cebtenzzre <cebtenz...@gmail.com>
+Date: Wed, 2 Aug 2023 21:29:15 -0400
+Subject: cmdline: do not write NUL byte to GUI bootstrap script
+
+Fixes #628
+---
+ lib/cmdline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/cmdline.c b/lib/cmdline.c
+index d5b1338c..07ba104a 100644
+--- a/lib/cmdline.c
++++ b/lib/cmdline.c
+@@ -176,7 +176,7 @@ static void rm_cmd_start_gui(int argc, const char **argv) {
+ return;
+ }
+
+- if(write(bootstrap_fd, RM_PY_BOOTSTRAP, sizeof(RM_PY_BOOTSTRAP)) < 0) {
++ if(write(bootstrap_fd, RM_PY_BOOTSTRAP, strlen(RM_PY_BOOTSTRAP)) < 0) {
+ rm_log_warning_line("Could not bootstrap gui: Unable to write to
tempfile: %s",
+ g_strerror(errno));
+ return;
+--
+2.30.2
+
diff -Nru
rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
---
rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
2023-07-12 18:18:40.000000000 +0300
+++
rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
2023-07-05 11:31:46.000000000 +0300
@@ -10,11 +10,9 @@
lib/config.h.in | 62 ++++++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 29 deletions(-)
-diff --git a/lib/config.h.in b/lib/config.h.in
-index 44d7e5d9..d9fdeabd 100644
--- a/lib/config.h.in
+++ b/lib/config.h.in
-@@ -121,9 +121,13 @@
+@@ -123,9 +123,13 @@
# define N_(String) gettext_noop (String)
#endif
@@ -30,7 +28,7 @@
typedef guint64 RmOff;
-@@ -150,33 +154,33 @@ typedef guint64 RmOff;
+@@ -152,33 +156,33 @@
///////////////
@@ -91,6 +89,3 @@
/* Domain for reporting errors. Needed by GOptions */
#define RM_ERROR_QUARK (g_quark_from_static_string("rmlint"))
---
-2.20.1
-
diff -Nru rmlint-2.9.0/debian/patches/series rmlint-2.9.0/debian/patches/series
--- rmlint-2.9.0/debian/patches/series 2023-07-12 18:18:40.000000000 +0300
+++ rmlint-2.9.0/debian/patches/series 2023-08-05 17:15:59.000000000 +0300
@@ -9,3 +9,4 @@
0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
0010-apply-upstream-fix-for-data-loss-bug.patch
python-version-number.patch
+0001-cmdline-do-not-write-NUL-byte-to-GUI-bootstrap-scrip.patch
