* fix byte order of packet length in IP header
* use autoconf and clean up a bit * bump package patch level
This commit is contained in:
danh
parent
a48ff1965e
commit
c237443f82
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2002/09/12 15:38:58 danh Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2002/12/27 18:07:00 danh Exp $
|
||||
|
||||
COMMENT= "send ICMP nasty garbage"
|
||||
|
||||
DISTNAME= SING-1.1
|
||||
PKGNAME= ${DISTNAME:L}
|
||||
PKGNAME= ${DISTNAME:L}p1
|
||||
CATEGORIES= net security
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sing/}
|
||||
EXTRACT_SUFX= .tgz
|
||||
@ -20,6 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
$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
|
||||
|
||||
-if test -n "$GCC"; then
|
||||
- CFLAGS="-O3 -Wall"
|
||||
-fi
|
||||
-
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1106: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
@@ -1607,14 +1603,14 @@ fi
|
||||
|
||||
PCAP_CLEAN="pcap_clean"
|
||||
PCAP_DISTCLEAN="pcap_distclean"
|
||||
-CFLAGS="$CFLAGS -I$libpcapdir"
|
||||
+CFLAGS="$CFLAGS"
|
||||
|
||||
if test $have_libpcap = yes; then
|
||||
PCAP_COMPILE=""
|
||||
LIBS="-L/usr/local/lib $LIBS"
|
||||
else
|
||||
PCAP_COMPILE="pcap_compile"
|
||||
- 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
|
||||
|
||||
|
||||
98
net/sing/patches/patch-configure_in
Normal file
98
net/sing/patches/patch-configure_in
Normal file
@ -0,0 +1,98 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2002/12/27 18:07:00 danh Exp $
|
||||
--- configure.in.orig Wed Apr 18 07:11:08 2001
|
||||
+++ configure.in Fri Dec 27 12:48:53 2002
|
||||
@@ -7,20 +7,11 @@ AC_INIT(sing.c)
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
-libpcapdir=libpcap-0.4
|
||||
-libnetdir=Libnet-1.0.1b
|
||||
-
|
||||
-AC_SUBST(libpcapdir)
|
||||
-AC_SUBST(libnetdir)
|
||||
-
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AM_INIT_AUTOMAKE(SING, 1.1)
|
||||
|
||||
AC_PROG_CC
|
||||
-if test -n "$GCC"; then
|
||||
- CFLAGS="-O3 -Wall"
|
||||
-fi
|
||||
|
||||
AC_STDC_HEADERS
|
||||
|
||||
@@ -46,42 +37,21 @@ AC_CHECK_LIB(net, libnet_open_raw_sock,
|
||||
dnl
|
||||
dnl libpcap...
|
||||
dnl
|
||||
-PCAP_CLEAN="pcap_clean"
|
||||
-PCAP_DISTCLEAN="pcap_distclean"
|
||||
-CFLAGS="$CFLAGS -I$libpcapdir"
|
||||
-
|
||||
if test $have_libpcap = yes; then
|
||||
PCAP_COMPILE=""
|
||||
- LIBS="-L/usr/local/lib $LIBS"
|
||||
else
|
||||
PCAP_COMPILE="pcap_compile"
|
||||
- LIBS="-L/usr/local/lib -L$libpcapdir $LIBS"
|
||||
fi
|
||||
|
||||
-AC_SUBST(PCAP_CLEAN)
|
||||
-AC_SUBST(PCAP_DISTCLEAN)
|
||||
-AC_SUBST(PCAP_COMPILE)
|
||||
-
|
||||
dnl
|
||||
dnl libnet...
|
||||
dnl
|
||||
-LIBNET_CLEAN="libnet_clean"
|
||||
-LIBNET_DISTCLEAN="libnet_distclean"
|
||||
-CFLAGS="$CFLAGS -I$libnetdir"
|
||||
-
|
||||
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"
|
||||
fi
|
||||
|
||||
-AC_SUBST(LIBNET_CLEAN)
|
||||
-AC_SUBST(LIBNET_DISTCLEAN)
|
||||
-AC_SUBST(LIBNET_COMPILE)
|
||||
-
|
||||
-
|
||||
dnl
|
||||
dnl Check headers
|
||||
dnl
|
||||
@@ -90,8 +60,6 @@ AC_CHECK_HEADERS(sys/time.h sys/param.h
|
||||
AC_CHECK_HEADERS(net/if.h unistd.h)
|
||||
AC_HEADER_TIME
|
||||
|
||||
-AC_C_BIGENDIAN
|
||||
-
|
||||
dnl
|
||||
dnl Check structs
|
||||
dnl
|
||||
@@ -144,7 +112,7 @@ case "$target_os" in
|
||||
case "`uname -r`" in
|
||||
2.4*)
|
||||
AC_DEFINE(LINUX_24)
|
||||
- ;
|
||||
+ ;;
|
||||
2.2*)
|
||||
AC_DEFINE(LINUX_22)
|
||||
;;
|
||||
@@ -197,11 +165,8 @@ case "$target_os" in
|
||||
2.0*)
|
||||
AC_DEFINE(STRANGE_BSD_BYTE)
|
||||
;;
|
||||
- 2.*)
|
||||
-
|
||||
- ;;
|
||||
*)
|
||||
- AC_DEFINE(STRANGE_BSD_BYTE)
|
||||
+
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
20
net/sing/patches/patch-ipcompat_h
Normal file
20
net/sing/patches/patch-ipcompat_h
Normal file
@ -0,0 +1,20 @@
|
||||
$OpenBSD: patch-ipcompat_h,v 1.1 2002/12/27 18:07:00 danh Exp $
|
||||
--- ipcompat.h.orig Wed Apr 18 07:11:08 2001
|
||||
+++ ipcompat.h Fri Dec 27 11:34:55 2002
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
/* IPv4 packet header */
|
||||
struct ip2 {
|
||||
-#ifdef WORDS_BIGENDIAN
|
||||
- u_char ip_v:4, /* Version de IP */
|
||||
- ip_hl:4; /* Longitud cabecera en grupos de 32 bits */
|
||||
-#else
|
||||
+#ifdef LIBNET_LIL_ENDIAN
|
||||
u_char ip_hl:4, /* Longitud cabecera en grupos de 32 bits */
|
||||
ip_v:4; /* Version de IP */
|
||||
+#else
|
||||
+ u_char ip_v:4, /* Version de IP */
|
||||
+ ip_hl:4; /* Longitud cabecera en grupos de 32 bits */
|
||||
#endif
|
||||
u_char ip_tos; /* Tipo de servicio */
|
||||
short ip_len; /* Longitud total incluyendo datos */
|
||||
@ -1,18 +0,0 @@
|
||||
$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>
|
||||
Loading…
x
Reference in New Issue
Block a user