5 files changed, 12 insertions, 67 deletions
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index a3a7ad2f5..8b05dcd44 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -4,23 +4,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		syslog-ng
-PKG_VERSION:=		1.6.12
+PKG_VERSION:=		3.5.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a3cbfdb6e1e5beea181a7349749719f3
-PKG_DESCR:=		A powerful syslog daemon
+PKG_MD5SUM:=		ff3bf223ebafbaa92b69a2d5b729f368
+PKG_DESCR:=		powerful syslog daemon
 PKG_SECTION:=		admin
-PKG_DEPENDS:=		libol libwrap
-PKG_BUILDDEP:=		libol tcp_wrappers
+PKG_BUILDDEP:=		eventlog
+PKG_DEPENDS:=		eventlog
 PKG_URL:=		http://www.balabit.com/
-PKG_SITES:=		http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
+PKG_SITES:=		http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${PKG_VERSION}/source/
+
+PKG_LIBC_DEPENDS:=	glibc musl
+
+DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--enable-full-dynamic \
-			--enable-tcp-wrapper
-CONFIGURE_ENV+=		ac_cv_path_libol_config=${STAGING_TARGET_DIR}/usr/bin
+			--disable-tcp-wrapper
+#CONFIGURE_ENV+=		ac_cv_path_libol_config=${STAGING_TARGET_DIR}/usr/bin
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 
 syslog-ng-install:
diff --git a/package/syslog-ng/patches/patch-Makefile_in b/package/syslog-ng/patches/patch-Makefile_in
deleted file mode 100644
index aaab22e64..000000000
--- a/package/syslog-ng/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- syslog-ng-1.6.11.orig/Makefile.in	2006-05-03 11:10:52.000000000 +0000
-+++ syslog-ng-1.6.11/Makefile.in	2007-02-15 20:40:14.000000000 +0000
-@@ -64,7 +64,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 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 --git a/package/syslog-ng/patches/patch-configure b/package/syslog-ng/patches/patch-configure
deleted file mode 100644
index 9eb1f51a9..000000000
--- a/package/syslog-ng/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id$
---- syslog-ng-1.6.11.orig/configure	2006-05-03 11:10:53.000000000 +0000
-+++ syslog-ng-1.6.11/configure	2007-02-15 20:42:56.000000000 +0000
-@@ -3160,7 +3160,7 @@ if test "${ac_cv_lib_fl_yywrap+set}" = s
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfl  $LIBS"
-+LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7609,7 +7609,7 @@ echo "$as_me: error: Bundled libol not f
- 	else
- 		LIBOL_VERSION=`libol-config --version`
- 		LIBOL_CFLAGS=`libol-config --cflags`
--		LIBOL_LIBS=`libol-config --static-libs`
-+		LIBOL_LIBS=`libol-config --libs`
- 		MAKE_CLASS="make_class"
- 	fi
- fi
diff --git a/package/syslog-ng/patches/patch-src_Makefile_in b/package/syslog-ng/patches/patch-src_Makefile_in
deleted file mode 100644
index 5f497f00a..000000000
--- a/package/syslog-ng/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- syslog-ng-1.6.11.orig/src/Makefile.in	2006-05-03 11:10:53.000000000 +0000
-+++ syslog-ng-1.6.11/src/Makefile.in	2007-02-15 20:40:14.000000000 +0000
-@@ -64,7 +64,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 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 --git a/package/syslog-ng/patches/patch-src_cfg-lex_c b/package/syslog-ng/patches/patch-src_cfg-lex_c
deleted file mode 100644
index b9d37d779..000000000
--- a/package/syslog-ng/patches/patch-src_cfg-lex_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id$
---- syslog-ng-1.6.11.orig/src/cfg-lex.c	2006-03-27 14:44:46.000000000 +0000
-+++ syslog-ng-1.6.11/src/cfg-lex.c	2007-02-15 20:40:14.000000000 +0000
-@@ -667,7 +667,9 @@ static void append_char(char c);
- #ifdef __cplusplus
- extern "C" int yywrap (void );
- #else
--extern int yywrap (void );
-+int yywrap (void ) {
-+	return 1;
-+}
- #endif
- #endif
-