diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-05-26 10:29:58 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-05-26 10:29:58 +0000 |
| commit | 6cd4103bc8c266b7a7e1e5a368d535b69d5aba3b (patch) | |
| tree | 47b12a29fea4efb47fa1fff07f9de030ef712fe1 /sys-power/nut | |
| parent | add deprecation notice (#301991, #301228) (diff) | |
| download | gentoo-2-6cd4103bc8c266b7a7e1e5a368d535b69d5aba3b.tar.gz gentoo-2-6cd4103bc8c266b7a7e1e5a368d535b69d5aba3b.tar.bz2 gentoo-2-6cd4103bc8c266b7a7e1e5a368d535b69d5aba3b.zip | |
Fix DOS line feeds from upstream patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/nut')
| -rw-r--r-- | sys-power/nut/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/nut/files/nut-2.4.3-lowspeed-buffer-size.patch | 42 |
2 files changed, 26 insertions, 22 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/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; |