update to sing 1.1

This commit is contained in:
danh 2001-05-22 18:18:50 +00:00
parent 43d0f2034d
commit 3e2fb6c4fb
5 changed files with 74 additions and 24 deletions

View File

@ -1,15 +1,17 @@
# $OpenBSD: Makefile,v 1.4 2001/05/09 19:16:47 danh Exp $
# $OpenBSD: Makefile,v 1.5 2001/05/22 18:18:50 danh Exp $
COMMENT= "send ICMP nasty garbage"
DISTNAME= SING-1.0
DISTNAME= SING-1.1
PKGNAME= ${DISTNAME:L}
CATEGORIES= net security
NEED_VERSION= 1.364
NEED_VERSION= 1.409
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sing
EXTRACT_SUFX= .tgz
LIB_DEPENDS= net::net/libnet
MAINTAINER= Dan Harnett <danh@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,3 +1,3 @@
MD5 (SING-1.0.tgz) = 0e478a271068eefc6e26e45d236e7694
RMD160 (SING-1.0.tgz) = ba2ac2d423b37a2b5ef4b1bac68b1e67d3fca23a
SHA1 (SING-1.0.tgz) = 90c894f926aec5980d1cdd1e0b699c68e3f6064e
MD5 (SING-1.1.tgz) = f9f649c4b40174a983601d46e4a3daac
RMD160 (SING-1.1.tgz) = 20f56bffcc8ecd6d5e360475b3445eb598bdd65f
SHA1 (SING-1.1.tgz) = 99163d89f824138ce8dd0819ba737b632f695600

View File

@ -1,25 +1,34 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/02/22 15:08:54 danh Exp $
--- Makefile.in.orig Sat Sep 16 06:03:43 2000
+++ Makefile.in Thu Feb 22 09:09:05 2001
@@ -72,7 +72,7 @@ getopt_OBJECTS = @getopt_OBJECTS@
getopt_SOURCES = @getopt_SOURCES@
$OpenBSD: patch-Makefile_in,v 1.2 2001/05/22 18:18:50 danh Exp $
--- Makefile.in.orig Wed Apr 18 07:11:06 2001
+++ Makefile.in Tue May 22 14:12:19 2001
@@ -76,7 +76,7 @@ getopt_SOURCES = @getopt_SOURCES@
libnetdir = @libnetdir@
libpcapdir = @libpcapdir@
-INCLUDES = -I$(includedir) -I$(libpcapdir)
-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include
+INCLUDES = -I$(includedir)
LIBS = @LIBS@ -lpcap
LIBS = @LIBS@ -lpcap -lnet
@@ -108,7 +108,7 @@ NROFF = nroff
@@ -94,7 +94,7 @@ CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS)
-DEFS = @DEFS@ `$(libnetdir)/libnet-config --defines` -I. -I$(srcdir) -I.
+DEFS = @DEFS@ `libnet-config --defines` -I. -I$(srcdir) -I.
sing_OBJECTS = sing.o device.o ip_options.o parser.o vers_date.o help.o @getopt_OBJECTS@
sing_LDADD = $(LDADD)
sing_DEPENDENCIES =
@@ -111,7 +111,7 @@ NROFF = nroff
SOURCES = $(sing_SOURCES)
OBJECTS = $(sing_OBJECTS)
-all: libpcap all-redirect
-all: libpcap libnet all-redirect
+all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .o .s
@@ -223,8 +223,7 @@ uninstall-man:
@@ -226,8 +226,7 @@ uninstall-man:
help.o: help.c config.h

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/02/22 15:08:54 danh Exp $
--- configure.orig Sat Sep 16 06:03:44 2000
+++ configure Thu Feb 22 09:36:37 2001
$OpenBSD: patch-configure,v 1.2 2001/05/22 18:18:50 danh Exp $
--- configure.orig Tue May 22 14:00:01 2001
+++ configure Tue May 22 14:01:48 2001
@@ -1097,10 +1097,6 @@ else
fi
fi
@ -10,9 +10,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/02/22 15:08:54 danh Exp $
-fi
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1104: checking how to run the C preprocessor" >&5
echo "configure:1106: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
@@ -1566,11 +1562,11 @@ fi
@@ -1607,14 +1603,14 @@ fi
PCAP_CLEAN="pcap_clean"
PCAP_DISTCLEAN="pcap_distclean"
@ -21,8 +21,29 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/02/22 15:08:54 danh Exp $
if test $have_libpcap = yes; then
PCAP_COMPILE=""
- LIBS="-L/usr/local/lib $LIBS"
+ LIBS="$LIBS"
LIBS="-L/usr/local/lib $LIBS"
else
PCAP_COMPILE="pcap_compile"
LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
- LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
+ LIBS="-L/usr/local/lib $LIBS"
fi
@@ -1623,14 +1619,14 @@ fi
LIBNET_CLEAN="libnet_clean"
LIBNET_DISTCLEAN="libnet_distclean"
-CFLAGS="$CFLAGS -I$libnetdir"
+CFLAGS="$CFLAGS"
if test $have_libnet = yes; then
LIBNET_COMPILE=""
LIBS="-L/usr/local/lib $LIBS"
else
- LIBNET_COMPILE="libnet_compile"
- LIBS="-L/usr/local/lib -L$libnetdir/lib $LIBS"
+ LIBNET_COMPILE=""
+ LIBS="-L/usr/local/lib $LIBS"
fi

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-sing_c,v 1.1 2001/05/22 18:18:50 danh Exp $
--- sing.c.orig Wed Apr 18 07:11:08 2001
+++ sing.c Tue May 22 14:16:23 2001
@@ -59,14 +59,6 @@ static const char rcsid[] =
# endif
#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-# include <netinet/in_systm.h>
-#else
-# ifdef HAVE_NETINET_IN_SYSTEM_H
-# include <netinet/in_system.h>
-# endif
-#endif
-
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>