[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d3d959851a8f3045409d7b1665bd4e1f09026a88
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 d3d959851a8f3045409d7b1665bd4e1f09026a88 (commit) via 7ca4deda497cfafcb26979335a8eddeec55d086d (commit) via be8c539905d27bab946f63e32c33d47d134afba1 (commit) via 9f1c19a5dbefe8e91479dfd60a5526dcb8451f5b (commit) via 9a0454cea2423fe944375bd8444e8276d420ed1f (commit) via a86febdc22f4c5e663b91a89260efab09c2a5cd7 (commit) via 111216416ffefa0574f8c044aaf93c250a8acb2c (commit) via 2da785f90bf2de9b9ea4a86a01fabccefd140e00 (commit) via 81d5af569b3a8e223a32eb56251015575b519e07 (commit) via fc1b0311d6ff51a8e907b9622c07404cb923fd94 (commit) from 93eff0dcb853657a9518a06194002ebf31d2e9eb (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 d3d959851a8f3045409d7b1665bd4e1f09026a88 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 11 17:38:32 2019 +0000
core136: update logwatch crontab entry
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7ca4deda497cfafcb26979335a8eddeec55d086d Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Aug 31 22:13:19 2019 +0200
BUG 12036: logwatch now starts at 00:05am to avoid conflicts with logrotate
Problem: Every once in a while 'logwatch' creates an empty log file with 0 Bytes.
Probably 'logwatch' conflicts with the logrotate job which is launched at the same time.
To avoid this in the future, the start of logwatch was postponed for four minutes.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit be8c539905d27bab946f63e32c33d47d134afba1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 11 16:57:20 2019 +0000
core136: ship logrotate
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9f1c19a5dbefe8e91479dfd60a5526dcb8451f5b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Sep 1 09:37:26 2019 +0200
logrotate: Update to 3.5.1
For details see: https://github.com/logrotate/logrotate/releases
"use correct create mode in examples/btmp (#257)" => https://github.com/logrotate/logrotate/pull/257
"fix several bugs found by fuzzing (#254)" => https://github.com/logrotate/logrotate/issues/254
"do not abort globbing on a broken symlink (#251)" => https://github.com/logrotate/logrotate/issues/251
"rearrange logrotate.8 man page to improve readability (#248)" => https://github.com/logrotate/logrotate/pull/248
"encourage admins to use the su directive in logrotate.8 man page (#236)" => https://github.com/logrotate/logrotate/pull/236
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9a0454cea2423fe944375bd8444e8276d420ed1f Author: peter.mueller@ipfire.org peter.mueller@ipfire.org Date: Sat Sep 7 17:52:00 2019 +0000
Tor: fix permission of /var/ipfire/tor/settings
The settings file must be writeable for group "nobody" so users can change their Tor settings via WebUI. Since other files in /var/ipfire/tor/ does not need this workaround, only the settings file permissions are changed.
Sorry for the late fix; this was reported by various people in the forum, too (I was unaware of so many Tor users in our community).
Fixes #12117
Reported-by: Erik Kapfer erik.kapfer@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit a86febdc22f4c5e663b91a89260efab09c2a5cd7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 11 16:52:23 2019 +0000
core136: ship changed log.dat
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 111216416ffefa0574f8c044aaf93c250a8acb2c Author: Alex Koch ipfire@starkstromkonsument.de Date: Sat Aug 31 20:53:00 2019 +0200
WUI log-section Mail: add support for postfix addon
Expand the regex for the section dmi ("Mail") for /var/log/mail to include the log contents of postfix, in case the addon is installed.
Signed-off-by: Alex Koch ipfire@starkstromkonsument.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 2da785f90bf2de9b9ea4a86a01fabccefd140e00 Author: Alex Koch ipfire@starkstromkonsument.de Date: Sat Aug 31 20:52:59 2019 +0200
WUI log-section Mail: bugfix for dma
The prefix for dmi in /var/log/mail seems to have changed from "dma[<PID>]: " to "dma: ". This results in a bug where no lines are being shown at all in the WUI.
Signed-off-by: Alex Koch ipfire@starkstromkonsument.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 81d5af569b3a8e223a32eb56251015575b519e07 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Sep 11 16:46:19 2019 +0000
core136: ship openssh
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fc1b0311d6ff51a8e907b9622c07404cb923fd94 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jul 30 19:38:00 2019 +0000
openssh: update to 8.0p1
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cron/crontab | 2 +- config/rootfiles/core/136/filelists/files | 1 + config/rootfiles/{oldcore/111 => core/136}/filelists/logrotate | 0 config/rootfiles/{oldcore/100 => core/136}/filelists/openssh | 0 config/rootfiles/core/136/update.sh | 4 ++++ html/cgi-bin/logs.cgi/log.dat | 2 +- lfs/logrotate | 6 +++--- lfs/openssh | 4 ++-- lfs/tor | 2 +- src/paks/tor/install.sh | 4 ++++ 10 files changed, 17 insertions(+), 8 deletions(-) copy config/rootfiles/{oldcore/111 => core/136}/filelists/logrotate (100%) copy config/rootfiles/{oldcore/100 => core/136}/filelists/openssh (100%)
Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index 4561f4a24..56801394e 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -31,7 +31,7 @@ HOME=/ */5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
# Logwatch -01 0 * * * /usr/local/bin/logwatch > /var/log/logwatch/`date -I -d yesterday`; \ +05 0 * * * /usr/local/bin/logwatch > /var/log/logwatch/`date -I -d yesterday`; \ LOGWATCH_KEEP=$(sed -ne 's/^LOGWATCH_KEEP=([0-9]+)$/\1/p' /var/ipfire/logging/settings); \ find /var/log/logwatch/ -ctime +${LOGWATCH_KEEP=56} -exec rm -f '{}' ';'
diff --git a/config/rootfiles/core/136/filelists/files b/config/rootfiles/core/136/filelists/files index d20908650..a2947a7da 100644 --- a/config/rootfiles/core/136/filelists/files +++ b/config/rootfiles/core/136/filelists/files @@ -4,3 +4,4 @@ srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/rc.d/init.d/firewall usr/local/bin/xt_geoip_update +srv/web/ipfire/cgi-bin/logs.cgi/log.dat diff --git a/config/rootfiles/core/136/filelists/logrotate b/config/rootfiles/core/136/filelists/logrotate new file mode 120000 index 000000000..bc192c05d --- /dev/null +++ b/config/rootfiles/core/136/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/136/filelists/openssh b/config/rootfiles/core/136/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/136/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/136/update.sh b/config/rootfiles/core/136/update.sh index 3c5d4bd86..e6082c397 100644 --- a/config/rootfiles/core/136/update.sh +++ b/config/rootfiles/core/136/update.sh @@ -57,6 +57,10 @@ rm -rf /usr/lib/perl5/site_perl/5.12.3 # update linker config ldconfig
+# Update crontab +sed -i -e "s|^01 0 * * *./usr/local/bin/logwatch|05 0 * * *\t/usr/local/bin/logwatch|g" /var/spool/cron/root.orig +fcrontab -z &>/dev/null + # Update Language cache /usr/local/bin/update-lang-cache
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 3548d5810..8ca32d675 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -57,7 +57,7 @@ my %sections = ( 'cron' => '(fcron[.*]: )', 'ddns' => '(ddns[\d+]:)', 'dhcp' => '(dhcpd: )', - 'dma' => '(dma[.*]: )', + 'dma' => '(dma: |dma[.*]: |postfix/\w*[\d*]: )', 'guardian' => '(guardian[.*]: )', 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon: |vpnwatch: )', diff --git a/lfs/logrotate b/lfs/logrotate index 143d09531..5f7314bbd 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 IPFire Team info@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,7 +24,7 @@
include Config
-VER = 3.15.0 +VER = 3.15.1
THISAPP = logrotate-$(VER) DL_FILE = logrotate-$(VER).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 240105d3288657d0ad7782c6a34c9a85 +$(DL_FILE)_MD5 = 629cb3b933a281f25741e385bc030203
install : $(TARGET)
diff --git a/lfs/openssh b/lfs/openssh index 7fbb5a928..d7d33cbbb 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@
include Config
-VER = 7.9p1 +VER = 8.0p1
THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c6af50b7a474d04726a5aa747a5dce8f +$(DL_FILE)_MD5 = bf050f002fe510e1daecd39044e1122d
install : $(TARGET)
diff --git a/lfs/tor b/lfs/tor index d918910d4..1e234e0ab 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 40 +PAK_VER = 41
DEPS = "libseccomp"
diff --git a/src/paks/tor/install.sh b/src/paks/tor/install.sh index 1659871b6..4d0353155 100644 --- a/src/paks/tor/install.sh +++ b/src/paks/tor/install.sh @@ -38,4 +38,8 @@ restore_backup ${NAME} # Adjust some folder permission for new UID/GID chown -R tor:tor /var/lib/tor /var/ipfire/tor
+# Tor settings file needs to be writeable by nobody group for WebUI +chown tor:nobody /var/ipfire/tor/settings +chmod 664 /var/ipfire/tor/settings + start_service --background ${NAME}
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter