Thanks, applied as 7e5088fa65e0f9c966048fec5212c108adeaa526. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:53:42 +0200, Thorsten Scherer <[email protected]> wrote: > Signed-off-by: Thorsten Scherer <[email protected]> > Message-Id: <[email protected]> > [mol: remove patches as well] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch > > b/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch > deleted file mode 100644 > index 8019ab888e30..000000000000 > --- > a/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From: Marc Kleine-Budde <[email protected]> > -Date: Sat, 29 Oct 2011 18:55:06 +0200 > -Subject: [PATCH] Adapt makefile for Linux, add destdir support > - > -Signed-off-by: Wolfram Sang <[email protected]> > -Signed-off-by: Marc Kleine-Budde <[email protected]> > ---- > -# 20081124: wsa: there is no upstream anymore :( > - > - Makefile | 16 ++++++++-------- > - 1 files changed, 8 insertions(+), 8 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 0964851..4281cb4 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -9,9 +9,9 @@ > - # > - ########## > - > --BINDIR=/usr/local/bin > --MANDIR=/usr/local/man > -- > -+PREFIX ?= /usr > -+BINDIR = $(PREFIX)/sbin > -+MANDIR = $(PREFIX)/man > - > - ########## > - # > -@@ -21,7 +21,7 @@ MANDIR=/usr/local/man > - > - # Uncomment if you need the 4.4 BSD compatibility includes. > - # -> required on Linux (and Win32) > --#COMPAT_INCS = -Iinclude > -+COMPAT_INCS = -Iinclude > - > - # Maybe specify some specific compatibility options > - # -> on AIX activate the BSD mode > -@@ -37,7 +37,7 @@ MANDIR=/usr/local/man > - > - # Define to use srandom/random rather than srand/rand > - # -> required on SunOS 4.1.3, SunOS 5, AIX 2 (BOSX 2 really), OSF1 V2.0 > --NO_SNPRINTF = -DNO_SNPRINTF=1 > -+#NO_SNPRINTF = -DNO_SNPRINTF=1 > - > - # Define if you lack strerror() > - #NO_STRERROR = -DNO_STRERROR=1 > -@@ -47,7 +47,7 @@ NO_SNPRINTF = -DNO_SNPRINTF=1 > - # -> if you want to debug bing define > - #COPTIM = -g > - # -> on Linux, SunOS 4 and OSF1 V2.0 you may specify > --#COPTIM = -O2 > -+COPTIM = -O2 > - # -> on Solaris you may use > - #COPTIM = -O > - # on some hosts like AIX, HP-UX the optimisation options are already set > -@@ -109,5 +109,5 @@ clean: > - $(RM) -f bing bing.ps bing.0 $(OBJS) > - > - install: bing unix/bing.8 > -- $(INSTALL) -m 644 -o man -g man unix/bing.8 $(MANDIR)/man8 > -- $(INSTALL) -m 4555 -o root -g staff bing $(BINDIR) > -+ $(INSTALL) -m 644 unix/bing.8 $(DESTDIR)$(MANDIR)/man8 > -+ $(INSTALL) -m 4555 -o root bing $(DESTDIR)$(BINDIR) > diff --git a/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch > b/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch > deleted file mode 100644 > index 3b7ac6909b96..000000000000 > --- a/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch > +++ /dev/null > @@ -1,119 +0,0 @@ > -From: Marc Kleine-Budde <[email protected]> > -Date: Sat, 29 Oct 2011 18:55:06 +0200 > -Subject: [PATCH] bing_1.1.3-2.diff > - > -From http://ftp.de.debian.org/debian/pool/main/b/bing/bing_1.1.3-2.diff.gz > - > -Signed-off-by: Marc Kleine-Budde <[email protected]> > ---- > - bing.c | 63 > ++++++++++++++++++++++++++++++--------------------------------- > - 1 files changed, 30 insertions(+), 33 deletions(-) > - > -diff --git a/bing.c b/bing.c > -index aa078f9..e1094e9 100644 > ---- a/bing.c > -+++ b/bing.c > -@@ -104,7 +104,9 @@ static char rcsid[] = "$Id: bing.c,v 1.17 1997/01/23 > 21:00:03 pb Exp $"; > - #include <math.h> > - > - /* More specific includes/declarations */ > -+#ifndef __GNU__ > - #include <limits.h> > -+#endif /* __GNU__ */ > - #include <ctype.h> > - #include <string.h> > - #include <memory.h> > -@@ -152,7 +154,9 @@ char* __progname; > - * standard libraries. > - */ > - #include <netinet/ip.h> > -+#ifndef __GNU__ > - #include <netinet/ip_var.h> > -+#endif /* __GNU__ */ > - #include <netinet/ip_icmp.h> > - > - #include "mod_icmp.h" > -@@ -320,9 +324,7 @@ struct timestats { > - > - struct hoststats { > - /* Host info */ > -- char hnamebuf[MAXHOSTNAMELEN]; > - char *hostname; > -- struct sockaddr_in whereto; > - struct sockaddr_in *to; > - struct timestats *ts; > - }; > -@@ -365,28 +367,19 @@ void set_ip(hs, target) > - struct hoststats *hs; > - char *target; > - { > -- struct hostent *hp; > -+ struct addrinfo hints, *ai; > -+ int r; > - > -- hs->to = &hs->whereto; > -- > -- memset((char *)hs->to, 0, sizeof(struct sockaddr_in)); > -- hs->to->sin_family = AF_INET; > -- hs->to->sin_addr.s_addr = inet_addr(target); > -- if (hs->to->sin_addr.s_addr != (u_int)-1) > -- hs->hostname = target; > -- else { > -- hp = gethostbyname(target); > -- if (!hp) { > -- (void)fprintf(stderr, > -- "bing: unknown host %s\n", target); > -- exit(1); > -- } > -- hs->to->sin_family = hp->h_addrtype; > -- memcpy((caddr_t)&hs->to->sin_addr, hp->h_addr, hp->h_length); > -- strncpy(hs->hnamebuf, hp->h_name, sizeof(hs->hnamebuf) - 1); > -- hs->hnamebuf[sizeof(hs->hnamebuf)-1] = '\0'; > -- hs->hostname = hs->hnamebuf; > -+ memset(&hints, 0, sizeof hints); > -+ hints.ai_family = AF_INET; > -+ hints.ai_flags = AI_CANONNAME; > -+ if((r = getaddrinfo(target, NULL, &hints, &ai))) { > -+ fprintf(stderr, "bing: couldn't resolve %s: %s\n", > -+ target, gai_strerror(r)); > -+ exit(1); > - } > -+ hs->to = (struct sockaddr_in *) ai->ai_addr; > -+ hs->hostname = ai->ai_canonname; > - } > - > - void randomfill(bp, len, seed) > -@@ -677,18 +670,22 @@ char * > - pr_addr(l) > - u_long l; > - { > -- struct hostent *hp; > -- static char buf[80]; > -+ static char buf[MAXHOSTNAMELEN+19]; > -+ struct sockaddr_in sa; > -+ int r; > - > -- if ((options & F_NUMERIC) || > -- !(hp = gethostbyaddr((char *)&l, 4, AF_INET))) > -- (void)snprintf(snfargs(buf, sizeof(buf), "%s"), > -- inet_ntoa(*(struct in_addr *)&l)); > -- else > -- (void)snprintf(snfargs(buf, sizeof(buf), "%s (%s)"), > -- hp->h_name, > -- inet_ntoa(*(struct in_addr *)&l)); > -- return(buf); > -+ sa.sin_family = AF_INET; > -+ sa.sin_port = 0; > -+ memcpy(&sa.sin_addr, &l, sizeof l); > -+ > -+ r = getnameinfo((struct sockaddr *) &sa, sizeof sa, buf, sizeof buf, > -+ NULL, 0, (options & F_NUMERIC) ? NI_NUMERICHOST : 0); > -+ if(r) { > -+ fprintf(stderr, "bing: getaddrinfo: %s\n", gai_strerror(r)); > -+ exit(1); > -+ } > -+ > -+ return buf; > - } > - > - /* > diff --git a/patches/bing_src-1.1.3/series b/patches/bing_src-1.1.3/series > deleted file mode 100644 > index 6514c8068328..000000000000 > --- a/patches/bing_src-1.1.3/series > +++ /dev/null > @@ -1,5 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Adapt-makefile-for-Linux-add-destdir-support.patch > -0002-bing_1.1.3-2.diff.patch > -# 91307e9accfd7ef14a5a6b17a345514c - git-ptx-patches magic > diff --git a/rules/bing.in b/rules/bing.in > deleted file mode 100644 > index cc1eb09d6f46..000000000000 > --- a/rules/bing.in > +++ /dev/null > @@ -1,25 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=networking > -config BING > - tristate > - prompt "bing" > - select LIBC_M > - help > - Empirical stochastic bandwidth tester (bing) > - > - Bing is a point-to-point bandwidth measurement > - tool (hence the 'b'), based on ping. > - > - Bing determines the real (raw, as opposed to > - available or average) throughput on a link by > - measuring ICMP echo requests' round trip times > - for different packet sizes at each end of the > - link. > - > - See also: > - http://fgouget.free.fr/bing/bing_src-readme-1st.shtml > - > - STAGING: remove in PTXdist 2026.03.0 > - Unmaintained in PTXdist, upstream dead and fails to build with > - current toolchains. > diff --git a/rules/bing.make b/rules/bing.make > deleted file mode 100644 > index 034835fee936..000000000000 > --- a/rules/bing.make > +++ /dev/null > @@ -1,53 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2003 by Robert Schwebel > -# 2008 by Wolfram Sang, Pengutronix e.K. > -# 2009 by Marc Kleine-Budde <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_BING) += bing > - > -# > -# Paths and names > -# > -BING_VERSION := 1.1.3 > -BING_MD5 := 0ccd96cc01351c0562f1e4b94aaa2790 > -BING := bing_src-$(BING_VERSION) > -BING_SUFFIX := tar.gz > -BING_URL := http://fgouget.free.fr/bing/$(BING).$(BING_SUFFIX) > -BING_SOURCE := $(SRCDIR)/$(BING).$(BING_SUFFIX) > -BING_DIR := $(BUILDDIR)/$(BING) > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -BING_CONF_TOOL := NO > -BING_MAKE_OPT := $(CROSS_ENV_PROGS) bing > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/bing.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, bing) > - @$(call install_fixup, bing,PRIORITY,optional) > - @$(call install_fixup, bing,SECTION,base) > - @$(call install_fixup, bing,AUTHOR,"Robert Schwebel > <[email protected]>") > - @$(call install_fixup, bing,DESCRIPTION,missing) > - > - @$(call install_copy, bing, 0, 0, 0755, -, /usr/sbin/bing) > - > - @$(call install_finish, bing) > - > - @$(call touch) > - > -# vim: syntax=make
