commit: 11ab24760afeb16dad477e0ba437bdc1af112975 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Tue Mar 16 16:04:39 2021 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Tue Mar 16 16:04:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=11ab2476
Update wireguard patch Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 2 +- ... => 2400_wireguard-backport-v1.0.20210316.patch | 44 ++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/0000_README b/0000_README index 3db6e30..ddac126 100644 --- a/0000_README +++ b/0000_README @@ -475,7 +475,7 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/[email protected]/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 -Patch: 2400_wireguard-backport-v1.0.20210304.patch +Patch: 2400_wireguard-backport-v1.0.20210316.patch From: https://git.zx2c4.com/wireguard-linux/ Desc: Extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography diff --git a/2400_wireguard-backport-v1.0.20210304.patch b/2400_wireguard-backport-v1.0.20210316.patch old mode 100644 new mode 100755 similarity index 99% rename from 2400_wireguard-backport-v1.0.20210304.patch rename to 2400_wireguard-backport-v1.0.20210316.patch index 1292f3e..ab5ae8c --- a/2400_wireguard-backport-v1.0.20210304.patch +++ b/2400_wireguard-backport-v1.0.20210316.patch @@ -1,3 +1,39 @@ +#!/bin/bash +############################################################################### +# = WireGuard for Linux 5.4.y = +# +# This is a patch that combines all of the patches on [1] into one single patch +# with all file changes merged into a single change per file, so that patching +# is fast and conflict free, and to keep the size of this file minimized. +# +# It also doubles as an executable bash script, which you can run to update +# this to the latest patch series for 5.4.y. It relies on bash, sed, coreutils, +# and patchutils. +# +# [1] https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y +############################################################################## +set -e +self="$(readlink -f "${BASH_SOURCE[0]}")" +temp="$(mktemp -d)" +trap 'cd /; rm -rf "$temp";' INT TERM EXIT +cd "$temp" +echo "[+] Fetching WireGuard patches for 5.4.y" +curl -# -f -L -o git-patches.mbox "https://git.zx2c4.com/wireguard-linux/patch/?id2=gregkh/stable-5.4.y&id=backport-5.4.y"; +echo "[+] Normalizing patches" +splitdiff -a -p 1 git-patches.mbox +l=/dev/null +for patch in *.patch; do + combinediff -q -p 1 "$l" "$patch" > next.patch + l=last.patch + mv next.patch last.patch +done +echo "[+] Writing out new patch" +sed '/^--$/q' "$self" > "$self.new" +cat last.patch >> "$self.new" +chmod +x "$self.new" +mv "$self.new" "$self" +exit 0 +-- --- b/crypto/Kconfig +++ b/crypto/Kconfig @@ -136,8 +136,6 @@ @@ -118,7 +154,7 @@ +config CRYPTO_POLY1305_MIPS + tristate "Poly1305 authenticator algorithm (MIPS optimized)" -+ depends on CPU_MIPS32 || (CPU_MIPS64 && 64BIT) ++ depends on MIPS + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + config CRYPTO_MD4 @@ -3135,8 +3171,8 @@ +obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o +poly1305-mips-y := poly1305-core.o poly1305-glue.o + -+perlasm-flavour-$(CONFIG_CPU_MIPS32) := o32 -+perlasm-flavour-$(CONFIG_CPU_MIPS64) := 64 ++perlasm-flavour-$(CONFIG_32BIT) := o32 ++perlasm-flavour-$(CONFIG_64BIT) := 64 + +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@) @@ -36431,7 +36467,7 @@ + select CRYPTO_POLY1305_ARM if ARM + select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON + select CRYPTO_CHACHA_MIPS if CPU_MIPS32_R2 -+ select CRYPTO_POLY1305_MIPS if CPU_MIPS32 || (CPU_MIPS64 && 64BIT) ++ select CRYPTO_POLY1305_MIPS if MIPS + help + WireGuard is a secure, fast, and easy to use replacement for IPSec + that uses modern cryptography and clever networking tricks. It's
