Add new usb network devices to kudzu

Add speed.cgi to updater

diff --git a/config/rootfiles/updater/filelists/kudzu b/config/rootfiles/updater/filelists/kudzu
new file mode 100644 (file)
index 0000000..f919925
--- /dev/null
+++ b/config/rootfiles/updater/filelists/kudzu
@@ -0,0 +1,184 @@
+#etc/rc.d/init.d/kudzu
+#etc/sysconfig/kudzu
+sbin/kudzu
+#usr/include/kudzu
+#usr/include/kudzu/adb.h
+#usr/include/kudzu/alias.h
+#usr/include/kudzu/ddc.h
+#usr/include/kudzu/device.h
+#usr/include/kudzu/firewire.h
+#usr/include/kudzu/ide.h
+#usr/include/kudzu/isapnp.h
+#usr/include/kudzu/keyboard.h
+#usr/include/kudzu/kudzu.h
+#usr/include/kudzu/macio.h
+#usr/include/kudzu/misc.h
+#usr/include/kudzu/modules.h
+#usr/include/kudzu/parallel.h
+#usr/include/kudzu/pci.h
+#usr/include/kudzu/pcmcia.h
+#usr/include/kudzu/psaux.h
+#usr/include/kudzu/sbus.h
+#usr/include/kudzu/scsi.h
+#usr/include/kudzu/serial.h
+#usr/include/kudzu/usb.h
+#usr/lib/libkudzu.a
+#usr/lib/libkudzu_loader.a
+#usr/lib/python2.4/site-packages/_kudzumodule.so
+#usr/lib/python2.4/site-packages/drv_libxml2.pyc
+#usr/lib/python2.4/site-packages/kudzu.py
+#usr/lib/python2.4/site-packages/kudzu.pyc
+#usr/lib/python2.4/site-packages/libxml2.pyc
+#usr/lib/python2.4/site-packages/snack.pyc
+usr/sbin/kudzu
+#usr/share/locale/ar
+#usr/share/locale/ar/LC_MESSAGES
+#usr/share/locale/ar/LC_MESSAGES/kudzu.mo
+#usr/share/locale/as
+#usr/share/locale/as/LC_MESSAGES
+#usr/share/locale/as/LC_MESSAGES/kudzu.mo
+#usr/share/locale/be/LC_MESSAGES/kudzu.mo
+#usr/share/locale/bg
+#usr/share/locale/bg/LC_MESSAGES
+#usr/share/locale/bg/LC_MESSAGES/kudzu.mo
+#usr/share/locale/bn
+#usr/share/locale/bn/LC_MESSAGES
+#usr/share/locale/bn/LC_MESSAGES/kudzu.mo
+#usr/share/locale/bn_IN
+#usr/share/locale/bn_IN/LC_MESSAGES
+#usr/share/locale/bn_IN/LC_MESSAGES/kudzu.mo
+#usr/share/locale/bs
+#usr/share/locale/bs/LC_MESSAGES
+#usr/share/locale/bs/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ca/LC_MESSAGES/kudzu.mo
+#usr/share/locale/cs/LC_MESSAGES/kudzu.mo
+#usr/share/locale/cy
+#usr/share/locale/cy/LC_MESSAGES
+#usr/share/locale/cy/LC_MESSAGES/kudzu.mo
+#usr/share/locale/da/LC_MESSAGES/kudzu.mo
+#usr/share/locale/de/LC_MESSAGES/kudzu.mo
+#usr/share/locale/el/LC_MESSAGES/kudzu.mo
+#usr/share/locale/en_GB/LC_MESSAGES/kudzu.mo
+#usr/share/locale/es/LC_MESSAGES/kudzu.mo
+#usr/share/locale/et/LC_MESSAGES/kudzu.mo
+#usr/share/locale/eu_ES
+#usr/share/locale/eu_ES/LC_MESSAGES
+#usr/share/locale/eu_ES/LC_MESSAGES/kudzu.mo
+#usr/share/locale/fi/LC_MESSAGES/kudzu.mo
+#usr/share/locale/fr/LC_MESSAGES/kudzu.mo
+#usr/share/locale/gl/LC_MESSAGES/kudzu.mo
+#usr/share/locale/gu
+#usr/share/locale/gu/LC_MESSAGES
+#usr/share/locale/gu/LC_MESSAGES/kudzu.mo
+#usr/share/locale/he
+#usr/share/locale/he/LC_MESSAGES
+#usr/share/locale/he/LC_MESSAGES/kudzu.mo
+#usr/share/locale/hi
+#usr/share/locale/hi/LC_MESSAGES
+#usr/share/locale/hi/LC_MESSAGES/kudzu.mo
+#usr/share/locale/hr/LC_MESSAGES/kudzu.mo
+#usr/share/locale/hu/LC_MESSAGES/kudzu.mo
+#usr/share/locale/hy
+#usr/share/locale/hy/LC_MESSAGES
+#usr/share/locale/hy/LC_MESSAGES/kudzu.mo
+#usr/share/locale/id
+#usr/share/locale/id/LC_MESSAGES
+#usr/share/locale/id/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ilo
+#usr/share/locale/ilo/LC_MESSAGES
+#usr/share/locale/ilo/LC_MESSAGES/kudzu.mo
+#usr/share/locale/is
+#usr/share/locale/is/LC_MESSAGES
+#usr/share/locale/is/LC_MESSAGES/kudzu.mo
+#usr/share/locale/it/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ja/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ka
+#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/kudzu.mo
+#usr/share/locale/kn
+#usr/share/locale/kn/LC_MESSAGES
+#usr/share/locale/kn/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ko/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ku
+#usr/share/locale/ku/LC_MESSAGES
+#usr/share/locale/ku/LC_MESSAGES/kudzu.mo
+#usr/share/locale/lo
+#usr/share/locale/lo/LC_MESSAGES
+#usr/share/locale/lo/LC_MESSAGES/kudzu.mo
+#usr/share/locale/lt
+#usr/share/locale/lt/LC_MESSAGES
+#usr/share/locale/lt/LC_MESSAGES/kudzu.mo
+#usr/share/locale/lv
+#usr/share/locale/lv/LC_MESSAGES
+#usr/share/locale/lv/LC_MESSAGES/kudzu.mo
+#usr/share/locale/mk
+#usr/share/locale/mk/LC_MESSAGES
+#usr/share/locale/mk/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ml
+#usr/share/locale/ml/LC_MESSAGES
+#usr/share/locale/ml/LC_MESSAGES/kudzu.mo
+#usr/share/locale/mr
+#usr/share/locale/mr/LC_MESSAGES
+#usr/share/locale/mr/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/kudzu.mo
+#usr/share/locale/my
+#usr/share/locale/my/LC_MESSAGES
+#usr/share/locale/my/LC_MESSAGES/kudzu.mo
+#usr/share/locale/nb/LC_MESSAGES/kudzu.mo
+#usr/share/locale/nl/LC_MESSAGES/kudzu.mo
+#usr/share/locale/nn
+#usr/share/locale/nn/LC_MESSAGES
+#usr/share/locale/nn/LC_MESSAGES/kudzu.mo
+#usr/share/locale/no
+#usr/share/locale/no/LC_MESSAGES
+#usr/share/locale/no/LC_MESSAGES/kudzu.mo
+#usr/share/locale/or
+#usr/share/locale/or/LC_MESSAGES
+#usr/share/locale/or/LC_MESSAGES/kudzu.mo
+#usr/share/locale/pa
+#usr/share/locale/pa/LC_MESSAGES
+#usr/share/locale/pa/LC_MESSAGES/kudzu.mo
+#usr/share/locale/pl/LC_MESSAGES/kudzu.mo
+#usr/share/locale/pt
+#usr/share/locale/pt/LC_MESSAGES
+#usr/share/locale/pt/LC_MESSAGES/kudzu.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ro/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ru/LC_MESSAGES/kudzu.mo
+#usr/share/locale/si
+#usr/share/locale/si/LC_MESSAGES
+#usr/share/locale/si/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sk/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sl/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sq
+#usr/share/locale/sq/LC_MESSAGES
+#usr/share/locale/sq/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sr
+#usr/share/locale/sr/LC_MESSAGES
+#usr/share/locale/sr/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sr@Latn
+#usr/share/locale/sr@Latn/LC_MESSAGES
+#usr/share/locale/sr@Latn/LC_MESSAGES/kudzu.mo
+#usr/share/locale/sv/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ta
+#usr/share/locale/ta/LC_MESSAGES
+#usr/share/locale/ta/LC_MESSAGES/kudzu.mo
+#usr/share/locale/te
+#usr/share/locale/te/LC_MESSAGES
+#usr/share/locale/te/LC_MESSAGES/kudzu.mo
+#usr/share/locale/tr/LC_MESSAGES/kudzu.mo
+#usr/share/locale/uk/LC_MESSAGES/kudzu.mo
+#usr/share/locale/ur
+#usr/share/locale/ur/LC_MESSAGES
+#usr/share/locale/ur/LC_MESSAGES/kudzu.mo
+#usr/share/locale/vi
+#usr/share/locale/vi/LC_MESSAGES
+#usr/share/locale/vi/LC_MESSAGES/kudzu.mo
+#usr/share/locale/wa
+#usr/share/locale/wa/LC_MESSAGES
+#usr/share/locale/wa/LC_MESSAGES/kudzu.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/kudzu.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/kudzu.mo
+#usr/share/man/man8/kudzu.8

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index cb34fd9771d2c236c2dec2b2b571d5b7a5040ce3..5d637c287037426b1d2f1db4284411c8f0215f37 100644 (file)
--- a/config/rootfiles/updater/filelists/other
+++ b/config/rootfiles/updater/filelists/other
@@ -7,6 +7,7 @@ etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/red.up/40-ipac
 usr/local/bin/getiptstate
 usr/local/bin/makegraphs
+srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 var/ipfire/sensors/

diff --git a/src/patches/kudzu-usbnet.patch b/src/patches/kudzu-usbnet.patch
index a33c6fb708182c7fbba5753e8bc8dab6ad247b6e..79481b9bae371703424cd01d1064c43d3ca8b43c 100644 (file)
--- a/src/patches/kudzu-usbnet.patch
+++ b/src/patches/kudzu-usbnet.patch
@@ -1,11 +1,24 @@
 diff -Naur kudzu.org/usb.c kudzu-1.2.64/usb.c
---- kudzu-1.2.64/usb.c 2006-11-28 17:58:58.000000000 +0100
-+++ kudzu-1.2.64/usb.c 2007-11-29 09:24:35.000000000 +0100
-@@ -268,6 +268,7 @@
+--- kudzu.org/usb.c    2006-11-28 17:58:58.000000000 +0100
++++ kudzu-1.2.64/usb.c 2008-06-11 19:27:36.000000000 +0200
+@@ -264,10 +264,20 @@
+                       if (t->driver && (!strcmp(t->driver, "pegasus") ||
+                           !strcmp(t->driver, "catc") ||
+                           !strcmp(t->driver, "kaweth") ||
++                          !strcmp(t->driver, "cdc_ether") ||
++                          !strcmp(t->driver, "gl620a") ||
++                          !strcmp(t->driver, "net1080") ||
++                          !strcmp(t->driver, "plusb") ||
++                          !strcmp(t->driver, "rndis_host") ||
++                          !strcmp(t->driver, "zaurus") ||
++                          !strcmp(t->driver, "net1080") ||
+                           !strcmp(t->driver, "rtl8150") ||
                            !strcmp(t->driver, "ax8817x") ||
++                          !strcmp(t->driver, "zd1211rw") ||
                            !strcmp(t->driver, "zd1201") ||
                            !strcmp(t->driver, "asix") ||
-+                          !strcmp(t->driver, "mcs7830") || !strcmp(t->driver, "dm9601") ||
++                          !strcmp(t->driver, "mcs7830") || 
++                          !strcmp(t->driver, "dm9601") ||
                            !strcmp(t->driver, "usbnet"))) {
                                if (t->type == CLASS_OTHER)
                                        t->type = CLASS_NETWORK;