summaryrefslogtreecommitdiff
path: root/libre/linux-libre-hardened
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-09-20 23:19:46 -0300
committerDavid P <megver83@parabola.nu>2018-09-20 23:19:46 -0300
commit1bdc09484bc703c20c4161bc97eae21764d9b172 (patch)
tree14f15b98f4c6ca335bfa718b17d82ff96d1dfad1 /libre/linux-libre-hardened
parent044ad0a8761004aba0ece46b765960cf2353f3b9 (diff)
downloadabslibre-1bdc09484bc703c20c4161bc97eae21764d9b172.tar.gz
abslibre-1bdc09484bc703c20c4161bc97eae21764d9b172.tar.bz2
abslibre-1bdc09484bc703c20c4161bc97eae21764d9b172.zip
upgpkg: libre/linux-libre-hardened 4.18.9.a_gnu-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/linux-libre-hardened')
-rw-r--r--libre/linux-libre-hardened/HID-core-fix-grouping-by-application.patch78
-rw-r--r--libre/linux-libre-hardened/PKGBUILD11
2 files changed, 4 insertions, 85 deletions
diff --git a/libre/linux-libre-hardened/HID-core-fix-grouping-by-application.patch b/libre/linux-libre-hardened/HID-core-fix-grouping-by-application.patch
deleted file mode 100644
index 6da2c1884..000000000
--- a/libre/linux-libre-hardened/HID-core-fix-grouping-by-application.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 20acb01da9443e3ca814bb5d17f01b3fea754010 Mon Sep 17 00:00:00 2001
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Tue, 4 Sep 2018 15:31:14 +0200
-Subject: [PATCH] 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 <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- 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 ab93dd5927c3a..a137d2835f328 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 45968f7970f87..1a987345692a6 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 773bcb1d4044e..5482dd6ae9efd 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 {
diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 1138916b2..c2d482b10 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -8,7 +8,7 @@
pkgbase=linux-libre-hardened
_srcbasever=4.18-gnu
-_srcver=4.18.8-gnu
+_srcver=4.18.9-gnu
_hardenedver=a
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -40,7 +40,6 @@ source=(
# other patches
'0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
- 'HID-core-fix-grouping-by-application.patch'
)
validpgpkeys=(
'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -50,9 +49,9 @@ validpgpkeys=(
)
sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471d3063016a4eb3f68d42879e18ee314ab30716116805fee35b5084b23df2a9'
'SKIP'
- 'b65d13364a75dfef4b5f6510fda93e1f36bcedc073c7b90ff238ba991d26f666f7bbca4ec24726e09a962af6d78409ad1737a589e2708e24958fc31bcc67c255'
+ '72486a515539b2420daa6fb41c41f5994dbc4572bdacd80f75fb965398b6e12ed06c491ddab263adc36c5d48da52e1b5cf1145f4f808665dffc64ba16bfc90d4'
'SKIP'
- '6bba2c6bc16a9a797023f3056bb545a4958ce6f2c098943b841ae51eb8d6038bca33f7f4d63500ed17e678773393c097b18f33cde2495eb89b9491d1d5043cac'
+ '60ac5793455044f8d1acf9c09397168b2f43c964e43941dbfccc6c7a05bb2288a9ab74147a76da4015e0b5ead18d6f598443ef04ebf14fd231e7746fc8bf6b9a'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -65,8 +64,7 @@ sha512sums=('0c221c6e84eb5bc270ef79454bf407079daed84534afb1d449d40fa46e42868a471
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
- 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
- '0c7cca61b8a18626ebab5be9db9d445bf5b39b5324f337d43ebde2c7e1bed0fb212f6daca2c7a5bec694fbaa85a4dedb20ff55b92500e779a21998ac44c8a92d')
+ 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
_kernelname=${pkgbase#linux-libre}
_replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -89,7 +87,6 @@ prepare() {
../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
# Arch's linux-hardened patches
- patch -p1 -i ../HID-core-fix-grouping-by-application.patch
# maintain the TTY over USB disconnects
# http://www.coreboot.org/EHCI_Gadget_Debug