Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/fw_ath9k_htc b/config/rootfiles/common/fw_ath9k_htc
new file mode 100644 (file)
index 0000000..a841a11
--- /dev/null
+++ b/config/rootfiles/common/fw_ath9k_htc
@@ -0,0 +1,2 @@
+lib/firmware/htc_7010.fw
+lib/firmware/htc_9271.fw

diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index c3166a0e8e52490a11f0994ebcda23f7418d8ad9..953f851faf95a00430a90db1deb464bd078ca81f 100644 (file)
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -6,12 +6,13 @@ usr/share/usb_modeswitch/0421:060c
 usr/share/usb_modeswitch/0421:0610
 usr/share/usb_modeswitch/0421:0622
 usr/share/usb_modeswitch/0421:0627
+usr/share/usb_modeswitch/0421:062c
 usr/share/usb_modeswitch/0471:1210:uMa=Philips
 usr/share/usb_modeswitch/0471:1210:uMa=Wisue
 usr/share/usb_modeswitch/0471:1237
 usr/share/usb_modeswitch/0482:024d
 usr/share/usb_modeswitch/04e8:689a
-usr/share/usb_modeswitch/04e8:f000
+usr/share/usb_modeswitch/04e8:f000:sMo=U209
 usr/share/usb_modeswitch/057c:84ff
 usr/share/usb_modeswitch/05c6:1000:sVe=GT
 usr/share/usb_modeswitch/05c6:1000:sVe=Option
@@ -22,6 +23,7 @@ usr/share/usb_modeswitch/05c6:1000:uMa=SSE
 usr/share/usb_modeswitch/05c6:1000:uMa=Vertex
 usr/share/usb_modeswitch/05c6:2000
 usr/share/usb_modeswitch/05c6:2001
+usr/share/usb_modeswitch/05c6:6503
 usr/share/usb_modeswitch/05c6:f000
 usr/share/usb_modeswitch/05c7:1000
 usr/share/usb_modeswitch/072f:100d
@@ -130,6 +132,7 @@ usr/share/usb_modeswitch/12d1:1523
 usr/share/usb_modeswitch/12d1:1553
 usr/share/usb_modeswitch/12d1:1557
 usr/share/usb_modeswitch/12d1:1c0b
+usr/share/usb_modeswitch/12d1:1d50
 usr/share/usb_modeswitch/12d1:1da1
 usr/share/usb_modeswitch/12d1:380b
 usr/share/usb_modeswitch/1307:1169
@@ -138,10 +141,12 @@ usr/share/usb_modeswitch/1410:5020
 usr/share/usb_modeswitch/1410:5030
 usr/share/usb_modeswitch/1410:5031
 usr/share/usb_modeswitch/1410:5041
+usr/share/usb_modeswitch/1410:5059
 usr/share/usb_modeswitch/148e:a000
 usr/share/usb_modeswitch/148f:2578
 usr/share/usb_modeswitch/16d8:6281
 usr/share/usb_modeswitch/16d8:6803
+usr/share/usb_modeswitch/16d8:6804
 usr/share/usb_modeswitch/16d8:700a
 usr/share/usb_modeswitch/16d8:700b
 usr/share/usb_modeswitch/16d8:f000
@@ -158,6 +163,7 @@ usr/share/usb_modeswitch/19d2:0103
 usr/share/usb_modeswitch/19d2:0110
 usr/share/usb_modeswitch/19d2:0115
 usr/share/usb_modeswitch/19d2:0149
+usr/share/usb_modeswitch/19d2:0166
 usr/share/usb_modeswitch/19d2:1001
 usr/share/usb_modeswitch/19d2:1007
 usr/share/usb_modeswitch/19d2:1009
@@ -168,8 +174,10 @@ usr/share/usb_modeswitch/19d2:1179
 usr/share/usb_modeswitch/19d2:1201
 usr/share/usb_modeswitch/19d2:1216
 usr/share/usb_modeswitch/19d2:1224
+usr/share/usb_modeswitch/19d2:1517
 usr/share/usb_modeswitch/19d2:2000
 usr/share/usb_modeswitch/19d2:bccd
+usr/share/usb_modeswitch/19d2:ffde
 usr/share/usb_modeswitch/19d2:ffe6
 usr/share/usb_modeswitch/19d2:fff5
 usr/share/usb_modeswitch/19d2:fff6
@@ -177,14 +185,18 @@ usr/share/usb_modeswitch/1a8d:1000
 usr/share/usb_modeswitch/1ab7:5700
 usr/share/usb_modeswitch/1b7d:0700
 usr/share/usb_modeswitch/1bbb:f000
+usr/share/usb_modeswitch/1bbb:f052
 usr/share/usb_modeswitch/1c9e:1001
 usr/share/usb_modeswitch/1c9e:6061
 usr/share/usb_modeswitch/1c9e:9200
 usr/share/usb_modeswitch/1c9e:9800
 usr/share/usb_modeswitch/1c9e:9e00
 usr/share/usb_modeswitch/1c9e:f000
+usr/share/usb_modeswitch/1da5:f000
 usr/share/usb_modeswitch/1dd6:1000
+usr/share/usb_modeswitch/1de1:1101
 usr/share/usb_modeswitch/1e0e:f000
+usr/share/usb_modeswitch/1e89:f000
 usr/share/usb_modeswitch/1edf:6003
 usr/share/usb_modeswitch/1ee8:0009
 usr/share/usb_modeswitch/1ee8:0013

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

diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
index b4f854cdb60daead2a7eef053301b68dca7882bf..59f97cfc8512e48181ec831cc29e608764e24a10 100644 (file)
--- a/config/rootfiles/core/54/update.sh
+++ b/config/rootfiles/core/54/update.sh
@@ -39,6 +39,10 @@ done
 /etc/init.d/squid stop
 /etc/init.d/snort stop
 
+#
+# Flush old usb-modeswitch data
+rm -rf /usr/share/usb_modeswitch
+
 #
 #Extract files
 extract_files

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index eea2c01ace4abb2da7d563178c94bdd53b82e651..0fb7c930a7e334d9e6a47aa665cb004c13658c3a 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1031,6 +1031,7 @@ END
            nsComment="OpenSSL Generated Certificate"
            subjectKeyIdentifier=hash
            authorityKeyIdentifier=keyid,issuer:always
+           extendedKeyUsage = serverAuth
 END
 ;
            print $fh "subjectAltName=$cgiparams{'SUBJECTALTNAME'}" if ($cgiparams{'SUBJECTALTNAME'});

diff --git a/lfs/GeoIP b/lfs/GeoIP
index d90a4c30b0cb89ec9c87b338f73d0dc3116c672e..653d654e855154ad8dc41435c68f4519675fb2e9 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 01072011
+DATVER     = 06122011
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 437a8fe09af2726856c1090615e27965
+GeoIP.dat-$(DATVER).gz_MD5 = 78baa14e4e271f5fb9f75e5ff1169950
 
 install : $(TARGET)
 

diff --git a/lfs/fw_ath9k_htc b/lfs/fw_ath9k_htc
new file mode 100644 (file)
index 0000000..ebd686e
--- /dev/null
+++ b/lfs/fw_ath9k_htc
@@ -0,0 +1,75 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.3
+
+THISAPP    = fw_ath9k_htc-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6e83c7d87007e3edd700034990cccd61
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && cp -v htc*.fw /lib/firmware
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index e5ae0ed791690309c24baa7c64df38616bd176e3..1d6ac81343bc536296271e90a16eb1c854494814 100644 (file)
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.9
+VER        = 1.2.0
 
 THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 76f6978f18cac41f269a346a5d0f1052
+$(DL_FILE)_MD5 = 1932ab96d6e3c5e0a6bdfac863338627
 
 install : $(TARGET)
 

diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index 486aa2d8da905f204f7d3787afb55b887fefc942..990c95087018f650bc27d521a6b5c1209e2f6e2b 100644 (file)
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20110805
+VER        = 20111023
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0ed8a28f8efd3177a128ecd46fc8bf9f
+$(DL_FILE)_MD5 = 6e7cb67d0428bda241600b038ba11aeb
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index f59678d71a854c2f8926ba5edf4493a227190225..3271a9e63db776be8eec0c60c68a73b6c24058b7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -364,6 +364,7 @@ buildipfire() {
   ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
+  ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
   # The xen and PAE kernels are only available for x86