Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13573 from ja-pa/ooniprobe-3.0.7

Browse source 
ooniprobe: update to version 3.0.7
This commit is contained in:
Rosen Penev 2020-10-06 03:17:02 -07:00 committed by GitHub
commit 77adfcac25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
libs/measurement-kit/Makefile
View file

@ -1,78 +0,0 @@
#
# Copyright (C) 2019-2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=measurement-kit
PKG_VERSION:=0.10.12
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/measurement-kit/measurement-kit/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=508d9db72579efbe4747dd791771f47299bc5867c72d67a86e371d66d20fd19e
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=curl libevent2 libmaxminddb openssl
PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:=MEASUREMENT_KIT_BUILD_DEPENDS
include $(INCLUDE_DIR)/package.mk
define Package/measurement-kit
SECTION:=libs
CATEGORY:=Libraries
TITLE:=library for open network measurement
URL:=https://measurement-kit.github.io/
DEPENDS:=+libstdcpp +libcurl +libevent2-pthreads +libevent2-extra +libevent2-openssl +libevent2-core +libmaxminddb +libopenssl +ca-bundle
endef
define Package/measurement-kit/description
Measurement Kit is a C++14 library that implements open network measurement methodologies (performance, censorship, etc.)
endef
define Package/measurement-kit/config
config MEASUREMENT_KIT_BUILD_DEPENDS
bool
default PACKAGE_measurement-kit
config MEASUREMENT_KIT_BUILD_SELECT
tristate
default m if MEASUREMENT_KIT_BUILD_DEPENDS
select PACKAGE_libevent2-openssl
select PACKAGE_libevent2-pthreads
endef
CONFIGURE_ARGS+= --with-ca-bundle=/etc/ssl/cert.pem
TARGET_CFLAGS += $(if $(CONFIG_USE_UCLIBC),-DCATCH_CONFIG_GLOBAL_NEXTAFTER)
define Build/Configure
( cd $(PKG_BUILD_DIR); ./autogen.sh )
$(call Build/Configure/Default)
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
endef
define Package/measurement-kit/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/measurement_kit $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/measurement_kit
$(CP) $(PKG_BUILD_DIR)/*.mmdb $(1)/etc/measurement_kit
endef
$(eval $(call BuildPackage,measurement-kit))

12
net/ooniprobe/Makefile
View file

@ -8,19 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ooniprobe
PKG_VERSION:=3.0.6
PKG_VERSION:=3.0.7
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:=f3e73c265886403755c17a58b1534919741043a09749e51da450f3d4816a2189
PKG_HASH:=01e1e1a8d7d8fff04a8c098cfd33c84c507cc6efb88c597714b4917b9d0d64e1
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.md
PKG_BUILD_DIR:=$(BUILD_DIR)/probe-cli-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=golang/host measurement-kit
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
@ -42,15 +42,11 @@ define Package/ooniprobe
endef
TARGET_LDFLAGS:=\
-lmeasurement_kit -lmaxminddb -lcurl \
-lmaxminddb -lcurl \
-levent_openssl -lssl \
-lcrypto -levent_core -levent_extra \
-levent_pthreads -lz
define Package/ooniprobe/config
select MEASUREMENT_KIT_BUILD_DEPENDS
endef
define Package/ooniprobe/description
The next generation of OONI(Open Observatory of Network Interference)
Probe Command Line Interface.