summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2023-05-18 09:46:10 -0400
committerChris Severance2023-05-18 09:46:10 -0400
commit9b953cd50490334bc963155fe7748c0c5c166dd7 (patch)
tree8ee55394dc8ca7cbd3742151f55a55fe7ba51b1f
parent1db8f1ceaf119305c420005a9eb9e6d223df7774 (diff)
downloadaur-9b953cd50490334bc963155fe7748c0c5c166dd7.tar.gz
autu: Update to 5.10.180-1
-rw-r--r--.SRCINFO13
-rw-r--r--0002-reorganize-gimple-includes-for-GCC-13.patch108
-rw-r--r--PKGBUILD14
3 files changed, 125 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 29909a3d2eab..857f3d5f76ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-lts510
pkgdesc = LTS 5.10 Linux
- pkgver = 5.10.179
+ pkgver = 5.10.180
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -20,20 +20,23 @@ pkgbase = linux-lts510
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.179.tar.xz
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.179.tar.sign
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.180.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.180.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = 0002-reorganize-gimple-includes-for-GCC-13.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- md5sums = 432fff466a27c1905a0686023b15a547
+ md5sums = 4f8d1f23ee07a46b556cab2ad6d9d4f7
md5sums = SKIP
md5sums = 8b8fa773fe9c7938a76ba07ca2933ed8
md5sums = d31360693fb06a0d69c1f126350baa6d
- sha256sums = 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29
+ md5sums = a77dc4dacf4e37a295f752aee2353016
+ sha256sums = da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29
sha256sums = SKIP
sha256sums = ddc8d7c604a2f8373a25674d06cd377fdf80adca9bd426f4c8a50f3d52403001
sha256sums = 96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e
+ sha256sums = 40024e38f7aee6d3f8e07528a411d9b0acbf1224c56434d96644acbff7862905
pkgname = linux-lts510
pkgdesc = The LTS 5.10 Linux kernel and modules
diff --git a/0002-reorganize-gimple-includes-for-GCC-13.patch b/0002-reorganize-gimple-includes-for-GCC-13.patch
new file mode 100644
index 000000000000..a76984186b87
--- /dev/null
+++ b/0002-reorganize-gimple-includes-for-GCC-13.patch
@@ -0,0 +1,108 @@
+From mboxrd@z Thu Jan 1 00:00:00 1970
+Return-Path: <linux-kernel-owner@vger.kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+ aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
+ by smtp.lore.kernel.org (Postfix) with ESMTP id 5B47CC32793
+ for <linux-kernel@archiver.kernel.org>; Wed, 18 Jan 2023 20:24:14 +0000 (UTC)
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S229966AbjARUYN (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
+ Wed, 18 Jan 2023 15:24:13 -0500
+Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34048 "EHLO
+ lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S229940AbjARUYF (ORCPT
+ <rfc822;linux-kernel@vger.kernel.org>);
+ Wed, 18 Jan 2023 15:24:05 -0500
+Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c])
+ by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA30C5D904
+ for <linux-kernel@vger.kernel.org>; Wed, 18 Jan 2023 12:24:04 -0800 (PST)
+Received: by mail-pl1-x62c.google.com with SMTP id g23so186772plq.12
+ for <linux-kernel@vger.kernel.org>; Wed, 18 Jan 2023 12:24:04 -0800 (PST)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=chromium.org; s=google;
+ h=content-transfer-encoding:mime-version:message-id:date:subject:cc
+ :to:from:from:to:cc:subject:date:message-id:reply-to;
+ bh=M7nQ+g2J8OLWVvtfKxW9hliY4Yc3cv4OwnKnX3U91hE=;
+ b=MhP7CFPKMusVUiw6o4PRowhujO/e8aU5sJEsYfnFGzwkO0eKdjfTpPALqtQqB5Zy6j
+ 4HhX1moUWoFgSiTgqdNnBCZ6fwdpJ4C8Af74LEg3m+WUiFaqrMImOxuHx3uDzpXXalR4
+ tushRG6S03QNI9iVt8BOoggY9UMF8Cxi+zYGI=
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=content-transfer-encoding:mime-version:message-id:date:subject:cc
+ :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
+ :reply-to;
+ bh=M7nQ+g2J8OLWVvtfKxW9hliY4Yc3cv4OwnKnX3U91hE=;
+ b=0cCGaGR+o74Jurh08/XntGl4chNuLyQNl/iVzNTm+edtBn78KWjWbdbjtPN6+MlzuZ
+ NLobh3+wVme06DtsTCRLN/nlyaXpmVNjIncsq8oRs/3BgEj0csqqLNiVjoO58/klOo4b
+ 2+YepXczjwwUb6KFrNxznz/IsE7FYOscOV/i0547T5oQDHEwmBImUAfqTnPm9CCvWdqY
+ MvZRNHOreAxVyzAxU4MzkeKUekBFhTAfcYZEykYnoMZAFOf1Rk9SQVvlvOVs8BuLqLAb
+ Ivh67f5gjwPMfheLgVVT58CXobyuBpr+g5HoPDXEvuECUhchsHAUq2JD2wtDLVWPT5/f
+ Hn2g==
+X-Gm-Message-State: AFqh2kpYWvrfwSKyaMOxJIuOcDW5YtHpMnGDnb/xuCtB2S7ZF9xJH+5a
+ fLAjOHcyz9BBym1IIOjTJbCreg==
+X-Google-Smtp-Source: AMrXdXuvhtr6QYHTUipL1E7izXxzP6eU9ELvbbiqPHuu407BTk2+78EO8VAixW82hWCQezgP9BpVtw==
+X-Received: by 2002:a17:903:32d1:b0:188:fc0c:b736 with SMTP id i17-20020a17090332d100b00188fc0cb736mr34331887plr.67.1674073444029;
+ Wed, 18 Jan 2023 12:24:04 -0800 (PST)
+Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163])
+ by smtp.gmail.com with ESMTPSA id a10-20020a170902ecca00b001891a17bd93sm23667416plh.43.2023.01.18.12.24.03
+ (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
+ Wed, 18 Jan 2023 12:24:03 -0800 (PST)
+From: Kees Cook <keescook@chromium.org>
+To: linux-hardening@vger.kernel.org
+Cc: Kees Cook <keescook@chromium.org>,
+ Palmer Dabbelt <palmer@rivosinc.com>,
+ linux-kernel@vger.kernel.org
+Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13
+Date: Wed, 18 Jan 2023 12:24:02 -0800
+Message-Id: <20230118202355.never.520-kees@kernel.org>
+X-Mailer: git-send-email 2.34.1
+MIME-Version: 1.0
+X-Developer-Signature: v=1; a=openpgp-sha256; l=1189; h=from:subject:message-id; bh=vukSS8cdZdqqtgn6apidKMhxtj1t0IFOu1S+KhQ8h60=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjyFVhjOBNRZYH+UzANpQMnfOjTUf8wrb94vsB2GjK IDs1+4mJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY8hVYQAKCRCJcvTf3G3AJmyREA CcSyhCMz+CA+i5K0m3iYOM2pKAQebVxf9SOeiSsHQ9qtRdv7a5z6CkN/4dhLFAdsSWkvEpnms+0XUp h7G4EIyluvBiJiLLXDusha33r5D26q/YU4jyPKPLBpRAnSG9NjYaQzhgZ/D5rdJZHfnFFMsRbNtUM2 fNoIlLb8dPW61nIg5aa3q+OytDBECibjwTGhfTRfKMCXTxSHQACjBshgbDZiFJjq3KQskjX0oaoueB rbnd4ZVAiK7cFr+Tl7mAqFIj0mfZ/GYFGvI7DTuFjSPlvrSCtNARfYN5JWT6jkdQNjkRChzbN7Wk4e t1oo8yy1+5Z4TatJUjAQ+MHPLTkG29N7QDn+tq3EN+PGbPgQxV9n+EgPv1S6oAw4/mNWVSqaautpSu aQTzy443t5hxKSBar1lgdimhQ0ftdCqgY2054yImNbbpTXWNDsJMIvgIlsXHpYUt/IBSqhudau5ey8 vnb073zDoc8LgAQSkN0a3SCjYfPNc7vqt+xoJuZVr5DZs/mpyTIA6STUfj9QJkiVfflaPqdAIaWC3f S2VjdKhhaFXnp24XgMKV43Cz53EiTQ1/EDN91PauJOI5LmHJb7AfX9vrtnmnTC3uFxJKwybVBVMEi8 0wjQFuS1iUmK4YrLAuqcXE/aA2kCRBRASAN/wkM2oNrPucr9pt8HJ4fSszkg==
+X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026
+Content-Transfer-Encoding: 8bit
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+The gimple-iterator.h header must be included before gimple-fold.h
+starting with GCC 13. Reorganize gimple headers to work for all GCC
+versions.
+
+Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
+Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
+Cc: linux-hardening@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+---
+ scripts/gcc-plugins/gcc-common.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Adapted from Kernel 6.3.1 to 5.10.179 by severach@aur Mon 08 May 2023 10:05:53 PM EDT
+
+diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
+index 9a1895747b15..84c730da36dd 100644
+--- a/scripts/gcc-plugins/gcc-common.h
++++ b/scripts/gcc-plugins/gcc-common.h
+@@ -108,7 +108,9 @@
+ #include "varasm.h"
+ #include "stor-layout.h"
+ #include "internal-fn.h"
++#include "gimple.h"
+ #include "gimple-expr.h"
++#include "gimple-iterator.h"
+ #include "gimple-fold.h"
+ #include "context.h"
+ #include "tree-ssa-alias.h"
+@@ -124,13 +126,10 @@
+ #include "gimplify.h"
+ #endif
+
+-#include "gimple.h"
+-
+ #if BUILDING_GCC_VERSION >= 4009
+ #include "tree-ssa-operands.h"
+ #include "tree-phinodes.h"
+ #include "tree-cfg.h"
+-#include "gimple-iterator.h"
+ #include "gimple-ssa.h"
+ #include "ssa-iterators.h"
+ #endif
diff --git a/PKGBUILD b/PKGBUILD
index ed7ef6ae9fea..6ea7f7495b90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgbase=linux-lts510
-pkgver=5.10.179
+pkgver=5.10.180
pkgrel=1
pkgdesc='LTS 5.10 Linux'
url="https://www.kernel.org/"
@@ -19,20 +19,24 @@ source=(
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ # https://build.opensuse.org/package/show/home:curb:ArchLinux/linux-lts510
+ 0002-reorganize-gimple-includes-for-GCC-13.patch # https://lore.kernel.org/lkml/20230118202355.never.520-kees@kernel.org/raw
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-md5sums=('432fff466a27c1905a0686023b15a547'
+md5sums=('4f8d1f23ee07a46b556cab2ad6d9d4f7'
'SKIP'
'8b8fa773fe9c7938a76ba07ca2933ed8'
- 'd31360693fb06a0d69c1f126350baa6d')
-sha256sums=('1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29'
+ 'd31360693fb06a0d69c1f126350baa6d'
+ 'a77dc4dacf4e37a295f752aee2353016')
+sha256sums=('da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29'
'SKIP'
'ddc8d7c604a2f8373a25674d06cd377fdf80adca9bd426f4c8a50f3d52403001'
- '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e')
+ '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e'
+ '40024e38f7aee6d3f8e07528a411d9b0acbf1224c56434d96644acbff7862905')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase