Date: Wed, 17 Jul 2002 00:02:23 -0700 (PDT) From: Joseph Scott <joseph@randomnetworks.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40678: MAINTAINER UPDATE : net/sendip 1.4 -> 2.1 Message-ID: <200207170702.AAA87073@pebkac.owp.csus.edu>
next in thread | raw e-mail | index | archive | help
>Number: 40678 >Category: ports >Synopsis: MAINTAINER UPDATE : net/sendip 1.4 -> 2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 17 00:00:09 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Joseph Scott >Release: FreeBSD 4.6-STABLE i386 >Organization: randomnetworks.com >Environment: System: FreeBSD rodan.owp.csus.edu 4.6-STABLE FreeBSD 4.6-STABLE #0: Fri Jul 12 14:57:15 PDT 2002 scottj@rodan.owp.csus.edu:/usr/obj/usr/src/sys/RODAN i386 >Description: MAINTAINER UPDATE : net/sendip 1.4 -> 2.1 The new patch for this port, patch-2122 is a diff from a yet to released version of sendip, 2.2. This was provided by the author of sendip. >How-To-Repeat: >Fix: diff -ruN sendip.orig/Makefile sendip/Makefile --- sendip.orig/Makefile Thu Mar 28 12:44:21 2002 +++ sendip/Makefile Tue Jul 16 22:42:19 2002 @@ -6,14 +6,19 @@ # PORTNAME= sendip -PORTVERSION= 1.4 +PORTVERSION= 2.1 CATEGORIES= net MASTER_SITES= http://www.earth.li/projectpurple/files/ MAINTAINER= joseph@randomnetworks.com -WRKSRC= ${WRKDIR}/sendip +USE_GMAKE= yes +USE_REINPLACE= yes MAN1= sendip.1 + +pre-install: + ${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile; + ${REINPLACE_CMD} -e "s:/share/man/man1:/man/man1:g" ${WRKSRC}/Makefile; .include <bsd.port.mk> diff -ruN sendip.orig/distinfo sendip/distinfo --- sendip.orig/distinfo Thu Mar 28 12:44:21 2002 +++ sendip/distinfo Tue Jul 16 22:10:10 2002 @@ -1 +1 @@ -MD5 (sendip-1.4.tar.gz) = f5b2a15d30e7d8359be25dcacdff663c +MD5 (sendip-2.1.tar.gz) = 76b36e63f1b1139e86c7092ed7c010cc diff -ruN sendip.orig/files/patch-2122 sendip/files/patch-2122 --- sendip.orig/files/patch-2122 Wed Dec 31 16:00:00 1969 +++ sendip/files/patch-2122 Tue Jul 16 22:20:40 2002 @@ -0,0 +1,177 @@ +diff -urN sendip-2.1/CHANGES sendip-2.2/CHANGES +--- CHANGES Sun Feb 24 12:43:14 2002 ++++ CHANGES Tue Mar 26 18:17:19 2002 +@@ -87,3 +87,9 @@ + * icmp.so: + - only checks a single layer of enclosing headers for IPV4/IPV6 + - now compiles on platforms which care about alignment ++ ++Changes between sendip-2.1 and sendip-2.2 ++* FreeBSD compile fixes ++* spec file fixes (Calum Selkirk <cselkirk@panix.com> ++* Linux-PPC compile fixes ++* More SunOS fixes +diff -urN sendip-2.1/Makefile sendip-2.2/Makefile +--- Makefile Sun Feb 24 12:37:47 2002 ++++ Makefile Sat Mar 9 08:15:25 2002 +@@ -8,12 +8,13 @@ + #For Solaris, you may need + #INSTALL=/usr/ucb/install + +-CFLAGS= -fPIC -pipe -Wall -Wpointer-arith -Wwrite-strings \ ++CFLAGS= -fPIC -fsigned-char -pipe -Wall -Wpointer-arith -Wwrite-strings \ + -Wstrict-prototypes -Wnested-externs -Winline -Werror -g \ + -DSENDIP_LIBS=\"$(LIBDIR)\" + #-Wcast-align causes problems on solaris, but not serious ones + LDFLAGS= -g -rdynamic -lm +-LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm ++#LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm ++LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm -ldl + LDFLAGS_LINUX= -g -rdynamic -ldl -lm + LIBCFLAGS= -shared + CC= gcc +diff -urN sendip-2.1/VERSION sendip-2.2/VERSION +--- VERSION Fri Nov 23 17:51:04 2001 ++++ VERSION Sun Feb 24 19:12:35 2002 +@@ -1 +1 @@ +-2.1 ++2.2 +diff -urN sendip-2.1/icmp.h sendip-2.2/icmp.h +--- icmp.h Fri Nov 23 17:50:51 2001 ++++ icmp.h Tue Mar 5 22:16:25 2002 +@@ -3,13 +3,8 @@ + #ifndef _SENDIP_ICMP_H + #define _SENDIP_ICMP_H + +-/* FreeBSD needs these. It shouldn't, but it does. GRR */ +-#include <netinet/in_systm.h> +-#include <netinet/ip.h> +- +-/* For message types */ +-#include <netinet/ip_icmp.h> +-#include <netinet/icmp6.h> ++#define ICMP6_ECHO_REQUEST 128 ++#define ICMP_ECHO 8 + + /* ICMP HEADER + * Copied from glibc 2.2, reproduced here without code specific stuff +diff -urN sendip-2.1/sendip.spec.in sendip-2.2/sendip.spec.in +--- sendip.spec.in Sat Feb 23 22:49:35 2002 ++++ sendip.spec.in Sun Mar 3 12:08:38 2002 +@@ -13,9 +13,19 @@ + BuildRoot: /var/tmp/sendip-root + + %description +-A command line tool to send arbitrary IP packets. It has a large number of command line options to specify the content of every header of a BGP, RIP, TCP, UDP, ICMP, or raw IPv4 or IPv6 packet. It also allows any data to be added to the packet. Checksums can be calculated automatically, but if you wish to send out wrong checksums, that is supported too. ++A command line tool to send arbitrary IP packets. It has a large number of ++command line options to specify the content of every header of a NTP, BGP, ++RIP, TCP, UDP, ICMP, or raw IPv4 or IPv6 packet. It also allows any data ++to be added to the packet. + + %changelog ++* Sun Feb 24 2002 Calum Selkirk <cselkirk@panix.com> ++- changed /usr/share/man to %{_mandir} and added perl to edit Makefile ++ to refect this ++- wrapped %discription to tw=78 ++- rm buildroot before install ++- other minor tweeks ++ + * Sat Feb 23 2002 Mike Ricketts <mike@earth.li> + - Update to version 2.1 + - See CHANGES for a more complete list (there's a *lot*) +@@ -59,10 +69,13 @@ + %build + mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/share/man/man1 + mkdir -p $RPM_BUILD_ROOT/usr/lib +-make PREFIX=/usr ++make PREFIX=/usr MANDIR=%{_mandir}/man1 + + %install +-make PREFIX=$RPM_BUILD_ROOT/usr install ++rm -rf $RPM_BUILD_ROOT ++mkdir -p $RPM_BUILD_ROOT/usr/{bin,lib} ++mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 ++make PREFIX=$RPM_BUILD_ROOT/usr MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install + + %clean + rm -fr $RPM_BUILD_ROOT +diff -urN sendip-2.1/types.h sendip-2.2/types.h +--- types.h Sat Feb 23 17:28:00 2002 ++++ types.h Tue Mar 26 18:19:00 2002 +@@ -1,6 +1,8 @@ + /* types.h - tpyes needed in sendip and not defined everywhere + * Author: Mike Ricketts <mike@earth.li> + * ChangeLog since 2.1 release: ++ * 03/02/2002 Added more defines/protos for non-IPv6 systems. ++ * 26/03/2002 FreeBSD style BYTE_ORDER fixes + */ + #ifndef _SENDIP_TYPES_H + #define _SENDIP_TYPES_H +@@ -25,8 +27,13 @@ + + /* for things that *really* don't know about ipv6, ... */ + #ifndef AF_INET6 +-#define PF_INET6 10 +-#define AF_INET6 PF_INET6 ++#define AF_INET6 10 ++#define IPPROTO_ICMPV6 58 ++#define IPPROTO_NONE 59 ++#define IPPROTO_DSTOPTS 60 ++#endif /* !AF_INET6 */ ++ ++#ifndef s6_addr + struct in6_addr { + union { + u_int8_t u6_addr8[16]; +@@ -37,6 +44,8 @@ + #define s6_add16 in6_u.u6_addr16 + #define s6_add32 in6_u.u6_addr32 + }; ++extern const struct in6_addr in6addr_any; /* :: */ ++extern const struct in6_addr in6addr_loopback; /* ::1 */ + + struct sockaddr_in6 { + u_int16_t sin6_family; +@@ -45,8 +54,9 @@ + struct in6_addr sin6_addr; + u_int32_t sin6_scope_id; + }; ++extern int inet_pton (int af, const char *cp, void *buf); + +-#endif /* !AF_INET 6 */ ++#endif /* !s6_addr */ + + /* Convert _BIG_ENDIAN/_LITTLE_ENDIAN to __BYTE_ORDER */ + #ifndef __LITTLE_ENDIAN +@@ -58,15 +68,30 @@ + #endif + + #ifndef __BYTE_ORDER ++ ++/* Not linux-style, maybe FreeBSD-style */ ++#ifdef BYTE_ORDER ++#undef __LITTLE_ENDIAN ++#undef __BIG_ENDIAN ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#define __BIG_ENDIAN BIG_ENDIAN ++#define __BYTE_ORDER BYTE_ORDER ++#else ++ ++/* Not FreeBSD-style, try solaris style */ + #ifdef _BIG_ENDIAN + #define __BYTE_ORDER __BIG_ENDIAN + #else /* not _BIG_ENDIAN */ + #ifdef _LITTLE_ENDIAN + #define __BYTE_ORDER __LITTLE_ENDIAN + #else /* not _LITTLE_ENDIAN */ ++ ++/* Not solaris style. Give up. */ + #error Could not guess your byte order ++ + #endif /* not _LITTLE_ENDIAN */ + #endif /* not _BIG_ENDIAN */ +-#endif /* _BYTE_ORDER */ ++#endif /* not BYTE_ORDER */ ++#endif /* not __BYTE_ORDER */ + + #endif /* _SENDIP_TYPES_H */ diff -ruN sendip.orig/pkg-plist sendip/pkg-plist --- sendip.orig/pkg-plist Thu Mar 28 12:44:21 2002 +++ sendip/pkg-plist Tue Jul 16 22:44:21 2002 @@ -1 +1,10 @@ bin/sendip +lib/sendip/ipv4.so +lib/sendip/ipv6.so +lib/sendip/icmp.so +lib/sendip/tcp.so +lib/sendip/udp.so +lib/sendip/rip.so +lib/sendip/bgp.so +lib/sendip/ntp.so +@dirrm lib/sendip >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207170702.AAA87073>