summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/bing-1.0.5/generic/linux-fixes.diff97
-rw-r--r--patches/bing-1.0.5/generic/malloc-include.diff20
-rw-r--r--patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff53
-rw-r--r--patches/bing_src-1.1.3/generic/series1
-rw-r--r--rules/bing.make14
5 files changed, 61 insertions, 124 deletions
diff --git a/patches/bing-1.0.5/generic/linux-fixes.diff b/patches/bing-1.0.5/generic/linux-fixes.diff
deleted file mode 100644
index 0f34c7624..000000000
--- a/patches/bing-1.0.5/generic/linux-fixes.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Submitted:
-#
-# Robert Schwebel, 2004-03-29
-#
-# Error:
-#
-# Does not compile because linux fixes seem to be out of date.
-#
-# Description:
-#
-# see Error
-#
-# State:
-#
-# Fixed in local tree, not sent upstream yet.
-#
-
-diff -urN bing-1.0.5/bing.c bing-1.0.5-ptx/bing.c
---- bing-1.0.5/bing.c 2001-01-19 19:28:53.000000000 +0100
-+++ bing-1.0.5-ptx/bing.c 2004-03-29 17:28:07.000000000 +0200
-@@ -671,13 +671,8 @@
- pr_retip((struct ip *)ICMP_TO_DATA(icp));
- break;
- case ICMP_PARAMPROB:
--#ifdef linux
-- (void)printf("Parameter problem: pointer = 0x%02x\n",
-- icp->un.gateway);
--#else
- (void)printf("Parameter problem: pointer = 0x%02x\n",
- icp->icmp_hun.ih_pptr);
--#endif /* linux */
- pr_retip((struct ip *)ICMP_TO_DATA(icp));
- break;
- case ICMP_TSTAMP:
-diff -urN bing-1.0.5/sysdep.h bing-1.0.5-ptx/sysdep.h
---- bing-1.0.5/sysdep.h 1995-07-18 00:36:44.000000000 +0200
-+++ bing-1.0.5-ptx/sysdep.h 2004-03-29 17:28:22.000000000 +0200
-@@ -46,58 +46,6 @@
- #ifndef _SYSDEP_H_
- #define _SYSDEP_H_
-
--#ifdef linux
--#define icmp icmphdr
--#define ip iphdr
--#define icmp_type type
--#define icmp_code code
--#define icmp_cksum checksum
--#define icmp_id un.echo.id
--#define icmp_seq un.echo.sequence
--#define icmp_gwaddr un.gateway
--#define ip_hl ihl
--#define ip_v version
--#define ip_tos tos
--#define ip_len tot_len
--#define ip_id id
--#define ip_off frag_off
--#define ip_ttl ttl
--#define ip_p protocol
--#define ip_sum check
--#define ip_src saddr
--#define ip_dst daddr
--#define MAX_IPOPTLEN 4096
--#define ICMP_MINLEN 16
--
--#define IPOPT_MINOFF 4
--
--#define IPOPT_EOL IPOPT_END
--#define IPOPT_NOP IPOPT_NOOP
--
--#define ICMP_UNREACH ICMP_DEST_UNREACH
--#define ICMP_UNREACH_NET ICMP_NET_UNREACH
--#define ICMP_UNREACH_HOST ICMP_HOST_UNREACH
--#define ICMP_UNREACH_PROTOCOL ICMP_PROT_UNREACH
--#define ICMP_UNREACH_PORT ICMP_PORT_UNREACH
--#define ICMP_UNREACH_NEEDFRAG ICMP_FRAG_NEEDED
--#define ICMP_UNREACH_SRCFAIL ICMP_SR_FAILED
--#define ICMP_SOURCEQUENCH ICMP_SOURCE_QUENCH
--#define ICMP_REDIRECT_NET ICMP_REDIR_NET
--#define ICMP_REDIRECT_HOST ICMP_REDIR_HOST
--#define ICMP_REDIRECT_TOSNET ICMP_REDIR_NETTOS
--#define ICMP_REDIRECT_TOSHOST ICMP_REDIR_HOSTTOS
--#define ICMP_TIMXCEED ICMP_TIME_EXCEEDED
--#define ICMP_TIMXCEED_INTRANS ICMP_EXC_TTL
--#define ICMP_TIMXCEED_REASS ICMP_EXC_FRAGTIME
--#define ICMP_PARAMPROB ICMP_PARAMETERPROB
--#define ICMP_TSTAMP ICMP_TIMESTAMP
--#define ICMP_TSTAMPREPLY ICMP_TIMESTAMPREPLY
--#define ICMP_IREQ ICMP_INFO_REQUEST
--#define ICMP_IREQREPLY ICMP_INFO_REPLY
--
--#define ICMP_TO_DATA(icp) ((u_char *)(icp + 1))
--#endif /* linux */
--
- /* Defaults (should work on most systems) */
-
- #ifndef ICMP_TO_DATA
diff --git a/patches/bing-1.0.5/generic/malloc-include.diff b/patches/bing-1.0.5/generic/malloc-include.diff
deleted file mode 100644
index 0f025994a..000000000
--- a/patches/bing-1.0.5/generic/malloc-include.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN bing-1.0.5-orig/bing.c bing-1.0.5/bing.c
---- bing-1.0.5-orig/bing.c 2004-06-29 20:20:57.000000000 +0200
-+++ bing-1.0.5/bing.c 2004-06-30 08:29:53.000000000 +0200
-@@ -169,6 +169,7 @@
- #endif /* linux */
- #include <netdb.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -1228,7 +1229,7 @@
- int i;
- int ch, hold, recv_packlen, preload;
- u_char *datap, *recv_packet;
-- char *target1, *target2, *malloc();
-+ char *target1, *target2;
- u_char ttl, loop;
- #ifdef IP_OPTIONS
- char rspace[3 + 4 * NROUTES + 1]; /* record route space */
diff --git a/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff b/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff
new file mode 100644
index 000000000..87d980747
--- /dev/null
+++ b/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff
@@ -0,0 +1,53 @@
+Adapt makefile for Linux
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+---
+# 20081124: wsa: there is no upstream anymore :(
+
+ Makefile | 12 +++++-----
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: platform-phyCORE-MPC5200B-IO/build-target/bing_src-1.1.3/Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -9,9 +9,9 @@
+ #
+ ##########
+
+-BINDIR=/usr/local/bin
+-MANDIR=/usr/local/man
+-
++PREFIX ?= /usr/local
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/man
+
+ ##########
+ #
+@@ -21,7 +21,7 @@
+
+ # 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 @@
+
+ # 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 @@
+ # -> 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
diff --git a/patches/bing_src-1.1.3/generic/series b/patches/bing_src-1.1.3/generic/series
new file mode 100644
index 000000000..4a3ef950c
--- /dev/null
+++ b/patches/bing_src-1.1.3/generic/series
@@ -0,0 +1 @@
+adapt_makefile_for_linux.diff -p0
diff --git a/rules/bing.make b/rules/bing.make
index 9dae5352b..f2afb56b4 100644
--- a/rules/bing.make
+++ b/rules/bing.make
@@ -2,7 +2,8 @@
# $Id$
#
# Copyright (C) 2003 by Robert Schwebel
-#
+# Copyright (C) 2008 by Wolfram Sang, Pengutronix e.K.
+#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
@@ -17,10 +18,10 @@ PACKAGES-$(PTXCONF_BING) += bing
#
# Paths and names
#
-BING_VERSION = 1.0.5
-BING = bing-$(BING_VERSION)
+BING_VERSION = 1.1.3
+BING = bing_src-$(BING_VERSION)
BING_SUFFIX = tar.gz
-BING_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(BING).$(BING_SUFFIX)
+BING_URL = http://fgouget.free.fr/bing/$(BING).$(BING_SUFFIX)
BING_SOURCE = $(SRCDIR)/$(BING).$(BING_SUFFIX)
BING_DIR = $(BUILDDIR)/$(BING)
@@ -59,7 +60,7 @@ $(STATEDIR)/bing.extract: $(bing_extract_deps_default)
bing_prepare: $(STATEDIR)/bing.prepare
BING_PATH = PATH=$(CROSS_PATH)
-BING_ENV = $(CROSS_ENV)
+BING_ENV = $(CROSS_ENV) PREFIX=$(SYSROOT)/usr
$(STATEDIR)/bing.prepare: $(bing_prepare_deps_default)
@$(call targetinfo, $@)
@@ -84,8 +85,7 @@ bing_install: $(STATEDIR)/bing.install
$(STATEDIR)/bing.install: $(bing_install_deps_default)
@$(call targetinfo, $@)
- # FIXME
- #@$(call install, BING)
+ @$(call install, BING)
@$(call touch, $@)
# ----------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-10 13:22:31 +0000