- up to 2.2.5

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$"

diff --git a/cups-eggcups.patch b/cups-eggcups.patch
index 908f5185eb3db70f1feec7c20ceb64ccb9628888..b1eb218463fda423c83f18b9ee3a06de923464ce 100644 (file)
--- a/cups-eggcups.patch
+++ b/cups-eggcups.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
---- cups-2.1b1/backend/ipp.c.eggcups   2015-05-28 03:19:14.000000000 +0200
-+++ cups-2.1b1/backend/ipp.c   2015-06-29 12:56:54.872807227 +0200
+diff -up cups-2.2.5/backend/ipp.c.eggcups cups-2.2.5/backend/ipp.c
+--- cups-2.2.5/backend/ipp.c.eggcups   2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/backend/ipp.c   2017-10-17 18:56:42.409024451 +0200
 @@ -149,6 +149,70 @@ static char               tmpfilename[1024] = "";
  static char           mandatory_attrs[1024] = "";
                                        /* cupsMandatory value */
@@ -72,7 +72,7 @@ diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
  
  /*
   * Local functions...
-@@ -1700,6 +1764,15 @@ main(int  argc,                         /* I - Number of comm
+@@ -1743,6 +1807,15 @@ main(int  argc,                         /* I - Number of comm
        fprintf(stderr, "DEBUG: Print job accepted - job ID %d.\n", job_id);
      }
  
@@ -88,22 +88,22 @@ diff -up cups-2.1b1/backend/ipp.c.eggcups cups-2.1b1/backend/ipp.c
      ippDelete(response);
  
      if (job_canceled)
-diff -up cups-2.1b1/backend/Makefile.eggcups cups-2.1b1/backend/Makefile
---- cups-2.1b1/backend/Makefile.eggcups        2014-05-09 00:42:44.000000000 +0200
-+++ cups-2.1b1/backend/Makefile        2015-06-29 12:54:55.753026774 +0200
-@@ -264,7 +264,7 @@ dnssd:     dnssd.o ../cups/$(LIBCUPS) libbac
+diff -up cups-2.2.5/backend/Makefile.eggcups cups-2.2.5/backend/Makefile
+--- cups-2.2.5/backend/Makefile.eggcups        2017-10-17 18:56:42.409024451 +0200
++++ cups-2.2.5/backend/Makefile        2017-10-17 18:59:11.696781116 +0200
+@@ -262,7 +262,7 @@ dnssd:     dnssd.o ../cups/$(LIBCUPS) libbac
  
  ipp:  ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
--      $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
-+      $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS)
+-      $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
++      $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS)
        $(RM) http
        $(LN) ipp http
  
-diff -up cups-2.1b1/scheduler/subscriptions.c.eggcups cups-2.1b1/scheduler/subscriptions.c
---- cups-2.1b1/scheduler/subscriptions.c.eggcups       2014-02-06 19:33:34.000000000 +0100
-+++ cups-2.1b1/scheduler/subscriptions.c       2015-06-29 12:54:55.753026774 +0200
-@@ -1293,13 +1293,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,
+diff -up cups-2.2.5/scheduler/subscriptions.c.eggcups cups-2.2.5/scheduler/subscriptions.c
+--- cups-2.2.5/scheduler/subscriptions.c.eggcups       2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/subscriptions.c       2017-10-17 18:56:42.409024451 +0200
+@@ -1291,13 +1291,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,
      what = "PrinterAdded";
    else if (event & CUPSD_EVENT_PRINTER_DELETED)
      what = "PrinterRemoved";
@@ -119,7 +119,7 @@ diff -up cups-2.1b1/scheduler/subscriptions.c.eggcups cups-2.1b1/scheduler/subsc
    else
      return;
  
-@@ -1335,7 +1335,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,
+@@ -1333,7 +1333,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,
    dbus_message_append_iter_init(message, &iter);
    if (dest)
      dbus_message_iter_append_string(&iter, dest->name);

diff --git a/cups-lspp.patch b/cups-lspp.patch
index 93a3a49f8bccf35bc7bd628f96284c56f767cedd..13cfb16e17ac807439328aa1ea6cb2794eb4982c 100644 (file)
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.2b2/config.h.in.lspp cups-2.2b2/config.h.in
---- cups-2.2b2/config.h.in.lspp        2016-06-27 17:39:48.075973879 +0200
-+++ cups-2.2b2/config.h.in     2016-06-27 17:47:31.376356684 +0200
-@@ -737,4 +737,11 @@ static __inline int _cups_abs(int i) { r
+diff -up cups-2.2.5/config.h.in.lspp cups-2.2.5/config.h.in
+--- cups-2.2.5/config.h.in.lspp        2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/config.h.in     2017-10-17 19:06:19.640228964 +0200
+@@ -730,4 +730,11 @@ static __inline int _cups_abs(int i) { r
  #  endif /* __GNUC__ || __STDC_VERSION__ */
  #endif /* !HAVE_ABS && !abs */
  
@@ -13,9 +13,9 @@ diff -up cups-2.2b2/config.h.in.lspp cups-2.2b2/config.h.in
 +
 +
  #endif /* !_CUPS_CONFIG_H_ */
-diff -up cups-2.2b2/config-scripts/cups-lspp.m4.lspp cups-2.2b2/config-scripts/cups-lspp.m4
---- cups-2.2b2/config-scripts/cups-lspp.m4.lspp        2016-06-27 17:39:48.076973871 +0200
-+++ cups-2.2b2/config-scripts/cups-lspp.m4     2016-06-27 17:39:48.076973871 +0200
+diff -up cups-2.2.5/config-scripts/cups-lspp.m4.lspp cups-2.2.5/config-scripts/cups-lspp.m4
+--- cups-2.2.5/config-scripts/cups-lspp.m4.lspp        2017-10-17 19:06:19.640228964 +0200
++++ cups-2.2.5/config-scripts/cups-lspp.m4     2017-10-17 19:06:19.640228964 +0200
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -53,9 +53,9 @@ diff -up cups-2.2b2/config-scripts/cups-lspp.m4.lspp cups-2.2b2/config-scripts/c
 +            ;;
 +    esac
 +fi
-diff -up cups-2.2b2/configure.ac.lspp cups-2.2b2/configure.ac
---- cups-2.2b2/configure.ac.lspp       2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/configure.ac    2016-06-27 17:39:48.076973871 +0200
+diff -up cups-2.2.5/configure.ac.lspp cups-2.2.5/configure.ac
+--- cups-2.2.5/configure.ac.lspp       2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/configure.ac    2017-10-17 19:06:19.640228964 +0200
 @@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4)
  sinclude(config-scripts/cups-defaults.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -65,9 +65,9 @@ diff -up cups-2.2b2/configure.ac.lspp cups-2.2b2/configure.ac
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-2.2b2/filter/common.c.lspp cups-2.2b2/filter/common.c
---- cups-2.2b2/filter/common.c.lspp    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/filter/common.c 2016-06-27 17:39:48.076973871 +0200
+diff -up cups-2.2.5/filter/common.c.lspp cups-2.2.5/filter/common.c
+--- cups-2.2.5/filter/common.c.lspp    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/filter/common.c 2017-10-17 19:06:19.640228964 +0200
 @@ -17,6 +17,12 @@
   * Include necessary headers...
   */
@@ -236,9 +236,9 @@ diff -up cups-2.2b2/filter/common.c.lspp cups-2.2b2/filter/common.c
  
  
  /*
-diff -up cups-2.2b2/filter/pstops.c.lspp cups-2.2b2/filter/pstops.c
---- cups-2.2b2/filter/pstops.c.lspp    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/filter/pstops.c 2016-06-27 17:39:48.077973863 +0200
+diff -up cups-2.2.5/filter/pstops.c.lspp cups-2.2.5/filter/pstops.c
+--- cups-2.2.5/filter/pstops.c.lspp    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/filter/pstops.c 2017-10-17 19:06:19.641228955 +0200
 @@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc,   /*
  {
    const char  *classification;        /* CLASSIFICATION environment variable */
@@ -394,21 +394,21 @@ diff -up cups-2.2b2/filter/pstops.c.lspp cups-2.2b2/filter/pstops.c
  
  
  /*
-diff -up cups-2.2b2/Makedefs.in.lspp cups-2.2b2/Makedefs.in
---- cups-2.2b2/Makedefs.in.lspp        2016-06-27 17:39:48.045974117 +0200
-+++ cups-2.2b2/Makedefs.in     2016-06-27 17:39:48.077973863 +0200
-@@ -143,7 +143,7 @@ LDFLAGS            =       -L../cgi-bin -L../cups -L../f
+diff -up cups-2.2.5/Makedefs.in.lspp cups-2.2.5/Makedefs.in
+--- cups-2.2.5/Makedefs.in.lspp        2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/Makedefs.in     2017-10-17 19:06:19.641228955 +0200
+@@ -161,7 +161,7 @@ LDFLAGS            =       -L../cgi-bin -L../cups -L../f
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
- LINKCUPS      =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+ LINKCUPS      =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
  LINKCUPSIMAGE =       @LINKCUPSIMAGE@
 -LIBS          =       $(LINKCUPS) $(COMMONLIBS)
 +LIBS          =       $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
  ONDEMANDFLAGS =       @ONDEMANDFLAGS@
  ONDEMANDLIBS  =       @ONDEMANDLIBS@
  OPTIM         =       @OPTIM@
-diff -up cups-2.2b2/scheduler/client.c.lspp cups-2.2b2/scheduler/client.c
---- cups-2.2b2/scheduler/client.c.lspp 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/client.c      2016-06-27 17:39:48.077973863 +0200
+diff -up cups-2.2.5/scheduler/client.c.lspp cups-2.2.5/scheduler/client.c
+--- cups-2.2.5/scheduler/client.c.lspp 2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/client.c      2017-10-17 19:06:19.689228556 +0200
 @@ -22,12 +22,20 @@
  #define _HTTP_NO_PRIVATE
  #include "cupsd.h"
@@ -430,7 +430,7 @@ diff -up cups-2.2b2/scheduler/client.c.lspp cups-2.2b2/scheduler/client.c
  
  
  /*
-@@ -266,6 +274,59 @@ cupsdAcceptClient(cupsd_listener_t *lis)
+@@ -268,6 +276,59 @@ cupsdAcceptClient(cupsd_listener_t *lis)
    }
  #endif /* HAVE_TCPD_H */
  
@@ -490,7 +490,7 @@ diff -up cups-2.2b2/scheduler/client.c.lspp cups-2.2b2/scheduler/client.c
  #ifdef AF_LOCAL
    if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL)
    {
-@@ -560,6 +621,13 @@ cupsdReadClient(cupsd_client_t *con)      /*
+@@ -562,6 +623,13 @@ cupsdReadClient(cupsd_client_t *con)      /*
    mime_type_t         *type;          /* MIME type of file */
    cupsd_printer_t     *p;             /* Printer */
    static unsigned     request_id = 0; /* Request ID for temp files */
@@ -504,7 +504,7 @@ diff -up cups-2.2b2/scheduler/client.c.lspp cups-2.2b2/scheduler/client.c
  
  
    status = HTTP_STATUS_CONTINUE;
-@@ -1924,6 +1992,73 @@ cupsdReadClient(cupsd_client_t *con)    /*
+@@ -1926,6 +1994,73 @@ cupsdReadClient(cupsd_client_t *con)    /*
              fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
          }
  
@@ -628,9 +628,9 @@ diff -up cups-2.2b2/scheduler/client.c.lspp cups-2.2b2/scheduler/client.c
  
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.2b2/scheduler/client.h.lspp cups-2.2b2/scheduler/client.h
---- cups-2.2b2/scheduler/client.h.lspp 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/client.h      2016-06-27 17:39:48.077973863 +0200
+diff -up cups-2.2.5/scheduler/client.h.lspp cups-2.2.5/scheduler/client.h
+--- cups-2.2.5/scheduler/client.h.lspp 2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/client.h      2017-10-17 19:06:19.690228548 +0200
 @@ -16,6 +16,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -666,9 +666,9 @@ diff -up cups-2.2b2/scheduler/client.h.lspp cups-2.2b2/scheduler/client.h
  
  #ifdef HAVE_SSL
  extern int    cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
---- cups-2.2b2/scheduler/conf.c.lspp   2016-06-27 17:39:48.072973903 +0200
-+++ cups-2.2b2/scheduler/conf.c        2016-06-27 17:39:48.078973855 +0200
+diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
+--- cups-2.2.5/scheduler/conf.c.lspp   2017-10-17 19:06:19.637228989 +0200
++++ cups-2.2.5/scheduler/conf.c        2017-10-17 19:06:19.691228540 +0200
 @@ -40,6 +40,9 @@
  #  define INADDR_NONE 0xffffffff
  #endif /* !INADDR_NONE */
@@ -690,7 +690,7 @@ diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
    { "WebInterface",           &WebInterface,          CUPSD_VARTYPE_BOOLEAN }
  };
  static const cupsd_var_t      cupsfiles_vars[] =
-@@ -577,6 +584,9 @@ cupsdReadConfiguration(void)
+@@ -544,6 +551,9 @@ cupsdReadConfiguration(void)
    const char  *tmpdir;                /* TMPDIR environment variable */
    struct stat tmpinfo;                /* Temporary directory info */
    cupsd_policy_t *p;                  /* Policy */
@@ -700,7 +700,7 @@ diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
  
  
   /*
-@@ -931,6 +941,25 @@ cupsdReadConfiguration(void)
+@@ -866,6 +876,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -726,7 +726,7 @@ diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
    cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
                    RemotePort ? "enabled" : "disabled");
  
-@@ -1350,7 +1379,19 @@ cupsdReadConfiguration(void)
+@@ -1286,7 +1315,19 @@ cupsdReadConfiguration(void)
      cupsdClearString(&Classification);
  
    if (Classification)
@@ -746,7 +746,7 @@ diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
  
   /*
    * Check the MaxClients setting, and then allocate memory for it...
-@@ -3827,6 +3868,18 @@ read_location(cups_file_t *fp,          /* I - C
+@@ -3770,6 +3811,18 @@ read_location(cups_file_t *fp,          /* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -765,10 +765,10 @@ diff -up cups-2.2b2/scheduler/conf.c.lspp cups-2.2b2/scheduler/conf.c
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.2b2/scheduler/conf.h.lspp cups-2.2b2/scheduler/conf.h
---- cups-2.2b2/scheduler/conf.h.lspp   2016-06-27 17:39:48.078973855 +0200
-+++ cups-2.2b2/scheduler/conf.h        2016-06-27 17:44:46.370632333 +0200
-@@ -248,6 +248,13 @@ VAR char          *ServerKeychain         VALUE(NULL);
+diff -up cups-2.2.5/scheduler/conf.h.lspp cups-2.2.5/scheduler/conf.h
+--- cups-2.2.5/scheduler/conf.h.lspp   2017-10-17 19:06:19.585229421 +0200
++++ cups-2.2.5/scheduler/conf.h        2017-10-17 19:06:19.691228540 +0200
+@@ -250,6 +250,13 @@ VAR char          *ServerKeychain         VALUE(NULL);
                                        /* Keychain holding cert + key */
  #endif /* HAVE_SSL */
  
@@ -782,7 +782,7 @@ diff -up cups-2.2b2/scheduler/conf.h.lspp cups-2.2b2/scheduler/conf.h
  #ifdef HAVE_ONDEMAND
  VAR int                       IdleExitTimeout         VALUE(60);
                                        /* Time after which an idle cupsd will exit */
-@@ -266,6 +273,9 @@ VAR int                    HaveServerCreds         VALUE(0);
+@@ -268,6 +275,9 @@ VAR int                    HaveServerCreds         VALUE(0);
  VAR gss_cred_id_t     ServerCreds;    /* Server's GSS credentials */
  #endif /* HAVE_GSSAPI */
  
@@ -792,9 +792,9 @@ diff -up cups-2.2b2/scheduler/conf.h.lspp cups-2.2b2/scheduler/conf.h
  
  /*
   * Prototypes...
-diff -up cups-2.2b2/scheduler/cupsd.h.lspp cups-2.2b2/scheduler/cupsd.h
---- cups-2.2b2/scheduler/cupsd.h.lspp  2016-06-27 17:39:48.064973966 +0200
-+++ cups-2.2b2/scheduler/cupsd.h       2016-06-27 17:39:48.078973855 +0200
+diff -up cups-2.2.5/scheduler/cupsd.h.lspp cups-2.2.5/scheduler/cupsd.h
+--- cups-2.2.5/scheduler/cupsd.h.lspp  2017-10-17 19:06:19.626229080 +0200
++++ cups-2.2.5/scheduler/cupsd.h       2017-10-17 19:06:19.691228540 +0200
 @@ -11,6 +11,8 @@
   * file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -826,11 +826,11 @@ diff -up cups-2.2b2/scheduler/cupsd.h.lspp cups-2.2b2/scheduler/cupsd.h
  /*
   * Some OS's don't have hstrerror(), most notably Solaris...
   */
-diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
---- cups-2.2b2/scheduler/ipp.c.lspp    2016-06-27 17:39:48.028974252 +0200
-+++ cups-2.2b2/scheduler/ipp.c 2016-06-27 17:39:48.080973839 +0200
+diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
+--- cups-2.2.5/scheduler/ipp.c.lspp    2017-10-17 19:06:19.599229305 +0200
++++ cups-2.2.5/scheduler/ipp.c 2017-10-17 19:06:19.695228506 +0200
 @@ -14,6 +14,9 @@
-  * file is missing or damaged, see the license at "http://www.cups.org/".
+  * missing or damaged, see the license at "http://www.cups.org/".
   */
  
 +/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
@@ -864,7 +864,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  static int    check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
  static void   close_job(cupsd_client_t *con, ipp_attribute_t *uri);
  static void   copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
-@@ -1248,6 +1262,21 @@ add_job(cupsd_client_t  *con,           /* I - Cl
+@@ -1286,6 +1300,21 @@ add_job(cupsd_client_t  *con,           /* I - Cl
      "time-at-creation",
      "time-at-processing"
    };
@@ -886,7 +886,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1559,6 +1588,106 @@ add_job(cupsd_client_t  *con,          /* I - Cl
+@@ -1597,6 +1626,106 @@ add_job(cupsd_client_t  *con,          /* I - Cl
      return (NULL);
    }
  
@@ -993,7 +993,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1567,6 +1696,32 @@ add_job(cupsd_client_t  *con,           /* I - Cl
+@@ -1605,6 +1734,32 @@ add_job(cupsd_client_t  *con,           /* I - Cl
      return (NULL);
    }
  
@@ -1026,7 +1026,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
    job->dirty   = 1;
-@@ -1756,6 +1911,29 @@ add_job(cupsd_client_t  *con,           /* I - Cl
+@@ -1794,6 +1949,29 @@ add_job(cupsd_client_t  *con,           /* I - Cl
        ippSetString(job->attrs, &attr, 0, printer->job_sheets[0]);
        ippSetString(job->attrs, &attr, 1, printer->job_sheets[1]);
      }
@@ -1056,7 +1056,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  
      job->job_sheets = attr;
  
-@@ -1786,6 +1964,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
+@@ -1824,6 +2002,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
                                             "job-sheets=\"%s,none\", "
                                             "job-originating-user-name=\"%s\"",
                      Classification, job->username);
@@ -1066,7 +1066,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
        }
        else if (attr->num_values == 2 &&
                 strcmp(attr->values[0].string.text,
-@@ -1804,6 +1985,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
+@@ -1842,6 +2023,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
                                             "job-originating-user-name=\"%s\"",
                      attr->values[0].string.text,
                      attr->values[1].string.text, job->username);
@@ -1076,7 +1076,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
                 strcmp(attr->values[0].string.text, "none") &&
-@@ -1824,6 +2008,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
+@@ -1862,6 +2046,9 @@ add_job(cupsd_client_t  *con,            /* I - Cl
                        "job-originating-user-name=\"%s\"",
                        attr->values[0].string.text,
                        attr->values[1].string.text, job->username);
@@ -1086,7 +1086,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1864,8 +2051,52 @@ add_job(cupsd_client_t  *con,           /* I - Cl
+@@ -1902,8 +2089,52 @@ add_job(cupsd_client_t  *con,           /* I - Cl
                      "job-sheets=\"%s\", "
                      "job-originating-user-name=\"%s\"",
                      Classification, job->username);
@@ -1139,7 +1139,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  
     /*
      * See if we need to add the starting sheet...
-@@ -3619,6 +3850,128 @@ check_rss_recipient(
+@@ -3686,6 +3917,128 @@ check_rss_recipient(
  }
  
  
@@ -1268,7 +1268,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4075,6 +4428,15 @@ copy_banner(cupsd_client_t *con,        /* I -
+@@ -4142,6 +4495,15 @@ copy_banner(cupsd_client_t *con,        /* I -
    char                attrname[255],          /* Name of attribute */
                *s;                     /* Pointer into name */
    ipp_attribute_t *attr;              /* Attribute */
@@ -1284,7 +1284,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4110,6 +4472,85 @@ copy_banner(cupsd_client_t *con,        /* I -
+@@ -4177,6 +4539,85 @@ copy_banner(cupsd_client_t *con,        /* I -
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -1370,7 +1370,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4204,6 +4645,24 @@ copy_banner(cupsd_client_t *con,        /* I -
+@@ -4271,6 +4712,24 @@ copy_banner(cupsd_client_t *con,        /* I -
        else
          s = attrname;
  
@@ -1395,7 +1395,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -6389,6 +6848,22 @@ get_job_attrs(cupsd_client_t  *con,     /* I
+@@ -6459,6 +6918,22 @@ get_job_attrs(cupsd_client_t  *con,     /* I
  
    exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
  
@@ -1418,7 +1418,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
   /*
    * Copy attributes...
    */
-@@ -6786,6 +7261,11 @@ get_jobs(cupsd_client_t  *con,          /* I - C
+@@ -6856,6 +7331,11 @@ get_jobs(cupsd_client_t  *con,          /* I - C
        if (username[0] && _cups_strcasecmp(username, job->username))
        continue;
  
@@ -1430,7 +1430,7 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
        if (count > 0)
        ippAddSeparator(con->response);
  
-@@ -11415,6 +11895,11 @@ validate_user(cupsd_job_t    *job,    /* I
+@@ -11487,6 +11967,11 @@ validate_user(cupsd_job_t    *job,    /* I
  
    strlcpy(username, get_username(con), userlen);
  
@@ -1442,11 +1442,11 @@ diff -up cups-2.2b2/scheduler/ipp.c.lspp cups-2.2b2/scheduler/ipp.c
   /*
    * Check the username against the owner...
    */
-diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
---- cups-2.2b2/scheduler/job.c.lspp    2016-06-27 17:39:48.041974149 +0200
-+++ cups-2.2b2/scheduler/job.c 2016-06-27 17:39:48.081973831 +0200
+diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
+--- cups-2.2.5/scheduler/job.c.lspp    2017-10-17 19:06:19.607229238 +0200
++++ cups-2.2.5/scheduler/job.c 2017-10-17 19:06:19.696228498 +0200
 @@ -11,6 +11,9 @@
-  * file is missing or damaged, see the license at "http://www.cups.org/".
+  * missing or damaged, see the license at "http://www.cups.org/".
   */
  
 +/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
@@ -1470,7 +1470,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
  
  /*
   * Design Notes for Job Management
-@@ -546,6 +557,14 @@ cupsdContinueJob(cupsd_job_t *job)        /* I
+@@ -547,6 +558,14 @@ cupsdContinueJob(cupsd_job_t *job)        /* I
                                        /* PRINTER_STATE_REASONS env var */
                        rip_max_cache[255];
                                        /* RIP_MAX_CACHE env variable */
@@ -1485,7 +1485,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -1082,6 +1101,67 @@ cupsdContinueJob(cupsd_job_t *job)      /* I
+@@ -1083,6 +1102,67 @@ cupsdContinueJob(cupsd_job_t *job)      /* I
    if (final_content_type[0])
      envp[envc ++] = final_content_type;
  
@@ -1553,7 +1553,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
    if (Classification && !banner_page)
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1905,6 +1985,22 @@ cupsdLoadJob(cupsd_job_t *job)          /* I - J
+@@ -1908,6 +1988,22 @@ cupsdLoadJob(cupsd_job_t *job)          /* I - J
        ippSetString(job->attrs, &job->reasons, 0, "none");
    }
  
@@ -1576,7 +1576,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
    job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER);
    job->sheets      = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER);
    job->job_sheets  = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -2318,6 +2414,14 @@ cupsdSaveJob(cupsd_job_t *job)          /* I - J
+@@ -2321,6 +2417,14 @@ cupsdSaveJob(cupsd_job_t *job)          /* I - J
  {
    char                filename[1024];         /* Job control filename */
    cups_file_t *fp;                    /* Job file */
@@ -1591,7 +1591,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -2340,6 +2444,78 @@ cupsdSaveJob(cupsd_job_t *job)          /* I - J
+@@ -2343,6 +2447,78 @@ cupsdSaveJob(cupsd_job_t *job)          /* I - J
  
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -1670,7 +1670,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3919,6 +4095,19 @@ get_options(cupsd_job_t *job,           /* I - Jo
+@@ -3989,6 +4165,19 @@ get_options(cupsd_job_t *job,           /* I - Jo
          banner_page)
          continue;
  
@@ -1690,7 +1690,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
       /*
        * Otherwise add them to the list...
        */
-@@ -4680,6 +4869,18 @@ start_job(cupsd_job_t     *job,         /* I -
+@@ -4750,6 +4939,18 @@ start_job(cupsd_job_t     *job,         /* I -
            cupsd_printer_t *printer)   /* I - Printer to print job */
  {
    const char  *filename;              /* Support filename */
@@ -1709,7 +1709,7 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
    ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
                                                   "job-cancel-after",
                                                   IPP_TAG_INTEGER);
-@@ -4856,6 +5057,113 @@ start_job(cupsd_job_t     *job,                /* I -
+@@ -4926,6 +5127,113 @@ start_job(cupsd_job_t     *job,                /* I -
    fcntl(job->side_pipes[1], F_SETFD,
        fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
  
@@ -1823,11 +1823,11 @@ diff -up cups-2.2b2/scheduler/job.c.lspp cups-2.2b2/scheduler/job.c
   /*
    * Now start the first file in the job...
    */
-diff -up cups-2.2b2/scheduler/job.h.lspp cups-2.2b2/scheduler/job.h
---- cups-2.2b2/scheduler/job.h.lspp    2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/job.h 2016-06-27 17:39:48.081973831 +0200
+diff -up cups-2.2.5/scheduler/job.h.lspp cups-2.2.5/scheduler/job.h
+--- cups-2.2.5/scheduler/job.h.lspp    2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/job.h 2017-10-17 19:06:19.696228498 +0200
 @@ -11,6 +11,13 @@
-  * file is missing or damaged, see the license at "http://www.cups.org/".
+  * missing or damaged, see the license at "http://www.cups.org/".
   */
  
 +/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
@@ -1851,9 +1851,9 @@ diff -up cups-2.2b2/scheduler/job.h.lspp cups-2.2b2/scheduler/job.h
  };
  
  typedef struct cupsd_joblog_s         /**** Job log message ****/
-diff -up cups-2.2b2/scheduler/main.c.lspp cups-2.2b2/scheduler/main.c
---- cups-2.2b2/scheduler/main.c.lspp   2016-06-27 17:39:48.064973966 +0200
-+++ cups-2.2b2/scheduler/main.c        2016-06-27 17:39:48.081973831 +0200
+diff -up cups-2.2.5/scheduler/main.c.lspp cups-2.2.5/scheduler/main.c
+--- cups-2.2.5/scheduler/main.c.lspp   2017-10-17 19:06:19.637228989 +0200
++++ cups-2.2.5/scheduler/main.c        2017-10-17 19:08:26.642173026 +0200
 @@ -56,6 +56,9 @@
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -1874,7 +1874,7 @@ diff -up cups-2.2b2/scheduler/main.c.lspp cups-2.2b2/scheduler/main.c
  #ifdef __APPLE__
    int                 use_sysman = 1; /* Use system management functions? */
  #else
-@@ -505,6 +511,25 @@ main(int  argc,                           /* I - Number of comm
+@@ -516,6 +522,25 @@ main(int  argc,                           /* I - Number of comm
      exit(errno);
    }
  
@@ -1898,9 +1898,9 @@ diff -up cups-2.2b2/scheduler/main.c.lspp cups-2.2b2/scheduler/main.c
 +#endif /* WITH_LSPP */
 +
   /*
-   * Set the timezone info...
+   * Let the system know we are busy while we bring up cupsd...
    */
-@@ -1205,6 +1230,11 @@ main(int  argc,                         /* I - Number of comm
+@@ -1227,6 +1252,11 @@ main(int  argc,                         /* I - Number of comm
  
    cupsdStopSelect();
  
@@ -1912,11 +1912,11 @@ diff -up cups-2.2b2/scheduler/main.c.lspp cups-2.2b2/scheduler/main.c
    return (!stop_scheduler);
  }
  
-diff -up cups-2.2b2/scheduler/printers.c.lspp cups-2.2b2/scheduler/printers.c
---- cups-2.2b2/scheduler/printers.c.lspp       2016-06-27 17:39:48.013974372 +0200
-+++ cups-2.2b2/scheduler/printers.c    2016-06-27 17:39:48.082973823 +0200
+diff -up cups-2.2.5/scheduler/printers.c.lspp cups-2.2.5/scheduler/printers.c
+--- cups-2.2.5/scheduler/printers.c.lspp       2017-10-17 19:06:19.587229404 +0200
++++ cups-2.2.5/scheduler/printers.c    2017-10-17 19:06:19.697228490 +0200
 @@ -11,6 +11,8 @@
-  * file is missing or damaged, see the license at "http://www.cups.org/".
+  * missing or damaged, see the license at "http://www.cups.org/".
   */
  
 +/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
@@ -1935,7 +1935,7 @@ diff -up cups-2.2b2/scheduler/printers.c.lspp cups-2.2b2/scheduler/printers.c
  
  /*
   * Local functions...
-@@ -2191,6 +2197,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2212,6 +2218,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
    ipp_attribute_t *attr;              /* Attribute data */
    char                *name,                  /* Current user/group name */
                *filter;                /* Current filter */
@@ -1949,7 +1949,7 @@ diff -up cups-2.2b2/scheduler/printers.c.lspp cups-2.2b2/scheduler/printers.c
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2318,6 +2331,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2339,6 +2352,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
                                           Classification : p->job_sheets[1]);
      }

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index c6c3506956762a71e33747fd2083c5ac2bbcd3c9..a1ee6de661091e387b23d4ea10839695c29be17a 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,9 +1,9 @@
-diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
---- cups-2.2b2/scheduler/main.c.systemd-socket 2016-06-27 15:12:24.930881404 +0200
-+++ cups-2.2b2/scheduler/main.c        2016-06-27 15:19:38.118234985 +0200
-@@ -690,8 +690,15 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c
+--- cups-2.2.5/scheduler/main.c.systemd-socket 2017-10-17 18:59:53.732431498 +0200
++++ cups-2.2.5/scheduler/main.c        2017-10-17 19:02:13.132275861 +0200
+@@ -691,8 +691,16 @@ main(int  argc,                           /* I - Number of comm
  
- #if defined(HAVE_ONDEMAND)
+ #ifdef HAVE_ONDEMAND
    if (OnDemand)
 +  {
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
@@ -15,14 +15,15 @@ diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
 +               (unsigned long) getpid());
 +# endif /* HAVE_SYSTEMD */
 +  } else
++
  #endif /* HAVE_ONDEMAND */
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.path.in
---- cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/org.cups.cupsd.path.in        2016-06-27 15:12:24.930881404 +0200
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
+diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/org.cups.cupsd.path.in        2017-10-17 18:59:53.732431498 +0200
+@@ -3,7 +3,7 @@ Description=CUPS Scheduler
+ PartOf=org.cups.cupsd.service
  
  [Path]
 -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
@@ -30,9 +31,9 @@ diff -up cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.service.in
---- cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket      2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/org.cups.cupsd.service.in     2016-06-27 15:12:24.930881404 +0200
+diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket      2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/org.cups.cupsd.service.in     2017-10-17 18:59:53.732431498 +0200
 @@ -1,10 +1,11 @@
  [Unit]
  Description=CUPS Scheduler

diff --git a/cups.spec b/cups.spec
index 481e0cd866c788679d005cfd772bb527240deca7..e4bded5c7400b4c1e549a6b7871059ca8d59b76a 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -12,13 +12,13 @@
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       2.2.4
+Version:       2.2.5
 Release:       1
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       https://github.com/apple/cups/releases/download/v%{version}/%{name}-%{version}-source.tar.gz
-# Source0-md5: d26e5a0a574a69fe1d01079b2931fc49
+# Source0-md5: 76294dff74c3baf3fdf7c626cd48b873
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -547,6 +547,7 @@ fi
 %{_datadir}/cups/templates/*.tmpl
 %lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
+%lang(fr) %{_datadir}/cups/templates/fr
 %lang(ja) %{_datadir}/cups/templates/ja
 %lang(pt_BR) %{_datadir}/cups/templates/pt_BR
 %lang(ru) %{_datadir}/cups/templates/ru