From bd1cd7b34d72192afd98854c70666dae59914e66 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 9 Aug 2016 11:59:55 +0200
Subject: [PATCH] rebase to cups-2.2rc1

---
 .gitignore                    |   1 +
 cups-2.2b2-source.tar.gz.sig  | Bin 543 -> 0 bytes
 cups-2.2rc1-source.tar.gz.sig | Bin 0 -> 543 bytes
 cups-serverbin-compat.patch   |  57 ++++++++++++++++++----------------
 cups.spec                     |   7 +++--
 sources                       |   2 +-
 6 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 cups-2.2b2-source.tar.gz.sig
 create mode 100644 cups-2.2rc1-source.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index bc233cc..edad938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ cups-1.4.4-source.tar.bz2
 /cups-2.1.3-source.tar.bz2
 /cups-2.1.4-source.tar.gz
 /cups-2.2b2-source.tar.gz
+/cups-2.2rc1-source.tar.gz
diff --git a/cups-2.2b2-source.tar.gz.sig b/cups-2.2b2-source.tar.gz.sig
deleted file mode 100644
index 9f032265f6efd2dcf5fc61a46cc1093a2adb5ad9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0SW*H1p-%XS3Up=2@u<(r>h9pVk65)5B@3yjAfDV-^gh~d$D4R
zM*zd<Uo9-+Q8058#I{CZbK8hNhJuq#DLwwBC|`5BP-xJc<<+Xk*w*Z?t-p;svqVY1
z;bLZwv({l9@A;qzsVMQvzj+C&t@Up~L?T8c3`?f)LQ@?(?l_g2RCY1NqQ0P6l8A1*
zj@=qifJxFj|JgbPU2+D~L4V)i2jwCE!lwf=ZJtlx)P=SR;%4K+ye1~OR?J2Ou&^D&
z5he+O_#R9HeR)u-_-pSE*Af2!<~qzVO(=o4`?@;8=9BJUs1bG^0?Qo~aVyI#V#dwE
z3%Ug0Y*;jW^o<TZEin`ti}9P&HH{B6z;-Z_{Rpr0f&ws&_3_rQWL=r<5%#zL5TB!Z
zws4nam#@&gWF#Twwzy$3Ipo8a=o#1J$p#+^m^J$&NbvYixL$!9y@n_~YDYhJ9txrz
z3VDKs>ZgXaG4C2Jxim?3QVvkPE(F7O3XKdHRx-E$9bA<}p2z6zPh!KqYE&9Tu~+T>
z<Q#;U`3lV20XZgiLJQ%&VrgP&QPxsKWA&flf*%(Fo;|+{M=`YYw59B^43nw)+ulbG
z^Qz15ePHE2N9g7366Xol651Jg>x2(V(ak5`WB|KCWUjB@$?Q-uLW)q|nKg{cFmf+l
hGt-<3UICluI`^NA2Pz3O#wR&Yg=IXGu+w;8!zxTM19JcX

diff --git a/cups-2.2rc1-source.tar.gz.sig b/cups-2.2rc1-source.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..86de217f9daf715c613b7a6c843ba9ecf3b79e2a
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0SW*H1p-&7${YX+2@u<(r>h9pVk3~&5C49acHMFReR;8iu_!Lk
zz(bHaZu00W0qpQJM8!0cSb?At=4RPUX;p=FE{eXN#o*|vAN!urU2I_WjG(}_;1{NT
zO6>q~IUzZQ%C%k;G+<!-ydI|+@z1u=TGIJqp&f#QV;apzUV&zgpr1hC2Za)|#x*Wj
z&%|>UE%@1BW9N4LZ7iW3bx(e{Vj)?!yB=4RZ*}wYN&KGp*1)<zGv_jP3+08|f*0^B
z+D+}ZZLae|mlLFx8Rkyo79B0kOkjDyq9%N*0y`af=diDkBWBN(aRi#FRu2MEn<BzL
z5`p;j?D2iv+LUk0x=K%*w3NqC{X%~-#VvgT*PKd7lMo#UR<yASqOBxFyPNBPN|JqS
z-XzYd=EHqxmzjesB9j0OH9wi`Hm0E}<l}A=S_ycQRBXuA<Lvv<4|<swPB_VhjfTTQ
zZTm}O;Jz!YFssbbG&leIJkHl2M2OFCY_HmG_mOMw7(hVFSb5Y1I;DUoxwo4UtC@y|
zZ7v{ua2eJxw%(V8+NxM1ym*1Vp!9+|E88YRy<R&3i{~5H!dQ{2-mRFzya`rad<}(>
zUZe>fe#&i4XnwddElyAA;bjyvRcW|e7Q*@qgpTmLNWcdi%3q>n+ILdkDiTe`6(v!t
h!&^oN@Et!08?LmK`F<RrO6|qcJ5B26fV{Jz`-(I`3$FkG

literal 0
HcmV?d00001

diff --git a/cups-serverbin-compat.patch b/cups-serverbin-compat.patch
index 0ca72fd..5f51e23 100644
--- a/cups-serverbin-compat.patch
+++ b/cups-serverbin-compat.patch
@@ -1,7 +1,7 @@
-diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.c
---- cups-1.5b1/scheduler/conf.c.serverbin-compat	2011-05-20 06:24:54.000000000 +0200
-+++ cups-1.5b1/scheduler/conf.c	2011-05-23 17:20:33.000000000 +0200
-@@ -491,6 +491,9 @@ cupsdReadConfiguration(void)
+diff -up cups-2.2rc1/scheduler/conf.c.serverbin-compat cups-2.2rc1/scheduler/conf.c
+--- cups-2.2rc1/scheduler/conf.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
++++ cups-2.2rc1/scheduler/conf.c	2016-08-09 09:58:21.324033645 +0200
+@@ -609,6 +609,9 @@ cupsdReadConfiguration(void)
    cupsdClearString(&ServerName);
    cupsdClearString(&ServerAdmin);
    cupsdSetString(&ServerBin, CUPS_SERVERBIN);
@@ -11,7 +11,7 @@ diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.
    cupsdSetString(&RequestRoot, CUPS_REQUESTS);
    cupsdSetString(&CacheDir, CUPS_CACHEDIR);
    cupsdSetString(&DataDir, CUPS_DATADIR);
-@@ -1378,7 +1381,12 @@ cupsdReadConfiguration(void)
+@@ -1604,7 +1607,12 @@ cupsdReadConfiguration(void)
      * Read the MIME type and conversion database...
      */
  
@@ -24,10 +24,10 @@ diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.
      snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir);
  
      MimeDatabase = mimeNew();
-diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.h
---- cups-1.5b1/scheduler/conf.h.serverbin-compat	2011-04-22 19:47:03.000000000 +0200
-+++ cups-1.5b1/scheduler/conf.h	2011-05-23 15:34:25.000000000 +0200
-@@ -105,6 +105,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
+diff -up cups-2.2rc1/scheduler/conf.h.serverbin-compat cups-2.2rc1/scheduler/conf.h
+--- cups-2.2rc1/scheduler/conf.h.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
++++ cups-2.2rc1/scheduler/conf.h	2016-08-09 09:58:21.325033636 +0200
+@@ -106,6 +106,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
  					/* Root directory for scheduler */
  			*ServerBin		VALUE(NULL),
  					/* Root directory for binaries */
@@ -38,10 +38,10 @@ diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.
  			*StateDir		VALUE(NULL),
  					/* Root directory for state data */
  			*RequestRoot		VALUE(NULL),
-diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c
---- cups-1.5b1/scheduler/env.c.serverbin-compat	2011-01-11 04:48:42.000000000 +0100
-+++ cups-1.5b1/scheduler/env.c	2011-05-23 17:07:17.000000000 +0200
-@@ -218,8 +218,13 @@ cupsdUpdateEnv(void)
+diff -up cups-2.2rc1/scheduler/env.c.serverbin-compat cups-2.2rc1/scheduler/env.c
+--- cups-2.2rc1/scheduler/env.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
++++ cups-2.2rc1/scheduler/env.c	2016-08-09 09:58:21.325033636 +0200
+@@ -212,8 +212,13 @@ cupsdUpdateEnv(void)
    set_if_undefined("LD_PRELOAD", NULL);
    set_if_undefined("NLSPATH", NULL);
    if (find_env("PATH") < 0)
@@ -55,10 +55,10 @@ diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c
    set_if_undefined("SERVER_ADMIN", ServerAdmin);
    set_if_undefined("SHLIB_PATH", NULL);
    set_if_undefined("SOFTWARE", CUPS_MINIMAL);
-diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c
---- cups-1.5b1/scheduler/ipp.c.serverbin-compat	2011-05-20 05:49:49.000000000 +0200
-+++ cups-1.5b1/scheduler/ipp.c	2011-05-23 16:09:57.000000000 +0200
-@@ -2586,9 +2586,18 @@ add_printer(cupsd_client_t  *con,	/* I -
+diff -up cups-2.2rc1/scheduler/ipp.c.serverbin-compat cups-2.2rc1/scheduler/ipp.c
+--- cups-2.2rc1/scheduler/ipp.c.serverbin-compat	2016-08-09 09:58:21.326033626 +0200
++++ cups-2.2rc1/scheduler/ipp.c	2016-08-09 10:10:16.266127629 +0200
+@@ -2419,12 +2419,21 @@ add_printer(cupsd_client_t  *con,	/* I -
          * Could not find device in list!
  	*/
  
@@ -70,6 +70,9 @@ diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c
 +#endif /* __x86_64__ */
  	send_ipp_status(con, IPP_NOT_POSSIBLE,
                          _("Bad device-uri scheme \"%s\"."), scheme);
+ 	if (!modify)
+ 	  cupsdDeletePrinter(printer, 0);
+ 
  	return;
 +#ifdef __x86_64__
 +	}
@@ -77,10 +80,10 @@ diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c
        }
      }
  
-diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c
---- cups-1.5b1/scheduler/job.c.serverbin-compat	2011-05-20 05:49:49.000000000 +0200
-+++ cups-1.5b1/scheduler/job.c	2011-05-23 16:18:57.000000000 +0200
-@@ -1047,8 +1047,32 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+diff -up cups-2.2rc1/scheduler/job.c.serverbin-compat cups-2.2rc1/scheduler/job.c
+--- cups-2.2rc1/scheduler/job.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
++++ cups-2.2rc1/scheduler/job.c	2016-08-09 09:58:21.327033616 +0200
+@@ -1126,8 +1126,32 @@ cupsdContinueJob(cupsd_job_t *job)	/* I
         i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
    {
      if (filter->filter[0] != '/')
@@ -115,7 +118,7 @@ diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c
      else
        strlcpy(command, filter->filter, sizeof(command));
  
-@@ -1199,6 +1223,28 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
+@@ -1283,6 +1307,28 @@ cupsdContinueJob(cupsd_job_t *job)	/* I
      {
        cupsdClosePipe(job->back_pipes);
        cupsdClosePipe(job->side_pipes);
@@ -144,10 +147,10 @@ diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c
  
        close(job->status_pipes[1]);
        job->status_pipes[1] = -1;
-diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/printers.c
---- cups-1.5b1/scheduler/printers.c.serverbin-compat	2011-05-20 05:49:49.000000000 +0200
-+++ cups-1.5b1/scheduler/printers.c	2011-05-23 17:09:04.000000000 +0200
-@@ -1030,9 +1030,19 @@ cupsdLoadAllPrinters(void)
+diff -up cups-2.2rc1/scheduler/printers.c.serverbin-compat cups-2.2rc1/scheduler/printers.c
+--- cups-2.2rc1/scheduler/printers.c.serverbin-compat	2016-08-08 20:06:00.000000000 +0200
++++ cups-2.2rc1/scheduler/printers.c	2016-08-09 09:58:21.327033616 +0200
+@@ -967,9 +967,19 @@ cupsdLoadAllPrinters(void)
  	    * Backend does not exist, stop printer...
  	    */
  
@@ -167,7 +170,7 @@ diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/p
  	  }
          }
  
-@@ -3621,8 +3631,20 @@ add_printer_filter(
+@@ -3481,8 +3491,20 @@ add_printer_filter(
      else
        snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program);
  
diff --git a/cups.spec b/cups.spec
index cabca81..8619bce 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,7 +7,7 @@
 # but we use lib for compatibility with 3rd party drivers (at upstream request).
 %global cups_serverbin %{_exec_prefix}/lib/cups
 
-%global prever b2
+%global prever rc1
 %global VERSION %{version}%{prever}
 #%%global VERSION %{version}
 
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2
-Release: 0.2%{prever}%{?dist}
+Release: 0.1%{prever}%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -617,6 +617,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Aug 09 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2-0.2rc1
+- rebase to cups-2.2rc1
+
 * Wed Aug 03 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2-0.2b2
 - bug 1358589 - added information about syslog means systemd journal by default
 
diff --git a/sources b/sources
index d3db7b3..931e230 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-817fd56423d74dada906cc9e9ebee206  cups-2.2b2-source.tar.gz
+7918e68de41e2013cb580bae9004c410  cups-2.2rc1-source.tar.gz