From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7da47c3ef983cfb5eaa63b114256e3fa0c548667 Date: Sat, 02 Dec 2017 12:25:35 +0000 Message-ID: <20171202122536.7AC121081DE6@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7691178365750621889==" List-Id: --===============7691178365750621889== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 7da47c3ef983cfb5eaa63b114256e3fa0c548667 (commit) via ea4620fc4abefc4e8c06e2f0f01c10cc4e45e554 (commit) via 9b5a17bf949c3b97f3fa65a01642f5f78a6ababc (commit) via e5efd998931720b8f347a9b0fcee30b463a1d442 (commit) via 68a7683a35f3304a1eee0b2084d2f78012c64501 (commit) via 3951a1135f280f0881c1d54f4a66653b5e44b57d (commit) via c26966bf7171d4bec5e94a68f47cb03a76b722e0 (commit) via 421ba804aab8244c0b294d96f41042797f32bd4f (commit) from 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51 (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 7da47c3ef983cfb5eaa63b114256e3fa0c548667 Author: Michael Tremer Date: Sat Dec 2 12:25:09 2017 +0000 core117: Ship updated CGI files =20 Signed-off-by: Michael Tremer commit ea4620fc4abefc4e8c06e2f0f01c10cc4e45e554 Author: Peter M=C3=BCller Date: Wed Nov 15 23:10:43 2017 +0100 display GeoIP information on active network connections =20 Display GeoIP information on active network connections in WebUI. Use newly implemented function in /var/ipfire/geoip-functions.pl . =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit 9b5a17bf949c3b97f3fa65a01642f5f78a6ababc Author: Peter M=C3=BCller Date: Wed Nov 15 22:56:36 2017 +0100 display GeoIP information on ipinfo.cgi =20 Display GeoIP information on ipinfo.cgi and use newly implemented function in /var/ipfire/geoip-functions.pl . =20 Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit e5efd998931720b8f347a9b0fcee30b463a1d442 Author: Michael Tremer Date: Sat Dec 2 12:23:39 2017 +0000 core117: Ship updated sudo package =20 Signed-off-by: Michael Tremer commit 68a7683a35f3304a1eee0b2084d2f78012c64501 Author: Matthias Fischer Date: Wed Nov 29 18:16:46 2017 +0100 mc: Update to 4.8.20 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 3951a1135f280f0881c1d54f4a66653b5e44b57d Author: Matthias Fischer Date: Sat Dec 2 10:10:23 2017 +0100 sudo: Fix for lfs-file (Typo) =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit c26966bf7171d4bec5e94a68f47cb03a76b722e0 Author: Matthias Fischer Date: Sat Dec 2 10:16:39 2017 +0100 nano: Update to 2.9.1 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 421ba804aab8244c0b294d96f41042797f32bd4f Author: Michael Tremer Date: Sat Dec 2 12:22:00 2017 +0000 Drop separate ffmpeg-libs package =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/117/filelists/files | 2 + .../{oldcore/112 =3D> core/117}/filelists/sudo | 0 config/rootfiles/packages/ffmpeg-libs | 237 -------------------= -- config/rootfiles/packages/mc | 4 + html/cgi-bin/connections.cgi | 21 ++ html/cgi-bin/ipinfo.cgi | 7 +- lfs/ffmpeg | 2 +- lfs/ffmpeg-libs | 47 ---- lfs/mc | 9 +- lfs/mediatomb | 4 +- lfs/mpd | 2 +- lfs/nano | 6 +- lfs/sudo | 2 +- 13 files changed, 46 insertions(+), 297 deletions(-) copy config/rootfiles/{oldcore/112 =3D> core/117}/filelists/sudo (100%) delete mode 100644 config/rootfiles/packages/ffmpeg-libs delete mode 100644 lfs/ffmpeg-libs Difference in files: diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/cor= e/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 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 diff --git a/config/rootfiles/packages/ffmpeg-libs b/config/rootfiles/package= s/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/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/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"; =20 my $colour_multicast =3D "#A0A0A0"; =20 @@ -379,6 +380,7 @@ print <3D"" 3D"" +   3D"" 3D"" @@ -386,6 +388,7 @@ print <3D"" 3D"" +   3D"" 3D"" @@ -409,10 +412,16 @@ 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 =3D format_bytes($bytes[0]); my $bytes_out =3D format_bytes($bytes[1]); =20 + # enumerate GeoIP information + my $srcccode =3D &GeoIP::lookup($sip_ret); + my $src_flag_icon =3D &GeoIP::get_flag_icon($srcccode); + my $dstccode =3D &GeoIP::lookup($dip_ret); + my $dst_flag_icon =3D &GeoIP::get_flag_icon($dstccode); + # Format TTL $ttl =3D format_time($ttl); =20 @@ -601,6 +616,9 @@ foreach my $line (@conntrack) { $sport_extra + + 3D'$srcccode' + $dip @@ -613,6 +631,9 @@ foreach my $line (@conntrack) { $dport_extra + + 3D'$dstccode' + $bytes_in / $bytes_out 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"; =20 my %cgiparams=3D(); =20 @@ -50,6 +51,10 @@ if (&General::validip($addr)) { my $hostname =3D gethostbyaddr($iaddr, AF_INET); if (!$hostname) { $hostname =3D $Lang::tr{'lookup failed'}; } =20 + # enumerate GeoIP information for IP address... + my $ccode =3D &GeoIP::lookup($addr); + my $flag_icon =3D &GeoIP::get_flag_icon($ccode); + my $sock =3D new IO::Socket::INET ( PeerAddr =3D> $whoisname, PeerPort =3D>= 43, Proto =3D> 'tcp'); if ($sock) { @@ -81,7 +86,7 @@ if (&General::validip($addr)) { @lines =3D ( "$Lang::tr{'unable to contact'} $whoisname" ); } =20 - &Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whoisna= me); + &Header::openbox('100%', 'left', $addr . " <= img src=3D'$flag_icon' border=3D'0' align=3D'absmiddle' alt=3D'$ccode' title= =3D'$ccode' /> (" . $hostname . ') : '.$whoisname); print "
\n";
 	foreach my $line (@lines) {
 		print &Header::cleanhtml($line,"y");
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index d0dceec4b..77258a0ed 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -34,7 +34,7 @@ TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D ffmpeg
 PAK_VER    =3D 7
=20
-DEPS       =3D "ffmpeg-libs sdl lame libvorbis xvid"
+DEPS       =3D "sdl lame libvorbis xvid"
=20
 ############################################################################=
###
 # 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        =3D 3.2.4
-THISAPP    =3D ffmpeg-export-$(VER)
-PROG       =3D ffmpeg-libs
-PAK_VER    =3D 6
-
-DEPS       =3D ""
-
-############################################################################=
###
-# Top-level Rules
-############################################################################=
###
-
-install :=20
-
-check :=20
-
-download :
-
-md5 :
-
-dist:=20
-	@$(PAK)
diff --git a/lfs/mc b/lfs/mc
index 1680a9638..741d41b13 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 4.8.19
+VER        =3D 4.8.20
=20
 THISAPP    =3D mc-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D mc
-PAK_VER    =3D 15
+PAK_VER    =3D 16
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 57209d138c0adcb9ea01dfe6bbb4cb87
+$(DL_FILE)_MD5 =3D 7f808b01f3f7d9aa52152a9efb86dbca
=20
 install : $(TARGET)
=20
@@ -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=3D/usr \
 				--sysconfdir=3D/etc \
-				--without-x --disable-nls \
+				--without-x \
+				--disable-nls \
 				--with-screen=3Dncurses
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/lfs/mediatomb b/lfs/mediatomb
index c36710a27..d7ae4cf6d 100644
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -32,9 +32,9 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D mediatomb
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
-DEPS       =3D "ffmpeg-libs libexif taglib "
+DEPS       =3D "ffmpeg libexif taglib "
=20
 ############################################################################=
###
 # 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     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D mpd
 PAK_VER    =3D 17
=20
-DEPS       =3D "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libi=
d3tag libvorbis opus"
+DEPS       =3D "alsa faad2 ffmpeg flac lame libmad libshout libogg libid3tag=
 libvorbis opus"
=20
 ############################################################################=
###
 # Top-level Rules
diff --git a/lfs/nano b/lfs/nano
index 379983196..3935a8b09 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.8.6
+VER        =3D 2.9.1
=20
 THISAPP    =3D nano-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D nano
-PAK_VER    =3D 16
+PAK_VER    =3D 17
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D e05d83c0f1687b733322f806c080d256
+$(DL_FILE)_MD5 =3D 0e2c5d7ae5378fe42b7166e7fe268736
=20
 install : $(TARGET)
=20
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=3D"[sudo] password for %p: " \
+			--with-passprompt=3D"[sudo] password for %p: " \
 			--without-pam
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install


hooks/post-receive
--
IPFire 2.x development tree

--===============7691178365750621889==--