[SCM] Debian packaging of libnetaddr-ip-perl branch, master, updated. debian/4.048+dfsg-1-9-gedc0693
gregor herrmann
gregoa at debian.org
Thu Oct 20 18:03:40 UTC 2011
The following commit has been merged in the master branch:
commit 6e5210c4b4ae34ff9c62fdd7c3c900f7cd3aa578
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Oct 20 19:47:03 2011 +0200
Refresh lite_makefile.patch.
diff --git a/debian/patches/lite_makefile.patch b/debian/patches/lite_makefile.patch
index 1877332..52ce07b 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: 2011-10-07
Forwarded: not-needed
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-10-20
--- a/Lite/Makefile.PL
+++ b/Lite/Makefile.PL
@@ -53,7 +54,7 @@ Forwarded: not-needed
WriteMakefile(%makeparms);
--- a/Lite/Util/README
+++ b/Lite/Util/README
-@@ -123,32 +123,37 @@
+@@ -137,39 +137,45 @@
::x:d.d.d.d
and so on...
@@ -82,6 +83,15 @@ Forwarded: not-needed
input: ipv6 text
returns: 128 bit RDATA string
+- * $ipv6_text = ipv6_ntoa($ipv6naddr);
++ * $ipv6_text = ipv6_ntoa($ipv6naddr);
++
+ Convert a 128 bit binary IPv6 address to compressed rfc 1884 text
+ representation.
+
+ input: 128 bit RDATA string
+ returns: ipv6 text
+
- * $hex_text = ipv6_n2x($ipv6addr);
+ * $hex_text = ipv6_n2x($ipv6addr);
+
@@ -96,7 +106,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.
-@@ -156,7 +161,8 @@
+@@ -177,7 +183,8 @@
input: 128 bit RDATA string
returns: x:x:x:x:x:x:d.d.d.d
@@ -106,7 +116,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
-@@ -165,7 +171,8 @@
+@@ -186,7 +193,8 @@
input: dot-quad or rfc1844 address
returns: 128 bit IPv6 string
@@ -116,7 +126,7 @@ 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.
-@@ -185,7 +192,8 @@
+@@ -206,7 +214,8 @@
input: 128 bit IPv6 string
returns: true if any bits are present
@@ -126,7 +136,7 @@ Forwarded: not-needed
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 @@
+@@ -222,7 +231,8 @@
::ffff::d.d.d.d or ::d.d.d.d
@@ -136,7 +146,7 @@ Forwarded: not-needed
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 @@
+@@ -230,17 +240,20 @@
Note: this is an old and deprecated ipV4 compatible ipV6 address
@@ -160,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 notation IPv6 address.
-@@ -227,7 +239,8 @@
+@@ -248,7 +261,8 @@
returns: ddd.ddd.ddd.ddd
or x:x:x:x:x:x:x:x
@@ -170,14 +180,38 @@ 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.
-@@ -235,13 +248,15 @@
+@@ -256,31 +270,36 @@
returns: ddd.ddd.ddd.ddd
or x:x:x:x:x:x:ddd.ddd.ddd.dd
+- * $netaddr = inet_pton($AF_family,$hex_text);
++ * $netaddr = inet_pton($AF_family,$hex_text);
++
+ This function takes an IP address in IPv4 or IPv6 text format and
+ converts it into binary format. The type of IP address conversion is
+ controlled by the FAMILY argument.
+
+- * $hex_text = inet_ntop($AF_family,$netaddr);
++ * $hex_text = inet_ntop($AF_family,$netaddr);
++
+ This function takes and IP address in binary format and converts it
+ into text format. The type of IP address conversion is controlled by
+ the FAMILY argument.
+
+ NOTE: inet_ntop ALWAYS returns lowercase characters.
+
+- * $hex_text = packzeros($hex_text);
++ * $hex_text = packzeros($hex_text);
++
+ This function optimizes and rfc 1884 IPv6 hex address to reduce the
+ number of long strings of zero bits as specified in rfc 1884, 2.2
+ (2) by substituting :: for the first occurence of the longest string
+ of zeros in the address.
+
- * $ipv6naddr = ipv4to6($netaddr);
+ * $ipv6naddr = ipv4to6($netaddr);
+
- Convert an ipv4 network address into an ipv6 network address.
+ Convert an ipv4 network address into an IPv6 network address.
input: 32 bit network address
returns: 128 bit network address
@@ -188,7 +222,7 @@ Forwarded: not-needed
Convert an ipv4 network address/mask into an ipv6 network mask.
input: 32 bit network/mask address
-@@ -249,28 +264,32 @@
+@@ -288,28 +307,32 @@
NOTE: returns the high 96 bits as one's
@@ -225,7 +259,7 @@ Forwarded: not-needed
input: 128 bit string variable,
number of shifts [optional]
returns: bits X n shifts
-@@ -278,7 +297,8 @@
+@@ -317,7 +340,8 @@
NOTE: a single shift is performed
if $n is not specified
@@ -235,7 +269,7 @@ Forwarded: not-needed
Add a signed constant to a 128 bit string variable.
input: 128 bit IPv6 string,
-@@ -286,7 +306,8 @@
+@@ -325,7 +349,8 @@
returns: scalar carry
array (carry, result)
@@ -245,7 +279,7 @@ Forwarded: not-needed
Add two 128 bit string variables.
input: 128 bit string var1,
-@@ -294,7 +315,8 @@
+@@ -333,7 +358,8 @@
returns: scalar carry
array (carry, result)
@@ -255,7 +289,7 @@ Forwarded: not-needed
Subtract two 128 bit string variables.
input: 128 bit string var1,
-@@ -308,7 +330,8 @@
+@@ -347,7 +373,8 @@
i.e. if ARG1 >= ARG2 then carry = 1
or if ARG1 < ARG2 then carry = 0
@@ -265,7 +299,7 @@ Forwarded: not-needed
This function counts the bit positions remaining in the mask when
the rightmost '0's are removed.
-@@ -319,27 +342,31 @@
+@@ -358,27 +385,31 @@
contiguous one's,
128 bit cidr number
@@ -300,10 +334,17 @@ 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 @@
+ In ARRAY context, returns a list of five elements, the hostname or
+@@ -405,15 +436,18 @@
+ For a gethostbyname2 emulator that behave like Socket6, see: the
+ Net::DNS::Dig manpage
- ::FFFF:FFFF:d.d.d.d
+- * $trueif = havegethostbyname2();
++ * $trueif = havegethostbyname2();
++
+ This function returns TRUE if Socket6 has a functioning
+ gethostbyname2, otherwise it returns FALSE. See the comments above
+ about the behavior of naip_gethostbyname.
- * NetAddr::IP::Util::lower();
+ * NetAddr::IP::Util::lower();
@@ -316,7 +357,7 @@ Forwarded: not-needed
Return IPv6 strings in uppercase. This is the default.
EXAMPLES
-@@ -394,6 +423,7 @@
+@@ -457,6 +491,7 @@
return ($vecip, $mask, $bits);
}
--
Debian packaging of libnetaddr-ip-perl
More information about the Pkg-perl-cvs-commits
mailing list