From 442717a1270fe40ebfc5a02e8eea9bd8ef24e79f Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 24 May 2020 20:03:52 +0200 Subject: [PATCH 1/6] 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 Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) From 5336aaa6fa24092ad3ea392516a52633a7278a31 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Mon, 25 May 2020 00:13:50 +0200 Subject: [PATCH 2/6] 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 Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 75bb55e716f57667d6a34a99f15fc0cdacc1081b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 25 May 2020 10:17:29 +0100 Subject: [PATCH 3/6] openvpn: Create database schema if not exists Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/logs.cgi/ovpnclients.dat | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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( From 6d78ec1a1ccfdc42f18b92bd5fcacab3be05f0b9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 25 May 2020 10:17:30 +0100 Subject: [PATCH 4/6] core145: Enable OpenVPN metrics collection Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/145/update.sh | 7 +++++++ 1 file changed, 7 insertions(+) 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 <> /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 From 6e670b9c9d16919164e269224cf728d9e25a35f9 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Mon, 25 May 2020 13:23:57 +0200 Subject: [PATCH 5/6] ffmpeg: Update to 4.2.3 For details see: http://ffmpeg.org/download.html#release_4.2 Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- lfs/ffmpeg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) From ca33424de57b2530f11e99e40501251dda26f5c0 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Mon, 25 May 2020 14:54:56 +0200 Subject: [PATCH 6/6] minidlna: Update to 1.2.1 For details see: https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/ Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- config/rootfiles/packages/minidlna | 1 + lfs/minidlna | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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/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)