update to 1.0.2a

changes:
-many bugfixes
-Added VRRP support
This commit is contained in:
drochner 2005-08-26 16:54:21 +00:00
parent 8b5d3a8e13
commit 703793922d
6 changed files with 47 additions and 67 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:27 tv Exp $
# $NetBSD: Makefile,v 1.25 2005/08/26 16:54:21 drochner Exp $
#
DISTNAME= libnet-1.0.1b
PKGREVISION= 5
DISTNAME= libnet-1.0.2a
CATEGORIES= devel net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/deprecated/
@ -25,11 +24,4 @@ INSTALLATION_DIRS= bin lib share/examples
post-extract:
${CHMOD} -R a+r ${WRKSRC}/doc
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libnet
@cd ${WRKSRC}/doc/html && ${PAX} -rw *.html *.gif */*.c \
${PREFIX}/share/doc/html/libnet
@${LN} -s ${PREFIX}/share/doc/html/libnet/examples \
${PREFIX}/share/examples/libnet
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:27 jlam Exp $
@comment $NetBSD: PLIST,v 1.5 2005/08/26 16:54:21 drochner Exp $
bin/libnet-config
include/libnet.h
include/libnet/libnet-asn1.h
@ -9,25 +9,4 @@ include/libnet/libnet-ospf.h
include/libnet/libnet-structures.h
lib/libnet.la
man/man3/libnet.3
share/doc/html/libnet/1.html
share/doc/html/libnet/2.html
share/doc/html/libnet/3.html
share/doc/html/libnet/4.html
share/doc/html/libnet/5.html
share/doc/html/libnet/6.html
share/doc/html/libnet/7.html
share/doc/html/libnet/contrib.html
share/doc/html/libnet/examples/libnet-example-1.c
share/doc/html/libnet/examples/libnet-example-2.c
share/doc/html/libnet/examples/libnet-example-3.c
share/doc/html/libnet/examples/libnet-example-4.c
share/doc/html/libnet/fig-3a.gif
share/doc/html/libnet/figure-1.gif
share/doc/html/libnet/figure-2.gif
share/doc/html/libnet/figure-3.gif
share/doc/html/libnet/figure-3a.gif
share/doc/html/libnet/lrm.html
share/examples/libnet
@dirrm share/doc/html/libnet/examples
@dirrm share/doc/html/libnet
@dirrm include/libnet

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.6 2005/08/21 12:21:55 grant Exp $
$NetBSD: distinfo,v 1.7 2005/08/26 16:54:21 drochner Exp $
SHA1 (libnet-1.0.1b.tar.gz) = 799d14bbc6ec909fb5fc9d7ac5183224f6c84ef5
RMD160 (libnet-1.0.1b.tar.gz) = f66e279ad3d700e975174f4051d109c0d7c9d574
Size (libnet-1.0.1b.tar.gz) = 233325 bytes
SHA1 (patch-aa) = 876755183045f277dd7c113cf1e8c591063058af
SHA1 (patch-ab) = 2bb117012b2a7e775b358e4dad6ae67757f5eb1f
SHA1 (patch-ac) = ce45fbee83e878b040443419533b85c1337742e6
SHA1 (libnet-1.0.2a.tar.gz) = 804eaf43bb90f93e505d46a9668c914a112bf136
RMD160 (libnet-1.0.2a.tar.gz) = 43dd2edc31e56b42792727b88d81342dc26d3308
Size (libnet-1.0.2a.tar.gz) = 140191 bytes
SHA1 (patch-aa) = 5dc17a1cac05cf0ea80e421b4e1f092cfc172550
SHA1 (patch-ab) = 56a2cb8b214529fdaacdbc6154ec2fc88edfa1c8
SHA1 (patch-ac) = 62195d77894bda78f9f4c1084e0d36a26c2efdf1

View file

@ -1,15 +1,18 @@
$NetBSD: patch-aa,v 1.1.1.1 1999/11/08 08:25:02 sakamoto Exp $
$NetBSD: patch-aa,v 1.2 2005/08/26 16:54:21 drochner Exp $
--- ./Makefile.in.orig Thu Oct 28 08:44:26 1999
+++ ./Makefile.in Mon Nov 8 11:23:32 1999
@@ -21,5 +21,5 @@
--- Makefile.in.orig 2001-02-05 18:51:41.000000000 +0100
+++ Makefile.in
@@ -20,7 +20,7 @@ MAN_PREFIX = @MAN_PREFIX@
LIBNET = libnet
LIBPWRITE = libpwrite
-LIB = lib/$(LIBNET).a
+LIB = $(LIBNET).a
MAN = doc/$(LIBNET).3
INCLUDE = include/$(LIBNET).h
@@ -68,12 +68,13 @@
INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
@@ -68,14 +68,15 @@ OBJECTS = src/libnet_resolve.o\
src/libnet_port_list.o
.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@
@ -27,7 +30,9 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/08 08:25:02 sakamoto Exp $
+ $(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJECTS:C|src/||:.o=.lo) -rpath $(LIB_PREFIX) -version-info 1:0
version.o: version.h
@@ -92,13 +93,6 @@
version.h: ./VERSION
@@ -92,15 +93,8 @@ example: libnet install
cd example; make
install: libnet
- $(ENSUREDIR) $(DESTDIR)$(prefix) 755
@ -36,15 +41,18 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/08 08:25:02 sakamoto Exp $
- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
- $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
- $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
- $(INSTALL) -c -m 0644 $(LIB) $(DESTDIR)$(LIB_PREFIX)
- rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE)
- $(LN) -f -s $(DESTDIR)$(LIB_PREFIX)$(LIBNET).a $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE)
- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
- rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
- cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
+ $(LIBTOOL) --mode=install $(INSTALL) -c -m 0644 $(LIB:.a=.la) $(DESTDIR)$(LIB_PREFIX)
$(INSTALL) -c -m 0644 $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
$(INSTALL) -c -m 0644 $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
@@ -110,4 +104,5 @@
$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)
$(INSTALL) -c -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
@@ -110,6 +104,7 @@ install: libnet
$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+ $(LIBTOOL) --mode=finish $(DESTDIR)$(LIB_PREFIX)
clean:

View file

@ -1,9 +1,9 @@
$NetBSD: patch-ab,v 1.1 2003/09/16 23:46:56 xtraeme Exp $
$NetBSD: patch-ab,v 1.2 2005/08/26 16:54:21 drochner Exp $
--- include/libnet.h.orig 2000-04-07 10:45:29.000000000 -0700
+++ include/libnet.h 2003-09-16 09:32:48.000000000 -0700
--- include/libnet.h.orig 2001-02-07 00:19:25.000000000 +0100
+++ include/libnet.h
@@ -84,8 +84,8 @@
#define LIBNET_VERSION "1.0.1b"
#define LIBNET_VERSION "1.0.2a"
#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
@ -12,3 +12,4 @@ $NetBSD: patch-ab,v 1.1 2003/09/16 23:46:56 xtraeme Exp $
+need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the \
documentation regarding the libnet-config script."
#endif

View file

@ -1,35 +1,35 @@
$NetBSD: patch-ac,v 1.2 2005/08/21 12:21:55 grant Exp $
$NetBSD: patch-ac,v 1.3 2005/08/26 16:54:21 drochner Exp $
--- configure.orig 1999-10-28 04:47:27.000000000 +1000
--- configure.orig 2001-01-17 21:59:33.000000000 +0100
+++ configure
@@ -503,7 +503,7 @@ fi
@@ -506,7 +506,7 @@ fi
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
+ac_cpp='${CC-cc} -E $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
@@ -737,7 +737,7 @@ echo "configure:737: checking whether th
@@ -778,7 +778,7 @@ echo "configure:778: checking whether th
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
+ac_cpp='${CC-cc} -E $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
@@ -1209,7 +1209,7 @@ fi
@@ -1284,7 +1284,7 @@ fi
echo $ac_n "checking low-level packet interface type""... $ac_c" 1>&6
echo "configure:1211: checking low-level packet interface type" >&5
echo "configure:1286: checking low-level packet interface type" >&5
-if test -r /dev/bpf0 ; then
+if test -r /dev/bpf0 -o -r /dev/bpf ; then
LL_INT_TYPE=bpf
echo "$ac_t""found bpf" 1>&6
elif test -r /usr/include/net/pfilt.h ; then
@@ -1340,7 +1340,7 @@ fi
@@ -1416,7 +1416,7 @@ fi
fi