From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 18 Aug 2009 14:49:11 +0000 (+0000)
Subject: [package] update syslog-ng3 to 3.0.4, remove some duplicate dependencies, fix init... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a591f7b6c8e38529092b752830932735e3bf1bd5;p=openwrt%2Fsvn-archive%2Farchive.git

[package] update syslog-ng3 to 3.0.4, remove some duplicate dependencies, fix init scripts (#5716)

SVN-Revision: 17298
---

diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile
index 83b23fff16..dcb92d808c 100644
--- a/admin/syslog-ng3/Makefile
+++ b/admin/syslog-ng3/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=b8b3c9af28696bce48ceca0de6444426
+PKG_MD5SUM:=86c39779261545d2289e9c309e262b8d
 
 PKG_SOURCE_URL:= \
-	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.0.3/source/
+	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.0.4/source/
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/syslog-ng3
   SECTION:=admin
   CATEGORY:=Administration
-  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libintl +libiconv
+  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap
   TITLE:=A powerful syslog daemon
   URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
 endef
@@ -33,7 +33,7 @@ define Package/syslog-ng3/description
 endef
 
 define Package/syslog-ng3/conffiles
-/etc/syslog-ng/syslog-ng.conf
+/etc/syslog-ng.conf
 endef
 
 define Build/Configure
@@ -53,8 +53,8 @@ define Package/syslog-ng3/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
-	$(INSTALL_DIR) $(1)/etc/syslog-ng
-	$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc/syslog-ng/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc
 endef
 
 $(eval $(call BuildPackage,syslog-ng3))
diff --git a/admin/syslog-ng3/files/syslog-ng.conf b/admin/syslog-ng3/files/syslog-ng.conf
index 658abead21..919bbc89dd 100644
--- a/admin/syslog-ng3/files/syslog-ng.conf
+++ b/admin/syslog-ng3/files/syslog-ng.conf
@@ -1,16 +1,32 @@
-options { 
-	chain_hostnames(off); 
-	sync(0); 
+@version:3.0
 
-	# The default action of syslog-ng 1.6.0 is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats(43200); 
+options {
+	chain_hostnames(no);
+	create_dirs(yes);
+	flush_lines(0);
+	keep_hostname(yes);
+	log_fifo_size(256);
+	log_msg_size(1024);
+	stats_freq(0);
+	flush_lines(0);
+	use_fqdn(no);
 };
 
-source src { unix-stream("/dev/log"); internal(); };
+source src {
+	internal();
+	unix-stream("/dev/log");
+};
 
-destination messages { file("/var/log/messages"); };
+source net {
+	udp(ip(0.0.0.0) port(514));
+};
 
-log { source(src); destination(messages); };
+destination messages {
+	file("/var/log/messages");
+};
+
+log {
+	source(src);
+	source(net);
+	destination(messages);
+};
diff --git a/admin/syslog-ng3/files/syslog-ng.init b/admin/syslog-ng3/files/syslog-ng.init
index 06672e87d8..4609f6fab9 100644
--- a/admin/syslog-ng3/files/syslog-ng.init
+++ b/admin/syslog-ng3/files/syslog-ng.init
@@ -3,8 +3,8 @@
 START=50
 
 start() {
-  [ -f /etc/syslog-ng/syslog-ng.conf ] || {
-    echo "/etc/syslog-ng/syslog-ng.conf does not exist !";
+  [ -f /etc/syslog-ng.conf ] || {
+    echo "/etc/syslog-ng.conf does not exist !";
     exit 0;
   };
   [ -d /var/run ] || mkdir -p /var/run