IPFire-SCM December 2017

ipfire-scm@lists.ipfire.org

1 participants
13 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a4459746774ddaabdf6c85414b7b91d75863740
by git＠ipfire.org 04 Dec '17

04 Dec '17

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 3a4459746774ddaabdf6c85414b7b91d75863740 (commit) via af183eeb785d5a2ba0e233da168a4f2f8ef06260 (commit) via 8c6b02e7f64d9ec2248b5912f5e761f0241fe4de (commit) from 7da47c3ef983cfb5eaa63b114256e3fa0c548667 (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 3a4459746774ddaabdf6c85414b7b91d75863740 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 4 17:51:53 2017 +0000 OpenVPN: Allow to set routes to IPsec networks This makes hub-and-spoke designs with OpenVPN RW and IPsec N2N easier to configure Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit af183eeb785d5a2ba0e233da168a4f2f8ef06260 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 4 17:31:53 2017 +0000 IPsec: Allow configuring inactivity timeout when in on-demand mode Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c6b02e7f64d9ec2248b5912f5e761f0241fe4de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 4 13:12:38 2017 +0000 IPsec: Drop support for MODP with subgroup These come from questionable sources and are not considered to be secure any more: https://eprint.iacr.org/2016/961 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/117/filelists/files | 1 + doc/language_issues.es | 6 +++ doc/language_issues.fr | 6 +++ doc/language_issues.it | 6 +++ doc/language_issues.nl | 6 +++ doc/language_issues.pl | 6 +++ doc/language_issues.ru | 6 +++ doc/language_issues.tr | 6 +++ doc/language_missings | 42 ++++++++++++++++++ html/cgi-bin/ovpnmain.cgi | 29 +++++++++++++ html/cgi-bin/vpnmain.cgi | 71 +++++++++++++++++++++++++------ langs/de/cgi-bin/de.pl | 6 +++ langs/en/cgi-bin/en.pl | 6 +++ 13 files changed, 185 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files index 4a5e674ec..9906b1542 100644 --- a/config/rootfiles/core/117/filelists/files +++ b/config/rootfiles/core/117/filelists/files @@ -19,6 +19,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/netexternal.cgi srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos/include/functions.pl diff --git a/doc/language_issues.es b/doc/language_issues.es index f030fdaa0..6df324159 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -787,6 +787,7 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: entropy graphs +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -813,6 +814,7 @@ WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first +WARNING: untranslated string: five minutes WARNING: untranslated string: flag WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop @@ -1020,6 +1022,7 @@ WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec @@ -1139,6 +1142,8 @@ WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1204,6 +1209,7 @@ WARNING: untranslated string: visit us at WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2c5fc31d6..f8360f3b6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -796,6 +796,7 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: entropy graphs +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -822,6 +823,7 @@ WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first +WARNING: untranslated string: five minutes WARNING: untranslated string: flag WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop @@ -1036,6 +1038,7 @@ WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec @@ -1152,6 +1155,8 @@ WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1220,6 +1225,7 @@ WARNING: untranslated string: visit us at WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action diff --git a/doc/language_issues.it b/doc/language_issues.it index 805bc1209..abd7da4a0 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -769,12 +769,14 @@ WARNING: untranslated string: email settings WARNING: untranslated string: email testmail WARNING: untranslated string: email tls WARNING: untranslated string: email usemail +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: firewall graph country WARNING: untranslated string: firewall graph ip WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: five minutes WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon @@ -837,6 +839,7 @@ WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: info messages +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: log server protocol @@ -869,6 +872,8 @@ WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain WARNING: untranslated string: search WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks WARNING: untranslated string: udp less overhead @@ -880,6 +885,7 @@ WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 65670849e..005fdcd85 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -781,6 +781,7 @@ WARNING: untranslated string: email settings WARNING: untranslated string: email testmail WARNING: untranslated string: email tls WARNING: untranslated string: email usemail +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: firewall graph country WARNING: untranslated string: firewall graph ip WARNING: untranslated string: firewall graph port @@ -788,6 +789,7 @@ WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country +WARNING: untranslated string: five minutes WARNING: untranslated string: four hours WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon @@ -853,6 +855,7 @@ WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: info messages +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: log server protocol @@ -915,6 +918,8 @@ WARNING: untranslated string: software version WARNING: untranslated string: source ip country WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks WARNING: untranslated string: udp less overhead @@ -928,6 +933,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f030fdaa0..6df324159 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -787,6 +787,7 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: entropy graphs +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -813,6 +814,7 @@ WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first +WARNING: untranslated string: five minutes WARNING: untranslated string: flag WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop @@ -1020,6 +1022,7 @@ WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec @@ -1139,6 +1142,8 @@ WARNING: untranslated string: system has rdrand WARNING: untranslated string: system information WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1204,6 +1209,7 @@ WARNING: untranslated string: visit us at WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 68e7b9384..2b4c9385d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -798,6 +798,7 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: firewall graph country WARNING: untranslated string: firewall graph ip WARNING: untranslated string: firewall graph port @@ -807,6 +808,7 @@ WARNING: untranslated string: firewall log port WARNING: untranslated string: firewall logs country WARNING: untranslated string: firewall rules WARNING: untranslated string: first +WARNING: untranslated string: five minutes WARNING: untranslated string: flag WARNING: untranslated string: four hours WARNING: untranslated string: fw default drop @@ -1022,6 +1024,7 @@ WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: ipsec @@ -1134,6 +1137,8 @@ WARNING: untranslated string: system has hwrng WARNING: untranslated string: system has rdrand WARNING: untranslated string: ta key WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes @@ -1199,6 +1204,7 @@ WARNING: untranslated string: visit us at WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b4f627903..a6aa99f90 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -745,12 +745,14 @@ WARNING: untranslated string: bytes WARNING: untranslated string: captive WARNING: untranslated string: dnssec disabled warning WARNING: untranslated string: eight hours +WARNING: untranslated string: fifteen minutes WARNING: untranslated string: firewall graph country WARNING: untranslated string: firewall graph ip WARNING: untranslated string: firewall graph port WARNING: untranslated string: firewall log country WARNING: untranslated string: firewall log ip WARNING: untranslated string: firewall log port +WARNING: untranslated string: five minutes WARNING: untranslated string: four hours WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip @@ -793,6 +795,7 @@ WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: info messages +WARNING: untranslated string: invalid input for inactivity timeout WARNING: untranslated string: invalid logserver protocol WARNING: untranslated string: log server protocol WARNING: untranslated string: no data @@ -806,6 +809,8 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: tcp more reliable +WARNING: untranslated string: ten minutes +WARNING: untranslated string: thirty minutes WARNING: untranslated string: twelve hours WARNING: untranslated string: two weeks WARNING: untranslated string: udp less overhead @@ -813,6 +818,7 @@ WARNING: untranslated string: unlimited WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting +WARNING: untranslated string: vpn inactivity timeout WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route diff --git a/doc/language_missings b/doc/language_missings index 383c36ca6..c9b3b455d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -251,6 +251,7 @@ < encryption < entropy < entropy graphs +< fifteen minutes < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -277,6 +278,7 @@ < firewall logs country < firewall rules < first +< five minutes < flag < forward firewall < four hours @@ -487,6 +489,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < ipsec @@ -624,7 +627,9 @@ < system information < ta key < tcp more reliable +< ten minutes < teovpn_fragment +< thirty minutes < tor < tor 0 = disabled < tor accounting @@ -701,6 +706,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn keyexchange < vpn on-demand < vpn start action @@ -956,6 +962,7 @@ < encryption < entropy < entropy graphs +< fifteen minutes < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -982,6 +989,7 @@ < firewall logs country < firewall rules < first +< five minutes < flag < forward firewall < four hours @@ -1202,6 +1210,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < ipsec @@ -1323,7 +1332,9 @@ < system information < ta key < tcp more reliable +< ten minutes < teovpn_fragment +< thirty minutes < tor < tor 0 = disabled < tor accounting @@ -1403,6 +1414,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn keyexchange < vpn on-demand < vpn start action @@ -1575,12 +1587,14 @@ < email text < email tls < email usemail +< fifteen minutes < firewall graph country < firewall graph ip < firewall graph port < firewall log country < firewall log ip < firewall log port +< five minutes < four hours < fwdfw err concon < fwdfw err ratecon @@ -1607,6 +1621,7 @@ < guardian < incoming compression in bytes per second < incoming overhead in bytes per second +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < log server protocol @@ -1636,6 +1651,8 @@ < samba join domain < search < tcp more reliable +< ten minutes +< thirty minutes < twelve hours < two weeks < udp less overhead @@ -1647,6 +1664,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn on-demand < vpn start action < vpn start action route @@ -1785,6 +1803,7 @@ < email text < email tls < email usemail +< fifteen minutes < firewall graph country < firewall graph ip < firewall graph port @@ -1792,6 +1811,7 @@ < firewall log ip < firewall log port < firewall logs country +< five minutes < four hours < fwdfw err concon < fwdfw err ratecon @@ -1821,6 +1841,7 @@ < imsi < incoming compression in bytes per second < incoming overhead in bytes per second +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < log server protocol @@ -1883,7 +1904,9 @@ < source ip country < ta key < tcp more reliable +< ten minutes < teovpn_fragment +< thirty minutes < twelve hours < two weeks < udp less overhead @@ -1897,6 +1920,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn on-demand < vpn start action < vpn start action route @@ -2128,6 +2152,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< fifteen minutes < firewall graph country < firewall graph ip < firewall graph port @@ -2137,6 +2162,7 @@ < firewall logs country < firewall rules < first +< five minutes < flag < forward firewall < four hours @@ -2357,6 +2383,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < ipsec @@ -2478,7 +2505,9 @@ < system has rdrand < ta key < tcp more reliable +< ten minutes < teovpn_fragment +< thirty minutes < tor < tor 0 = disabled < tor accounting @@ -2555,6 +2584,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn keyexchange < vpn on-demand < vpn start action @@ -2823,6 +2853,7 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< fifteen minutes < firewall graph country < firewall graph ip < firewall graph port @@ -2832,6 +2863,7 @@ < firewall logs country < firewall rules < first +< five minutes < flag < forward firewall < four hours @@ -3055,6 +3087,7 @@ < integrity < invalid input for dpd delay < invalid input for dpd timeout +< invalid input for inactivity timeout < invalid input for valid till days < invalid logserver protocol < ipsec @@ -3174,7 +3207,9 @@ < system has rdrand < ta key < tcp more reliable +< ten minutes < teovpn_fragment +< thirty minutes < tor < tor 0 = disabled < tor accounting @@ -3251,6 +3286,7 @@ < vpn broken < vpn connecting < vpn force mobike +< vpn inactivity timeout < vpn keyexchange < vpn on-demand < vpn start action @@ -3371,14 +3407,17 @@ < Captive wrong ext < dnssec disabled warning < eight hours +< fifteen minutes < firewall graph country < firewall graph ip < firewall graph port < firewall log country < firewall log ip < firewall log port +< five minutes < four hours < guardian +< invalid input for inactivity timeout < invalid logserver protocol < log server protocol < one hour @@ -3387,6 +3426,8 @@ < one year < rdns < tcp more reliable +< ten minutes +< thirty minutes < twelve hours < two weeks < udp less overhead @@ -3394,6 +3435,7 @@ < uplink bit rate < vpn broken < vpn connecting +< vpn inactivity timeout < vpn on-demand < vpn start action < vpn start action route diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ceb88c156..b43f91f6b 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4975,6 +4975,35 @@ END } if ($set == '1' && $#temp != -1){ print"<option selected>$temp[1]</option>";$set=0;}elsif($set == '0' && $#temp != -1){print"<option>$temp[1]</option>";} } + + my %vpnconfig = (); + &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); + foreach my $vpn (keys %vpnconfig) { + # Skip all disabled VPN connections + my $enabled = $vpnconfig{$vpn}[0]; + next unless ($enabled eq "on"); + + my $name = $vpnconfig{$vpn}[1]; + + # Remote subnets + my @networks = split(/\|/, $vpnconfig{$vpn}[11]); + foreach my $network (@networks) { + my $selected = ""; + + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { + foreach my $i (1 .. $#{$ccdroute2hash{$key}}) { + if ($ccdroute2hash{$key}[$i] eq $network) { + $selected = "selected"; + } + } + } + } + + print "<option value=\"$network\" $selected>$name ($network)</option>\n"; + } + } + #check if green,blue,orange are defined for client foreach my $key (keys %ccdroute2hash) { if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index d6f6ecb33..be6eb6d15 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -68,6 +68,17 @@ if (&Header::orange_used() && $netsettings{'ORANGE_DEV'}) { $orange_cidr = &General::ipcidr("$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}"); } +my %INACTIVITY_TIMEOUTS = ( + 300 => $Lang::tr{'five minutes'}, + 600 => $Lang::tr{'ten minutes'}, + 900 => $Lang::tr{'fifteen minutes'}, + 1800 => $Lang::tr{'thirty minutes'}, + 3600 => $Lang::tr{'one hour'}, + 43200 => $Lang::tr{'twelve hours'}, + 86400 => $Lang::tr{'24 hours'}, + 0 => "- $Lang::tr{'unlimited'} -", +); + my $col=""; $cgiparams{'ENABLED'} = 'off'; @@ -109,6 +120,7 @@ $cgiparams{'DPD_DELAY'} = '30'; $cgiparams{'DPD_TIMEOUT'} = '120'; $cgiparams{'FORCE_MOBIKE'} = 'off'; $cgiparams{'START_ACTION'} = 'start'; +$cgiparams{'INACTIVITY_TIMEOUT'} = 900; &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); ### @@ -407,6 +419,11 @@ sub writeipsecfiles { $start_action = "start"; } + my $inactivity_timeout = $lconfighash{$key}[34]; + if ($inactivity_timeout eq "") { + $inactivity_timeout = 900; + } + # Automatically start only if a net-to-net connection if ($lconfighash{$key}[3] eq 'host') { print CONF "\tauto=add\n"; @@ -416,8 +433,8 @@ sub writeipsecfiles { # If in on-demand mode, we terminate the tunnel # after 15 min of no traffic - if ($start_action eq 'route') { - print CONF "\tinactivity=900\n"; + if ($start_action eq 'route' && $inactivity_timeout > 0) { + print CONF "\tinactivity=$inactivity_timeout\n"; } } @@ -1299,6 +1316,7 @@ END $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32]; + $cgiparams{'INACTIVITY_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[34]; if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -1308,6 +1326,10 @@ END $cgiparams{'DPD_TIMEOUT'} = 120; } + if ($cgiparams{'INACTIVITY_TIMEOUT'} eq "") { + $cgiparams{'INACTIVITY_TIMEOUT'} = 900; + } + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { @@ -1790,7 +1812,7 @@ END my $key = $cgiparams{'KEY'}; if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 33) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 34) { $confighash{$key}[$i] = "";} } $confighash{$key}[0] = $cgiparams{'ENABLED'}; $confighash{$key}[1] = $cgiparams{'NAME'}; @@ -1834,6 +1856,7 @@ END $confighash{$key}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$key}[31] = $cgiparams{'DPD_DELAY'}; $confighash{$key}[32] = $cgiparams{'FORCE_MOBIKE'}; + $confighash{$key}[34] = $cgiparams{'INACTIVITY_TIMEOUT'}; # free unused fields! $confighash{$key}[6] = 'off'; @@ -1907,6 +1930,7 @@ END $cgiparams{'COMPRESSION'} = 'off'; #[13]; $cgiparams{'ONLY_PROPOSED'} = 'on'; #[24]; $cgiparams{'PFS'} = 'on'; #[28]; + $cgiparams{'INACTIVITY_TIMEOUT'} = 900; } VPNCONF_ERROR: @@ -2178,7 +2202,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|2048s256|2048s224|2048s160|3072|4096|6144|8192)$/) { + if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2219,7 +2243,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|2048s256|2048s224|2048s160|3072|4096|6144|8192|none)$/) { + if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192|none)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2251,6 +2275,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } + if ($cgiparams{'INACTIVITY_TIMEOUT'} !~ /^\d+$/) { + $errormessage = $Lang::tr{'invalid input for inactivity timeout'}; + goto ADVANCED_ERROR; + } + $confighash{$cgiparams{'KEY'}}[29] = $cgiparams{'IKE_VERSION'}; $confighash{$cgiparams{'KEY'}}[18] = $cgiparams{'IKE_ENCRYPTION'}; $confighash{$cgiparams{'KEY'}}[19] = $cgiparams{'IKE_INTEGRITY'}; @@ -2269,6 +2298,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $confighash{$cgiparams{'KEY'}}[31] = $cgiparams{'DPD_DELAY'}; $confighash{$cgiparams{'KEY'}}[32] = $cgiparams{'FORCE_MOBIKE'}; $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'}; + $confighash{$cgiparams{'KEY'}}[34] = $cgiparams{'INACTIVITY_TIMEOUT'}; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); if (&vpnenabled) { @@ -2297,6 +2327,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32]; $cgiparams{'START_ACTION'} = $confighash{$cgiparams{'KEY'}}[33]; + $cgiparams{'INACTIVITY_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[34]; if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -2309,6 +2340,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || if (!$cgiparams{'START_ACTION'}) { $cgiparams{'START_ACTION'} = "start"; } + + if ($cgiparams{'INACTIVITY_TIMEOUT'} eq "") { + $cgiparams{'INACTIVITY_TIMEOUT'} = 900; # 15 min + } } ADVANCED_ERROR: @@ -2408,6 +2443,12 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $selected{'START_ACTION'}{'start'} = ''; $selected{'START_ACTION'}{$cgiparams{'START_ACTION'}} = "selected='selected'"; + $selected{'INACTIVITY_TIMEOUT'} = (); + foreach my $timeout (keys %INACTIVITY_TIMEOUTS) { + $selected{'INACTIVITY_TIMEOUT'}{$timeout} = ""; + } + $selected{'INACTIVITY_TIMEOUT'}{$cgiparams{'INACTIVITY_TIMEOUT'}} = "selected"; + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'ipsec'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -2545,9 +2586,6 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <option value='6144' $checked{'IKE_GROUPTYPE'}{'6144'}>MODP-6144</option> <option value='4096' $checked{'IKE_GROUPTYPE'}{'4096'}>MODP-4096</option> <option value='3072' $checked{'IKE_GROUPTYPE'}{'3072'}>MODP-3072</option> - <option value='2048s256' $checked{'IKE_GROUPTYPE'}{'2048s256'}>MODP-2048/256</option> - <option value='2048s224' $checked{'IKE_GROUPTYPE'}{'2048s224'}>MODP-2048/224</option> - <option value='2048s160' $checked{'IKE_GROUPTYPE'}{'2048s160'}>MODP-2048/160</option> <option value='2048' $checked{'IKE_GROUPTYPE'}{'2048'}>MODP-2048</option> <option value='1536' $checked{'IKE_GROUPTYPE'}{'1536'}>MODP-1536</option> <option value='1024' $checked{'IKE_GROUPTYPE'}{'1024'}>MODP-1024 ($Lang::tr{'vpn broken'})</option> @@ -2570,9 +2608,6 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <option value='6144' $checked{'ESP_GROUPTYPE'}{'6144'}>MODP-6144</option> <option value='4096' $checked{'ESP_GROUPTYPE'}{'4096'}>MODP-4096</option> <option value='3072' $checked{'ESP_GROUPTYPE'}{'3072'}>MODP-3072</option> - <option value='2048s256' $checked{'ESP_GROUPTYPE'}{'2048s256'}>MODP-2048/256</option> - <option value='2048s224' $checked{'ESP_GROUPTYPE'}{'2048s224'}>MODP-2048/224</option> - <option value='2048s160' $checked{'ESP_GROUPTYPE'}{'2048s160'}>MODP-2048/160</option> <option value='2048' $checked{'ESP_GROUPTYPE'}{'2048'}>MODP-2048</option> <option value='1536' $checked{'ESP_GROUPTYPE'}{'1536'}>MODP-1536</option> <option value='1024' $checked{'ESP_GROUPTYPE'}{'1024'}>MODP-1024 ($Lang::tr{'vpn broken'})</option> @@ -2633,12 +2668,24 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || </td> </tr> <tr> - <td colspan="2"> + <td> <label> <input type='checkbox' name='PFS' $checked{'PFS'} /> $Lang::tr{'pfs yes no'} </label> </td> + <td> + <label>$Lang::tr{'vpn inactivity timeout'}</label> + <select name="INACTIVITY_TIMEOUT"> +EOF + foreach my $t (sort { $a <=> $b } keys %INACTIVITY_TIMEOUTS) { + print "<option value=\"$t\" $selected{'INACTIVITY_TIMEOUT'}{$t}>$INACTIVITY_TIMEOUTS{$t}</option>\n"; + } + + print <<EOF; + + </select> + </td> </tr> <tr> <td colspan="2"> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f87071db7..fd9355f7a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -984,6 +984,7 @@ 'false min bandwith' => 'Mindestbandbreite ist ungültig.', 'february' => 'Februar', 'fetch ip from' => 'Schätze die echte öffentliche IP-Adresse mit Hilfe eines externen Servers', +'fifteen minutes' => '15 Minuten', 'filename' => 'Dateiname', 'filesystem full' => 'Dateisystem voll', 'fireinfo ipfire version' => 'IPFire-Version', @@ -1022,6 +1023,7 @@ 'firmware' => 'Firmware', 'firmware upload' => 'Hochladen der Firmware/Treiber', 'first' => 'Erste', +'five minutes' => '5 Minuten', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', 'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht', @@ -1388,6 +1390,7 @@ 'invalid input for esp keylife' => 'Ungültige Eingabe für ESP Schlüssel-Lebensdauer', 'invalid input for hostname' => 'Ungültige Eingabe für Hostname', 'invalid input for ike lifetime' => 'Ungültige Eingabe für IKE Lebensdauer', +'invalid input for inactivity timeout' => 'Ungültige Eingabe für Inaktivitätstimeout', 'invalid input for keepalive 1' => 'Ungültige Eingabe für Keepalive ping', 'invalid input for keepalive 1:2' => 'Ungültige Eingabe für Keepalive (mindestens ein Verhältnis von 1:2)', 'invalid input for keepalive 2' => 'Ungültige Eingabe für Keepalive ping-restart', @@ -2207,6 +2210,7 @@ 'telephone not set' => 'Telefonnummer nicht angegeben.', 'template' => 'Vorlage', 'template warning' => 'Zur Einrichtung von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Entweder Sie wählen speichern und erstellen Klassen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.', +'ten minutes' => '10 Minuten', 'test' => 'test', 'test email could not be sent' => 'Könnte Test-E-Mail nicht senden', 'test email was sent' => 'Test-E-Mail wurde erfolgreich versand', @@ -2216,6 +2220,7 @@ 'there are updates' => 'Für Ihr System sind Updates verfügbar. Im Abschnitt "Updates" erhalten Sie weitere Informationen dazu.', 'there are updates available' => 'Für Ihr System sind Programm-Updates verfügbar. Es wird dringend empfohlen, daß Sie Ihr System baldmöglichst aktualisieren.', 'there was no file upload' => 'Es wurde keine Datei hochgeladen', +'thirty minutes' => '30 Minuten', 'this feature has been sponsored by' => 'Diese Funktion wurde gesponsort von', 'this is not a valid archive' => 'Dies ist kein gültiges Archiv.', 'this is not an authorised update' => 'Dies ist kein autorisiertes Update.', @@ -2683,6 +2688,7 @@ 'vpn connecting' => 'VERBINDUNGSAUFBAU', 'vpn delayed start' => 'Verzögerung, bevor VPN gestartet wird (in Sekunden)', 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.', +'vpn inactivity timeout' => 'Inaktivitätstimeout', 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig', 'vpn keyexchange' => 'Schlüsseltausch', 'vpn local id' => 'Lokale ID', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 44696f8d6..3940d7b7c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1011,6 +1011,7 @@ 'false min bandwith' => 'Minimum bandwith is false.', 'february' => 'February', 'fetch ip from' => 'Guess the real public IP with help of an external server', +'fifteen minutes' => '15 Minutes', 'filename' => 'Filename', 'filesystem full' => 'Filesystem full', 'fireinfo ipfire version' => 'IPFire version', @@ -1049,6 +1050,7 @@ 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', 'first' => 'First', +'five minutes' => '5 Minutes', 'fixed ip lease added' => 'Fixed IP lease added', 'fixed ip lease modified' => 'Fixed IP lease modified', 'fixed ip lease removed' => 'Fixed IP lease removed', @@ -1419,6 +1421,7 @@ 'invalid input for esp keylife' => 'Invalid input for ESP Keylife', 'invalid input for hostname' => 'Invalid input for hostname.', 'invalid input for ike lifetime' => 'Invalid input for IKE lifetime', +'invalid input for inactivity timeout' => 'Invalid input for Inactivity Timeout', 'invalid input for keepalive 1' => 'Invalid input for Keepalive ping', 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2', 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart', @@ -2245,6 +2248,7 @@ 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', 'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.', +'ten minutes' => '10 Minutes', 'teovpn_fragment' => 'Fragmentsize', 'test' => 'test', 'test email could not be sent' => 'Could not sent Testemail', @@ -2255,6 +2259,7 @@ 'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.', 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.', 'there was no file upload' => 'There was no file upload.', +'thirty minutes' => '30 Minutes', 'this feature has been sponsored by' => 'This feature has been sponsored by', 'this is not a valid archive' => 'This is not a valid archive.', 'this is not an authorised update' => 'This is not an authorised update.', @@ -2728,6 +2733,7 @@ 'vpn delayed start' => 'Delay before launching VPN (seconds)', 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.', 'vpn force mobike' => 'Force using MOBIKE (only IKEv2)', +'vpn inactivity timeout' => 'Inactivity Timeout', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed', 'vpn keyexchange' => 'Keyexchange', 'vpn local id' => 'Local ID', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7da47c3ef983cfb5eaa63b114256e3fa0c548667
by git＠ipfire.org 02 Dec '17

02 Dec '17

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 <michael.tremer(a)ipfire.org> Date: Sat Dec 2 12:25:09 2017 +0000 core117: Ship updated CGI files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ea4620fc4abefc4e8c06e2f0f01c10cc4e45e554 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Wed Nov 15 23:10:43 2017 +0100 display GeoIP information on active network connections 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 <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b5a17bf949c3b97f3fa65a01642f5f78a6ababc Author: Peter Müller <peter.mueller(a)link38.eu> Date: Wed Nov 15 22:56:36 2017 +0100 display GeoIP information on ipinfo.cgi Display GeoIP information on ipinfo.cgi and use newly implemented function in /var/ipfire/geoip-functions.pl . Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e5efd998931720b8f347a9b0fcee30b463a1d442 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 2 12:23:39 2017 +0000 core117: Ship updated sudo package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 68a7683a35f3304a1eee0b2084d2f78012c64501 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Nov 29 18:16:46 2017 +0100 mc: Update to 4.8.20 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3951a1135f280f0881c1d54f4a66653b5e44b57d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Dec 2 10:10:23 2017 +0100 sudo: Fix for lfs-file (Typo) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c26966bf7171d4bec5e94a68f47cb03a76b722e0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Dec 2 10:16:39 2017 +0100 nano: Update to 2.9.1 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 421ba804aab8244c0b294d96f41042797f32bd4f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 2 12:22:00 2017 +0000 Drop separate ffmpeg-libs package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/117/filelists/files | 2 + .../{oldcore/112 => 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 => 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/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 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/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/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"; 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,10 +412,16 @@ 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'} </th> @@ -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> 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 . " <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"); 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 <info(a)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) 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 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 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) 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51
by git＠ipfire.org 01 Dec '17

01 Dec '17

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 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51 (commit) via 63bc6600f863dc81b12277cc21ae3541e262f6c2 (commit) via 7dede5abef3fd1eaf84bb03aa7bf3c27fdadfc98 (commit) from 14d0e151b62aa5c2c1638c4ca357a26f50f786c4 (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 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 1 16:31:25 2017 +0000 strip: Explicitely call right binaries Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 63bc6600f863dc81b12277cc21ae3541e262f6c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 1 15:41:15 2017 +0000 ffmpeg: Update to 3.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7dede5abef3fd1eaf84bb03aa7bf3c27fdadfc98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 30 17:01:24 2017 +0000 nasm: Update to 2.13.02 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ffmpeg | 35 ++++++++++++++++++++++++++--------- lfs/cleanup-toolchain | 3 --- lfs/ffmpeg | 24 +++++++++++++----------- lfs/nasm | 4 ++-- lfs/strip | 11 ++++++++++- make.sh | 1 + 6 files changed, 52 insertions(+), 26 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 7fc5e1494..75187a873 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -32,6 +32,9 @@ usr/bin/ffserver #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h #usr/include/libavformat/version.h +#usr/include/libavresample +#usr/include/libavresample/avresample.h +#usr/include/libavresample/version.h #usr/include/libavutil #usr/include/libavutil/adler32.h #usr/include/libavutil/aes.h @@ -67,10 +70,13 @@ usr/bin/ffserver #usr/include/libavutil/hmac.h #usr/include/libavutil/hwcontext.h #usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_d3d11va.h +#usr/include/libavutil/hwcontext_drm.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/hwcontext_videotoolbox.h #usr/include/libavutil/imgutils.h #usr/include/libavutil/intfloat.h #usr/include/libavutil/intreadwrite.h @@ -97,6 +103,7 @@ usr/bin/ffserver #usr/include/libavutil/samplefmt.h #usr/include/libavutil/sha.h #usr/include/libavutil/sha512.h +#usr/include/libavutil/spherical.h #usr/include/libavutil/stereo3d.h #usr/include/libavutil/tea.h #usr/include/libavutil/threadmessage.h @@ -119,39 +126,44 @@ usr/bin/ffserver #usr/lib/libavcodec.a #usr/lib/libavcodec.so #usr/lib/libavcodec.so.57 -#usr/lib/libavcodec.so.57.64.101 +usr/lib/libavcodec.so.57.107.100 #usr/lib/libavdevice.a #usr/lib/libavdevice.so #usr/lib/libavdevice.so.57 -#usr/lib/libavdevice.so.57.1.100 +usr/lib/libavdevice.so.57.10.100 #usr/lib/libavfilter.a #usr/lib/libavfilter.so #usr/lib/libavfilter.so.6 -#usr/lib/libavfilter.so.6.65.100 +usr/lib/libavfilter.so.6.107.100 #usr/lib/libavformat.a #usr/lib/libavformat.so #usr/lib/libavformat.so.57 -#usr/lib/libavformat.so.57.56.101 +usr/lib/libavformat.so.57.83.100 +#usr/lib/libavresample.a +#usr/lib/libavresample.so +usr/lib/libavresample.so.3 +usr/lib/libavresample.so.3.7.0 #usr/lib/libavutil.a #usr/lib/libavutil.so #usr/lib/libavutil.so.55 -#usr/lib/libavutil.so.55.34.101 +usr/lib/libavutil.so.55.78.100 #usr/lib/libpostproc.a #usr/lib/libpostproc.so #usr/lib/libpostproc.so.54 -#usr/lib/libpostproc.so.54.1.100 +usr/lib/libpostproc.so.54.7.100 #usr/lib/libswresample.a #usr/lib/libswresample.so #usr/lib/libswresample.so.2 -#usr/lib/libswresample.so.2.3.100 +usr/lib/libswresample.so.2.9.100 #usr/lib/libswscale.a #usr/lib/libswscale.so #usr/lib/libswscale.so.4 -#usr/lib/libswscale.so.4.2.100 +usr/lib/libswscale.so.4.8.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc #usr/lib/pkgconfig/libavfilter.pc #usr/lib/pkgconfig/libavformat.pc +#usr/lib/pkgconfig/libavresample.pc #usr/lib/pkgconfig/libavutil.pc #usr/lib/pkgconfig/libpostproc.pc #usr/lib/pkgconfig/libswresample.pc @@ -184,6 +196,7 @@ usr/bin/ffserver #usr/share/doc/ffmpeg/libavutil.html #usr/share/doc/ffmpeg/libswresample.html #usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/mailing-list-faq.html #usr/share/doc/ffmpeg/nut.html #usr/share/doc/ffmpeg/platform.html #usr/share/ffmpeg @@ -192,13 +205,17 @@ usr/bin/ffserver #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/decode_audio.c +#usr/share/ffmpeg/examples/decode_video.c #usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/encode_audio.c +#usr/share/ffmpeg/examples/encode_video.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/hw_decode.c #usr/share/ffmpeg/examples/metadata.c #usr/share/ffmpeg/examples/muxing.c #usr/share/ffmpeg/examples/qsvdec.c diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index 1c1fa8a50..436c7dd52 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -64,9 +64,6 @@ ifeq "$(TOOLCHAIN)" "1" # Remove man and info pages. rm -rfv $(TOOLS_DIR)/{,share}/{info,man} - # Strip all binaries. - STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper $(TOOLS_DIR)/ - # Fix ownership of the toolchain. chown -R root:root $(TOOLS_DIR)/ diff --git a/lfs/ffmpeg b/lfs/ffmpeg index cd9e8b61f..d0dceec4b 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -24,14 +24,15 @@ include Config -VER = 3.2.4 +VER = 3.4 + THISAPP = ffmpeg-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 6 +PAK_VER = 7 DEPS = "ffmpeg-libs sdl lame libvorbis xvid" @@ -43,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39fd71024ac76ba35f04397021af5606 +$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911 install : $(TARGET) @@ -76,13 +77,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --enable-shared \ - --enable-postproc \ - --enable-pthreads \ - --enable-gpl - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ + --enable-gpl \ + --enable-version3 \ + --enable-avfilter \ + --enable-avresample + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-libs @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nasm b/lfs/nasm index b77e7cbfd..6eb34f101 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -24,7 +24,7 @@ include Config -VER = 2.11.06 +VER = 2.13.02 THISAPP = nasm-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2b958e9f5d200641e6fc9564977aecc5 +$(DL_FILE)_MD5 = abb79a82fa30908217e30f76eca8a557 install : $(TARGET) diff --git a/lfs/strip b/lfs/strip index 9fbdf7627..084082e7b 100644 --- a/lfs/strip +++ b/lfs/strip @@ -29,6 +29,15 @@ VER = ipfire THISAPP = strip TARGET = $(DIR_INFO)/$(THISAPP) +ifeq "$(TOOLCHAIN)" "1" + SHELL = /bin/bash + STRIP = /usr/bin/strip + ROOT = $(TOOLS_DIR) +else + SHELL = $(TOOLS_DIR)/bin/bash + STRIP = $(TOOLS_DIR)/bin/strip +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -49,6 +58,6 @@ $(TARGET) : # Don't strip VDR binaries, because they use a weird plugin system # which does not work when unneeded symbols get stripped from # /usr/sbin/vdr. - $(DIR_SRC)/src/stripper $(ROOT) \ + STRIP=$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper $(ROOT) \ --exclude=/usr/src --exclude=$(TOOLS_DIR) \ --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr diff --git a/make.sh b/make.sh index 87125c0de..bb80f3c05 100755 --- a/make.sh +++ b/make.sh @@ -947,6 +947,7 @@ buildtoolchain() { lfsmake1 texinfo lfsmake1 xz lfsmake1 fake-environ + lfsmake1 strip lfsmake1 cleanup-toolchain } hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2017