From 369910ec4cdde8a2fc9bb755c7800c34173a8e69 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 20 Sep 2018 13:04:51 -0300 Subject: upgpkg: libre/linux-libre-pae 4.18.9_gnu-1 Signed-off-by: David P --- ...to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 5 +- ...0002-HID-core-fix-grouping-by-application.patch | 81 ---------------------- libre/linux-libre-pae/PKGBUILD | 9 +-- 3 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch (limited to 'libre') diff --git a/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 222de64ee..e57df3b15 100644 --- a/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/libre/linux-libre-pae/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,7 @@ -From 771e964ed3199a0d98bdd644b22039f5b957ddb1 Mon Sep 17 00:00:00 2001 +From 1a47eb71988a919e811ce558f6f58855155c6218 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by - default +Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn [bwh: Remove unneeded binary sysctl bits] diff --git a/libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch b/libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch deleted file mode 100644 index 633e29c92..000000000 --- a/libre/linux-libre-pae/0002-HID-core-fix-grouping-by-application.patch +++ /dev/null @@ -1,81 +0,0 @@ -From b4f39f4eba0486807d870ff8fbdb618185131d6c Mon Sep 17 00:00:00 2001 -From: Benjamin Tissoires -Date: Tue, 4 Sep 2018 15:31:14 +0200 -Subject: [PATCH 2/2] HID: core: fix grouping by application - -commit f07b3c1da92d ("HID: generic: create one input report per -application type") was effectively the same as MULTI_INPUT: -hidinput->report was never set, so hidinput_match_application() -always returned null. - -Fix that by testing against the real application. - -Note that this breaks some old eGalax touchscreens that expect MULTI_INPUT -instead of HID_QUIRK_INPUT_PER_APP. Enable this quirk for backward -compatibility on all non-Win8 touchscreens. - -link: https://bugzilla.kernel.org/show_bug.cgi?id=200847 -link: https://bugzilla.kernel.org/show_bug.cgi?id=200849 -link: https://bugs.archlinux.org/task/59699 -link: https://github.com/NixOS/nixpkgs/issues/45165 - -Cc: stable@vger.kernel.org # v4.18+ -Signed-off-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina ---- - drivers/hid/hid-input.c | 4 ++-- - drivers/hid/hid-multitouch.c | 3 +++ - include/linux/hid.h | 1 + - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c -index ab93dd5927c3..a137d2835f32 100644 ---- a/drivers/hid/hid-input.c -+++ b/drivers/hid/hid-input.c -@@ -1579,6 +1579,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, - input_dev->dev.parent = &hid->dev; - - hidinput->input = input_dev; -+ hidinput->application = application; - list_add_tail(&hidinput->list, &hid->inputs); - - INIT_LIST_HEAD(&hidinput->reports); -@@ -1674,8 +1675,7 @@ static struct hid_input *hidinput_match_application(struct hid_report *report) - struct hid_input *hidinput; - - list_for_each_entry(hidinput, &hid->inputs, list) { -- if (hidinput->report && -- hidinput->report->application == report->application) -+ if (hidinput->application == report->application) - return hidinput; - } - -diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 45968f7970f8..1a987345692a 100644 ---- a/drivers/hid/hid-multitouch.c -+++ b/drivers/hid/hid-multitouch.c -@@ -1476,6 +1476,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) - */ - hdev->quirks |= HID_QUIRK_INPUT_PER_APP; - -+ if (id->group != HID_GROUP_MULTITOUCH_WIN_8) -+ hdev->quirks |= HID_QUIRK_MULTI_INPUT; -+ - timer_setup(&td->release_timer, mt_expired_timeout, 0); - - ret = hid_parse(hdev); -diff --git a/include/linux/hid.h b/include/linux/hid.h -index 773bcb1d4044..5482dd6ae9ef 100644 ---- a/include/linux/hid.h -+++ b/include/linux/hid.h -@@ -520,6 +520,7 @@ struct hid_input { - const char *name; - bool registered; - struct list_head reports; /* the list of reports */ -+ unsigned int application; /* application usage for this input */ - }; - - enum hid_type { --- -2.19.0 - diff --git a/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index a8852d7cf..cfd081e72 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -11,7 +11,7 @@ pkgbase=linux-libre-pae _srcbasever=4.18-gnu -_srcver=4.18.8-gnu +_srcver=4.18.9-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -42,7 +42,6 @@ source=( '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-HID-core-fix-grouping-by-application.patch' ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -50,7 +49,7 @@ validpgpkeys=( ) sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471d3063016a4eb3f68d42879e18ee314ab30716116805fee35b5084b23df2a9' 'SKIP' - 'b65d13364a75dfef4b5f6510fda93e1f36bcedc073c7b90ff238ba991d26f666f7bbca4ec24726e09a962af6d78409ad1737a589e2708e24958fc31bcc67c255' + '72486a515539b2420daa6fb41c41f5994dbc4572bdacd80f75fb965398b6e12ed06c491ddab263adc36c5d48da52e1b5cf1145f4f808665dffc64ba16bfc90d4' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -64,8 +63,7 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471 '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'faac26d1e404628ccad18ad23dd5a56c28cfd194552870fdaf51944c4d60d284329124154786d37458432425d9fd4e3f076f7c079369c9893222d6df9984297b' - 'f257b7ab860650966e71511aa6fa42eb81f8b686ff4a965b8e48eeed6205fb8048e4b93fdca4c5ef41a390ec628c9a806f1c72bfafbf43f21c9ba5e76d7eb01f') + '78b8020105e7aafb84f32de6a7fb12b5dcb466f1d36d5188d78064d3d11a2a996a7ea4c7f9ba8a927fb9e4bbbfc6ac2913d03aa8b8257d8a771a93b7b8658092') _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") @@ -86,7 +84,6 @@ prepare() { # Arch's linux patches patch -p1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - patch -p1 -i ../0002-HID-core-fix-grouping-by-application.patch # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug -- cgit v1.2.3