summaryrefslogtreecommitdiff
blob: af0b92f2c3a1792e7dccff8a3d3c0307bb85700d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
diff -ur Libnet-1.0.2a.orig/Makefile.in Libnet-1.0.2a/Makefile.in
--- Libnet-1.0.2a.orig/Makefile.in	2003-08-17 23:53:14.000000000 -0400
+++ Libnet-1.0.2a/Makefile.in	2003-08-18 00:10:28.810521400 -0400
@@ -18,17 +18,17 @@
 LIB_PREFIX  =   @libdir@/
 MAN_PREFIX  =   @MAN_PREFIX@
 
-LIBNET      =   libnet
-LIBPWRITE   =   libpwrite
+LIBNET      =   libnet-1.0
+LIBPWRITE   =   libpwrite-1.0
 LIB         =   lib/$(LIBNET).a
 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@
@@ -94,7 +94,7 @@
 install: libnet
 	$(ENSUREDIR) $(DESTDIR)$(prefix) 755
 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
-	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
+	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755
 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
 	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
@@ -102,12 +102,12 @@
 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
 	cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
 	$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
-	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
-	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/
+	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/
+	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/
+	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/
+	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/
+	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/
 	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
 
@@ -142,6 +142,6 @@
 	    cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
 	fi
 	rm -f config.log config.cache config.status Makefile include/config.h \
-	version.h support/bpf-lkm/etherspoof conftest* libnet-config
+	version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
 
 # EOF
diff -ur Libnet-1.0.2a.orig/configure.in Libnet-1.0.2a/configure.in
--- Libnet-1.0.2a.orig/configure.in	2003-08-17 23:53:14.000000000 -0400
+++ Libnet-1.0.2a/configure.in	2003-08-17 23:54:35.000000000 -0400
@@ -261,6 +261,6 @@
 AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
     test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
     test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
-    libnet-config, chmod +x libnet-config)
+    libnet-1.0-config, chmod +x libnet-1.0-config)
 
 dnl EOF
diff -ur Libnet-1.0.2a.orig/include/libnet.h Libnet-1.0.2a/include/libnet.h
--- Libnet-1.0.2a.orig/include/libnet.h	2003-08-17 23:53:14.000000000 -0400
+++ Libnet-1.0.2a/include/libnet.h	2003-08-18 00:01:38.000000000 -0400
@@ -74,12 +74,12 @@
 #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 "./libnet/libnet-1.0-headers.h"
+#include "./libnet/libnet-1.0-structures.h"
+#include "./libnet/libnet-1.0-macros.h"
+#include "./libnet/libnet-1.0-asn1.h"
+#include "./libnet/libnet-1.0-functions.h"
+#include "./libnet/libnet-1.0-ospf.h"
 
 #define LIBNET_VERSION  "1.0.2a"
 
diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
--- Libnet-1.0.2a.orig/libnet-config.in	2003-08-17 23:53:14.000000000 -0400
+++ Libnet-1.0.2a/libnet-config.in	2003-08-17 23:54:53.000000000 -0400
@@ -9,12 +9,12 @@
 
 libnet_defines="@LIBNET_CONFIG_DEFINES@"
 libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
+libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0"
 
 usage()
 {
         cat <<EOF
-Usage: libnet-config [OPTIONS]
+Usage: libnet-1.0-config [OPTIONS]
 Options:
         [--libs]
         [--cflags]
Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD