From 915fed26049abc00a21a79f7632cca46b5b20f96 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Mon, 15 Feb 2021 13:26:46 +0100 Subject: [PATCH 1/7] ooniprobe: update to version 3.5.2 Signed-off-by: Jan Pavlinec (cherry picked from commit 3b25f4561f3f29066e85df4907c1e277881f2fcd) Signed-off-by: James White --- net/ooniprobe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index acea965f9..06b2f05e8 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.5.1 +PKG_VERSION:=3.5.2 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8278f9318ef939c46169dc44e89bbc03915c660912e66be9c4b20d18d00816fe +PKG_HASH:=56e419033715e1b2b61a82661f724148bab8fec4a28b2566a10e0a3051b3bade PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From a11f9a412ab554d265dd64bdd1d5aedd8b1a4900 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Mon, 8 Mar 2021 16:48:47 +0100 Subject: [PATCH 2/7] ooniprobe: update to version 3.7.0 Changes: -add Configure stage to prebuild resources Signed-off-by: Jan Pavlinec (cherry picked from commit 17b18d825cc385fc2df0fa2f6a5e7775d778ef65) Signed-off-by: James White --- net/ooniprobe/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index 06b2f05e8..5c058253e 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.5.2 +PKG_VERSION:=3.7.0 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=56e419033715e1b2b61a82661f724148bab8fec4a28b2566a10e0a3051b3bade +PKG_HASH:=27f0eec380825f236f7ab3aff22dd29d7090ef47d1ce1ccb1e728e0b846b30ce PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause @@ -43,5 +43,10 @@ define Package/ooniprobe/description Probe Command Line Interface. endef +define Build/Configure + $(call GoPackage/Build/Configure) + cd $(PKG_BUILD_DIR) && $(STAGING_DIR_HOSTPKG)/bin/go run $(PKG_BUILD_DIR)/internal/cmd/getresources/getresources.go +endef + $(eval $(call GoBinPackage,ooniprobe)) $(eval $(call BuildPackage,ooniprobe)) From 918ca913b7b433f407a864680fce966aff157070 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Mon, 22 Mar 2021 16:20:50 +0100 Subject: [PATCH 3/7] ooniprobe: update to version 3.8.0 Signed-off-by: Jan Pavlinec (cherry picked from commit b2921628abbc9bd13321ed3d09bdcd8a378f6463) Signed-off-by: James White --- net/ooniprobe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index 5c058253e..8b09f47fb 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.7.0 +PKG_VERSION:=3.8.0 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=27f0eec380825f236f7ab3aff22dd29d7090ef47d1ce1ccb1e728e0b846b30ce +PKG_HASH:=65bc4e592cadb99530be713798308d6950f67240bff6d90f2760fde11d750a83 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 9f90da7366cf8a8c2db04f1ee468909901f75698 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Tue, 6 Apr 2021 11:47:18 +0200 Subject: [PATCH 4/7] ooniprobe: update to version 3.9.0 Remove getrescources call because it is no longer required. Signed-off-by: Jan Pavlinec (cherry picked from commit 354523d5b5a563d2d8c6a59a12f1950a471ddba5) Signed-off-by: James White --- net/ooniprobe/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index 8b09f47fb..e4f1e5668 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.8.0 +PKG_VERSION:=3.9.0 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=65bc4e592cadb99530be713798308d6950f67240bff6d90f2760fde11d750a83 +PKG_HASH:=92dc714472c473352d750d558962734a42894d67407e755f94fed8d099cc8504 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause @@ -43,10 +43,5 @@ define Package/ooniprobe/description Probe Command Line Interface. endef -define Build/Configure - $(call GoPackage/Build/Configure) - cd $(PKG_BUILD_DIR) && $(STAGING_DIR_HOSTPKG)/bin/go run $(PKG_BUILD_DIR)/internal/cmd/getresources/getresources.go -endef - $(eval $(call GoBinPackage,ooniprobe)) $(eval $(call BuildPackage,ooniprobe)) From a33113111f76f5a4e986099c49b5cb6c0d59f471 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Tue, 13 Apr 2021 16:44:25 +0200 Subject: [PATCH 5/7] ooniprobe: update to version 3.9.2 Signed-off-by: Jan Pavlinec (cherry picked from commit eda48170ecffad0e6239ef2190cfb063ef3b10b4) Signed-off-by: James White --- net/ooniprobe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index e4f1e5668..b76698375 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.9.0 +PKG_VERSION:=3.9.2 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=92dc714472c473352d750d558962734a42894d67407e755f94fed8d099cc8504 +PKG_HASH:=d34dc096dfdebceaa027716fdf675eb9ab7f0085defb4235f52685d064bd5afa PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 04a580232b720149a55723164876775ee41f13ff Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Sun, 10 Oct 2021 12:48:23 +0200 Subject: [PATCH 6/7] ooniprobe: update to version 3.10.1 Signed-off-by: Jan Pavlinec (cherry picked from commit 3f62bd9df117b225a57a9f85f61728a9ebe39b74) Signed-off-by: James White --- net/ooniprobe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index b76698375..5021c5dc4 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.9.2 +PKG_VERSION:=3.10.1 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d34dc096dfdebceaa027716fdf675eb9ab7f0085defb4235f52685d064bd5afa +PKG_HASH:=2b81c14133f39ac91c4ea6761be7a27d768cd88989b52ae72376d1d7b69de322 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 827c375331f5fe3f0cc117fc199f87af3a41ebf6 Mon Sep 17 00:00:00 2001 From: James White Date: Thu, 7 Apr 2022 21:06:46 +0100 Subject: [PATCH 7/7] ooniprobe: Update 3.14.2 Signed-off-by: James White (cherry picked from commit ddb4ccfeaf8fc6067b9265d44aa9b593a591fa68) --- net/ooniprobe/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ooniprobe/Makefile b/net/ooniprobe/Makefile index 5021c5dc4..419e276d0 100644 --- a/net/ooniprobe/Makefile +++ b/net/ooniprobe/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ooniprobe -PKG_VERSION:=3.10.1 +PKG_VERSION:=3.14.2 PKG_RELEASE:=1 PKG_SOURCE:=probe-cli-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ooni/probe-cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2b81c14133f39ac91c4ea6761be7a27d768cd88989b52ae72376d1d7b69de322 +PKG_HASH:=a0b71089444c899ba99c7f63f9e05819cdbe964cfa17bb95ca5672343e6aec22 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause @@ -25,7 +25,6 @@ PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/ooni/probe-cli -GO_PKG_TAGS:=PSIPHON_DISABLE_QUIC include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk