소스 검색

package/ulogd: bump to version 2.0.8

- Drop patch (already in version)
- Update configure options due to
  https://git.netfilter.org/ulogd2/commit/?id=794f0385ab60fd8c52ff3ce498c8aac78b58ac20

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 2 년 전
부모
커밋
6fc4b59ffd
3개의 변경된 파일15개의 추가작업 그리고 49개의 파일을 삭제
  1. 0 32
      package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch
  2. 2 4
      package/ulogd/ulogd.hash
  3. 13 13
      package/ulogd/ulogd.mk

+ 0 - 32
package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch

@@ -1,32 +0,0 @@
-From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001
-From: Cameron Norman <camerontnorman@gmail.com>
-Date: Sat, 27 Oct 2018 13:05:45 -0700
-Subject: ulogd: fix build with musl libc
-
-The attached patch fixes building ulogd2 with musl libc. It is being
-used on Void Linux right now.
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrrieved from:
-https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b]
----
- src/ulogd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ulogd.c b/src/ulogd.c
-index b8bc57c..9cd64e8 100644
---- a/src/ulogd.c
-+++ b/src/ulogd.c
-@@ -65,6 +65,7 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sched.h>
-+#include <limits.h>
- #include <ulogd/conffile.h>
- #include <ulogd/ulogd.h>
- #ifdef DEBUG
--- 
-cgit v1.2.1
-

+ 2 - 4
package/ulogd/ulogd.hash

@@ -1,7 +1,5 @@
-# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum}
-md5  2bb2868cf51acbb90c35763c9f995f31  ulogd-2.0.7.tar.bz2
-sha1  f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9  ulogd-2.0.7.tar.bz2
+# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum
+sha256  4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291  ulogd-2.0.8.tar.bz2
 
 
 # Locally calculated
 # Locally calculated
-sha256  990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b  ulogd-2.0.7.tar.bz2
 sha256  b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf  COPYING
 sha256  b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf  COPYING

+ 13 - 13
package/ulogd/ulogd.mk

@@ -4,10 +4,10 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-ULOGD_VERSION = 2.0.7
+ULOGD_VERSION = 2.0.8
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
-ULOGD_CONF_OPTS = --without-dbi
+ULOGD_CONF_OPTS = --disable-dbi
 ULOGD_DEPENDENCIES = host-pkgconf \
 ULOGD_DEPENDENCIES = host-pkgconf \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
 	libnfnetlink
 	libnfnetlink
@@ -18,39 +18,39 @@ ULOGD_SELINUX_MODULES = ulogd
 # DB backends need threads
 # DB backends need threads
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 ifeq ($(BR2_PACKAGE_MYSQL),y)
 ifeq ($(BR2_PACKAGE_MYSQL),y)
-ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
+ULOGD_CONF_OPTS += --enable-mysql
 ULOGD_DEPENDENCIES += mysql
 ULOGD_DEPENDENCIES += mysql
 else
 else
-ULOGD_CONF_OPTS += --without-mysql
+ULOGD_CONF_OPTS += --disable-mysql
 endif
 endif
 ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
 ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
-ULOGD_CONF_OPTS += --with-pgsql
+ULOGD_CONF_OPTS += --enable-pgsql
 ULOGD_DEPENDENCIES += postgresql
 ULOGD_DEPENDENCIES += postgresql
 else
 else
-ULOGD_CONF_OPTS += --without-pgsql
+ULOGD_CONF_OPTS += --disable-pgsql
 endif
 endif
 ifeq ($(BR2_PACKAGE_SQLITE),y)
 ifeq ($(BR2_PACKAGE_SQLITE),y)
-ULOGD_CONF_OPTS += --with-sqlite
+ULOGD_CONF_OPTS += --enable-sqlite3
 ULOGD_DEPENDENCIES += sqlite
 ULOGD_DEPENDENCIES += sqlite
 else
 else
-ULOGD_CONF_OPTS += --without-sqlite
+ULOGD_CONF_OPTS += --disable-sqlite3
 endif
 endif
 else
 else
-ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite
+ULOGD_CONF_OPTS += --disable-mysql --disable-pgsql --disable-sqlite3
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
-ULOGD_CONF_OPTS += --with-pcap
+ULOGD_CONF_OPTS += --enable-pcap
 ULOGD_DEPENDENCIES += libpcap
 ULOGD_DEPENDENCIES += libpcap
 else
 else
-ULOGD_CONF_OPTS += --without-pcap
+ULOGD_CONF_OPTS += --disable-pcap
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_JANSSON),y)
 ifeq ($(BR2_PACKAGE_JANSSON),y)
-ULOGD_CONF_OPTS += --with-jansson
+ULOGD_CONF_OPTS += --enable-json
 ULOGD_DEPENDENCIES += jansson
 ULOGD_DEPENDENCIES += jansson
 else
 else
-ULOGD_CONF_OPTS += --without-jansson
+ULOGD_CONF_OPTS += --disable-json
 endif
 endif
 
 
 $(eval $(autotools-package))
 $(eval $(autotools-package))