From 603acc933c575737fb6055e7ef45dc80807a7be0 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Mar 14 2020 16:02:50 +0000
Subject: Update to 4.19.109


---

diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
index 28019bd..f5c7bd2 100644
--- a/.raspberrypi2.metadata
+++ b/.raspberrypi2.metadata
@@ -1,4 +1,3 @@
-287bd0fb82e59c7c2ab8cf013b278930520a570c  SOURCES/65cd479134433363e1235a3aee4e41e281384cf6.tar.gz
-4b8a8405b94f991f637efdd8b21ed6f7dfd57628  SOURCES/f4b58692fef0b9c16bd4564edb980fff73a758b3.tar.gz
-bc8021fbcce862481f675c2605644b10eaf53603  SOURCES/patch-4.19.102-103-mod.xz
-7f51fabd019fc4c152aa7dcb7971e431e0cf3b4a  SOURCES/patch-4.19.103-104.xz
+71d37eea250fee076ae28aa51542f5aa82cb127a  SOURCES/2fab54c74bf956951e61c6d4fe473995e8d07010.tar.gz
+b9d628cb0c1307eac2b7b599e786eec9bb61a2ae  SOURCES/9e2193537c48abf8225e02e15e319a209cca558a.tar.gz
+a2199e5fb76d17e7d1334896cc38b4f3661870bf  SOURCES/patch-4.19.108-109.xz
diff --git a/SOURCES/bcm2709_selinux_config.patch b/SOURCES/bcm2709_selinux_config.patch
index 067fc08..1a4fd4b 100644
--- a/SOURCES/bcm2709_selinux_config.patch
+++ b/SOURCES/bcm2709_selinux_config.patch
@@ -8,7 +8,7 @@
  CONFIG_GENERIC_IRQ_DEBUGFS=y
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
-@@ -120,6 +121,7 @@ CONFIG_IPV6_SUBTREES=y
+@@ -122,6 +123,7 @@ CONFIG_IPV6_SUBTREES=y
  CONFIG_IPV6_MROUTE=y
  CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
  CONFIG_IPV6_PIMSM_V2=y
@@ -16,7 +16,7 @@
  CONFIG_NETFILTER=y
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CONNTRACK_ZONES=y
-@@ -167,6 +169,7 @@ CONFIG_NFT_FIB_NETDEV=m
+@@ -169,6 +171,7 @@ CONFIG_NFT_FIB_NETDEV=m
  CONFIG_NF_FLOW_TABLE_INET=m
  CONFIG_NF_FLOW_TABLE=m
  CONFIG_NETFILTER_XT_SET=m
@@ -24,7 +24,7 @@
  CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-@@ -278,6 +281,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
+@@ -280,6 +283,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
  CONFIG_IP_NF_RAW=m
@@ -32,7 +32,7 @@
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
  CONFIG_IP_NF_ARP_MANGLE=m
-@@ -303,6 +307,7 @@ CONFIG_IP6_NF_FILTER=m
+@@ -305,6 +309,7 @@ CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_RAW=m
@@ -40,7 +40,7 @@
  CONFIG_IP6_NF_NAT=m
  CONFIG_IP6_NF_TARGET_MASQUERADE=m
  CONFIG_IP6_NF_TARGET_NPT=m
-@@ -1322,6 +1327,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
+@@ -1350,6 +1355,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_NILFS2_FS=m
  CONFIG_F2FS_FS=y
  CONFIG_FANOTIFY=y
@@ -48,7 +48,7 @@
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
  CONFIG_AUTOFS4_FS=y
-@@ -1363,6 +1369,7 @@ CONFIG_NFS_FSCACHE=y
+@@ -1392,6 +1398,7 @@ CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
  CONFIG_NFSD_V3_ACL=y
  CONFIG_NFSD_V4=y
@@ -56,7 +56,7 @@
  CONFIG_CIFS=m
  CONFIG_CIFS_WEAK_PW_HASH=y
  CONFIG_CIFS_UPCALL=y
-@@ -1411,7 +1418,14 @@ CONFIG_NLS_ISO8859_15=m
+@@ -1440,7 +1447,14 @@ CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
@@ -69,5 +69,15 @@
 +CONFIG_SECURITY_SELINUX_DISABLE=y
 +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
  CONFIG_CRYPTO_USER=m
- CONFIG_CRYPTO_CBC=y
- CONFIG_CRYPTO_CTS=m
+ CONFIG_CRYPTO_XCBC=m
+ CONFIG_CRYPTO_TGR192=m
+@@ -1467,3 +1481,9 @@ CONFIG_FUNCTION_PROFILER=y
+ CONFIG_KGDB=y
+ CONFIG_KGDB_KDB=y
+ CONFIG_KDB_KEYBOARD=y
++CONFIG_NET_TEAM=m
++CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
++CONFIG_NET_TEAM_MODE_BROADCAST=m
++CONFIG_NET_TEAM_MODE_LOADBALANCE=m
++CONFIG_NET_TEAM_MODE_RANDOM=m
++CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
diff --git a/SOURCES/bcm2711_selinux_config.patch b/SOURCES/bcm2711_selinux_config.patch
index a7bd4c9..044d4c7 100644
--- a/SOURCES/bcm2711_selinux_config.patch
+++ b/SOURCES/bcm2711_selinux_config.patch
@@ -9,7 +9,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_GENERIC_IRQ_DEBUGFS=y
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
-@@ -123,6 +124,7 @@ CONFIG_IPV6_SUBTREES=y
+@@ -130,6 +131,7 @@ CONFIG_IPV6_SUBTREES=y
  CONFIG_IPV6_MROUTE=y
  CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
  CONFIG_IPV6_PIMSM_V2=y
@@ -17,7 +17,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_NETFILTER=y
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CONNTRACK_ZONES=y
-@@ -170,6 +172,7 @@ CONFIG_NFT_FIB_NETDEV=m
+@@ -177,6 +179,7 @@ CONFIG_NFT_FIB_NETDEV=m
  CONFIG_NF_FLOW_TABLE_INET=m
  CONFIG_NF_FLOW_TABLE=m
  CONFIG_NETFILTER_XT_SET=m
@@ -25,7 +25,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-@@ -281,6 +284,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
+@@ -288,6 +291,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
  CONFIG_IP_NF_RAW=m
@@ -33,7 +33,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
  CONFIG_IP_NF_ARP_MANGLE=m
-@@ -306,6 +310,7 @@ CONFIG_IP6_NF_FILTER=m
+@@ -313,6 +317,7 @@ CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_RAW=m
@@ -41,7 +41,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_IP6_NF_NAT=m
  CONFIG_IP6_NF_TARGET_MASQUERADE=m
  CONFIG_IP6_NF_TARGET_NPT=m
-@@ -1355,6 +1360,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
+@@ -1388,6 +1393,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_NILFS2_FS=m
  CONFIG_F2FS_FS=y
  CONFIG_FANOTIFY=y
@@ -49,7 +49,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
  CONFIG_AUTOFS4_FS=y
-@@ -1396,6 +1402,7 @@ CONFIG_NFS_FSCACHE=y
+@@ -1430,6 +1436,7 @@ CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
  CONFIG_NFSD_V3_ACL=y
  CONFIG_NFSD_V4=y
@@ -57,7 +57,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
  CONFIG_CIFS=m
  CONFIG_CIFS_WEAK_PW_HASH=y
  CONFIG_CIFS_UPCALL=y
-@@ -1445,6 +1452,13 @@ CONFIG_NLS_ISO8859_15=m
+@@ -1479,6 +1486,13 @@ CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
@@ -69,8 +69,18 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco
 +CONFIG_SECURITY_SELINUX_DISABLE=y
 +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
  CONFIG_CRYPTO_USER=m
- CONFIG_CRYPTO_CBC=y
- CONFIG_CRYPTO_CTS=m
+ CONFIG_CRYPTO_XCBC=m
+ CONFIG_CRYPTO_TGR192=m
+@@ -1505,3 +1519,9 @@ CONFIG_FUNCTION_PROFILER=y
+ CONFIG_KGDB=y
+ CONFIG_KGDB_KDB=y
+ CONFIG_KDB_KEYBOARD=y
++CONFIG_NET_TEAM=m
++CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
++CONFIG_NET_TEAM_MODE_BROADCAST=m
++CONFIG_NET_TEAM_MODE_LOADBALANCE=m
++CONFIG_NET_TEAM_MODE_RANDOM=m
++CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
 --- a/arch/arm64/configs/bcm2711_defconfig	2019-11-16 13:47:33.867996642 +0000
 +++ b/arch/arm64/configs/bcm2711_defconfig	2019-11-16 13:55:19.882362227 +0000
@@ -82,7 +92,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_GENERIC_IRQ_DEBUGFS=y
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
-@@ -119,6 +120,7 @@ CONFIG_IPV6_SUBTREES=y
+@@ -126,6 +127,7 @@ CONFIG_IPV6_SUBTREES=y
  CONFIG_IPV6_MROUTE=y
  CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
  CONFIG_IPV6_PIMSM_V2=y
@@ -90,7 +100,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_NETFILTER=y
  CONFIG_NF_CONNTRACK=m
  CONFIG_NF_CONNTRACK_ZONES=y
-@@ -166,6 +168,7 @@ CONFIG_NFT_FIB_NETDEV=m
+@@ -173,6 +175,7 @@ CONFIG_NFT_FIB_NETDEV=m
  CONFIG_NF_FLOW_TABLE_INET=m
  CONFIG_NF_FLOW_TABLE=m
  CONFIG_NETFILTER_XT_SET=m
@@ -98,7 +108,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-@@ -277,6 +280,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
+@@ -284,6 +287,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m
  CONFIG_IP_NF_TARGET_ECN=m
  CONFIG_IP_NF_TARGET_TTL=m
  CONFIG_IP_NF_RAW=m
@@ -106,7 +116,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_IP_NF_ARPTABLES=m
  CONFIG_IP_NF_ARPFILTER=m
  CONFIG_IP_NF_ARP_MANGLE=m
-@@ -302,6 +306,7 @@ CONFIG_IP6_NF_FILTER=m
+@@ -309,6 +313,7 @@ CONFIG_IP6_NF_FILTER=m
  CONFIG_IP6_NF_TARGET_REJECT=m
  CONFIG_IP6_NF_MANGLE=m
  CONFIG_IP6_NF_RAW=m
@@ -114,7 +124,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_IP6_NF_NAT=m
  CONFIG_IP6_NF_TARGET_MASQUERADE=m
  CONFIG_IP6_NF_TARGET_NPT=m
-@@ -1365,6 +1370,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
+@@ -1381,6 +1386,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_NILFS2_FS=m
  CONFIG_F2FS_FS=y
  CONFIG_FANOTIFY=y
@@ -122,7 +132,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
  CONFIG_AUTOFS4_FS=y
-@@ -1406,6 +1412,7 @@ CONFIG_NFS_FSCACHE=y
+@@ -1423,6 +1429,7 @@ CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
  CONFIG_NFSD_V3_ACL=y
  CONFIG_NFSD_V4=y
@@ -130,7 +140,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
  CONFIG_CIFS=m
  CONFIG_CIFS_WEAK_PW_HASH=y
  CONFIG_CIFS_UPCALL=y
-@@ -1455,6 +1462,13 @@ CONFIG_NLS_ISO8859_15=m
+@@ -1472,6 +1479,13 @@ CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
@@ -142,5 +152,15 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d
 +CONFIG_SECURITY_SELINUX_DISABLE=y
 +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
  CONFIG_CRYPTO_USER=m
- CONFIG_CRYPTO_CBC=y
- CONFIG_CRYPTO_CTS=m
+ CONFIG_CRYPTO_XCBC=m
+ CONFIG_CRYPTO_TGR192=m
+@@ -1497,3 +1511,9 @@ CONFIG_FUNCTION_PROFILER=y
+ CONFIG_KGDB=y
+ CONFIG_KGDB_KDB=y
+ CONFIG_KDB_KEYBOARD=y
++CONFIG_NET_TEAM=m
++CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
++CONFIG_NET_TEAM_MODE_BROADCAST=m
++CONFIG_NET_TEAM_MODE_LOADBALANCE=m
++CONFIG_NET_TEAM_MODE_RANDOM=m
++CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 444bbd1..e1eca4a 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -1,6 +1,6 @@
-%global commit_firmware_long f4b58692fef0b9c16bd4564edb980fff73a758b3
+%global commit_firmware_long 9e2193537c48abf8225e02e15e319a209cca558a
 #%global commit_firmware_short %(c=%{commit_firmware_long}; echo ${c:0:7})
-%global commit_linux_long 65cd479134433363e1235a3aee4e41e281384cf6
+%global commit_linux_long 2fab54c74bf956951e61c6d4fe473995e8d07010
 #%global commit_linux_short %(c=%{commit_linux_long}; echo ${c:0:7})
 
 ExclusiveArch: aarch64 armv7hl
@@ -34,7 +34,7 @@ ExclusiveArch: aarch64 armv7hl
 %define extra_version 1
 
 Name:           raspberrypi2
-Version:        4.19.104
+Version:        4.19.109
 Release:        %{local_version}.%{extra_version}%{?dist}
 Summary:        Specific kernel and bootcode for Raspberry Pi
 
@@ -43,8 +43,7 @@ URL:            https://github.com/raspberrypi/linux
 Source0:        https://github.com/raspberrypi/linux/archive/%{commit_linux_long}.tar.gz
 Source1:        https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz
 
-Patch103:       patch-4.19.102-103-mod.xz
-Patch104:       patch-4.19.103-104.xz
+Patch109:       patch-4.19.108-109.xz
 
 BuildRequires: kmod, patch, bash, sh-utils, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk
@@ -119,8 +118,7 @@ including the kernel bootloader.
 %patch0 -p1
 %patch1 -p1
 
-%patch103 -p1
-%patch104 -p1
+%patch109 -p1
 
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile
 perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm%{bcmmodel}_defconfig
@@ -250,6 +248,10 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README
 %doc /boot/LICENCE.broadcom
 
 %changelog
+* Sat Mar 14 2020 Pablo Greco <pgreco@centosproject.org> - 4.19.109-v7.1.el7
+- Update to version v4.19.104
+- Add team network driver
+
 * Sat Feb 15 2020 Pablo Greco <pgreco@centosproject.org> - 4.19.104-v7.1.el7
 - Update to version v4.19.104
 - Support building in CentOS8