From patchwork Sat Nov 11 10:58:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7341 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4SSCP32TNXz3wvq for ; Sat, 11 Nov 2023 10:59:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SSCNx6pLKz2rT; Sat, 11 Nov 2023 10:58:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4SSCNx6FxMz33gJ; Sat, 11 Nov 2023 10:58:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4SSCNv3kfCz2x9l for ; Sat, 11 Nov 2023 10:58:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4SSCNv0psRz12T; Sat, 11 Nov 2023 10:58:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1699700335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aqCJF9yOL77/5xLY+tAT1KfJ9f/wn+BVt0UNBSV6Ilc=; b=3rYTophAfVNIPiEeetiyKo4qMOFIaj0EkzXfjanL+UROZmtTIXNaOtW8boMdS/TOjO13Wp cmtq33NO4Rq6GCCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1699700335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aqCJF9yOL77/5xLY+tAT1KfJ9f/wn+BVt0UNBSV6Ilc=; b=rk/5iMB5xyQ6JGPl4AmCxbwdXzW+tOJhYo8Y6pj3sW12aiTNqIEg6z2Yu/i2AILCN4Yah1 Llq4YWfCiPvVNOQ1bqfxg/a4+RxAbGRfZZVw0FAH4Ny/6dtQ5ChQ9Y4vgPzp8NdRKy15Ez /UpCWXuHOjhIjiIh4sc/OEvo/6MZOZ/q6YyZGPc3lk5jI80FoJd1chBNfwo5mWQAGqJATP +tEDZM7dZpYpoUr0I1EVQUL4PhfKIwW0ENGvMRAYPwlkyB5feItNPZGk7o+ACht+cMUXBk hfrZ7OQmSKbvn7hrGMpajVCWtAabkELnGgIFrFCll+FE03S2mUo8WCA5v8VQSg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] mcelog: Update to version 196 Date: Sat, 11 Nov 2023 11:58:45 +0100 Message-ID: <20231111105850.717840-3-adolf.belka@ipfire.org> In-Reply-To: <20231111105850.717840-1-adolf.belka@ipfire.org> References: <20231111105850.717840-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 2PZS3OU2SGXTVFZSIIBLD2PUTCLJGG2D X-Message-ID-Hash: 2PZS3OU2SGXTVFZSIIBLD2PUTCLJGG2D X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 181 to 196 - Update of rootfile not required - Fix python call patch removed as correct python call now in the source tarball - Changelog file is no longer used. Review of changes has to be done via the git repo. https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ Signed-off-by: Adolf Belka --- lfs/mcelog | 12 ++++-------- src/patches/mcelog-181-fix-Python-call.patch | 8 -------- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/patches/mcelog-181-fix-Python-call.patch diff --git a/lfs/mcelog b/lfs/mcelog index 0f4694f2b..619cf025a 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config SUMMARY = Log Machine Check Events -VER = 181 +VER = 196 THISAPP = mcelog-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mcelog -PAK_VER = 3 +PAK_VER = 4 SUP_ARCH = x86_64 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de +$(DL_FILE)_BLAKE2 = 50871cd7a3c4dd6f4c4d613c7db4528d972ca37ba17b0a5aa4876d8fc92d4478c2247ea65748310ad6d4b950d1abc9bd0ea40193e72b36d38334547382477849 install : $(TARGET) @@ -82,10 +82,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Fix Python interpreter call in genconfig.py script - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mcelog-181-fix-Python-call.patch - cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/mcelog-181-fix-Python-call.patch b/src/patches/mcelog-181-fix-Python-call.patch deleted file mode 100644 index b0781f828..000000000 --- a/src/patches/mcelog-181-fix-Python-call.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- mcelog-181.orig/genconfig.py 2022-04-23 14:54:26.721031777 +0000 -+++ mcelog-181/genconfig.py 2022-04-23 14:54:35.577658935 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # generate man config documentation from mcelog.conf example - # genconfig.py mcelog.conf intro.html - from __future__ import print_function