Hi, On Tue, Nov 05, 2024 at 10:56:09AM +0800, Bo YU wrote:
Hi,
...
I have uploaded it to mentor also. Please review it. Could you upload it if there are no other issues? TIA. ``` The source builds the following binary packages: xxkb - Keyboard state indicator and switcher for xkb To access further information about this package, please visit the following URL: https://mentors.debian.net/package/xxkb/ Alternatively, you can download the package with 'dget' using this command: dget -x https://mentors.debian.net/debian/pool/main/x/xxkb/xxkb_1.11.1-3.dsc Changes since the last upload: xxkb (1.11.1-3) unstable; urgency=medium . * QA upload. * Add 0004-fix-ftbfs-on-gcc-14.patch to fix the ftbfs issue. (Closes: #1075694) * Set std-ver to 4.7.0. * Add Rules-Requires-Root on d/control. * Add doc-base for xxkb. * debian/rules: pass CFLAGS to dh_auto_build.
Sorry for the useless entry of the chanelog, I have this with v2.
diff -Nru xxkb-1.11.1/debian/changelog xxkb-1.11.1/debian/changelog --- xxkb-1.11.1/debian/changelog 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/changelog 2024-11-04 23:12:36.000000000 +0800 @@ -1,3 +1,15 @@ +xxkb (1.11.1-3) unstable; urgency=medium + + * QA upload. + * Add 0004-fix-ftbfs-on-gcc-14.patch to fix the ftbfs issue. + (Closes: #1075694) + * Set std-ver to 4.7.0. + * Add Rules-Requires-Root on d/control. + * Add doc-base for xxkb. + * Add 0005-fix-gcc-hardening.patch to fix hardening issue. + + -- Bo YU <tsu.y...@gmail.com> Mon, 04 Nov 2024 23:12:36 +0800 + xxkb (1.11.1-2) unstable; urgency=medium * QA upload. diff -Nru xxkb-1.11.1/debian/control xxkb-1.11.1/debian/control --- xxkb-1.11.1/debian/control 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/control 2024-11-04 23:06:07.000000000 +0800 @@ -9,10 +9,11 @@ libxt-dev, xutils-dev, Maintainer: Debian QA Group <packa...@qa.debian.org> -Standards-Version: 4.6.1 +Standards-Version: 4.7.0 Homepage: http://sourceforge.net/projects/xxkb/ Vcs-Git: https://salsa.debian.org/debian/xxkb.git Vcs-Browser: https://salsa.debian.org/debian/xxkb +Rules-Requires-Root: no Package: xxkb Architecture: any diff -Nru xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch --- xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 1970-01-01 07:30:00.000000000 +0730 +++ xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 2024-11-04 23:04:47.000000000 +0800 @@ -0,0 +1,17 @@ +Description: fix ftbfs on gcc-14 +Author: Bo YU <tsu.y...@gmail.com> +Bug: https://bugs.debian.org/1075694 +Last-Update: 2024-11-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/resource.c ++++ b/resource.c +@@ -622,7 +622,7 @@ + if (filename) + stat = XrmCombineFileDatabase(filename, &db, True); + else +- stat = NULL; ++ stat = 0; + if (stat == 0 && db == NULL) { + /* failed */ + warnx("Unable to find configuration data"); diff -Nru xxkb-1.11.1/debian/patches/0005-fix-gcc-hardening.patch xxkb-1.11.1/debian/patches/0005-fix-gcc-hardening.patch --- xxkb-1.11.1/debian/patches/0005-fix-gcc-hardening.patch 1970-01-01 07:30:00.000000000 +0730 +++ xxkb-1.11.1/debian/patches/0005-fix-gcc-hardening.patch 2024-11-04 23:12:36.000000000 +0800 @@ -0,0 +1,17 @@ +Description: fix hardening problems +Author: Bo YU <tsu.y...@gmail.com> +Forwarded: not-needed +Last-Update: 2024-11-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Imakefile ++++ b/Imakefile +@@ -24,7 +24,7 @@ + LOCAL_LIBRARIES += `pkg-config --libs glib-2.0 gdk-pixbuf-xlib-2.0 librsvg-2.0` + #endif + +-CDEBUGFLAGS = -O2 -Wall -g ++CDEBUGFLAGS = -O2 -Wall -g -fstack-protector-strong -Wformat -Werror=format-security -fPIE -pie -Wl,-z,relro -Wl,-z,now + SED = sed + + ComplexProgramTarget(xxkb) diff -Nru xxkb-1.11.1/debian/patches/series xxkb-1.11.1/debian/patches/series --- xxkb-1.11.1/debian/patches/series 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/patches/series 2024-11-04 23:12:36.000000000 +0800 @@ -1,3 +1,5 @@ 0001-debian-patch.patch 0002-Fix-manpage-semantics.patch 0003-Imakefile-enable-debug-flag.patch +0004-fix-ftbfs-on-gcc-14.patch +0005-fix-gcc-hardening.patch diff -Nru xxkb-1.11.1/debian/watch xxkb-1.11.1/debian/watch --- xxkb-1.11.1/debian/watch 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/watch 2024-11-04 23:05:46.000000000 +0800 @@ -1,2 +1,2 @@ -version=3 +version=4 http://sf.net/xxkb/xxkb-(\d+(?:\.\d+)+)-src\.tar\.gz diff -Nru xxkb-1.11.1/debian/xxkb.doc-base xxkb-1.11.1/debian/xxkb.doc-base --- xxkb-1.11.1/debian/xxkb.doc-base 1970-01-01 07:30:00.000000000 +0730 +++ xxkb-1.11.1/debian/xxkb.doc-base 2024-11-04 23:06:56.000000000 +0800 @@ -0,0 +1,10 @@ +Document: xxkb +Title: Debian xxkb Manual +Author: Ivan Pascal +Abstract: This manual describes what xxkb is + and how to use it. +Section: Programming + +Format: HTML +Index: /usr/share/doc/xxkb/3gr.html +Files: /usr/share/doc/xxkb/3gr.html
signature.asc
Description: PGP signature
