From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] mcelog: Update to 181
Date: Sat, 23 Apr 2022 14:59:09 +0000
Message-ID: <687701db-4ca1-1b07-eb1f-a80842e1ac28@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7632636311461384813=="
List-Id: <development.lists.ipfire.org>

--===============7632636311461384813==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

No changelog or release notes are provided. Please refer to
https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/log/ for the
source code history since the 175 release of mcelog.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 lfs/mcelog                                   | 11 +++++++----
 src/patches/mcelog-181-fix-Python-call.patch |  8 ++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/patches/mcelog-181-fix-Python-call.patch

diff --git a/lfs/mcelog b/lfs/mcelog
index 8b75feecf..0f4694f2b 100644
--- a/lfs/mcelog
+++ b/lfs/mcelog
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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
=20
 SUMMARY    =3D Log Machine Check Events
=20
-VER        =3D 175
+VER        =3D 181
=20
 THISAPP    =3D mcelog-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D mcelog
-PAK_VER    =3D 2
+PAK_VER    =3D 3
 SUP_ARCH   =3D x86_64
=20
 DEPS       =3D
@@ -49,7 +49,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe=
452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64
+$(DL_FILE)_BLAKE2 =3D 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff219=
9ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de
=20
 install : $(TARGET)
=20
@@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
=20
+	# 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
=20
diff --git a/src/patches/mcelog-181-fix-Python-call.patch b/src/patches/mcelo=
g-181-fix-Python-call.patch
new file mode 100644
index 000000000..b0781f828
--- /dev/null
+++ b/src/patches/mcelog-181-fix-Python-call.patch
@@ -0,0 +1,8 @@
+--- 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
--=20
2.34.1

--===============7632636311461384813==--