[SCM] Debian packaging of libnetaddr-ip-perl branch, master, updated. c4479658eeb6035c5e764ef71726805c467ac19c
gregor herrmann
gregoa at debian.org
Fri Oct 7 12:38:22 UTC 2011
The following commit has been merged in the master branch:
commit 6c202f553141defc7909cdf94c62a2b33ce82efd
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Oct 7 14:33:39 2011 +0200
Refresh lite_makefile.patch.
diff --git a/debian/patches/lite_makefile.patch b/debian/patches/lite_makefile.patch
index 7acb6e4..1877332 100644
--- a/debian/patches/lite_makefile.patch
+++ b/debian/patches/lite_makefile.patch
@@ -1,7 +1,8 @@
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Subject: stop overriting Lite/README
-Last-Update: 2010-11-02
+Last-Update: 2011-10-07
Forwarded: not-needed
+
--- a/Lite/Makefile.PL
+++ b/Lite/Makefile.PL
@@ -17,26 +17,26 @@
@@ -52,7 +53,7 @@ Forwarded: not-needed
WriteMakefile(%makeparms);
--- a/Lite/Util/README
+++ b/Lite/Util/README
-@@ -117,32 +117,37 @@
+@@ -123,32 +123,37 @@
::x:d.d.d.d
and so on...
@@ -95,7 +96,7 @@ Forwarded: not-needed
Takes an IPv6 RDATA string and returns a mixed hex - decimal IPv6
address with the 6 uppermost chunks in hex and the lower 32 bits in
dot-quad representation.
-@@ -150,7 +155,8 @@
+@@ -156,7 +161,8 @@
input: 128 bit RDATA string
returns: x:x:x:x:x:x:d.d.d.d
@@ -105,7 +106,7 @@ Forwarded: not-needed
This function converts a text IPv4 or IPv6 address in text format in
any standard notation into a 128 bit IPv6 string address. It
prefixes any dot-quad address (if found) with '::' and passes it to
-@@ -159,7 +165,8 @@
+@@ -165,7 +171,8 @@
input: dot-quad or rfc1844 address
returns: 128 bit IPv6 string
@@ -115,23 +116,51 @@ Forwarded: not-needed
This function returns true if there are one's present in the 128 bit
string and false if all the bits are zero.
-@@ -179,11 +186,13 @@
+@@ -185,7 +192,8 @@
input: 128 bit IPv6 string
returns: true if any bits are present
+- * $ipv6naddr = inet_4map6($netaddr or $ipv6naddr
++ * $ipv6naddr = inet_4map6($netaddr or $ipv6naddr
++
+ This function returns an ipV6 network address with the first 80 bits
+ set to zero and the next 16 bits set to one, while the last 32 bits
+ are filled with the ipV4 address.
+@@ -201,7 +209,8 @@
+
+ ::ffff::d.d.d.d or ::d.d.d.d
+
- * $rv = isIPv4($bits128);
+ * $rv = isIPv4($bits128);
+
This function returns true if there are no on bits present in the
IPv6 portion of the 128 bit string and false otherwise.
+@@ -209,17 +218,20 @@
+
+ Note: this is an old and deprecated ipV4 compatible ipV6 address
+
+- * $rv = isNewIPv4($bits128);
++ * $rv = isNewIPv4($bits128);
++
+ This function return true if the IPv6 128 bit string is of the form
+
+ ::ffff::d.d.d.d
+
+- * $rv = isAnyIPv4($bits128);
++ * $rv = isAnyIPv4($bits128);
++
+ This function return true if the IPv6 bit string is of the form
+
+ ::d.d.d.d or ::ffff::d.d.d.d
+
- * $dotquad or $hex_text = inet_n2dx($ipv6naddr);
+ * $dotquad or $hex_text = inet_n2dx($ipv6naddr);
+
This function does the right thing and returns the text for either a
dot-quad IPv4 or a hex notation IPv6 address.
-@@ -191,7 +200,8 @@
+@@ -227,7 +239,8 @@
returns: ddd.ddd.ddd.ddd
or x:x:x:x:x:x:x:x
@@ -141,7 +170,7 @@ Forwarded: not-needed
This function does the right thing and returns the text for either a
dot-quad IPv4 or a hex::decimal notation IPv6 address.
-@@ -199,13 +209,15 @@
+@@ -235,13 +248,15 @@
returns: ddd.ddd.ddd.ddd
or x:x:x:x:x:x:ddd.ddd.ddd.dd
@@ -159,7 +188,7 @@ Forwarded: not-needed
Convert an ipv4 network address/mask into an ipv6 network mask.
input: 32 bit network/mask address
-@@ -213,28 +225,32 @@
+@@ -249,28 +264,32 @@
NOTE: returns the high 96 bits as one's
@@ -196,7 +225,7 @@ Forwarded: not-needed
input: 128 bit string variable,
number of shifts [optional]
returns: bits X n shifts
-@@ -242,7 +258,8 @@
+@@ -278,7 +297,8 @@
NOTE: a single shift is performed
if $n is not specified
@@ -206,7 +235,7 @@ Forwarded: not-needed
Add a signed constant to a 128 bit string variable.
input: 128 bit IPv6 string,
-@@ -250,7 +267,8 @@
+@@ -286,7 +306,8 @@
returns: scalar carry
array (carry, result)
@@ -216,7 +245,7 @@ Forwarded: not-needed
Add two 128 bit string variables.
input: 128 bit string var1,
-@@ -258,7 +276,8 @@
+@@ -294,7 +315,8 @@
returns: scalar carry
array (carry, result)
@@ -226,7 +255,7 @@ Forwarded: not-needed
Subtract two 128 bit string variables.
input: 128 bit string var1,
-@@ -272,7 +291,8 @@
+@@ -308,7 +330,8 @@
i.e. if ARG1 >= ARG2 then carry = 1
or if ARG1 < ARG2 then carry = 0
@@ -236,7 +265,7 @@ Forwarded: not-needed
This function counts the bit positions remaining in the mask when
the rightmost '0's are removed.
-@@ -283,33 +303,39 @@
+@@ -319,27 +342,31 @@
contiguous one's,
128 bit cidr number
@@ -271,6 +300,11 @@ Forwarded: not-needed
+
Replacement for Perl's gethostbyname if Socket6 is available
+ This function ALWAYS returns an IPv6 address, even on IPv4 only
+@@ -347,10 +374,12 @@
+
+ ::FFFF:FFFF:d.d.d.d
+
- * NetAddr::IP::Util::lower();
+ * NetAddr::IP::Util::lower();
+
@@ -282,7 +316,7 @@ Forwarded: not-needed
Return IPv6 strings in uppercase. This is the default.
EXAMPLES
-@@ -353,6 +379,7 @@
+@@ -394,6 +423,7 @@
return ($vecip, $mask, $bits);
}
--
Debian packaging of libnetaddr-ip-perl
More information about the Pkg-perl-cvs-commits
mailing list