From: Gustavo Zacarias Date: Wed, 9 Apr 2014 18:09:59 +0000 (-0300) Subject: ulogd: bump to version 2.0.4 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=010745a955b6cf4c979588fafdb7506460038e0f;p=buildroot.git ulogd: bump to version 2.0.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/package/ulogd/ulogd-01-pthread-conditional.patch b/package/ulogd/ulogd-01-pthread-conditional.patch deleted file mode 100644 index b33e0bc9c7..0000000000 --- a/package/ulogd/ulogd-01-pthread-conditional.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 389bade377e6e7335304636ea1ebd0a81b0c235e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Dec 2013 09:11:00 -0300 -Subject: [PATCH ulogd] ulogd: use AC_SEARCH_LIBS for libpthread - -Some uClibc-based toolchains lack threading support, so use -AC_SEARCH_LIB instead of AC_CHECK_LIB to check for libpthread -availability and link conditionally if found since it's only used for -the database backends. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 3 ++- - src/Makefile.am | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7f5ffa9..5e45aaa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,7 +39,8 @@ AC_CHECK_FUNCS(socket strerror) - regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter" - AC_SUBST([regular_CFLAGS]) - --AC_CHECK_LIB(pthread, pthread_create) -+AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""]) -+AC_SUBST([libpthread_LIBS]) - - dnl Check for the right nfnetlink version - PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 1097468..998e776 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,5 +7,5 @@ AM_CFLAGS = ${regular_CFLAGS} - sbin_PROGRAMS = ulogd - - ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c addr.c --ulogd_LDADD = ${libdl_LIBS} --ulogd_LDFLAGS = -export-dynamic -lpthread -+ulogd_LDADD = ${libdl_LIBS} ${libpthread_LIBS} -+ulogd_LDFLAGS = -export-dynamic --- -1.8.3.2 - diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index b51da21477..28ada96dac 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ULOGD_VERSION = 2.0.3 +ULOGD_VERSION = 2.0.4 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files ULOGD_CONF_OPT = --with-dbi=no --with-pgsql=no