From 7dc7717327954839d7f7aebfbec0a99c42a35796 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 30 2017 20:21:46 +0000
Subject: rebase to 2.2.4


---

diff --git a/.gitignore b/.gitignore
index b57bd7e..e660847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ cups-1.4.4-source.tar.bz2
 /cups-2.2.1-source.tar.gz
 /cups-2.2.2-source.tar.gz
 /cups-2.2.3-source.tar.gz
+/.metadata/
+/cups-2.2.4-source.tar.gz
diff --git a/cups-0755.patch b/cups-0755.patch
index b0df3a0..0c3b18b 100644
--- a/cups-0755.patch
+++ b/cups-0755.patch
@@ -1,20 +1,20 @@
-diff -up cups-1.6b1/Makedefs.in.0755 cups-1.6b1/Makedefs.in
---- cups-1.6b1/Makedefs.in.0755	2012-05-23 01:58:31.000000000 +0200
-+++ cups-1.6b1/Makedefs.in	2012-05-25 16:09:40.545463214 +0200
-@@ -40,14 +40,14 @@ SHELL		=	/bin/sh
+diff -up cups-2.2.4/Makedefs.in.0755 cups-2.2.4/Makedefs.in
+--- cups-2.2.4/Makedefs.in.0755	2017-06-30 20:39:59.411493947 +0200
++++ cups-2.2.4/Makedefs.in	2017-06-30 20:43:29.553609350 +0200
+@@ -38,14 +38,14 @@ SHELL		=	/bin/sh
  # Installation programs...
  #
  
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 +INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
  INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
  INSTALL_DATA	=	$(INSTALL) -c -m 444
  INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 +INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
  INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
 +INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
  
  #
diff --git a/cups-2.2.2-source.tar.gz.sig b/cups-2.2.2-source.tar.gz.sig
deleted file mode 100644
index 4ea98b9..0000000
Binary files a/cups-2.2.2-source.tar.gz.sig and /dev/null differ
diff --git a/cups-2.2.4-source.tar.gz.sig b/cups-2.2.4-source.tar.gz.sig
new file mode 100644
index 0000000..ff0ee05
Binary files /dev/null and b/cups-2.2.4-source.tar.gz.sig differ
diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch
index f81c71f..e36e7b4 100644
--- 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.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
 @@ -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.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
 @@ -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.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
 @@ -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.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
 @@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
      cupsdUpdateDNSSDName();
  
@@ -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.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
 @@ -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.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
-@@ -131,7 +131,10 @@ main(int  argc,				/* I - Number of comm
+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
    int			service_idle_exit;
  					/* Idle exit on select timeout? */
  #endif /* HAVE_ONDEMAND */
@@ -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
+@@ -611,6 +614,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
+@@ -926,6 +937,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 */
+@@ -1630,6 +1651,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
+@@ -1675,6 +1700,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.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
 @@ -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.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
 @@ -0,0 +1,235 @@
 +/*
 + * "$Id$"
diff --git a/cups-enum-all.patch b/cups-enum-all.patch
deleted file mode 100644
index 0ac3983..0000000
--- a/cups-enum-all.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
---- cups-1.6.2/cups/dest.c.enum-all	2013-06-04 10:58:36.169786250 +0100
-+++ cups-1.6.2/cups/dest.c	2013-06-04 10:59:02.147900811 +0100
-@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
- 	break;
- 
-     case AVAHI_BROWSER_REMOVE:
--    case AVAHI_BROWSER_ALL_FOR_NOW:
-     case AVAHI_BROWSER_CACHE_EXHAUSTED:
-         break;
-+
-+    case AVAHI_BROWSER_ALL_FOR_NOW:
-+	avahi_simple_poll_quit(data->simple_poll);
-+        break;
-   }
- }
- 
diff --git a/cups-lspp.patch b/cups-lspp.patch
index 8128732..904b3cb 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2.2/config.h.in.lspp cups-2.2.2/config.h.in
---- cups-2.2.2/config.h.in.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/config.h.in	2017-01-19 11:34:39.235988617 +0100
+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
 @@ -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.2/config.h.in.lspp cups-2.2.2/config.h.in
 +
 +
  #endif /* !_CUPS_CONFIG_H_ */
-diff -up cups-2.2.2/config-scripts/cups-lspp.m4.lspp cups-2.2.2/config-scripts/cups-lspp.m4
---- cups-2.2.2/config-scripts/cups-lspp.m4.lspp	2017-01-19 11:34:39.235988617 +0100
-+++ cups-2.2.2/config-scripts/cups-lspp.m4	2017-01-19 11:34:39.235988617 +0100
+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
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -53,9 +53,9 @@ diff -up cups-2.2.2/config-scripts/cups-lspp.m4.lspp cups-2.2.2/config-scripts/c
 +            ;;
 +    esac
 +fi
-diff -up cups-2.2.2/configure.ac.lspp cups-2.2.2/configure.ac
---- cups-2.2.2/configure.ac.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/configure.ac	2017-01-19 11:34:39.235988617 +0100
+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
 @@ -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.2/configure.ac.lspp cups-2.2.2/configure.ac
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-2.2.2/filter/common.c.lspp cups-2.2.2/filter/common.c
---- cups-2.2.2/filter/common.c.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/filter/common.c	2017-01-19 11:34:39.235988617 +0100
+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
 @@ -17,6 +17,12 @@
   * Include necessary headers...
   */
@@ -236,9 +236,9 @@ diff -up cups-2.2.2/filter/common.c.lspp cups-2.2.2/filter/common.c
  
  
  /*
-diff -up cups-2.2.2/filter/pstops.c.lspp cups-2.2.2/filter/pstops.c
---- cups-2.2.2/filter/pstops.c.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/filter/pstops.c	2017-01-19 11:34:39.236988608 +0100
+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
 @@ -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.2.2/filter/pstops.c.lspp cups-2.2.2/filter/pstops.c
  
  
  /*
-diff -up cups-2.2.2/Makedefs.in.lspp cups-2.2.2/Makedefs.in
---- cups-2.2.2/Makedefs.in.lspp	2017-01-19 11:34:39.206988873 +0100
-+++ cups-2.2.2/Makedefs.in	2017-01-19 11:34:39.236988608 +0100
-@@ -143,7 +143,7 @@ LDFLAGS		=	-L../cgi-bin -L../cups -L../f
+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
  			@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.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
---- cups-2.2.2/scheduler/client.c.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/client.c	2017-01-19 11:34:39.281988212 +0100
+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
 @@ -22,12 +22,20 @@
  #define _HTTP_NO_PRIVATE
  #include "cupsd.h"
@@ -578,7 +578,7 @@ diff -up cups-2.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
  	  if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
  	  {
  	    if (!httpWait(con->http, 0))
-@@ -3456,6 +3591,49 @@ is_path_absolute(const char *path)	/* I
+@@ -3454,6 +3589,49 @@ is_path_absolute(const char *path)	/* I
    return (1);
  }
  
@@ -628,9 +628,9 @@ diff -up cups-2.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
  
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.2.2/scheduler/client.h.lspp cups-2.2.2/scheduler/client.h
---- cups-2.2.2/scheduler/client.h.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/client.h	2017-01-19 11:34:39.281988212 +0100
+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
 @@ -16,6 +16,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -666,9 +666,9 @@ diff -up cups-2.2.2/scheduler/client.h.lspp cups-2.2.2/scheduler/client.h
  
  #ifdef HAVE_SSL
  extern int	cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
---- cups-2.2.2/scheduler/conf.c.lspp	2017-01-19 11:34:39.232988644 +0100
-+++ cups-2.2.2/scheduler/conf.c	2017-01-19 11:34:39.282988203 +0100
+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
 @@ -40,6 +40,9 @@
  #  define INADDR_NONE	0xffffffff
  #endif /* !INADDR_NONE */
@@ -726,7 +726,7 @@ diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
    cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
                    RemotePort ? "enabled" : "disabled");
  
-@@ -1276,7 +1305,19 @@ cupsdReadConfiguration(void)
+@@ -1285,7 +1314,19 @@ cupsdReadConfiguration(void)
      cupsdClearString(&Classification);
  
    if (Classification)
@@ -746,7 +746,7 @@ diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
  
   /*
    * Check the MaxClients setting, and then allocate memory for it...
-@@ -3753,6 +3794,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3764,6 +3805,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.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
  
  /*
   * 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.2.2/scheduler/conf.h.lspp cups-2.2.2/scheduler/conf.h
---- cups-2.2.2/scheduler/conf.h.lspp	2017-01-19 11:34:39.175989146 +0100
-+++ cups-2.2.2/scheduler/conf.h	2017-01-19 11:34:39.283988194 +0100
+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
 @@ -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.2/scheduler/conf.h.lspp cups-2.2.2/scheduler/conf.h
  
  /*
   * Prototypes...
-diff -up cups-2.2.2/scheduler/cupsd.h.lspp cups-2.2.2/scheduler/cupsd.h
---- cups-2.2.2/scheduler/cupsd.h.lspp	2017-01-19 11:34:39.224988714 +0100
-+++ cups-2.2.2/scheduler/cupsd.h	2017-01-19 11:34:39.283988194 +0100
+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
 @@ -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.2/scheduler/cupsd.h.lspp cups-2.2.2/scheduler/cupsd.h
  /*
   * Some OS's don't have hstrerror(), most notably Solaris...
   */
-diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
---- cups-2.2.2/scheduler/ipp.c.lspp	2017-01-19 11:34:39.190989014 +0100
-+++ cups-2.2.2/scheduler/ipp.c	2017-01-19 11:49:37.704922404 +0100
+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
 @@ -14,6 +14,9 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1395,7 +1395,7 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -6429,6 +6888,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -6432,6 +6891,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.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
   /*
    * Copy attributes...
    */
-@@ -6826,6 +7301,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -6829,6 +7304,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.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
        if (count > 0)
  	ippAddSeparator(con->response);
  
-@@ -11457,6 +11937,11 @@ validate_user(cupsd_job_t    *job,	/* I
+@@ -11460,6 +11940,11 @@ validate_user(cupsd_job_t    *job,	/* I
  
    strlcpy(username, get_username(con), userlen);
  
@@ -1442,9 +1442,9 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
   /*
    * Check the username against the owner...
    */
-diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
---- cups-2.2.2/scheduler/job.c.lspp	2017-01-19 11:34:39.202988908 +0100
-+++ cups-2.2.2/scheduler/job.c	2017-01-19 11:51:43.774763010 +0100
+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
 @@ -11,6 +11,9 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1470,7 +1470,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/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.2.2/scheduler/job.c.lspp cups-2.2.2/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.2.2/scheduler/job.c.lspp cups-2.2.2/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.2.2/scheduler/job.c.lspp cups-2.2.2/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.2.2/scheduler/job.c.lspp cups-2.2.2/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.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3926,6 +4102,19 @@ get_options(cupsd_job_t *job,		/* I - Jo
+@@ -3931,6 +4107,19 @@ get_options(cupsd_job_t *job,		/* I - Jo
  	  banner_page)
          continue;
  
@@ -1690,7 +1690,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
       /*
        * Otherwise add them to the list...
        */
-@@ -4687,6 +4876,18 @@ start_job(cupsd_job_t     *job,		/* I -
+@@ -4692,6 +4881,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.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
    ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
  						   "job-cancel-after",
  						   IPP_TAG_INTEGER);
-@@ -4863,6 +5064,113 @@ start_job(cupsd_job_t     *job,		/* I -
+@@ -4868,6 +5069,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.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
   /*
    * Now start the first file in the job...
    */
-diff -up cups-2.2.2/scheduler/job.h.lspp cups-2.2.2/scheduler/job.h
---- cups-2.2.2/scheduler/job.h.lspp	2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/job.h	2017-01-19 11:52:53.997134426 +0100
+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
 @@ -11,6 +11,13 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1851,9 +1851,9 @@ diff -up cups-2.2.2/scheduler/job.h.lspp cups-2.2.2/scheduler/job.h
  };
  
  typedef struct cupsd_joblog_s		/**** Job log message ****/
-diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
---- cups-2.2.2/scheduler/main.c.lspp	2017-01-19 11:34:39.225988705 +0100
-+++ cups-2.2.2/scheduler/main.c	2017-01-19 11:34:39.286988168 +0100
+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
 @@ -56,6 +56,9 @@
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -1864,7 +1864,7 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
  
  /*
   * Local functions...
-@@ -122,6 +125,9 @@ main(int  argc,				/* I - Number of comm
+@@ -124,6 +127,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.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
  #ifdef __APPLE__
    int			use_sysman = 1;	/* Use system management functions? */
  #else
-@@ -508,6 +514,25 @@ main(int  argc,				/* I - Number of comm
+@@ -518,6 +524,25 @@ main(int  argc,				/* I - Number of comm
      exit(errno);
    }
  
@@ -1900,7 +1900,7 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
   /*
    * Set the timezone info...
    */
-@@ -1201,6 +1226,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1225,6 +1250,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -1912,9 +1912,9 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
    return (!stop_scheduler);
  }
  
-diff -up cups-2.2.2/scheduler/printers.c.lspp cups-2.2.2/scheduler/printers.c
---- cups-2.2.2/scheduler/printers.c.lspp	2017-01-19 11:34:39.177989128 +0100
-+++ cups-2.2.2/scheduler/printers.c	2017-01-19 11:53:39.614723905 +0100
+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
 @@ -11,6 +11,8 @@
   * missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -1935,7 +1935,7 @@ diff -up cups-2.2.2/scheduler/printers.c.lspp cups-2.2.2/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.2.2/scheduler/printers.c.lspp cups-2.2.2/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-no-gzip-man.patch b/cups-no-gzip-man.patch
index 9bffccc..c476b7b 100644
--- a/cups-no-gzip-man.patch
+++ b/cups-no-gzip-man.patch
@@ -1,9 +1,9 @@
-diff -up cups-2.2b2/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2b2/config-scripts/cups-manpages.m4
---- cups-2.2b2/config-scripts/cups-manpages.m4.no-gzip-man	2016-06-27 14:59:39.642245559 +0200
-+++ cups-2.2b2/config-scripts/cups-manpages.m4	2016-06-27 15:05:02.553627348 +0200
-@@ -53,10 +53,10 @@ case "$uname" in
+diff -up cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2.4/config-scripts/cups-manpages.m4
+--- cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man	2017-06-30 20:37:09.470034273 +0200
++++ cups-2.2.4/config-scripts/cups-manpages.m4	2017-06-30 20:39:15.982884832 +0200
+@@ -53,10 +53,10 @@ case "$host_os_name" in
  		;;
- 	Linux* | GNU* | Darwin*)
+ 	linux* | gnu* | darwin*)
  		# Linux, GNU Hurd, and macOS
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
diff --git a/cups.spec b/cups.spec
index f60d438..145d88c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,8 +14,8 @@
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 2.2.3
-Release: 6%{?dist}
+Version: 2.2.4
+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
@@ -52,7 +52,6 @@ Patch23: cups-dnssd-deviceid.patch
 Patch24: cups-ricoh-deviceid-oid.patch
 Patch25: cups-systemd-socket.patch
 Patch27: cups-avahi-address.patch
-Patch28: cups-enum-all.patch
 Patch29: cups-dymo-deviceid.patch
 Patch30: cups-freebind.patch
 Patch31: cups-no-gcry.patch
@@ -236,8 +235,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch25 -p1 -b .systemd-socket
 # Use IP address when resolving DNSSD URIs (bug #948288).
 %patch27 -p1 -b .avahi-address
-# Return from cupsEnumDests() once all records have been returned.
-%patch28 -p1 -b .enum-all
 # Added IEEE 1284 Device ID for a Dymo device (bug #747866).
 %patch29 -p1 -b .dymo-deviceid
 # Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
@@ -278,7 +275,7 @@ sed -i -e 's,^SystemGroup .*$, SystemGroup sys root wheel,' conf/cups-files.conf
 # Let's look at the compilation command lines.
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
-f=CREDITS.txt
+f=CREDITS.md
 mv "$f" "$f"~
 iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
 rm -f "$f"~
@@ -480,7 +477,7 @@ exit 0
 rm -f %{cups_serverbin}/backend/smb
 
 %files -f %{name}.lang
-%doc README.txt CREDITS.txt CHANGES.txt
+%doc README.md CREDITS.md CHANGES.md
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups
 %dir %attr(0755,root,lp) %{_localstatedir}/run/cups
 %dir %attr(0511,lp,sys) %{_localstatedir}/run/cups/certs
@@ -623,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Jun 30 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.4-1
+- rebase to 2.2.4
+
 * Thu Jun 29 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.3-6
 - update python dependencies accordingly Fedora Guideline for Python (python-cups -> python3-cups)
 
diff --git a/sources b/sources
index b7a4149..2754467 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cups-2.2.3-source.tar.gz) = 0f3e2aa8e514dad056b4878b0657491d35796b62021092cd5dd480b67a8423fc0fdb822ccb4bc72a454c3ced20c160c8631d44c182c87a3993b882df904aaec7
+SHA512 (cups-2.2.4-source.tar.gz) = 132e1896c5b8466e0c38decbb1210b420f1fa811a761150abdf07112bab290d51883f58a9a441fdc51e7094d94036288d564d6f39e9ee65e9c298e00088469d3