From d2c513153145d47603deeef450a0d0fcdb305697 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Fri, 6 May 2016 15:15:21 +0200 Subject: [PATCH 1/3] liburcu: update to 0.9.2 Signed-off-by: Daniel Salzman --- libs/liburcu/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/liburcu/Makefile b/libs/liburcu/Makefile index aaf869aa8..3b77f323a 100644 --- a/libs/liburcu/Makefile +++ b/libs/liburcu/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2015 OpenWrt.org -# Copyright (C) 2014 CZ.NIC, z.s.p.o. +# Copyright (C) 2014-2016 CZ.NIC, z.s.p.o. # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburcu -PKG_VERSION:=0.8.7 +PKG_VERSION:=0.9.2 PKG_RELEASE:=1 +PKG_MAINTAINER:=Daniel Salzman +PKG_LICENSE:=LGPL-2.1 GPL-2.0 GPL-3.0 MIT + PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_SUBDIR:=userspace-rcu-$(PKG_VERSION) PKG_SOURCE_URL:=https://lttng.org/files/urcu/ -PKG_MD5SUM:=7a6ee17871d31226db3f618e28351d22 +PKG_MD5SUM:=49f86e68c1e2f41d303381a271b791d1 PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 @@ -29,7 +31,6 @@ define Package/liburcu CATEGORY:=Libraries TITLE:=User-space Read-Copy-Update library URL:=https://lttng.org/ - MAINTAINER:=daniel.salzman@nic.cz DEPENDS:=+libpthread endef From b366588c95f10044fafac3d8883281ccafc9e6b6 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Fri, 6 May 2016 15:15:38 +0200 Subject: [PATCH 2/3] libedit: add new package Signed-off-by: Daniel Salzman --- libs/libedit/Makefile | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 libs/libedit/Makefile diff --git a/libs/libedit/Makefile b/libs/libedit/Makefile new file mode 100644 index 000000000..f1d62fad4 --- /dev/null +++ b/libs/libedit/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2016 CZ.NIC, z.s.p.o. +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libedit +PKG_VERSION:=20150325-3.1 +PKG_RELEASE:=1 + +PKG_MAINTAINER:=Daniel Salzman +PKG_LICENSE:=BSD-3-Clause + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://thrysoee.dk/editline/ +PKG_MD5SUM:=43cdb5df3061d78b5e9d59109871b4f6 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libedit + SECTION:=libs + CATEGORY:=Libraries + TITLE:=BSD editline and history library + URL:=http://thrysoee.dk/editline/ + DEPENDS:=+libncurses +endef + +define Package/libedit/description + Generic line editing, history, and tokenization functions similar to GNU Readline. +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/usr/include/editline + $(CP) $(PKG_INSTALL_DIR)/usr/include/editline/*.h $(1)/usr/include/editline/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libedit.{a,so*} $(1)/usr/lib/ +endef + +define Package/libedit/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libedit.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libedit)) From 0c0331dac59356ac8cbb2796d9443529e3a9cb21 Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Fri, 6 May 2016 15:16:16 +0200 Subject: [PATCH 3/3] knot: update to 2.2.0 Signed-off-by: Daniel Salzman --- net/knot/Makefile | 13 ++++----- net/knot/patches/03_contrib_files.patch | 15 ++++++++++ net/knot/patches/03_libtap_files.patch | 15 ---------- net/knot/patches/04_hostname.patch | 37 +++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 net/knot/patches/03_contrib_files.patch delete mode 100644 net/knot/patches/03_libtap_files.patch create mode 100644 net/knot/patches/04_hostname.patch diff --git a/net/knot/Makefile b/net/knot/Makefile index 104bd3ec0..608f1ad9a 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -8,13 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot -PKG_VERSION:=2.1.1 +PKG_VERSION:=2.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ -PKG_MD5SUM:=ee6a54ec8a7898579b768c66e2eaeb54 +PKG_MD5SUM:=ac00a189038fd692c53b2e8c1837c5cb PKG_MAINTAINER:=Daniel Salzman PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD MIT OLDAP-2.8 @@ -62,7 +61,7 @@ endef define Package/knot $(call Package/knot/Default) TITLE+= server - DEPENDS=+liburcu +knot-libdnssec +knot-libknot +knot-libzscanner + DEPENDS=+liburcu +libedit +knot-libdnssec +knot-libknot +knot-libzscanner endef define Package/knot-dig @@ -161,9 +160,9 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/libtap check - $(MAKE) -C $(PKG_BUILD_DIR)/src/dnssec/tests check-compile-only - $(MAKE) -C $(PKG_BUILD_DIR)/tests check-compile-only - $(MAKE) -C $(PKG_BUILD_DIR)/src/zscanner check-compile-only + $(MAKE) -C $(PKG_BUILD_DIR)/src/dnssec/tests check-compile + $(MAKE) -C $(PKG_BUILD_DIR)/tests check-compile + $(MAKE) -C $(PKG_BUILD_DIR)/src/zscanner check-compile endef define Build/InstallDev diff --git a/net/knot/patches/03_contrib_files.patch b/net/knot/patches/03_contrib_files.patch new file mode 100644 index 000000000..02f519803 --- /dev/null +++ b/net/knot/patches/03_contrib_files.patch @@ -0,0 +1,15 @@ +diff --git a/src/contrib/files.c b/src/contrib/files.c +index 8aee482..12f36ca 100644 +--- a/src/contrib/files.c ++++ b/src/contrib/files.c +@@ -24,6 +24,10 @@ + #include + #include + ++#ifndef O_NOFOLLOW ++#define O_NOFOLLOW 0 ++#endif ++ + static bool special_name(const char *name) + { + return strcmp(name, ".") == 0 || strcmp(name, "..") == 0; diff --git a/net/knot/patches/03_libtap_files.patch b/net/knot/patches/03_libtap_files.patch deleted file mode 100644 index bb7b34261..000000000 --- a/net/knot/patches/03_libtap_files.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libtap/tap/files.c b/libtap/tap/files.c -index 0c24075..d33db6c 100644 ---- a/libtap/tap/files.c -+++ b/libtap/tap/files.c -@@ -27,6 +27,10 @@ - #include - #include - -+#ifndef O_NOFOLLOW -+#define O_NOFOLLOW 0 -+#endif -+ - char *test_mkdtemp(void) - { - char *tmpdir = getenv("TMPDIR"); diff --git a/net/knot/patches/04_hostname.patch b/net/knot/patches/04_hostname.patch new file mode 100644 index 000000000..8e43189a0 --- /dev/null +++ b/net/knot/patches/04_hostname.patch @@ -0,0 +1,37 @@ +diff --git a/src/knot/conf/base.c b/src/knot/conf/base.c +index 9a0a655..e4721ad 100644 +--- a/src/knot/conf/base.c ++++ b/src/knot/conf/base.c +@@ -101,6 +101,10 @@ void conf_refresh_hostname( + + free(conf->hostname); + conf->hostname = sockaddr_hostname(); ++ if (conf->hostname == NULL) { ++ // Empty hostname fallback, NULL cannot be passed to strlen! ++ conf->hostname = strdup(""); ++ } + } + + static void init_cache( +@@ -206,7 +210,7 @@ int conf_new( + + // Cache the current hostname. + if (!(flags & CONF_FNOHOSTNAME)) { +- out->hostname = sockaddr_hostname(); ++ conf_refresh_hostname(out); + } + + // Initialize cached values. +diff --git a/src/knot/modules/dnstap.c b/src/knot/modules/dnstap.c +index 890663d..b60c1ca 100644 +--- a/src/knot/modules/dnstap.c ++++ b/src/knot/modules/dnstap.c +@@ -241,7 +241,7 @@ int dnstap_load(struct query_plan *plan, struct query_module *self, + } else { + ctx->identity = sockaddr_hostname(); + } +- ctx->identity_len = strlen(ctx->identity); ++ ctx->identity_len = (ctx->identity != NULL) ? strlen(ctx->identity) : 0; + + // Set version. + val = conf_mod_get(self->config, MOD_VERSION, self->id);