| 1 |
robbat2 11/08/03 07:49:50 |
| 2 |
|
| 3 |
Modified: g15daemon-hotplug |
| 4 |
Added: 20g15daemon g15daemon-1.9.5.3-overflow-fix.patch |
| 5 |
Log: |
| 6 |
Bug #354921, #343133: Fix overflow for amd64. Bug #301340: Fix suspend behavior. Bug #366863: Improve udev interaction. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-misc/g15daemon/files/g15daemon-hotplug |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/g15daemon-hotplug?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/g15daemon-hotplug?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/g15daemon-hotplug?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: g15daemon-hotplug |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-hotplug,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 23 |
--- g15daemon-hotplug 8 Sep 2008 11:44:03 -0000 1.1 |
| 24 |
+++ g15daemon-hotplug 3 Aug 2011 07:49:50 -0000 1.2 |
| 25 |
@@ -1,11 +1,13 @@ |
| 26 |
#!/bin/sh |
| 27 |
|
| 28 |
+export IN_HOTPLUG=1 |
| 29 |
+ |
| 30 |
case "$ACTION" in |
| 31 |
"add") |
| 32 |
- /etc/init.d/g15daemon restart |
| 33 |
+ /etc/init.d/g15daemon --quiet restart |
| 34 |
;; |
| 35 |
"remove") |
| 36 |
- /etc/init.d/g15daemon stop |
| 37 |
+ /etc/init.d/g15daemon --quiet stop |
| 38 |
;; |
| 39 |
*) |
| 40 |
exit 0 |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 app-misc/g15daemon/files/20g15daemon |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/20g15daemon?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/20g15daemon?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: 20g15daemon |
| 50 |
=================================================================== |
| 51 |
#!/bin/sh |
| 52 |
|
| 53 |
. "${PM_FUNCTIONS}" |
| 54 |
|
| 55 |
case "$1" in |
| 56 |
hibernate|suspend) |
| 57 |
/etc/init.d/g15daemon stop |
| 58 |
;; |
| 59 |
thaw|resume) |
| 60 |
/etc/init.d/g15daemon start |
| 61 |
;; |
| 62 |
*) |
| 63 |
exit $NA |
| 64 |
;; |
| 65 |
esac |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.1 app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch?rev=1.1&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch?rev=1.1&content-type=text/plain |
| 73 |
|
| 74 |
Index: g15daemon-1.9.5.3-overflow-fix.patch |
| 75 |
=================================================================== |
| 76 |
--- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2008-01-25 05:45:05.000000000 +0100 |
| 77 |
+++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2011-02-14 22:51:55.203009264 +0100 |
| 78 |
@@ -217,7 +217,7 @@ |
| 79 |
if(poll(pfd,1,100)>0){ |
| 80 |
if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) { |
| 81 |
memset(packet,0,sizeof(packet)); |
| 82 |
- msgret = recv(sock, packet, 10 , MSG_OOB); |
| 83 |
+ msgret = recv(sock, packet, sizeof(packet), MSG_OOB); |
| 84 |
if (msgret < 1) { |
| 85 |
return -1; |
| 86 |
} |
Archives