public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e1982c695c6faf86fb74c48c151985acb1f9250e
Date: Sun, 03 Mar 2019 14:28:12 +0000	[thread overview]
Message-ID: <20190303142812.D670D84FDD4@people01.i.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 8712 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  e1982c695c6faf86fb74c48c151985acb1f9250e (commit)
       via  771c9b78eeb54a405608884dc3a4e9e5fa961b1a (commit)
      from  d6af912c83827b231eb989ff1349a3243fd52902 (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 e1982c695c6faf86fb74c48c151985acb1f9250e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 2 13:24:44 2019 +0000

    spectre-meltdown-checker: New package
    
    This makes it easy to install the script and check the vulnerability status
    of a system IPFire is running on.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 771c9b78eeb54a405608884dc3a4e9e5fa961b1a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 2 13:01:42 2019 +0000

    binutils: Ship strings & readelf
    
    This is needed by the spectre meltdown checker script
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/aarch64/binutils           |  4 ++--
 config/rootfiles/common/armv5tel/binutils          |  4 ++--
 config/rootfiles/common/i586/binutils              |  4 ++--
 config/rootfiles/common/x86_64/binutils            |  4 ++--
 config/rootfiles/core/129/filelists/files          |  2 ++
 config/rootfiles/packages/spectre-meltdown-checker |  1 +
 lfs/{jansson => spectre-meltdown-checker}          | 13 ++++++-------
 make.sh                                            |  1 +
 8 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 config/rootfiles/packages/spectre-meltdown-checker
 copy lfs/{jansson => spectre-meltdown-checker} (92%)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils
index a276d5d23..5a37c770e 100644
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -10,9 +10,9 @@
 #usr/bin/objcopy
 #usr/bin/objdump
 #usr/bin/ranlib
-#usr/bin/readelf
+usr/bin/readelf
 #usr/bin/size
-#usr/bin/strings
+usr/bin/strings
 #usr/bin/strip
 #usr/include/ansidecl.h
 #usr/include/bfd.h
diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils
index c12b90fe2..a94ecfa1a 100644
--- a/config/rootfiles/common/armv5tel/binutils
+++ b/config/rootfiles/common/armv5tel/binutils
@@ -10,9 +10,9 @@
 #usr/bin/objcopy
 #usr/bin/objdump
 #usr/bin/ranlib
-#usr/bin/readelf
+usr/bin/readelf
 #usr/bin/size
-#usr/bin/strings
+usr/bin/strings
 #usr/bin/strip
 #usr/include/ansidecl.h
 #usr/include/bfd.h
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
index 42c82cbd7..20d8972a8 100644
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -10,9 +10,9 @@
 #usr/bin/objcopy
 #usr/bin/objdump
 #usr/bin/ranlib
-#usr/bin/readelf
+usr/bin/readelf
 #usr/bin/size
-#usr/bin/strings
+usr/bin/strings
 #usr/bin/strip
 #usr/include/ansidecl.h
 #usr/include/bfd.h
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 42c82cbd7..20d8972a8 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -10,9 +10,9 @@
 #usr/bin/objcopy
 #usr/bin/objdump
 #usr/bin/ranlib
-#usr/bin/readelf
+usr/bin/readelf
 #usr/bin/size
-#usr/bin/strings
+usr/bin/strings
 #usr/bin/strip
 #usr/include/ansidecl.h
 #usr/include/bfd.h
diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/core/129/filelists/files
index a3d40802f..14bd3edc9 100644
--- a/config/rootfiles/core/129/filelists/files
+++ b/config/rootfiles/core/129/filelists/files
@@ -8,6 +8,8 @@ srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/netovpnsrv.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/bin/readelf
+usr/bin/strings
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/ipsec-policy
 usr/local/bin/ipsec-interfaces
diff --git a/config/rootfiles/packages/spectre-meltdown-checker b/config/rootfiles/packages/spectre-meltdown-checker
new file mode 100644
index 000000000..7f4fbfab9
--- /dev/null
+++ b/config/rootfiles/packages/spectre-meltdown-checker
@@ -0,0 +1 @@
+usr/sbin/spectre-meltdown-checker
diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker
new file mode 100644
index 000000000..8bb3efb04
--- /dev/null
+++ b/lfs/spectre-meltdown-checker
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.40
+
+THISAPP    = spectre-meltdown-checker-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = spectre-meltdown-checker
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = cc1ed68faf3fde13b1ff3bd15a22d46d
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && install -v -m 754 spectre-meltdown-checker.sh \
+		/usr/sbin/spectre-meltdown-checker
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 8bafd86f9..99b5a32a7 100755
--- a/make.sh
+++ b/make.sh
@@ -1590,6 +1590,7 @@ buildipfire() {
   lfsmake2 borgbackup
   lfsmake2 libedit
   lfsmake2 knot
+  lfsmake2 spectre-meltdown-checker
 }
 
 buildinstaller() {


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2019-03-03 14:28 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190303142812.D670D84FDD4@people01.i.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox