IPFire-SCM May 2020

ipfire-scm@lists.ipfire.org

1 participants
38 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. bea09ff2616e67fdfabae2442b3bf2a45422c15b
by Arne Fitzenreiter 30 May '20

30 May '20

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, master has been updated via bea09ff2616e67fdfabae2442b3bf2a45422c15b (commit) from 30830d62a058b69487679f5b2bf2e040407e51c5 (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 bea09ff2616e67fdfabae2442b3bf2a45422c15b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 30 18:04:33 2020 +0000 core145: found more urlfilter db files to cleanup Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index c8cf12224..893539f30 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -68,7 +68,7 @@ mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd # remove converted urlfilter database to force rebuilt rm -f /var/ipfire/urlfilter/blacklists/*/*.db -rm -f /var/ipfire/urlfilter/blacklists/custom/*/*.db +rm -f /var/ipfire/urlfilter/blacklists/*/*/*.db # remove packages that are included now in core for package in perl-DBI perl-DBD-SQLite; do hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bea09ff2616e67fdfabae2442b3bf2a45422c15b
by Arne Fitzenreiter 30 May '20

30 May '20

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 bea09ff2616e67fdfabae2442b3bf2a45422c15b (commit) from 30830d62a058b69487679f5b2bf2e040407e51c5 (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 bea09ff2616e67fdfabae2442b3bf2a45422c15b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 30 18:04:33 2020 +0000 core145: found more urlfilter db files to cleanup Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index c8cf12224..893539f30 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -68,7 +68,7 @@ mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd # remove converted urlfilter database to force rebuilt rm -f /var/ipfire/urlfilter/blacklists/*/*.db -rm -f /var/ipfire/urlfilter/blacklists/custom/*/*.db +rm -f /var/ipfire/urlfilter/blacklists/*/*/*.db # remove packages that are included now in core for package in perl-DBI perl-DBD-SQLite; do hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30830d62a058b69487679f5b2bf2e040407e51c5
by Arne Fitzenreiter 30 May '20

30 May '20

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 30830d62a058b69487679f5b2bf2e040407e51c5 (commit) from 371661367ce0b00cce45b49f1d242a74978261e0 (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 30830d62a058b69487679f5b2bf2e040407e51c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 30 17:33:40 2020 +0000 core145: remove converted urlfilter database to force rebuilt with new db. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 4 ++++ 1 file changed, 4 insertions(+) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 9ff64f7f9..c8cf12224 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -66,6 +66,10 @@ rm /etc/rc.d/rc6.d/K45random mv /etc/rc.d/rc3.d/S00random /etc/rc.d/rcsysinit.d/S66random mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd +# remove converted urlfilter database to force rebuilt +rm -f /var/ipfire/urlfilter/blacklists/*/*.db +rm -f /var/ipfire/urlfilter/blacklists/custom/*/*.db + # remove packages that are included now in core for package in perl-DBI perl-DBD-SQLite; do rm -f /opt/pakfire/db/installed/meta-$package hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 30830d62a058b69487679f5b2bf2e040407e51c5
by Arne Fitzenreiter 30 May '20

30 May '20

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, master has been updated via 30830d62a058b69487679f5b2bf2e040407e51c5 (commit) from 371661367ce0b00cce45b49f1d242a74978261e0 (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 30830d62a058b69487679f5b2bf2e040407e51c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 30 17:33:40 2020 +0000 core145: remove converted urlfilter database to force rebuilt with new db. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 4 ++++ 1 file changed, 4 insertions(+) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 9ff64f7f9..c8cf12224 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -66,6 +66,10 @@ rm /etc/rc.d/rc6.d/K45random mv /etc/rc.d/rc3.d/S00random /etc/rc.d/rcsysinit.d/S66random mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd +# remove converted urlfilter database to force rebuilt +rm -f /var/ipfire/urlfilter/blacklists/*/*.db +rm -f /var/ipfire/urlfilter/blacklists/custom/*/*.db + # remove packages that are included now in core for package in perl-DBI perl-DBD-SQLite; do rm -f /opt/pakfire/db/installed/meta-$package hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 371661367ce0b00cce45b49f1d242a74978261e0
by Arne Fitzenreiter 29 May '20

29 May '20

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, master has been updated via 371661367ce0b00cce45b49f1d242a74978261e0 (commit) from fead20a917dfdb8d7e091f8a8c6e39625ea9e315 (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 371661367ce0b00cce45b49f1d242a74978261e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 28 19:00:47 2020 +0000 netatalk: Add krb5 as a dependency Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/netatalk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/netatalk b/lfs/netatalk index 09107e2e8..16fd292eb 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netatalk -PAK_VER = 1 +PAK_VER = 2 -DEPS = avahi dbus +DEPS = avahi dbus krb5 CFLAGS += -Wno-unused-result hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 371661367ce0b00cce45b49f1d242a74978261e0
by Arne Fitzenreiter 29 May '20

29 May '20

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 371661367ce0b00cce45b49f1d242a74978261e0 (commit) from fead20a917dfdb8d7e091f8a8c6e39625ea9e315 (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 371661367ce0b00cce45b49f1d242a74978261e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 28 19:00:47 2020 +0000 netatalk: Add krb5 as a dependency Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/netatalk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/netatalk b/lfs/netatalk index 09107e2e8..16fd292eb 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netatalk -PAK_VER = 1 +PAK_VER = 2 -DEPS = avahi dbus +DEPS = avahi dbus krb5 CFLAGS += -Wno-unused-result hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. fead20a917dfdb8d7e091f8a8c6e39625ea9e315
by Arne Fitzenreiter 27 May '20

27 May '20

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, master has been updated via fead20a917dfdb8d7e091f8a8c6e39625ea9e315 (commit) via ca33424de57b2530f11e99e40501251dda26f5c0 (commit) via 6e670b9c9d16919164e269224cf728d9e25a35f9 (commit) via 6d78ec1a1ccfdc42f18b92bd5fcacab3be05f0b9 (commit) via 75bb55e716f57667d6a34a99f15fc0cdacc1081b (commit) via 5336aaa6fa24092ad3ea392516a52633a7278a31 (commit) via 442717a1270fe40ebfc5a02e8eea9bd8ef24e79f (commit) from 91b23ce05b77dc96b38de3589049cbe8350ba9ad (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 fead20a917dfdb8d7e091f8a8c6e39625ea9e315 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue May 26 20:46:29 2020 +0200 knot: Update to 2.9.5 For details see: https://www.knot-dns.cz/2020-05-25-version-295.html "Bugfixes: Old ZSK can be withdrawn too early during a ZSK rollover if maximum zone TTL is computed automatically Server responds SERVFAIL to ANY queries on empty non-terminal nodes Improvements: Also module onlinesign returns minimized responses to ANY queries Linking against libcap-ng can be disabled via a configure option" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ca33424de57b2530f11e99e40501251dda26f5c0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 14:54:56 2020 +0200 minidlna: Update to 1.2.1 For details see: https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6e670b9c9d16919164e269224cf728d9e25a35f9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 13:23:57 2020 +0200 ffmpeg: Update to 4.2.3 For details see: http://ffmpeg.org/download.html#release_4.2 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6d78ec1a1ccfdc42f18b92bd5fcacab3be05f0b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 25 10:17:30 2020 +0100 core145: Enable OpenVPN metrics collection Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 75bb55e716f57667d6a34a99f15fc0cdacc1081b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 25 10:17:29 2020 +0100 openvpn: Create database schema if not exists Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5336aaa6fa24092ad3ea392516a52633a7278a31 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 00:13:50 2020 +0200 make.sh: Suppress 'ls :cannot access *.bz2'-message The message "ls: cannot access '*.bz2': No such file or directory" comes from the 'ls' command prior to creating the *.md5-files for *.bz2, *.img.xz and *.iso files. But on most builds we have especially no more bzip2 compressed images anymore. This message can usually be ignored and is just irritating. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 442717a1270fe40ebfc5a02e8eea9bd8ef24e79f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 24 20:03:52 2020 +0200 nano: Update to 4.9.3 For details see: https://www.nano-editor.org/news.php "One more bug introduced in version 4.9 is fixed: a crash when the terminal screen is resized while at a lock-file prompt." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 7 +++++++ config/rootfiles/packages/minidlna | 1 + html/cgi-bin/logs.cgi/ovpnclients.dat | 15 +++++++++++++++ lfs/ffmpeg | 6 +++--- lfs/knot | 4 ++-- lfs/minidlna | 6 +++--- lfs/nano | 6 +++--- make.sh | 2 +- 8 files changed, 35 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 5f5394f78..9ff64f7f9 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -73,6 +73,13 @@ for package in perl-DBI perl-DBD-SQLite; do rm -f /opt/pakfire/db/rootfiles/$package done +# Enable OpenVPN metrics collection +cat <<EOF >> /var/ipfire/ovpn/server.conf +# Log clients connecting/disconnecting +client-connect "/usr/sbin/openvpn-metrics client-connect" +client-disconnect "/usr/sbin/openvpn-metrics client-disconnect" +EOF + # Start services /etc/init.d/vnstat start /etc/init.d/unbound restart diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna index f0b953653..42a83f8da 100644 --- a/config/rootfiles/packages/minidlna +++ b/config/rootfiles/packages/minidlna @@ -7,6 +7,7 @@ usr/sbin/minidlnad #usr/share/locale/fr/LC_MESSAGES/minidlna.mo #usr/share/locale/it/LC_MESSAGES/minidlna.mo #usr/share/locale/ja/LC_MESSAGES/minidlna.mo +#usr/share/locale/ko/LC_MESSAGES/minidlna.mo #usr/share/locale/nb/LC_MESSAGES/minidlna.mo #usr/share/locale/nl/LC_MESSAGES/minidlna.mo #usr/share/locale/pl/LC_MESSAGES/minidlna.mo diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index 2009990ec..a064893a1 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -95,6 +95,21 @@ unless ($to_datestring ge $from_datestring) { $errormessage = "$Lang::tr{'error the to date has to be later than the from date'}"; } +# Initialise database +my $cursor = $database_handle->prepare(" + CREATE TABLE IF NOT EXISTS sessions( + common_name TEXT NOT NULL, + connected_at TEXT NOT NULL, + disconnected_at TEXT, + bytes_received INTEGER, + bytes_sent INTEGER + ); + + -- Create index for speeding up searches + CREATE INDEX IF NOT EXISTS sessions_common_name ON sessions(common_name); +"); +$cursor->execute(); + my $database_query = qq( SELECT common_name, SUM( diff --git a/lfs/ffmpeg b/lfs/ffmpeg index ed013bc22..0795afff8 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -24,7 +24,7 @@ include Config -VER = 4.2.2 +VER = 4.2.3 THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 9 +PAK_VER = 10 DEPS = sdl lame libvorbis xvid @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 829d56f158832dbf669b5b417af48060 +$(DL_FILE)_MD5 = 695fad11f3baf27784e24cb0e977b65a install : $(TARGET) diff --git a/lfs/knot b/lfs/knot index e5074d08c..7f341ab3f 100644 --- a/lfs/knot +++ b/lfs/knot @@ -24,7 +24,7 @@ include Config -VER = 2.9.4 +VER = 2.9.5 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4975cfc1b0a789bc1263b07d28f2493c +$(DL_FILE)_MD5 = f04b2ce8c9e25ec8a9a5e8566a8192b7 install : $(TARGET) diff --git a/lfs/minidlna b/lfs/minidlna index 67ba1f959..1b6e6b51c 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -24,7 +24,7 @@ include Config -VER = 1.1.3 +VER = 1.2.1 THISAPP = minidlna-$(VER) DL_FILE = minidlna-$(VER).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minidlna -PAK_VER = 5 +PAK_VER = 6 DEPS = ffmpeg flac libexif libid3tag libogg @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 879027192c89e5376cdd2ae2d1aa33b4 +$(DL_FILE)_MD5 = a968d3d84971322471cabda3669cc0f8 install : $(TARGET) diff --git a/lfs/nano b/lfs/nano index c18288796..c169282c0 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 4.9.2 +VER = 4.9.3 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 30 +PAK_VER = 31 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 10df0100ebf4aa7bb4806428c11751eb +$(DL_FILE)_MD5 = 52137a960ae8b3ca6d7dab6767fe6e5f install : $(TARGET) diff --git a/make.sh b/make.sh index 4acce807f..2e8faa38d 100755 --- a/make.sh +++ b/make.sh @@ -1707,7 +1707,7 @@ buildpackages() { # remove not useable iso on armv5tel (needed to build flash images) [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso - for i in `ls *.bz2 *.img.xz *.iso`; do + for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do md5sum $i > $i.md5 done cd $PWD hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fead20a917dfdb8d7e091f8a8c6e39625ea9e315
by Arne Fitzenreiter 27 May '20

27 May '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ca33424de57b2530f11e99e40501251dda26f5c0
by Arne Fitzenreiter 26 May '20

26 May '20

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 ca33424de57b2530f11e99e40501251dda26f5c0 (commit) via 6e670b9c9d16919164e269224cf728d9e25a35f9 (commit) via 6d78ec1a1ccfdc42f18b92bd5fcacab3be05f0b9 (commit) via 75bb55e716f57667d6a34a99f15fc0cdacc1081b (commit) via 5336aaa6fa24092ad3ea392516a52633a7278a31 (commit) via 442717a1270fe40ebfc5a02e8eea9bd8ef24e79f (commit) from 91b23ce05b77dc96b38de3589049cbe8350ba9ad (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 ca33424de57b2530f11e99e40501251dda26f5c0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 14:54:56 2020 +0200 minidlna: Update to 1.2.1 For details see: https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6e670b9c9d16919164e269224cf728d9e25a35f9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 13:23:57 2020 +0200 ffmpeg: Update to 4.2.3 For details see: http://ffmpeg.org/download.html#release_4.2 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6d78ec1a1ccfdc42f18b92bd5fcacab3be05f0b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 25 10:17:30 2020 +0100 core145: Enable OpenVPN metrics collection Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 75bb55e716f57667d6a34a99f15fc0cdacc1081b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 25 10:17:29 2020 +0100 openvpn: Create database schema if not exists Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5336aaa6fa24092ad3ea392516a52633a7278a31 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon May 25 00:13:50 2020 +0200 make.sh: Suppress 'ls :cannot access *.bz2'-message The message "ls: cannot access '*.bz2': No such file or directory" comes from the 'ls' command prior to creating the *.md5-files for *.bz2, *.img.xz and *.iso files. But on most builds we have especially no more bzip2 compressed images anymore. This message can usually be ignored and is just irritating. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 442717a1270fe40ebfc5a02e8eea9bd8ef24e79f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 24 20:03:52 2020 +0200 nano: Update to 4.9.3 For details see: https://www.nano-editor.org/news.php "One more bug introduced in version 4.9 is fixed: a crash when the terminal screen is resized while at a lock-file prompt." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/145/update.sh | 7 +++++++ config/rootfiles/packages/minidlna | 1 + html/cgi-bin/logs.cgi/ovpnclients.dat | 15 +++++++++++++++ lfs/ffmpeg | 6 +++--- lfs/minidlna | 6 +++--- lfs/nano | 6 +++--- make.sh | 2 +- 7 files changed, 33 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 5f5394f78..9ff64f7f9 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -73,6 +73,13 @@ for package in perl-DBI perl-DBD-SQLite; do rm -f /opt/pakfire/db/rootfiles/$package done +# Enable OpenVPN metrics collection +cat <<EOF >> /var/ipfire/ovpn/server.conf +# Log clients connecting/disconnecting +client-connect "/usr/sbin/openvpn-metrics client-connect" +client-disconnect "/usr/sbin/openvpn-metrics client-disconnect" +EOF + # Start services /etc/init.d/vnstat start /etc/init.d/unbound restart diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna index f0b953653..42a83f8da 100644 --- a/config/rootfiles/packages/minidlna +++ b/config/rootfiles/packages/minidlna @@ -7,6 +7,7 @@ usr/sbin/minidlnad #usr/share/locale/fr/LC_MESSAGES/minidlna.mo #usr/share/locale/it/LC_MESSAGES/minidlna.mo #usr/share/locale/ja/LC_MESSAGES/minidlna.mo +#usr/share/locale/ko/LC_MESSAGES/minidlna.mo #usr/share/locale/nb/LC_MESSAGES/minidlna.mo #usr/share/locale/nl/LC_MESSAGES/minidlna.mo #usr/share/locale/pl/LC_MESSAGES/minidlna.mo diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index 2009990ec..a064893a1 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -95,6 +95,21 @@ unless ($to_datestring ge $from_datestring) { $errormessage = "$Lang::tr{'error the to date has to be later than the from date'}"; } +# Initialise database +my $cursor = $database_handle->prepare(" + CREATE TABLE IF NOT EXISTS sessions( + common_name TEXT NOT NULL, + connected_at TEXT NOT NULL, + disconnected_at TEXT, + bytes_received INTEGER, + bytes_sent INTEGER + ); + + -- Create index for speeding up searches + CREATE INDEX IF NOT EXISTS sessions_common_name ON sessions(common_name); +"); +$cursor->execute(); + my $database_query = qq( SELECT common_name, SUM( diff --git a/lfs/ffmpeg b/lfs/ffmpeg index ed013bc22..0795afff8 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -24,7 +24,7 @@ include Config -VER = 4.2.2 +VER = 4.2.3 THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 9 +PAK_VER = 10 DEPS = sdl lame libvorbis xvid @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 829d56f158832dbf669b5b417af48060 +$(DL_FILE)_MD5 = 695fad11f3baf27784e24cb0e977b65a install : $(TARGET) diff --git a/lfs/minidlna b/lfs/minidlna index 67ba1f959..1b6e6b51c 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -24,7 +24,7 @@ include Config -VER = 1.1.3 +VER = 1.2.1 THISAPP = minidlna-$(VER) DL_FILE = minidlna-$(VER).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minidlna -PAK_VER = 5 +PAK_VER = 6 DEPS = ffmpeg flac libexif libid3tag libogg @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 879027192c89e5376cdd2ae2d1aa33b4 +$(DL_FILE)_MD5 = a968d3d84971322471cabda3669cc0f8 install : $(TARGET) diff --git a/lfs/nano b/lfs/nano index c18288796..c169282c0 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 4.9.2 +VER = 4.9.3 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 30 +PAK_VER = 31 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 10df0100ebf4aa7bb4806428c11751eb +$(DL_FILE)_MD5 = 52137a960ae8b3ca6d7dab6767fe6e5f install : $(TARGET) diff --git a/make.sh b/make.sh index 4acce807f..2e8faa38d 100755 --- a/make.sh +++ b/make.sh @@ -1707,7 +1707,7 @@ buildpackages() { # remove not useable iso on armv5tel (needed to build flash images) [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso - for i in `ls *.bz2 *.img.xz *.iso`; do + for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do md5sum $i > $i.md5 done cd $PWD hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 91b23ce05b77dc96b38de3589049cbe8350ba9ad
by Arne Fitzenreiter 22 May '20

22 May '20

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, master has been updated via 91b23ce05b77dc96b38de3589049cbe8350ba9ad (commit) from 7479c993490ea57fb35a80523577309e36b63f90 (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 91b23ce05b77dc96b38de3589049cbe8350ba9ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 22 11:49:03 2020 +0000 squidGuard: Fix generating databases with libdb >= 5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/squidguard | 1 + src/patches/squidGuard-1.4-db5.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/patches/squidGuard-1.4-db5.patch Difference in files: diff --git a/lfs/squidguard b/lfs/squidguard index f627a27d8..38efab0ee 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5.patch cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \ --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man \ --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ diff --git a/src/patches/squidGuard-1.4-db5.patch b/src/patches/squidGuard-1.4-db5.patch new file mode 100644 index 000000000..733fbad2e --- /dev/null +++ b/src/patches/squidGuard-1.4-db5.patch @@ -0,0 +1,12 @@ +diff -ruN squidGuard-1.4-vanilla/src/sgDb.c squidGuard-1.4/src/sgDb.c +--- squidGuard-1.4-vanilla/src/sgDb.c 2008-07-15 04:29:41.000000000 +1000 ++++ squidGuard-1.4/src/sgDb.c 2013-01-21 12:47:41.049325756 +1100 +@@ -114,7 +114,7 @@ + } + } + #endif +-#if DB_VERSION_MAJOR == 4 ++#if DB_VERSION_MAJOR >= 4 + if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){ + flag = DB_CREATE; + if(createdb) \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2020