rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

dbus notifier: call _exit when handling SIGTERM (STR #4314).

Browse Source
This commit is contained in:
Tim Waugh 2014-01-02 17:04:08 +00:00
parent ccb55ae4bc
commit fd624c76f2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-dbus-notifier.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.7.0/notifier/dbus.c.dbus-notifier cups-1.7.0/notifier/dbus.c diff -up cups-1.7.0/notifier/dbus.c.dbus-notifier cups-1.7.0/notifier/dbus.c
--- cups-1.7.0/notifier/dbus.c.dbus-notifier 2013-11-14 18:10:31.745121435 +0000 --- cups-1.7.0/notifier/dbus.c.dbus-notifier 2014-01-02 17:01:06.033615950 +0000
+++ cups-1.7.0/notifier/dbus.c 2013-11-14 18:10:53.997227718 +0000 +++ cups-1.7.0/notifier/dbus.c 2014-01-02 17:02:06.573904333 +0000
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
* D-Bus notifier for CUPS. * D-Bus notifier for CUPS.
* *
@ -45,7 +45,7 @@ diff -up cups-1.7.0/notifier/dbus.c.dbus-notifier cups-1.7.0/notifier/dbus.c
} }
return (0); return (0);
@@ -661,6 +666,26 @@ main(int argc, /* I - Number of comm @@ -661,6 +666,27 @@ main(int argc, /* I - Number of comm
/* /*
@ -66,13 +66,14 @@ diff -up cups-1.7.0/notifier/dbus.c.dbus-notifier cups-1.7.0/notifier/dbus.c
+handle_sigterm(int signum) +handle_sigterm(int signum)
+{ +{
+ release_lock(); + release_lock();
+ _exit (0);
+} +}
+ +
+/* +/*
* 'acquire_lock()' - Acquire a lock so we only have a single notifier running. * 'acquire_lock()' - Acquire a lock so we only have a single notifier running.
*/ */
@@ -669,7 +694,8 @@ acquire_lock(int *fd, /* O - Lock fi @@ -669,7 +695,8 @@ acquire_lock(int *fd, /* O - Lock fi
char *lockfile, /* I - Lock filename buffer */ char *lockfile, /* I - Lock filename buffer */
size_t locksize) /* I - Size of filename buffer */ size_t locksize) /* I - Size of filename buffer */
{ {
@ -82,7 +83,7 @@ diff -up cups-1.7.0/notifier/dbus.c.dbus-notifier cups-1.7.0/notifier/dbus.c
/* /*
@@ -687,8 +713,16 @@ acquire_lock(int *fd, /* O - Lock fi @@ -687,8 +714,16 @@ acquire_lock(int *fd, /* O - Lock fi
if ((*fd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0) if ((*fd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
return (-1); return (-1);

1
cups.spec
View File

@ -659,6 +659,7 @@ rm -f %{cups_serverbin}/backend/smb
%changelog %changelog
* Thu Jan 2 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-9 * Thu Jan 2 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-9
- dbus notifier: call _exit when handling SIGTERM (STR #4314).
- Use '-f' when using rm in %%setup section. - Use '-f' when using rm in %%setup section.
- Fixed avahi-no-threaded patch so it removes a call to - Fixed avahi-no-threaded patch so it removes a call to
avahi_threaded_poll_stop() (bug #1044602). avahi_threaded_poll_stop() (bug #1044602).