From 9f14ee08c176bcfb92172532fe749e6df28e34b4 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Apr 26 2009 12:24:27 +0000
Subject: - Accept "Host: ::1" (bug #497393).


---

diff --git a/cups-localhost-ipv6.patch b/cups-localhost-ipv6.patch
new file mode 100644
index 0000000..6b1bb0f
--- /dev/null
+++ b/cups-localhost-ipv6.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.3.10/scheduler/client.c.localhost-ipv6 cups-1.3.10/scheduler/client.c
+--- cups-1.3.10/scheduler/client.c.localhost-ipv6	2009-04-16 20:32:04.000000000 +0100
++++ cups-1.3.10/scheduler/client.c	2009-04-26 13:19:58.000000000 +0100
+@@ -4879,7 +4879,8 @@ valid_host(cupsd_client_t *con)		/* I - 
+             !strcmp(host, "127.0.0.1") ||
+ 	    !strncmp(host, "127.0.0.1:", 10) ||
+ 	    !strcmp(host, "[::1]") ||
+-	    !strncmp(host, "[::1]:", 6));
++	    !strncmp(host, "[::1]:", 6) ||
++	    !strcmp(host, "::1"));
+   }
+ 
+ #ifdef HAVE_DNSSD
diff --git a/cups.spec b/cups.spec
index 83fa086..251d287 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 1%{?svn:.svn%{svn}}%{?dist}
+Release: 2%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -47,6 +47,7 @@ Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2536.patch
+Patch24: cups-localhost-ipv6.patch
 Patch25: cups-str3023.patch
 Patch28: cups-str2831.patch
 Patch100: cups-lspp.patch
@@ -167,6 +168,7 @@ lpd emulation.
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2536
+%patch24 -p1 -b .localhost-ipv6
 %patch25 -p1 -b .str3023
 %patch28 -p1 -b .str2831
 
@@ -449,7 +451,8 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Apr 24 2009 Tim Waugh <twaugh@redhat.com> 1:1.3.10-2
+* Sun Apr 26 2009 Tim Waugh <twaugh@redhat.com> 1:1.3.10-2
+- Accept "Host: ::1" (bug #497393).
 - Accept Host: fields set to the ServerName value (bug #497301).
 - Temporarily relax requirement to have printer-uri attribute in
   IPP-Get-Jobs request (bug #497519).