OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Feb-2005 12:41:32
Branch: HEAD Handle: 2005021011413200
Modified files:
openpkg-src/perl-net perl-net.patch perl-net.spec
Log:
modifying package: perl-net-5.8.6 20050129 -> 20050210
Summary:
Revision Changes Path
1.7 +46 -0 openpkg-src/perl-net/perl-net.patch
1.82 +62 -31 openpkg-src/perl-net/perl-net.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-net/perl-net.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 perl-net.patch
--- openpkg-src/perl-net/perl-net.patch 17 Dec 2004 22:47:53 -0000
1.6
+++ openpkg-src/perl-net/perl-net.patch 10 Feb 2005 11:41:32 -0000
1.7
@@ -207,3 +207,49 @@
int num_active_node; /* for debug purpose */
} patricia_tree_t;
+Index: Net-Packet-2.03/Makefile.PL
+--- Net-Packet-2.03/Makefile.PL.orig 2005-01-16 18:02:02 +0100
++++ Net-Packet-2.03/Makefile.PL 2005-02-10 12:30:38 +0100
+@@ -3,34 +3,6 @@
+
+ use ExtUtils::MakeMaker;
+
+-die("*** Microsoft Windows not supported\n")
+- if $^O =~ /win/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',
+@@ -40,7 +12,6 @@
+ IO::Interface => 0,
+ Net::Pcap => '0.04',
+ Net::IPv6Addr => 0,
+- Socket6 => 0,
+ Class::Gomor::Hash => '0.20',
+ },
+ ABSTRACT_FROM => 'Packet.pm',
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-net/perl-net.spec
============================================================================
$ cvs diff -u -r1.81 -r1.82 perl-net.spec
--- openpkg-src/perl-net/perl-net.spec 29 Jan 2005 09:55:40 -0000
1.81
+++ openpkg-src/perl-net/perl-net.spec 10 Feb 2005 11:41:32 -0000
1.82
@@ -25,6 +25,9 @@
# versions of individual parts
%define V_perl 5.8.6
+%define V_math_base85 0.2
+%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_ext 1.011
@@ -42,7 +45,7 @@
%define V_net_pcap 0.05
%define V_net_radius 1.44
%define V_net_ip 1.21
-%define V_net_packet 1.28
+%define V_net_packet 2.03
%define V_net_xmpp 1.0
%define V_net_jabber 2.0
%define V_net_patricia 1.010
@@ -58,34 +61,37 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20050129
+Release: 20050210
# package options
%option with_curl no
%option with_pcap no
# list of sources
-Source0:
http://www.cpan.org/modules/by-module/Net/Net-Daemon-%{V_net_daemon}.tar.gz
-Source1:
http://www.cpan.org/modules/by-module/Net/Net-Server-%{V_net_server}.tar.gz
-Source2:
http://www.cpan.org/modules/by-module/Net/Net-ext-%{V_net_ext}.tar.gz
-Source3:
http://www.cpan.org/modules/by-module/Net/libnet-%{V_libnet}.tar.gz
-Source4:
http://www.cpan.org/modules/by-module/Net/Net-Netmask-%{V_net_netmask}.tar.gz
-Source5:
http://www.cpan.org/modules/by-module/Net/Net-FTP-Common-%{V_net_ftp_common}.tar.gz
-Source6:
http://www.cpan.org/modules/by-module/Net/Net-SNMP-%{V_net_snmp}.tar.gz
-Source7:
http://www.cpan.org/modules/by-module/Net/Net-TFTP-%{V_net_tftp}.tar.gz
-Source8:
http://www.cpan.org/modules/by-module/Net/Net-Telnet-%{V_net_telnet}.tar.gz
-Source9:
http://www.cpan.org/modules/by-module/Net/Net-Telnet-Cisco-%{V_net_telnet_cisco}.tar.gz
-Source10:
http://www.cpan.org/modules/by-module/Net/Net-Radius-%{V_net_radius}.tar.gz
-Source11:
http://www.cpan.org/modules/by-module/RPC/PlRPC-%{V_plrpc}.tar.gz
-Source12:
http://curl.haxx.se/libcurl/perl/Curl-easy-%{V_curl_easy}.tar.gz
-Source13:
http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
-Source14:
http://www.cpan.org/modules/by-module/Net/Net-BGP-%{V_net_bgp}.tar.gz
-Source15:
http://www.cpan.org/authors/id/K/KC/KCARNUT/Net-Pcap-%{V_net_pcap}.tar.gz
-Source16:
http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
-Source17:
http://www.cpan.org/authors/id/M/MA/MANU/Net-IP-%{V_net_ip}.tar.gz
-Source18:
http://www.cpan.org/modules/by-module/Net/Net-XMPP-%{V_net_xmpp}.tar.gz
-Source19:
http://www.cpan.org/modules/by-module/Net/Net-Jabber-%{V_net_jabber}.tar.gz
-Source20:
http://www.cpan.org/modules/by-module/Net/Net-Patricia-%{V_net_patricia}.tar.gz
+Source0:
http://www.cpan.org/modules/by-module/Math/Math-Base85-%{V_math_base85}.tar.gz
+Source1:
http://www.cpan.org/modules/by-module/Net/Net-IPv4Addr-%{V_net_ipv4addr}.tar.gz
+Source2:
http://www.cpan.org/modules/by-module/Net/Net-IPv6Addr-%{V_net_ipv6addr}.tar.gz
+Source3:
http://www.cpan.org/modules/by-module/Net/Net-Daemon-%{V_net_daemon}.tar.gz
+Source4:
http://www.cpan.org/modules/by-module/Net/Net-Server-%{V_net_server}.tar.gz
+Source5:
http://www.cpan.org/modules/by-module/Net/Net-ext-%{V_net_ext}.tar.gz
+Source6:
http://www.cpan.org/modules/by-module/Net/libnet-%{V_libnet}.tar.gz
+Source7:
http://www.cpan.org/modules/by-module/Net/Net-Netmask-%{V_net_netmask}.tar.gz
+Source8:
http://www.cpan.org/modules/by-module/Net/Net-FTP-Common-%{V_net_ftp_common}.tar.gz
+Source9:
http://www.cpan.org/modules/by-module/Net/Net-SNMP-%{V_net_snmp}.tar.gz
+Source10:
http://www.cpan.org/modules/by-module/Net/Net-TFTP-%{V_net_tftp}.tar.gz
+Source11:
http://www.cpan.org/modules/by-module/Net/Net-Telnet-%{V_net_telnet}.tar.gz
+Source12:
http://www.cpan.org/modules/by-module/Net/Net-Telnet-Cisco-%{V_net_telnet_cisco}.tar.gz
+Source13:
http://www.cpan.org/modules/by-module/Net/Net-Radius-%{V_net_radius}.tar.gz
+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
+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
+Source18:
http://www.cpan.org/authors/id/K/KC/KCARNUT/Net-Pcap-%{V_net_pcap}.tar.gz
+Source19:
http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
+Source20:
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-XMPP-%{V_net_xmpp}.tar.gz
+Source22:
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-Patricia-%{V_net_patricia}.tar.gz
Patch0: perl-net.patch
# build information
@@ -93,8 +99,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg
>= %{V_perl}-20040126
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
-BuildPreReq: perl-crypto, perl-sys, perl-time, perl-xml
-PreReq: perl-crypto, perl-sys, perl-time, perl-xml
+BuildPreReq: perl-crypto, perl-sys, perl-time, perl-xml, perl-util >=
%{V_perl}-20040210
+PreReq: perl-crypto, perl-sys, perl-time, perl-xml, perl-util >=
%{V_perl}-20040210
%if "%{with_curl}" == "yes"
BuildPreReq: curl
PreReq: curl
@@ -144,6 +150,8 @@
- Net::XMPP (%{V_net_xmpp})
- Net::Jabber (%{V_net_jabber})
- Net::Patricia (%{V_net_patricia})
+ - Net::IPv4Addr (%{V_net_ipv4addr})
+ - Net::IPv6Addr (%{V_net_ipv6addr})
%track
prog perl-net:Curl-easy = {
@@ -232,7 +240,6 @@
regex = Net-IP-(__VER__)\.tar\.gz
}
prog perl-net:Net-Packet = {
- comment = "rse: Net::Packet 2.00 requires additional modules"
version = %{V_net_packet}
url = http://www.cpan.org/modules/by-module/Net/
regex = Net-Packet-(__VER__)\.tar\.gz
@@ -252,6 +259,21 @@
url = http://www.cpan.org/modules/by-module/Net/
regex = Net-Patricia-(__VER__)\.tar\.gz
}
+ prog perl-net:Net-IPv4Addr = {
+ version = %{V_net_ipv4addr}
+ url = http://www.cpan.org/modules/by-module/Net/
+ regex = Net-IPv4Addr-(__VER__)\.tar\.gz
+ }
+ prog perl-net:Net-IPv6Addr = {
+ version = %{V_net_ipv6addr}
+ url = http://www.cpan.org/modules/by-module/Net/
+ regex = Net-IPv6Addr-(__VER__)\.tar\.gz
+ }
+ prog perl-net:Math-Base85 = {
+ version = %{V_math_base85}
+ url = http://www.cpan.org/modules/by-module/Math/
+ regex = Math-Base85-(__VER__)\.tar\.gz
+ }
%prep
%setup -q -c
@@ -275,6 +297,9 @@
%setup -q -T -D -a 18
%setup -q -T -D -a 19
%setup -q -T -D -a 20
+ %setup -q -T -D -a 21
+ %setup -q -T -D -a 22
+ %setup -q -T -D -a 23
sed <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
%build
@@ -294,19 +319,25 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE9} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE10} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE11} configure build install
-%if "%{with_curl}" == "yes"
%{l_prefix}/bin/perl-openpkg -d %{SOURCE12} configure build install
-%endif
%{l_prefix}/bin/perl-openpkg -d %{SOURCE13} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE14} configure build install
-%if "%{with_pcap}" == "yes"
+%if "%{with_curl}" == "yes"
%{l_prefix}/bin/perl-openpkg -d %{SOURCE15} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE16} -A "INC='-I. %{l_cflags}'"
-A "LIBS='%{l_ldflags} -lpcap'" configure build install
%endif
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE16} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE17} configure build install
+%if "%{with_pcap}" == "yes"
%{l_prefix}/bin/perl-openpkg -d %{SOURCE18} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE19} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE19} \
+ -A "INC='-I. %{l_cppflags}'" \
+ -A "LIBS='%{l_ldflags} -lpcap'" \
+ configure build install
+%endif
%{l_prefix}/bin/perl-openpkg -d %{SOURCE20} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE21} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE22} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE23} configure build install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
