[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 488c7e7e31d52387609a3ee8b29015158d7ecaf3
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 488c7e7e31d52387609a3ee8b29015158d7ecaf3 (commit) via 42661bf875f609f13e0757a9838a70d07aa57269 (commit) via 8c31790a2f706ff05471e864ecde7853fec0cb3a (commit) via b4b62a341450b085fd95b4f5f8ce4da09bec4327 (commit) via e467a2f274cdff830b5d3646ed9c9ac5a117940d (commit) via fdfddd64620ea6fcb109f50633c304f14a354b4d (commit) via 70ba2380d3088a4384abd25893d2d93828b627b0 (commit) via 3f9ecfdc27263ed0c419a3500112411f5c07b08c (commit) via a0ab2f880e9dd8809b327b9245fb36cd7cb9b67e (commit) via 12b0a9da205108e5ce706913ff4c9553e58284f9 (commit) via 844e542e60d0f1b01546a1e81d5b35b96ce9eba1 (commit) via c335b0cd8edb800795cf1b4422043ef3c24a036b (commit) via 0628d956a7cc1d952b236494de0559cbea52c0ff (commit) via f2c94780088c6b172e63493705906142dbad0727 (commit) via 19f0fa5694d9224c128ff362673c42e9b169351c (commit) via 2a77d2a2cee7a04d8bb1af541afd58ab7cf82810 (commit) via aa6ee515c59cd42b12d69981329a2438e4d6e933 (commit) via d1f180f88eff7114625d619f99b6b569f9db8549 (commit) via d93a23ae847df6ec122c125ca92e0e9af5d63d45 (commit) via 352fc2e9a51d1563df57551472f812692c7f4ea0 (commit) via d191cd7e76fa390df808352b94235474c134a015 (commit) via ca52b1895f2ff316317b3cf71f2bd6f55520ef74 (commit) via d986a632cb9a9f77eeaf8f39f0baee4e5b668b08 (commit) via 621dcd8609a26ffe98fcb7fff05202bf5eb41112 (commit) via 67d99eeda887a625da2fa7dc43c89098478a14bf (commit) via 32d805980e0a92daeecea46ae138417ab5a4b3df (commit) via 11685f787310168d7fa8beb581da161718fcc873 (commit) via be3d3959d2e7ee03caf40e37993d6a815f8829bf (commit) via ba2247a4b27afc5ae6985a61c65e20dda1a73454 (commit) via 2709b42dc4fa904d6103c30a18ba27df2ed84bc7 (commit) from 59b2133892ca3592da4aaa92e57bb38ba924191b (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 488c7e7e31d52387609a3ee8b29015158d7ecaf3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 18 11:55:20 2017 +0100
core111: Ship updated cpio
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 42661bf875f609f13e0757a9838a70d07aa57269 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Apr 25 11:13:04 2017 +0200
cpio: Update to 2.12
FTBFS on aarch64
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c31790a2f706ff05471e864ecde7853fec0cb3a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 13 19:16:25 2017 +0200
ccache: Cleanup makefile
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b4b62a341450b085fd95b4f5f8ce4da09bec4327 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 13 19:02:21 2017 +0200
make.sh: Set TOOLCHAIN=1 in toolchain stage
This allows better lfs files and fewer ifdefs in toolchain stage.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e467a2f274cdff830b5d3646ed9c9ac5a117940d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 13 19:01:28 2017 +0200
make.sh: Adjust toolchain PATH in lfsmake1 instead of globally
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fdfddd64620ea6fcb109f50633c304f14a354b4d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 8 12:12:42 2017 +0200
kernel headers: Install correct headers for all architectures
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 70ba2380d3088a4384abd25893d2d93828b627b0 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 12 11:38:42 2017 +0200
fake-environ: Fix typos
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3f9ecfdc27263ed0c419a3500112411f5c07b08c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 5 14:10:36 2017 +0200
make.sh: Show last lines of log when build aborts
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a0ab2f880e9dd8809b327b9245fb36cd7cb9b67e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 18 11:47:07 2017 +0100
Start Core Update 111
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 12b0a9da205108e5ce706913ff4c9553e58284f9 Merge: 844e542 2a77d2a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 18 11:24:41 2017 +0100
Merge remote-tracking branch 'origin/master' into next
commit 844e542e60d0f1b01546a1e81d5b35b96ce9eba1 Merge: 59b2133 c335b0c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 18 11:22:20 2017 +0100
Merge remote-tracking branch 'ms/wlanclient' into next
commit c335b0cd8edb800795cf1b4422043ef3c24a036b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 16 16:02:25 2017 +0200
index.cgi: Show WiFi properties on front page
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0628d956a7cc1d952b236494de0559cbea52c0ff Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 16 15:05:25 2017 +0200
WiFi: Show EAP status on wireless client page
This patch adds some status information so that we know what authentication an access point is using.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f2c94780088c6b172e63493705906142dbad0727 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 5 11:31:36 2017 +0100
wlan client: Generate wpa_supplicant configuration file for EAP
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 19f0fa5694d9224c128ff362673c42e9b169351c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 5 11:17:06 2017 +0100
wlan client: Allow configuration of EAP-PEAP and EAP-TTLS on web user interface
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/network-functions.pl | 59 ++++++++ config/httpd/server-tuning.conf | 2 +- config/rootfiles/common/attr | 8 +- config/rootfiles/core/110/filelists/files | 2 + config/rootfiles/core/110/update.sh | 3 + config/rootfiles/core/{110 => 111}/exclude | 0 .../100 => core/111}/filelists/armv5tel/gcc | 0 .../101 => core/111}/filelists/armv5tel/gmp | 0 config/rootfiles/core/{110 => 111}/filelists/bind | 0 .../{oldcore/103 => core/111}/filelists/coreutils | 0 .../{oldcore/44 => core/111}/filelists/cpio | 0 .../{oldcore/51 => core/111}/filelists/dhcp | 0 .../{oldcore/106 => core/111}/filelists/file | 0 config/rootfiles/core/111/filelists/files | 22 +++ config/rootfiles/core/111/filelists/gzip | 1 + .../{oldcore/100 => core/111}/filelists/i586/gcc | 0 .../{oldcore/101 => core/111}/filelists/i586/gmp | 0 .../111}/filelists/i586/strongswan-padlock | 0 .../{oldcore/93 => core/111}/filelists/libevent2 | 0 .../rootfiles/core/111/filelists/libevent2-compat | 1 + .../{oldcore/90 => core/111}/filelists/logrotate | 0 .../{oldcore/61 => core/111}/filelists/logwatch | 0 .../{oldcore/101 => core/111}/filelists/mpfr | 0 .../{oldcore/101 => core/111}/filelists/pcre | 0 .../{oldcore/47 => core/111}/filelists/php | 0 .../{oldcore/38 => core/111}/filelists/rrdtool | 0 .../core/{110 => 111}/filelists/strongswan | 0 .../rootfiles/core/{110 => 111}/filelists/unbound | 0 .../{oldcore/79 => core/111}/filelists/vnstat | 0 .../{oldcore/100 => core/111}/filelists/x86_64/gcc | 0 .../{oldcore/101 => core/111}/filelists/x86_64/gmp | 0 config/rootfiles/core/{110 => 111}/meta | 0 config/rootfiles/core/{110 => 111}/update.sh | 12 +- doc/language_issues.es | 16 ++ doc/language_issues.fr | 16 ++ doc/language_issues.it | 16 ++ doc/language_issues.nl | 16 ++ doc/language_issues.pl | 16 ++ doc/language_issues.ru | 16 ++ doc/language_issues.tr | 16 ++ doc/language_missings | 64 ++++++++ html/cgi-bin/index.cgi | 43 +++++- html/cgi-bin/wirelessclient.cgi | 166 +++++++++++++++++++-- langs/de/cgi-bin/de.pl | 16 ++ langs/en/cgi-bin/en.pl | 16 ++ lfs/ccache | 8 +- lfs/cpio | 4 +- lfs/linux | 18 ++- lfs/mpd | 7 +- lfs/openssh | 1 - make.sh | 3 - src/fake-environ/Makefile | 4 +- src/initscripts/system/wlanclient | 45 +++++- src/pakfire/lib/functions.pl | 47 +++--- tools/make-functions | 14 +- 55 files changed, 621 insertions(+), 57 deletions(-) copy config/rootfiles/core/{110 => 111}/exclude (100%) copy config/rootfiles/{oldcore/100 => core/111}/filelists/armv5tel/gcc (100%) copy config/rootfiles/{oldcore/101 => core/111}/filelists/armv5tel/gmp (100%) copy config/rootfiles/core/{110 => 111}/filelists/bind (100%) copy config/rootfiles/{oldcore/103 => core/111}/filelists/coreutils (100%) copy config/rootfiles/{oldcore/44 => core/111}/filelists/cpio (100%) copy config/rootfiles/{oldcore/51 => core/111}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/106 => core/111}/filelists/file (100%) create mode 100644 config/rootfiles/core/111/filelists/files create mode 120000 config/rootfiles/core/111/filelists/gzip copy config/rootfiles/{oldcore/100 => core/111}/filelists/i586/gcc (100%) copy config/rootfiles/{oldcore/101 => core/111}/filelists/i586/gmp (100%) copy config/rootfiles/{oldcore/106 => core/111}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/93 => core/111}/filelists/libevent2 (100%) create mode 120000 config/rootfiles/core/111/filelists/libevent2-compat copy config/rootfiles/{oldcore/90 => core/111}/filelists/logrotate (100%) copy config/rootfiles/{oldcore/61 => core/111}/filelists/logwatch (100%) copy config/rootfiles/{oldcore/101 => core/111}/filelists/mpfr (100%) copy config/rootfiles/{oldcore/101 => core/111}/filelists/pcre (100%) copy config/rootfiles/{oldcore/47 => core/111}/filelists/php (100%) copy config/rootfiles/{oldcore/38 => core/111}/filelists/rrdtool (100%) copy config/rootfiles/core/{110 => 111}/filelists/strongswan (100%) copy config/rootfiles/core/{110 => 111}/filelists/unbound (100%) copy config/rootfiles/{oldcore/79 => core/111}/filelists/vnstat (100%) copy config/rootfiles/{oldcore/100 => core/111}/filelists/x86_64/gcc (100%) copy config/rootfiles/{oldcore/101 => core/111}/filelists/x86_64/gmp (100%) copy config/rootfiles/core/{110 => 111}/meta (100%) copy config/rootfiles/core/{110 => 111}/update.sh (95%)
Difference in files: diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 5f53704..66f1ed5 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -315,6 +315,65 @@ sub setup_upstream_proxy() { } }
+my %wireless_status = (); + +sub _get_wireless_status($) { + my $intf = shift; + + if (!$wireless_status{$intf}) { + $wireless_status{$intf} = `iwconfig $intf`; + } + + return $wireless_status{$intf}; +} + +sub wifi_get_essid($) { + my $status = &_get_wireless_status(shift); + + my ($essid) = $status =~ /ESSID:"(.*)"/; + + return $essid; +} + +sub wifi_get_frequency($) { + my $status = &_get_wireless_status(shift); + + my ($frequency) = $status =~ /Frequency:(\d+.\d+ GHz)/; + + return $frequency; +} + +sub wifi_get_access_point($) { + my $status = &_get_wireless_status(shift); + + my ($access_point) = $status =~ /Access Point: ([0-9A-F:]+)/; + + return $access_point; +} + +sub wifi_get_bit_rate($) { + my $status = &_get_wireless_status(shift); + + my ($bit_rate) = $status =~ /Bit Rate=(\d+ [GM]b/s)/; + + return $bit_rate; +} + +sub wifi_get_link_quality($) { + my $status = &_get_wireless_status(shift); + + my ($cur, $max) = $status =~ /Link Quality=(\d+)/(\d+)/; + + return $cur * 100 / $max; +} + +sub wifi_get_signal_level($) { + my $status = &_get_wireless_status(shift); + + my ($signal_level) = $status =~ /Signal level=(-\d+ dBm)/; + + return $signal_level; +} 1;
# Remove the next line to enable the testsuite diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 8f1eae5..9041018 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -20,7 +20,7 @@ KeepAliveTimeout 15 MinSpareServers 1 MaxSpareServers 10 StartServers 2 -MaxClients 1000 +MaxClients 256
# # The following directives modify normal HTTP response behavior to diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index 6a594f7..6a3ed50 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -28,8 +28,12 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man1/attr.1 #usr/share/man/man1/getfattr.1 #usr/share/man/man1/setfattr.1 -#usr/share/man/man2/fgetxattr.2 -#usr/share/man/man2/fsetxattr.2 +#usr/share/man/man2/flistxattr.2 +#usr/share/man/man2/fremovexattr.2 +#usr/share/man/man2/getxattr.2 +#usr/share/man/man2/setxattr.2 +#usr/share/man/man2/llistxattr.2 +#usr/share/man/man2/lremovexattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files index 4a7d710..0664e7f 100644 --- a/config/rootfiles/core/110/filelists/files +++ b/config/rootfiles/core/110/filelists/files @@ -3,6 +3,7 @@ etc/issue etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/unbound etc/sysctl.conf +opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/entropy.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/index.cgi @@ -12,6 +13,7 @@ srv/web/ipfire/cgi-bin/system.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos/include/style.css srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css srv/web/ipfire/html/themes/maniac/include/style.css usr/lib/firewall/ipsec-block usr/lib/libssp.so.0 diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh index 84e0ddf..2011d4d 100644 --- a/config/rootfiles/core/110/update.sh +++ b/config/rootfiles/core/110/update.sh @@ -44,6 +44,9 @@ ldconfig # Update Language cache /usr/local/bin/update-lang-cache
+# Remove deprecated options +sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config + # Start services /etc/init.d/unbound start /etc/init.d/sshd restart diff --git a/config/rootfiles/core/111/exclude b/config/rootfiles/core/111/exclude new file mode 100644 index 0000000..d6fd053 --- /dev/null +++ b/config/rootfiles/core/111/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/111/filelists/armv5tel/gcc b/config/rootfiles/core/111/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/core/111/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/armv5tel/gmp b/config/rootfiles/core/111/filelists/armv5tel/gmp new file mode 120000 index 0000000..2bdf30d --- /dev/null +++ b/config/rootfiles/core/111/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/bind b/config/rootfiles/core/111/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/core/111/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/coreutils b/config/rootfiles/core/111/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/core/111/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/cpio b/config/rootfiles/core/111/filelists/cpio new file mode 120000 index 0000000..fbab21a --- /dev/null +++ b/config/rootfiles/core/111/filelists/cpio @@ -0,0 +1 @@ +../../../common/cpio \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/dhcp b/config/rootfiles/core/111/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/111/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/file b/config/rootfiles/core/111/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/111/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/files b/config/rootfiles/core/111/filelists/files new file mode 100644 index 0000000..dbe65e2 --- /dev/null +++ b/config/rootfiles/core/111/filelists/files @@ -0,0 +1,22 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/wlanclient +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ipinfo.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/html/images/back.png +usr/local/bin/getipstat +usr/local/bin/ipsecctrl +var/ipfire/langs +var/ipfire/graphs.pl +var/ipfire/network-functions.pl +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/111/filelists/gzip b/config/rootfiles/core/111/filelists/gzip new file mode 120000 index 0000000..aebcccd --- /dev/null +++ b/config/rootfiles/core/111/filelists/gzip @@ -0,0 +1 @@ +../../../common/gzip \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/gcc b/config/rootfiles/core/111/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/gmp b/config/rootfiles/core/111/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/strongswan-padlock b/config/rootfiles/core/111/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/libevent2 b/config/rootfiles/core/111/filelists/libevent2 new file mode 120000 index 0000000..42edc99 --- /dev/null +++ b/config/rootfiles/core/111/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/libevent2-compat b/config/rootfiles/core/111/filelists/libevent2-compat new file mode 120000 index 0000000..4ea809b --- /dev/null +++ b/config/rootfiles/core/111/filelists/libevent2-compat @@ -0,0 +1 @@ +../../../common/libevent2-compat \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/logrotate b/config/rootfiles/core/111/filelists/logrotate new file mode 120000 index 0000000..bc192c0 --- /dev/null +++ b/config/rootfiles/core/111/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/logwatch b/config/rootfiles/core/111/filelists/logwatch new file mode 120000 index 0000000..f14eabd --- /dev/null +++ b/config/rootfiles/core/111/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/mpfr b/config/rootfiles/core/111/filelists/mpfr new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/core/111/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/pcre b/config/rootfiles/core/111/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/111/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/php b/config/rootfiles/core/111/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/111/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/rrdtool b/config/rootfiles/core/111/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/111/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/strongswan b/config/rootfiles/core/111/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/111/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/unbound b/config/rootfiles/core/111/filelists/unbound new file mode 120000 index 0000000..66adf09 --- /dev/null +++ b/config/rootfiles/core/111/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/vnstat b/config/rootfiles/core/111/filelists/vnstat new file mode 120000 index 0000000..2e2e610 --- /dev/null +++ b/config/rootfiles/core/111/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/x86_64/gcc b/config/rootfiles/core/111/filelists/x86_64/gcc new file mode 120000 index 0000000..d1616d3 --- /dev/null +++ b/config/rootfiles/core/111/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/x86_64/gmp b/config/rootfiles/core/111/filelists/x86_64/gmp new file mode 120000 index 0000000..7c59c60 --- /dev/null +++ b/config/rootfiles/core/111/filelists/x86_64/gmp @@ -0,0 +1 @@ +../../../../common/x86_64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/meta b/config/rootfiles/core/111/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/111/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/111/update.sh b/config/rootfiles/core/111/update.sh new file mode 100644 index 0000000..1c3cc27 --- /dev/null +++ b/config/rootfiles/core/111/update.sh @@ -0,0 +1,69 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2017 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=111 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +ipsec stop +/etc/init.d/unbound stop + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start + +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + ipsec start +fi + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/doc/language_issues.es b/doc/language_issues.es index e16b83a..d34d63f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1144,6 +1144,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template @@ -1161,31 +1162,46 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client bssid WARNING: untranslated string: wlan client ccmp WARNING: untranslated string: wlan client configuration WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption none WARNING: untranslated string: wlan client encryption wep WARNING: untranslated string: wlan client encryption wpa WARNING: untranslated string: wlan client encryption wpa2 WARNING: untranslated string: wlan client group cipher WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client method WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise key algorithm WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 9865a12..4a91676 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1158,6 +1158,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: upload dh key WARNING: untranslated string: upload new ruleset WARNING: untranslated string: uptime load average @@ -1178,31 +1179,46 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client bssid WARNING: untranslated string: wlan client ccmp WARNING: untranslated string: wlan client configuration WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption none WARNING: untranslated string: wlan client encryption wep WARNING: untranslated string: wlan client encryption wpa WARNING: untranslated string: wlan client encryption wpa2 WARNING: untranslated string: wlan client group cipher WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client method WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise key algorithm WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp diff --git a/doc/language_issues.it b/doc/language_issues.it index c99fb1e..0baf400 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -825,6 +825,7 @@ WARNING: untranslated string: search WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn force mobike @@ -836,3 +837,18 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state +WARNING: untranslated string: wlan client encryption eap +WARNING: untranslated string: wlan client identity +WARNING: untranslated string: wlan client method +WARNING: untranslated string: wlan client password +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version diff --git a/doc/language_issues.nl b/doc/language_issues.nl index fd80711..4f64b5d 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -871,6 +871,7 @@ WARNING: untranslated string: ta key WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor WARNING: untranslated string: vpn broken @@ -884,3 +885,18 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state +WARNING: untranslated string: wlan client encryption eap +WARNING: untranslated string: wlan client identity +WARNING: untranslated string: wlan client method +WARNING: untranslated string: wlan client password +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version diff --git a/doc/language_issues.pl b/doc/language_issues.pl index e16b83a..d34d63f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1144,6 +1144,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template @@ -1161,31 +1162,46 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client bssid WARNING: untranslated string: wlan client ccmp WARNING: untranslated string: wlan client configuration WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption none WARNING: untranslated string: wlan client encryption wep WARNING: untranslated string: wlan client encryption wpa WARNING: untranslated string: wlan client encryption wpa2 WARNING: untranslated string: wlan client group cipher WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client method WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise key algorithm WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 4b6eee4..d07c421 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1139,6 +1139,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: uplink +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: upload dh key WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template @@ -1156,31 +1157,46 @@ WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings WARNING: untranslated string: wlan client bssid WARNING: untranslated string: wlan client ccmp WARNING: untranslated string: wlan client configuration WARNING: untranslated string: wlan client disconnected WARNING: untranslated string: wlan client duplicate ssid +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state WARNING: untranslated string: wlan client edit entry WARNING: untranslated string: wlan client encryption +WARNING: untranslated string: wlan client encryption eap WARNING: untranslated string: wlan client encryption none WARNING: untranslated string: wlan client encryption wep WARNING: untranslated string: wlan client encryption wpa WARNING: untranslated string: wlan client encryption wpa2 WARNING: untranslated string: wlan client group cipher WARNING: untranslated string: wlan client group key algorithm +WARNING: untranslated string: wlan client identity WARNING: untranslated string: wlan client invalid key length +WARNING: untranslated string: wlan client method WARNING: untranslated string: wlan client new entry WARNING: untranslated string: wlan client new network WARNING: untranslated string: wlan client pairwise cipher WARNING: untranslated string: wlan client pairwise key algorithm WARNING: untranslated string: wlan client pairwise key group key +WARNING: untranslated string: wlan client password WARNING: untranslated string: wlan client psk WARNING: untranslated string: wlan client ssid WARNING: untranslated string: wlan client tkip +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version WARNING: untranslated string: wlan client wpa mode WARNING: untranslated string: wlan client wpa mode all WARNING: untranslated string: wlan client wpa mode ccmp ccmp diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0235601..034dd2a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -759,6 +759,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: uplink bit rate WARNING: untranslated string: vpn broken WARNING: untranslated string: vpn connecting WARNING: untranslated string: vpn on-demand @@ -767,3 +768,18 @@ WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistics n2n WARNING: untranslated string: vpn weak +WARNING: untranslated string: wireless network +WARNING: untranslated string: wlan client anonymous identity +WARNING: untranslated string: wlan client auth auto +WARNING: untranslated string: wlan client auth peap +WARNING: untranslated string: wlan client auth ttls +WARNING: untranslated string: wlan client authentication settings +WARNING: untranslated string: wlan client eap authentication method +WARNING: untranslated string: wlan client eap phase2 method +WARNING: untranslated string: wlan client eap state +WARNING: untranslated string: wlan client encryption eap +WARNING: untranslated string: wlan client identity +WARNING: untranslated string: wlan client method +WARNING: untranslated string: wlan client password +WARNING: untranslated string: wlan client tls cipher +WARNING: untranslated string: wlan client tls version diff --git a/doc/language_missings b/doc/language_missings index 81bb27b..fd372c1 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -558,6 +558,7 @@ < updxlrtr sources < updxlrtr standard view < uplink +< uplink bit rate < upload dh key < upload new ruleset < uptime @@ -577,6 +578,7 @@ < vpn statistic n2n < vpn statistic rw < vpn weak +< wireless network < wlanap access point < wlanap channel < wlanap country @@ -601,29 +603,43 @@ < wlan client < wlan client advanced settings < wlan client and +< wlan client anonymous identity +< wlan client auth auto +< wlan client authentication settings +< wlan client auth peap +< wlan client auth ttls < wlan client bssid < wlan client ccmp < wlan client configuration < wlan client disconnected < wlan client duplicate ssid +< wlan client eap authentication method +< wlan client eap phase2 method +< wlan client eap state < wlan client edit entry < wlan client encryption +< wlan client encryption eap < wlan client encryption none < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 < wlan client group cipher < wlan client group key algorithm +< wlan client identity < wlan client invalid key length +< wlan client method < wlan client new entry < wlan client new network < wlan client pairwise cipher < wlan client pairwise key algorithm < wlan client pairwise key group key +< wlan client password < wlan client psk < wlan clients < wlan client ssid < wlan client tkip +< wlan client tls cipher +< wlan client tls version < wlan client wpa mode < wlan client wpa mode all < wlan client wpa mode ccmp ccmp @@ -1189,6 +1205,7 @@ < updxlrtr sources < updxlrtr standard view < uplink +< uplink bit rate < upload dh key < uptime < uptime load average @@ -1205,33 +1222,48 @@ < vpn statistic n2n < vpn statistic rw < vpn weak +< wireless network < wlanap country < wlan client < wlan client advanced settings < wlan client and +< wlan client anonymous identity +< wlan client auth auto +< wlan client authentication settings +< wlan client auth peap +< wlan client auth ttls < wlan client bssid < wlan client ccmp < wlan client configuration < wlan client disconnected < wlan client duplicate ssid +< wlan client eap authentication method +< wlan client eap phase2 method +< wlan client eap state < wlan client edit entry < wlan client encryption +< wlan client encryption eap < wlan client encryption none < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 < wlan client group cipher < wlan client group key algorithm +< wlan client identity < wlan client invalid key length +< wlan client method < wlan client new entry < wlan client new network < wlan client pairwise cipher < wlan client pairwise key algorithm < wlan client pairwise key group key +< wlan client password < wlan client psk < wlan clients < wlan client ssid < wlan client tkip +< wlan client tls cipher +< wlan client tls version < wlan client wpa mode < wlan client wpa mode all < wlan client wpa mode ccmp ccmp @@ -1782,6 +1814,7 @@ < updxlrtr sources < updxlrtr standard view < uplink +< uplink bit rate < upload dh key < uptime < uptime load average @@ -1798,33 +1831,48 @@ < vpn statistic n2n < vpn statistic rw < vpn weak +< wireless network < wlanap country < wlan client < wlan client advanced settings < wlan client and +< wlan client anonymous identity +< wlan client auth auto +< wlan client authentication settings +< wlan client auth peap +< wlan client auth ttls < wlan client bssid < wlan client ccmp < wlan client configuration < wlan client disconnected < wlan client duplicate ssid +< wlan client eap authentication method +< wlan client eap phase2 method +< wlan client eap state < wlan client edit entry < wlan client encryption +< wlan client encryption eap < wlan client encryption none < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 < wlan client group cipher < wlan client group key algorithm +< wlan client identity < wlan client invalid key length +< wlan client method < wlan client new entry < wlan client new network < wlan client pairwise cipher < wlan client pairwise key algorithm < wlan client pairwise key group key +< wlan client password < wlan client psk < wlan clients < wlan client ssid < wlan client tkip +< wlan client tls cipher +< wlan client tls version < wlan client wpa mode < wlan client wpa mode all < wlan client wpa mode ccmp ccmp @@ -2380,6 +2428,7 @@ < updxlrtr sources < updxlrtr standard view < uplink +< uplink bit rate < upload dh key < uptime < uptime load average @@ -2397,33 +2446,48 @@ < vpn statistic rw < vpn weak < week-graph +< wireless network < wlanap country < wlan client < wlan client advanced settings < wlan client and +< wlan client anonymous identity +< wlan client auth auto +< wlan client authentication settings +< wlan client auth peap +< wlan client auth ttls < wlan client bssid < wlan client ccmp < wlan client configuration < wlan client disconnected < wlan client duplicate ssid +< wlan client eap authentication method +< wlan client eap phase2 method +< wlan client eap state < wlan client edit entry < wlan client encryption +< wlan client encryption eap < wlan client encryption none < wlan client encryption wep < wlan client encryption wpa < wlan client encryption wpa2 < wlan client group cipher < wlan client group key algorithm +< wlan client identity < wlan client invalid key length +< wlan client method < wlan client new entry < wlan client new network < wlan client pairwise cipher < wlan client pairwise key algorithm < wlan client pairwise key group key +< wlan client password < wlan client psk < wlan clients < wlan client ssid < wlan client tkip +< wlan client tls cipher +< wlan client tls version < wlan client wpa mode < wlan client wpa mode all < wlan client wpa mode ccmp ccmp diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 80a86af..6ba345d 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -217,7 +217,48 @@ END </td> <td></td> </tr> - </table> +END + + if (&General::RedIsWireless()) { + my $iface = $netsettings{"RED_DEV"} || "red0"; + + my $essid = &Network::wifi_get_essid($iface); + my $frequency = &Network::wifi_get_frequency($iface); + my $access_point = &Network::wifi_get_access_point($iface); + my $bit_rate = &Network::wifi_get_bit_rate($iface); + my $link_quality = &Network::wifi_get_link_quality($iface); + my $signal_level = &Network::wifi_get_signal_level($iface); + + print <<END; + <tr> + <td> + <strong>$Lang::tr{'wireless network'}:</strong> + </td> + <td style="text-align: center"> + $essid + </td> + <td style="text-align: center"> + $access_point @ $frequency + </td> + </tr> + <tr> + <td> + <strong> + $Lang::tr{'uplink bit rate'}: + </strong> + </td> + <td style="text-align: center"> + $bit_rate + </td> + <td style="text-align: center"> + $link_quality% @ $signal_level + </td> + </tr> +END + } + + print <<END; + </table> END
#Dial profiles diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index a2d0273..6978663 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -19,8 +19,8 @@ # # ###############################################################################
-# DEVICE,ENABLED,MODE,WPA_MODE,SSID,PSK,PRIO -# wlan0,on,WPA2,,Use This One Mum,ThisIsTheKey,2 +# DEVICE,ENABLED,MODE,WPA_MODE,SSID,PSK,PRIO,AUTH,ANONYMOUS,IDENTITY,PASSWORD +# wlan0,on,WPA2,,Use This One Mum,ThisIsTheKey,2,TTLS,anonymous,username,password
use strict;
@@ -132,6 +132,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { push(@config, $settings{'SSID'}); push(@config, $settings{'PSK'}); push(@config, $settings{'PRIO'}); + push(@config, $settings{'AUTH'}); + push(@config, $settings{'ANONYMOUS'}); + push(@config, $settings{'IDENTITY'}); + push(@config, $settings{'PASSWORD'});
# Add the new configuration and write all the stuff to the configuration file. my $line = join(',', @config) . "\n"; @@ -164,6 +168,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'SSID'} = $config[5]; $settings{'PSK'} = $config[6]; $settings{'PRIO'} = $config[7]; + $settings{'AUTH'} = $config[8]; + $settings{'ANONYMOUS'} = $config[9]; + $settings{'IDENTITY'} = $config[10]; + $settings{'PASSWORD'} = $config[11]; } } } @@ -181,12 +189,16 @@ if ($settings{'ACTION'} eq $Lang::tr{'update'}) { if ($config[0] eq $settings{'ID'}) { # Update all configuration settings. # ID and INTERFACE cannot be changed. - $config[2] = $settings{'ENABLED'}; - $config[3] = $settings{'ENCRYPTION'}; - $config[4] = $settings{'WPA_MODE'}; - $config[5] = $settings{'SSID'}; - $config[6] = $settings{'PSK'}; - $config[7] = $settings{'PRIO'}; + $config[2] = $settings{'ENABLED'}; + $config[3] = $settings{'ENCRYPTION'}; + $config[4] = $settings{'WPA_MODE'}; + $config[5] = $settings{'SSID'}; + $config[6] = $settings{'PSK'}; + $config[7] = $settings{'PRIO'}; + $config[8] = $settings{'AUTH'}; + $config[9] = $settings{'ANONYMOUS'}; + $config[10] = $settings{'IDENTITY'}; + $config[11] = $settings{'PASSWORD'};
$line = join(',', @config); } @@ -312,9 +324,34 @@ END $encryption_mode = $Lang::tr{'wlan client encryption wpa'}; } elsif ($config[3] eq "WPA2") { $encryption_mode = $Lang::tr{'wlan client encryption wpa2'}; + } elsif ($config[3] eq "EAP") { + $encryption_mode = $Lang::tr{'wlan client encryption eap'}; }
- if (($config[3] eq "WPA") || ($config[3] eq "WPA2")) { + if ($config[3] eq "EAP") { + if ($config[8] eq "PEAP") { + $encryption_mode .= " ($Lang::tr{'wlan client auth peap'})"; + } elsif ($config[8] eq "TTLS") { + $encryption_mode .= " ($Lang::tr{'wlan client auth ttls'})"; + } else { + $encryption_mode .= " ($Lang::tr{'wlan client auth auto'})"; + } + + $encryption_mode .= "<hr>"; + + if ($config[10]) { + $encryption_mode .= "<strong>$Lang::tr{'wlan client identity'}</strong>: "; + $encryption_mode .= $config[10]; + } + + # Anonymous identity + if ($config[9]) { + $encryption_mode .= "<br>"; + $encryption_mode .= "<strong>$Lang::tr{'wlan client anonymous identity'}</strong>: "; + $encryption_mode .= $config[9]; + } + + } elsif (($config[3] eq "WPA") || ($config[3] eq "WPA2")) { my $wpa_pairwise = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}"; my $wpa_group = "$Lang::tr{'wlan client ccmp'} $Lang::tr{'wlan client and'} $Lang::tr{'wlan client tkip'}";
@@ -437,6 +474,12 @@ sub showEditBox() { $selected{'WPA_MODE'}{'TKIP-TKIP'} = ''; $selected{'WPA_MODE'}{$settings{'WPA_MODE'}} = "selected='selected'";
+ $selected{'AUTH'} = (); + $selected{'AUTH'}{''} = ''; + $selected{'AUTH'}{'PEAP'} = ''; + $selected{'AUTH'}{'TTLS'} = ''; + $selected{'AUTH'}{$settings{'AUTH'}} = "selected='selected'"; + $selected{'PRIO'} = (); $selected{'PRIO'}{'0'} = ''; $selected{'PRIO'}{'1'} = ''; @@ -461,6 +504,7 @@ sub showEditBox() { <td width='40%'> <select name='ENCRYPTION'> <option value="NONE" $selected{'ENCRYPTION'}{'NONE'}>$Lang::tr{'wlan client encryption none'}</option> + <option value="EAP" $selected{'ENCRYPTION'}{'EAP'}>$Lang::tr{'wlan client encryption eap'}</option> <option value="WPA2" $selected{'ENCRYPTION'}{'WPA2'}>$Lang::tr{'wlan client encryption wpa2'}</option> <option value="WPA" $selected{'ENCRYPTION'}{'WPA'}>$Lang::tr{'wlan client encryption wpa'}</option> <option value="WEP" $selected{'ENCRYPTION'}{'WEP'}>$Lang::tr{'wlan client encryption wep'}</option> @@ -477,6 +521,57 @@ sub showEditBox() {
<br> <hr> + + <strong> + $Lang::tr{'wlan client authentication settings'}: + </strong> + + <table width='100%'> + <tr> + <td class='base' width='20%'> + $Lang::tr{'wlan client eap authentication method'}: + </td> + <td width='40%'> + <select name='AUTH'> + <option value="" $selected{'AUTH'}{''}>$Lang::tr{'wlan client auth auto'}</option> + <option value="PEAP" $selected{'AUTH'}{'PEAP'}>$Lang::tr{'wlan client auth peap'}</option> + <option value="TTLS" $selected{'AUTH'}{'TTLS'}>$Lang::tr{'wlan client auth ttls'}</option> + </select> + </td> + <td colspan="2" width='40%'></td> + </tr> + <tr> + <td class='base' width='20%'> + $Lang::tr{'wlan client anonymous identity'}: + </td> + <td width='40%'> + <input type="text" name="ANONYMOUS" value="$settings{"ANONYMOUS"}" size="25" /> + </td> + <td colspan="2" width='40%'></td> + </tr> + <tr> + <td class='base' width='20%'> + $Lang::tr{'wlan client identity'}: + </td> + <td width='40%'> + <input type="text" name="IDENTITY" value="$settings{"IDENTITY"}" size="25" /> + </td> + <td colspan="2" width='40%'></td> + </tr> + <tr> + <td class='base' width='20%'> + $Lang::tr{'wlan client password'}: + </td> + <td width='40%'> + <input type="password" name="PASSWORD" value="$settings{"PASSWORD"}" size="25" /> + </td> + <td colspan="2" width='40%'></td> + </tr> + </table> + + <br> + <hr> + <strong> $Lang::tr{'wlan client advanced settings'}: @@ -585,6 +680,59 @@ sub ShowStatus() { </tr> END
+ if ($status{'EAP state'}) { + my $selected_method = $status{'selectedMethod'}; + $selected_method =~ s/\d+ ((.*))/$1/e; + + print <<END; + <tr> + <td colspan='2'> + <strong>$Lang::tr{'wlan client encryption eap'}</strong> + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client eap state'} + </td> + <td width='80%'> + $status{'EAP state'} + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client method'} + </td> + <td width='80%'> + $selected_method + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client tls version'} + </td> + <td width='80%'> + $status{'eap_tls_version'} + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client tls cipher'} + </td> + <td width='80%'> + $status{'EAP TLS cipher'} + </td> + </tr> + <tr> + <td width='20%'> + $Lang::tr{'wlan client eap phase2 method'} + </td> + <td width='80%'> + $status{"${selected_method}v0 Phase2 method"} + </td> + </tr> +END + } + if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) { print <<END; <tr> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6443abe..b0cb96d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2356,6 +2356,7 @@ 'updxlrtr year' => 'einem Jahr', 'upgrade' => 'upgrade', 'uplink' => 'Uplink', +'uplink bit rate' => 'Ausgehende Datenrate', 'uplink speed' => 'Uplink-Geschwindigkeit (kbit/sek)', 'uplink std class' => 'Uploadstandardklasse', 'upload' => 'Hochladen', @@ -2656,31 +2657,46 @@ 'wireless config added' => 'Wireless-Konfiguration hinzugefügt', 'wireless config changed' => 'Wireless-Konfiguration geändert', 'wireless configuration' => 'Wireless-Konfiguration', +'wireless network' => 'WLAN-Netzwerk', 'wlan client' => 'WLAN-Client', 'wlan client advanced settings' => 'Erweiterte Einstellungen', 'wlan client and' => 'und', +'wlan client anonymous identity' => 'Anonyme Identität', +'wlan client auth auto' => 'Auto', +'wlan client auth peap' => 'PEAP', +'wlan client auth ttls' => 'TTLS', +'wlan client authentication settings' => 'Authentifizierungseinstellungen', 'wlan client bssid' => 'BSSID', 'wlan client ccmp' => 'CCMP', 'wlan client configuration' => 'WLAN-Client-Konfiguration', 'wlan client disconnected' => 'Nicht verbunden', 'wlan client duplicate ssid' => 'Doppelte SSID', +'wlan client eap authentication method' => 'EAP-Authentifizierungsmethode', +'wlan client eap phase2 method' => 'EAP-Phase-2-Methode', +'wlan client eap state' => 'EAP-Status', 'wlan client edit entry' => 'Verbindung bearbeiten', 'wlan client encryption' => 'Verschlüsselung', +'wlan client encryption eap' => 'EAP', 'wlan client encryption none' => 'Keine', 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', 'wlan client group cipher' => 'Gruppenchiffre', 'wlan client group key algorithm' => 'GKA', +'wlan client identity' => 'Identität', 'wlan client invalid key length' => 'Ungültige Schlüssellänge.', +'wlan client method' => 'Methode', 'wlan client new entry' => 'Neue WLAN-Client-Konfiguration erstellen', 'wlan client new network' => 'Neues Netzwerk', 'wlan client pairwise cipher' => 'Paarweise Chiffre', 'wlan client pairwise key algorithm' => 'PKA', 'wlan client pairwise key group key' => 'Paarweise-/Gruppenschlüssel', +'wlan client password' => 'Passwort', 'wlan client psk' => 'Schlüssel', 'wlan client ssid' => 'SSID', 'wlan client tkip' => 'TKIP', +'wlan client tls cipher' => 'TLS-Chiffre', +'wlan client tls version' => 'TLS-Version', 'wlan client wpa mode' => 'WPA-Modus', 'wlan client wpa mode all' => 'Automatisch', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 4c62471..b3aee5a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2398,6 +2398,7 @@ 'updxlrtr year' => 'one year', 'upgrade' => 'upgrade', 'uplink' => 'Uplink', +'uplink bit rate' => 'Uplink Bit Rate', 'uplink speed' => 'Uplink speed (kbit/sec)', 'uplink std class' => 'uplink standard class', 'upload' => 'Upload', @@ -2701,31 +2702,46 @@ 'wireless config added' => 'Wireless config added', 'wireless config changed' => 'Wireless config changed', 'wireless configuration' => 'Wireless Configuration', +'wireless network' => 'WiFi Network', 'wlan client' => 'Wireless client', 'wlan client advanced settings' => 'Advanced settings', 'wlan client and' => 'and', +'wlan client anonymous identity' => 'Anonymous Identity', +'wlan client auth auto' => 'Auto', +'wlan client auth peap' => 'PEAP', +'wlan client auth ttls' => 'TTLS', +'wlan client authentication settings' => 'Authentication Settings', 'wlan client bssid' => 'BSSID', 'wlan client ccmp' => 'CCMP', 'wlan client configuration' => 'Wireless Client Configuration', 'wlan client disconnected' => 'Disconnected', 'wlan client duplicate ssid' => 'Duplicate SSID', +'wlan client eap authentication method' => 'EAP Authentication Method', +'wlan client eap phase2 method' => 'EAP Phase 2 Method', +'wlan client eap state' => 'EAP Status', 'wlan client edit entry' => 'Edit wireless client configuration', 'wlan client encryption' => 'Encryption', +'wlan client encryption eap' => 'EAP', 'wlan client encryption none' => 'None', 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', 'wlan client group cipher' => 'Group cipher', 'wlan client group key algorithm' => 'GKA', +'wlan client identity' => 'Identity', 'wlan client invalid key length' => 'Invalid key length.', +'wlan client method' => 'Method', 'wlan client new entry' => 'Create new wireless client configuration', 'wlan client new network' => 'New network', 'wlan client pairwise cipher' => 'Pairwise cipher', 'wlan client pairwise key algorithm' => 'PKA', 'wlan client pairwise key group key' => 'Pairwise key/group key', +'wlan client password' => 'Password', 'wlan client psk' => 'Pre-shared key', 'wlan client ssid' => 'SSID', 'wlan client tkip' => 'TKIP', +'wlan client tls cipher' => 'TLS Cipher', +'wlan client tls version' => 'TLS Version', 'wlan client wpa mode' => 'WPA mode', 'wlan client wpa mode all' => 'Auto', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', diff --git a/lfs/ccache b/lfs/ccache index 682f499..c35c670 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -83,7 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install
-ifeq "$(PASS)" "1" +ifeq "$(TOOLCHAIN)" "1" + ifeq "$(PASS)" "1" mkdir -pv /tools/ccache/bin ln -svf ../../bin/ccache /tools/ccache/bin/gcc ln -svf ../../bin/ccache /tools/ccache/bin/g++ @@ -93,13 +94,14 @@ ifeq "$(PASS)" "1" ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-g++ ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-cc ln -svf ../../bin/ccache /tools/ccache/bin/$(CROSSTARGET)-c++ -endif + endif
-ifeq "$(PASS)" "2" + ifeq "$(PASS)" "2" ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-gcc ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-g++ ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-cc ln -svf ../../bin/ccache /tools/ccache/bin/$(BUILDTARGET)-c++ + endif endif
@rm -rf $(DIR_APP) diff --git a/lfs/cpio b/lfs/cpio index 48a4393..4d9a752 100644 --- a/lfs/cpio +++ b/lfs/cpio @@ -24,7 +24,7 @@
include Config
-VER = 2.11 +VER = 2.12
THISAPP = cpio-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1112bb6c45863468b5496ba128792f6c +$(DL_FILE)_MD5 = fc207561a86b63862eea4b8300313e86
install : $(TARGET)
diff --git a/lfs/linux b/lfs/linux index d7b21e6..3c85a23 100644 --- a/lfs/linux +++ b/lfs/linux @@ -40,10 +40,10 @@ CXXFLAGS = PAK_VER = 73 DEPS = ""
-KERNEL_ARCH = $(MACHINE) - ifeq "$(MACHINE)" "i586" KERNEL_ARCH = i386 +else + KERNEL_ARCH = $(MACHINE) endif
VERSUFIX=ipfire$(KCFG) @@ -56,9 +56,19 @@ else HEADERS_PREFIX = /usr endif
-ifeq "$(MACHINE_TYPE)" "arm" +ifeq "$(MACHINE)" "armv5tel" HEADERS_ARCH=arm -else +endif + +ifeq "$(MACHINE)" "aarch64" + HEADERS_ARCH=arm64 +endif + +ifeq "$(MACHINE)" "x86_64" + HEADERS_ARCH=x86 +endif + +ifeq "$(MACHINE)" "i586" HEADERS_ARCH=x86 endif
diff --git a/lfs/mpd b/lfs/mpd index 4134b71..6b057f7 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@
include Config
-VER = 0.20.6 +VER = 0.19.19
THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 15 +PAK_VER = 16
DEPS = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis opus"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1197a2190fc8ddfccbf4bba3b749cea4 +$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db
install : $(TARGET)
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-ipv6 \ --sysconfdir=/etc \ --disable-sqlite \ + --disable-smbclient \ --enable-id3 \ --enable-vorbis \ --enable-expat \ diff --git a/lfs/openssh b/lfs/openssh index 005e4df..56ac55a 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e 's/^#?Port .*$$/Port 222/' \ -e 's/^#?Protocol .*$$/Protocol 2/' \ -e 's/^#?LoginGraceTime .*$$/LoginGraceTime 30s/' \ - -e 's/^#?RSAAuthentication .*$$/RSAAuthentication yes/' \ -e 's/^#?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \ -e 's/^#?PasswordAuthentication .*$$/PasswordAuthentication yes/' \ -e 's/^#?MaxStartups .*$$/MaxStartups 5/' \ diff --git a/make.sh b/make.sh index a87f706..e8af68a 100755 --- a/make.sh +++ b/make.sh @@ -279,8 +279,6 @@ buildtoolchain() { LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE
- local ORG_PATH=$PATH - export PATH="/tools/ccache/bin:/tools/bin:$PATH" lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 @@ -316,7 +314,6 @@ buildtoolchain() { lfsmake1 xz lfsmake1 fake-environ lfsmake1 cleanup-toolchain PASS=2 - export PATH=$ORG_PATH }
buildbase() { diff --git a/src/fake-environ/Makefile b/src/fake-environ/Makefile index 3c3a3b4..5af7718 100644 --- a/src/fake-environ/Makefile +++ b/src/fake-environ/Makefile @@ -1,10 +1,10 @@
ifeq "$(CFLAGS)" "" - $(error CLFAGS not defined.) + $(error CFLAGS not defined) endif
ifeq "$(TOOLS_DIR)" "" - $(error TOOLS_DIR not defined.) + $(error TOOLS_DIR not defined) endif
LIB = libpakfire_preload.so diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient index ee24c43..b32a4cb 100644 --- a/src/initscripts/system/wlanclient +++ b/src/initscripts/system/wlanclient @@ -62,7 +62,11 @@ function wpa_supplicant_make_config() { --wpa-mode="${line[4]}" \ --ssid="${line[5]}" \ --psk="${line[6]}" \ - --priority="${line[7]}" + --priority="${line[7]}" \ + --auth-mode="${line[8]}" \ + --anonymous-identity="${line[9]}" \ + --identity="${line[10]}" \ + --password="${line[11]}"
items=$(( ${items} + 1 ))
@@ -82,12 +86,16 @@ function wpa_supplicant_config_line() { local config=${2} shift 2
+ local anonymous_identity local auth_alg + local auth_mode + local identity local proto local key_mgmt local pairwise local group local mode + local password local priority local psk local ssid @@ -98,9 +106,21 @@ function wpa_supplicant_config_line() {
while [ $# -gt 0 ]; do case "${1}" in + --anonymous-identity=*) + anonymous_identity=${1#--anonymous-identity=} + ;; + --auth-mode=*) + auth_mode=${1#--auth-mode=} + ;; + --identity=*) + identity=${1#--identity=} + ;; --mode=*) mode=${1#--mode=} ;; + --password=*) + password=${1#--password=} + ;; --priority=*) priority=${1#--priority=} ;; @@ -121,6 +141,9 @@ function wpa_supplicant_config_line() { done
case "${mode}" in + EAP) + key_mgmt="WPA-EAP" + ;; WPA2) auth_alg="OPEN" proto="RSN" @@ -149,7 +172,7 @@ function wpa_supplicant_config_line() { ;; esac
- if [ "${mode}" = "WPA" -o "${mode}" = "WPA2" ]; then + if [ "${mode}" = "EAP" -o "${mode}" = "WPA" -o "${mode}" = "WPA2" ]; then case "${wpa_mode}" in CCMP-CCMP) pairwise="CCMP" @@ -205,6 +228,24 @@ function wpa_supplicant_config_line() { echo " priority=${priority}" fi
+ # EAP + if [ "${mode}" = "EAP" ]; then + if [ -n "${auth_mode}" ]; then + echo " eap=${auth_mode}" + else + echo " eap=PEAP TTLS" + fi + + if [ "${auth_mode}" = "TTLS" -a -n "${anonymous_identity}" ]; then + echo " anonymous_identity="${anonymous_identity}"" + fi + + if [ -n "${identity}" -a -n "${password}" ]; then + echo " identity="${identity}"" + echo " password="${password}"" + fi + fi + echo "}" echo ) >> ${config} diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 11b1e37..c347916 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -541,7 +541,7 @@ sub dblist { } }
-sub resolvedeps { +sub resolvedeps_one { my $pak = shift; getmetafile("$pak"); @@ -553,7 +553,7 @@ sub resolvedeps { close(FILE); my $line; - my (@templine, @deps, @tempdeps, @all); + my (@templine, @deps, @all); foreach $line (@file) { @templine = split(/: /,$line); if ("$templine[0]" eq "Dependencies") { @@ -568,30 +568,41 @@ sub resolvedeps { message("PAKFIRE RESV: $pak: Dependency is already installed: $_"); } else { message("PAKFIRE RESV: $pak: Need to install dependency: $_"); - push(@tempdeps,$_); push(@all,$_); } } }
- foreach (@tempdeps) { - if ($_) { - my @newdeps = resolvedeps("$_"); - foreach(@newdeps) { - unless (($_ eq " ") || ($_ eq "")) { - my $return = &isinstalled($_); - if ($return eq 0) { - message("PAKFIRE RESV: $pak: Dependency is already installed: $_"); - } else { - message("PAKFIRE RESV: $pak: Need to install dependency: $_"); - push(@all,$_); - } - } + return @all; +} + +sub resolvedeps { + my $pak = shift; + my @all; + + # Resolve all not yet installed dependencies of $pak + my @deps = &resolvedeps_one($pak); + push(@all, @deps); + + # For each dependency, we check if more dependencies exist + while (@deps) { + my $dep = pop(@deps); + + my @subdeps = &resolvedeps_one($dep); + foreach my $subdep (@subdeps) { + # Skip the package we are currently resolving for + next if ($pak eq $subdep); + + # If the package is not already to be installed, + # we add it to the list (@all) and check if it has + # more dependencies on its own. + unless (grep {$_ eq $subdep} @all) { + push(@deps, $subdep); + push(@all, $subdep); } } } - message(""); - chomp (@all); + return @all; }
diff --git a/tools/make-functions b/tools/make-functions index d5f0a71..0180ded 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -310,6 +310,16 @@ exiterror() { losetup -d /dev/loop${i} 2>/dev/null fi; done + + if [ -n "${LOGFILE}" ]; then + echo # empty line + + local line + while read -r line; do + echo " ${line}" + done <<< "$(tail -n30 ${LOGFILE})" + fi + echo -e "\nERROR: $*" echo " Check $LOGFILE for errors if applicable" exit 1 @@ -555,7 +565,9 @@ lfsmake1() {
local PKG_TIME_START=`date +%s`
- cd $BASEDIR/lfs && make -f $* BUILDTARGET=$BUILDTARGET \ + cd $BASEDIR/lfs && \ + PATH="/tools/ccache/bin:/tools/bin:$PATH" \ + make -f $* TOOLCHAIN=1 BUILDTARGET=$BUILDTARGET \ CROSSTARGET="${CROSSTARGET}" \ MACHINE=$MACHINE \ MACHINE_TYPE=$MACHINE_TYPE \
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org