ripe-atlas: update to 5130

5130 removed --with-probe-type; generic is the default now, selected by
not passing --enable-hwprobe. Drop 001-uname.patch, upstream took the
`uname -n` change in 5120.

Also set LD back to busybox's "$(CC) -nostdlib": OpenWrt's MAKE_FLAGS
force the raw ld.bfd, which rejects the compiler-driver flags in
OpenWrt's LDFLAGS (-fuse-ld=, -specs=, -flto=) with "-f may not be used
without -shared".

Fixes: https://github.com/openwrt/packages/issues/30083
Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/net/ripe-atlas/Makefile b/net/ripe-atlas/Makefile
index d426169862bd6e8fcd555c245bd575792bc342b1..dd8655f1e2bbc218849ecbcc37c41f6972f94a47 100644 (file)
--- a/net/ripe-atlas/Makefile
+++ b/net/ripe-atlas/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ripe-atlas
-PKG_VERSION:=5110
+PKG_VERSION:=5130
 PKG_RELEASE:=1
 
 PKG_SOURCE:=ripe-atlas-software-probe-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/RIPE-NCC/ripe-atlas-software-probe/tar.gz/refs/tags/$(PKG_VERSION)?
-PKG_HASH:=9ff4931056b7da67e13478c29dfaea0f647ee4cb725f864ba5fa28a33a8ec5c7
+PKG_HASH:=d2b0b03c1c27b9e1cfc8329c4862141ca53d0f46f8cb36af92a3adc2e5d26ff6
 PKG_BUILD_DIR:=$(BUILD_DIR)/ripe-atlas-software-probe-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Tiago Gaspar <tiagogaspar8@gmail.com>, Michel Stam <mstam@ripe.net>
@@ -23,6 +23,9 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+# Restore busybox's compiler-driver LD; OpenWrt overrides it with raw ld.bfd.
+MAKE_FLAGS += LD="$(TARGET_CC) -nostdlib"
+
 define Package/ripe-atlas/Default
   SECTION:=net
   CATEGORY:=Network
@@ -45,7 +48,6 @@ endef
 # The measurement applets need raw sockets; ujail hands them CAP_NET_RAW from
 # capabilities.json, so the probe does not have to run as root.
 CONFIGURE_ARGS+= \
-       --with-probe-type=generic \
        --with-user=ripe-atlas \
        --with-group=ripe-atlas \
        --with-measurement-user=ripe-atlas \

diff --git a/net/ripe-atlas/patches/001-uname.patch b/net/ripe-atlas/patches/001-uname.patch
deleted file mode 100644 (file)
index ca1d9eb..0000000
--- a/net/ripe-atlas/patches/001-uname.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 64a088ae6c2752888966167508e1318bed047f03 Mon Sep 17 00:00:00 2001
-From: ttaiclet <ttaiclet@ripe.net>
-Date: Wed, 16 Apr 2025 18:09:56 +0200
-Subject: [PATCH] changed: uname instead of hostname for generic ssh-key
- creation
-
-hostname is a call to uname() in most implementations, but requires
-an additional binary to be shipped. By using uname directly, no
-additional binary has to be shipped.
-
-See 'uname' in the following links:
-- https://linux.die.net/man/2/gethostname
-- https://pubs.opengroup.org/onlinepubs/7908799/xsh/sysutsname.h.html
-
-Reviewed-by: Marios Mavropoulos <mmavropoulos@ripe.net>
----
- bin/arch/generic/generic-ATLAS.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/bin/arch/generic/generic-ATLAS.sh.in
-+++ b/bin/arch/generic/generic-ATLAS.sh.in
-@@ -49,7 +49,7 @@ get_ether_addr
- 
- # Create ssh keys if they are not there yet.
- if [ ! -f $ATLAS_SYSCONFDIR/probe_key ]; then
--    name=$(hostname -s)
-+    name=$(uname -n)
-     ssh-keygen -t rsa -P '' -C $name -f $ATLAS_SYSCONFDIR/probe_key
-     chown -R @ripe_atlas_user@:@ripe_atlas_group@ $ATLAS_SYSCONFDIR
- fi