--- /dev/null
+--- Libnet-1.0.2a/include/libnet.h~ 2001-02-06 23:19:25.000000000 +0000
++++ Libnet-1.0.2a/include/libnet.h 2003-07-03 19:26:05.000000000 +0000
+@@ -74,19 +74,17 @@
+ #include <errno.h>
+ #include <assert.h>
+
+-#include "./libnet/libnet-headers.h"
+-#include "./libnet/libnet-structures.h"
+-#include "./libnet/libnet-macros.h"
+-#include "./libnet/libnet-asn1.h"
+-#include "./libnet/libnet-functions.h"
+-#include "./libnet/libnet-ospf.h"
++#include "./libnet1/libnet-headers.h"
++#include "./libnet1/libnet-structures.h"
++#include "./libnet1/libnet-macros.h"
++#include "./libnet1/libnet-asn1.h"
++#include "./libnet1/libnet-functions.h"
++#include "./libnet1/libnet-ospf.h"
+
+ #define LIBNET_VERSION "1.0.2a"
+
+ #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
+-#error "byte order has not been specified, you'll
+-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the
+-documentation regarding the libnet-config script."
++#error "byte order has not been specified, you'll need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the documentation regarding the libnet-config script."
+ #endif
+
+ #endif /* __LIBNET_H */
--- /dev/null
+--- Libnet-1.0.2a/Makefile.in.orig 2003-07-03 19:21:17.000000000 +0000
++++ Libnet-1.0.2a/Makefile.in 2003-07-03 19:31:21.000000000 +0000
+@@ -18,20 +18,20 @@
+ LIB_PREFIX = @libdir@/
+ MAN_PREFIX = @MAN_PREFIX@
+
+-LIBNET = libnet
+-LIBPWRITE = libpwrite
++LIBNET = libnet1
++LIBPWRITE = libpwrite1
+ LIBSTATIC = lib/$(LIBNET).a
+ MAJ = 1
+ MIN = 0
+ LIBSHARED = lib/$(LIBNET).so.$(MAJ).$(MIN)
+ MAN = doc/$(LIBNET).3
+ INCLUDE = include/$(LIBNET).h
+-INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
+-INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h
+-INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h
+-INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h
+-INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h
+-INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h
++INCLUDE-H = include/$(LIBNET)/libnet-headers.h
++INCLUDE-F = include/$(LIBNET)/libnet-functions.h
++INCLUDE-S = include/$(LIBNET)/libnet-structures.h
++INCLUDE-M = include/$(LIBNET)/libnet-macros.h
++INCLUDE-A = include/$(LIBNET)/libnet-asn1.h
++INCLUDE-O = include/$(LIBNET)/libnet-ospf.h
+ CONFIG = $(LIBNET)-config
+ DEFINES += @DEFS@
+ RANLIB = @RANLIB@
+--- Libnet-1.0.2a/libnet-config.in.org 2003-07-03 19:48:30.000000000 +0000
++++ Libnet-1.0.2a/libnet-config.in 2003-07-03 19:49:15.000000000 +0000
+@@ -9,7 +9,7 @@
+
+ libnet_defines="@LIBNET_CONFIG_DEFINES@"
+ libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
+-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet1"
+
+ usage()
+ {
--- /dev/null
+diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
+--- Libnet-1.0.2a.orig/Makefile.in Mon Feb 5 18:51:41 2001
++++ Libnet-1.0.2a/Makefile.in Sat Jun 2 22:49:59 2001
+@@ -20,7 +20,10 @@
+
+ LIBNET = libnet
+ LIBPWRITE = libpwrite
+-LIB = lib/$(LIBNET).a
++LIBSTATIC = lib/$(LIBNET).a
++MAJ = 1
++MIN = 0
++LIBSHARED = lib/$(LIBNET).so.$(MAJ).$(MIN)
+ MAN = doc/$(LIBNET).3
+ INCLUDE = include/$(LIBNET).h
+ INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
+@@ -38,6 +41,7 @@
+ ENSUREDIR = $(srcdir)/ensure-dir.sh
+ INSTALL_DATA= $(srcdir)/install-sh
+ CFLAGS = @CFLAGS@
++CFLAGSSHARE = -shared -Wl,-soname,$(LIBNET).so.$(MAJ).$(MIN)
+ CPPFLAGS = @CPPFLAGS@
+ OBJECTS = src/libnet_resolve.o\
+ src/libnet_socket.o\
+@@ -67,16 +71,53 @@
+ src/libnet_if_addr.o\
+ src/libnet_port_list.o
+
++OBJECTSHARE = src/libnet_resolve_pic.o\
++ src/libnet_socket_pic.o\
++ src/libnet_checksum_pic.o\
++ src/libnet_prand_pic.o\
++ src/libnet_version_pic.o\
++ src/libnet_write_ip_pic.o\
++ src/libnet_insert_ipo_pic.o\
++ src/libnet_insert_tcpo_pic.o\
++ src/libnet_error_pic.o\
++ src/libnet_link_@LL_INT_TYPE@_pic.o\
++ src/libnet_packet_mem_pic.o\
++ src/libnet_build_ip_pic.o\
++ src/libnet_build_tcp_pic.o\
++ src/libnet_build_udp_pic.o\
++ src/libnet_build_arp_pic.o\
++ src/libnet_build_ethernet_pic.o\
++ src/libnet_build_icmp_pic.o\
++ src/libnet_build_igmp_pic.o\
++ src/libnet_build_dns_pic.o\
++ src/libnet_build_snmp_pic.o\
++ src/libnet_build_rip_pic.o\
++ src/libnet_build_ospf_pic.o\
++ src/libnet_build_vrrp_pic.o\
++ src/libnet_asn1_pic.o\
++ src/libnet_hex_dump_pic.o\
++ src/libnet_if_addr_pic.o\
++ src/libnet_port_list_pic.o
++
+ .c.o:
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@
+
++%_pic.o: %.c
++ $(CC) -fPIC $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@
++
+ all: libnet
+ supp: test example
+
+-libnet: version.h $(OBJECTS)
+- $(AR) -cr $(LIB) $(OBJECTS)
+- $(RANLIB) $(LIB)
++$(LIBSTATIC): version.h $(OBJECTS)
++ $(AR) -cr $(LIBSTATIC) $(OBJECTS)
++ $(RANLIB) $(LIBSTATIC)
++
++$(LIBSHARED): version.h $(OBJECTSHARE)
++ $(CC) $(CFLAGSSHARE) -o $(LIBSHARED) $(OBJECTSHARE)
++ ln -s $(LIBSHARED) libnet.so
+
++libnet: $(LIBSTATIC) $(LIBSHARED)
++
+ version.o: version.h
+ version.h: ./VERSION
+ @rm -f $@
+@@ -98,7 +139,10 @@
+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+ $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
+ $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
+- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
++ $(INSTALL_DATA) -c -m 0644 $(LIBSTATIC) $(DESTDIR)$(LIB_PREFIX)
++ $(INSTALL_DATA) -c -m 0755 $(LIBSHARED) $(DESTDIR)$(LIB_PREFIX)
++ $(LN) -f -s $(LIBSHARED) $(DESTDIR)$(LIB_PREFIX)$(LIBNET).so
++ $(LN) -f -s $(LIBSHARED) $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).so
+ rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+ cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
+ $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
projects / packages / libnet1.git / commitdiff