From 55cb5e9324dbec88cac9581930aaee4e3a598a9b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 5 Sep 2021 18:32:50 +0000 Subject: [PATCH] Revert "lynis: Update to version 3.0.6" This reverts commit d78fd31bb39b767537868c3bb1f8884732f2c09e. downloads gives every time a different checksum lookls like packetstorm never send the same file. [root@helena cache]# wget https://packetstormsecurity.com/files/download/163629/lynis-3.0.6.tar.gz --2021-09-05 18:29:39-- https://packetstormsecurity.com/files/download/163629/lynis-3.0.6.tar.gz Resolving packetstormsecurity.com... 198.84.60.198 Connecting to packetstormsecurity.com|198.84.60.198|:443... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: 'lynis-3.0.6.tar.gz.1' lynis-3.0.6.tar.gz. [ <=> ] 20.27K --.-KB/s in 0s 2021-09-05 18:29:40 (164 MB/s) - 'lynis-3.0.6.tar.gz.1' saved [20753] [root@helena cache]# wget https://packetstormsecurity.com/files/download/163629/lynis-3.0.6.tar.gz --2021-09-05 18:29:43-- https://packetstormsecurity.com/files/download/163629/lynis-3.0.6.tar.gz Resolving packetstormsecurity.com... 198.84.60.198 Connecting to packetstormsecurity.com|198.84.60.198|:443... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: 'lynis-3.0.6.tar.gz.2' lynis-3.0.6.tar.gz. [ <=> ] 20.27K --.-KB/s in 0s 2021-09-05 18:29:44 (177 MB/s) - 'lynis-3.0.6.tar.gz.2' saved [20753] [root@helena cache]# md5sum lynis-3.0.6.tar.gz* a13bad1e6ef81708a86f65d0f317eef6 lynis-3.0.6.tar.gz 841d1f2004220f78a13a702835c906fc lynis-3.0.6.tar.gz.1 3d6435e94955da9f14d824a1618038c1 lynis-3.0.6.tar.gz.2 [root@helena cache]# --- config/rootfiles/packages/lynis | 3 +++ lfs/lynis | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis index bd81000d7b..357f9cb3a6 100644 --- a/config/rootfiles/packages/lynis +++ b/config/rootfiles/packages/lynis @@ -1,4 +1,5 @@ var/ipfire/lynis +#var/ipfire/lynis/LICENSE #var/ipfire/lynis/db var/ipfire/lynis/db/fileperms.db var/ipfire/lynis/db/hints.db @@ -116,3 +117,5 @@ var/ipfire/lynis/lynis #var/ipfire/lynis/plugins #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 c85e2a2807..1ae5016036 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -24,7 +24,7 @@ include Config -VER = 3.0.6 +VER = 3.0.3 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 10 +PAK_VER = 9 DEPS = ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 23cc369984d564e4a8232473b1ace137 +$(DL_FILE)_MD5 = d5c7cdbab15029449fe5ef4b59ee941d install : $(TARGET) @@ -76,8 +76,8 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_SRC)/$(PROG) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/$(PROG) && rm -rf *.md FAQ INSTALL LICENSE lynis.8 README - cp -vrf $(DIR_SRC)/$(PROG) /var/ipfire/lynis - @rm -rf $(DIR_SRC)/$(PROG) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + 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) -- 2.39.5