summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys-kernel/boest-v5.2.21/0001-patch-5.2-ja1.diff.patch (renamed from sys-kernel/boest-v5.2.17/0001-patch-5.2-ja1.diff.patch)40
-rw-r--r--sys-kernel/boest-v5.2.21/0002-pool-2.6.25-tcp-timewait-20s.diff.patch (renamed from sys-kernel/boest-v5.2.17/0002-pool-2.6.25-tcp-timewait-20s.diff.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0003-pool-2.6.25-disable-tcp-debug.diff.patch (renamed from sys-kernel/boest-v5.2.17/0003-pool-2.6.25-disable-tcp-debug.diff.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch (renamed from sys-kernel/boest-v5.2.17/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch (renamed from sys-kernel/boest-v5.2.17/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch (renamed from sys-kernel/boest-v5.2.17/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0007-This-patch-adds-support-for-a-restricted-user-contro.patch (renamed from sys-kernel/boest-v5.2.17/0007-This-patch-adds-support-for-a-restricted-user-contro.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0008-fs-Enable-link-security-restrictions-by-default.patch (renamed from sys-kernel/boest-v5.2.17/0008-fs-Enable-link-security-restrictions-by-default.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch (renamed from sys-kernel/boest-v5.2.17/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch (renamed from sys-kernel/boest-v5.2.17/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch (renamed from sys-kernel/boest-v5.2.17/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch)16
-rw-r--r--sys-kernel/boest-v5.2.21/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch (renamed from sys-kernel/boest-v5.2.17/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch)2
-rw-r--r--sys-kernel/boest-v5.2.21/0013-WARNING.patch (renamed from sys-kernel/boest-v5.2.17/0013-WARNING.patch)2
l---------sys-kernel/stable-sources-5.2.171
l---------sys-kernel/stable-sources-5.2.211
15 files changed, 40 insertions, 40 deletions
diff --git a/sys-kernel/boest-v5.2.17/0001-patch-5.2-ja1.diff.patch b/sys-kernel/boest-v5.2.21/0001-patch-5.2-ja1.diff.patch
index af74c3b4..d1877b09 100644
--- a/sys-kernel/boest-v5.2.17/0001-patch-5.2-ja1.diff.patch
+++ b/sys-kernel/boest-v5.2.21/0001-patch-5.2-ja1.diff.patch
@@ -1,4 +1,4 @@
-From 1f0194f591c6e5dae298f18af9b8abc552ebf26a Mon Sep 17 00:00:00 2001
+From 16ab0298f558bc7854cde694800b47b9e88ee839 Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Sun, 15 Sep 2019 14:32:08 +0000
Subject: [PATCH 01/13] patch-5.2-ja1.diff
@@ -182,10 +182,10 @@ index 423cda2c6542..c6aefd01b672 100644
unsigned int nf_nat_setup_info(struct nf_conn *ct,
const struct nf_nat_range2 *range,
diff --git a/include/net/route.h b/include/net/route.h
-index 55ff71ffb796..78ed6e76c167 100644
+index 2b34a3a4386f..10d2e408e644 100644
--- a/include/net/route.h
+++ b/include/net/route.h
-@@ -183,6 +183,9 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
+@@ -184,6 +184,9 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
int ip_route_input_rcu(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin,
struct fib_result *res);
@@ -195,7 +195,7 @@ index 55ff71ffb796..78ed6e76c167 100644
static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin)
-@@ -218,6 +221,8 @@ unsigned int inet_addr_type_dev_table(struct net *net,
+@@ -219,6 +222,8 @@ unsigned int inet_addr_type_dev_table(struct net *net,
void ip_rt_multicast_event(struct in_device *);
int ip_rt_ioctl(struct net *, unsigned int cmd, struct rtentry *rt);
void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);
@@ -1800,10 +1800,10 @@ index ad33687b7444..49d98f51458b 100644
.hook = iptable_nat_do_chain,
.pf = NFPROTO_IPV4,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 8ea0735a6754..a94f9c1efbe4 100644
+index 148dfcb5cbd9..6af0506bfc92 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
-@@ -1704,7 +1704,7 @@ int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -1706,7 +1706,7 @@ int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
return -EINVAL;
} else {
err = fib_validate_source(skb, saddr, 0, tos, 0, dev,
@@ -1812,7 +1812,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (err < 0)
return err;
}
-@@ -1779,7 +1779,7 @@ static void ip_handle_martian_source(struct net_device *dev,
+@@ -1781,7 +1781,7 @@ static void ip_handle_martian_source(struct net_device *dev,
static int __mkroute_input(struct sk_buff *skb,
const struct fib_result *res,
struct in_device *in_dev,
@@ -1821,7 +1821,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
{
struct fib_nh_common *nhc = FIB_RES_NHC(*res);
struct net_device *dev = nhc->nhc_dev;
-@@ -1798,7 +1798,7 @@ static int __mkroute_input(struct sk_buff *skb,
+@@ -1800,7 +1800,7 @@ static int __mkroute_input(struct sk_buff *skb,
}
err = fib_validate_source(skb, saddr, daddr, tos, FIB_RES_OIF(*res),
@@ -1830,7 +1830,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (err < 0) {
ip_handle_martian_source(in_dev->dev, in_dev, skb, daddr,
saddr);
-@@ -1808,7 +1808,7 @@ static int __mkroute_input(struct sk_buff *skb,
+@@ -1810,7 +1810,7 @@ static int __mkroute_input(struct sk_buff *skb,
do_cache = res->fi && !itag;
if (out_dev == in_dev && err && IN_DEV_TX_REDIRECTS(out_dev) &&
@@ -1839,7 +1839,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
__be32 gw;
gw = nhc->nhc_gw_family == AF_INET ? nhc->nhc_gw.ipv4 : 0;
-@@ -1974,10 +1974,12 @@ int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,
+@@ -1976,10 +1976,12 @@ int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,
static int ip_mkroute_input(struct sk_buff *skb,
struct fib_result *res,
@@ -1853,7 +1853,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (res->fi && res->fi->fib_nhs > 1) {
int h = fib_multipath_hash(res->fi->fib_net, NULL, skb, hkeys);
-@@ -1987,7 +1989,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
+@@ -1989,7 +1991,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
#endif
/* create a routing cache entry */
@@ -1862,7 +1862,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
}
/*
-@@ -2002,7 +2004,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
+@@ -2004,7 +2006,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
*/
static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -1871,7 +1871,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
struct fib_result *res)
{
struct in_device *in_dev = __in_dev_get_rcu(dev);
-@@ -2060,18 +2062,25 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2062,18 +2064,25 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
goto martian_source;
}
@@ -1899,7 +1899,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (fib4_rules_early_flow_dissect(net, skb, &fl4, &_flkeys)) {
flkeys = &_flkeys;
-@@ -2082,6 +2091,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2084,6 +2093,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
}
err = fib_lookup(net, &fl4, res, 0);
@@ -1908,7 +1908,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (err != 0) {
if (!IN_DEV_FORWARD(in_dev))
err = -EHOSTUNREACH;
-@@ -2099,7 +2110,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2101,7 +2112,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
if (res->type == RTN_LOCAL) {
err = fib_validate_source(skb, saddr, daddr, tos,
@@ -1917,7 +1917,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (err < 0)
goto martian_source;
goto local_input;
-@@ -2113,16 +2124,19 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2115,16 +2126,19 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
goto martian_destination;
make_route:
@@ -1939,7 +1939,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
if (err < 0)
goto martian_source;
}
-@@ -2225,9 +2239,26 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2227,9 +2241,26 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
}
EXPORT_SYMBOL(ip_route_input_noref);
@@ -1968,7 +1968,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
{
/* Multicast recognition logic is moved from route cache to here.
The problem was that too many Ethernet cards have broken/missing
-@@ -2273,7 +2304,13 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+@@ -2275,7 +2306,13 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,
return err;
}
@@ -1983,7 +1983,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
}
/* called with rcu_read_lock() */
-@@ -2525,6 +2562,7 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,
+@@ -2527,6 +2564,7 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,
fl4->daddr = fl4->saddr = htonl(INADDR_LOOPBACK);
dev_out = net->loopback_dev;
fl4->flowi4_oif = LOOPBACK_IFINDEX;
@@ -1991,7 +1991,7 @@ index 8ea0735a6754..a94f9c1efbe4 100644
res->type = RTN_LOCAL;
flags |= RTCF_LOCAL;
goto make_route;
-@@ -2583,6 +2621,7 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,
+@@ -2585,6 +2623,7 @@ struct rtable *ip_route_output_key_hash_rcu(struct net *net, struct flowi4 *fl4,
orig_oif = FIB_RES_OIF(*res);
fl4->flowi4_oif = dev_out->ifindex;
diff --git a/sys-kernel/boest-v5.2.17/0002-pool-2.6.25-tcp-timewait-20s.diff.patch b/sys-kernel/boest-v5.2.21/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
index 1ee178ae..946186f7 100644
--- a/sys-kernel/boest-v5.2.17/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
+++ b/sys-kernel/boest-v5.2.21/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
@@ -1,4 +1,4 @@
-From ba7d807721341d5b827c00fb0d6beeb44359c533 Mon Sep 17 00:00:00 2001
+From 95d58ef3d9a4394782c46b87602ae8780345e113 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 02/13] pool/2.6.25-tcp-timewait-20s.diff
diff --git a/sys-kernel/boest-v5.2.17/0003-pool-2.6.25-disable-tcp-debug.diff.patch b/sys-kernel/boest-v5.2.21/0003-pool-2.6.25-disable-tcp-debug.diff.patch
index 80237055..58b42240 100644
--- a/sys-kernel/boest-v5.2.17/0003-pool-2.6.25-disable-tcp-debug.diff.patch
+++ b/sys-kernel/boest-v5.2.21/0003-pool-2.6.25-disable-tcp-debug.diff.patch
@@ -1,4 +1,4 @@
-From 2fcb463aec590a245cd5a417013d6219490c6f1d Mon Sep 17 00:00:00 2001
+From a9a2e683d0e2bc9d7e4cc8def7e1c784ede56e2d Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 03/13] pool/2.6.25-disable-tcp-debug.diff
diff --git a/sys-kernel/boest-v5.2.17/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch b/sys-kernel/boest-v5.2.21/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
index 2c7fa164..1484a982 100644
--- a/sys-kernel/boest-v5.2.17/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
+++ b/sys-kernel/boest-v5.2.21/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
@@ -1,4 +1,4 @@
-From 72f70f27ba9e335ba6d07f26729bae5d0a17a698 Mon Sep 17 00:00:00 2001
+From eaee16434cfbc3afbbcab028d7b884413bf92021 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 8 Oct 2008 10:00:42 +0200
Subject: [PATCH 04/13] TCP: add a sysctl to disable simultaneous connection
diff --git a/sys-kernel/boest-v5.2.17/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch b/sys-kernel/boest-v5.2.21/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
index e9bb51b6..4c2188da 100644
--- a/sys-kernel/boest-v5.2.17/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
+++ b/sys-kernel/boest-v5.2.21/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
@@ -1,4 +1,4 @@
-From b06d89e73a0c42c37afce955d87d8ed03d132cc7 Mon Sep 17 00:00:00 2001
+From cf9c7fdc55ab59c5fac8f8e5800605c6bf5d9852 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 05/13] pool/2.6.25-disable-kbdrate-at-boot.diff
diff --git a/sys-kernel/boest-v5.2.17/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch b/sys-kernel/boest-v5.2.21/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
index 0a38007d..ba6d9d3c 100644
--- a/sys-kernel/boest-v5.2.17/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
+++ b/sys-kernel/boest-v5.2.21/0006-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
@@ -1,4 +1,4 @@
-From b87e6c5525d1e3a1e0c2b0f930ea18a156ba6e90 Mon Sep 17 00:00:00 2001
+From ebb146b34b9d13a57386d5e5ff5534483fb93d13 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 9 Jan 2013 00:28:28 +0100
Subject: [PATCH 06/13] Disable CONFIG_PROCESSOR_SELECT printk()'s
diff --git a/sys-kernel/boest-v5.2.17/0007-This-patch-adds-support-for-a-restricted-user-contro.patch b/sys-kernel/boest-v5.2.21/0007-This-patch-adds-support-for-a-restricted-user-contro.patch
index 22d1a8d5..bd8ae264 100644
--- a/sys-kernel/boest-v5.2.17/0007-This-patch-adds-support-for-a-restricted-user-contro.patch
+++ b/sys-kernel/boest-v5.2.21/0007-This-patch-adds-support-for-a-restricted-user-contro.patch
@@ -1,4 +1,4 @@
-From fdc71929bef48284d82cae83ad1e52fd31d62151 Mon Sep 17 00:00:00 2001
+From 1ac9a85e49f05af11b7c9df4acb1f23cbb2535ad Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 22 Jun 2019 19:30:55 -0400
Subject: [PATCH 07/13] This patch adds support for a restricted
diff --git a/sys-kernel/boest-v5.2.17/0008-fs-Enable-link-security-restrictions-by-default.patch b/sys-kernel/boest-v5.2.21/0008-fs-Enable-link-security-restrictions-by-default.patch
index 06cf9abd..93446b3a 100644
--- a/sys-kernel/boest-v5.2.17/0008-fs-Enable-link-security-restrictions-by-default.patch
+++ b/sys-kernel/boest-v5.2.21/0008-fs-Enable-link-security-restrictions-by-default.patch
@@ -1,4 +1,4 @@
-From 58b7b9e353324a1dadcca70d6207bab4501c9702 Mon Sep 17 00:00:00 2001
+From 5715691512be62630bc4735332156ff28eb202e5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 2 Nov 2012 05:32:06 +0000
Subject: [PATCH 08/13] fs: Enable link security restrictions by default
diff --git a/sys-kernel/boest-v5.2.17/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch b/sys-kernel/boest-v5.2.21/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch
index 95154e45..5ffabe8d 100644
--- a/sys-kernel/boest-v5.2.17/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch
+++ b/sys-kernel/boest-v5.2.21/0009-The-encryption-is-only-mandatory-to-be-enforced-when.patch
@@ -1,4 +1,4 @@
-From c46253bf3fb21da7271eb2dca9ad2ac943da3743 Mon Sep 17 00:00:00 2001
+From 733892fba49515461caec62717401ef1f431b5e7 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sat, 22 Jun 2019 19:30:55 -0400
Subject: [PATCH 09/13] The encryption is only mandatory to be enforced when
diff --git a/sys-kernel/boest-v5.2.17/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch b/sys-kernel/boest-v5.2.21/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
index 82e5ae6f..685a1947 100644
--- a/sys-kernel/boest-v5.2.17/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
+++ b/sys-kernel/boest-v5.2.21/0010-usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
@@ -1,4 +1,4 @@
-From c4c95d64ab0b26dd18b53b96047bb249224c9c56 Mon Sep 17 00:00:00 2001
+From 3fe2a0ec8baec3894c0ae0fcb9c1b2810c54b6fb Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Tue, 8 Sep 2015 09:53:38 -0700
Subject: [PATCH 10/13] usb-storage: Disable UAS on JMicron SATA enclosure
diff --git a/sys-kernel/boest-v5.2.17/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch b/sys-kernel/boest-v5.2.21/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch
index c4c127cc..e5abd56d 100644
--- a/sys-kernel/boest-v5.2.17/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch
+++ b/sys-kernel/boest-v5.2.21/0011-5.2-2600_enable-key-swapping-for-apple-mac.patch.patch
@@ -1,4 +1,4 @@
-From e975e586900815967997fd5994312dc29b000f5a Mon Sep 17 00:00:00 2001
+From af51bc621599f210c8c50f20ecd5ad22dcf98c2d Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sat, 22 Jun 2019 19:30:55 -0400
Subject: [PATCH 11/13] 5.2:2600_enable-key-swapping-for-apple-mac.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 11/13] 5.2:2600_enable-key-swapping-for-apple-mac.patch
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
-index 81df62f48c4c..e2db70cbc995 100644
+index 6ac8becc2372..35d8a8771d64 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -51,6 +51,22 @@ MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\")
@@ -34,7 +34,7 @@ index 81df62f48c4c..e2db70cbc995 100644
struct apple_sc {
unsigned long quirks;
unsigned int fn_on;
-@@ -163,6 +179,21 @@ static const struct apple_key_translation swapped_option_cmd_keys[] = {
+@@ -162,6 +178,21 @@ static const struct apple_key_translation swapped_option_cmd_keys[] = {
{ }
};
@@ -56,9 +56,9 @@ index 81df62f48c4c..e2db70cbc995 100644
static const struct apple_key_translation *apple_find_translation(
const struct apple_key_translation *table, u16 from)
{
-@@ -182,9 +213,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
- struct apple_sc *asc = hid_get_drvdata(hid);
- const struct apple_key_translation *trans, *table;
+@@ -183,9 +214,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
+ bool do_translate;
+ u16 code = 0;
- if (usage->code == KEY_FN) {
+ u16 fn_keycode = (swap_fn_leftctrl) ? (KEY_LEFTCTRL) : (KEY_FN);
@@ -70,7 +70,7 @@ index 81df62f48c4c..e2db70cbc995 100644
return 1;
}
-@@ -263,6 +296,30 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
+@@ -270,6 +303,30 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
}
}
@@ -101,7 +101,7 @@ index 81df62f48c4c..e2db70cbc995 100644
return 0;
}
-@@ -326,6 +383,21 @@ static void apple_setup_input(struct input_dev *input)
+@@ -333,6 +390,21 @@ static void apple_setup_input(struct input_dev *input)
for (trans = apple_iso_keyboard; trans->from; trans++)
set_bit(trans->to, input->keybit);
diff --git a/sys-kernel/boest-v5.2.17/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch b/sys-kernel/boest-v5.2.21/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch
index e8c7b264..e8225fe0 100644
--- a/sys-kernel/boest-v5.2.17/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch
+++ b/sys-kernel/boest-v5.2.21/0012-5.2-4567_distro-Gentoo-Kconfig.patch.patch
@@ -1,4 +1,4 @@
-From 314ee79ba604fb85ef567b26f7c43c85d6b6d5db Mon Sep 17 00:00:00 2001
+From 4dd9595d103a1daae2230358b96089ce00bf4273 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Thu, 19 Sep 2019 08:03:16 -0400
Subject: [PATCH 12/13] 5.2:4567_distro-Gentoo-Kconfig.patch
diff --git a/sys-kernel/boest-v5.2.17/0013-WARNING.patch b/sys-kernel/boest-v5.2.21/0013-WARNING.patch
index fa4eb9ab..7f24cf27 100644
--- a/sys-kernel/boest-v5.2.17/0013-WARNING.patch
+++ b/sys-kernel/boest-v5.2.21/0013-WARNING.patch
@@ -1,4 +1,4 @@
-From 8379f69e9d700397c6772acc2d5206dfd3ee4afa Mon Sep 17 00:00:00 2001
+From 1474be436328cbb18851a96d9a584d5dfffa83e5 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sat, 22 Jun 2019 19:30:55 -0400
Subject: [PATCH 13/13] WARNING This patch works with gcc versions 8.1+ and
diff --git a/sys-kernel/stable-sources-5.2.17 b/sys-kernel/stable-sources-5.2.17
deleted file mode 120000
index 9f0f3536..00000000
--- a/sys-kernel/stable-sources-5.2.17
+++ /dev/null
@@ -1 +0,0 @@
-boest-v5.2.17 \ No newline at end of file
diff --git a/sys-kernel/stable-sources-5.2.21 b/sys-kernel/stable-sources-5.2.21
new file mode 120000
index 00000000..9d0451ab
--- /dev/null
+++ b/sys-kernel/stable-sources-5.2.21
@@ -0,0 +1 @@
+boest-v5.2.21 \ No newline at end of file