From 18482e8395b9dc9bd74f9d0707db3f45de0c701f Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 20 Oct 2011 12:14:52 +0100 Subject: [PATCH] Update to 4.049 - New upstream release 4.049 - In Lite v1.32: - Add capability to parse input of the form ->new6(12345,1); this should have been there but was missing (CPAN RT#68723) - In Util v1.41: - Add inet_pton, inet_ntop, AF_INET, AF_INET6 - Modify inet_n2dx and inet_n2ad to recognize the new 128-bit IPv4 format ::FFFF:FFFF:0:0 - Replace isIPv4 with a pure perl version for portability - Split the following into NetAddr::IP::InetBase v0.01 to provide better long-term support for IPv6: - inet_aton - inet_ntoa - ipv6_aton - ipv6_n2x - ipv6_n2d - inet_any2n - inet_n2dx - inet_n2ad - inet_ntop - inet_pton - packzeros - isIPv4 - isNewIPv4 - isAnyIPv4 - AF_INET - AF_INET6 - BR: perl(Carp) - BR: perl(Socket6) for test suite - Update UTF-8 patch to apply cleanly - License is now GPL+ or Artistic in most of the code but Util.xs is GPLv2+ so we ship the whole thing under that license --- .gitignore | 5 +- License_of_perl-NetAddr-IP.txt | 61 ------------------- ...-UTF8.patch => NetAddr-IP-4.049-UTF8.patch | 18 +++--- perl-NetAddr-IP.spec | 54 +++++++++++++--- sources | 2 +- 5 files changed, 55 insertions(+), 85 deletions(-) delete mode 100644 License_of_perl-NetAddr-IP.txt rename NetAddr-IP-4.042-UTF8.patch => NetAddr-IP-4.049-UTF8.patch (60%) diff --git a/.gitignore b/.gitignore index 9cb6668..76a0989 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -NetAddr-IP-4.027.tar.gz -/NetAddr-IP-4.042.tar.gz -/NetAddr-IP-4.044.tar.gz -/NetAddr-IP-4.047.tar.gz +/NetAddr-IP-[0-9.]*.tar.gz diff --git a/License_of_perl-NetAddr-IP.txt b/License_of_perl-NetAddr-IP.txt deleted file mode 100644 index 6615447..0000000 --- a/License_of_perl-NetAddr-IP.txt +++ /dev/null @@ -1,61 +0,0 @@ -Subject: Re: License of perl-NetAddr-IP -From: "Luis E." =?ISO-8859-1?Q?Mu=F1oz?= -To: "Tom \"spot\" Callaway" -Date: Thu, 07 Aug 2008 11:16:59 -0430 - -On Thu, 2008-08-07 at 10:55 -0400, Tom "spot" Callaway wrote: -> I've been trying to contact you over the last year without any luck. -> Currently, Fedora is including NetAddr::IP, which is licensed under -> the -> Artistic 1.0 license. This license is no longer a permitted license in -> Fedora. - -Hi Tom and thanks for getting in touch. - -Why do you say that the code is licensed under the 1.0 license? - -According to this excerpt (from -http://search.cpan.org/src/LUISMUNOZ/NetAddr-IP-4.007/README )... - -# LICENSE AND WARRANTY -# -# This software is (c) Luis E. Muñoz and Michael A. Robinton. It can be -# used under the terms of the perl artistic license provided that proper -# credit for the work of the authors is preserved in the form of this -# copyright notice and license for this module. - -... there is no mention to a specific version number for the license. - -> [...] We have several other popular applications which depend on your -> code, so -> I am hopeful that you will be willing to relicense (either to Artistic -> 2.0 or any other license of your choice on this list: -> http://fedoraproject.org/wiki/Licensing#Good_Licenses ) or dual -> license -> (for example, the same license as perl, GPL+ or Artistic). - -I would be willing to relicense to Artistic 2.0 if need be. However, the -code is rather stable at this time. I think it would not be a wise use -of time to start tracking "upstream license version number" as well :-) - -Regards. - --lem - - -Subject: Re: License of perl-NetAddr-IP -From: "Luis E." =?ISO-8859-1?Q?Mu=F1oz?= -To: "Tom \"spot\" Callaway" -Date: Thu, 07 Aug 2008 12:06:33 -0430 - -On Thu, 2008-08-07 at 11:57 -0400, Tom "spot" Callaway wrote: -> In the interim, will you give Fedora permission to distribute this -> code -> under Artistic 2.0? - -Of course. I'll tack a note to update the wording in the next release. - -Best regards. - --lem - diff --git a/NetAddr-IP-4.042-UTF8.patch b/NetAddr-IP-4.049-UTF8.patch similarity index 60% rename from NetAddr-IP-4.042-UTF8.patch rename to NetAddr-IP-4.049-UTF8.patch index d63da1c..dbe0c58 100644 --- a/NetAddr-IP-4.042-UTF8.patch +++ b/NetAddr-IP-4.049-UTF8.patch @@ -1,5 +1,5 @@ ---- NetAddr-IP-4.042/README 2011-03-23 10:56:16.137035463 +0000 -+++ NetAddr-IP-4.042/README 2008-12-02 20:54:08.000000000 +0000 +--- NetAddr-IP/README ++++ NetAddr-IP/README @@ -187,7 +187,7 @@ LICENSE AND WARRANTY @@ -9,9 +9,9 @@ used under the terms of the perl artistic license provided that proper credit for the work of the authors is preserved in the form of this copyright notice and license for this module. ---- NetAddr-IP-4.042/Lite/Lite.pm 2011-03-22 22:37:05.000000000 +0000 -+++ NetAddr-IP-4.042/Lite/Lite.pm 2011-03-23 10:56:55.768181188 +0000 -@@ -1338,7 +1338,7 @@ +--- NetAddr-IP/Lite/Lite.pm ++++ NetAddr-IP/Lite/Lite.pm +@@ -1381,7 +1381,7 @@ =head1 AUTHOR @@ -20,12 +20,12 @@ Michael Robinton Emichael@bizsystems.comE =head1 WARRANTY -@@ -1348,7 +1348,7 @@ +@@ -1391,7 +1391,7 @@ - =head1 LICENSE + =head1 COPYRIGHT - This software is (c) Luis E. Muñoz, 1999 - 2005 + This software is (c) Luis E. Muñoz, 1999 - 2005 - and (c) Michael Robinton, 2006 - 2010. + and (c) Michael Robinton, 2006 - 2011. - It can be used under the terms of the perl artistic license provided that + All rights reserved. diff --git a/perl-NetAddr-IP.spec b/perl-NetAddr-IP.spec index f87efb0..3bd2bb5 100644 --- a/perl-NetAddr-IP.spec +++ b/perl-NetAddr-IP.spec @@ -1,23 +1,22 @@ Name: perl-NetAddr-IP -Version: 4.047 +Version: 4.049 Release: 1%{?dist} Summary: Manages IPv4 and IPv6 addresses and subnets -# Upstream explicitly gave permission for us to distribute under Artistic 2.0 -# Will be reflected in next release. -License: Artistic 2.0 +License: GPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/NetAddr-IP/ Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-%{version}.tar.gz -Source1: License_of_perl-NetAddr-IP.txt -Patch0: NetAddr-IP-4.042-UTF8.patch +Patch0: NetAddr-IP-4.049-UTF8.patch BuildRequires: perl(AutoLoader) +BuildRequires: perl(Carp) BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) +BuildRequires: perl(Socket6) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # Don't "provide" private Perl libs or redundant unversioned provides -%global __provides_exclude ^(perl\\(NetAddr::IP(::Util(PP|Polluted)?)?\\)$|Util\\.so) +%global __provides_exclude ^(perl\\(NetAddr::IP(::(InetBase|Util(PP)?))?\\)$|Util\\.so) %description This module provides an object-oriented abstraction on top of IP addresses @@ -27,7 +26,7 @@ Math::BigInt as in previous versions. %prep %setup -q -n NetAddr-IP-%{version} -cp %{SOURCE1} . + # Fix UTF-8 %patch0 -p1 @@ -39,22 +38,57 @@ make %{?_smp_mflags} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; +find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null %{_fixperms} %{buildroot} %check make test %files -%doc Changes README TODO docs/rfc1884.txt License_of_perl-NetAddr-IP.txt +%doc Artistic Changes Copying README TODO docs/rfc1884.txt %{perl_vendorarch}/auto/NetAddr/ %{perl_vendorarch}/NetAddr/ %{_mandir}/man3/NetAddr::IP.3pm* +%{_mandir}/man3/NetAddr::IP::InetBase.3pm* %{_mandir}/man3/NetAddr::IP::Lite.3pm* %{_mandir}/man3/NetAddr::IP::Util.3pm* %{_mandir}/man3/NetAddr::IP::UtilPP.3pm* %changelog +* Thu Oct 20 2011 Paul Howarth - 4.049-1 +- update to 4.049 + - in Lite v1.32: + - add capability to parse input of the form ->new6(12345,1); this should + have been there but was missing (CPAN RT#68723) + - in Util v1.41: + - add inet_pton, inet_ntop, AF_INET, AF_INET6 + - modify inet_n2dx and inet_n2ad to recognize the new 128-bit IPv4 format + ::FFFF:FFFF:0:0 + - replace isIPv4 with a pure perl version for portability + - split the following into NetAddr::IP::InetBase v0.01 to provide better + long-term support for IPv6: + - inet_aton + - inet_ntoa + - ipv6_aton + - ipv6_n2x + - ipv6_n2d + - inet_any2n + - inet_n2dx + - inet_n2ad + - inet_ntop + - inet_pton + - packzeros + - isIPv4 + - isNewIPv4 + - isAnyIPv4 + - AF_INET + - AF_INET6 +- BR: perl(Carp) +- BR: perl(Socket6) for test suite +- update UTF-8 patch to apply cleanly +- license is now GPL+ or Artistic in most of the code but Util.xs is GPLv2+ so + we ship the whole thing under that license + * Fri Oct 07 2011 Petr Sabata - 4.047-1 - 4.047 bump diff --git a/sources b/sources index 1a3a24c..afe438a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -670cda79f225afa73bcd2709c3032cf7 NetAddr-IP-4.047.tar.gz +3021d2db44fe151012b7fcef99127cc4 NetAddr-IP-4.049.tar.gz