]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups-avahi-no-threaded.patch
projects / packages / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- up to 2.2.5
[packages/cups.git] / cups-avahi-no-threaded.patch
diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch
index f81c71fe2898076209bf51ac7e46934c3f992477..942bbf5ec7f54971158792e9d85cf9c755133228 100644 (file)
--- a/cups-avahi-no-threaded.patch
+++ b/cups-avahi-no-threaded.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2b2/scheduler/avahi.c.avahi-no-threaded cups-2.2b2/scheduler/avahi.c
---- cups-2.2b2/scheduler/avahi.c.avahi-no-threaded     2016-06-27 17:55:19.568728958 +0200
-+++ cups-2.2b2/scheduler/avahi.c       2016-06-27 17:55:19.568728958 +0200
+diff -up cups-2.2.5/scheduler/avahi.c.avahi-no-threaded cups-2.2.5/scheduler/avahi.c
+--- cups-2.2.5/scheduler/avahi.c.avahi-no-threaded     2017-10-17 19:03:00.760881016 +0200
++++ cups-2.2.5/scheduler/avahi.c       2017-10-17 19:03:00.760881016 +0200
 @@ -0,0 +1,441 @@
 +/*
 + * "$Id$"
@@ -443,9 +443,9 @@ diff -up cups-2.2b2/scheduler/avahi.c.avahi-no-threaded cups-2.2b2/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2b2/scheduler/avahi.h.avahi-no-threaded cups-2.2b2/scheduler/avahi.h
---- cups-2.2b2/scheduler/avahi.h.avahi-no-threaded     2016-06-27 17:55:19.568728958 +0200
-+++ cups-2.2b2/scheduler/avahi.h       2016-06-27 17:55:19.568728958 +0200
+diff -up cups-2.2.5/scheduler/avahi.h.avahi-no-threaded cups-2.2.5/scheduler/avahi.h
+--- cups-2.2.5/scheduler/avahi.h.avahi-no-threaded     2017-10-17 19:03:00.760881016 +0200
++++ cups-2.2.5/scheduler/avahi.h       2017-10-17 19:03:00.760881016 +0200
 @@ -0,0 +1,69 @@
 +/*
 + * "$Id$"
@@ -516,9 +516,9 @@ diff -up cups-2.2b2/scheduler/avahi.h.avahi-no-threaded cups-2.2b2/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded cups-2.2b2/scheduler/cupsd.h
---- cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded     2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/cupsd.h       2016-06-27 17:57:45.476572827 +0200
+diff -up cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded cups-2.2.5/scheduler/cupsd.h
+--- cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded     2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/cupsd.h       2017-10-17 19:03:00.760881016 +0200
 @@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int);
  #include "colorman.h"
  #include "conf.h"
@@ -570,9 +570,9 @@ diff -up cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded cups-2.2b2/scheduler/cup
 +extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
 +#endif /* HAVE_AVAHI */
 \ No newline at end of file
-diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/dirsvc.c
---- cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/dirsvc.c      2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.c
+--- cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/dirsvc.c      2017-10-17 19:05:35.938592292 +0200
 @@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
      cupsdUpdateDNSSDName();
  
@@ -604,7 +604,7 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
      }
  #  endif /* HAVE_DNSSD */
    }
-@@ -606,7 +604,7 @@ dnssdClientCallback(
+@@ -635,7 +633,7 @@ dnssdClientCallback(
          * Renew Avahi client...
          */
  
@@ -613,21 +613,21 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
  
          if (!DNSSDClient)
          {
-@@ -670,13 +668,7 @@ dnssdDeregisterInstance(
-   DNSServiceRefDeallocate(*srv);
- 
+@@ -701,13 +699,7 @@ dnssdDeregisterInstance(
  #  else /* HAVE_AVAHI */
--  if (!from_callback)
--    avahi_threaded_poll_lock(DNSSDMaster);
+   if (*srv)
+   {
+-    if (!from_callback)
+-      avahi_threaded_poll_lock(DNSSDMaster);
 -
-   avahi_entry_group_free(*srv);
+     avahi_entry_group_free(*srv);
 -
--  if (!from_callback)
--    avahi_threaded_poll_unlock(DNSSDMaster);
+-    if (!from_callback)
+-      avahi_threaded_poll_unlock(DNSSDMaster);
+   }
  #  endif /* HAVE_DNSSD */
  
-   *srv = NULL;
-@@ -997,16 +989,10 @@ dnssdRegisterInstance(
+@@ -1029,16 +1021,10 @@ dnssdRegisterInstance(
    (void)commit;
  
  #  else /* HAVE_AVAHI */
@@ -644,7 +644,7 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
      cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
                      name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
      return (0);
-@@ -1121,9 +1107,6 @@ dnssdRegisterInstance(
+@@ -1153,9 +1139,6 @@ dnssdRegisterInstance(
        cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
                        name);
    }
@@ -654,7 +654,7 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
  #  endif /* HAVE_DNSSD */
  
    if (error)
-@@ -1294,9 +1277,6 @@ dnssdStop(void)
+@@ -1326,9 +1309,6 @@ dnssdStop(void)
    DNSSDMaster = NULL;
  
  #  else /* HAVE_AVAHI */
@@ -664,7 +664,7 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
    if (DNSSDClient)
    {
      avahi_client_free(DNSSDClient);
-@@ -1305,7 +1285,7 @@ dnssdStop(void)
+@@ -1337,7 +1317,7 @@ dnssdStop(void)
  
    if (DNSSDMaster)
    {
@@ -673,9 +673,9 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
      DNSSDMaster = NULL;
    }
  #  endif /* HAVE_DNSSD */
-diff -up cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded cups-2.2b2/scheduler/dirsvc.h
---- cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/dirsvc.h      2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.h
+--- cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/dirsvc.h      2017-10-17 19:03:00.761881007 +0200
 @@ -49,7 +49,7 @@ VAR cups_array_t     *DNSSDPrinters  VALUE(NU
  VAR DNSServiceRef     DNSSDMaster     VALUE(NULL);
                                        /* Master DNS-SD service reference */
@@ -685,9 +685,9 @@ diff -up cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded cups-2.2b2/scheduler/di
                                        /* Master polling interface for Avahi */
  VAR AvahiClient               *DNSSDClient    VALUE(NULL);
                                        /* Client information */
-diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main.c
---- cups-2.2b2/scheduler/main.c.avahi-no-threaded      2016-06-27 17:55:19.555729061 +0200
-+++ cups-2.2b2/scheduler/main.c        2016-06-27 17:58:44.350106330 +0200
+diff -up cups-2.2.5/scheduler/main.c.avahi-no-threaded cups-2.2.5/scheduler/main.c
+--- cups-2.2.5/scheduler/main.c.avahi-no-threaded      2017-10-17 19:03:00.753881074 +0200
++++ cups-2.2.5/scheduler/main.c        2017-10-17 19:03:00.761881007 +0200
 @@ -131,7 +131,10 @@ main(int  argc,                           /* I - Number of comm
    int                 service_idle_exit;
                                        /* Idle exit on select timeout? */
@@ -700,7 +700,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
  
  #ifdef HAVE_GETEUID
   /*
-@@ -609,6 +612,14 @@ main(int  argc,                           /* I - Number of comm
+@@ -610,6 +613,14 @@ main(int  argc,                           /* I - Number of comm
  
    httpInitialize();
  
@@ -715,7 +715,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
    cupsdStartServer();
  
   /*
-@@ -930,6 +941,16 @@ main(int  argc,                           /* I - Number of comm
+@@ -928,6 +939,16 @@ main(int  argc,                           /* I - Number of comm
      }
  #endif /* __APPLE__ */
  
@@ -732,9 +732,9 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
  #ifndef __APPLE__
     /*
      * Update the network interfaces once a minute...
-@@ -1620,6 +1641,10 @@ select_timeout(int fds)                 /* I - Number
-   cupsd_client_t      *con;           /* Client information */
+@@ -1632,6 +1653,10 @@ select_timeout(int fds)                 /* I - Number
    cupsd_job_t         *job;           /* Job information */
+   cupsd_printer_t       *printer;       /* Printer information */
    const char          *why;           /* Debugging aid */
 +#ifdef HAVE_AVAHI
 +  cupsd_timeout_t     *tmo;           /* Timed callback */
@@ -743,7 +743,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
-@@ -1665,6 +1690,19 @@ select_timeout(int fds)                 /* I - Number
+@@ -1677,6 +1702,19 @@ select_timeout(int fds)                 /* I - Number
    }
  #endif /* __APPLE__ */
  
@@ -763,9 +763,9 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
   /*
    * Check whether we are accepting new connections...
    */
-diff -up cups-2.2b2/scheduler/Makefile.avahi-no-threaded cups-2.2b2/scheduler/Makefile
---- cups-2.2b2/scheduler/Makefile.avahi-no-threaded    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/Makefile      2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.5/scheduler/Makefile.avahi-no-threaded cups-2.2.5/scheduler/Makefile
+--- cups-2.2.5/scheduler/Makefile.avahi-no-threaded    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/Makefile      2017-10-17 19:03:00.762880999 +0200
 @@ -15,6 +15,7 @@ include ../Makedefs
  
  CUPSDOBJS =   \
@@ -784,9 +784,9 @@ diff -up cups-2.2b2/scheduler/Makefile.avahi-no-threaded cups-2.2b2/scheduler/Ma
  LIBOBJS =     \
                filter.o \
                mime.o \
-diff -up cups-2.2b2/scheduler/timeout.c.avahi-no-threaded cups-2.2b2/scheduler/timeout.c
---- cups-2.2b2/scheduler/timeout.c.avahi-no-threaded   2016-06-27 17:55:19.569728950 +0200
-+++ cups-2.2b2/scheduler/timeout.c     2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.5/scheduler/timeout.c.avahi-no-threaded cups-2.2.5/scheduler/timeout.c
+--- cups-2.2.5/scheduler/timeout.c.avahi-no-threaded   2017-10-17 19:03:00.762880999 +0200
++++ cups-2.2.5/scheduler/timeout.c     2017-10-17 19:03:00.762880999 +0200
 @@ -0,0 +1,235 @@
 +/*
 + * "$Id$"
USB backend for CUPS
This page took 0.041389 seconds and 4 git commands to generate.