KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update ulogd to v1.24, add a -mod-sqlite output plugin.

Browse source 
SVN-Revision: 3741
This commit is contained in:
Nicolas Thill 2006-05-08 16:52:37 +00:00
parent 62cdbe18f3
commit ab1afcbabb
6 changed files with 25 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openwrt/package/depend.mk
View file

@ -286,3 +286,6 @@ endif
ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),) ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)
ulogd-compile: postgresql-compile ulogd-compile: postgresql-compile
endif endif
ifneq ($(BR2_PACKAGE_ULOGD_MOD_SQLITE),)
ulogd-compile: sqlite-compile
endif

7
openwrt/package/ulogd/Config.in
View file

@ -31,6 +31,13 @@ config BR2_PACKAGE_ULOGD_MOD_PGSQL
depends BR2_PACKAGE_ULOGD depends BR2_PACKAGE_ULOGD
select BR2_PACKAGE_LIBPQ 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 config BR2_PACKAGE_ULOGD_MOD_EXTRA
prompt "ulogd-mod-extra................. All other plugins" prompt "ulogd-mod-extra................. All other plugins"
tristate tristate

13
openwrt/package/ulogd/Makefile
View file

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ulogd PKG_NAME:=ulogd
PKG_VERSION:=1.23 PKG_VERSION:=1.24
PKG_RELEASE:=2.1 PKG_RELEASE:=1
PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \ ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
@ -31,6 +31,10 @@ ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)
ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr
endif endif
ifneq ($(BR2_PACKAGE_ULOGD_MOD_SQLITE),)
ULOGD_SQLITE_OPTION:=--with-sqlite3=$(STAGING_DIR)/usr
endif
define IPKG_plugin_template define IPKG_plugin_template
$$(IPKG_$(1)): $$(IPKG_$(1)):
@ -49,11 +53,13 @@ $(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_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_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_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 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_MYSQL,MYSQL))
$(eval $(call IPKG_plugin_template,ULOGD_MOD_PCAP,PCAP)) $(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_PGSQL,PGSQL))
$(eval $(call IPKG_plugin_template,ULOGD_MOD_SQLITE,SQLITE3))
$(eval $(call IPKG_plugin_template,ULOGD_MOD_EXTRA,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG)) $(eval $(call IPKG_plugin_template,ULOGD_MOD_EXTRA,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG))
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.configured:
@ -87,6 +93,7 @@ $(PKG_BUILD_DIR)/.configured:
--disable-static \ --disable-static \
$(ULOGD_MYSQL_OPTION) \ $(ULOGD_MYSQL_OPTION) \
$(ULOGD_PGSQL_OPTION) \ $(ULOGD_PGSQL_OPTION) \
$(ULOGD_SQLITE_OPTION) \
); );
touch $@ touch $@

5
openwrt/package/ulogd/ipkg/ulogd-mod-sqlite.control Normal file
View file

@ -0,0 +1,5 @@
Package: ulogd-mod-sqlite
Priority: optional
Section: net
Description: Netfilter userspace logging daemon (SQLite plugin)
Depends: libsqlite, ulogd

24
openwrt/package/ulogd/patches/ulogd-1.23-gcc4.patch
View file

@ -1,24 +0,0 @@
diff -ur ulogd-1.23/extensions/ulogd_SYSLOG.c ulogd-1.23-owrt/extensions/ulogd_SYSLOG.c
--- ulogd-1.23/extensions/ulogd_SYSLOG.c 2005-02-12 22:17:41.000000000 +0100
+++ ulogd-1.23-owrt/extensions/ulogd_SYSLOG.c 2006-01-29 19:58:43.000000000 +0100
@@ -136,7 +136,7 @@
.name = "syslog",
.init = &syslog_init,
.fini = &syslog_fini,
- .output &_output_syslog
+ .output = &_output_syslog
};
diff -ur ulogd-1.23/include/ulogd/ulogd.h ulogd-1.23-owrt/include/ulogd/ulogd.h
--- ulogd-1.23/include/ulogd/ulogd.h 2004-04-25 00:40:54.000000000 +0200
+++ ulogd-1.23-owrt/include/ulogd/ulogd.h 2006-01-29 19:58:40.000000000 +0100
@@ -56,8 +56,6 @@
#define ULOGD_ERROR 7 /* error condition, requires user action */
#define ULOGD_FATAL 8 /* fatal, program aborted */
-extern FILE *logfile;
-
typedef struct ulog_iret {
/* next interpreter return (key) in the global list */
struct ulog_iret *next;

20
openwrt/package/ulogd/patches/ulogd-1.23-no-rej.patch
View file

@ -1,20 +0,0 @@
diff -ruN ulogd-1.23-old/ulogd.conf.in.rej ulogd-1.23-new/ulogd.conf.in.rej
--- ulogd-1.23-old/ulogd.conf.in.rej 2005-04-18 16:19:06.000000000 +0200
+++ ulogd-1.23-new/ulogd.conf.in.rej 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-***************
-*** 62,68 ****
- user="laforge"
- db="ulogd"
- host="localhost"
-- use_ssl=0
-
- [PGSQL]
- table="ulog"
---- 62,67 ----
- user="laforge"
- db="ulogd"
- host="localhost"
-
- [PGSQL]
- table="ulog"