Fix dos line-endings in patch. Bug 261253. Thanks to Aelia <diego.abelenda@gmail.com> for reporting.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 57 insertions, 52 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index dcf85551fd08..b9c887dd9b02 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.136 2009/03/04 14:44:59 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.137 2009/03/05 22:11:45 loki_val Exp $
+
+  05 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  files/libtorrent-0.12.4-gcc44.patch:
+  Fix dos line-endings in patch. Bug 261253. Thanks to Aelia
+  <diego.abelenda@gmail.com> for reporting.
 
   04 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/libtorrent-0.12.4-gcc44.patch, libtorrent-0.12.4.ebuild:
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 5c9239a6808b..59785adc3264 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -12,7 +12,7 @@ AUX libtorrent-0.12.2-tracker_timer_fix.patch 952 RMD160 ccf4df0575210f95e758ece
 AUX libtorrent-0.12.3-fix-epoll-crash.patch 1296 RMD160 1adf575ccd93ed6c21bc6f6ac1eb1cd841110f3a SHA1 444668456fa5aee9f79f69a7799f79e9a39ec91a SHA256 f632014d8a38762c2da0cedf558257469cddae1d0a8d7a3e66b90ce1c7c7f0a8
 AUX libtorrent-0.12.3-fix-fill_read_buffer-overflow.patch 882 RMD160 42e18cf804cdcda4876ee89d7da4cbbdd26794ab SHA1 f8c0bc09bf2f446dfd7f25118eeb673d7453f5ab SHA256 9b68bbc38cb275e79317004d6c5e25ffcde62032ca31d14d5e23707fc5c91e33
 AUX libtorrent-0.12.3-fix-poll_fd.patch 8048 RMD160 ed219de71bafad0859bb4bd2a14873618cb992d6 SHA1 74cb2c141c1c6ff0789108d4df725fdffd9f6e7d SHA256 e4b2b67ec8933d5b667d80b7f2d9e0d21f25f9e1016c4a1c5ea52f2a9b7b1a61
-AUX libtorrent-0.12.4-gcc44.patch 1670 RMD160 f88e036205739bcaeb2a6c4a7bf4783c74bbd261 SHA1 a9d3181d876851091dafc5e541323ca362e5a436 SHA256 f83c3040b1268d3a0989e7ce09bd0d33f9c0b0f56176bf7ac741000e434f4a5d
+AUX libtorrent-0.12.4-gcc44.patch 1621 RMD160 729c88bb31f6738d2a5e82c2a476daf5524ab3b6 SHA1 5b88d2a4c32fb641cdb79ce63cd11cec5e975883 SHA256 4cae96da10a380d5865b864fcc4c6d7f4a54311527ff005d4d034740a0b864c7
 DIST libtorrent-0.11.9.tar.gz 545210 RMD160 fb8de66d65791dab67c195356a98de7cf653d3c9 SHA1 d88e754d1c2ff7f8c5fb7544331264bd505870b8 SHA256 71f09218a7784b21ab53cdfcd8fa122da60352e5ca117fda7cd8d2763f908a08
 DIST libtorrent-0.12.2.tar.gz 585374 RMD160 88cdc415f98afd8b87fa6d7330906737c3e434fa SHA1 a53d2c671e9f2dd971d0622d5b3672da91c46ef9 SHA256 cf9d2cd667fd6939a3e0bd27e48d0c7f35d9ab2f7affbb3214da03fd2c1360a8
 DIST libtorrent-0.12.3.tar.gz 598178 RMD160 a770d3026c88c1f17656243e9060e3bfebdd33c2 SHA1 4f27fb0ab076ee30d14db2378340ffa3b72002e3 SHA256 6044618e37c2925615a08517e8b69ef84147ef5287a222fc451968b36a0a9be7
@@ -24,5 +24,5 @@ EBUILD libtorrent-0.12.3-r1.ebuild 1276 RMD160 a615dd60848b3fd4a25f114f858c85a35
 EBUILD libtorrent-0.12.3-r2.ebuild 1333 RMD160 8c510cd115d424406d2963094e2100a58226f7b0 SHA1 c3b3768ffe92a892ee81ad2b0117819af1a491f9 SHA256 2498f939a39ff4b5190e1e6c05399da8566270b2144da3f2e363e48a82fc4943
 EBUILD libtorrent-0.12.3.ebuild 1234 RMD160 825795dc4fa983f73a4f512ced2155884d3c89ee SHA1 3308b230458e0c6357c3818a912c52f87907d592 SHA256 ac4cc8e06459733fb8ba514495112607dcd1adf655f23d223398ece89f7c641d
 EBUILD libtorrent-0.12.4.ebuild 1224 RMD160 1914b396cb1b86161ef1a0b3b7f014b92f49b8a8 SHA1 25e52738fde7c2a09888d577cefed85fec2aa81e SHA256 a35a0f9e3ccb06567f57739322b28d03d572433f2fb4556e657c3ff24cb06262
-MISC ChangeLog 20910 RMD160 809977f43809b64a2e49aff5a3c741bd4b9f30fa SHA1 1d136a1a79526f19f7ac95ec1cf7f312b04698b6 SHA256 dd77d260ee3483a99bdf9c7b8d9a9059840d7ddf05808118404dfa001b69fa65
+MISC ChangeLog 21108 RMD160 dc8a774a33c1eaf021bb46503bb9e1a89e09f154 SHA1 c5dcbbb0169dc13ba20f0219786dba2287673881 SHA256 c72bf2b9f898b9a547a4a9ae7ff396bf8f07439a918b8fe2d991fafd1cb7edc0
 MISC metadata.xml 436 RMD160 4546e998ce9c6303f4c91d7413b1f732bbb2a8aa SHA1 fb1f2cddef7e268bf64572615fbc3c326ed673fd SHA256 936fb95c2c44078d98c0c74d0b148744036d6a18d40b8b482d7656ef0e211bff
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch b/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch
index 150e1b1f7ab4..a7cbe32ec62d 100644
--- a/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch
+++ b/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch
@@ -1,49 +1,49 @@
-diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc libtorrent-0.12.4/src/torrent/poll_epoll.cc

---- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc     2008-10-28 06:49:47.000000000 -0500

-+++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04 09:45:22.000000000 -0600

-@@ -37,6 +37,7 @@

- #include "config.h"

-

- #include <cerrno>

-+#include <cstdio>

- #include <cstring>

-

- #include <unistd.h>

-

-

-diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc libtorrent-0.12.4/src/protocol/extensions.cc

---- libtorrent-0.12.4.old/src/protocol/extensions.cc    2008-08-26 15:15:15.000000000 -0500

-+++ libtorrent-0.12.4/src/protocol/extensions.cc        2009-02-04 09:47:07.000000000 -0600

-@@ -36,6 +36,7 @@

-

- #include "config.h"

-

-+#include <cstdio>

- #include <limits>

- #include <sstream>

-

-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc libtorrent-0.12.4/src/tracker/tracker_dht.cc

---- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc    2008-08-26 15:18:34.000000000 -0500

-+++ libtorrent-0.12.4/src/tracker/tracker_dht.cc        2009-02-04 09:48:49.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <sstream>

-

- #include "dht/dht_router.h"

-

-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc  libtorrent-0.12.4/src/tracker/tracker_udp.cc

---- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc    2008-05-07 07:19:13.000000000 -0500

-+++ libtorrent-0.12.4/src/tracker/tracker_udp.cc        2009-02-04 09:49:24.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <sigc++/adaptors/bind.h>

- #include <torrent/connection_manager.h>

-

+diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc libtorrent-0.12.4/src/torrent/poll_epoll.cc
+--- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc     2008-10-28 06:49:47.000000000 -0500
++++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04 09:45:22.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstdio>
+ #include <cstring>
+
+ #include <unistd.h>
+
+
+diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc libtorrent-0.12.4/src/protocol/extensions.cc
+--- libtorrent-0.12.4.old/src/protocol/extensions.cc    2008-08-26 15:15:15.000000000 -0500
++++ libtorrent-0.12.4/src/protocol/extensions.cc        2009-02-04 09:47:07.000000000 -0600
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <limits>
+ #include <sstream>
+
+diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc libtorrent-0.12.4/src/tracker/tracker_dht.cc
+--- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc    2008-08-26 15:18:34.000000000 -0500
++++ libtorrent-0.12.4/src/tracker/tracker_dht.cc        2009-02-04 09:48:49.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <sstream>
+
+ #include "dht/dht_router.h"
+
+diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc  libtorrent-0.12.4/src/tracker/tracker_udp.cc
+--- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc    2008-05-07 07:19:13.000000000 -0500
++++ libtorrent-0.12.4/src/tracker/tracker_udp.cc        2009-02-04 09:49:24.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <sigc++/adaptors/bind.h>
+ #include <torrent/connection_manager.h>
+