Merge commit 'origin/xen'

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 2c84d21bb1e1139f94f8792f3b594bc7224efc75..0f557855028d0bcd984fb60c707bbfa548352b0b 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -31,6 +31,7 @@ etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
 #etc/rc.d/init.d/hostapd
+#etc/rc.d/init.d/icecream
 #etc/rc.d/init.d/ipfireseeder
 etc/rc.d/init.d/ipsec
 #etc/rc.d/init.d/lcr

diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index cc56a0b62fb156a669f7e5a901d729cdaca32d9d..ca979c648871b15ecd656342d411eabdc10cb1d0 100644 (file)
--- a/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@ -23,3 +23,5 @@ srv/web/ipfire/cgi-bin/mac.cgi
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/html/images/indicator.gif
 srv/web/ipfire/html/images/dns_link.png
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/index.cgi

diff --git a/config/rootfiles/core/30/exclude b/config/rootfiles/core/30/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/30/filelists/files b/config/rootfiles/core/30/filelists/files
new file mode 100644 (file)
index 0000000..4af6d78
--- /dev/null
+++ b/config/rootfiles/core/30/filelists/files
@@ -0,0 +1,6 @@
+lib/modules/2.6.27.25-ipfire/kernel/drivers/usb/serial/option.ko
+var/ipfire/langs/list
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/index.cgi

diff --git a/config/rootfiles/core/30/meta b/config/rootfiles/core/30/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/30/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/30/update.sh b/config/rootfiles/core/30/update.sh
new file mode 100644 (file)
index 0000000..f267862
--- /dev/null
+++ b/config/rootfiles/core/30/update.sh
@@ -0,0 +1,30 @@
+#!/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) 2009 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#Rebuild language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#Rebuild module dep's
+depmod -a

diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc
new file mode 100644 (file)
index 0000000..bc9bfca
--- /dev/null
+++ b/config/rootfiles/packages/icecc
@@ -0,0 +1,18 @@
+#opt/icecream
+#opt/icecream/bin
+#opt/icecream/bin/icecc
+#opt/icecream/include
+#opt/icecream/include/icecc
+#opt/icecream/include/icecc/comm.h
+#opt/icecream/include/icecc/job.h
+#opt/icecream/lib
+#opt/icecream/lib/icecc
+#opt/icecream/lib/icecc/icecc-create-env
+#opt/icecream/lib/libicecc.a
+#opt/icecream/lib/libicecc.la
+#opt/icecream/lib/pkgconfig
+#opt/icecream/lib/pkgconfig/icecc.pc
+#opt/icecream/sbin
+opt/icecream/sbin/icecc-scheduler
+opt/icecream/sbin/iceccd
+etc/init.d/icecream

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8d01bd029466e18dcbfab97ef73d8967ae9499a6..ef8f1cdb1df57795ef963b087f63937cece0b7c7 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -135,6 +135,7 @@
 * hwdata
 * iana-etc-2.10
 * icecast-2.3.2
+* icecream-0.9.4.8
 * icegenerator-0.5.5-pre2
 * iftop-0.17
 * igmpproxy-src-0.1-beta2

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index cca4bdf4b90c75432c34f5b397aab0fb11d45b56..b0a90181d1e4328437e783c07f29fb122505d33c 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -167,18 +167,52 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
 
 if ($death == 0 && $rebirth == 0) {
 
-print <<END
+if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
+       print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='100%'>
-<tr>
+  <tr>
+    <td colspan="3" align='left'><font color="red">$Lang::tr{'reboot sure'}</font></td>
+    </tr>
+  <tr>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+</tr>
+</table>
+</form>
+END
+;
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
+       print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%'>
+  <tr>
+    <td colspan="3" align='right'><font color="red">$Lang::tr{'shutdown sure'}</font></td>
+    </tr>
+  <tr>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
        <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
 </tr>
 </table>
 </form>
 END
 ;
+} else {
+print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%'>
+<tr>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+</tr>
+</table>
+</form>
+END
+;
+}
 print <<END;
 
 <!-- Table of networks -->
@@ -392,7 +426,9 @@ END
 </div>
 END
 ;
-}
+
+} 
+
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 2eb125a4fb4e6db20776cfaae2cd16e07f4079e8..49031d0fdbd19c8ec213e10e6468605c651911aa 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -1084,6 +1084,7 @@ END
                <tr><td width='33%' align='right'>$Lang::tr{'destination ip'}:
                    <td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
                    <td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
+               <tr><td colspan="3" align='center'><font color="red"><em>$Lang::tr{'qos warning'}</em></font>
                </table></form>
 END
 ;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 9d5740993bf9bb96f71aa5a840904d6f079381ea..014262d4a3c95ec91d8d277a22589d5304e9f24e 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1369,12 +1369,15 @@
 'pulse' => 'Puls',
 'pulse dial' => 'Pulswahl:',
 'qos graphs' => 'Qos Diagramme',
+'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM-Speicher',
 'read bytes' => 'Gelesene Bytes',
 'read list' => 'Liste der Leseberechtigten',
 'real address' => 'Reale Addresse',
 'reboot' => 'Neustart',
+'reboot ask' => 'Neustart?',
+'reboot sure' => 'Sind Sie sicher, dass Sie neustarten wollen?',
 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts',
 'rebooting' => 'Starte neu ...',
 'rebooting ipfire' => 'Starte IPFire neu',
@@ -1485,6 +1488,8 @@
 'show root certificate' => 'Root-Zertifikat anzeigen',
 'show share options' => 'Anzeige der Freigabeeinstellungen',
 'shutdown' => 'Herunterfahren',
+'shutdown ask' => 'Herunterfahren?',
+'shutdown sure' => 'Sind Sie sicher, dass Sie herunterfahren wollen?',
 'shutdown control' => 'Herunterfahren',
 'shutdown2' => 'Herunterfahren:',
 'shutting down' => 'Fahre herunter',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f2a0bdb499b2eb36bb676b987102d3b9137ec200..76aaae9f040d1f1c646276692c8b1bb0e053dc34 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1397,6 +1397,7 @@
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos graphs' => 'Qos Graphs',
+'qos warning' => 'The rule <strong>must</strong> be saved, otherwise it will be discarded!',
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
@@ -1404,6 +1405,8 @@
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
+'reboot ask' => 'Reboot?',
+'reboot sure' => 'Are you sure that you want to reboot?',
 'reboot schedule' => 'Schedule IPFire reboots',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
@@ -1517,6 +1520,8 @@
 'show root certificate' => 'Show Root Certificate',
 'show share options' => 'show shares options',
 'shutdown' => 'Shutdown',
+'shutdown ask' => 'Shutdown?',
+'shutdown sure' => 'Are you sure that you want to shutdown?',
 'shutdown control' => 'Shutdown control',
 'shutdown2' => 'Shutdown:',
 'shutting down' => 'Shutting down',

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 7c77f92f0a91fd4f31f43a8b91d52638bab41cb8..5ad94224231bfef3cf4d4060bac05de00285cfb1 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -103,5 +103,10 @@ endif
 
        # Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
        echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
+
+       # Remove original kernel rtl818x modules (compat wireless use the
+       # place of newer kernels and so not overwrite it...
+       -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
+
        @$(POSTBUILD)
 

diff --git a/lfs/icecc b/lfs/icecc
new file mode 100644 (file)
index 0000000..a5b7af4
--- /dev/null
+++ b/lfs/icecc
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        = 0.9.4.8
+
+THISAPP    = icecream-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = icecc
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/opt/icecream
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/linux b/lfs/linux
index 1fe1654f32a6643fe77dad77cae889d3b96e840a..db4c0e10a38b1cbb5eec8e0919f57b75d5bd70b1 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -102,6 +102,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Not report deprecated syscall 1.23 (for kudzu)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
     
+       # Add Vodafone K3565-Z USB ID's to option driver
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
+
        # Reiser4
        cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
        

diff --git a/make.sh b/make.sh
index de96a6303ad8b034e55ab81a4561d5d663bb0961..fe07377e92c00a19102444538738373288c9f056 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.5"
-CORE="29"
+CORE="30"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -613,6 +613,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
   ipfiremake cacti
+  ipfiremake icecc
   ipfiremake open-vm-tools
   ipfiremake nagiosql
   ipfiremake iftop

diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream
new file mode 100644 (file)
index 0000000..6ce4660
--- /dev/null
+++ b/src/initscripts/init.d/icecream
@@ -0,0 +1,54 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/icecream
+#
+# Description : This is a script that starts the icecream daemon.
+#
+# Authors     : Michael Tremer (mitch@ipfire.org)
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+SCHEDULER=minerva.ipfire.org
+JOBS=8
+PORT=10244
+
+case "${1}" in
+       start)
+               boot_mesg "Starting Icecream Daemon..."
+               /opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT}
+               evaluate_retval
+               if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then
+                       echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config
+                       /usr/local/bin/setxtaccess
+               fi
+               ;;
+               
+       stop)
+               boot_mesg "Stopping Icecream Daemon..."
+               killproc /opt/icecream/sbin/iceccd
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /opt/icecream/sbin/iceccd
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|reload|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/icecream

diff --git a/src/paks/icecc/install.sh b/src/paks/icecc/install.sh
new file mode 100644 (file)
index 0000000..fa9a22d
--- /dev/null
+++ b/src/paks/icecc/install.sh
@@ -0,0 +1,26 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+start_service --delay 90 --background icecream

diff --git a/src/paks/icecc/uninstall.sh b/src/paks/icecc/uninstall.sh
new file mode 100644 (file)
index 0000000..36331ef
--- /dev/null
+++ b/src/paks/icecc/uninstall.sh
@@ -0,0 +1,26 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service icecream
+remove_files

diff --git a/src/paks/icecc/update.sh b/src/paks/icecc/update.sh
new file mode 100644 (file)
index 0000000..88f1f3a
--- /dev/null
+++ b/src/paks/icecc/update.sh
@@ -0,0 +1,26 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/etc/init.d/icecream stop
+./install.sh

diff --git a/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch b/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
new file mode 100644 (file)
index 0000000..08df38e
--- /dev/null
+++ b/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
@@ -0,0 +1,26 @@
+diff -Naur linux-2.6.27.25.org/drivers/usb/serial/option.c linux-2.6.27.25/drivers/usb/serial/option.c
+--- linux-2.6.27.25.org/drivers/usb/serial/option.c    2009-06-12 05:04:50.000000000 +0200
++++ linux-2.6.27.25/drivers/usb/serial/option.c        2009-07-30 10:19:36.000000000 +0200
+@@ -286,6 +286,12 @@
+ #define ZTE_PRODUCT_MF622                     0x0001
+ #define ZTE_PRODUCT_MF628                     0x0015
+ #define ZTE_PRODUCT_MF626                     0x0031
++
++/* Vodafone K3565-Z - pid depends on firmware version */
++#define ZTE_PRODUCT_VFK3565_1                 0x0049
++#define ZTE_PRODUCT_VFK3565_2                 0x0052
++#define ZTE_PRODUCT_VFK3565_3                 0x0063
++
+ #define ZTE_PRODUCT_CDMA_TECH                 0xfffe
+ 
+ #define BENQ_VENDOR_ID                                0x04a5
+@@ -500,6 +506,9 @@
+       { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622) },
+       { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) },
+       { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
++      { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_VFK3565_1) },
++      { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_VFK3565_2) },
++      { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_VFK3565_3) },
+       { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
+       { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
+       { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */