Merge remote-tracking branch 'stevee/pakfire3-fixes' into next

diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211
index 9e04ea6717ef936e6b9e88954b30948488711189..e72bedde808f513e876eb72817bc6d0836eb1d17 100644 (file)
--- a/config/etc/modprobe.d/cfg80211
+++ b/config/etc/modprobe.d/cfg80211
@@ -1,2 +1 @@
-#options cfg80211 ieee80211_regdom=DE
 blacklist ieee80211

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 85ae5eb48f0606608ea39659c63321fa44233ee0..51f34133aa2a0ef22fd5b0faebf2de8651a4c7e9 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3725,7 +3725,7 @@ CONFIG_USB_WUSB_CBAF=m
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 038bee5b37bd09866042d92dd365c7fd0dd09a73..6f39769a289d8d7d9dda0419145c4d1cf0752929 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -3757,7 +3757,7 @@ CONFIG_USB_WUSB_CBAF=m
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 8fedba49055875981fd112d537951bc485306f18..dcdf545611da4a09e2aef74be0631e43548a8000 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -2786,7 +2786,7 @@ CONFIG_USB_WUSB_CBAF=m
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index 3f9acf53c6992e8d4dbcfa6a7b33b5298ccd1b76..bf51301d741ca620bece6a4f89c2a326de2fc89a 100644 (file)
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -1,5 +1,6 @@
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/issue
+etc/modprobe.d/cfg80211
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/halt

diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index 19036b1962461bd79253981e939738c81e05ee08..cf408444b51525ba8b26be63af70f692d78c6e5e 100644 (file)
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -219,6 +219,13 @@ telinit u
 # Convert OpenVPN RW connections.
 /usr/sbin/ovpn-ccd-convert
 
+touch /var/ipfire/ovpn/ccd.conf
+touch /var/ipfire/ovpn/ccdroute
+touch /var/ipfire/ovpn/ccdroute2
+chown nobody:nobody /var/ipfire/ovpn/ccd.conf
+chown nobody:nobody /var/ipfire/ovpn/ccdroute
+chown nobody:nobody /var/ipfire/ovpn/ccdroute2
+
 # Update crontab.
 sed -i /var/spool/cron/root.orig \
        -e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@'

diff --git a/config/rootfiles/core/60/exclude b/config/rootfiles/oldcore/60/exclude
similarity index 100%
rename from config/rootfiles/core/60/exclude
rename to config/rootfiles/oldcore/60/exclude

diff --git a/config/rootfiles/core/60/filelists/files b/config/rootfiles/oldcore/60/filelists/files
similarity index 100%
rename from config/rootfiles/core/60/filelists/files
rename to config/rootfiles/oldcore/60/filelists/files

diff --git a/config/rootfiles/core/60/filelists/strongswan b/config/rootfiles/oldcore/60/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/60/filelists/strongswan
rename to config/rootfiles/oldcore/60/filelists/strongswan

diff --git a/config/rootfiles/core/60/meta b/config/rootfiles/oldcore/60/meta
similarity index 100%
rename from config/rootfiles/core/60/meta
rename to config/rootfiles/oldcore/60/meta

diff --git a/config/rootfiles/core/60/update.sh b/config/rootfiles/oldcore/60/update.sh
similarity index 100%
rename from config/rootfiles/core/60/update.sh
rename to config/rootfiles/oldcore/60/update.sh

diff --git a/config/rootfiles/core/61/exclude b/config/rootfiles/oldcore/61/exclude
similarity index 100%
rename from config/rootfiles/core/61/exclude
rename to config/rootfiles/oldcore/61/exclude

diff --git a/config/rootfiles/core/61/filelists/GeoIP b/config/rootfiles/oldcore/61/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/61/filelists/GeoIP
rename to config/rootfiles/oldcore/61/filelists/GeoIP

diff --git a/config/rootfiles/core/61/filelists/Net-Telnet b/config/rootfiles/oldcore/61/filelists/Net-Telnet
similarity index 100%
rename from config/rootfiles/core/61/filelists/Net-Telnet
rename to config/rootfiles/oldcore/61/filelists/Net-Telnet

diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/oldcore/61/filelists/files
similarity index 100%
rename from config/rootfiles/core/61/filelists/files
rename to config/rootfiles/oldcore/61/filelists/files

diff --git a/config/rootfiles/core/61/filelists/fireinfo b/config/rootfiles/oldcore/61/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/61/filelists/fireinfo
rename to config/rootfiles/oldcore/61/filelists/fireinfo

diff --git a/config/rootfiles/core/61/filelists/logwatch b/config/rootfiles/oldcore/61/filelists/logwatch
similarity index 100%
rename from config/rootfiles/core/61/filelists/logwatch
rename to config/rootfiles/oldcore/61/filelists/logwatch

diff --git a/config/rootfiles/core/61/filelists/openvpn b/config/rootfiles/oldcore/61/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/61/filelists/openvpn
rename to config/rootfiles/oldcore/61/filelists/openvpn

diff --git a/config/rootfiles/core/61/filelists/pam b/config/rootfiles/oldcore/61/filelists/pam
similarity index 100%
rename from config/rootfiles/core/61/filelists/pam
rename to config/rootfiles/oldcore/61/filelists/pam

diff --git a/config/rootfiles/core/61/filelists/php b/config/rootfiles/oldcore/61/filelists/php
similarity index 100%
rename from config/rootfiles/core/61/filelists/php
rename to config/rootfiles/oldcore/61/filelists/php

diff --git a/config/rootfiles/core/61/filelists/squid b/config/rootfiles/oldcore/61/filelists/squid
similarity index 100%
rename from config/rootfiles/core/61/filelists/squid
rename to config/rootfiles/oldcore/61/filelists/squid

diff --git a/config/rootfiles/core/61/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/61/filelists/usb_modeswitch_data
similarity index 100%
rename from config/rootfiles/core/61/filelists/usb_modeswitch_data
rename to config/rootfiles/oldcore/61/filelists/usb_modeswitch_data

diff --git a/config/rootfiles/core/61/meta b/config/rootfiles/oldcore/61/meta
similarity index 100%
rename from config/rootfiles/core/61/meta
rename to config/rootfiles/oldcore/61/meta

diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/oldcore/61/update.sh
similarity index 100%
rename from config/rootfiles/core/61/update.sh
rename to config/rootfiles/oldcore/61/update.sh

diff --git a/config/rootfiles/core/62/exclude b/config/rootfiles/oldcore/62/exclude
similarity index 100%
rename from config/rootfiles/core/62/exclude
rename to config/rootfiles/oldcore/62/exclude

diff --git a/config/rootfiles/core/62/filelists/GeoIP b/config/rootfiles/oldcore/62/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/62/filelists/GeoIP
rename to config/rootfiles/oldcore/62/filelists/GeoIP

diff --git a/config/rootfiles/core/62/filelists/files b/config/rootfiles/oldcore/62/filelists/files
similarity index 100%
rename from config/rootfiles/core/62/filelists/files
rename to config/rootfiles/oldcore/62/filelists/files

diff --git a/config/rootfiles/core/62/filelists/hwdata b/config/rootfiles/oldcore/62/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/62/filelists/hwdata
rename to config/rootfiles/oldcore/62/filelists/hwdata

diff --git a/config/rootfiles/core/62/filelists/php b/config/rootfiles/oldcore/62/filelists/php
similarity index 100%
rename from config/rootfiles/core/62/filelists/php
rename to config/rootfiles/oldcore/62/filelists/php

diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch b/config/rootfiles/oldcore/62/filelists/usb_modeswitch
similarity index 100%
rename from config/rootfiles/core/62/filelists/usb_modeswitch
rename to config/rootfiles/oldcore/62/filelists/usb_modeswitch

diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/62/filelists/usb_modeswitch_data
similarity index 100%
rename from config/rootfiles/core/62/filelists/usb_modeswitch_data
rename to config/rootfiles/oldcore/62/filelists/usb_modeswitch_data

diff --git a/config/rootfiles/core/62/meta b/config/rootfiles/oldcore/62/meta
similarity index 100%
rename from config/rootfiles/core/62/meta
rename to config/rootfiles/oldcore/62/meta

diff --git a/config/rootfiles/core/62/update.sh b/config/rootfiles/oldcore/62/update.sh
similarity index 100%
rename from config/rootfiles/core/62/update.sh
rename to config/rootfiles/oldcore/62/update.sh

diff --git a/config/rootfiles/core/63/exclude b/config/rootfiles/oldcore/63/exclude
similarity index 100%
rename from config/rootfiles/core/63/exclude
rename to config/rootfiles/oldcore/63/exclude

diff --git a/config/rootfiles/core/63/filelists/GeoIP b/config/rootfiles/oldcore/63/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/63/filelists/GeoIP
rename to config/rootfiles/oldcore/63/filelists/GeoIP

diff --git a/config/rootfiles/core/63/filelists/apache2 b/config/rootfiles/oldcore/63/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/63/filelists/apache2
rename to config/rootfiles/oldcore/63/filelists/apache2

diff --git a/config/rootfiles/core/63/filelists/dhcp b/config/rootfiles/oldcore/63/filelists/dhcp
similarity index 100%
rename from config/rootfiles/core/63/filelists/dhcp
rename to config/rootfiles/oldcore/63/filelists/dhcp

diff --git a/config/rootfiles/core/63/filelists/files b/config/rootfiles/oldcore/63/filelists/files
similarity index 100%
rename from config/rootfiles/core/63/filelists/files
rename to config/rootfiles/oldcore/63/filelists/files

diff --git a/config/rootfiles/core/63/filelists/fireinfo b/config/rootfiles/oldcore/63/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/63/filelists/fireinfo
rename to config/rootfiles/oldcore/63/filelists/fireinfo

diff --git a/config/rootfiles/core/63/filelists/inetutils b/config/rootfiles/oldcore/63/filelists/inetutils
similarity index 100%
rename from config/rootfiles/core/63/filelists/inetutils
rename to config/rootfiles/oldcore/63/filelists/inetutils

diff --git a/config/rootfiles/core/63/meta b/config/rootfiles/oldcore/63/meta
similarity index 100%
rename from config/rootfiles/core/63/meta
rename to config/rootfiles/oldcore/63/meta

diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/oldcore/63/update.sh
similarity index 100%
rename from config/rootfiles/core/63/update.sh
rename to config/rootfiles/oldcore/63/update.sh

diff --git a/config/rootfiles/core/64/exclude b/config/rootfiles/oldcore/64/exclude
similarity index 100%
rename from config/rootfiles/core/64/exclude
rename to config/rootfiles/oldcore/64/exclude

diff --git a/config/rootfiles/core/64/filelists/daq b/config/rootfiles/oldcore/64/filelists/daq
similarity index 100%
rename from config/rootfiles/core/64/filelists/daq
rename to config/rootfiles/oldcore/64/filelists/daq

diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/oldcore/64/filelists/files
similarity index 100%
rename from config/rootfiles/core/64/filelists/files
rename to config/rootfiles/oldcore/64/filelists/files

diff --git a/config/rootfiles/core/64/filelists/snort b/config/rootfiles/oldcore/64/filelists/snort
similarity index 100%
rename from config/rootfiles/core/64/filelists/snort
rename to config/rootfiles/oldcore/64/filelists/snort

diff --git a/config/rootfiles/core/64/meta b/config/rootfiles/oldcore/64/meta
similarity index 100%
rename from config/rootfiles/core/64/meta
rename to config/rootfiles/oldcore/64/meta

diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/oldcore/64/update.sh
similarity index 100%
rename from config/rootfiles/core/64/update.sh
rename to config/rootfiles/oldcore/64/update.sh

diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/oldcore/65/exclude
similarity index 100%
rename from config/rootfiles/core/65/exclude
rename to config/rootfiles/oldcore/65/exclude

diff --git a/config/rootfiles/core/65/filelists/GeoIP b/config/rootfiles/oldcore/65/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/65/filelists/GeoIP
rename to config/rootfiles/oldcore/65/filelists/GeoIP

diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/oldcore/65/filelists/daq
similarity index 100%
rename from config/rootfiles/core/65/filelists/daq
rename to config/rootfiles/oldcore/65/filelists/daq

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/oldcore/65/filelists/files
similarity index 100%
rename from config/rootfiles/core/65/filelists/files
rename to config/rootfiles/oldcore/65/filelists/files

diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/oldcore/65/meta
similarity index 100%
rename from config/rootfiles/core/65/meta
rename to config/rootfiles/oldcore/65/meta

diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/oldcore/65/update.sh
similarity index 100%
rename from config/rootfiles/core/65/update.sh
rename to config/rootfiles/oldcore/65/update.sh

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 7a02653b1766e532fff76d5df2977514526acf2e..f7b6cde9ab3fcb55d22bf76b62c1b5f0e9d261c9 100644 (file)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -2720,3 +2720,6 @@ var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/en
 var/spool/asterisk/voicemail/default/1234/en/busy.gsm
 var/spool/asterisk/voicemail/default/1234/en/unavail.gsm
+etc/rc.d/init.d/asterisk
+srv/web/ipfire/cgi-bin/asterisk
+var/ipfire/menu.d/EX-asterisk.menu

diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission
index af8a68ab3ed2510ed7faec363186685fa437ea21..3321b719fe6be74beee50f66394776df33ee4c25 100644 (file)
--- a/config/rootfiles/packages/transmission
+++ b/config/rootfiles/packages/transmission
@@ -16,31 +16,8 @@ usr/share/transmission
 #usr/share/transmission/web
 #usr/share/transmission/web/LICENSE
 #usr/share/transmission/web/images
-#usr/share/transmission/web/images/buttons
-#usr/share/transmission/web/images/buttons/cancel.png
-#usr/share/transmission/web/images/buttons/file_priority_buttons.png
-#usr/share/transmission/web/images/buttons/file_wanted_buttons.png
-#usr/share/transmission/web/images/buttons/info_activity.png
-#usr/share/transmission/web/images/buttons/info_files.png
-#usr/share/transmission/web/images/buttons/info_general.png
-#usr/share/transmission/web/images/buttons/info_peers.png
-#usr/share/transmission/web/images/buttons/info_trackers.png
-#usr/share/transmission/web/images/buttons/tab_backgrounds.png
-#usr/share/transmission/web/images/buttons/tab_backgrounds_highlight.png
-#usr/share/transmission/web/images/buttons/toolbar_buttons.png
-#usr/share/transmission/web/images/buttons/torrent_buttons.png
 #usr/share/transmission/web/images/favicon.ico
 #usr/share/transmission/web/images/favicon.png
-#usr/share/transmission/web/images/graphics
-#usr/share/transmission/web/images/graphics/blue-turtle.png
-#usr/share/transmission/web/images/graphics/chrome.png
-#usr/share/transmission/web/images/graphics/filter_bar.png
-#usr/share/transmission/web/images/graphics/filter_icon.png
-#usr/share/transmission/web/images/graphics/iphone_chrome.png
-#usr/share/transmission/web/images/graphics/lock_icon.png
-#usr/share/transmission/web/images/graphics/logo.png
-#usr/share/transmission/web/images/progress
-#usr/share/transmission/web/images/progress/progress.png
 #usr/share/transmission/web/images/webclip-icon.png
 #usr/share/transmission/web/index.html
 #usr/share/transmission/web/javascript
@@ -53,17 +30,58 @@ usr/share/transmission
 #usr/share/transmission/web/javascript/jquery/jquery.contextmenu.min.js
 #usr/share/transmission/web/javascript/jquery/jquery.form.js
 #usr/share/transmission/web/javascript/jquery/jquery.form.min.js
+#usr/share/transmission/web/javascript/jquery/jquery.min.js
 #usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js
+#usr/share/transmission/web/javascript/jquery/jqueryui-1.8.16.min.js
 #usr/share/transmission/web/javascript/jquery/json2.min.js
+#usr/share/transmission/web/javascript/notifications.js
 #usr/share/transmission/web/javascript/prefs-dialog.js
 #usr/share/transmission/web/javascript/remote.js
 #usr/share/transmission/web/javascript/torrent-row.js
 #usr/share/transmission/web/javascript/torrent.js
 #usr/share/transmission/web/javascript/transmission.js
-#usr/share/transmission/web/stylesheets
-#usr/share/transmission/web/stylesheets/common.css
-#usr/share/transmission/web/stylesheets/ie7.css
-#usr/share/transmission/web/stylesheets/ieAll.css
-#usr/share/transmission/web/stylesheets/mobile.css
+#usr/share/transmission/web/style
+#usr/share/transmission/web/style/jqueryui
+#usr/share/transmission/web/style/jqueryui/images
+#usr/share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png
+#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
+#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png
+#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png
+#usr/share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+#usr/share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png
+#usr/share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png
+#usr/share/transmission/web/style/jqueryui/jqueryui-1.8.16.css
+#usr/share/transmission/web/style/transmission
+#usr/share/transmission/web/style/transmission/common.css
+#usr/share/transmission/web/style/transmission/images
+#usr/share/transmission/web/style/transmission/images/arrow-down.png
+#usr/share/transmission/web/style/transmission/images/arrow-up.png
+#usr/share/transmission/web/style/transmission/images/blue-turtle.png
+#usr/share/transmission/web/style/transmission/images/buttons
+#usr/share/transmission/web/style/transmission/images/buttons/torrent_buttons.png
+#usr/share/transmission/web/style/transmission/images/compact.png
+#usr/share/transmission/web/style/transmission/images/file-priority-high.png
+#usr/share/transmission/web/style/transmission/images/file-priority-low.png
+#usr/share/transmission/web/style/transmission/images/file-priority-normal.png
+#usr/share/transmission/web/style/transmission/images/filter_bar.png
+#usr/share/transmission/web/style/transmission/images/filter_icon.png
+#usr/share/transmission/web/style/transmission/images/inspector-files.png
+#usr/share/transmission/web/style/transmission/images/inspector-info.png
+#usr/share/transmission/web/style/transmission/images/inspector-peers.png
+#usr/share/transmission/web/style/transmission/images/inspector-trackers.png
+#usr/share/transmission/web/style/transmission/images/lock_icon.png
+#usr/share/transmission/web/style/transmission/images/logo.png
+#usr/share/transmission/web/style/transmission/images/progress.png
+#usr/share/transmission/web/style/transmission/images/settings.png
+#usr/share/transmission/web/style/transmission/images/toolbar-close.png
+#usr/share/transmission/web/style/transmission/images/toolbar-folder.png
+#usr/share/transmission/web/style/transmission/images/toolbar-info.png
+#usr/share/transmission/web/style/transmission/images/toolbar-pause-all.png
+#usr/share/transmission/web/style/transmission/images/toolbar-pause.png
+#usr/share/transmission/web/style/transmission/images/toolbar-start-all.png
+#usr/share/transmission/web/style/transmission/images/toolbar-start.png
+#usr/share/transmission/web/style/transmission/images/turtle.png
+#usr/share/transmission/web/style/transmission/images/wrench.png
+#usr/share/transmission/web/style/transmission/mobile.css
 var/ipfire/backup/addons/includes/transmission
 etc/rc.d/init.d/transmission

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 99c77e32d9632d7ccd0404c23f302f6742dd0494..83d65dbdb478efb5f2c3baf6774ae701fc3c8b79 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -49,6 +49,7 @@ my %mainsettings = ();
 my %netsettings=();
 my %wlanapsettings=();
 my $channel = '';
+my $country = '';
 my $txpower = '';
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -64,6 +65,7 @@ $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
 $wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'COUNTRY'} = '00';
 $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
@@ -243,11 +245,17 @@ $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
+$selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
 $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`;
+my $monwlaninterface = $wlanapsettings{'INTERFACE'};
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+       $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
+}
+
+my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -258,8 +266,23 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 }
 my @channellist = @temp;
 
-my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`;
-# get available channels
+my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
+# get available country codes
+
+my @temp;
+foreach (@countrylist_cmd){
+$_ =~ /country (.*):/;
+$country = $1;chomp $country;
+if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);}
+}
+my @countrylist = @temp;
+
+my @txpower_cmd = `iwlist $monwlaninterface txpower 2>/dev/null`;
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+       # There is a bug with NL80211 only all devices can displayed
+       @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`;
+}
+# get available power
 
 my @temp;
 foreach (@txpower_cmd){
@@ -376,6 +399,16 @@ foreach $channel (@channellist){
        print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
 }
 
+print <<END
+</select></td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
+       <select name='COUNTRY'>
+END
+;
+foreach $country (@countrylist){
+       print "<option $selected{'COUNTRY'}{$country}>$country</option>";
+}
+
 print <<END
 </select></td></tr>
 <tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 05e1d8531dbfbbaab382613e49fa4249de836b06..ca5dbb3f86323e159b2c3f542ebc9516716e2aee 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2201,6 +2201,7 @@
 'wireless config changed' => 'Wireless Konfiguration geändert',
 'wireless configuration' => 'Wireless-Konfiguration',
 'wlanap access point' => 'Access Point',
+'wlanap country' => 'Ländercode',
 'wlanap channel' => 'Kanal',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f0fa2c21f150e1e4fcd019d71978b2e96fbd8956..ede45179fcd5017fc53f688b6528182501daa984 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2234,6 +2234,7 @@
 'wireless config changed' => 'Wireless config changed',
 'wireless configuration' => 'Wireless Configuration',
 'wlanap access point' => 'Access Point',
+'wlanap country' => 'Country Code',
 'wlanap channel' => 'Channel',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Remove selected interface?',

diff --git a/lfs/asterisk b/lfs/asterisk
index afc95f5beb40c36e138887b940c7e653234721d8..d2b1976cdeecef89a86b074ceffc1ebda276c5a0 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.8.13.0
+VER        = 1.8.19.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 7
+PAK_VER    = 8
 
 CHAN_CAPI  = chan_capi-20120614
 
@@ -44,20 +44,17 @@ DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
 
 objects = $(DL_FILE) \
        asterisk-1.4-de-prompts.tar.gz \
-       asterisk-core-sounds-en-gsm-1.4.22.tar.gz \
        asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \
        asterisk-moh-opsound-gsm-2.03.tar.gz \
        $(CHAN_CAPI).tgz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-core-sounds-en-gsm-1.4.22.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz
 asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
 asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
 $(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
 
-$(DL_FILE)_MD5 = e7f2cb19068c1211c907062f9e96c47a
-asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6
+$(DL_FILE)_MD5 = dc98436846cc2de57100d78747b1bdd1
 asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
@@ -104,7 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts
 
        # add additional sounds
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz $(DIR_APP)/sounds/
        cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz $(DIR_APP)/sounds/
        cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
 

diff --git a/lfs/hostapd b/lfs/hostapd
index 01768b8eec3c6cea38428a19d018c2f1fe6c7da1..f29712a7fc9968d8e4a4eb3432d7be4a9fb97b36 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0
+VER        = 1.1
 
 THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 22
+PAK_VER    = 23
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 236247a7bbd4f60d5fa3e99849d1ffc9
+$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7
 
 install : $(TARGET)
 

diff --git a/lfs/transmission b/lfs/transmission
index 6e2ab79ee07cc9280d2b0460b03f5516c024a3e8..340cf00abcc8de06e014d885ca8333eb2f52e591 100644 (file)
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.42
+VER        = 2.75
 
 THISAPP    = transmission-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 50f6dd76c5c01f45d5ed20783c686815
+$(DL_FILE)_MD5 = 26b92e56e1574bb10443eccbf17443a7
 
 install : $(TARGET)
 

diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index ef539dffdd05cb93c3103e859fa3336058d551a8..e8a67e008bcad8dfc317f3199d8a9e93cb4430c4 100644 (file)
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0
+VER        = 1.1
 
 THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8650f6aa23646ef634402552d0669640
+$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c
 
 install : $(TARGET)
 

diff --git a/src/initscripts/init.d/acpid b/src/initscripts/init.d/acpid
index 53fa7c64ce901d792cd649b454a661a78725c77c..bca69c2b70b33178d65308562195469067b36651 100644 (file)
--- a/src/initscripts/init.d/acpid
+++ b/src/initscripts/init.d/acpid
@@ -9,14 +9,10 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-# ACPI daemon is only support on Intel architectures.
-case "$(uname -m)" in
-       i?86)
-               ;;
-       *)
-               exit 0
-               ;;
-esac
+# Test if ACPI is present
+if [ ! -d /proc/acpi ]; then
+       exit 0
+fi
 
 case "${1}" in
        start)

diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/init.d/asterisk
index b3a734b66167a94fbc4d82eb719add194cec47e3..aac9a637ef881a89ef84cc0ac79bfe912ffab71f 100644 (file)
--- a/src/initscripts/init.d/asterisk
+++ b/src/initscripts/init.d/asterisk
@@ -23,7 +23,7 @@ case "${1}" in
 
        stop)
                boot_mesg "Stopping Asterisk PBX..."
-               asterisk -rx "stop gracefully" >/dev/null 2>&1
+               asterisk -rx "core stop gracefully" >/dev/null 2>&1
                evaluate_retval
                ;;
 

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 31083399b18f83ce6191fbe597f3b9e45717dd1d..c0b11e6af6ee7f4c004120eefeb681abeddbd9c2 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -3,6 +3,7 @@
 . ${rc_functions}
 
 CHANNEL="05"
+COUNTRY="00"
 TXPOWER="auto"
 INTERFACE="blue0"
 MACMODE="0"
@@ -74,6 +75,10 @@ case "${1}" in
                        fi
                fi
 
+               # First reset to World (00) and then set new country
+               /usr/sbin/iw reg set 00
+               /usr/sbin/iw reg set $COUNTRY
+
                /usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null
                /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
 

diff --git a/src/initscripts/init.d/lcr b/src/initscripts/init.d/lcr
index 56a4553dcd344c4376e11846cb755833c731602a..dd72967528fb99a4a2887f066ecd839291a8b45a 100644 (file)
--- a/src/initscripts/init.d/lcr
+++ b/src/initscripts/init.d/lcr
@@ -18,7 +18,7 @@
 case "${1}" in
        start)
                boot_mesg "Starting Linux Call Router..."
-               nice --10 /usr/sbin/lcr fork >> /var/log/lcr 2>&1
+               nice --10 /usr/sbin/lcr fork >> /var/log/lcr/console.log 2>&1
                evaluate_retval
                ;;
 

diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds
index 818382974c266d83721fa45c001bf5a8e2ee4a6d..0d6ee7263bc0d3a1ac62d2d4b05ad2cae6bc0982 100644 (file)
--- a/src/initscripts/init.d/leds
+++ b/src/initscripts/init.d/leds
@@ -9,8 +9,8 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-if [ -e $0.user ]; then
-       $0.user $*
+if [ -e /etc/init.d/leds.user ]; then
+       /etc/init.d/leds.user $*
        exit ${?}
 fi
 

diff --git a/src/initscripts/init.d/transmission b/src/initscripts/init.d/transmission
index 2ad7d48bb4c06f173bcbdc58c7f6cdfd97c504e8..6fd7cd5334e5e0b3f18c415810e2f4d7f55a2e7c 100644 (file)
--- a/src/initscripts/init.d/transmission
+++ b/src/initscripts/init.d/transmission
@@ -18,12 +18,16 @@
 case "${1}" in
        start)
                boot_mesg "Starting transmission daemon..."
-               transmission-daemon -g /etc/transmission
+               chown -R nobody /etc/transmission
+               chown -R nobody /var/transmission
+               sudo -u nobody transmission-daemon -g /etc/transmission
+               evaluate_retval
                ;;
 
        stop)
                boot_mesg "Stopping transmission daemon..."
                killall transmission-daemon
+               evaluate_retval
                ;;
 
        restart)