From: Tiago Gaspar Date: Sat, 31 May 2025 20:08:47 +0000 (+0100) Subject: atlas-probe: remove package X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d2aeaf041bc025bb7015b1ad45ebdb7de7cbebd0;p=openwrt-packages.git atlas-probe: remove package Delete the atlas-probe package in favor of the new ripe-atlas package that will be added in a following commit. Signed-off-by: Tiago Gaspar --- diff --git a/net/atlas-probe/Makefile b/net/atlas-probe/Makefile deleted file mode 100644 index 35b63ed23..000000000 --- a/net/atlas-probe/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (https://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:=atlas-probe -PKG_VERSION:=2.6.3 -PKG_RELEASE:=3 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/RIPE-NCC/ripe-atlas-probe-busybox -PKG_MIRROR_HASH:=5cb9c17f381e57105bb4ff7c83923619478f970ab9b43ff90a2ed9b1c3879fe0 - -PKG_MAINTAINER:=Alexandru Ardelean -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=LICENSE - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/atlas-probe - SECTION:=net - CATEGORY:=Network - TITLE:=RIPE Atlas probe measurement - DEPENDS:=+librt +libopenssl +openssh-client +sudo - USERID:=atlas=444:atlas=444 - URL:=https://atlas.ripe.net/ -endef - -define Package/atlas-probe/description - RIPE Atlas is a global, open, distributed Internet measurement platform, - consisting of thousands of measurement devices that measure Internet - connectivity in real time. -endef - -TARGET_CFLAGS += $(FPIC) - -CONFIGURE_ARGS += \ - --disable-shared \ - --enable-static - -CONFIGURE_PATH = libevent-2.1.11-stable - -TARGET_LDFLAGS = -L$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/.libs - -define Build/Compile - +$(MAKE_VARS) \ - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(CONFIGURE_PATH) \ - $(MAKE_FLAGS) - +$(MAKE_VARS) \ - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(MAKE_FLAGS) -endef - -define Package/atlas-probe/install - +$(MAKE_VARS) \ - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(MAKE_FLAGS) CONFIG_PREFIX=$(1)/usr/libexec/atlas-probe install - $(INSTALL_DIR) $(1)/usr/libexec/atlas-probe/state - echo $(PKG_VERSION) > $(1)/usr/libexec/atlas-probe/state/VERSION -endef - -$(eval $(call BuildPackage,atlas-probe)) diff --git a/net/atlas-probe/patches/004-Comment-out-librt-testing.patch b/net/atlas-probe/patches/004-Comment-out-librt-testing.patch deleted file mode 100644 index c433f0718..000000000 --- a/net/atlas-probe/patches/004-Comment-out-librt-testing.patch +++ /dev/null @@ -1,32 +0,0 @@ -From df50c29210f18f959186bb974c33cefff2bcc15e Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Fri, 8 Oct 2021 22:34:37 -0300 -Subject: [PATCH] Comment out librt testing - -The packages feed Ci is apparently failing to execute the test: - -Makefile.flags:128: *** unterminated call to function 'shell': - missing ')'. Stop. - -The call appears to be correct, but we already know that the library -will not be needed for openwrt, so let's just leave it out. - -Signed-off-by: Eneas U de Queiroz - ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -125,10 +125,10 @@ export SYSROOT=$(CONFIG_SYSROOT) - endif - - # glibc versions before 2.17 need to link with -rt to use clock_gettime --RT_NEEDED := $(shell echo 'int main(void){struct timespec tp; return clock_gettime(CLOCK_MONOTONIC, &tp);}' >rttest.c; $(CC) $(CFLAGS) -include time.h -o /dev/null rttest.c >/dev/null 2>&1 || echo "y"; rm rttest.c) --ifeq ($(RT_NEEDED),y) --LDLIBS += rt --endif -+#RT_NEEDED := $(shell echo 'int main(void){struct timespec tp; return clock_gettime(CLOCK_MONOTONIC, &tp);}' >rttest.c; $(CC) $(CFLAGS) -include time.h -o /dev/null rttest.c >/dev/null 2>&1 || echo "y"; rm rttest.c) -+#ifeq ($(RT_NEEDED),y) -+#LDLIBS += rt -+#endif - - # Android has no separate crypt library - # gcc-4.2.1 fails if we try to feed C source on stdin: diff --git a/net/atlas-probe/patches/010-openssl.patch b/net/atlas-probe/patches/010-openssl.patch deleted file mode 100644 index 539659787..000000000 --- a/net/atlas-probe/patches/010-openssl.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/libevent-2.1.11-stable/test/regress_ssl.c -+++ b/libevent-2.1.11-stable/test/regress_ssl.c -@@ -148,9 +148,9 @@ ssl_getcert(EVP_PKEY *key) - X509_set_issuer_name(x509, name); - X509_NAME_free(name); - -- X509_time_adj(X509_get_notBefore(x509), 0, &now); -+ X509_time_adj(X509_getm_notBefore(x509), 0, &now); - now += 3600; -- X509_time_adj(X509_get_notAfter(x509), 0, &now); -+ X509_time_adj(X509_getm_notAfter(x509), 0, &now); - X509_set_pubkey(x509, key); - tt_assert(0 != X509_sign(x509, key, EVP_sha1())); - -@@ -469,8 +469,8 @@ regress_bufferevent_openssl(void *arg) - type = (enum regress_openssl_type)data->setup_data; - - if (type & REGRESS_OPENSSL_RENEGOTIATE) { -- if (SSLeay() >= 0x10001000 && -- SSLeay() < 0x1000104f) { -+ if (OPENSSL_VERSION_NUMBER >= 0x10001000 && -+ OPENSSL_VERSION_NUMBER < 0x1000104f) { - /* 1.0.1 up to 1.0.1c has a bug where TLS1.1 and 1.2 - * can't renegotiate with themselves. Disable. */ - disable_tls_11_and_12 = 1; diff --git a/net/atlas-probe/patches/020-gcc14.patch b/net/atlas-probe/patches/020-gcc14.patch deleted file mode 100644 index 442ddc126..000000000 --- a/net/atlas-probe/patches/020-gcc14.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/networking/telnetd.c -+++ b/networking/telnetd.c -@@ -133,6 +133,7 @@ - #include - #include - #include -+#include - - #define LOGIN_PREFIX "Atlas probe, see http://atlas.ripe.net/\r\n\r\n" - #define LOGIN_PROMPT " login: "