fix ulogd for musl, update to latest upstream, fix dependencies, add example config

package/ulogd/Makefile

@@ -16,11 +16,19 @@ PKG_SITES:=		http://www.netfilter.org/projects/ulogd/files/
 PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
 
-PKG_SUBPKGS:=		ULOGD ULOGD_MOD_MYSQL ULOGD_MOD_PCAP ULOGD_MOD_PGSQL ULOGD_MOD_SQLITE ULOGD_MOD_EXTRA
+PKG_SUBPKGS:=		ULOGD ULOGD_MOD_MYSQL ULOGD_MOD_PCAP ULOGD_MOD_PGSQL ULOGD_MOD_SQLITE
+PKGSD_ULOGD_MOD_MYSQL:=		MySQL plugin for ulogd
 PKGSB_ULOGD_MOD_MYSQL:=		mysql
+PKGSS_ULOGD_MOD_MYSQL:=		zlib libmysqlclient
+PKGSD_ULOGD_MOD_PGSQL:=		PostgreSQL plugin for ulogd
 PKGSB_ULOGD_MOD_PGSQL:=		postgresql
+PKGSS_ULOGD_MOD_PGSQL:=		libpq
+PKGSD_ULOGD_MOD_SQLITE:=	sqlite plugin for ulogd
 PKGSB_ULOGD_MOD_SQLITE:=	sqlite
+PKGSS_ULOGD_MOD_SQLITE:=	libsqlite
+PKGSD_ULOGD_MOD_PCAP:=		libpcap plugin for ulogd
 PKGSB_ULOGD_MOD_PCAP:=		libpcap
+PKGSS_ULOGD_MOD_PCAP:=		libpcap
 
 PKG_HOST_DEPENDS:=	!cygwin
 
@@ -29,11 +37,10 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_MYSQL},${PKGSD_ULOGD_MOD_MYSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_PCAP},${PKGSD_ULOGD_MOD_PCAP},${PKG_SECTION}))
+$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_PGSQL},${PKGSD_ULOGD_MOD_PGSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_SQLITE},${PKGSD_ULOGD_MOD_SQLITE},${PKG_SECTION}))
 
 TARGET_CFLAGS+=		-fPIC
 
@@ -45,16 +52,55 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_PGSQL},)
 CONFIGURE_ARGS+=	--with-pgsql=${STAGING_TARGET_DIR}/usr
 endif
 
-post-install:
+ulogd-install:
+	${INSTALL_DIR} ${IDIR_ULOGD}/etc
+	${INSTALL_DATA} ${WRKBUILD}/ulogd.conf ${IDIR_ULOGD}/etc
 	${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
 	${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_output_{LOGEMU,OPRINT,SYSLOG}.so \
-		${IDIR_ULOGD_MOD_EXTRA}/usr/lib/ulogd
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_HWHDR.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_IFINDEX.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_IP2BIN.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_IP2HBIN.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_IP2STR.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_MARK.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_PRINTFLOW.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_PRINTPKT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_filter_PWSNIFF.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_inpflow_NFACCT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_inpflow_NFCT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_inppkt_NFLOG.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_inppkt_ULOG.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_inppkt_UNIXSOCK.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_GPRINT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_GRAPHITE.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_LOGEMU.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_NACCT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_OPRINT.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_SYSLOG.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_output_XML.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/ulogd ${IDIR_ULOGD}/usr/sbin
 
 ulogd-mod-pcap-install:
 	${INSTALL_DIR} ${IDIR_ULOGD_MOD_PCAP}/usr/lib/ulogd

package/ulogd/patches/patch-filter_raw2packet_ulogd_raw2packet_BASE_c

@@ -1,19 +0,0 @@
---- ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c	2013-03-01 16:44:22.124839615 +0100
-+++ ulogd-2.0.2/filter/raw2packet/ulogd_raw2packet_BASE.c	2013-08-20 19:17:11.315521712 +0200
-@@ -36,6 +36,7 @@
- #include <netinet/ip6.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-+#include <linux/tcp.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/icmp6.h>
- #include <netinet/udp.h>
-@@ -555,7 +556,7 @@ static int _interp_tcp(struct ulogd_plug
- 	okey_set_b(&ret[KEY_TCP_SYN], tcph->syn);
- 	okey_set_b(&ret[KEY_TCP_FIN], tcph->fin);
- 	okey_set_b(&ret[KEY_TCP_RES1], tcph->res1);
--	okey_set_b(&ret[KEY_TCP_RES2], tcph->res2);
-+	//okey_set_b(&ret[KEY_TCP_RES2], tcph->res2);
- 	okey_set_u16(&ret[KEY_TCP_CSUM], ntohs(tcph->check));
- 	
- 	return ULOGD_IRET_OK;

package/ulogd/patches/patch-filter_ulogd_filter_PWSNIFF_c

@@ -1,10 +0,0 @@
---- ulogd-2.0.2.orig/filter/ulogd_filter_PWSNIFF.c	2013-03-01 16:44:22.124839615 +0100
-+++ ulogd-2.0.2/filter/ulogd_filter_PWSNIFF.c	2013-08-20 19:18:26.774573063 +0200
-@@ -25,6 +25,7 @@
- #include <sys/socket.h>
- #include <netinet/ip.h>
- #include <netinet/in.h>
-+#include <linux/tcp.h>
- #include <netinet/tcp.h>
- #include <ulogd/ulogd.h>
- 

package/ulogd/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- ulogd-2.0.0beta4.orig/ltmain.sh	2010-07-16 17:53:39.000000000 +0200
-+++ ulogd-2.0.0beta4/ltmain.sh	2011-01-17 16:15:25.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

package/ulogd/patches/patch-src_ulogd_c

@@ -1,47 +0,0 @@
---- ulogd-2.0.2.orig/src/ulogd.c	2013-03-01 16:45:23.285968838 +0100
-+++ ulogd-2.0.2/src/ulogd.c	2013-08-20 19:09:53.029031721 +0200
-@@ -78,7 +78,7 @@
- static FILE *logfile = NULL;		/* logfile pointer */
- static char *ulogd_logfile = NULL;
- static const char *ulogd_configfile = ULOGD_CONFIGFILE;
--static FILE syslog_dummy;
-+static FILE *syslog_dummy = NULL;
- 
- static int info_mode = 0;
- 
-@@ -420,7 +420,7 @@ void __ulogd_log(int level, char *file,
- 	if (level < loglevel_ce.u.value)
- 		return;
- 
--	if (logfile == &syslog_dummy) {
-+	if (logfile == syslog_dummy) {
- 		/* FIXME: this omits the 'file' string */
- 		va_start(ap, format);
- 		vsyslog(ulogd2syslog_level(level), format, ap);
-@@ -941,7 +941,7 @@ static int logfile_open(const char *name
- 		logfile = stdout;
- 	} else if (!strcmp(name, "syslog")) {
- 		openlog("ulogd", LOG_PID, LOG_DAEMON);
--		logfile = &syslog_dummy;
-+		logfile = syslog_dummy;
- 	} else {
- 		logfile = fopen(ulogd_logfile, "a");
- 		if (!logfile) {
-@@ -1070,7 +1070,7 @@ static void sigterm_handler(int signal)
- 	unload_plugins();
- #endif
- 
--	if (logfile != NULL  && logfile != stdout && logfile != &syslog_dummy) {
-+	if (logfile != NULL  && logfile != stdout && logfile != syslog_dummy) {
- 		fclose(logfile);
- 		logfile = NULL;
- 	}
-@@ -1090,7 +1090,7 @@ static void signal_handler(int signal)
- 	switch (signal) {
- 	case SIGHUP:
- 		/* reopen logfile */
--		if (logfile != stdout && logfile != &syslog_dummy) {
-+		if (logfile != stdout && logfile != syslog_dummy) {
- 			fclose(logfile);
- 			logfile = fopen(ulogd_logfile, "a");
-  			if (!logfile) {