| 1 |
ssuominen 12/07/05 09:09:03 |
| 2 |
|
| 3 |
Added: system-config-printer-common-1.3.9-udev185.patch |
| 4 |
Log: |
| 5 |
Fix compability with sys-fs/udev >= 185 wrt #423423 by Maksim Melnikau |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-udev185.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: system-config-printer-common-1.3.9-udev185.patch |
| 16 |
=================================================================== |
| 17 |
From cbacff0c9f7e3e6549c9b33a42e805a935db36e6 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Jiri Popelka <jpopelka@××××××.com> |
| 19 |
Date: Tue, 5 Jun 2012 14:28:36 +0200 |
| 20 |
Subject: [PATCH] udev: replace udev_get_sys_path() with hard-coded "/sys" |
| 21 |
(trac #223) |
| 22 |
|
| 23 |
udev_get_sys_path() is no longer provided by libudev |
| 24 |
--- |
| 25 |
udev/udev-configure-printer.c | 6 ++---- |
| 26 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 27 |
|
| 28 |
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c |
| 29 |
index 1d89f9a..8d349e4 100644 |
| 30 |
--- a/udev/udev-configure-printer.c |
| 31 |
+++ b/udev/udev-configure-printer.c |
| 32 |
@@ -451,7 +451,6 @@ device_id_from_devpath (const char *devpath, |
| 33 |
struct usb_uri_map_entry *entry; |
| 34 |
struct udev *udev; |
| 35 |
struct udev_device *dev, *parent_dev = NULL; |
| 36 |
- const char *sys; |
| 37 |
const char *idVendorStr, *idProductStr, *serial; |
| 38 |
char *end; |
| 39 |
unsigned long idVendor, idProduct; |
| 40 |
@@ -500,8 +499,7 @@ device_id_from_devpath (const char *devpath, |
| 41 |
*dest = '\0'; |
| 42 |
} |
| 43 |
|
| 44 |
- sys = udev_get_sys_path (udev); |
| 45 |
- syslen = strlen (sys); |
| 46 |
+ syslen = strlen ("/sys"); |
| 47 |
devpathlen = strlen (devpath); |
| 48 |
syspath = malloc (syslen + devpathlen + 1); |
| 49 |
if (syspath == NULL) |
| 50 |
@@ -511,7 +509,7 @@ device_id_from_devpath (const char *devpath, |
| 51 |
exit (1); |
| 52 |
} |
| 53 |
|
| 54 |
- memcpy (syspath, sys, syslen); |
| 55 |
+ memcpy (syspath, "/sys", syslen); |
| 56 |
memcpy (syspath + syslen, devpath, devpathlen); |
| 57 |
syspath[syslen + devpathlen] = '\0'; |
| 58 |
|
| 59 |
-- |
| 60 |
1.7.10.2 |
Archives