update to latest upstream of ulogd and add dependencies

9 files changed, 74 insertions, 89 deletions

diff --git a/package/Config.in b/package/Config.in
index 29c32ede3..e5ffd2e07 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,6 +235,10 @@ source "package/ncurses/Config.in.lib"
 source "package/neon/Config.in"
 source "package/libnet/Config.in"
 source "package/libnet/Config.in.lib"
+source "package/libnetfilter_conntrack/Config.in"
+source "package/libnetfilter_conntrack/Config.in.lib"
+source "package/libnetfilter_log/Config.in"
+source "package/libnetfilter_log/Config.in.lib"
 source "package/libnetfilter_queue/Config.in"
 source "package/libnetfilter_queue/Config.in.lib"
 source "package/libnfsidmap/Config.in"
@@ -323,7 +327,6 @@ source "package/libxslt/Config.in"
 source "package/libxslt/Config.in.lib"
 source "package/lua/Config.in.lib"
 source "package/uclibc++/Config.in.manual"
-source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
new file mode 100644
index 000000000..83fc76459
--- /dev/null
+++ b/package/libnetfilter_conntrack/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libnetfilter_conntrack
+PKG_VERSION:=		0.0.101
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3c4b4048c914f2694c3ca6de2bb457dc
+PKG_DESCR:=		API to connection tracking state table
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libnfnetlink
+PKG_BUILDDEP+=		libnfnetlink
+PKG_URL:=		http://www.netfilter.org/projects/libnetfilter_conntrack/
+PKG_SITES:=		http://www.netfilter.org/projects/libnetfilter_conntrack/files/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBNETFILTER_CONNTRACK,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libnetfilter_conntrack*so* \
+		$(IDIR_LIBNETFILTER_CONNTRACK)/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile
new file mode 100644
index 000000000..24bc47cb5
--- /dev/null
+++ b/package/libnetfilter_log/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libnetfilter_log
+PKG_VERSION:=		0.0.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4ffcf46dad9d0c81f6611dd185639694
+PKG_DESCR:=		API to packets that have been logged
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libnfnetlink
+PKG_BUILDDEP+=		libnfnetlink
+PKG_URL:=		http://www.netfilter.org/projects/libnetfilter_log/
+PKG_SITES:=		http://www.netfilter.org/projects/libnetfilter_log/files/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBNETFILTER_LOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libnetfilter_log*so* \
+		$(IDIR_LIBNETFILTER_LOG)/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index 51111e768..dbad956b5 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libnfnetlink
-PKG_VERSION:=		0.0.41
+PKG_VERSION:=		1.0.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5d844ea1f557bad0364d5b85cd10c796
+PKG_MD5SUM:=		016fdec8389242615024c529acc1adb8
 PKG_DESCR:=		low-level library for netfilter related kernel/userspace communication
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.netfilter.org/projects/libnfnetlink/
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index cfb002702..535f202c8 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -4,32 +4,26 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ulogd
-PKG_VERSION:=		1.24
-PKG_RELEASE:=		7
-PKG_MD5SUM:=		05b4ed2926b9a22aaeaf642917bbf8ff
+PKG_VERSION:=		2.0.0beta3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		be8137d3b7ae70ebbce7ca8852b9e901
 PKG_DESCR:=		Netfilter userspace logging daemon
 PKG_SECTION:=		net
 PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
-PKG_DEPENDS:=		iptables
-PKG_BUILDDEP+=		iptables
+PKG_DEPENDS:=		iptables libnetfilter_conntrack libnetfilter_log
+PKG_BUILDDEP+=		iptables libnetfilter_conntrack libnetfilter_log
 ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),)
 PKG_BUILDDEP+=		mysql
 endif
-ifneq ($(ADK_PACKAGE_ULOGD_MOD_PCAP),)
-PKG_BUILDDEP+=		libpcap
-endif
 ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),)
 PKG_BUILDDEP+=		postgresql
 endif
 ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),)
 PKG_BUILDDEP+=		sqlite
 endif
-PKG_URL:=		http://www.netfilter.org/projects/ulogd
-PKG_SITES:=		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_URL:=		http://www.netfilter.org/projects/ulogd/
+PKG_SITES:=		http://www.netfilter.org/projects/ulogd/files/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -46,7 +40,6 @@ $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_
 
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PCAP}+=		ulogd-mod-pcap-install
 SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_MYSQL}+=		ulogd-mod-mysql-install
 SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+=		ulogd-mod-pgsql-install
 SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+=		ulogd-mod-sqlite-install
@@ -54,12 +47,6 @@ SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+=		ulogd-mod-extra-install
 
 TCFLAGS+=		-fPIC
 
-ifneq (${ADK_PACKAGE_ULOGD_MOD_PCAP},)
-CONFIGURE_ENV+=		ac_cv_header_pcap_h=yes
-else
-CONFIGURE_ENV+=		ac_cv_header_pcap_h=no
-endif
-
 ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},)
 CONFIGURE_ARGS+=	--with-mysql=${STAGING_DIR}/usr
 endif
@@ -74,35 +61,28 @@ endif
 
 post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
-	${INSTALL_DIR} ${IDIR_ULOGD}/etc
-	${INSTALL_DATA} ${WRKINST}/etc/ulogd.conf ${IDIR_ULOGD}/etc/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_BASE.so \
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \
 		${IDIR_ULOGD}/usr/lib/ulogd/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ulogd ${IDIR_ULOGD}/usr/sbin/
 
 ulogd-mod-extra-install:
 	${INSTALL_DIR} ${IDIR_ULOGD_MOD_EXTRA}/usr/lib/ulogd
-	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_{LOCAL,LOGEMU,OPRINT,PWSNIFF,SYSLOG}.so \
+	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_output_{LOGEMU,OPRINT,SYSLOG}.so \
 		${IDIR_ULOGD_MOD_EXTRA}/usr/lib/ulogd
 
-ulogd-mod-pcap-install:
-	${INSTALL_DIR} ${IDIR_ULOGD_MOD_PCAP}/usr/lib/ulogd
-	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_PCAP.so \
-		${IDIR_ULOGD_MOD_PCAP}/usr/lib/ulogd
-
 ulogd-mod-sqlite-install:
 	${INSTALL_DIR} ${IDIR_ULOGD_MOD_SQLITE}/usr/lib/ulogd
-	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_SQLITE3.so \
+	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_output_SQLITE3.so \
 		${IDIR_ULOGD_MOD_SQLITE}/usr/lib/ulogd
 
 ulogd-mod-pgsql-install:
 	${INSTALL_DIR} ${IDIR_ULOGD_MOD_PGSQL}/usr/lib/ulogd
-	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_PGSQL.so \
+	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_output_PGSQL.so \
 		${IDIR_ULOGD_MOD_PGSQL}/usr/lib/ulogd
 
 ulogd-mod-mysql-install:
 	${INSTALL_DIR} ${IDIR_ULOGD_MOD_MYSQL}/usr/lib/ulogd
-	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_MYSQL.so \
+	${CP} ${WRKINST}/usr/lib/ulogd/ulogd_output_MYSQL.so \
 		${IDIR_ULOGD_MOD_MYSQL}/usr/lib/ulogd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ulogd/patches/patch-Makefile_in b/package/ulogd/patches/patch-Makefile_in
deleted file mode 100644
index 1eaedec61..000000000
--- a/package/ulogd/patches/patch-Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
---- ulogd-1.24.orig/Makefile.in	2006-01-25 12:26:51.000000000 +0100
-+++ ulogd-1.24/Makefile.in	2009-12-12 00:23:18.000000000 +0100
-@@ -78,9 +78,9 @@ clean:
- install: all
- 	@for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
- 	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
--	@INSTALL@ -D -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd
-+	@INSTALL@ -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd
- 	@[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR)
--	@[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -D -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf
-+	@[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf
- 	
- doc:
- 	$(MAKE) -C $@
diff --git a/package/ulogd/patches/patch-Rules_make_in b/package/ulogd/patches/patch-Rules_make_in
deleted file mode 100644
index 454248384..000000000
--- a/package/ulogd/patches/patch-Rules_make_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- ulogd-1.24.orig/Rules.make.in	2005-11-25 19:58:27.000000000 +0000
-+++ ulogd-1.24/Rules.make.in	2007-02-15 21:22:28.000000000 +0000
-@@ -22,7 +22,7 @@ CFLAGS=@CFLAGS@ @CPPFLAGS@ -Wall
- 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 --git a/package/ulogd/patches/patch-libipulog_Makefile_in b/package/ulogd/patches/patch-libipulog_Makefile_in
deleted file mode 100644
index 002e6e123..000000000
--- a/package/ulogd/patches/patch-libipulog_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id$
---- ulogd-1.24.orig/libipulog/Makefile.in	2005-11-25 20:58:25.000000000 +0100
-+++ ulogd-1.24/libipulog/Makefile.in	2009-08-28 20:28:09.339447238 +0200
-@@ -1,10 +1,10 @@
- #
- 
- include @top_srcdir@/Rules.make
--CFLAGS+=-Iinclude -I/usr/src/linux/include
-+CFLAGS+=-Iinclude
- 
- libipulog.a: libipulog.o
--	$(LD) -i $< -o $@
-+	$(CC) -shared $< -o $@
- 
- distrib:
- 
diff --git a/package/ulogd/patches/patch-mysql_Makefile_in b/package/ulogd/patches/patch-mysql_Makefile_in
deleted file mode 100644
index e019da0ff..000000000
--- a/package/ulogd/patches/patch-mysql_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ulogd-1.24.orig/mysql/Makefile.in	2005-11-25 20:58:27.000000000 +0100
-+++ ulogd-1.24/mysql/Makefile.in	2008-10-16 10:38:34.000000000 +0200
-@@ -14,7 +14,7 @@ all: $(SHARED_LIBS)
- distrib:
- 
- $(SHARED_LIBS): %.so: %_sh.o
--	$(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc
-+	$(LD) -shared -o $@ $< -lc
- 
- %_sh.o: %.c
- 	$(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $<