From 8d28f99010e50569140153798de5e91d6dda397c Mon Sep 17 00:00:00 2001
From: pavlov <pavlov@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 4 Mar 2007 02:51:51 +0000
Subject: [PATCH] update syslogng to 1.6.12 and libol to 0.3.18 -- bugfixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@6495 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 admin/syslog-ng/Makefile                |  8 +++---
 admin/syslog-ng/patches/01-no_lfl.patch | 36 +++++++++----------------
 libs/libol/Makefile                     |  4 +--
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 9daeede7d..77d66f4a1 100644
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=1.6.9
+PKG_VERSION:=1.6.12
 PKG_RELEASE:=1
-PKG_MD5SUM:=5280a86b4f5c25b2ba157c8cea302cf0
+PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3
 
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/syslog-ng/stable/src \
-		http://www.balabit.com/downloads/syslog-ng/1.6/src
+PKG_SOURCE_URL:= http://www.balabit.com/downloads/syslog-ng/1.6/src \
+		http://www.balabit.com/downloads/syslog-ng/stable/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
diff --git a/admin/syslog-ng/patches/01-no_lfl.patch b/admin/syslog-ng/patches/01-no_lfl.patch
index e17a5c6af..ce33d95d2 100644
--- a/admin/syslog-ng/patches/01-no_lfl.patch
+++ b/admin/syslog-ng/patches/01-no_lfl.patch
@@ -1,19 +1,7 @@
-diff -urN syslog-ng-1.6.9/Makefile.in syslog-ng-1.6.9.new/Makefile.in
---- syslog-ng-1.6.9/Makefile.in	2005-11-23 09:58:28.000000000 +0100
-+++ syslog-ng-1.6.9.new/Makefile.in	2006-03-23 19:02:04.000000000 +0100
-@@ -64,7 +64,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LEX = @LEX@
--LEXLIB = @LEXLIB@
-+LEXLIB =
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBOL_DIR = @LIBOL_DIR@
-diff -urN syslog-ng-1.6.9/configure syslog-ng-1.6.9.new/configure
---- syslog-ng-1.6.9/configure	2005-11-23 09:58:29.000000000 +0100
-+++ syslog-ng-1.6.9.new/configure	2006-03-23 21:56:43.000000000 +0100
-@@ -3160,7 +3160,7 @@
+diff -ubr /tmp/syslog-ng-1.6.12/configure syslog-ng-1.6.12/configure
+--- /tmp/syslog-ng-1.6.12/configure	2007-02-02 02:58:41.000000000 -0600
++++ syslog-ng-1.6.12/configure	2007-03-03 20:39:40.000000000 -0600
+@@ -3695,7 +3695,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -22,10 +10,10 @@ diff -urN syslog-ng-1.6.9/configure syslog-ng-1.6.9.new/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-diff -urN syslog-ng-1.6.9/src/Makefile.in syslog-ng-1.6.9.new/src/Makefile.in
---- syslog-ng-1.6.9/src/Makefile.in	2005-11-23 09:58:37.000000000 +0100
-+++ syslog-ng-1.6.9.new/src/Makefile.in	2006-03-23 19:02:27.000000000 +0100
-@@ -64,7 +64,7 @@
+diff -ubr /tmp/syslog-ng-1.6.12/Makefile.in syslog-ng-1.6.12/Makefile.in
+--- /tmp/syslog-ng-1.6.12/Makefile.in	2007-02-02 02:58:41.000000000 -0600
++++ syslog-ng-1.6.12/Makefile.in	2007-03-03 20:38:56.000000000 -0600
+@@ -65,7 +65,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
  LEX = @LEX@
@@ -34,10 +22,10 @@ diff -urN syslog-ng-1.6.9/src/Makefile.in syslog-ng-1.6.9.new/src/Makefile.in
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBOBJS = @LIBOBJS@
  LIBOL_DIR = @LIBOL_DIR@
-diff -urN syslog-ng-1.6.9/src/cfg-lex.c syslog-ng-1.6.9.new/src/cfg-lex.c
---- syslog-ng-1.6.9/src/cfg-lex.c	2005-11-15 19:41:46.000000000 +0100
-+++ syslog-ng-1.6.9.new/src/cfg-lex.c	2006-03-23 19:03:25.000000000 +0100
-@@ -666,7 +666,9 @@
+diff -ubr /tmp/syslog-ng-1.6.12/src/cfg-lex.c syslog-ng-1.6.12/src/cfg-lex.c
+--- /tmp/syslog-ng-1.6.12/src/cfg-lex.c	2006-08-22 03:43:36.000000000 -0500
++++ syslog-ng-1.6.12/src/cfg-lex.c	2007-03-03 20:36:52.000000000 -0600
+@@ -668,7 +668,9 @@
  #ifdef __cplusplus
  extern "C" int yywrap (void );
  #else
diff --git a/libs/libol/Makefile b/libs/libol/Makefile
index ac55a5640..2f86625b0 100644
--- a/libs/libol/Makefile
+++ b/libs/libol/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libol
-PKG_VERSION:=0.3.17
+PKG_VERSION:=0.3.18
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3
-PKG_MD5SUM:=28cc52e84bdb472b7830f9ad120a62a7
+PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)