From a1d70de325dfa52d0eabd1a0b1c06b6e0370d61e Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Sun, 7 Feb 2021 07:12:56 +0800 Subject: [PATCH] overture: update to 1.7 Signed-off-by: Huangbin Zhan --- net/overture/Makefile | 8 ++++---- net/overture/files/overture.init | 2 +- net/overture/patches/001-fix-go-sum.patch | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 net/overture/patches/001-fix-go-sum.patch diff --git a/net/overture/Makefile b/net/overture/Makefile index 671b9de3a..d11748c6f 100644 --- a/net/overture/Makefile +++ b/net/overture/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=overture -PKG_VERSION:=1.6.1 +PKG_VERSION:=1.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/shawn1m/overture/tar.gz/v${PKG_VERSION}? -PKG_HASH:=916ddbc4e8ee3cd008e281ba768c1502ad7b3ad71073f5e587b187e371eedd2b +PKG_HASH:=d3912fe53d2f6a60d20767a8dc5041333f8b5386b7d23d959b4de872d12b5024 PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=MIT @@ -46,8 +46,8 @@ define Package/overture/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/overture $(INSTALL_DIR) $(1)/etc/overture - $(INSTALL_DATA) $(PKG_BUILD_DIR)/config.sample.json $(1)/etc/overture/config.json - $(SED) 's@"\.\(/[^"]\{1,\}_sample\)"@"/etc/overture\1"@g;s/":53"/"127.0.0.3:53"/' $(1)/etc/overture/config.json + $(INSTALL_DATA) $(PKG_BUILD_DIR)/config.sample.yml $(1)/etc/overture/config.yml + $(SED) 's@\.\(/[^[:space:]]\{1,\}_sample\)@/etc/overture\1@g;s/^\(bindAddress:[[:space:]]\{0,\}\)[^[:space:]]\{0,\}$$$$/\1127.0.0.3:53/' $(1)/etc/overture/config.yml $(INSTALL_DATA) ./files/*_sample $(1)/etc/overture $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/overture.init $(1)/etc/init.d/overture diff --git a/net/overture/files/overture.init b/net/overture/files/overture.init index fb7c1c25f..1be553f9f 100644 --- a/net/overture/files/overture.init +++ b/net/overture/files/overture.init @@ -5,7 +5,7 @@ USE_PROCD=1 start_service() { procd_open_instance - procd_set_param command /usr/bin/overture -c /etc/overture/config.json + procd_set_param command /usr/bin/overture -c /etc/overture/config.yml procd_set_param file /etc/overture/config.json procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/net/overture/patches/001-fix-go-sum.patch b/net/overture/patches/001-fix-go-sum.patch new file mode 100644 index 000000000..936998f6e --- /dev/null +++ b/net/overture/patches/001-fix-go-sum.patch @@ -0,0 +1,10 @@ +--- a/go.sum ++++ b/go.sum +@@ -91,6 +91,7 @@ github.com/cncf/udpa/go v0.0.0-201912090 + github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= + github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= + github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= ++github.com/coredns/coredns v1.8.0 h1:U6Z6Ljuy5D8VKDquF1dUotUtFeoNt0PVCwSfIVYFC6s= + github.com/coredns/coredns v1.8.0/go.mod h1:R/TQ2yPVKdafwpVXOh6NFN13ikgto21kOMPvOeFPS8o= + github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= + github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=