Bug#1038673: nmu: console-setup_1.221
Control: -1 usertag + transition On 2023-06-20 03:14, Gunnar Hjalmarsson wrote: On 2023-06-20 01:18, Gunnar Hjalmarsson wrote: nmu control-setup_1.221 . all . -m 'Rebuild against xkb-data 2.38-2' Sorry about the typo. Should better be: nmu console-setup_1.221 . all . -m 'Rebuild against xkb-data 2.38-2' (don't do these things when you ought to sleep) At last I realize that this is strictly a transition, and thus that I uploaded to unstable prematurely. The autogenerated ben tracker looks as expected: https://release.debian.org/transitions/html/auto-upperlimit-xkb-data.html But the conclusion stands: Please do a binNMU of console-setup to help accomplish the transition.
Bug#1038673: nmu: console-setup_1.221
On 2023-06-20 01:18, Gunnar Hjalmarsson wrote: nmu control-setup_1.221 . all . -m 'Rebuild against xkb-data 2.38-2' Sorry about the typo. Should better be: nmu console-setup_1.221 . all . -m 'Rebuild against xkb-data 2.38-2' (don't do these things when you ought to sleep) / Gunnar
Bug#1038673: nmu: console-setup_1.221
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: binnmu X-Debbugs-Cc: debia...@lists.debian.org, gunna...@debian.org Control: affects -1 src:xkeyboard-config src:control-setup Hi! I uploaded xkeyboard-config 2.38-2 to unstable (as an NMU), but before it can migrate, console-setup needs to be rebuilt against the new xkb-data version. nmu control-setup_1.221 . all . -m 'Rebuild against xkb-data 2.38-2' -- Thanks! Gunnar Hjalmarsson
Bug#1036306: unblock: ufw/0.36.2-1
On 2023-05-23 22:01, Paul Gevers wrote: On 23-05-2023 18:56, Gunnar Hjalmarsson wrote: ufw has autopkgtest, so strictly it's not blocked because of the freeze, but because of a piuparts failure. That's not true. We're in Hard Freeze, so ufw qualifies to migrate with passing autopkgtest when it's age is 20 days. However, once those 20 days are over, we're in Full Freeze so it won't migrate. So yes, strictly speaking it's *also* blocked by the freeze. I stand corrected. (And with that I understand wrt ufw why Jamie needs to justify the freeze related unblock request.) As you can see my primary concern is another package, i.e. ibus-pinyin. That package has already been unblocked from freeze: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036225 And missed the ignore-piuparts hint. Thanks for bringing that to our attention, I added that hint. Thanks! (And I understand from your reply that otherwise I should have simply submitted a separate unblock request. Or maybe re-opened the already submitted bug...) From tomorrow on, all packages that haven't migrated need an unblock request or they will not be part of bookworm. Normally we'd spot the piuparts problem and add the ignore hint if it's caused by the adduser issue. Sounds like the release team has it under control, then, so I will stop worrying. :) -- Thanks again! Gunnar
Bug#1036306: unblock: ufw/0.36.2-1
Hi Paul, On 2023-05-23 17:31, Paul Gevers wrote: On 19-05-2023 05:33, Jamie Strandboge wrote: It seems that adduser 3.133 has caused problems for a lot of packages in sid, including ufw. See: https://piuparts.debian.org/sid/fail/adduser_3.133.log https://piuparts.debian.org/sid/fail/ https://piuparts.debian.org/sid/fail/ufw_0.36.2-1.log https://piuparts.debian.org/sid/fail/... Yes, known, let's not worry about that. Well, I do worry a bit. ufw did not cause adduser to be unremovable, and adduser being unremovable should not affect ufw's migration. Sure. The migration is currently blocked because the upload happened very recently That description is not quite accurate. ufw has autopkgtest, so strictly it's not blocked because of the freeze, but because of a piuparts failure. and tomorrow we'll enter Full Freeze. So the upload happened too late for it to migrate without us unblocking. Maybe you didn't see my reply to Jamie's initial bug, but it was archived: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036306#10 As you can see my primary concern is another package, i.e. ibus-pinyin. That package has already been unblocked from freeze: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036225 But since it hit the very same adduser/piuparts issue as ufw (and probably a bunch of other packages) did, it's still blocked from migration. Maybe it was wrong of me to comment on this ufw bug, but the adduser/piuparts situation is special, and I felt it made sense to handle all affected packages together. Please advice on how uploaders affected by the adduser/piuparts situation should act. -- Rgds, Gunnar Hjalmarsson
Bug#1036306: unblock: ufw/0.36.2-1
I'm kind of 'hijacking' this bug instead of submitting an own. Hope you don't mind, Jamie. :/ I have the very same problem, i.e. piuparts failing due to the latest change in adduser: https://tracker.debian.org/pkg/ibus-pinyin So please add ibus-pinyin to the list of packages which probably need the release team's attention to resolve the adduser/piuparts situation. I don't know how to identify other affected packages, but there is a related email list thread: https://alioth-lists.debian.net/pipermail/piuparts-devel/2023-May/009566.html (And with that I suppose that #1036307, which was mistakenly submitted as a new bug, can be closed.) -- Cheers, Gunnar Hjalmarsson
Bug#1036225: unblock: ibus-pinyin/1.5.0-10
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-input-met...@lists.debian.org
Control: affects -1 + src:ibus-pinyin
Please unblock package ibus-pinyin.
[ Reason ]
https://bugs.debian.org/1036197 pointed out that a python file includes
a gettext API which was removed in python3.10. When fixing that I also
noticed that the Gtk version was not specified, which it needs to be on
systems where gtk4 is present.
These issues have been fixed in ibus-pinyin 1.5.0-10 through two small
patches.
[ Impact ]
Without the mentioned patches, the user can't open the Preferences
window, which significantly reduces the usability of the package.
[ Tests ]
Manually installed the binary built by version 1.5.0-10 of the
ibus-pinyin source, and confirmed that the issues were fixed as expected.
[ Risks ]
The fixes are standard python3 fixes, and should have been done long
ago. Can't see any risk for adverse side effects.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
--
Cheers,
Gunnar Hjalmarssondiff --git a/debian/changelog b/debian/changelog
index e163562..67e8e68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+ibus-pinyin (1.5.0-10) unstable; urgency=medium
+
+ * Team upload
+ * Upload to unstable
+
+ -- Gunnar Hjalmarsson Wed, 17 May 2023 19:14:23 +0200
+
+ibus-pinyin (1.5.0-9) experimental; urgency=medium
+
+ * Team upload
+ * Fix removed python gettext API (closes: #1036197, LP: #2019921)
+ * Bump Standards-Version to 4.6.2
+ * Specify Gtk version (LP: #2019921)
+
+ -- Gunnar Hjalmarsson Wed, 17 May 2023 08:17:28 +0200
+
ibus-pinyin (1.5.0-8) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 2a49cc4..630f00a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
python3-dev,
sqlite3,
uuid-dev,
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Homepage: https://github.com/ibus/ibus-pinyin
Vcs-Git: https://salsa.debian.org/input-method-team/ibus-pinyin.git
Vcs-Browser: https://salsa.debian.org/input-method-team/ibus-pinyin
diff --git a/debian/patches/Fix-removed-python-gettext-API.patch
b/debian/patches/Fix-removed-python-gettext-API.patch
new file mode 100644
index 000..f800cd0
--- /dev/null
+++ b/debian/patches/Fix-removed-python-gettext-API.patch
@@ -0,0 +1,28 @@
+From: znwu
+Date: Sun, 7 May 2023 18:17:11 -0700
+Subject: Fix removed python gettext API
+
+Origin: https://github.com/ibus/ibus-pinyin/commit/e2e10c40
+Bug-Debian: https://bugs.debian.org/1036197
+---
+ setup/main.py | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/setup/main.py b/setup/main.py
+index 3c13c4c..3f153a5 100644
+--- a/setup/main.py
b/setup/main.py
+@@ -45,7 +45,12 @@ def __init__(self, engine):
+ locale.setlocale(locale.LC_ALL, "")
+ localedir = os.getenv("IBUS_LOCALEDIR")
+ gettext.bindtextdomain("ibus-pinyin", localedir)
+-gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
++# Python's gettext module doesn't provide all methods in
++# new Python version since Python 3.10
++try:
++gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
++except AttributeError:
++pass
+
+ self.__bus = IBus.Bus()
+ self.__config = self.__bus.get_config()
diff --git a/debian/patches/Specify-Gtk-version.patch
b/debian/patches/Specify-Gtk-version.patch
new file mode 100644
index 000..925aaf0
--- /dev/null
+++ b/debian/patches/Specify-Gtk-version.patch
@@ -0,0 +1,15 @@
+Description: Specify Gtk version
+Author: Gunnar Hjalmarsson
+Applied-Upstream: https://github.com/ibus/ibus-pinyin/commit/61677008
+
+--- a/setup/main.py
b/setup/main.py
+@@ -27,6 +27,8 @@
+ import os
+ import sys
+
++from gi import require_version
++require_version ('Gtk', '3.0')
+ from gi.repository import GLib
+ from gi.repository import Gtk
+ from gi.repository import IBus
diff --git a/debian/patches/series b/debian/patches/series
index d467c09..c483696 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,6 @@ ibus-pinyin-default-full.patch
# python3 support
python3.patch
lua-5.4.patch
+
+Fix-removed-python-gettext-API.patch
+Specify-Gtk-version.patch
Bug#1034461: unblock: gnome-user-docs/43.0-2
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock X-Debbugs-Cc: gunna...@debian.org Control: affects -1 + src:gnome-user-docs Please unblock package gnome-user-docs. [ Reason ] Upstream missed to ship two figures in the tarball. They were added via a patch in gnome-user-docs 43.0-2. [ Impact ] Without the patch it doesn't look so good if you browse this page: yelp /usr/share/help/C/gnome-help/bluetooth-device-specific-pairing.page [ Tests ] Installed the binary built by version 43.0-2 of the gnome-user-docs source, and confirmed that the figures showed up as expected. [ Risks ] Just two docs figures, not affecting anything else. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing -- Cheers, Gunnar Hjalmarssondiff --git a/debian/changelog b/debian/changelog index f8b94f77a..deff6d0ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gnome-user-docs (43.0-2) unstable; urgency=medium + + * Add-missing-figures.patch + + -- Gunnar Hjalmarsson Sat, 15 Apr 2023 23:54:03 +0200 + gnome-user-docs (43.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/Add-missing-figures.patch b/debian/patches/Add-missing-figures.patch new file mode 100644 index 0..ab58c19b0 --- /dev/null +++ b/debian/patches/Add-missing-figures.patch @@ -0,0 +1,153 @@ +Description: Add missing figures + A consequence of the mistake in gnome-help/Makefile.am is that the + figures are not included in the upstream tarball. So this patch also + adds the missing figures as such. +Author: Gunnar Hjalmarsson +Forwarded: https://gitlab.gnome.org/GNOME/gnome-user-docs/-/merge_requests/164 +--- + /dev/null => gnome-help/C/figures/ps-button.svg | 62 +++ + /dev/null => gnome-help/C/figures/ps-create.svg | 54 ++ + gnome-help/Makefile.am | 2 + + 3 files changed, 118 insertions(+) + +diff --git a/gnome-help/C/figures/ps-button.svg b/gnome-help/C/figures/ps-button.svg +new file mode 100644 +index 000..f65a8f3 +--- /dev/null b/gnome-help/C/figures/ps-button.svg +@@ -0,0 +1,62 @@ ++ ++ ++ ++http://www.inkscape.org/namespaces/inkscape; ++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; ++ xmlns="http://www.w3.org/2000/svg; ++ xmlns:svg="http://www.w3.org/2000/svg;> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/gnome-help/C/figures/ps-create.svg b/gnome-help/C/figures/ps-create.svg +new file mode 100644 +index 000..f62dec8 +--- /dev/null b/gnome-help/C/figures/ps-create.svg +@@ -0,0 +1,54 @@ ++ ++ ++ ++http://www.inkscape.org/namespaces/inkscape; ++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; ++ xmlns="http://www.w3.org/2000/svg; ++ xmlns:svg="http://www.w3.org/2000/svg;> ++ ++ ++ ++⚟ ++ ++ +diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am +index 95000e0..a94470b 100644 +--- a/gnome-help/Makefile.am b/gnome-help/Makefile.am +@@ -83,6 +83,8 @@ HELP_MEDIA = \ + figures/network-wireless-disabled-symbolic.svg \ + figures/preferences-desktop-accessibility-symbolic.svg \ + figures/printing-select.png \ ++ figures/ps-button.svg \ ++ figures/ps-create.svg \ + figures/rotation-allowed-symbolic.svg \ + figures/rotation-locked-symbolic.svg \ + figures/screenshot-tool.png \ diff --git a/debian/patches/series b/debian/patches/series index ead8eb86f..b87203895 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ drop-experimental-style-for-prefs.page.patch +Add-missing-figures.patch
Bug#1033229: unblock: im-config/0.55-2
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock X-Debbugs-Cc: debian-input-met...@lists.debian.org Please unblock package im-config. [ Reason ] The file /etc/xdg/autostart/im-launch.desktop had an Exec line which proved to be incompatible with the parser of systemd boot. That Exec line has therefore been simplified in im-config 0.55-2. [ Impact ] The issue resulted in im-config failing to start the IM framework, e.g. fcitx5, when logging in to a Plasma (Wayland) session. That's an annoyance which will be fixed with the version in unstable. [ Tests ] Manually installed the binary built by version 0.55-2 of the im-config source, and confirmed that the bug was fixed as expected. [ Risks ] The change is a targeted trivial fix to address the issue at hand. Can't think of any adverse side effects. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing -- Cheers, Gunnar Hjalmarssondiff --git a/debian/changelog b/debian/changelog index c5ae651c299c0765505947febdacd33e21490a5d..8f623fc6535339c94bee79c31ce9e891a888d3d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +im-config (0.55-2) unstable; urgency=medium + + * systemd boot compatible Exec line in im-launch.desktop +- Fixes issue with the IM framework not being started automatically + when logging in to a Plasma (Wayland) session (closes: #1033097). + + -- Gunnar Hjalmarsson Mon, 20 Mar 2023 11:47:27 +0100 + im-config (0.55-1) unstable; urgency=medium * Set GTK_IM_MODULE in GNOME on Xorg sessions (closes: #1031227) diff --git a/debian/patches/series b/debian/patches/series index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6639a6d9c04ac850f554da420891f57a857f0275 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +systemd_boot_compatible_Exec_line_in_im-launch.desktop.patch diff --git a/debian/patches/systemd_boot_compatible_Exec_line_in_im-launch.desktop.patch b/debian/patches/systemd_boot_compatible_Exec_line_in_im-launch.desktop.patch new file mode 100644 index ..1f0fdbc2aeae3757dc77e9f5f673d12c663d8150 --- /dev/null +++ b/debian/patches/systemd_boot_compatible_Exec_line_in_im-launch.desktop.patch @@ -0,0 +1,55 @@ +From: Gunnar Hjalmarsson +Date: Mon, 20 Mar 2023 09:55:59 +0100 +Subject: systemd boot compatible Exec line in im-launch.desktop + +im-launch.desktop is autostarted, and the Exec line has up to now +contained a condition so /usr/bin/im-launch has only been started in +wayland sessions. + +However, as from KDE Plasma 5.25 systemd boot is enabled by default, +and that feature fails to parse the previous Exec line in +im-launch.desktop. An example consequence is that fcitx5 is not started +automatically at login to a KDE Plasma (Wayland) or Kubuntu (Wayland) +session. + +This commit fixes the issue by moving the mentioned condition from +im-launch.desktop to the top of /usr/bin/im-launch, resulting in an +Exec line simple enough for systemd boot to parse. + +Bug-KDE: https://bugs.kde.org/show_bug.cgi?id=455252 +Bug-Debian: https://bugs.debian.org/1033097 +Origin: https://salsa.debian.org/input-method-team/im-config/-/commit/5a979231 +--- + im-launch | 6 ++ + im-launch.desktop | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/im-launch b/im-launch +index 4845f92..721a24a 100755 +--- a/im-launch b/im-launch +@@ -13,6 +13,12 @@ if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ "x$1" = "x" ]; then + exit 1 + fi + ++if [ "$1" = 'true' ] && [ "$XDG_SESSION_TYPE" != 'wayland' ]; then ++# This program was autostarted, but was already run at the ++# start of an X session, so don't run it now too. ++exit 0 ++fi ++ + if [ "$IM_CONFIG_CHECK_ENV" = 1 ] && \ +[ "$IM_CONFIG_PHASE" = 1 ]; then + # If tweaked, keep hands off :-) +diff --git a/im-launch.desktop b/im-launch.desktop +index 7e3b624..e8d5e70 100644 +--- a/im-launch.desktop b/im-launch.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Name=im-launch +-Exec=sh -c 'if [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi' ++Exec=sh -c 'IM_CONFIG_CHECK_ENV=1 im-launch true' + TryExec=im-launch + Type=Application + NoDisplay=true
Bug#1024540: transition: libpinyin
On 2022-11-26 15:44, Sebastian Ramacher wrote: On 2022-11-25 14:52:12 +0100, Gunnar Hjalmarsson wrote: I notice that libpinyin has not yet migrated, even though the 2 days delay is over. Is that because Britney waits for the dependencies to be migration ready too, or is it because this bug is not closed yet? It has not migrated yet because the shared library packages have strictly versioned dependency on libpinyin-data. Hence, migrating libpinyin to testing would currently render some packages uninstallable in testing. Thanks for the explanation. I see that you requested a higher urgency for maliit-keyboard, so they all show "will attempt migration" now. Ideally, this dependency would be relaxed if possible so that this won't be an issue for the next libpinyin transition. For this one, all the reverse dependencies and libpinyin need to migrate together. I'll pass that advice to others who are more familiar than me with the libpinyin packaging choices. -- Cheers, Gunnar Hjalmarsson
Bug#1024540: transition: libpinyin
On 2022-11-21 20:46, Sebastian Ramacher wrote: On 2022-11-21 08:03:26 +0100, Gunnar Hjalmarsson wrote: Hello Release Team, libpinyin upstream made a SOVERSION bump from 13 to 15, and the Debian packaging has been changed accordingly in libpinyin 2.7.92-1 in experimental. These are the packages affected by the transition: fcitx-libpinyin fcitx5-zhuyin ibus-libpinyin ibus-libzhuyin maliit-keyboard I have changed the sources as appropriate and successfully test built the packages against the new libpinyin. As regards maliit-keyboard I plan to ping the maintainer (aka submit a bug) and possibly do an NMU. The other affected packages are maintained by Debian's IME team, and as a team member I plan to upload them myself. The autogenerated ben tracker looks as expected: https://release.debian.org/transitions/html/auto-libpinyin.html Please consider libpinyin for transition. Please go ahead after filing the bug against malitt-keyboard. Both libpinyin and the reverse dependencies have built successfully in unstable on the official architectures, and the old library packages have been deleted. I notice that libpinyin has not yet migrated, even though the 2 days delay is over. Is that because Britney waits for the dependencies to be migration ready too, or is it because this bug is not closed yet? This is my first transition, so I'm trying to figure out along the road how things actually work. ;) -- Gunnar Hjalmarsson
Bug#1024540: transition: libpinyin
On 2022-11-21 20:46, Sebastian Ramacher wrote: Please go ahead after filing the bug against malitt-keyboard. Ok. * maliit-keyboard bug: https://bugs.debian.org/1024593 * libpinyin 2.7.92-2 uploaded to unstable
Bug#1024540: transition: libpinyin
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: transition X-Debbugs-Cc: debian-input-met...@lists.debian.org Hello Release Team, libpinyin upstream made a SOVERSION bump from 13 to 15, and the Debian packaging has been changed accordingly in libpinyin 2.7.92-1 in experimental. These are the packages affected by the transition: fcitx-libpinyin fcitx5-zhuyin ibus-libpinyin ibus-libzhuyin maliit-keyboard I have changed the sources as appropriate and successfully test built the packages against the new libpinyin. As regards maliit-keyboard I plan to ping the maintainer (aka submit a bug) and possibly do an NMU. The other affected packages are maintained by Debian's IME team, and as a team member I plan to upload them myself. The autogenerated ben tracker looks as expected: https://release.debian.org/transitions/html/auto-libpinyin.html Please consider libpinyin for transition. -- Cheers, Gunnar Hjalmarsson
Bug#990697: unblock: gnome-desktop3/3.38.5-3
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pkg-gnome-maintain...@lists.alioth.debian.org
Please unblock package gnome-desktop3.
[ Reason ]
Cherry picked upstream commit to fix segfault when adding input sources
while show-all-sources is "true". The problem was reported in
<https://bugs.debian.org/989045>.
[ Impact ]
Without the fix, GNOME users can't make use of the so-called "exotic"
XKB keyboard layouts. Let's not ship Debian 11 with that bug, even if
only a minor portion of the users are affected.
[ Tests ]
Manually installed the binaries built by version 3.38.5-3 of the
gnome-desktop3 source, and confirmed that the bug was fixed as expected.
[ Risks ]
The change is a targeted fix to address the issue at hand. It was
committed upstream on April 22, and no reported regression.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
--
Cheers,
Gunnar Hjalmarsson
diff --git a/debian/changelog b/debian/changelog
index 80634e36..d39f84fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-desktop3 (3.38.5-3) unstable; urgency=medium
+
+ * Team upload
+ * d/p/xkbinfo-only-insert-new-layouts-skip-over-duplicate-ones.patch:
+Fix segfault when adding input sources while show-all-sources is
+"true" (closes: #989045).
+
+ -- Gunnar Hjalmarsson Sun, 04 Jul 2021 15:40:52 +0200
+
gnome-desktop3 (3.38.5-2) unstable; urgency=medium
* Team upload
diff --git a/debian/patches/series b/debian/patches/series
index 6b64c79b..0630c1a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ xkbinfo-refactor-some-of-the-rules-parsing.patch
test-convert-the-xkbinfo-test-to-produce-YAML.patch
xkbinfo-use-libxkbregistry-to-parse-the-rules-files-for-u.patch
xkbinfo-Update-iso639Ids-correctly-in-evdev.patch
+xkbinfo-only-insert-new-layouts-skip-over-duplicate-ones.patch
diff --git
a/debian/patches/xkbinfo-only-insert-new-layouts-skip-over-duplicate-ones.patch
b/debian/patches/xkbinfo-only-insert-new-layouts-skip-over-duplicate-ones.patch
new file mode 100644
index ..1274aae8
--- /dev/null
+++
b/debian/patches/xkbinfo-only-insert-new-layouts-skip-over-duplicate-ones.patch
@@ -0,0 +1,53 @@
+From: Peter Hutterer
+Date: Thu, 22 Apr 2021 01:29:18 +
+Subject: xkbinfo: only insert new layouts, skip over duplicate ones
+
+This matches the behavior to the one in the old code path before
+libxkbregistry.
+
+This also fixes a use-after-free bug when a duplicate layout is present. The
+same layout struct is a member of multiple hashtables, specifically
+priv->layouts_table, priv->layouts_by_language and priv->layouts_by_country.
+
+When the duplicate layout is added, add_layouts calls g_hash_table_replace
+(priv->layouts_table, l->id, l) which frees the original layout - but the
+layouts_by_{country|language} still have that now-freed layout.
+Immediately afterwards, add_layouts calls add_layout_to_locale_tables () which
+calls add_layout_to_table () which triggers a use-after-free.
+
+Avoid all this by simply skipping any duplicate layout.
+
+Reproducible with
+ gsettings set org.gnome.desktop.input-sources show-all-sources true
+ valgrind /usr/libexec/gnome-desktop-debug/test-xkb-info
+
+Requires xkeyboard-config <= 2.32, it has a duplicate cm(mmuock) entry
+(one is marked exotic, hence the need for show-all-sources).
+
+Origin: concatenation of:
+ https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/a39dd0d2
+ https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/81c6cd79
+Bug: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/190
+Bug-Debian: https://bugs.debian.org/989045
+Bug-Ubuntu: https://launchpad.net/bugs/1933022
+---
+ libgnome-desktop/gnome-xkb-info.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgnome-desktop/gnome-xkb-info.c
b/libgnome-desktop/gnome-xkb-info.c
+index b2eca699..f2a3214b 100644
+--- a/libgnome-desktop/gnome-xkb-info.c
b/libgnome-desktop/gnome-xkb-info.c
+@@ -268,6 +268,12 @@ add_layouts (GnomeXkbInfo*self,
+ l->iso3166Ids = g_slist_prepend (l->iso3166Ids, id);
+ }
+
++ if (g_hash_table_contains (priv->layouts_table, l->id))
++{
++ g_clear_pointer (, free_layout);
++ continue;
++}
++
+ g_hash_table_replace (priv->layouts_table, l->id, l);
+ add_layout_to_locale_tables (l,
+priv->layouts_by_language,
OpenPGP_signature
Description: OpenPGP digital signature
Bug#985222: unblock: ibus/1.5.24-1
Control: tags -1 - moreinfo Hi Sebastian! On 2021-03-18 22:29, Sebastian Ramacher wrote: Hi Gunnar On 2021-03-14 17:03:23 +0100, Gunnar Hjalmarsson wrote: Package: release.debian.org Hello Release Team, I probably made a mistake. I uploaded ibus to unstable on 2021-03-03, and since it was well before 2021-03-12 I thought it would be treated as a Soft Freeze upload. But now I see at <https://tracker.debian.org/pkg/ibus> that it has been blocked by freeze since ibus is a key package. The upload includes an upgrade to a new upstream release. At first hand I wanted to get the updated translations into bullseye. My reasoning behind bumping the upstream version follows. The upstream changes are summarized here: https://github.com/ibus/ibus/releases/tag/1.5.24 * The most important change, the addition of a GTK4 IM module, is a no-op for us at this time, since the upload was built without GTK4 support. * The dialog to warn about deprecated IBus XKB engines is already in testing via a patch that cherry picks the upstream change. * The other non-translation changes are minor (upstream) bug fixes and improvements, which I deemed to be within the scope of a Soft Freeze upload. So if you agree that the changes are low risk, it would be great if you could unblock ibus and with that effectively treat the upload as a Soft Freeze one. I attached the debdiff between testing and unstable. It's big.. But I ask you to evaluate it in the light of my reasoning above. 208 files changed, 8499 insertions(+), 2691 deletions(-) That's too much for us to review. Actually I agree. If I had realized that it was too late to migrate without a release team review, I hadn't uploaded the new upstream version. Now I have learned that the dates in the freeze policy timeline do not refer to uploading, as I thought, but to migration. Could you please provided a filtered diff which only contains the relevant changes? TBH I think it would not be worth it. Too much work both for me and for the release team. I filed this bug in the hope that you would overlook my mistake and unblock without really reviewing the whole diff. After all it would probably have been in bullseye now if I had uploaded it two days earlier... But staying with 1.5.23-2 in bullseye is fine too. The translations I wanted to get in are not so important. My upload to unstable can't be undone. Is it ok to simply keep the block for bullseye and let it migrate to testing later? If it is - and if you haven't changed your mind ;) - I would suggest that you tag this bug "wontfix". I'll respect and understand that. Lesson learned. -- Regards, Gunnar Hjalmarsson https://launchpad.net/~gunnarhj OpenPGP_signature Description: OpenPGP digital signature
