From 2c116eb5709714dbdef92609c2b60e97a6f398e1 Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Fri, 17 Feb 2017 16:29:33 +0300
Subject: [PATCH] cups:update

---
 .../files/archlinux/cups-no-gzip-man.patch     |  2 +-
 .../files/pld-linux/cups-avahi-address.patch   | 18 +++++++++---------
 hardware/printer/cups/pspec.xml                | 11 +++++++++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch b/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch
index 69899b9cb7..a66971cbc4 100644
--- a/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch
+++ b/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch
@@ -4,7 +4,7 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
 @@ -69,10 +69,10 @@ case "$uname" in
  		;;
  	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
+ 		# Linux, GNU Hurd, and macOS
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
 -		MAN7EXT=7.gz
diff --git a/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch b/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch
index 1b40df957c..b8090ea0ca 100644
--- a/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch
+++ b/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c
---- cups-2.0rc1/cups/http-support.c.avahi-address	2014-08-28 17:37:22.000000000 +0200
-+++ cups-2.0rc1/cups/http-support.c	2014-09-12 15:31:45.062950696 +0200
-@@ -2342,7 +2342,7 @@ http_resolve_cb(
+diff -up cups-2.2b2/cups/http-support.c.avahi-address cups-2.2b2/cups/http-support.c
+--- cups-2.2b2/cups/http-support.c.avahi-address	2016-06-24 17:43:35.000000000 +0200
++++ cups-2.2b2/cups/http-support.c	2016-06-27 15:31:34.201361844 +0200
+@@ -2340,7 +2340,7 @@ http_resolve_cb(
      const char             *type,	/* I - Registration type */
      const char             *domain,	/* I - Domain (unused) */
      const char             *hostTarget,	/* I - Hostname */
@@ -10,7 +10,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
      uint16_t               port,	/* I - Port number */
      AvahiStringList        *txt,	/* I - TXT record */
      AvahiLookupResultFlags flags,	/* I - Lookup flags (unused) */
-@@ -2495,39 +2495,62 @@ http_resolve_cb(
+@@ -2493,39 +2493,62 @@ http_resolve_cb(
      * getting the IP address of the .local name and then do reverse-lookups...
      */
  
@@ -20,7 +20,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
 +    size_t addrlen;
 +    int error;
  
-     DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
+     DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget));
  
 -    snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
 -    if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
@@ -54,7 +54,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
  
 -        if (!error)
 -	{
--	  DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
+-	  DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn));
 +	if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
 +	    _cups_strcasecmp(hostptr, ".local"))
  
@@ -73,7 +73,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
 +
  #ifdef DEBUG
 -	else
--	  DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+-	  DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d",
 -	                httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
 -			error));
 +	DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
@@ -92,4 +92,4 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
 +   hostTarget = fqdn;
    }
  
-  /* 
+  /*
diff --git a/hardware/printer/cups/pspec.xml b/hardware/printer/cups/pspec.xml
index 9a64ce7d8e..d582d774b8 100644
--- a/hardware/printer/cups/pspec.xml
+++ b/hardware/printer/cups/pspec.xml
@@ -12,8 +12,8 @@
         <IsA>service</IsA>
         <Summary>Common Unix Printing System</Summary>
         <Description>cups provides a portable printing layer for *nix-based operating systems.</Description>
-        <Archive sha1sum="bba3c97e58902f883f22784aff669968d1231dd7" type="tarbz2">http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2</Archive>
-        <Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-2.1.2">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> -->
+        <Archive sha1sum="e38d2847eceeb3a2d59172d3c5a58d817632fe44" type="targz">https://github.com/apple/cups/releases/download/v2.2.2/cups-2.2.2-source.tar.gz</Archive>
+        <Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-2.2.2">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> -->
         <BuildDependencies>
             <Dependency>acl-devel</Dependency>
             <Dependency>pam-devel</Dependency>
@@ -148,6 +148,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-02-17</Date>
+            <Version>2.2.2</Version>
+            <Comment>Version Bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-09</Date>
             <Version>2.1.3</Version>