diff -Nru urfkill-0.6.0~20150318.103828.5539c0d.1/debian/changelog urfkill-0.6.0~20150318.103828.5539c0d.1/debian/changelog --- urfkill-0.6.0~20150318.103828.5539c0d.1/debian/changelog 2017-09-18 20:00:06.000000000 +0000 +++ urfkill-0.6.0~20150318.103828.5539c0d.1/debian/changelog 2021-03-31 17:50:00.000000000 +0000 @@ -1,3 +1,24 @@ +urfkill (0.6.0~20150318.103828.5539c0d.1-0ubuntu9) hirsute; urgency=medium + + * Allow extra byte in rfkill event struct. This is related to a kernel + change with commit id 14486c82612a177cb910980c70ba900827ca0894. The + new byte was added to track the reason for rfkill events. (LP: #1922117) + + -- William 'jawn-smith' Wilson Wed, 31 Mar 2021 12:50:00 -0500 + +urfkill (0.6.0~20150318.103828.5539c0d.1-0ubuntu8) hirsute; urgency=medium + + * Fix segmentation fault that can be caused by freeing wrong variable + (LP: #1921919) + + -- William 'jawn-smith' Wilson Tue, 30 Mar 2021 09:36:17 -0500 + +urfkill (0.6.0~20150318.103828.5539c0d.1-0ubuntu7) hirsute; urgency=medium + + * Drop build-dependency on obsolete dh-systemd + + -- Steve Langasek Fri, 05 Mar 2021 16:57:13 -0800 + urfkill (0.6.0~20150318.103828.5539c0d.1-0ubuntu6) artful; urgency=medium * Drop hybris dependencies, no longer required as Ubuntu Touch product diff -Nru urfkill-0.6.0~20150318.103828.5539c0d.1/debian/control urfkill-0.6.0~20150318.103828.5539c0d.1/debian/control --- urfkill-0.6.0~20150318.103828.5539c0d.1/debian/control 2017-09-18 19:59:56.000000000 +0000 +++ urfkill-0.6.0~20150318.103828.5539c0d.1/debian/control 2021-03-06 00:57:13.000000000 +0000 @@ -6,11 +6,10 @@ Pre-Depends: dpkg (>= 1.15.7.2) Build-Depends: autopoint, autotools-dev, - debhelper (>= 9), + debhelper (>= 9.20160709), dh-autoreconf (>=2), gnome-common, dh-exec (>=0.3), - dh-systemd, gir1.2-gtk-2.0, gir1.2-gtk-3.0, gobject-introspection (>= 0.6.7), diff -Nru urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/allow_extra_event_byte.patch urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/allow_extra_event_byte.patch --- urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/allow_extra_event_byte.patch 1970-01-01 00:00:00.000000000 +0000 +++ urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/allow_extra_event_byte.patch 2021-03-31 17:50:00.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Allow new fields to be added to rfkill event struct + There was a change in the kernel to allow an extra byte in the rfkill event + struct: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=14486c82612a177cb910980c70ba900827ca0894 + It should be safe to just make sure we read at least RFKILL_EVENT_SIZE_V1 bytes + rather than checking that we have read some exact number of bytes. +Author: William 'jawn-smith' Wilson +Origin: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/urfkill/+bug/1922117 +Forwarded: https://github.com/lcp/urfkill/pull/14 +Last-Update: 2021-03-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: urfkill-0.6.0~20150318.103828.5539c0d.1/src/urf-arbitrator.c +=================================================================== +--- urfkill-0.6.0~20150318.103828.5539c0d.1.orig/src/urf-arbitrator.c ++++ urfkill-0.6.0~20150318.103828.5539c0d.1/src/urf-arbitrator.c +@@ -813,7 +813,12 @@ urf_arbitrator_startup (UrfArbitrator *a + break; + } + +- if (len != RFKILL_EVENT_SIZE_V1) { ++ /* There has been a change in the kernel that allows for an extra ++ * byte in the rfkill event struct that tracks a reason field. ++ * see commit id 14486c82612a177cb910980c70ba900827ca0894 for ++ * more information ++ */ ++ if (len < RFKILL_EVENT_SIZE_V1) { + g_warning ("Wrong size of RFKILL event\n"); + continue; + } diff -Nru urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/fix_config_segfault.patch urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/fix_config_segfault.patch --- urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/fix_config_segfault.patch 1970-01-01 00:00:00.000000000 +0000 +++ urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/fix_config_segfault.patch 2021-03-30 14:36:17.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix Possible Segmentation fault seen on ppc64el + There was a possible segmentation fault when trying to free a variable + that had not yet been initialized. This was blocking the migration of + a version of this package in the proposed pocket +Origin: upstream, https://github.com/lcp/urfkill/commit/b39a72f9227838d4af5a9fda3430914a4b03a8e2 +Bug: https://github.com/lcp/urfkill/issues/11 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/urfkill/+bug/1921919 +Last-Update: 2021-03-30 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/urf-config.c ++++ b/src/urf-config.c +@@ -630,7 +630,7 @@ + * control to be enabled: there would not be a way to disable + * it for devices that don't have it. + */ +- options->key_control = FALSE; ++ priv->options.key_control = FALSE; + + return; + } diff -Nru urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/series urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/series --- urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/series 2015-03-20 16:49:22.000000000 +0000 +++ urfkill-0.6.0~20150318.103828.5539c0d.1/debian/patches/series 2021-03-31 17:50:00.000000000 +0000 @@ -1,3 +1,5 @@ 01_fix_ftbfs_on_intltool.patch urfkill-debug-input.patch use-glib-gettext.patch +fix_config_segfault.patch +allow_extra_event_byte.patch