rpms/perl-Net-IP/devel perl-Net-IP-31prefix.patch, NONE, 1.1 perl-Net-IP-noout.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Net-IP.spec, 1.6, 1.7 sources, 1.3, 1.4 IP.pm.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11251/devel

Modified Files:
	.cvsignore perl-Net-IP.spec sources 
Added Files:
	perl-Net-IP-31prefix.patch perl-Net-IP-noout.patch 
Removed Files:
	IP.pm.patch 
Log Message:
1.22.

perl-Net-IP-31prefix.patch:

--- NEW FILE perl-Net-IP-31prefix.patch ---
http://rt.cpan.org/NoAuth/Bug.html?id=7528


diff -ru Net-IP-1.22.orig/IP.pm Net-IP-1.22/IP.pm
--- Net-IP-1.22.orig/IP.pm	2005-05-27 12:01:23.000000000 +0300
+++ Net-IP-1.22/IP.pm	2005-05-28 11:54:07.000000000 +0300
@@ -1529,10 +1529,8 @@
 	while (ip_bincomp ($binip,'le',$endbinip) == 1)
 	{
 		# Find all 0s at the end
-		$binip =~ m/(0+)$/;
-		# nbits = nb of 0 bits
-		
-		if ($1) {
+		if ($binip =~ m/(0+)$/) {
+			# nbits = nb of 0 bits
 			$nbits = length ($1);
 		}
 		else {
diff -ru Net-IP-1.22.orig/t/ipv4.t Net-IP-1.22/t/ipv4.t
--- Net-IP-1.22.orig/t/ipv4.t	2003-02-14 11:38:03.000000000 +0200
+++ Net-IP-1.22/t/ipv4.t	2005-05-28 11:56:48.000000000 +0300
@@ -12,7 +12,7 @@
 	};
 };
 
-my $numtests = 21;
+my $numtests = 23;
 
 # Create checker:
 my $T = typical ExtUtils::TBone;
@@ -60,9 +60,13 @@
 $T->ok_eqnum ($ip->bincomp('gt',$ip2),1,$ip->error());
 
 $ip = new Net::IP('133.44.255.255-133.45.0.42');
-
 $T->ok_eq (($ip->find_prefixes())[3],'133.45.0.40/31',$ip->error());
 
+$ip = new Net::IP('192.168.2.254-192.168.2.255');
+my @prefixes = $ip->find_prefixes();
+$T->ok_eqnum (scalar(@prefixes), 1);
+$T->ok_eq ($prefixes[0],'192.168.2.254/31',$ip->error());
+
 $ip->set('201.33.128.0/22');
 $ip2->set('201.33.129.0/24');
 

perl-Net-IP-noout.patch:

--- NEW FILE perl-Net-IP-noout.patch ---
--- IP.pm~	2005-05-27 12:01:23.000000000 +0300
+++ IP.pm	2005-05-28 12:02:14.000000000 +0300
@@ -1884,7 +1884,5 @@
 		
 		foreach my $qn (reverse @quads[0..($no_quads-1)]) {
-			print "Quad: $qn\n";
 			push (@reverse_groups, $qn + 1 - 1);
-			print "Quad: $qn\n";
 		}
 		


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Dec 2004 08:17:41 -0000	1.3
+++ .cvsignore	29 May 2005 07:35:51 -0000	1.4
@@ -1 +1 @@
-Net-IP-1.21.tar.gz
+Net-IP-1.22.tar.gz


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-IP.spec	6 Apr 2005 22:13:07 -0000	1.6
+++ perl-Net-IP.spec	29 May 2005 07:35:51 -0000	1.7
@@ -1,16 +1,14 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Net-IP
-Version:        1.21
+Version:        1.22
 Release:        2
-
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Net-IP/
-Source:         http://www.cpan.org/modules/by-module/Net/Net-IP-1.21.tar.gz
-Patch0:         http://rt.cpan.org/NoAuth/Attachment/24678/24151/IP.pm.patch
+Source:         http://www.cpan.org/modules/by-module/Net/Net-IP-%{version}.tar.gz
+Patch0:         %{name}-31prefix.patch
+Patch1:         %{name}-noout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,10 +26,8 @@
 
 %prep
 %setup -q -n Net-IP-%{version}
-# http://rt.cpan.org/NoAuth/Bug.html?id=7528
-%patch0 -p0
-# http://rt.cpan.org/NoAuth/Bug.html?id=3844
-%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL
+%patch0 -p1
+%patch1
 
 
 %build
@@ -60,12 +56,16 @@
 %doc COPYING Changes README
 %{_bindir}/ipcount
 %{_bindir}/iptab
-%{perl_vendorlib}/Net
+%{perl_vendorlib}/Net/
 %{_mandir}/man3/Net::IP.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sun May 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.22-2
+- 1.22, include test case for rt.cpan.org #7528 patch.
+- Patch to mute stdout noise from ip_reverse().
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.21-2
 - rebuilt
 
 * Thu Dec  2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.21-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Dec 2004 08:17:41 -0000	1.3
+++ sources	29 May 2005 07:35:51 -0000	1.4
@@ -1 +1 @@
-1a4163b626a743ca5a76e04cc00fa73d  Net-IP-1.21.tar.gz
+b3caf36826060b89769d5aa32d716996  Net-IP-1.22.tar.gz


--- IP.pm.patch DELETED ---