Fix DOS line feeds from upstream patch.

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

3 files changed, 28 insertions, 24 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index c9d2a87accec..9a5748b96cb6 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.73 2010/05/25 20:19:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.74 2010/05/26 10:29:58 robbat2 Exp $
+
+  26 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  files/nut-2.4.3-lowspeed-buffer-size.patch:
+  Fix DOS line feeds from upstream patch.
 
 *nut-2.4.3-r1 (25 May 2010)
 
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 36e25867bef4..9aeccc5682cc 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -6,7 +6,7 @@ AUX nut-2.2.2-init.d-upsdrv 978 RMD160 249292e9338ae68b956c5858db7588447c3f41d7
 AUX nut-2.2.2-init.d-upsmon 655 RMD160 04ba8bdc74c296f7126dcc06a748fbeac630ab64 SHA1 c69bd2d85fcf9e59d49b57fd5a3d51575bd688b0 SHA256 f8063853e446dc4012254ac6f81d4c1921f3e9f5c8dabe49bec3420bad98bc06
 AUX nut-2.2.2-no-libdummy.patch 1421 RMD160 aa7156a547922c38db419a69ccf70c3f83119a4a SHA1 49038db25dc33836adbcdab821286db7ade34b94 SHA256 1a9dfcd2b9bb96e43642f70087e290a27ae631fca0f8c2c9c976f417ec4007fb
 AUX nut-2.4.1-no-libdummy.patch 791 RMD160 2a8ed4c000b3bd2a271e1e169486a0cd1cbdb809 SHA1 a48e71e06bb590cb296b7deead51b7b31420d68b SHA256 c9cf34980e79a4b9f07c338d10bc4ef4e90608ee7543cbc483898ee4f3f4f2a4
-AUX nut-2.4.3-lowspeed-buffer-size.patch 746 RMD160 1cb00bcfb116f117e5610dba4b696b813092855b SHA1 e73fe84d2f6ab9aaa87a01763d0b7e890192e60b SHA256 40d3cdaee565189364d6442cbe6072dc19996e0a09a6e757824777ad67885fad
+AUX nut-2.4.3-lowspeed-buffer-size.patch 725 RMD160 ac7a5dbe8e65dc7fe1376eb8c695a66c260be68c SHA1 d71e49841f023812bf3c5934b65dad016aaa97ef SHA256 74ed963e039413472907ebdbba07dd59ebf8e721214f32ce0fabe169597dc9b7
 AUX nut.powerfail.initd 1109 RMD160 48c26c0173ffcf4ef2c3228984757367285777e7 SHA1 4e80350d6430cb001fa210d519b5730d39172d58 SHA256 fa4a22c15427655fe09395b0f26a14964aafb2523010ed46c82f2d81d99b1be5
 AUX upsd.rc6 733 RMD160 e95d9885a27059b16f17c6f124a43f158fef3b19 SHA1 7ffcd039a7a2e58f1608a7fe29898c13b3c4a762 SHA256 f78f9ef953e4f9b17f40eb36fe404118a39bb0baba9ccde0fb4ea0274440bb93
 AUX upsdrv.rc6-r1 490 RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 SHA1 ffbcc64d07317e6a3275156bbdcbbb08497415aa SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84
@@ -23,5 +23,5 @@ EBUILD nut-2.4.1-r2.ebuild 7211 RMD160 9cbd432a8ec3369a7b7767d6d12f4df42a801062
 EBUILD nut-2.4.1.ebuild 6664 RMD160 b9ace7b62a6775df4187e4d9ae62e75ac9837811 SHA1 0d0ee71999aabf92086d4cd914f61914ea1ed9c0 SHA256 1573c28d84e120113605c06030d72ae3bf0eb1651ad53b02bdffa49fa703d7da
 EBUILD nut-2.4.3-r1.ebuild 7338 RMD160 cdf1e7bf2fd456d1cb4817294bf0e5d723751c0d SHA1 ffc205089b4206f37e907238cbd6ecb27cacc9b4 SHA256 27036a208da2a87e5c490ff38a59d1ab1edc6129b98e2ad05cb16dbb11d664ac
 EBUILD nut-2.4.3.ebuild 7274 RMD160 647de44925715507ac0187f29b03510c08a84a0a SHA1 7c3be9690415799144bfe5dd9a0eff0ade3f91ac SHA256 357d0bd23241e99e567f96825709f8b11b564de92f6c6c95ea58ac6e4513e485
-MISC ChangeLog 18072 RMD160 dcad9808798b36bb8be933d94543f573a64415f8 SHA1 e7974cdb23dfe9f7fe731cc33fd6ce3ad6ad4cf7 SHA256 4380dbaa065615b0788dcf5b568db6db1a0996926b30e13b0aacc1496c1e603e
+MISC ChangeLog 18214 RMD160 6f67c0557ec31f4527ebe92d7528377149b0f131 SHA1 3046a26ba5d14e9b3f5e8f52f763304a9f6929ac SHA256 d35d0d7d048e88c50319035b7fccaf3ea6a8683fc2c40c96cbdb0f7aed0f88a3
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
diff --git a/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch b/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
index 6ef6ca8e1031..e9a4da8fab2d 100644
--- a/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
+++ b/sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch
@@ -1,21 +1,21 @@
-http://bugs.gentoo.org/show_bug.cgi?id=318937

-http://boxster.ghz.cc/projects/nut/changeset/2407

-

-Index: /trunk/drivers/libhid.c

-===================================================================

---- /trunk/drivers/libhid.c (revision 2336)

-+++ /trunk/drivers/libhid.c (revision 2407)

-@@ -142,5 +142,5 @@

- 	int	id = pData->ReportID;

- 	int	r;

--	unsigned char	buf[SMALLBUF];

-+	unsigned char	buf[8];	/* Maximum size for low-speed USB devices */

- 

- 	if (rbuf->ts[id] + age > time(NULL)) {

-@@ -470,5 +470,5 @@

- int HIDGetEvents(hid_dev_handle_t udev, HIDData_t **event, int eventsize)

- {

--	unsigned char	buf[SMALLBUF];

-+	unsigned char	buf[8];	/* Maximum size for low-speed USB devices */

- 	int		itemCount = 0;

- 	int		buflen, r, i;

+http://bugs.gentoo.org/show_bug.cgi?id=318937
+http://boxster.ghz.cc/projects/nut/changeset/2407
+
+Index: /trunk/drivers/libhid.c
+===================================================================
+--- /trunk/drivers/libhid.c (revision 2336)
++++ /trunk/drivers/libhid.c (revision 2407)
+@@ -142,5 +142,5 @@
+ 	int	id = pData->ReportID;
+ 	int	r;
+-	unsigned char	buf[SMALLBUF];
++	unsigned char	buf[8];	/* Maximum size for low-speed USB devices */
+ 
+ 	if (rbuf->ts[id] + age > time(NULL)) {
+@@ -470,5 +470,5 @@
+ int HIDGetEvents(hid_dev_handle_t udev, HIDData_t **event, int eventsize)
+ {
+-	unsigned char	buf[SMALLBUF];
++	unsigned char	buf[8];	/* Maximum size for low-speed USB devices */
+ 	int		itemCount = 0;
+ 	int		buflen, r, i;