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] lynis: update to 3.0.3
Date: Mon, 01 Feb 2021 19:37:27 +0100
Message-ID: <a5761f7b-6c68-8edf-75d5-066865267768@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4400478906568794853=="
List-Id: <development.lists.ipfire.org>

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

The changelog of lynis 3.0.3 is available at
https://github.com/CISOfy/lynis/releases/tag/3.0.3; all changes since
lynis 3.0.1 can be inspected at https://github.com/CISOfy/lynis/releases.

lynis 3.0.2 adds detection for IPFire, so we can hope to have those
"unknown operating system" messages omitted in future. :-)

Minor adjustments to LFS and rootfile were necessary to purge unused
CI/CD stuff as well as some markdown files (licence, code of conduct,
etc. pp.) from the extracted archive.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 config/rootfiles/packages/lynis | 11 +++--------
 lfs/lynis                       | 14 +++++++-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis
index a7ca0e3dd..4a9918b27 100644
--- a/config/rootfiles/packages/lynis
+++ b/config/rootfiles/packages/lynis
@@ -1,10 +1,4 @@
 var/ipfire/lynis
-#var/ipfire/lynis/CHANGELOG.md
-#var/ipfire/lynis/CODE_OF_CONDUCT.md
-#var/ipfire/lynis/CONTRIBUTING.md
-#var/ipfire/lynis/CONTRIBUTORS.md
-#var/ipfire/lynis/HAPPY_USERS.md
-#var/ipfire/lynis/SECURITY.md
 #var/ipfire/lynis/db
 var/ipfire/lynis/db/fileperms.db
 var/ipfire/lynis/db/hints.db
@@ -119,7 +113,8 @@ var/ipfire/lynis/include/tests_virtualization
 var/ipfire/lynis/include/tests_webservers
 var/ipfire/lynis/include/tool_tips
 var/ipfire/lynis/lynis
-var/ipfire/lynis/lynis.8
 #var/ipfire/lynis/plugins
-var/ipfire/lynis/plugins/README
+#var/ipfire/lynis/plugins/README
 var/ipfire/lynis/plugins/custom_plugin.template
+var/ipfire/lynis/plugins/plugin_pam_phase1
+var/ipfire/lynis/plugins/plugin_systemd_phase1
diff --git a/lfs/lynis b/lfs/lynis
index 7dc807781..1ae501603 100644
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2021  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,16 +24,16 @@
=20
 include Config
=20
-VER        =3D 3.0.1
+VER        =3D 3.0.3
=20
 THISAPP    =3D lynis-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
 DL_FROM    =3D $(URL_IPFIRE)
-DIR_APP    =3D $(DIR_SRC)/lynis
+DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 PROG       =3D lynis
-PAK_VER    =3D 8
+PAK_VER    =3D 9
 DEPS       =3D
=20
 ############################################################################=
###
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D ac984258e89b88c86e8c1c5395de8a15
+$(DL_FILE)_MD5 =3D d5c7cdbab15029449fe5ef4b59ee941d
=20
 install : $(TARGET)
=20
@@ -77,7 +77,7 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && rm -rf {dev,CHANGELOG,README,INSTALL,TODO,FAQ,LICENSE}
-	cp -vrf $(DIR_APP) /var/ipfire/
+	cd $(DIR_APP) && rm -rf .git* .travis.yml *.md FAQ INSTALL LICENCE lynis.8 =
README
+	cp -vrf $(DIR_APP) /var/ipfire/lynis
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.26.2

--===============4400478906568794853==--