Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to-libloc

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

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

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(

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)
 

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)
 

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)
 

make.sh

@@ -1705,7 +1705,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