* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 27ef66c26c480542f0ea60d85302da5ada0f0648
@ 2018-03-19 11:57 git
0 siblings, 0 replies; only message in thread
From: git @ 2018-03-19 11:57 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7838 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 27ef66c26c480542f0ea60d85302da5ada0f0648 (commit)
via 71e5a29c8123014a8b740c3a99a83742a19019fa (commit)
via 35cdaa194ac5d2abfc0a93f60ed99aab07be9ce3 (commit)
from b2318b5e351923632c43e3d5d9e6a2351a1b63cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 27ef66c26c480542f0ea60d85302da5ada0f0648
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Mar 18 17:32:43 2018 +0100
hdparm: Update to 9.55
Changelogs against 9.53:
"hdparm-9.55:
- added #include <sys/sysmacros.h> for major()/minor() macros
hdparm-9.54:
- Partial revert of Jmicron changes, from Jan Friesse."
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 71e5a29c8123014a8b740c3a99a83742a19019fa
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Mar 18 17:40:47 2018 +0100
dmidecode 3.1: Added patch (Fix firmware version of TPM device)
For details see:
http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=174387405e98cd94c627832ae23abcb9be7e5623
"Both the operator (detected by clang, reported by Xorg) and the mask
for the minor firmware version field of TPM devices were wrong."
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 35cdaa194ac5d2abfc0a93f60ed99aab07be9ce3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Mar 19 11:52:26 2018 +0000
Fix python-m2crypto rootfile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/python-m2crypto | 1 -
.../common/{armv5tel => }/python-m2crypto | 0
config/rootfiles/common/x86_64/python-m2crypto | 1 -
lfs/dmidecode | 3 ++-
lfs/hdparm | 6 ++---
..._support_for_structure_type_43_tpm_device.patch | 30 ++++++++++++++++++++++
6 files changed, 35 insertions(+), 6 deletions(-)
delete mode 100644 config/rootfiles/common/i586/python-m2crypto
rename config/rootfiles/common/{armv5tel => }/python-m2crypto (100%)
delete mode 100644 config/rootfiles/common/x86_64/python-m2crypto
create mode 100644 src/patches/dmidecode/add_support_for_structure_type_43_tpm_device.patch
Difference in files:
diff --git a/config/rootfiles/common/i586/python-m2crypto b/config/rootfiles/common/i586/python-m2crypto
deleted file mode 100644
index 73172148e..000000000
--- a/config/rootfiles/common/i586/python-m2crypto
+++ /dev/null
@@ -1 +0,0 @@
-#usr/lib/python2.7/site-packages/M2Crypto-0.21.1-py2.7-linux-i586.egg
diff --git a/config/rootfiles/common/armv5tel/python-m2crypto b/config/rootfiles/common/python-m2crypto
similarity index 100%
rename from config/rootfiles/common/armv5tel/python-m2crypto
rename to config/rootfiles/common/python-m2crypto
diff --git a/config/rootfiles/common/x86_64/python-m2crypto b/config/rootfiles/common/x86_64/python-m2crypto
deleted file mode 100644
index 6352cab97..000000000
--- a/config/rootfiles/common/x86_64/python-m2crypto
+++ /dev/null
@@ -1 +0,0 @@
-#usr/lib/python2.7/site-packages/M2Crypto-0.21.1-py2.7-linux-x86_64.egg
diff --git a/lfs/dmidecode b/lfs/dmidecode
index 8f8a2491c..fa0101594 100644
--- a/lfs/dmidecode
+++ b/lfs/dmidecode
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2018 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 #
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/add_support_for_structure_type_43_tpm_device.patch
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/hdparm b/lfs/hdparm
index 68620bd6e..87d961d15 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2018 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 9.53
+VER = 9.55
THISAPP = hdparm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1e54b52e0c8cb79389d4d47eacba411d
+$(DL_FILE)_MD5 = adae46e9564075ae288af8082d5ad9fd
install : $(TARGET)
diff --git a/src/patches/dmidecode/add_support_for_structure_type_43_tpm_device.patch b/src/patches/dmidecode/add_support_for_structure_type_43_tpm_device.patch
new file mode 100644
index 000000000..07f4f7ed7
--- /dev/null
+++ b/src/patches/dmidecode/add_support_for_structure_type_43_tpm_device.patch
@@ -0,0 +1,30 @@
+From 174387405e98cd94c627832ae23abcb9be7e5623 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare(a)suse.de>
+Date: Wed, 31 Jan 2018 18:52:47 +0100
+Subject: dmidecode: Fix firmware version of TPM device
+
+Both the operator (detected by clang, reported by Xorg) and the mask
+for the minor firmware version field of TPM devices were wrong.
+
+Signed-off-by: Jean Delvare <jdelvare(a)suse.de>
+Fixes: 48a8132058a0 ("dmidecode: Add support for structure type 43 (TPM Device)")
+---
+ dmidecode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dmidecode.c b/dmidecode.c
+index 87faaa9..a593170 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -4511,7 +4511,7 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
+ case 0x02:
+ printf("\tFirmware Revision: %u.%u\n",
+ DWORD(data + 0x0A) >> 16,
+- DWORD(data + 0x0A) && 0xFF);
++ DWORD(data + 0x0A) & 0xFFFF);
+ /*
+ * We skip the next 4 bytes, as their
+ * format is not standardized and their
+--
+cgit v1.0-41-gc330
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-03-19 11:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-19 11:57 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 27ef66c26c480542f0ea60d85302da5ada0f0648 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox