mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-14 13:02:58 +02:00
Merge remote-tracking branch 'origin/next' into kernel-4.14
This commit is contained in:
Arne Fitzenreiter
@@ -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
|
||||
|
||||
1
config/rootfiles/core/117/filelists/sudo
Symbolic link
1
config/rootfiles/core/117/filelists/sudo
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/sudo
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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 <<END;
|
||||
<a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
|
||||
<a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
|
||||
</th>
|
||||
<th> </th>
|
||||
<th style='text-align:center' colspan='2'>
|
||||
<a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
|
||||
<a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
|
||||
@@ -386,6 +388,7 @@ print <<END;
|
||||
<a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
|
||||
<a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
|
||||
</th>
|
||||
<th> </th>
|
||||
<th style='text-align:center'>
|
||||
<a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
|
||||
<a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
|
||||
@@ -409,9 +412,15 @@ print <<END;
|
||||
<th style='text-align:center' colspan='2'>
|
||||
$Lang::tr{'source ip and port'}
|
||||
</th>
|
||||
<th style='text-align:center'>
|
||||
$Lang::tr{'country'}
|
||||
</th>
|
||||
<th style='text-align:center' colspan='2'>
|
||||
$Lang::tr{'dest ip and port'}
|
||||
</th>
|
||||
<th style='text-align:center'>
|
||||
$Lang::tr{'country'}
|
||||
</th>
|
||||
<th style='text-align:center'>
|
||||
$Lang::tr{'download'} /
|
||||
<br>$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) {
|
||||
</a>
|
||||
$sport_extra
|
||||
</td>
|
||||
<td style='text-align:center; background-color:$sip_colour;'>
|
||||
<a href='country.cgi#$srcccode'><img src='$src_flag_icon' border='0' align='absmiddle' alt='$srcccode' title='$srcccode' /></a>
|
||||
</td>
|
||||
<td style='text-align:center; background-color:$dip_colour;'>
|
||||
<a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
|
||||
<span style='color:#FFFFFF;'>$dip</span>
|
||||
@@ -613,6 +631,9 @@ foreach my $line (@conntrack) {
|
||||
</a>
|
||||
$dport_extra
|
||||
</td>
|
||||
<td style='text-align:center; background-color:$sip_colour;'>
|
||||
<a href='country.cgi#$dstccode'><img src='$dst_flag_icon' border='0' align='absmiddle' alt='$dstccode' title='$dstccode' /></a>
|
||||
</td>
|
||||
<td style='text-align:center'>
|
||||
$bytes_in / $bytes_out
|
||||
</td>
|
||||
|
||||
@@ -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 . " <a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a> (" . $hostname . ') : '.$whoisname);
|
||||
print "<pre>\n";
|
||||
foreach my $line (@lines) {
|
||||
print &Header::cleanhtml($line,"y");
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# 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 <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# 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)
|
||||
9
lfs/mc
9
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
|
||||
|
||||
@@ -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
|
||||
|
||||
2
lfs/mpd
2
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
|
||||
|
||||
6
lfs/nano
6
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)
|
||||
|
||||
|
||||
2
lfs/sudo
2
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
|
||||
|
||||
Reference in New Issue
Block a user