modifying package: perl-net-5.8.7 20050606 -> 20050625

perl-net/perl-net.patch

@@ -1,51 +1,51 @@
---- 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"
+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-06-25 13:38:45 +0200
+@@ -1,33 +1,5 @@
+ use ExtUtils::MakeMaker;
  
- #ifdef __cplusplus
- }
+-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	2004-12-17 23:45:00 +0100
++++ Net-Patricia-1.010/libpatricia/patricia.c	2005-06-25 13:38:45 +0200
 @@ -35,24 +35,24 @@
  /* prefix_tochar
   * convert prefix information to bytes
@@ -155,7 +155,7 @@ Index: Net-Patricia-1.010/libpatricia/patricia.c
      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
++++ Net-Patricia-1.010/libpatricia/patricia.h	2005-06-25 13:38:45 +0200
 @@ -15,10 +15,10 @@
  #ifndef _PATRICIA_H
  #define _PATRICIA_H
@@ -207,48 +207,40 @@ Index: Net-Patricia-1.010/libpatricia/patricia.h
     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;
+Index: Net-Pcap-0.05/Makefile.PL
+--- Net-Pcap-0.05/Makefile.PL.orig	1999-03-12 00:34:01 +0100
++++ Net-Pcap-0.05/Makefile.PL	2005-06-25 13:38:45 +0200
+@@ -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 +0200
++++ Net-Pcap-0.05/Pcap.xs	2005-06-25 13:38:45 +0200
+@@ -18,7 +18,7 @@
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+-#include <pcap.h>
++#include "pcap.h"
  
--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',
+ #ifdef __cplusplus
+ }
+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-06-25 13:39:52 +0200
+@@ -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{

perl-net/perl-net.spec

@@ -28,7 +28,7 @@
 %define       V_net_ipv4addr          0.10
 %define       V_net_ipv6addr          0.2
 %define       V_net_daemon            0.38
-%define       V_net_server            0.87
+%define       V_net_server            0.88
 %define       V_net_ext               1.011
 %define       V_libnet                1.19
 %define       V_net_netmask           1.9012
@@ -62,7 +62,7 @@ Class:        BASE
 Group:        Language
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20050606
+Release:      20050625
 
 #   package options
 %option       with_curl   no