--- Net-Server-0.87/lib/Net/Server.pm.dist	Tue Apr 22 14:38:13 2003
+++ Net-Server-0.87/lib/Net/Server.pm	Tue Apr 22 14:39:16 2003
@@ -404,7 +404,7 @@
     $self->log(1,"Group Not Defined.  Defaulting to EGID '$)'\n");
     $prop->{group}  = $);
   }else{
-    if( $prop->{group} =~ /^(\w+( \w+)*)$/ ){
+    if( $prop->{group} =~ /^([\w\-]+( [\w\-]+)*)$/ ){
       $prop->{group} = eval{ get_gid( $1 ) };
       $self->fatal( $@ ) if $@;
     }else{
@@ -418,7 +418,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{
Index: Net-Pcap-0.05/Makefile.PL
--- Net-Pcap-0.05/Makefile.PL.orig	2004-02-28 23:41:40.000000000 +0100
+++ Net-Pcap-0.05/Makefile.PL	2004-02-28 23:45:17.000000000 +0100
@@ -10,7 +10,8 @@
 	'NAME'         => 'Net::Pcap',
 	'DISTNAME'     => 'Net-Pcap',
 	'VERSION_FROM' => 'Pcap.pm',
-	'LIBS'         => ['-lpcap'], 
+	'INC'          => '-I@l_prefix@/include', 
+	'LIBS'         => ['-L@l_prefix@/lib -lpcap'], 
 	dist => {
 		'COMPRESS' => "gzip -9f",
 		'SUFFIX'   => "gz"
Index: Net-Pcap-0.05/Pcap.xs
--- Net-Pcap-0.05/Pcap.xs.orig	2003-06-14 14:15:18.000000000 +0200
+++ Net-Pcap-0.05/Pcap.xs	2004-02-28 23:43:47.000000000 +0100
@@ -18,7 +18,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#include <pcap.h>
+#include "pcap.h"
 
 #ifdef __cplusplus
 }
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	2004-12-17 23:45:00 +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	2004-12-17 23:44:39 +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-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-05-23 19:39:05 +0200
@@ -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',