move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@4944 3c298f89-4303-0410-b956-a3cf2f4a3e73

13 files changed, 0 insertions, 255 deletions

diff --git a/openwrt/package/ulogd/Config.in b/openwrt/package/ulogd/Config.in
deleted file mode 100644
index 875a148bd..000000000
--- a/openwrt/package/ulogd/Config.in
+++ /dev/null
@@ -1,47 +0,0 @@
-menu "ulogd............................. Netfilter userspace logging daemon"
-
-config BR2_PACKAGE_ULOGD
-	prompt "ulogd............................. Netfilter userspace logging daemon"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPTABLES
-	help
-	  The netfilter userspace logging daemon
-	  
-	  http://gnumonks.org/projects/ulogd
-
-config BR2_PACKAGE_ULOGD_MOD_MYSQL
-	prompt   "ulogd-mod-mysql................. Output plugin for logging into a MySQL database"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ULOGD
-	select BR2_PACKAGE_LIBMYSQLCLIENT
-
-config BR2_PACKAGE_ULOGD_MOD_PCAP
-        prompt  "ulogd-mod-pcap................... Output plugin for logging into pcap format"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ULOGD
-	select BR2_PACKAGE_LIBPCAP
-
-config BR2_PACKAGE_ULOGD_MOD_PGSQL
-	prompt   "ulogd-mod-pgsql................. Output plugin for logging into a PostgreSQL database"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ULOGD
-	select BR2_PACKAGE_LIBPQ
-
-config BR2_PACKAGE_ULOGD_MOD_SQLITE
-	prompt   "ulogd-mod-sqlite................ Output plugin for logging into an SQLite database"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ULOGD
-	select BR2_PACKAGE_LIBSQLITE
-
-config BR2_PACKAGE_ULOGD_MOD_EXTRA
-	prompt   "ulogd-mod-extra................. All other plugins"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ULOGD
-
-endmenu
diff --git a/openwrt/package/ulogd/Makefile b/openwrt/package/ulogd/Makefile
deleted file mode 100644
index 85b7b08ce..000000000
--- a/openwrt/package/ulogd/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ulogd
-PKG_VERSION:=1.24
-PKG_RELEASE:=1
-PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
-
-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
-	ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
-	ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \
-	ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_MYSQL),)
-ULOGD_MYSQL_OPTION:=--with-mysql=$(STAGING_DIR)/usr
-endif
-
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_PCAP),)
-ULOGD_PCAP_HEADER:=yes
-else
-ULOGD_PCAP_HEADER:=no
-endif
-
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)
-ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr
-endif
-
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_SQLITE),)
-ULOGD_SQLITE_OPTION:=--with-sqlite3=$(STAGING_DIR)/usr
-endif
-
-define IPKG_plugin_template
-
-$$(IPKG_$(1)):
-	install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \
-	done
-	$(RSTRIP) $$(IDIR_$(1))
-	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
-
-endef
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,ULOGD,ulogd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(eval $(call IPKG_plugin_template,ULOGD_MOD_MYSQL,MYSQL))
-$(eval $(call IPKG_plugin_template,ULOGD_MOD_PCAP,PCAP))
-$(eval $(call IPKG_plugin_template,ULOGD_MOD_PGSQL,PGSQL))
-$(eval $(call IPKG_plugin_template,ULOGD_MOD_SQLITE,SQLITE3))
-$(eval $(call IPKG_plugin_template,ULOGD_MOD_EXTRA,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG))
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		ac_cv_header_pcap_h=$(ULOGD_PCAP_HEADER) \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--disable-static \
-			$(ULOGD_MYSQL_OPTION) \
-			$(ULOGD_PGSQL_OPTION) \
-			$(ULOGD_SQLITE_OPTION) \
-	);
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		STAGING_DIR=$(STAGING_DIR) \
-		all install
-	touch $@
-
-$(IPKG_ULOGD):
-	install -d -m0755 $(IDIR_ULOGD)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/
-	install -d -m0755 $(IDIR_ULOGD)/etc/default
-	install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd
-	install -d -m0755 $(IDIR_ULOGD)/etc/init.d
-	install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd
-	ln -sf ulogd $(IDIR_ULOGD)/etc/init.d/S49ulogd
-	install -d -m0755 $(IDIR_ULOGD)/usr/lib/ulogd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/
-	install -d -m0755 $(IDIR_ULOGD)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/
-	$(RSTRIP) $(IDIR_ULOGD)
-	$(IPKG_BUILD) $(IDIR_ULOGD) $(PACKAGE_DIR)
-
diff --git a/openwrt/package/ulogd/files/ulogd.default b/openwrt/package/ulogd/files/ulogd.default
deleted file mode 100644
index 86bf44480..000000000
--- a/openwrt/package/ulogd/files/ulogd.default
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS="-d"
\ No newline at end of file
diff --git a/openwrt/package/ulogd/files/ulogd.init b/openwrt/package/ulogd/files/ulogd.init
deleted file mode 100644
index d3863c5f2..000000000
--- a/openwrt/package/ulogd/files/ulogd.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-BIN=ulogd
-DEFAULT=/etc/default/$BIN
-LOG_D=/var/log
-[ -f $DEFAULT ] && . $DEFAULT
-
-case $1 in
- start)
-  $BIN $OPTIONS
-  ;;
- *)
-  echo "usage: $0 (start)"
-  exit 1
-esac
-
-exit $?
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-extra.control b/openwrt/package/ulogd/ipkg/ulogd-mod-extra.control
deleted file mode 100644
index 95332ba34..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-extra.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ulogd-mod-extra
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon (extra plugins)
-Depends: ulogd
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control b/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control
deleted file mode 100644
index 3556bb155..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ulogd-mod-mysql
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon (MySQL plugin)
-Depends: libmysqlclient, ulogd
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-pcap.control b/openwrt/package/ulogd/ipkg/ulogd-mod-pcap.control
deleted file mode 100644
index 521ad94e8..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-pcap.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ulogd-mod-pcap
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon (PCAP plugin)
-Depends: libpcap, ulogd
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control b/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control
deleted file mode 100644
index dbc97765d..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ulogd-mod-pgsql
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon (PostgreSQL plugin)
-Depends: libpq, ulogd
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-sqlite.control b/openwrt/package/ulogd/ipkg/ulogd-mod-sqlite.control
deleted file mode 100644
index d76b2d62f..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-sqlite.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ulogd-mod-sqlite
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon (SQLite plugin)
-Depends: libsqlite, ulogd
diff --git a/openwrt/package/ulogd/ipkg/ulogd.conffiles b/openwrt/package/ulogd/ipkg/ulogd.conffiles
deleted file mode 100644
index 4d41604a9..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/default/ulogd
-/etc/ulogd.conf
diff --git a/openwrt/package/ulogd/ipkg/ulogd.control b/openwrt/package/ulogd/ipkg/ulogd.control
deleted file mode 100644
index 48eda41f3..000000000
--- a/openwrt/package/ulogd/ipkg/ulogd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: ulogd
-Priority: optional
-Section: net
-Description: Netfilter userspace logging daemon
diff --git a/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch b/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch
deleted file mode 100644
index b4721121f..000000000
--- a/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN ulogd-1.23-old/Rules.make.in ulogd-1.23-new/Rules.make.in
---- ulogd-1.23-old/Rules.make.in	2005-02-19 22:32:40.000000000 +0100
-+++ ulogd-1.23-new/Rules.make.in	2005-05-27 07:45:18.000000000 +0200
-@@ -22,7 +22,7 @@
- CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
- # doesn't work for subdirs
- #CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
--CFLAGS+=-I/lib/modules/`uname -r`/build/include
-+#CFLAGS+=-I/lib/modules/`uname -r`/build/include
- #CFLAGS+=@DEFS@
- #CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
- 
-diff -ruN ulogd-1.23-old/libipulog/Makefile.in ulogd-1.23-new/libipulog/Makefile.in
---- ulogd-1.23-old/libipulog/Makefile.in	2004-03-23 23:36:06.000000000 +0100
-+++ ulogd-1.23-new/libipulog/Makefile.in	2005-05-27 07:44:21.000000000 +0200
-@@ -1,7 +1,7 @@
- #
- 
- include @top_srcdir@/Rules.make
--CFLAGS+=-Iinclude -I/usr/src/linux/include
-+CFLAGS+=-Iinclude
- 
- libipulog.a: libipulog.o
- 	$(LD) -i $< -o $@
diff --git a/openwrt/package/ulogd/patches/ulogd-1.23-pcap_ldflags.patch b/openwrt/package/ulogd/patches/ulogd-1.23-pcap_ldflags.patch
deleted file mode 100644
index d45182329..000000000
--- a/openwrt/package/ulogd/patches/ulogd-1.23-pcap_ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ulogd-1.23/pcap/Makefile.in ulogd-1.23.new/pcap/Makefile.in
---- ulogd-1.23/pcap/Makefile.in	2004-03-23 23:36:04.000000000 +0100
-+++ ulogd-1.23.new/pcap/Makefile.in	2006-04-19 11:30:45.000000000 +0200
-@@ -14,7 +14,7 @@
- distrib:
- 
- $(SHARED_LIBS): %.so: %_sh.o
--	$(LD) -shared -o $@ $< -lc -lpcap
-+	$(LD) -shared -o $@ $< -lc -lpcap -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
- 
- %_sh.o: %.c
- 	$(CC) $(SH_CFLAGS) -o $@ -c $<