From patchwork Mon Feb 1 18:37:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3849 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DTxWj6KnJz3xGH for ; Mon, 1 Feb 2021 18:37:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DTxWg1zXYzrY; Mon, 1 Feb 2021 18:37:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DTxWg0pmpz2xjj; Mon, 1 Feb 2021 18:37:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DTxWd5mJJz2xjj for ; Mon, 1 Feb 2021 18:37:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DTxWc5Q54zlq for ; Mon, 1 Feb 2021 18:37:32 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612204653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhjMM0y9VtUipCJocV4tj8EjX2VPUx6x+xSl8P1rwNE=; b=dc2MHzeMhzDN9Ka7UnhZuG8LtNYDbvlW2z6ylkvouqCh8ChW2rK3aUhU++KZlz/enixmNM 5J2JyBZcB7Yz4cAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612204653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhjMM0y9VtUipCJocV4tj8EjX2VPUx6x+xSl8P1rwNE=; b=FHJU88nuEfBkl3R6s8Szna8o3EXazAAtPWEiVRfY+wRfkha8xE7xVcEP0Yt6faul+JgS7M mWdWnHZm+7T1swJycXVkn6gTaaM4tWVPmpJ8+BOaYMnzWu+YwdjOxauSHTke70Lc6KfTZw ZhWbiugvf6o8tJEd9J8bD8pQC/mvp0pXU/t692Gn+pUVRm7mpAI1/7TzgYpZG/EQiGDvIK Mm0qH0c50bIhPlgLKLzHUL5ggsD7PfoANdPVi7GPG+EFpk8P9T0QcJraotg7SK2z1af1O3 P7GwDIiG5C3dlCnzKaV/nl6fdMTAbn3v/6H2oQjGOQdXpGcoYnvkV2IH96jcvw== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] lynis: update to 3.0.3 Message-ID: Date: Mon, 1 Feb 2021 19:37:27 +0100 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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üller --- 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 # +# Copyright (C) 2007-2021 IPFire Team # # # # 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 @@ include Config -VER = 3.0.1 +VER = 3.0.3 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/lynis +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 8 +PAK_VER = 9 DEPS = ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ac984258e89b88c86e8c1c5395de8a15 +$(DL_FILE)_MD5 = d5c7cdbab15029449fe5ef4b59ee941d install : $(TARGET) @@ -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)