kudzu: removed.

diff --git a/config/rootfiles/common/kudzu b/config/rootfiles/common/kudzu
deleted file mode 100644 (file)
index 5776f0f..0000000
--- a/config/rootfiles/common/kudzu
+++ /dev/null
@@ -1,198 +0,0 @@
-#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.7/lib2to3/tests/data/bom.pyc
-#usr/lib/python2.7/lib2to3/tests/data/crlf.pyc
-#usr/lib/python2.7/lib2to3/tests/data/different_encoding.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/__init__.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_explicit.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_first.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_last.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_parrot.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_preorder.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/no_fixer_cls.pyc
-#usr/lib/python2.7/lib2to3/tests/data/fixers/parrot_example.pyc
-#usr/lib/python2.7/lib2to3/tests/data/infinite_recursion.pyc
-#usr/lib/python2.7/lib2to3/tests/data/py2_test_grammar.pyc
-#usr/lib/python2.7/site-packages/_kudzumodule.so
-#usr/lib/python2.7/site-packages/drv_libxml2.pyc
-#usr/lib/python2.7/site-packages/kudzu.py
-#usr/lib/python2.7/site-packages/kudzu.pyc
-#usr/lib/python2.7/site-packages/libxslt.pyc
-#usr/lib/python2.7/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/installer/kudzu b/config/rootfiles/installer/kudzu
deleted file mode 120000 (symlink)
index da66b91..0000000
--- a/config/rootfiles/installer/kudzu
+++ /dev/null
@@ -1 +0,0 @@
-../common/kudzu
\ No newline at end of file

diff --git a/lfs/kudzu b/lfs/kudzu
deleted file mode 100644 (file)
index bc5ed02..0000000
--- a/lfs/kudzu
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  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        = 1.2.64
-
-THISAPP    = kudzu-$(VER)
-DL_FILE    = kudzu-$(VER).tar.gz
-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 = 3eb6fae5e8f62409fd5149f2079f6060
-
-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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kudzu-usbnet.patch
-       rm -rf /usr/sbin/kudzu
-       cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make
-       cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install
-       cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install-program
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/linux2 b/lfs/linux2
index 9bedd535d5d1268a005aa7686a99f7e2d5d46f85..0a53bdc48d962f9026cce70bef16999417b14c40 100644 (file)
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -139,9 +139,6 @@ else
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif
 
-       # 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
-
        # Reiser4 (don't check if fail (some patches are already in xen patchset)
        -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
 

diff --git a/make.sh b/make.sh
index 781d477e060c96e04811c673c240c71a899ed247..e498300f4fc870e239e42a2b0d79e82bf9f518b3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -519,7 +519,6 @@ buildipfire() {
   ipfiremake mISDNuser
   ipfiremake capi4k-utils
   ipfiremake hwdata
-  ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs

diff --git a/src/patches/kudzu-link-lintl.diff b/src/patches/kudzu-link-lintl.diff
deleted file mode 100644 (file)
index ec3974c..0000000
--- a/src/patches/kudzu-link-lintl.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tmp/kudzu-1.2.60/Makefile  2006-09-05 15:56:21.000000000 +0200
-+++ build/usr/src/kudzu-1.2.60/Makefile        2006-11-20 15:08:32.000000000 +0100
-@@ -63,7 +63,7 @@
-       $(RANLIB) libkudzu.a
- 
- kudzu: libkudzu.a $(KUDOBJS) po
--      $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -Wl,-Bstatic -lpopt -Wl,-Bdynamic
-+      $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -L. -lintl -Wl,-Bstatic -lpopt -Wl,-Bdynamic
- 
- module_upgrade: libkudzu.a module_upgrade.c
-       $(CC) $(CFLAGS) $(LDFLAGS) module_upgrade.c -o module_upgrade -L. -lkudzu -lpci

diff --git a/src/patches/kudzu-usbnet.patch b/src/patches/kudzu-usbnet.patch
deleted file mode 100644 (file)
index 185d1a7..0000000
--- a/src/patches/kudzu-usbnet.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur kudzu-1.2.64.org/usb.c kudzu-1.2.64/usb.c
---- kudzu-1.2.64.org/usb.c     2006-11-28 17:58:58.000000000 +0100
-+++ kudzu-1.2.64/usb.c 2009-07-16 20:33:19.000000000 +0200
-@@ -261,13 +261,33 @@
-                               t->desc = strdup(t->usbprod);
-                       else
-                               asprintf(&t->desc,"Unknown USB device 0x%x:0x%x",t->vendorId,t->deviceId);
--                      if (t->driver && (!strcmp(t->driver, "pegasus") ||
-+                      if (t->driver && (!strcmp(t->driver, "asix") ||
-                           !strcmp(t->driver, "catc") ||
-+                          !strcmp(t->driver, "cdc_ether") ||
-+                          !strcmp(t->driver, "cdc_subset") ||
-+                          !strcmp(t->driver, "dm9601") ||
-+                          !strcmp(t->driver, "gl620a") ||
-                           !strcmp(t->driver, "kaweth") ||
-+                          !strcmp(t->driver, "mcs7830") || 
-+                          !strcmp(t->driver, "net1080") ||
-+                          !strcmp(t->driver, "pegasus") ||
-+                          !strcmp(t->driver, "plusb") ||
-+                          !strcmp(t->driver, "rndis_host") ||
-                           !strcmp(t->driver, "rtl8150") ||
--                          !strcmp(t->driver, "ax8817x") ||
-+                          !strcmp(t->driver, "zaurus") ||
-+                          !strcmp(t->driver, "rt2500usb") ||
-+                          !strcmp(t->driver, "rt2800usb") ||
-+                          !strcmp(t->driver, "rt2x00usb") ||
-+                          !strcmp(t->driver, "rt73usb") ||
-+                          !strcmp(t->driver, "ar9170usb") ||
-+                          !strcmp(t->driver, "libertas_tf_usb") ||
-+                          !strcmp(t->driver, "at76c50x-usb") ||
-+                          !strcmp(t->driver, "p54usb") ||
-+                          !strcmp(t->driver, "rndis_wlan") ||
-+                          !strcmp(t->driver, "rtl8187") ||
-+                          !strcmp(t->driver, "usb8xxx") ||
-                           !strcmp(t->driver, "zd1201") ||
--                          !strcmp(t->driver, "asix") ||
-+                          !strcmp(t->driver, "zd1211rw") ||
-                           !strcmp(t->driver, "usbnet"))) {
-                               if (t->type == CLASS_OTHER)
-                                       t->type = CLASS_NETWORK;

diff --git a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch b/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
deleted file mode 100644 (file)
index 7419c05..0000000
--- a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur linux-2.6.25.18.org/kernel/sysctl.c linux-2.6.25.18/kernel/sysctl.c
---- linux-2.6.25.18.org/kernel/sysctl.c        2008-10-09 04:58:32.000000000 +0200
-+++ linux-2.6.25.18/kernel/sysctl.c    2008-10-10 18:03:33.000000000 +0200
-@@ -2807,6 +2807,10 @@
-       if ((args->nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION))
-               return 0;
- 
-+      /* Ignore kudzu syscall 1.23 */
-+      if ((args->nlen == 2) && (name[0] == 1) && (name[1] == 23))
-+              return 0;
-+
-       if (msg_count < 5) {
-               msg_count++;
-               printk(KERN_INFO