RT 24835, bug 165784; new libnet forces utf8 on folks where it shouldnt. Thanks for...

Package-Manager: portage-2.1.2.2

diff --git a/perl-core/libnet/ChangeLog b/perl-core/libnet/ChangeLog
index e5077a9175037543ddb031ca9b31580d9f184ffc..e055527cf7abe9c95411325e64e6d6033cf17fed 100644 (file)
--- a/perl-core/libnet/ChangeLog
+++ b/perl-core/libnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for perl-core/libnet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/ChangeLog,v 1.6 2007/02/05 17:15:03 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/ChangeLog,v 1.7 2007/03/25 12:06:26 mcummings Exp $
+
+*libnet-1.20-r1 (25 Mar 2007)
+
+  25 Mar 2007; Michael Cummings <mcummings@gentoo.org>
+  +files/Net-CMD-UTF8.patch, -libnet-1.20.ebuild, +libnet-1.20-r1.ebuild:
+  RT 24835, bug 165784; new libnet forces utf8 on folks where it shouldnt.
+  Thanks for bringing it to our attention barthek.
 
 *libnet-1.20 (05 Feb 2007)
 

diff --git a/perl-core/libnet/Manifest b/perl-core/libnet/Manifest
index 2bb861c180112cb8c76bea75447dbcc1b75a3e0f..f184492d02335525ccebef139c6f6c4b4618ba6e 100644 (file)
--- a/perl-core/libnet/Manifest
+++ b/perl-core/libnet/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX Net-CMD-UTF8.patch 551 RMD160 d30685bf01fa314ff6ff8bc0aba30ab0e18c8dae SHA1 386ea03b480f3dc0e1b6d0dfd6385bfa80650964 SHA256 852d8f123e4cbee224e4d8b3729b491365d42da825149b689f4d5176da188458
+MD5 7005e3d93ce655f0b1d20da5258583d5 files/Net-CMD-UTF8.patch 551
+RMD160 d30685bf01fa314ff6ff8bc0aba30ab0e18c8dae files/Net-CMD-UTF8.patch 551
+SHA256 852d8f123e4cbee224e4d8b3729b491365d42da825149b689f4d5176da188458 files/Net-CMD-UTF8.patch 551
 AUX libnet.cfg 268 RMD160 6c5fd8a093897165d5cb6b7db955fc8c55827799 SHA1 867e77e3e6a7c7d81e9cb7bf235d6e2340b629e8 SHA256 e07de290e7651f580bd587231655b8bf9c2b4ae7d77e650ccfa28c25ad705912
 MD5 655ae6886075bd2902bd1b1bcbbffa4d files/libnet.cfg 268
 RMD160 6c5fd8a093897165d5cb6b7db955fc8c55827799 files/libnet.cfg 268
@@ -11,14 +15,14 @@ EBUILD libnet-1.19.ebuild 614 RMD160 9accc1a7b3fde5dde64773c6c3452efea3ca903a SH
 MD5 da67618b617797186afb261f4f14936d libnet-1.19.ebuild 614
 RMD160 9accc1a7b3fde5dde64773c6c3452efea3ca903a libnet-1.19.ebuild 614
 SHA256 73346d410e164c76ea9c75b23e284168cdec2669edbd07e12f90fe6b5c0fff42 libnet-1.19.ebuild 614
-EBUILD libnet-1.20.ebuild 626 RMD160 2b78133b64acdab4843c3fcd6302bfacd73bbb53 SHA1 38a8e938bccdddb1c507b3d8ca7ac169a20a241d SHA256 c1cf91c9cd78368986ca1fb4bead07dce5bd9c331cf273c9cb9087650ef93974
-MD5 8ac2aa9d3750bb1909fd5e4ad4bd5aba libnet-1.20.ebuild 626
-RMD160 2b78133b64acdab4843c3fcd6302bfacd73bbb53 libnet-1.20.ebuild 626
-SHA256 c1cf91c9cd78368986ca1fb4bead07dce5bd9c331cf273c9cb9087650ef93974 libnet-1.20.ebuild 626
-MISC ChangeLog 5010 RMD160 09c94231ffc8b7ac6ee54dc641ef8d169ca6ce8e SHA1 c14e5dd12dd2e903ea32720352ea54b0b9e7664c SHA256 9e36bcde693ef39ac827ab72e45e66cbf1508201156a40950d64bc1882879724
-MD5 860b79f93c7f7a32d4bc81d7b095f625 ChangeLog 5010
-RMD160 09c94231ffc8b7ac6ee54dc641ef8d169ca6ce8e ChangeLog 5010
-SHA256 9e36bcde693ef39ac827ab72e45e66cbf1508201156a40950d64bc1882879724 ChangeLog 5010
+EBUILD libnet-1.20-r1.ebuild 670 RMD160 f8ea29cdf739c470f89ca6df03155cbef74b69cb SHA1 5a3947671e0f5937b51891d3f81fbbb965394918 SHA256 bd8e888a488d7d3ec38c2071f070095ef839fa4ff621a85050b5f96586d995ce
+MD5 2496d74c5a78acf3586dea7380735381 libnet-1.20-r1.ebuild 670
+RMD160 f8ea29cdf739c470f89ca6df03155cbef74b69cb libnet-1.20-r1.ebuild 670
+SHA256 bd8e888a488d7d3ec38c2071f070095ef839fa4ff621a85050b5f96586d995ce libnet-1.20-r1.ebuild 670
+MISC ChangeLog 5297 RMD160 ae6bbf3120c7b925416812f2c7a2c47f8bb80c1f SHA1 46efaec9a77c0c9f99a5d42d92a91440563ffd44 SHA256 a221e5e50124a018b3ab6572e786c0c342be3068eee67cbf2271689ff9ab1e59
+MD5 56c947d984325201188b15f1164a05f6 ChangeLog 5297
+RMD160 ae6bbf3120c7b925416812f2c7a2c47f8bb80c1f ChangeLog 5297
+SHA256 a221e5e50124a018b3ab6572e786c0c342be3068eee67cbf2271689ff9ab1e59 ChangeLog 5297
 MISC metadata.xml 485 RMD160 dc9ff8eef00c1c6914a4497e51751e9a81a2307d SHA1 e4c865b0087cf5db1110db7241266565b8402034 SHA256 ea552fea0b170b64896d3bf87cdc3a7e3a494501d2d9cb9c5e46635f8eaea2be
 MD5 5754ff268b56f63cc6b8cca33848cfaf metadata.xml 485
 RMD160 dc9ff8eef00c1c6914a4497e51751e9a81a2307d metadata.xml 485
@@ -26,13 +30,13 @@ SHA256 ea552fea0b170b64896d3bf87cdc3a7e3a494501d2d9cb9c5e46635f8eaea2be metadata
 MD5 2c8efafe921d7e1a72152c609cabb80e files/digest-libnet-1.19 232
 RMD160 8adbef36ae4f9793544506ae239bfcb648dc5c7d files/digest-libnet-1.19 232
 SHA256 e465b4597b6e5612c9055271f1f4bd5e3c0d500672b52d67bf26187c1242a03d files/digest-libnet-1.19 232
-MD5 1f46b128b577957ca0b52fd58523fd51 files/digest-libnet-1.20 232
-RMD160 e149953f3b5939c98f97e40d5ad66c6b9f0fe327 files/digest-libnet-1.20 232
-SHA256 7ecc2b73cc5b75cab3ad33b55ccc1bd855b6bfddf104623c7569d8b4625b897e files/digest-libnet-1.20 232
+MD5 1f46b128b577957ca0b52fd58523fd51 files/digest-libnet-1.20-r1 232
+RMD160 e149953f3b5939c98f97e40d5ad66c6b9f0fe327 files/digest-libnet-1.20-r1 232
+SHA256 7ecc2b73cc5b75cab3ad33b55ccc1bd855b6bfddf104623c7569d8b4625b897e files/digest-libnet-1.20-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFx2YdtG5z4I8BtQoRAg4WAJ9y97LKICZ7zSdo/bhRD6ncJ1MyYgCbB5zu
-K2nq5BgEJoEmHoZ8KfH6tCQ=
-=vs+0
+iD8DBQFGBmXItG5z4I8BtQoRAkRbAJ49FvlBQSZQO/lGhNoxEW8TGZikZACfavoR
+w2yWe54Y/UtkyjuxPZexVFQ=
+=S0hV
 -----END PGP SIGNATURE-----

diff --git a/perl-core/libnet/files/Net-CMD-UTF8.patch b/perl-core/libnet/files/Net-CMD-UTF8.patch
new file mode 100644 (file)
index 0000000..23272e5
--- /dev/null
+++ b/perl-core/libnet/files/Net-CMD-UTF8.patch
@@ -0,0 +1,20 @@
+diff -Naurp libnet-1.20.old/Net/Cmd.pm libnet-1.20/Net/Cmd.pm
+--- libnet-1.20.old/Net/Cmd.pm 2006-10-27 07:08:07.000000000 -0400
++++ libnet-1.20/Net/Cmd.pm     2007-03-25 08:02:38.000000000 -0400
+@@ -21,7 +21,6 @@ BEGIN {
+   }
+ }
+ 
+-my $doUTF8 = eval { require utf8 };
+ 
+ $VERSION = "2.27";
+ @ISA     = qw(Exporter);
+@@ -395,8 +394,6 @@ sub datasend
+  my $arr = @_ == 1 && ref($_[0]) ? $_[0] : \@_;
+  my $line = join("" ,@$arr);
+ 
+- utf8::encode($line) if $doUTF8;
+-
+  return 0 unless defined(fileno($cmd));
+ 
+  my $last_ch = ${*$cmd}{'net_cmd_last_ch'};

diff --git a/perl-core/libnet/files/digest-libnet-1.20 b/perl-core/libnet/files/digest-libnet-1.20-r1
similarity index 100%
rename from perl-core/libnet/files/digest-libnet-1.20
rename to perl-core/libnet/files/digest-libnet-1.20-r1

diff --git a/perl-core/libnet/libnet-1.20.ebuild b/perl-core/libnet/libnet-1.20-r1.ebuild
similarity index 76%
rename from perl-core/libnet/libnet-1.20.ebuild
rename to perl-core/libnet/libnet-1.20-r1.ebuild
index 369568b50a6f012d1ecab1f5a5d68315d3e91d89..790d6308e5e45419f214e5aded42c673917b96ca 100644 (file)
--- a/perl-core/libnet/libnet-1.20.ebuild
+++ b/perl-core/libnet/libnet-1.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.20.ebuild,v 1.1 2007/02/05 17:15:03 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.20-r1.ebuild,v 1.1 2007/03/25 12:06:26 mcummings Exp $
 
 inherit perl-module
 
@@ -12,6 +12,7 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="sasl"
+PATCHES="${FILESDIR}/Net-CMD-UTF8.patch"
 
 DEPEND="dev-lang/perl
                sasl? ( dev-perl/Authen-SASL )"