Merge remote-tracking branch 'origin/next' into kernel-4.14

diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index 4a5e674ecf69d3848bcdc766450a0ea4e2621348..9906b1542cc7a69efdfe7faeec0b590e5696b61a 100644 (file)
--- 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/config/rootfiles/core/117/filelists/i586/openssl-sse2 b/config/rootfiles/core/117/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/core/117/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file

diff --git a/config/rootfiles/core/117/filelists/openssl b/config/rootfiles/core/117/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/117/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file

diff --git a/doc/language_issues.es b/doc/language_issues.es
index f030fdaa09b6dd1345c54e81bc84325f900d2bb3..6df32415922df033c426ad810e68583fcaaf13c9 100644 (file)
--- 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 2c5fc31d6371f0165aa21e6ad29e19f2ddb9e08c..f8360f3b625353ca14149806707afa1ce3977f1d 100644 (file)
--- 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 805bc1209fc7174a9ac073b73a2c801e9b815fef..abd7da4a0b6ffd37cfa5d0c89efc4247ba41c9f7 100644 (file)
--- 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 65670849e20998dc0ec4abc0aec9d891557900c7..005fdcd851e21fff7b3fb53d0bb0b1c9afc7d516 100644 (file)
--- 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 f030fdaa09b6dd1345c54e81bc84325f900d2bb3..6df32415922df033c426ad810e68583fcaaf13c9 100644 (file)
--- 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 68e7b9384d3bb89f0df046c0c16df9d15718b331..2b4c9385d5b1e621b63d26331a608aa9f78e0d4d 100644 (file)
--- 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 b4f62790311629579b9877146a0f5e5efc98a904..a6aa99f90034ae15c0b86c513bc64cac45b72172 100644 (file)
--- 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 383c36ca6e220fb180d65b4ca56363a3c0178dab..c9b3b455d4bb1cdb28f8c23f6f487798cc409e08 100644 (file)
--- 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 ceb88c1569d07e6190a99f7fb0dcae67712163a2..b43f91f6bbdb93d3cee910969313c0488e2d4128 100644 (file)
--- 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 d6f6ecb33a91294ec43a3db562983edcb5458f95..be6eb6d157930a957aef077406c05d11776f8a45 100644 (file)
--- 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 f87071db7add02b4580154f725ad3f3089cc08fc..fd9355f7a65edbe7956a8eca91a0a9aed2b18b7a 100644 (file)
--- 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 44696f8d61abdc16cfa8678f24f942d2aa895dee..3940d7b7c776c7dcda238d1b0951c8a4fbcf1c19 100644 (file)
--- 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',

diff --git a/lfs/autoconf b/lfs/autoconf
index 9c58e20cc623973a3008d35a961b79b6d338d102..7e622da86cb41081fb22ab55c2303b30ff043c80 100644 (file)
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -69,7 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/automake b/lfs/automake
index 15bdad1e5e866d435813cdb139826fc1d56aefe4..0b3d9cce89574512855e5a9c033bd163d69a275d 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -81,8 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
-                       --docdir=/usr/share/doc/automake-1.15
+       cd $(DIR_APP) && ./configure \
+               --prefix=$(PREFIX) \
+               --docdir=/usr/share/doc/automake-1.15
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 73f73e18c74f3ade36b56cdb1bb4a54e405523db..7dea649a36ad314b2491cf40cb3ec871b6eb9dae 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
-                               --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
-                               --with-auth=unix --with-perl --with-sasl --with-idle=idled \
-                               --with-syslogfacility=MAIL --enable-listext --without-snmp \
-                               --enable-autocreate --enable-idled
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --with-service-path=/usr/lib/cyrus \
+               --with-cyrus-prefix=/usr/lib/cyrus \
+               --sysconfdir=/var/ipfire/cyrusimap \
+               --with-perl \
+               --with-sasl \
+               --with-syslogfacility=MAIL \
+               --without-snmp \
+               --enable-autocreate \
+               --enable-idled
+
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        -mkdir /var/imap

diff --git a/lfs/dhcp b/lfs/dhcp
index 4c613a7d8b624be215e237fab9197d3240b60406..262a25129c31ebff2e6f8d9171e7753b28cf0c08 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -107,7 +107,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --prefix=/usr \
                        --sysconfdir=/etc/dhcp \
                        --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-                       --disable-static \
                        --enable-paranoia \
                        --enable-early-chroot \
                        --disable-dhcpv6

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 90e28ac077551caf4fc83ed02be535d0faa744f6..8e265c1e25703c47fefb347e5cf5a18a898f2200 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -76,8 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --prefix=/usr \
                        --with-root-prefix="" \
                        --enable-elf-shlibs \
-                       --disable-evms \
                        --disable-nls
+
        cd $(DIR_APP)/build && make $(MAKETUNING)
        cd $(DIR_APP)/build && make install
        cd $(DIR_APP)/build && make install-libs

diff --git a/lfs/expat b/lfs/expat
index aa9759094e9cf2c0c005ee0b4618303a4f8a3538..5bb22ec27063ddee600c0c1c3030b14e96008522 100644 (file)
--- a/lfs/expat
+++ b/lfs/expat
@@ -70,7 +70,9 @@ $(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 --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)

diff --git a/lfs/faad2 b/lfs/faad2
index bd258f79ab4d8f9f01642a417f17e81adaa3a652..7cadb9aef6a135fa4257fe23feee6da8e580359f 100644 (file)
--- a/lfs/faad2
+++ b/lfs/faad2
@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-shared
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/fcron b/lfs/fcron
index 5cc2cd62aafa78bdf3fdea9c9e13e7feaeb19e58..b548c1310554c0ab29574b6741f25e6db3103528 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -70,22 +70,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure    \
-           --prefix=/usr                       \
-           --disable-nls                       \
-           --without-sendmail          \
-           --with-spooldir=/var/spool/cron     \
-           --with-fifodir=/var/run             \
-           --with-piddir=/var/run              \
-           --sysconfdir=/etc                   \
-           --with-username=cron                \
-           --with-groupname=cron               \
-           --with-run-non-privileged=no        \
-           --with-fcrondyn=no          \
-           --with-sysfcrontab=no               \
-           --with-boot-install=no              \
-           --with-pam=no                       \
-           --with-selinux=no
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --without-sendmail \
+               --with-spooldir=/var/spool/cron \
+               --with-fifodir=/var/run \
+               --with-piddir=/var/run \
+               --sysconfdir=/etc \
+               --with-username=cron \
+               --with-groupname=cron \
+               --with-run-non-privileged=no \
+               --with-fcrondyn=no \
+               --with-sysfcrontab=no \
+               --with-boot-install=no \
+               --with-pam=no \
+               --with-selinux=no
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        echo "root" > /etc/fcron.allow

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 77258a0ed90bc70010138e440524f435bb010fbb..258e29b7b9e6cb41d4db6c963a26aaf5ff21e629 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-version3 \
                --enable-avfilter \
                --enable-avresample
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/fuse b/lfs/fuse
index 2639156b2196ed11bd87a1528e2677a36d845cfe..275647252b0772cda6657c05287a2ab5e21937ce 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -74,7 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
+       cd $(DIR_APP) && ./configure \
+       --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/ghostscript b/lfs/ghostscript
index 7ee1ce4e4a9648090b0a00706725cfa2a8b25f85..6d297dabcc1041740dacc1aadd8f1ad58ba9712f 100644 (file)
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
-                       --with-system-libtiff \
-                       --with-install-cups
+                       --with-system-libtiff
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/lfs/gmp b/lfs/gmp
index 8dc9b73509cd69cc28dd775ef5f2b93ea591d146..4d55e4f76253c29e675e6a8cfdf17a42ae6890ab 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -39,9 +39,7 @@ endif
 
 CONFIGURE_OPTIONS = \
        --prefix=/usr \
-       --enable-cxx \
-       --enable-mpbsd \
-       --disable-nls
+       --enable-cxx
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/groff b/lfs/groff
index a0bb0bd3f9edef46c6d065bd2dcc45fea11e2bef..e4c293bb703d6ddf0ac3d8fc51cea2dcfc46805c 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
+       cd $(DIR_APP) && PAGE=A4 ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        ln -svf eqn /usr/bin/geqn

diff --git a/lfs/gzip b/lfs/gzip
index 12fae78e9436641a914540f7d5bd88a5750b53ff..233c6ce4070a1f21b06053148f6dd4cf3f6f38a8 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -35,10 +35,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
+  EXTRA_CONFIG = --prefix=/usr --bindir=/bin
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################

diff --git a/lfs/kmod b/lfs/kmod
index dc2dc10b883d73d3d4194f579c4c2c8ae6e65390..8e0bb0d53d5165b07ce0c0c0a0e75e13f397a00a 100644 (file)
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --prefix=/usr \
                --bindir=/bin \
                --sysconfdir=/etc \
-               --enable-zlib \
                --disable-manpages
 
 #              --libdir=/lib \

diff --git a/lfs/less b/lfs/less
index 3a35483387e582415e890e3b2317b79f5e169550..10528d866549dad51e94fd825241b3651eea4169 100644 (file)
--- a/lfs/less
+++ b/lfs/less
@@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
index 4166d52c7251cb8b0c64409fa4b3cd0b127be222..0e712d0c2394c63a58ff0b5b9980883bdb365665 100644 (file)
--- a/lfs/libjpeg-compat
+++ b/lfs/libjpeg-compat
@@ -72,7 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-static \
+               --enable-shared
+
        cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/

diff --git a/lfs/libmpeg2 b/lfs/libmpeg2
index 6d664c9f0c20a6a6dee6d699df7bb2721aab6574..488a597378cebfda00266941c078fca18af2c039 100644 (file)
--- a/lfs/libmpeg2
+++ b/lfs/libmpeg2
@@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared \
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-shared \
                --disable-accel-detect
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libtool b/lfs/libtool
index 01721450553d5d88009ba56b80458e8134361263..d7e9a155585554dc9bd990bdc15d21a18d32d471 100644 (file)
--- a/lfs/libtool
+++ b/lfs/libtool
@@ -75,7 +75,9 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libupnp b/lfs/libupnp
index 3f8d2b549819f4d55c60189ad10842fc5802da4f..18f5e6d8a0f5f9e5731ac661d2cb53ab372b2af6 100644 (file)
--- a/lfs/libupnp
+++ b/lfs/libupnp
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libusb b/lfs/libusb
index f557bd8be7d0a15e2fa98fb0eb1efc6a5b07f7a1..f7fc12420f0b4dc46b500f0bffe1603f32ca17c4 100644 (file)
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules

diff --git a/lfs/m4 b/lfs/m4
index 3864d42158f97eecf9ad4c0f9c0bb120935da348..5bb8604442527f52b045183cc6ccfd6390658aa7 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -35,12 +35,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
+  EXTRA_MAKE =
 endif
 
 ###############################################################################

diff --git a/lfs/mpfr b/lfs/mpfr
index f729b8fe2f672c4c71c0c3681be2473bf7191071..cb5a29b101b9b2bf6fdd1caf4c616b98479c7fec 100644 (file)
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-                       --enable-thread-safe --disable-nls
+               --enable-thread-safe
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/nasm b/lfs/nasm
index 6eb34f101bcaa1817be8683d0cedd8294cdb7d97..5968dce7299c27d112300a13608d303615649649 100644 (file)
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -70,7 +70,9 @@ $(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 --disable-nls
+       cd $(DIR_APP) && ./configure \
+       --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/openssh b/lfs/openssh
index 56ac55a9602480eb0b19d8fa364315c29344d45f..20a5dc1156d34f1a3dc47a27c01512c3d2499e76 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -71,29 +71,33 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
-                   --libexecdir=/usr/lib/openssh --with-md5-passwords \
-                   --with-privsep-path=/var/empty --disable-nls \
-                   --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc/ssh \
+               --libexecdir=/usr/lib/openssh \
+               --with-md5-passwords \
+               --with-privsep-path=/var/empty \
+               --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        sed -i -e 's/^#\?Port .*$$/Port 222/' \
-           -e 's/^#\?Protocol .*$$/Protocol 2/' \
-           -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-           -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
-           -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
-           -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
-           -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
-           -e 's/^#\?UsePAM .*$$//' \
-           -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
-           -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
-           -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-           -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
-           -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
-           /etc/ssh/sshd_config
+               -e 's/^#\?Protocol .*$$/Protocol 2/' \
+               -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
+               -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
+               -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
+               -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
+               -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
+               -e 's/^#\?UsePAM .*$$//' \
+               -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+               -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+               -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
+               -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+               -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
+               /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/openssl b/lfs/openssl
index 8782e1e05bdc4c75c0ffd282d84ac362f0939a15..6050768ecc58831b2378f6dc737f7909a5ab641d 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2m
+VER        = 1.0.2n
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 10e9e37f492094b9ef296f68f24a7666
+$(DL_FILE)_MD5 = 13bdc1b1d1ff39b6fd42a255e74676a4
 
 install : $(TARGET)
 

diff --git a/lfs/openvmtools b/lfs/openvmtools
index 1cf9427fe2bddf42f439c27cd574db6d232e120f..b5b1fefa21ce9e09302bb6729f61067496b45acc 100644 (file)
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -81,13 +81,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
        cd $(DIR_APP) && autoreconf -vfi
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-          --with-kernel-release=$(KVER)-ipfire --without-pam \
-          --disable-unity --without-gtk2 --without-gtkmm \
-          --without-procps --without-icu \
-          --without-x --with-linuxdir=/usr/src/linux \
-          --without-kernel-modules --disable-deploypkg \
-          --without-xerces-c --without-xerces
+
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --with-kernel-release=$(KVER)-ipfire \
+               --without-pam \
+               --without-gtk2 \
+               --without-gtkmm \
+               --without-procps \
+               --without-icu \
+               --without-x \
+               --with-linuxdir=/usr/src/linux \
+               --without-kernel-modules \
+               --disable-deploypkg \
+               --without-xerces
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        #install initscripts

diff --git a/lfs/patch b/lfs/patch
index c938ac8faacec50f96c1422722b77cf513a74844..065314d51b5a8e0a9fbb038ec22678affa9ecbd7 100644 (file)
--- a/lfs/patch
+++ b/lfs/patch
@@ -35,14 +35,14 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
   EXTRA_MAKE =
-  EXTRA_INSTALL = 
+  EXTRA_INSTALL =
 endif
 
 ###############################################################################

diff --git a/lfs/python b/lfs/python
index 14ccb690c9e3111b0206759cc9c99cbd07169710..70299852c02a94d6a323fda1b9cbbec06fa3cac5 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-               --prefix=/usr --enable-shared --with-system-ffi
+               --prefix=/usr \
+               --enable-shared \
+               --with-system-ffi
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/python3 b/lfs/python3
index 0fe493ba97d86f2fda76ca87d11a0c5e813a7d25..e753d96ab23dcd889487871d1c5de3819db5918d 100644 (file)
--- a/lfs/python3
+++ b/lfs/python3
@@ -79,7 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-               --prefix=/usr --enable-shared --with-system-ffi
+               --prefix=/usr \
+               --enable-shared \
+               --with-system-ffi
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/rpcbind b/lfs/rpcbind
index 046121f362733fc7f722f80f365dbe567fddc972..c1b696de7936a2b28134e2c81111a64417a43cb6 100644 (file)
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -79,7 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --bindir=/sbin \
+               --with-rpcuser=root \
+               --without-systemdsystemunitdir
+
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        #install initscripts

diff --git a/lfs/shadow b/lfs/shadow
index c445dd362f5794f4e1f16cd6230ef8aaee7be29c..30000bfa1957d64cf8dee402920087ffeb31f33c 100644 (file)
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -71,12 +71,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
-       cd $(DIR_APP) && ./configure --libdir=/lib      \
-                               --sysconfdir=/etc       \
-                               --enable-shared         \
-                               --without-selinux       \
-                               --disable-nls           \
-                               --with-group-name-max-length=32
+       cd $(DIR_APP) && ./configure \
+               --libdir=/lib \
+               --sysconfdir=/etc \
+               --enable-shared \
+               --without-selinux \
+               --disable-nls \
+               --with-group-name-max-length=32
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/lfs/strip b/lfs/strip
index 084082e7b17ded779b8c58f78cd8b906787ed553..b22cfb9a357fc8885397a63d0e6c7e39ad64c845 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -36,6 +36,7 @@ ifeq "$(TOOLCHAIN)" "1"
 else
        SHELL = $(TOOLS_DIR)/bin/bash
        STRIP = $(TOOLS_DIR)/bin/strip
+       ROOT = /
 endif
 
 ###############################################################################

diff --git a/lfs/taglib b/lfs/taglib
index eec6e97e900f8532262af3c4a03a8691ffc2223b..058a15542398ff6a5f821cc1f8638775b1164669 100644 (file)
--- a/lfs/taglib
+++ b/lfs/taglib
@@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/tcl b/lfs/tcl
index 7762a1dc8f30984c3e50258262cdd796ef32a450..fb464dca350ae5791e110611557163acd33af3d5 100644 (file)
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -76,9 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifneq "$(ROOT)" ""
-       cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) --disable-nls
+       cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
 else
-       cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP)/unix && ./configure --prefix=/usr
 endif
        cd $(DIR_APP)/unix && make $(MAKETUNING)
        cd $(DIR_APP)/unix && make install

diff --git a/make.sh b/make.sh
index e3f32b73741f40927c0d6b8599bb090586093dbe..5647ecb97c7937416d106240540cdf32826883ca 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -217,6 +217,12 @@ configure_build() {
                        parallelism=${cpu_max}
                fi
 
+               # limit to -j23 because perl will not build
+               # more
+               if [ ${parallelism} -gt 23 ]; then
+                       parallelism=23
+               fi
+
                MAKETUNING="-j${parallelism}"
        fi
 }
@@ -627,7 +633,7 @@ lfsmake2() {
        local PS1='\u:\w$ '
 
        enterchroot \
-               bash -x -c "cd /usr/src/lfs && \
+               ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
                        MAKETUNING=${MAKETUNING} \
                        make -f $* \
                        LFS_BASEDIR=/usr/src install" \
@@ -1526,7 +1532,8 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake1 strip
+  # use toolchain bash for chroot to strip
+  EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip
 }
 
 buildpackages() {

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index cfb7e51175f30a7ffb790ade89a7ae5a19bc38f9..5fe4cc4e66d0082bd1bdc09c78a73b0f6a9bae91 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -904,7 +904,7 @@ sub checkcryptodb {
        logger("CRYPTO INFO: Checking GnuPG Database");
        my $ret = system("gpg --list-keys | grep -q $myid");
        unless ( "$ret" eq "0" ) {
-               message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
+               message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this.");
                message("CRYPTO WARN: It's normal to see this on first execution.");
                message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
                my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";