perl-net/perl-net.patch

changeset 480
332ec562ab2e
parent 99
161326b4f1f9
equal deleted inserted replaced
0:d2ace6d0e256 1:5f83e4502cbf
1 Index: Net-Packet-3.26/Makefile.PL 1 Index: Net-IRC-0.79/Makefile.PL
2 --- Net-Packet-3.26/Makefile.PL.orig 2006-12-16 16:26:26 +0100 2 --- Net-IRC-0.79/Makefile.PL.orig 2009-12-23 18:05:52.000000000 +0100
3 +++ Net-Packet-3.26/Makefile.PL 2008-01-01 22:05:18 +0100 3 +++ Net-IRC-0.79/Makefile.PL 2010-12-19 13:16:21.000000000 +0100
4 @@ -14,7 +14,6 @@ 4 @@ -4,29 +4,6 @@
5 Net::Libdnet => 0, 5 # the contents of the Makefile that is written.
6
7 exit 0 if $ENV{AUTOMATED_TESTING};
8 -my $ok = 'I acknowledge that Net::IRC is unsupported and I wish to proceed.';
9 -my $warning = <<WILLROBINSON;
10 ---------------------------------------------------------------------------------
11 -********************************************************************************
12 -DANGER, WILL ROBINSON! DANGER!
13 -
14 -This module has been deprecated, abandoned, and is no longer supported. It has
15 -not seen active development in five years, and its original author has moved on.
16 -We *STRONGLY* recommend you port your code to either Bot::BasicBot or
17 -POE::Component::IRC. Please feel free to stop by irc.freenode.net/#perl for help
18 -making this transition. Or, if you insist on proceeding, please type the
19 -following line exactly as is and then press Enter:
20 -
21 -$ok
22 -********************************************************************************
23 ---------------------------------------------------------------------------------
24 -WILLROBINSON
25 -
26 --t STDIN or die $warning;
27 -warn $warning;
28 -chomp(my $acceptance = <STDIN>);
29 -die "Refusing to install due to lack of confirmation" unless $acceptance eq $ok;
30 -
31
32 WriteMakefile(
33 'NAME' => 'Net::IRC',
34 Index: Net-Packet-3.27/Makefile.PL
35 --- Net-Packet-3.27/Makefile.PL.orig 2009-11-09 18:58:29.000000000 +0100
36 +++ Net-Packet-3.27/Makefile.PL 2010-12-19 13:15:40.000000000 +0100
37 @@ -15,7 +15,6 @@
6 Time::HiRes => 0, 38 Time::HiRes => 0,
7 Net::IPv6Addr => 0, 39 Net::IPv6Addr => 0,
40 Net::IPv4Addr => 0,
8 - Socket6 => 0, 41 - Socket6 => 0,
9 Bit::Vector => 0, 42 Bit::Vector => 0,
10 }, 43 },
11 ABSTRACT_FROM => 'lib/Net/Packet.pm', 44 ABSTRACT_FROM => 'lib/Net/Packet.pm',
12 Index: Net-Patricia-1.014/libpatricia/patricia.c 45 Index: Net-Patricia-1.15/libpatricia/patricia.c
13 --- Net-Patricia-1.014/libpatricia/patricia.c.orig 2005-12-07 21:55:39 +0100 46 --- Net-Patricia-1.15/libpatricia/patricia.c.orig 2009-04-19 06:28:15.000000000 +0200
14 +++ Net-Patricia-1.014/libpatricia/patricia.c 2008-01-01 22:05:18 +0100 47 +++ Net-Patricia-1.15/libpatricia/patricia.c 2010-12-19 13:15:40.000000000 +0100
15 @@ -38,24 +38,24 @@ 48 @@ -38,24 +38,24 @@
16 /* prefix_tochar 49 /* prefix_tochar
17 * convert prefix information to bytes 50 * convert prefix information to bytes
18 */ 51 */
19 -u_char * 52 -u_char *
117 + unsigned char *addr, *test_addr; 150 + unsigned char *addr, *test_addr;
118 + unsigned int bitlen, check_bit, differ_bit; 151 + unsigned int bitlen, check_bit, differ_bit;
119 int i, j, r; 152 int i, j, r;
120 153
121 assert (patricia); 154 assert (patricia);
122 Index: Net-Patricia-1.014/libpatricia/patricia.h 155 Index: Net-Patricia-1.15/libpatricia/patricia.h
123 --- Net-Patricia-1.014/libpatricia/patricia.h.orig 2005-12-07 21:54:52 +0100 156 --- Net-Patricia-1.15/libpatricia/patricia.h.orig 2009-04-19 06:28:15.000000000 +0200
124 +++ Net-Patricia-1.014/libpatricia/patricia.h 2008-01-01 22:05:18 +0100 157 +++ Net-Patricia-1.15/libpatricia/patricia.h 2010-12-19 13:15:40.000000000 +0100
125 @@ -15,10 +15,10 @@ 158 @@ -15,10 +15,10 @@
126 #ifndef _PATRICIA_H 159 #ifndef _PATRICIA_H
127 #define _PATRICIA_H 160 #define _PATRICIA_H
128 161
129 -/* typedef unsigned int u_int; */ 162 -/* typedef unsigned int u_int; */
172 + unsigned int maxbits; /* for IP, 32 bit addresses */ 205 + unsigned int maxbits; /* for IP, 32 bit addresses */
173 int num_active_node; /* for debug purpose */ 206 int num_active_node; /* for debug purpose */
174 } patricia_tree_t; 207 } patricia_tree_t;
175 208
176 Index: Net-Pcap-0.16/Makefile.PL 209 Index: Net-Pcap-0.16/Makefile.PL
177 --- Net-Pcap-0.16/Makefile.PL.orig 2007-12-24 00:06:15 +0100 210 --- Net-Pcap-0.16/Makefile.PL.orig 2007-12-24 00:06:15.000000000 +0100
178 +++ Net-Pcap-0.16/Makefile.PL 2008-01-01 22:08:20 +0100 211 +++ Net-Pcap-0.16/Makefile.PL 2010-12-19 13:15:40.000000000 +0100
179 @@ -23,7 +23,8 @@ 212 @@ -23,7 +23,8 @@
180 } 213 }
181 else { 214 else {
182 $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006; 215 $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006;
183 - $options{LIBS} = '-lpcap'; 216 - $options{LIBS} = '-lpcap';
184 + $options{INC} = '-I@l_prefix@/include'; 217 + $options{INC} = '-I/openpkg/include';
185 + $options{LIBS} = '-L@l_prefix@/lib -lpcap'; 218 + $options{LIBS} = '-L/openpkg/lib -lpcap';
186 } 219 }
187 220
188 for my $arg (@ARGV) { 221 for my $arg (@ARGV) {
189 Index: Net-Pcap-0.16/Pcap.xs 222 Index: Net-Pcap-0.16/Pcap.xs
190 --- Net-Pcap-0.16/Pcap.xs.orig 2008-01-01 05:22:22 +0100 223 --- Net-Pcap-0.16/Pcap.xs.orig 2008-01-01 05:22:22.000000000 +0100
191 +++ Net-Pcap-0.16/Pcap.xs 2008-01-01 22:05:18 +0100 224 +++ Net-Pcap-0.16/Pcap.xs 2010-12-19 13:15:40.000000000 +0100
192 @@ -33,7 +33,7 @@ 225 @@ -33,7 +33,7 @@
193 #define NEED_sv_2pv_nolen 1 226 #define NEED_sv_2pv_nolen 1
194 #include "ppport.h" 227 #include "ppport.h"
195 228
196 -#include <pcap.h> 229 -#include <pcap.h>
197 +#include "pcap.h" 230 +#include "pcap.h"
198 231
199 #ifdef _CYGWIN 232 #ifdef _CYGWIN
200 #include <Win32-Extensions.h> 233 #include <Win32-Extensions.h>
234 Index: Net-RabbitMQ-0.0.4/Makefile.PL
235 --- Net-RabbitMQ-0.0.4/Makefile.PL.orig 2009-11-12 21:15:45.000000000 +0100
236 +++ Net-RabbitMQ-0.0.4/Makefile.PL 2010-12-19 13:15:40.000000000 +0100
237 @@ -2,12 +2,16 @@
238 use ExtUtils::MakeMaker 5.16 ;
239 use Config ;
240
241 -my @parts = qw/api connection debug framing mem socket table/;
242 -my $cfiles = join(' ', map { "librabbitmq/amqp_$_.c" } @parts);
243 -
244 WriteMakefile(
245 NAME => 'Net::RabbitMQ',
246 VERSION_FROM => 'RabbitMQ.pm',
247 - OBJECT => "RabbitMQ.o $cfiles",
248 + 'MYEXTLIB' => 'librabbitmq/librabbitmq$(LIB_EXT)',
249 + OBJECT => "RabbitMQ.o",
250 );
251
252 +sub MY::postamble {
253 +'
254 +$(MYEXTLIB): librabbitmq/Makefile
255 + cd librabbitmq && $(MAKE) $(PASTHRU)
256 +';
257 +}
258 Index: Net-RabbitMQ-0.0.4/librabbitmq/Makefile.PL
259 --- Net-RabbitMQ-0.0.4/librabbitmq/Makefile.PL.orig 2010-12-19 13:15:40.000000000 +0100
260 +++ Net-RabbitMQ-0.0.4/librabbitmq/Makefile.PL 2010-12-19 13:15:40.000000000 +0100
261 @@ -0,0 +1,22 @@
262 +
263 +use ExtUtils::MakeMaker;
264 +
265 +$Verbose = 1;
266 +
267 +WriteMakefile(
268 + NAME => 'Net::RabbitMQ::librabbitmq',
269 + SKIP => [ qw(all static static_lib dynamic dynamic_lib test) ],
270 + clean => { 'FILES' => 'librabbitmq$(LIB_EXT)' },
271 +);
272 +
273 +sub MY::top_targets {
274 +'
275 +all :: static
276 +test ::
277 +static :: librabbitmq$(LIB_EXT)
278 +librabbitmq$(LIB_EXT): $(O_FILES)
279 + $(AR) cr librabbitmq$(LIB_EXT) $(O_FILES)
280 + $(RANLIB) librabbitmq$(LIB_EXT)
281 +
282 +';
283 +}
284 Index: Net-RabbitMQ-0.0.4/librabbitmq/amqp.h
285 --- Net-RabbitMQ-0.0.4/librabbitmq/amqp.h.orig 2009-12-19 08:59:44.000000000 +0100
286 +++ Net-RabbitMQ-0.0.4/librabbitmq/amqp.h 2010-12-19 13:15:40.000000000 +0100
287 @@ -5,6 +5,9 @@
288 extern "C" {
289 #endif
290
291 +#include <sys/types.h>
292 +#include <unistd.h>
293 +
294 typedef int amqp_boolean_t;
295 typedef uint32_t amqp_method_number_t;
296 typedef uint32_t amqp_flags_t;
297 Index: Net-RabbitMQ-0.0.4/librabbitmq/amqp_config.h
298 --- Net-RabbitMQ-0.0.4/librabbitmq/amqp_config.h.orig 2009-11-12 21:15:45.000000000 +0100
299 +++ Net-RabbitMQ-0.0.4/librabbitmq/amqp_config.h 2010-12-19 13:15:40.000000000 +0100
300 @@ -1,2 +1,3 @@
301 +#undef VERSION
302 #define VERSION "0.0.1"
303

mercurial