* added eventlog, prerequisite to new syslog-ng

	* unbroke syslog-ng, 1.9.9 seems to work


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5022 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 160 insertions, 5 deletions

diff --git a/rules/eventlog.in b/rules/eventlog.in
new file mode 100644
index 000000000..d9ec65bfe
--- /dev/null
+++ b/rules/eventlog.in
@@ -0,0 +1,8 @@
+# eventlog configuration
+
+menuconfig EVENTLOG
+	bool
+	prompt "eventlog            "
+	help
+	  Part of syslog-ng. 
+
diff --git a/rules/eventlog.make b/rules/eventlog.make
new file mode 100644
index 000000000..57c42ed8e
--- /dev/null
+++ b/rules/eventlog.make
@@ -0,0 +1,143 @@
+# -*-makefile-*-
+# $Id: template 5021 2006-03-05 11:13:02Z rsc $
+#
+# Copyright (C) 2006 by Robert Schwebel <r.schwebel@pengutronix.de>
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_EVENTLOG) += eventlog
+
+#
+# Paths and names
+#
+EVENTLOG_VERSION	= 0.2.4
+EVENTLOG		= eventlog-$(EVENTLOG_VERSION)
+EVENTLOG_SUFFIX		= tar.gz
+EVENTLOG_URL		= http://www.balabit.com/downloads/syslog-ng/1.9/src/$(EVENTLOG).$(EVENTLOG_SUFFIX)
+EVENTLOG_SOURCE		= $(SRCDIR)/$(EVENTLOG).$(EVENTLOG_SUFFIX)
+EVENTLOG_DIR		= $(BUILDDIR)/$(EVENTLOG)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+eventlog_get: $(STATEDIR)/eventlog.get
+
+$(STATEDIR)/eventlog.get: $(eventlog_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(EVENTLOG_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(EVENTLOG_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+eventlog_extract: $(STATEDIR)/eventlog.extract
+
+$(STATEDIR)/eventlog.extract: $(eventlog_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(EVENTLOG_DIR))
+	@$(call extract, $(EVENTLOG_SOURCE))
+	@$(call patchin, $(EVENTLOG))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+eventlog_prepare: $(STATEDIR)/eventlog.prepare
+
+EVENTLOG_PATH	:=  PATH=$(CROSS_PATH)
+EVENTLOG_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+EVENTLOG_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/eventlog.prepare: $(eventlog_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(EVENTLOG_DIR)/config.cache)
+	cd $(EVENTLOG_DIR) && \
+		$(EVENTLOG_PATH) $(EVENTLOG_ENV) \
+		./configure $(EVENTLOG_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+eventlog_compile: $(STATEDIR)/eventlog.compile
+
+$(STATEDIR)/eventlog.compile: $(eventlog_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(EVENTLOG_DIR) && $(EVENTLOG_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+eventlog_install: $(STATEDIR)/eventlog.install
+
+$(STATEDIR)/eventlog.install: $(eventlog_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, EVENTLOG)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+eventlog_targetinstall: $(STATEDIR)/eventlog.targetinstall
+
+$(STATEDIR)/eventlog.targetinstall: $(eventlog_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, eventlog)
+	@$(call install_fixup,eventlog,PACKAGE,eventlog)
+	@$(call install_fixup,eventlog,PRIORITY,optional)
+	@$(call install_fixup,eventlog,VERSION,$(EVENTLOG_VERSION))
+	@$(call install_fixup,eventlog,SECTION,base)
+	@$(call install_fixup,eventlog,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,eventlog,DEPENDS,)
+	@$(call install_fixup,eventlog,DESCRIPTION,missing)
+
+	@$(call install_copy, eventlog, 0, 0, 0644, \
+		$(EVENTLOG_DIR)/src/.libs/libevtlog.so.0.0.0, \
+		/usr/lib/libevtlog.so.0.0.0)
+
+	@$(call install_link, eventlog, \
+		libevtlog.so.0.0.0, \
+		/usr/lib/libevtlog.so.0)
+
+	@$(call install_link, eventlog, \
+		libevtlog.so.0.0.0, \
+		/usr/lib/libevtlog.so)
+
+	@$(call install_finish,eventlog)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+eventlog_clean:
+	rm -rf $(STATEDIR)/eventlog.*
+	rm -rf $(IMAGEDIR)/eventlog_*
+	rm -rf $(EVENTLOG_DIR)
+
+# vim: syntax=make
diff --git a/rules/networking.in b/rules/networking.in
index e3e9e66c6..6715b955e 100644
--- a/rules/networking.in
+++ b/rules/networking.in
@@ -28,6 +28,7 @@ source "rules/dhcp.in"
 source "rules/dnsmasq.in"
 source "rules/ethereal.in"
 source "rules/etherwake.in"
+source "rules/eventlog.in"
 source "rules/inetutils.in"
 source "rules/libcgicc.in"
 source "rules/libnet.in"
diff --git a/rules/syslogng.in b/rules/syslogng.in
index f92b2ca31..464ea4980 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -3,7 +3,8 @@
 menuconfig SYSLOGNG
 	bool
 	prompt "syslog-ng           "
-	depends on BROKEN
+	select EVENTLOG
+	select GLIB28
 	help
 	  The next generation syslog daemon.
 
@@ -35,5 +36,3 @@ config SYSLOGNG_SPOOF_SOURCE
 	help
 	  FIXME: missing
 
-comment "syslog-ng is broken, please send a patch"
-	depends on !BROKEN
diff --git a/rules/syslogng.make b/rules/syslogng.make
index b60b18dbc..331696d7a 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
 #
 # Paths and names
 #
-SYSLOGNG_VERSION	= 1.6.9
+SYSLOGNG_VERSION	= 1.9.9
 SYSLOGNG		= syslog-ng-$(SYSLOGNG_VERSION)
 SYSLOGNG_SUFFIX		= tar.gz
-SYSLOGNG_URL		= http://www.balabit.com/downloads/syslog-ng/1.6/src/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
+SYSLOGNG_URL		= http://www.balabit.com/downloads/syslog-ng/1.9/src/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
 SYSLOGNG_SOURCE		= $(SRCDIR)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
 SYSLOGNG_DIR		= $(BUILDDIR)/$(SYSLOGNG)
 
@@ -66,6 +66,10 @@ SYSLOGNG_ENV 	=  $(CROSS_ENV)
 # autoconf
 #
 SYSLOGNG_AUTOCONF =  $(CROSS_AUTOCONF_USR)
+
+# for glib
+SYSLOGNG_AUTOCONF += --enable-dynamic-linking
+
 ifdef $(PTXCONF_SYSLOGNG_SUNSTREAMS)
 SYSLOGNG_AUTOCONF += --enable-sun-streams
 else