From 421ba804aab8244c0b294d96f41042797f32bd4f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 2 Dec 2017 12:22:00 +0000 Subject: [PATCH 1/8] Drop separate ffmpeg-libs package Signed-off-by: Michael Tremer --- config/rootfiles/packages/ffmpeg-libs | 237 -------------------------- lfs/ffmpeg | 2 +- lfs/ffmpeg-libs | 47 ----- lfs/mediatomb | 4 +- lfs/mpd | 2 +- 5 files changed, 4 insertions(+), 288 deletions(-) delete mode 100644 config/rootfiles/packages/ffmpeg-libs delete mode 100644 lfs/ffmpeg-libs diff --git a/config/rootfiles/packages/ffmpeg-libs b/config/rootfiles/packages/ffmpeg-libs deleted file mode 100644 index 7a512f9da..000000000 --- a/config/rootfiles/packages/ffmpeg-libs +++ /dev/null @@ -1,237 +0,0 @@ -#usr/bin/ffmpeg -#usr/bin/ffprobe -#usr/bin/ffserver -#usr/include/libavcodec -#usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/avdct.h -#usr/include/libavcodec/avfft.h -#usr/include/libavcodec/d3d11va.h -#usr/include/libavcodec/dirac.h -#usr/include/libavcodec/dv_profile.h -#usr/include/libavcodec/dxva2.h -#usr/include/libavcodec/jni.h -#usr/include/libavcodec/mediacodec.h -#usr/include/libavcodec/qsv.h -#usr/include/libavcodec/vaapi.h -#usr/include/libavcodec/vda.h -#usr/include/libavcodec/vdpau.h -#usr/include/libavcodec/version.h -#usr/include/libavcodec/videotoolbox.h -#usr/include/libavcodec/vorbis_parser.h -#usr/include/libavcodec/xvmc.h -#usr/include/libavdevice -#usr/include/libavdevice/avdevice.h -#usr/include/libavdevice/version.h -#usr/include/libavfilter -#usr/include/libavfilter/avfilter.h -#usr/include/libavfilter/avfiltergraph.h -#usr/include/libavfilter/buffersink.h -#usr/include/libavfilter/buffersrc.h -#usr/include/libavfilter/version.h -#usr/include/libavformat -#usr/include/libavformat/avformat.h -#usr/include/libavformat/avio.h -#usr/include/libavformat/version.h -#usr/include/libavutil -#usr/include/libavutil/adler32.h -#usr/include/libavutil/aes.h -#usr/include/libavutil/aes_ctr.h -#usr/include/libavutil/attributes.h -#usr/include/libavutil/audio_fifo.h -#usr/include/libavutil/avassert.h -#usr/include/libavutil/avconfig.h -#usr/include/libavutil/avstring.h -#usr/include/libavutil/avutil.h -#usr/include/libavutil/base64.h -#usr/include/libavutil/blowfish.h -#usr/include/libavutil/bprint.h -#usr/include/libavutil/bswap.h -#usr/include/libavutil/buffer.h -#usr/include/libavutil/camellia.h -#usr/include/libavutil/cast5.h -#usr/include/libavutil/channel_layout.h -#usr/include/libavutil/common.h -#usr/include/libavutil/cpu.h -#usr/include/libavutil/crc.h -#usr/include/libavutil/des.h -#usr/include/libavutil/dict.h -#usr/include/libavutil/display.h -#usr/include/libavutil/downmix_info.h -#usr/include/libavutil/error.h -#usr/include/libavutil/eval.h -#usr/include/libavutil/ffversion.h -#usr/include/libavutil/fifo.h -#usr/include/libavutil/file.h -#usr/include/libavutil/frame.h -#usr/include/libavutil/hash.h -#usr/include/libavutil/hmac.h -#usr/include/libavutil/hwcontext.h -#usr/include/libavutil/hwcontext_cuda.h -#usr/include/libavutil/hwcontext_dxva2.h -#usr/include/libavutil/hwcontext_qsv.h -#usr/include/libavutil/hwcontext_vaapi.h -#usr/include/libavutil/hwcontext_vdpau.h -#usr/include/libavutil/imgutils.h -#usr/include/libavutil/intfloat.h -#usr/include/libavutil/intreadwrite.h -#usr/include/libavutil/lfg.h -#usr/include/libavutil/log.h -#usr/include/libavutil/lzo.h -#usr/include/libavutil/macros.h -#usr/include/libavutil/mastering_display_metadata.h -#usr/include/libavutil/mathematics.h -#usr/include/libavutil/md5.h -#usr/include/libavutil/mem.h -#usr/include/libavutil/motion_vector.h -#usr/include/libavutil/murmur3.h -#usr/include/libavutil/opt.h -#usr/include/libavutil/parseutils.h -#usr/include/libavutil/pixdesc.h -#usr/include/libavutil/pixelutils.h -#usr/include/libavutil/pixfmt.h -#usr/include/libavutil/random_seed.h -#usr/include/libavutil/rational.h -#usr/include/libavutil/rc4.h -#usr/include/libavutil/replaygain.h -#usr/include/libavutil/ripemd.h -#usr/include/libavutil/samplefmt.h -#usr/include/libavutil/sha.h -#usr/include/libavutil/sha512.h -#usr/include/libavutil/stereo3d.h -#usr/include/libavutil/tea.h -#usr/include/libavutil/threadmessage.h -#usr/include/libavutil/time.h -#usr/include/libavutil/timecode.h -#usr/include/libavutil/timestamp.h -#usr/include/libavutil/tree.h -#usr/include/libavutil/twofish.h -#usr/include/libavutil/version.h -#usr/include/libavutil/xtea.h -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h -#usr/include/libpostproc/version.h -#usr/include/libswresample -#usr/include/libswresample/swresample.h -#usr/include/libswresample/version.h -#usr/include/libswscale -#usr/include/libswscale/swscale.h -#usr/include/libswscale/version.h -#usr/lib/libavcodec.a -#usr/lib/libavcodec.so -usr/lib/libavcodec.so.57 -usr/lib/libavcodec.so.57.64.101 -#usr/lib/libavdevice.a -#usr/lib/libavdevice.so -usr/lib/libavdevice.so.57 -usr/lib/libavdevice.so.57.1.100 -#usr/lib/libavfilter.a -#usr/lib/libavfilter.so -usr/lib/libavfilter.so.6 -usr/lib/libavfilter.so.6.65.100 -#usr/lib/libavformat.a -#usr/lib/libavformat.so -usr/lib/libavformat.so.57 -usr/lib/libavformat.so.57.56.101 -#usr/lib/libavutil.a -#usr/lib/libavutil.so -usr/lib/libavutil.so.55 -usr/lib/libavutil.so.55.34.101 -#usr/lib/libpostproc.a -#usr/lib/libpostproc.so -usr/lib/libpostproc.so.54 -usr/lib/libpostproc.so.54.1.100 -#usr/lib/libswresample.a -#usr/lib/libswresample.so -usr/lib/libswresample.so.2 -usr/lib/libswresample.so.2.3.100 -#usr/lib/libswscale.a -#usr/lib/libswscale.so -usr/lib/libswscale.so.4 -usr/lib/libswscale.so.4.2.100 -#usr/lib/pkgconfig/libavcodec.pc -#usr/lib/pkgconfig/libavdevice.pc -#usr/lib/pkgconfig/libavfilter.pc -#usr/lib/pkgconfig/libavformat.pc -#usr/lib/pkgconfig/libavutil.pc -#usr/lib/pkgconfig/libpostproc.pc -#usr/lib/pkgconfig/libswresample.pc -#usr/lib/pkgconfig/libswscale.pc -#usr/share/doc/ffmpeg -#usr/share/doc/ffmpeg/developer.html -#usr/share/doc/ffmpeg/faq.html -#usr/share/doc/ffmpeg/fate.html -#usr/share/doc/ffmpeg/ffmpeg-all.html -#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html -#usr/share/doc/ffmpeg/ffmpeg-codecs.html -#usr/share/doc/ffmpeg/ffmpeg-devices.html -#usr/share/doc/ffmpeg/ffmpeg-filters.html -#usr/share/doc/ffmpeg/ffmpeg-formats.html -#usr/share/doc/ffmpeg/ffmpeg-protocols.html -#usr/share/doc/ffmpeg/ffmpeg-resampler.html -#usr/share/doc/ffmpeg/ffmpeg-scaler.html -#usr/share/doc/ffmpeg/ffmpeg-utils.html -#usr/share/doc/ffmpeg/ffmpeg.html -#usr/share/doc/ffmpeg/ffprobe-all.html -#usr/share/doc/ffmpeg/ffprobe.html -#usr/share/doc/ffmpeg/ffserver-all.html -#usr/share/doc/ffmpeg/ffserver.html -#usr/share/doc/ffmpeg/general.html -#usr/share/doc/ffmpeg/git-howto.html -#usr/share/doc/ffmpeg/libavcodec.html -#usr/share/doc/ffmpeg/libavdevice.html -#usr/share/doc/ffmpeg/libavfilter.html -#usr/share/doc/ffmpeg/libavformat.html -#usr/share/doc/ffmpeg/libavutil.html -#usr/share/doc/ffmpeg/libswresample.html -#usr/share/doc/ffmpeg/libswscale.html -#usr/share/doc/ffmpeg/nut.html -#usr/share/doc/ffmpeg/platform.html -#usr/share/ffmpeg -#usr/share/ffmpeg/examples -#usr/share/ffmpeg/examples/Makefile -#usr/share/ffmpeg/examples/README -#usr/share/ffmpeg/examples/avio_dir_cmd.c -#usr/share/ffmpeg/examples/avio_reading.c -#usr/share/ffmpeg/examples/decoding_encoding.c -#usr/share/ffmpeg/examples/demuxing_decoding.c -#usr/share/ffmpeg/examples/extract_mvs.c -#usr/share/ffmpeg/examples/filter_audio.c -#usr/share/ffmpeg/examples/filtering_audio.c -#usr/share/ffmpeg/examples/filtering_video.c -#usr/share/ffmpeg/examples/http_multiclient.c -#usr/share/ffmpeg/examples/metadata.c -#usr/share/ffmpeg/examples/muxing.c -#usr/share/ffmpeg/examples/qsvdec.c -#usr/share/ffmpeg/examples/remuxing.c -#usr/share/ffmpeg/examples/resampling_audio.c -#usr/share/ffmpeg/examples/scaling_video.c -#usr/share/ffmpeg/examples/transcode_aac.c -#usr/share/ffmpeg/examples/transcoding.c -#usr/share/ffmpeg/ffprobe.xsd -#usr/share/ffmpeg/libvpx-1080p.ffpreset -#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset -#usr/share/ffmpeg/libvpx-360p.ffpreset -#usr/share/ffmpeg/libvpx-720p.ffpreset -#usr/share/ffmpeg/libvpx-720p50_60.ffpreset -#usr/share/man/man1/ffmpeg-all.1 -#usr/share/man/man1/ffmpeg-bitstream-filters.1 -#usr/share/man/man1/ffmpeg-codecs.1 -#usr/share/man/man1/ffmpeg-devices.1 -#usr/share/man/man1/ffmpeg-filters.1 -#usr/share/man/man1/ffmpeg-formats.1 -#usr/share/man/man1/ffmpeg-protocols.1 -#usr/share/man/man1/ffmpeg-resampler.1 -#usr/share/man/man1/ffmpeg-scaler.1 -#usr/share/man/man1/ffmpeg-utils.1 -#usr/share/man/man1/ffmpeg.1 -#usr/share/man/man1/ffprobe-all.1 -#usr/share/man/man1/ffprobe.1 -#usr/share/man/man1/ffserver-all.1 -#usr/share/man/man1/ffserver.1 -#usr/share/man/man3/libavcodec.3 -#usr/share/man/man3/libavdevice.3 -#usr/share/man/man3/libavfilter.3 -#usr/share/man/man3/libavformat.3 -#usr/share/man/man3/libavutil.3 -#usr/share/man/man3/libswresample.3 -#usr/share/man/man3/libswscale.3 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index d0dceec4b..77258a0ed 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg PAK_VER = 7 -DEPS = "ffmpeg-libs sdl lame libvorbis xvid" +DEPS = "sdl lame libvorbis xvid" ############################################################################### # Top-level Rules diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs deleted file mode 100644 index 0ed657f93..000000000 --- a/lfs/ffmpeg-libs +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 3.2.4 -THISAPP = ffmpeg-export-$(VER) -PROG = ffmpeg-libs -PAK_VER = 6 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -install : - -check : - -download : - -md5 : - -dist: - @$(PAK) diff --git a/lfs/mediatomb b/lfs/mediatomb index c36710a27..d7ae4cf6d 100644 --- a/lfs/mediatomb +++ b/lfs/mediatomb @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mediatomb -PAK_VER = 5 +PAK_VER = 6 -DEPS = "ffmpeg-libs libexif taglib " +DEPS = "ffmpeg libexif taglib " ############################################################################### # Top-level Rules diff --git a/lfs/mpd b/lfs/mpd index 93039b772..2beb422fa 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd PAK_VER = 17 -DEPS = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis opus" +DEPS = "alsa faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus" ############################################################################### # Top-level Rules From c26966bf7171d4bec5e94a68f47cb03a76b722e0 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 2 Dec 2017 10:16:39 +0100 Subject: [PATCH 2/8] nano: Update to 2.9.1 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nano b/lfs/nano index 379983196..3935a8b09 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.8.6 +VER = 2.9.1 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 16 +PAK_VER = 17 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e05d83c0f1687b733322f806c080d256 +$(DL_FILE)_MD5 = 0e2c5d7ae5378fe42b7166e7fe268736 install : $(TARGET) From 3951a1135f280f0881c1d54f4a66653b5e44b57d Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 2 Dec 2017 10:10:23 +0100 Subject: [PATCH 3/8] sudo: Fix for lfs-file (Typo) Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- lfs/sudo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/sudo b/lfs/sudo index 9dd72fef5..1c66bc558 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-env-editor \ --with-ignore-dot \ --with-tty-tickets \ - --with-passpromt="[sudo] password for %p: " \ + --with-passprompt="[sudo] password for %p: " \ --without-pam cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From 68a7683a35f3304a1eee0b2084d2f78012c64501 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 29 Nov 2017 18:16:46 +0100 Subject: [PATCH 4/8] mc: Update to 4.8.20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- config/rootfiles/packages/mc | 4 ++++ lfs/mc | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 820d23333..4733af6fa 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -162,6 +162,7 @@ usr/share/mc/syntax/fortran.syntax usr/share/mc/syntax/glsl.syntax usr/share/mc/syntax/go.syntax usr/share/mc/syntax/haskell.syntax +usr/share/mc/syntax/hive.syntax usr/share/mc/syntax/html.syntax usr/share/mc/syntax/idl.syntax usr/share/mc/syntax/ini.syntax @@ -177,6 +178,7 @@ usr/share/mc/syntax/lua.syntax usr/share/mc/syntax/m4.syntax usr/share/mc/syntax/mail.syntax usr/share/mc/syntax/makefile.syntax +usr/share/mc/syntax/markdown.syntax usr/share/mc/syntax/ml.syntax usr/share/mc/syntax/named.syntax usr/share/mc/syntax/nemerle.syntax @@ -191,6 +193,7 @@ usr/share/mc/syntax/po.syntax usr/share/mc/syntax/povray.syntax usr/share/mc/syntax/procmail.syntax usr/share/mc/syntax/properties.syntax +usr/share/mc/syntax/protobuf.syntax usr/share/mc/syntax/puppet.syntax usr/share/mc/syntax/python.syntax usr/share/mc/syntax/r.syntax @@ -205,6 +208,7 @@ usr/share/mc/syntax/swig.syntax usr/share/mc/syntax/syntax.syntax usr/share/mc/syntax/tcl.syntax usr/share/mc/syntax/texinfo.syntax +usr/share/mc/syntax/ts.syntax usr/share/mc/syntax/tt.syntax usr/share/mc/syntax/unknown.syntax usr/share/mc/syntax/verilog.syntax diff --git a/lfs/mc b/lfs/mc index 1680a9638..741d41b13 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.8.19 +VER = 4.8.20 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 15 +PAK_VER = 16 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 57209d138c0adcb9ea01dfe6bbb4cb87 +$(DL_FILE)_MD5 = 7f808b01f3f7d9aa52152a9efb86dbca install : $(TARGET) @@ -79,7 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr \ --sysconfdir=/etc \ - --without-x --disable-nls \ + --without-x \ + --disable-nls \ --with-screen=ncurses cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From e5efd998931720b8f347a9b0fcee30b463a1d442 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 2 Dec 2017 12:23:39 +0000 Subject: [PATCH 5/8] core117: Ship updated sudo package Signed-off-by: Michael Tremer --- config/rootfiles/core/117/filelists/sudo | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/117/filelists/sudo diff --git a/config/rootfiles/core/117/filelists/sudo b/config/rootfiles/core/117/filelists/sudo new file mode 120000 index 000000000..0d3c45e04 --- /dev/null +++ b/config/rootfiles/core/117/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file From 9b5a17bf949c3b97f3fa65a01642f5f78a6ababc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Wed, 15 Nov 2017 22:56:36 +0100 Subject: [PATCH 6/8] display GeoIP information on ipinfo.cgi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display GeoIP information on ipinfo.cgi and use newly implemented function in /var/ipfire/geoip-functions.pl . Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- html/cgi-bin/ipinfo.cgi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 16541f126..b756a24d2 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -30,6 +30,7 @@ use strict; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/geoip-functions.pl"; my %cgiparams=(); @@ -50,6 +51,10 @@ if (&General::validip($addr)) { my $hostname = gethostbyaddr($iaddr, AF_INET); if (!$hostname) { $hostname = $Lang::tr{'lookup failed'}; } + # enumerate GeoIP information for IP address... + my $ccode = &GeoIP::lookup($addr); + my $flag_icon = &GeoIP::get_flag_icon($ccode); + my $sock = new IO::Socket::INET ( PeerAddr => $whoisname, PeerPort => 43, Proto => 'tcp'); if ($sock) { @@ -81,7 +86,7 @@ if (&General::validip($addr)) { @lines = ( "$Lang::tr{'unable to contact'} $whoisname" ); } - &Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whoisname); + &Header::openbox('100%', 'left', $addr . " $ccode (" . $hostname . ') : '.$whoisname); print "
\n";
 	foreach my $line (@lines) {
 		print &Header::cleanhtml($line,"y");

From ea4620fc4abefc4e8c06e2f0f01c10cc4e45e554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20M=C3=BCller?= 
Date: Wed, 15 Nov 2017 23:10:43 +0100
Subject: [PATCH 7/8] display GeoIP information on active network connections
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Display GeoIP information on active network connections in WebUI.
Use newly implemented function in /var/ipfire/geoip-functions.pl .

Signed-off-by: Peter Müller 
Signed-off-by: Michael Tremer 
---
 html/cgi-bin/connections.cgi | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 96f09012b..e9e9e335c 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -31,6 +31,7 @@ use Switch;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/geoip-functions.pl";
 
 my $colour_multicast = "#A0A0A0";
 
@@ -379,6 +380,7 @@ print <
 				
 			
+			 
 			
 				
 				
@@ -386,6 +388,7 @@ print <
 				
 			
+			 
 			
 				
 				
@@ -409,9 +412,15 @@ print <
 				$Lang::tr{'source ip and port'}
 			
+			
+				$Lang::tr{'country'}
+			
 			
 				$Lang::tr{'dest ip and port'}
 			
+			
+				$Lang::tr{'country'}
+			
 			
 				$Lang::tr{'download'} /
 				
$Lang::tr{'upload'}
@@ -540,6 +549,12 @@ foreach my $line (@conntrack) {
 	my $bytes_in = format_bytes($bytes[0]);
 	my $bytes_out = format_bytes($bytes[1]);
 
+	# enumerate GeoIP information
+	my $srcccode = &GeoIP::lookup($sip_ret);
+	my $src_flag_icon = &GeoIP::get_flag_icon($srcccode);
+	my $dstccode = &GeoIP::lookup($dip_ret);
+	my $dst_flag_icon = &GeoIP::get_flag_icon($dstccode);
+
 	# Format TTL
 	$ttl = format_time($ttl);
 
@@ -601,6 +616,9 @@ foreach my $line (@conntrack) {
 			
 			$sport_extra
 		
+		
+			$srcccode
+		
 		
 			
 				$dip
@@ -613,6 +631,9 @@ foreach my $line (@conntrack) {
 			
 			$dport_extra
 		
+		
+			$dstccode
+		
 		
 			$bytes_in / $bytes_out
 		

From 7da47c3ef983cfb5eaa63b114256e3fa0c548667 Mon Sep 17 00:00:00 2001
From: Michael Tremer 
Date: Sat, 2 Dec 2017 12:25:09 +0000
Subject: [PATCH 8/8] core117: Ship updated CGI files

Signed-off-by: Michael Tremer 
---
 config/rootfiles/core/117/filelists/files | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index b3e570a5e..4a5e674ec 100644
--- a/config/rootfiles/core/117/filelists/files
+++ b/config/rootfiles/core/117/filelists/files
@@ -6,9 +6,11 @@ etc/ssl/certs/ca-bundle.crt
 etc/ssl/certs/ca-bundle.trust.crt
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/captive.cgi
+srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ipinfo.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/config.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat