summaryrefslogtreecommitdiffstats
path: root/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2014-10-27 20:28:27 (GMT)
committerBritney Fransen <brfransen@gmail.com>2014-10-27 20:28:27 (GMT)
commitf7b823f55a80b1498c30e9f3a47692a2329c4f09 (patch)
tree6de557714e6336282fbc0ab16c6578386dfc6654 /abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
parent4c2a2e3504f472628285a989c7c9a76be6855f54 (diff)
parent01c1a60f3b7f93b3ed7404196c2cf798c4d8c674 (diff)
downloadlinhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.zip
linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.gz
linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.bz2
Merge branch 'testing'
Diffstat (limited to 'abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch')
-rw-r--r--abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
new file mode 100644
index 0000000..ee36936
--- /dev/null
+++ b/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
@@ -0,0 +1,19 @@
+Description: Fixed crash which sometimes happens on shutdown of the CUPS
+ daemon, caused by a wrong shutdown sequence for shutting down the Avahi
+ threaded poll.
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Upstream: http://cups.org/str.php?L4180
+Bug-Upstream: http://cups.org/str.php?L4213
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045
+Last-Updated: 2012-10-16
+
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -1333,6 +1333,7 @@
+ DNSSDMaster = NULL;
+
+ # else /* HAVE_AVAHI */
++ avahi_threaded_poll_stop(DNSSDMaster);
+ avahi_client_free(DNSSDClient);
+ DNSSDClient = NULL;
+