openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
18446 Commits
1 Branch
2 Tags
595 MiB
 
 
 
 
 
 
Tree: 29d0b5800a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '29d0b5800a'
${ noResults }
openpkg-packages/perl-net/perl-net.patch

246 lines
7.0 KiB
Raw Blame History

Index: Net-Packet-2.04/Makefile.PL
--- Net-Packet-2.04/Makefile.PL.orig 2005-05-22 21:08:20 +0200
+++ Net-Packet-2.04/Makefile.PL 2005-10-31 20:06:29 +0100
@@ -1,33 +1,5 @@
use ExtUtils::MakeMaker;
-die("*** Microsoft Windows not supported\n")
- if $^O =~ /windows|win32/i;
-die("*** Big endian architectures not supported yet\n")
- if unpack("h*", pack("s", 1)) =~ /01/;
-
-require DynaLoader;
-
-my $file = DynaLoader::dl_findfile('-lpcap')
- or die("*** Cannot find libpcap, try setting LD_LIBRARY_PATH\n");
-
-my ($lib) = $file =~ /^(.*)\//;
-(my $inc = $lib) =~ s/lib/include/;
-
-sub _getPcapHPath { (-d "$inc/pcap") ? "[$inc/pcap]" : "[$inc]" }
-
-unless (-f "$inc/pcap-int.h" || -f "$inc/pcap/pcap-int.h") {
- die("*** Cannot find pcap-int.h . Get it from your installed libpcap ".
- "source distribution and copy it to: ". _getPcapHPath().
- " (near pcap.h)\n");
-}
-
-$inc = "-I$inc -I$inc/pcap";
-$lib = "-L$lib";
-
-print "Found libpcap: [$file]\n";
-print "Will use lib: [$lib]\n";
-print "Will use include: [$inc]\n";
-
WriteMakefile(
NAME => 'Net::Packet',
VERSION_FROM => 'Packet.pm',
@@ -36,7 +8,6 @@
IO::Interface => 0,
Net::Pcap => '0.04',
Net::IPv6Addr => 0,
- Socket6 => 0,
Class::Gomor::Hash => '0.20',
},
ABSTRACT_FROM => 'Packet.pm',
Index: Net-Patricia-1.010/libpatricia/patricia.c
--- Net-Patricia-1.010/libpatricia/patricia.c.orig 2000-10-04 22:41:35 +0200
+++ Net-Patricia-1.010/libpatricia/patricia.c 2005-10-31 20:06:29 +0100
@@ -35,24 +35,24 @@
/* prefix_tochar
* convert prefix information to bytes
*/
-u_char *
+unsigned char *
prefix_tochar (prefix_t * prefix)
{
if (prefix == NULL)
return (NULL);
- return ((u_char *) & prefix->add.sin);
+ return ((unsigned char *) & prefix->add.sin);
}
int
-comp_with_mask (void *addr, void *dest, u_int mask)
+comp_with_mask (void *addr, void *dest, unsigned int mask)
{
if ( /* mask/8 == 0 || */ memcmp (addr, dest, mask / 8) == 0) {
int n = mask / 8;
int m = ((-1) << (8 - (mask % 8)));
- if (mask % 8 == 0 || (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m))
+ if (mask % 8 == 0 || (((unsigned char *)addr)[n] & m) == (((unsigned char *)dest)[n] & m))
return (1);
}
return (0);
@@ -67,7 +67,7 @@
int
inet_pton (int af, const char *src, void *dst)
{
- u_long result;
+ unsigned long result;
if (af == AF_INET) {
result = inet_addr(src);
@@ -101,7 +101,7 @@
{
if (af == AF_INET) {
int i, c, val;
- u_char xp[4] = {0, 0, 0, 0};
+ unsigned char xp[4] = {0, 0, 0, 0};
for (i = 0; ; i++) {
c = *src++;
@@ -150,7 +150,7 @@
struct buffer {
char buffs[16][48+5];
- u_int i;
+ unsigned int i;
} *buffp;
# if 0
@@ -169,7 +169,7 @@
buff = buffp->buffs[buffp->i++%16];
}
if (prefix->family == AF_INET) {
- u_char *a;
+ unsigned char *a;
assert (prefix->bitlen <= 32);
a = prefix_touchar (prefix);
if (with_len) {
@@ -269,7 +269,7 @@
prefix_t *
ascii2prefix (int family, char *string)
{
- u_long bitlen, maxbitlen = 0;
+ unsigned long bitlen, maxbitlen = 0;
char *cp;
struct in_addr sin;
#ifdef HAVE_IPV6
@@ -466,8 +466,8 @@
patricia_search_exact (patricia_tree_t *patricia, prefix_t *prefix)
{
patricia_node_t *node;
- u_char *addr;
- u_int bitlen;
+ unsigned char *addr;
+ unsigned int bitlen;
assert (patricia);
assert (prefix);
@@ -538,8 +538,8 @@
{
patricia_node_t *node;
patricia_node_t *stack[PATRICIA_MAXBITS + 1];
- u_char *addr;
- u_int bitlen;
+ unsigned char *addr;
+ unsigned int bitlen;
int cnt = 0;
assert (patricia);
@@ -637,8 +637,8 @@
patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
{
patricia_node_t *node, *new_node, *parent, *glue;
- u_char *addr, *test_addr;
- u_int bitlen, check_bit, differ_bit;
+ unsigned char *addr, *test_addr;
+ unsigned int bitlen, check_bit, differ_bit;
int i, j, r;
assert (patricia);
Index: Net-Patricia-1.010/libpatricia/patricia.h
--- Net-Patricia-1.010/libpatricia/patricia.h.orig 2000-09-29 21:28:26 +0200
+++ Net-Patricia-1.010/libpatricia/patricia.h 2005-10-31 20:06:29 +0100
@@ -15,10 +15,10 @@
#ifndef _PATRICIA_H
#define _PATRICIA_H
-/* typedef unsigned int u_int; */
+/* typedef unsigned int unsigned int; */
typedef void (*void_fn_t)();
/* { from defs.h */
-#define prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin)
+#define prefix_touchar(prefix) ((unsigned char *)&(prefix)->add.sin)
#define MAXLINE 1024
#define BIT_TEST(f, b) ((f) & (b))
/* } */
@@ -32,15 +32,15 @@
/* { from mrt.h */
typedef struct _prefix4_t {
- u_short family; /* AF_INET | AF_INET6 */
- u_short bitlen; /* same as mask? */
+ unsigned short family; /* AF_INET | AF_INET6 */
+ unsigned short bitlen; /* same as mask? */
int ref_count; /* reference count */
struct in_addr sin;
} prefix4_t;
typedef struct _prefix_t {
- u_short family; /* AF_INET | AF_INET6 */
- u_short bitlen; /* same as mask? */
+ unsigned short family; /* AF_INET | AF_INET6 */
+ unsigned short bitlen; /* same as mask? */
int ref_count; /* reference count */
union {
struct in_addr sin;
@@ -53,7 +53,7 @@
/* } */
typedef struct _patricia_node_t {
- u_int bit; /* flag if this node used */
+ unsigned int bit; /* flag if this node used */
prefix_t *prefix; /* who we are in patricia tree */
struct _patricia_node_t *l, *r; /* left and right children */
struct _patricia_node_t *parent;/* may be used */
@@ -63,7 +63,7 @@
typedef struct _patricia_tree_t {
patricia_node_t *head;
- u_int maxbits; /* for IP, 32 bit addresses */
+ unsigned int maxbits; /* for IP, 32 bit addresses */
int num_active_node; /* for debug purpose */
} patricia_tree_t;
Index: Net-Pcap-0.09/Makefile.PL
--- Net-Pcap-0.09/Makefile.PL.orig 2005-10-26 23:39:53 +0200
+++ Net-Pcap-0.09/Makefile.PL 2005-10-31 20:07:32 +0100
@@ -15,7 +15,8 @@
} else {
$config{CCFLAGS} = '-Wall';
- $config{LIBS} = '-lpcap';
+ $config{INC} = '-I@l_prefix@/include';
+ $config{LIBS} = '-L@l_prefix@/lib -lpcap';
}
for my $arg (@ARGV) {
Index: Net-Pcap-0.09/Pcap.xs
--- Net-Pcap-0.09/Pcap.xs.orig 2005-10-26 13:52:19 +0200
+++ Net-Pcap-0.09/Pcap.xs 2005-10-31 20:06:45 +0100
@@ -31,7 +31,7 @@
#define NEED_sv_2pv_nolen 1
#include "ppport.h"
-#include <pcap.h>
+#include "pcap.h"
#ifdef _WINPCAP
#include <Win32-Extensions.h>
Index: Net-Server-0.88/lib/Net/Server.pm
--- Net-Server-0.88/lib/Net/Server.pm.orig 2005-06-21 23:16:03 +0200
+++ Net-Server-0.88/lib/Net/Server.pm 2005-10-31 20:06:29 +0100
@@ -423,7 +423,7 @@
$self->log(1,"User Not Defined. Defaulting to EUID '$>'\n");
$prop->{user} = $>;
}else{
- if( $prop->{user} =~ /^(\w+)$/ ){
+ if( $prop->{user} =~ /^([\w-]+)$/ ){
$prop->{user} = eval{ get_uid( $1 ) };
$self->fatal( $@ ) if $@;
}else{