/[gentoo-x86]/net-libs/libnet/files/1.0.2a-slot.patch
Gentoo

Contents of /net-libs/libnet/files/1.0.2a-slot.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download)
Sat Apr 28 16:59:10 2012 UTC (23 months, 2 weeks ago) by jer
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +22 -27 lines
Apply endian patch by Christopher Friedt (bug #275885). Clean up patch. Respect CFLAGS.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 --- a/Makefile.in
2 +++ b/Makefile.in
3 @@ -18,17 +18,17 @@
4 LIB_PREFIX = @libdir@/
5 MAN_PREFIX = @MAN_PREFIX@
6
7 -LIBNET = libnet
8 -LIBPWRITE = libpwrite
9 +LIBNET = libnet-1.0
10 +LIBPWRITE = libpwrite-1.0
11 LIB = lib/$(LIBNET).a
12 MAN = doc/$(LIBNET).3
13 INCLUDE = include/$(LIBNET).h
14 -INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
15 -INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h
16 -INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h
17 -INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h
18 -INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h
19 -INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h
20 +INCLUDE-H = include/libnet/$(LIBNET)-headers.h
21 +INCLUDE-F = include/libnet/$(LIBNET)-functions.h
22 +INCLUDE-S = include/libnet/$(LIBNET)-structures.h
23 +INCLUDE-M = include/libnet/$(LIBNET)-macros.h
24 +INCLUDE-A = include/libnet/$(LIBNET)-asn1.h
25 +INCLUDE-O = include/libnet/$(LIBNET)-ospf.h
26 CONFIG = $(LIBNET)-config
27 DEFINES += @DEFS@
28 RANLIB = @RANLIB@
29 @@ -94,7 +94,7 @@
30 install: libnet
31 $(ENSUREDIR) $(DESTDIR)$(prefix) 755
32 $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
33 - $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
34 + $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755
35 $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
36 $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
37 $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
38 @@ -102,12 +102,12 @@
39 rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
40 cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
41 $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
42 - $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
43 - $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
44 - $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
45 - $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
46 - $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
47 - $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
48 + $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/
49 + $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/
50 + $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/
51 + $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/
52 + $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/
53 + $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/
54 $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
55 $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
56
57 @@ -142,6 +142,6 @@
58 cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
59 fi
60 rm -f config.log config.cache config.status Makefile include/config.h \
61 - version.h support/bpf-lkm/etherspoof conftest* libnet-config
62 + version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
63
64 # EOF
65 --- a/configure.in
66 +++ b/configure.in
67 @@ -261,6 +261,6 @@
68 AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
69 test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
70 test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
71 - libnet-config, chmod +x libnet-config)
72 + libnet-1.0-config, chmod +x libnet-1.0-config)
73
74 dnl EOF
75 --- a/include/libnet.h
76 +++ b/include/libnet.h
77 @@ -74,12 +74,12 @@
78 #include <errno.h>
79 #include <assert.h>
80
81 -#include "./libnet/libnet-headers.h"
82 -#include "./libnet/libnet-structures.h"
83 -#include "./libnet/libnet-macros.h"
84 -#include "./libnet/libnet-asn1.h"
85 -#include "./libnet/libnet-functions.h"
86 -#include "./libnet/libnet-ospf.h"
87 +#include "./libnet/libnet-1.0-headers.h"
88 +#include "./libnet/libnet-1.0-structures.h"
89 +#include "./libnet/libnet-1.0-macros.h"
90 +#include "./libnet/libnet-1.0-asn1.h"
91 +#include "./libnet/libnet-1.0-functions.h"
92 +#include "./libnet/libnet-1.0-ospf.h"
93
94 #define LIBNET_VERSION "1.0.2a"
95
96 --- a/libnet-config.in
97 +++ b/libnet-config.in
98 @@ -9,12 +9,12 @@
99
100 libnet_defines="@LIBNET_CONFIG_DEFINES@"
101 libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
102 -libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
103 +libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0"
104
105 usage()
106 {
107 cat <<EOF
108 -Usage: libnet-config [OPTIONS]
109 +Usage: libnet-1.0-config [OPTIONS]
110 Options:
111 [--libs]
112 [--cflags]
113 --- a/test/Ethernet/Makefile.in
114 +++ b/test/Ethernet/Makefile.in
115 @@ -10,7 +10,7 @@
116 CFLAGS = @CFLAGS@
117 OBJECTS = arp.o tcp.o icmp_mask.o get_address.o poink.o
118 DEFINES += @DEFS@
119 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
120 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
121
122 .c.o:
123 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
124 --- a/test/ICMP/Makefile.in
125 +++ b/test/ICMP/Makefile.in
126 @@ -15,7 +15,7 @@
127 ping_of_death.o
128
129 DEFINES += @DEFS@
130 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
131 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
132
133 .c.o:
134 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
135 --- a/test/IP/Makefile.in
136 +++ b/test/IP/Makefile.in
137 @@ -10,7 +10,7 @@
138 OBJECTS =
139
140 DEFINES += @DEFS@
141 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
142 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
143
144 .c.o:
145 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
146 --- a/test/OSPF/Makefile.in
147 +++ b/test/OSPF/Makefile.in
148 @@ -12,7 +12,7 @@
149 ospf_request.o \
150
151 DEFINES += @DEFS@
152 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
153 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
154
155 .c.o:
156 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
157 --- a/test/Random/Makefile.in
158 +++ b/test/Random/Makefile.in
159 @@ -9,7 +9,7 @@
160 CFLAGS = @CFLAGS@
161 OBJECTS = prand_trials.o
162 DEFINES += @DEFS@
163 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
164 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
165
166 .c.o:
167 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
168 --- a/test/TCP/Makefile.in
169 +++ b/test/TCP/Makefile.in
170 @@ -13,7 +13,7 @@
171 tcp+data+ipopt.o
172
173 DEFINES += @DEFS@
174 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
175 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
176
177 .c.o:
178 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
179 --- a/test/UDP/Makefile.in
180 +++ b/test/UDP/Makefile.in
181 @@ -11,7 +11,7 @@
182 udp+data.o
183
184 DEFINES += @DEFS@
185 -LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
186 +LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
187
188 .c.o:
189 $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@

  ViewVC Help
Powered by ViewVC 1.1.20