* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f
@ 2021-02-02 10:58 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-02-02 10:58 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6654 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 f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f (commit)
via e36cd564317a3223192c16aa3b17d42b0aac9fe7 (commit)
via 89b044918573826c2b52b27293a81d66ac0504e1 (commit)
from 710b6ef1e828a93e48052adc79f400ac243e63c7 (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 f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Feb 1 19:37:27 2021 +0100
lynis: update to 3.0.3
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 <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e36cd564317a3223192c16aa3b17d42b0aac9fe7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 2 10:55:21 2021 +0000
core154: Ship unbound.conf
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 89b044918573826c2b52b27293a81d66ac0504e1
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Feb 1 18:47:27 2021 +0100
unbound.conf: do not set defaults again
These are meanwhile set by Unbound upstream as well, so there is no need
to do things twice here.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/154/filelists/files | 1 +
config/rootfiles/packages/lynis | 11 +++--------
config/unbound/unbound.conf | 6 ------
lfs/lynis | 14 +++++++-------
4 files changed, 11 insertions(+), 21 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/154/filelists/files
index 4f8d4e92b..d8daaa25a 100644
--- a/config/rootfiles/core/154/filelists/files
+++ b/config/rootfiles/core/154/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/functions
etc/rc.d/init.d/sshd
etc/rc.d/init.d/unbound
etc/rc.d/init.d/wlanclient
+etc/unbound/unbound.conf
lib/udev/network-hotplug-bridges
opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/country.cgi
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/config/unbound/unbound.conf b/config/unbound/unbound.conf
index f78aaae8c..9d5e840dd 100644
--- a/config/unbound/unbound.conf
+++ b/config/unbound/unbound.conf
@@ -27,9 +27,6 @@ server:
prefetch: yes
prefetch-key: yes
- # Randomise any cached responses
- rrset-roundrobin: yes
-
# Privacy Options
hide-identity: yes
hide-version: yes
@@ -47,9 +44,6 @@ server:
# TLS
tls-cert-bundle: /etc/ssl/certs/ca-bundle.crt
- # EDNS Buffer Size (#12240)
- edns-buffer-size: 1232
-
# Harden against DNS cache poisoning
unwanted-reply-threshold: 1000000
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 @@
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)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-02 10:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 10:58 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f1f2a8dbefd8a90622a1de641adb61f6cffc7a5f Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox