Browse Source

upgrade Net::Pcap module and cleanup some parts of the packaging

Ralf S. Engelschall 20 years ago
parent
commit
f4ade55b14
2 changed files with 31 additions and 31 deletions
  1. 26 26
      perl-net/perl-net.patch
  2. 5 5
      perl-net/perl-net.spec

+ 26 - 26
perl-net/perl-net.patch

@@ -1,6 +1,6 @@
 Index: Net-Packet-2.04/Makefile.PL
 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.orig	2005-05-22 21:08:20 +0200
-+++ Net-Packet-2.04/Makefile.PL	2005-06-25 13:38:45 +0200
++++ Net-Packet-2.04/Makefile.PL	2005-10-31 20:06:29 +0100
 @@ -1,33 +1,5 @@
 @@ -1,33 +1,5 @@
  use ExtUtils::MakeMaker;
  use ExtUtils::MakeMaker;
  
  
@@ -45,7 +45,7 @@ Index: Net-Packet-2.04/Makefile.PL
     ABSTRACT_FROM => 'Packet.pm',
     ABSTRACT_FROM => 'Packet.pm',
 Index: Net-Patricia-1.010/libpatricia/patricia.c
 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.orig	2000-10-04 22:41:35 +0200
-+++ Net-Patricia-1.010/libpatricia/patricia.c	2005-06-25 13:38:45 +0200
++++ Net-Patricia-1.010/libpatricia/patricia.c	2005-10-31 20:06:29 +0100
 @@ -35,24 +35,24 @@
 @@ -35,24 +35,24 @@
  /* prefix_tochar
  /* prefix_tochar
   * convert prefix information to bytes
   * convert prefix information to bytes
@@ -155,7 +155,7 @@ Index: Net-Patricia-1.010/libpatricia/patricia.c
      assert (patricia);
      assert (patricia);
 Index: Net-Patricia-1.010/libpatricia/patricia.h
 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.orig	2000-09-29 21:28:26 +0200
-+++ Net-Patricia-1.010/libpatricia/patricia.h	2005-06-25 13:38:45 +0200
++++ Net-Patricia-1.010/libpatricia/patricia.h	2005-10-31 20:06:29 +0100
 @@ -15,10 +15,10 @@
 @@ -15,10 +15,10 @@
  #ifndef _PATRICIA_H
  #ifndef _PATRICIA_H
  #define _PATRICIA_H
  #define _PATRICIA_H
@@ -207,34 +207,34 @@ Index: Net-Patricia-1.010/libpatricia/patricia.h
     int num_active_node;		/* for debug purpose */
     int num_active_node;		/* for debug purpose */
  } patricia_tree_t;
  } patricia_tree_t;
  
  
-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"
+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>
 +#include "pcap.h"
 +#include "pcap.h"
  
  
- #ifdef __cplusplus
- }
+ #ifdef _WINPCAP
+ #include <Win32-Extensions.h>
 Index: Net-Server-0.88/lib/Net/Server.pm
 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.orig	2005-06-21 23:16:03 +0200
-+++ Net-Server-0.88/lib/Net/Server.pm	2005-06-25 13:39:52 +0200
++++ Net-Server-0.88/lib/Net/Server.pm	2005-10-31 20:06:29 +0100
 @@ -423,7 +423,7 @@
 @@ -423,7 +423,7 @@
      $self->log(1,"User Not Defined.  Defaulting to EUID '$>'\n");
      $self->log(1,"User Not Defined.  Defaulting to EUID '$>'\n");
      $prop->{user}  = $>;
      $prop->{user}  = $>;

+ 5 - 5
perl-net/perl-net.spec

@@ -41,7 +41,7 @@
 %define       V_curl_easy             1.35
 %define       V_curl_easy             1.35
 %define       V_net_imap_simple       0.93
 %define       V_net_imap_simple       0.93
 %define       V_net_bgp               0.08
 %define       V_net_bgp               0.08
-%define       V_net_pcap              0.05
+%define       V_net_pcap              0.09
 %define       V_net_radius            1.44
 %define       V_net_radius            1.44
 %define       V_net_ip                1.24
 %define       V_net_ip                1.24
 %define       V_class_gomor_hash      0.22
 %define       V_class_gomor_hash      0.22
@@ -62,7 +62,7 @@ Class:        BASE
 Group:        Language
 Group:        Language
 License:      GPL/Artistic
 License:      GPL/Artistic
 Version:      %{V_perl}
 Version:      %{V_perl}
-Release:      20051022
+Release:      20051031
 
 
 #   package options
 #   package options
 %option       with_curl   no
 %option       with_curl   no
@@ -87,10 +87,10 @@ Source14:     http://www.cpan.org/modules/by-module/RPC/PlRPC-%{V_plrpc}.tar.gz
 Source15:     http://curl.haxx.se/libcurl/perl/Curl-easy-%{V_curl_easy}.tar.gz
 Source15:     http://curl.haxx.se/libcurl/perl/Curl-easy-%{V_curl_easy}.tar.gz
 Source16:     http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
 Source16:     http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
 Source17:     http://www.cpan.org/modules/by-module/Net/Net-BGP-%{V_net_bgp}.tar.gz
 Source17:     http://www.cpan.org/modules/by-module/Net/Net-BGP-%{V_net_bgp}.tar.gz
-Source18:     http://www.cpan.org/authors/id/K/KC/KCARNUT/Net-Pcap-%{V_net_pcap}.tar.gz
+Source18:     http://www.cpan.org/modules/by-module/Net/Net-Pcap-%{V_net_pcap}.tar.gz
 Source19:     http://www.cpan.org/modules/by-module/Class/Class-Gomor-Hash-%{V_class_gomor_hash}.tar.gz
 Source19:     http://www.cpan.org/modules/by-module/Class/Class-Gomor-Hash-%{V_class_gomor_hash}.tar.gz
 Source20:     http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
 Source20:     http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
-Source21:     http://www.cpan.org/authors/id/M/MA/MANU/Net-IP-%{V_net_ip}.tar.gz
+Source21:     http://www.cpan.org/modules/by-module/Net/Net-IP-%{V_net_ip}.tar.gz
 Source22:     http://www.cpan.org/modules/by-module/Net/Net-XMPP-%{V_net_xmpp}.tar.gz
 Source22:     http://www.cpan.org/modules/by-module/Net/Net-XMPP-%{V_net_xmpp}.tar.gz
 Source23:     http://www.cpan.org/modules/by-module/Net/Net-Jabber-%{V_net_jabber}.tar.gz
 Source23:     http://www.cpan.org/modules/by-module/Net/Net-Jabber-%{V_net_jabber}.tar.gz
 Source24:     http://www.cpan.org/modules/by-module/Net/Net-Patricia-%{V_net_patricia}.tar.gz
 Source24:     http://www.cpan.org/modules/by-module/Net/Net-Patricia-%{V_net_patricia}.tar.gz
@@ -231,7 +231,7 @@ AutoReqProv:  no
     }
     }
     prog perl-net:Net-Pcap = {
     prog perl-net:Net-Pcap = {
         version   = %{V_net_pcap}
         version   = %{V_net_pcap}
-        url       = http://www.cpan.org/authors/id/K/KC/KCARNUT/
+        url       = http://www.cpan.org/modules/by-module/Net/
         regex     = Net-Pcap-(__VER__)\.tar\.gz
         regex     = Net-Pcap-(__VER__)\.tar\.gz
     }
     }
     prog perl-net:Net-Radius = {
     prog perl-net:Net-Radius = {