diff --git a/cups-2.2.4-source.tar.gz.sig b/cups-2.2.4-source.tar.gz.sig
deleted file mode 100644
index ff0ee05..0000000
Binary files a/cups-2.2.4-source.tar.gz.sig and /dev/null differ
diff --git a/cups-2.2.5-source.tar.gz.sig b/cups-2.2.5-source.tar.gz.sig
new file mode 100644
index 0000000..27ce3f3
Binary files /dev/null and b/cups-2.2.5-source.tar.gz.sig differ
diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch
index e36e7b4..942bbf5 100644
--- a/cups-avahi-no-threaded.patch
+++ b/cups-avahi-no-threaded.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2.4/scheduler/avahi.c.avahi-no-threaded cups-2.2.4/scheduler/avahi.c
---- cups-2.2.4/scheduler/avahi.c.avahi-no-threaded	2017-06-30 21:04:37.013278512 +0200
-+++ cups-2.2.4/scheduler/avahi.c	2017-06-30 21:04:37.013278512 +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.2.4/scheduler/avahi.c.avahi-no-threaded cups-2.2.4/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2.4/scheduler/avahi.h.avahi-no-threaded cups-2.2.4/scheduler/avahi.h
---- cups-2.2.4/scheduler/avahi.h.avahi-no-threaded	2017-06-30 21:04:37.013278512 +0200
-+++ cups-2.2.4/scheduler/avahi.h	2017-06-30 21:04:37.013278512 +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.2.4/scheduler/avahi.h.avahi-no-threaded cups-2.2.4/scheduler/ava
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-2.2.4/scheduler/cupsd.h.avahi-no-threaded cups-2.2.4/scheduler/cupsd.h
---- cups-2.2.4/scheduler/cupsd.h.avahi-no-threaded	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/cupsd.h	2017-06-30 21:04:37.013278512 +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.2.4/scheduler/cupsd.h.avahi-no-threaded cups-2.2.4/scheduler/cup
 +extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
 +#endif /* HAVE_AVAHI */
 \ No newline at end of file
-diff -up cups-2.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/scheduler/dirsvc.c
---- cups-2.2.4/scheduler/dirsvc.c.avahi-no-threaded	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/dirsvc.c	2017-06-30 21:04:37.051278174 +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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/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.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/scheduler/di
      DNSSDMaster = NULL;
    }
  #  endif /* HAVE_DNSSD */
-diff -up cups-2.2.4/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.4/scheduler/dirsvc.h
---- cups-2.2.4/scheduler/dirsvc.h.avahi-no-threaded	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/dirsvc.h	2017-06-30 21:04:37.051278174 +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,10 +685,10 @@ diff -up cups-2.2.4/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.4/scheduler/di
  					/* Master polling interface for Avahi */
  VAR AvahiClient		*DNSSDClient	VALUE(NULL);
  					/* Client information */
-diff -up cups-2.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main.c
---- cups-2.2.4/scheduler/main.c.avahi-no-threaded	2017-06-30 21:04:37.002278610 +0200
-+++ cups-2.2.4/scheduler/main.c	2017-06-30 21:05:55.015584932 +0200
-@@ -133,7 +133,10 @@ main(int  argc,				/* I - Number of comm
+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? */
  #endif /* HAVE_ONDEMAND */
@@ -700,7 +700,7 @@ diff -up cups-2.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main
  
  #ifdef HAVE_GETEUID
   /*
-@@ -611,6 +614,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.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main
    cupsdStartServer();
  
   /*
-@@ -926,6 +937,16 @@ main(int  argc,				/* I - Number of comm
+@@ -928,6 +939,16 @@ main(int  argc,				/* I - Number of comm
      }
  #endif /* __APPLE__ */
  
@@ -732,7 +732,7 @@ diff -up cups-2.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main
  #ifndef __APPLE__
     /*
      * Update the network interfaces once a minute...
-@@ -1630,6 +1651,10 @@ select_timeout(int fds)			/* I - Number
+@@ -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 */
@@ -743,7 +743,7 @@ diff -up cups-2.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
-@@ -1675,6 +1700,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.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main
   /*
    * Check whether we are accepting new connections...
    */
-diff -up cups-2.2.4/scheduler/Makefile.avahi-no-threaded cups-2.2.4/scheduler/Makefile
---- cups-2.2.4/scheduler/Makefile.avahi-no-threaded	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/Makefile	2017-06-30 21:04:37.053278156 +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.2.4/scheduler/Makefile.avahi-no-threaded cups-2.2.4/scheduler/Ma
  LIBOBJS =	\
  		filter.o \
  		mime.o \
-diff -up cups-2.2.4/scheduler/timeout.c.avahi-no-threaded cups-2.2.4/scheduler/timeout.c
---- cups-2.2.4/scheduler/timeout.c.avahi-no-threaded	2017-06-30 21:04:37.053278156 +0200
-+++ cups-2.2.4/scheduler/timeout.c	2017-06-30 21:04:37.053278156 +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 908f518..b1eb218 100644
--- 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 904b3cb..13cfb16 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2.4/config.h.in.lspp cups-2.2.4/config.h.in
---- cups-2.2.4/config.h.in.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/config.h.in	2017-06-30 21:06:35.855221795 +0200
+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.2.4/config.h.in.lspp cups-2.2.4/config.h.in
 +
 +
  #endif /* !_CUPS_CONFIG_H_ */
-diff -up cups-2.2.4/config-scripts/cups-lspp.m4.lspp cups-2.2.4/config-scripts/cups-lspp.m4
---- cups-2.2.4/config-scripts/cups-lspp.m4.lspp	2017-06-30 21:06:35.856221786 +0200
-+++ cups-2.2.4/config-scripts/cups-lspp.m4	2017-06-30 21:06:35.856221786 +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.2.4/config-scripts/cups-lspp.m4.lspp cups-2.2.4/config-scripts/c
 +            ;;
 +    esac
 +fi
-diff -up cups-2.2.4/configure.ac.lspp cups-2.2.4/configure.ac
---- cups-2.2.4/configure.ac.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/configure.ac	2017-06-30 21:06:35.856221786 +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.2.4/configure.ac.lspp cups-2.2.4/configure.ac
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-2.2.4/filter/common.c.lspp cups-2.2.4/filter/common.c
---- cups-2.2.4/filter/common.c.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/filter/common.c	2017-06-30 21:06:35.857221777 +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.2.4/filter/common.c.lspp cups-2.2.4/filter/common.c
  
  
  /*
-diff -up cups-2.2.4/filter/pstops.c.lspp cups-2.2.4/filter/pstops.c
---- cups-2.2.4/filter/pstops.c.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/filter/pstops.c	2017-06-30 21:06:35.857221777 +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,10 +394,10 @@ diff -up cups-2.2.4/filter/pstops.c.lspp cups-2.2.4/filter/pstops.c
  
  
  /*
-diff -up cups-2.2.4/Makedefs.in.lspp cups-2.2.4/Makedefs.in
---- cups-2.2.4/Makedefs.in.lspp	2017-06-30 21:06:35.858221768 +0200
-+++ cups-2.2.4/Makedefs.in	2017-06-30 21:08:33.477175926 +0200
-@@ -151,7 +151,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) $(SSLLIBS) $(LIBZ)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
@@ -406,9 +406,9 @@ diff -up cups-2.2.4/Makedefs.in.lspp cups-2.2.4/Makedefs.in
  ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
  ONDEMANDLIBS	=	@ONDEMANDLIBS@
  OPTIM		=	@OPTIM@
-diff -up cups-2.2.4/scheduler/client.c.lspp cups-2.2.4/scheduler/client.c
---- cups-2.2.4/scheduler/client.c.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/client.c	2017-06-30 21:06:35.900221395 +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.2.4/scheduler/client.c.lspp cups-2.2.4/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.2.4/scheduler/client.c.lspp cups-2.2.4/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.2.4/scheduler/client.c.lspp cups-2.2.4/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);
  	  }
  
@@ -578,7 +578,7 @@ diff -up cups-2.2.4/scheduler/client.c.lspp cups-2.2.4/scheduler/client.c
  	  if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
  	  {
  	    if (!httpWait(con->http, 0))
-@@ -3454,6 +3589,49 @@ is_path_absolute(const char *path)	/* I
+@@ -3456,6 +3591,49 @@ is_path_absolute(const char *path)	/* I
    return (1);
  }
  
@@ -628,9 +628,9 @@ diff -up cups-2.2.4/scheduler/client.c.lspp cups-2.2.4/scheduler/client.c
  
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.2.4/scheduler/client.h.lspp cups-2.2.4/scheduler/client.h
---- cups-2.2.4/scheduler/client.h.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/client.h	2017-06-30 21:06:35.900221395 +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.2.4/scheduler/client.h.lspp cups-2.2.4/scheduler/client.h
  
  #ifdef HAVE_SSL
  extern int	cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.2.4/scheduler/conf.c.lspp cups-2.2.4/scheduler/conf.c
---- cups-2.2.4/scheduler/conf.c.lspp	2017-06-30 21:06:35.853221813 +0200
-+++ cups-2.2.4/scheduler/conf.c	2017-06-30 21:06:35.901221386 +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 */
@@ -726,7 +726,7 @@ diff -up cups-2.2.4/scheduler/conf.c.lspp cups-2.2.4/scheduler/conf.c
    cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
                    RemotePort ? "enabled" : "disabled");
  
-@@ -1285,7 +1314,19 @@ cupsdReadConfiguration(void)
+@@ -1286,7 +1315,19 @@ cupsdReadConfiguration(void)
      cupsdClearString(&Classification);
  
    if (Classification)
@@ -746,7 +746,7 @@ diff -up cups-2.2.4/scheduler/conf.c.lspp cups-2.2.4/scheduler/conf.c
  
   /*
    * Check the MaxClients setting, and then allocate memory for it...
-@@ -3764,6 +3805,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,9 +765,9 @@ diff -up cups-2.2.4/scheduler/conf.c.lspp cups-2.2.4/scheduler/conf.c
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.2.4/scheduler/conf.h.lspp cups-2.2.4/scheduler/conf.h
---- cups-2.2.4/scheduler/conf.h.lspp	2017-06-30 21:06:35.796222319 +0200
-+++ cups-2.2.4/scheduler/conf.h	2017-06-30 21:06:35.901221386 +0200
+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 */
@@ -792,9 +792,9 @@ diff -up cups-2.2.4/scheduler/conf.h.lspp cups-2.2.4/scheduler/conf.h
  
  /*
   * Prototypes...
-diff -up cups-2.2.4/scheduler/cupsd.h.lspp cups-2.2.4/scheduler/cupsd.h
---- cups-2.2.4/scheduler/cupsd.h.lspp	2017-06-30 21:06:35.841221919 +0200
-+++ cups-2.2.4/scheduler/cupsd.h	2017-06-30 21:06:35.901221386 +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,9 +826,9 @@ diff -up cups-2.2.4/scheduler/cupsd.h.lspp cups-2.2.4/scheduler/cupsd.h
  /*
   * Some OS's don't have hstrerror(), most notably Solaris...
   */
-diff -up cups-2.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
---- cups-2.2.4/scheduler/ipp.c.lspp	2017-06-30 21:06:35.815222151 +0200
-+++ cups-2.2.4/scheduler/ipp.c	2017-06-30 21:06:35.902221377 +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 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -864,7 +864,7 @@ diff -up cups-2.2.4/scheduler/ipp.c.lspp cups-2.2.4/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,
-@@ -1265,6 +1279,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1576,6 +1605,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
    if ((job = cupsdAddJob(priority, printer->name)) == NULL)
    {
      send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1584,6 +1713,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
    job->dirty   = 1;
-@@ -1773,6 +1928,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  
      job->job_sheets = attr;
  
-@@ -1803,6 +1981,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  	}
  	else if (attr->num_values == 2 &&
  	         strcmp(attr->values[0].string.text,
-@@ -1821,6 +2002,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  	}
  	else if (strcmp(attr->values[0].string.text, Classification) &&
  	         strcmp(attr->values[0].string.text, "none") &&
-@@ -1841,6 +2025,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
          }
        }
        else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1881,8 +2068,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  
     /*
      * See if we need to add the starting sheet...
-@@ -3659,6 +3890,128 @@ check_rss_recipient(
+@@ -3686,6 +3917,128 @@ check_rss_recipient(
  }
  
  
@@ -1268,7 +1268,7 @@ diff -up cups-2.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4115,6 +4468,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4150,6 +4512,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4244,6 +4685,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -6432,6 +6891,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
   /*
    * Copy attributes...
    */
-@@ -6829,6 +7304,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.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
        if (count > 0)
  	ippAddSeparator(con->response);
  
-@@ -11460,6 +11940,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,9 +1442,9 @@ diff -up cups-2.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
   /*
    * Check the username against the owner...
    */
-diff -up cups-2.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
---- cups-2.2.4/scheduler/job.c.lspp	2017-06-30 21:06:35.826222053 +0200
-+++ cups-2.2.4/scheduler/job.c	2017-06-30 21:06:35.903221368 +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 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1670,7 +1670,7 @@ diff -up cups-2.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3931,6 +4107,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.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
       /*
        * Otherwise add them to the list...
        */
-@@ -4692,6 +4881,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.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
    ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
  						   "job-cancel-after",
  						   IPP_TAG_INTEGER);
-@@ -4868,6 +5069,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,9 +1823,9 @@ diff -up cups-2.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
   /*
    * Now start the first file in the job...
    */
-diff -up cups-2.2.4/scheduler/job.h.lspp cups-2.2.4/scheduler/job.h
---- cups-2.2.4/scheduler/job.h.lspp	2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/scheduler/job.h	2017-06-30 21:06:35.903221368 +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 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1851,9 +1851,9 @@ diff -up cups-2.2.4/scheduler/job.h.lspp cups-2.2.4/scheduler/job.h
  };
  
  typedef struct cupsd_joblog_s		/**** Job log message ****/
-diff -up cups-2.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
---- cups-2.2.4/scheduler/main.c.lspp	2017-06-30 21:06:35.854221804 +0200
-+++ cups-2.2.4/scheduler/main.c	2017-06-30 21:06:35.904221359 +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 */
@@ -1864,7 +1864,7 @@ diff -up cups-2.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
  
  /*
   * Local functions...
-@@ -124,6 +127,9 @@ main(int  argc,				/* I - Number of comm
+@@ -122,6 +125,9 @@ main(int  argc,				/* I - Number of comm
  #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
    struct sigaction	action;		/* Actions for POSIX signals */
  #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -1874,7 +1874,7 @@ diff -up cups-2.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
  #ifdef __APPLE__
    int			use_sysman = 1;	/* Use system management functions? */
  #else
-@@ -518,6 +524,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.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
 +#endif /* WITH_LSPP */
 +
   /*
-   * Set the timezone info...
+   * Let the system know we are busy while we bring up cupsd...
    */
-@@ -1225,6 +1250,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1227,6 +1252,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -1912,9 +1912,9 @@ diff -up cups-2.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
    return (!stop_scheduler);
  }
  
-diff -up cups-2.2.4/scheduler/printers.c.lspp cups-2.2.4/scheduler/printers.c
---- cups-2.2.4/scheduler/printers.c.lspp	2017-06-30 21:06:35.800222284 +0200
-+++ cups-2.2.4/scheduler/printers.c	2017-06-30 21:06:35.904221359 +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 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index cc936d9..a1ee6de 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,9 +1,9 @@
-diff -up cups-2.2.2/scheduler/main.c.systemd-socket cups-2.2.2/scheduler/main.c
---- cups-2.2.2/scheduler/main.c.systemd-socket	2017-01-19 11:12:42.004520240 +0100
-+++ cups-2.2.2/scheduler/main.c	2017-01-19 11:12:42.029520021 +0100
-@@ -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,12 +15,13 @@ diff -up cups-2.2.2/scheduler/main.c.systemd-socket cups-2.2.2/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.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.path.in
---- cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket	2017-01-19 11:12:42.029520021 +0100
-+++ cups-2.2.2/scheduler/org.cups.cupsd.path.in	2017-01-19 11:19:34.468933097 +0100
+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
  
@@ -30,9 +31,9 @@ diff -up cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.2/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.service.in
---- cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/org.cups.cupsd.service.in	2017-01-19 11:12:42.029520021 +0100
+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 2fcdac4..0ff18a0 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,8 +14,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 2.2.4
-Release: 7%{?dist}
+Version: 2.2.5
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -46,7 +46,7 @@ Patch17: cups-res_init.patch
 Patch18: cups-filter-debug.patch
 Patch19: cups-uri-compat.patch
 Patch20: cups-str3382.patch
-Patch21: cups-0755.patch
+#Patch21: cups-0755.patch
 Patch22: cups-hp-deviceid-oid.patch
 Patch23: cups-dnssd-deviceid.patch
 Patch24: cups-ricoh-deviceid-oid.patch
@@ -54,7 +54,7 @@ Patch25: cups-systemd-socket.patch
 Patch27: cups-avahi-address.patch
 Patch29: cups-dymo-deviceid.patch
 Patch30: cups-freebind.patch
-Patch31: cups-no-gcry.patch
+#Patch31: cups-no-gcry.patch
 Patch32: cups-libusb-quirks.patch
 Patch33: cups-use-ipp1.1.patch
 Patch34: cups-avahi-no-threaded.patch
@@ -63,8 +63,6 @@ Patch36: cups-web-devices-timeout.patch
 Patch37: cups-synconclose.patch
 Patch38: cups-resolv_reload.patch
 Patch39: cups-ypbind.patch
-Patch40: cups-no-dest.patch
-Patch41: cups-cupsenumdests2.patch
 
 Patch100: cups-lspp.patch
 
@@ -226,7 +224,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Fix temporary filename creation.
 %patch20 -p1 -b .str3382
 # Use mode 0755 for binaries and libraries where appropriate.
-%patch21 -p1 -b .0755
+#%%patch21 -p1 -b .0755
 # Add an SNMP query for HP's device ID OID (STR #3552).
 %patch22 -p1 -b .hp-deviceid-oid
 # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
@@ -242,7 +240,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
 %patch30 -p1 -b .freebind
 # Don't link against libgcrypt needlessly.
-%patch31 -p1 -b .no-gcry
+#%%patch31 -p1 -b .no-gcry
 # Added libusb quirk for Canon PIXMA MP540 (bug #967873).
 %patch32 -p1 -b .libusb-quirks
 # Default to IPP/1.1 for now (bug #977813).
@@ -259,10 +257,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch38 -p1 -b .resolv_reload
 # CUPS may fail to start if NIS groups are used (bug #1494558)
 %patch39 -p1 -b .ypbind
-# Can not get destinations from CUPS server (bug #1484916)
-%patch40 -p1 -b .no-dest
-# Cannot browse CUPS servers in GNOME Control Panel Printers (bug #1498091)
-%patch41 -p1 -b .cupsenumdests2
 
 %if %{lspp}
 # LSPP support.
@@ -298,6 +292,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 %if %{lspp}
 	--enable-lspp \
 %endif
+  --with-exe-file-perm=0755 \
 	--with-cupsd-file-perm=0755 \
 	--with-log-file-perm=0600 \
 	--enable-relro \
@@ -501,7 +496,7 @@ rm -f %{cups_serverbin}/backend/smb
 %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf
 %attr(0640,root,lp) %{_sysconfdir}/cups/snmp.conf.default
 %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/subscriptions.conf
-#%{_sysconfdir}/cups/interfaces
+#%%{_sysconfdir}/cups/interfaces
 %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd
 %dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl
@@ -563,6 +558,7 @@ rm -f %{cups_serverbin}/backend/smb
 %dir %{_datadir}/cups/templates/pt_BR
 %{_datadir}/cups/templates/*.tmpl
 %{_datadir}/cups/templates/de/*.tmpl
+%{_datadir}/cups/templates/fr/*.tmpl
 %{_datadir}/cups/templates/es/*.tmpl
 %{_datadir}/cups/templates/ja/*.tmpl
 %{_datadir}/cups/templates/ru/*.tmpl
@@ -628,6 +624,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Oct 17 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.5-1
+- rebase to 2.2.5
+
 * Mon Oct 09 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.4-7
 - removing ghostscript-cups dependency - cups-filters ships it