Handle "localhost" resolving to 127.0.0.1 on IPv6-addressed systems (bug #737230).
This commit is contained in:
parent
c4dc311c9d
commit
778fcc75ef
14
cups-loopback.patch
Normal file
14
cups-loopback.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up cups-1.5.0/cups/http-addr.c.loopback cups-1.5.0/cups/http-addr.c
|
||||||
|
--- cups-1.5.0/cups/http-addr.c.loopback 2011-10-05 17:48:36.469794399 +0100
|
||||||
|
+++ cups-1.5.0/cups/http-addr.c 2011-10-05 17:48:52.293500663 +0100
|
||||||
|
@@ -147,7 +147,9 @@ httpAddrLocalhost(
|
||||||
|
|
||||||
|
#ifdef AF_INET6
|
||||||
|
if (addr->addr.sa_family == AF_INET6 &&
|
||||||
|
- IN6_IS_ADDR_LOOPBACK(&(addr->ipv6.sin6_addr)))
|
||||||
|
+ (IN6_IS_ADDR_LOOPBACK(&(addr->ipv6.sin6_addr)) ||
|
||||||
|
+ (IN6_IS_ADDR_V4COMPAT(&(addr->ipv6.sin6_addr)) &&
|
||||||
|
+ addr->ipv6.sin6_addr.s6_addr[12] == 0x7f)))
|
||||||
|
return (1);
|
||||||
|
#endif /* AF_INET6 */
|
||||||
|
|
11
cups.spec
11
cups.spec
@ -13,7 +13,7 @@
|
|||||||
Summary: Common Unix Printing System
|
Summary: Common Unix Printing System
|
||||||
Name: cups
|
Name: cups
|
||||||
Version: 1.5.0
|
Version: 1.5.0
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
||||||
@ -73,6 +73,7 @@ Patch35: cups-icc.patch
|
|||||||
Patch36: cups-systemd-socket.patch
|
Patch36: cups-systemd-socket.patch
|
||||||
Patch37: cups-CVE-2011-2896.patch
|
Patch37: cups-CVE-2011-2896.patch
|
||||||
Patch38: cups-driverd-bug.patch
|
Patch38: cups-driverd-bug.patch
|
||||||
|
Patch39: cups-loopback.patch
|
||||||
|
|
||||||
Patch100: cups-lspp.patch
|
Patch100: cups-lspp.patch
|
||||||
|
|
||||||
@ -300,6 +301,10 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
# Work around PPDs cache handling issue (bug #742989).
|
# Work around PPDs cache handling issue (bug #742989).
|
||||||
%patch38 -p1 -b .driverd-bug
|
%patch38 -p1 -b .driverd-bug
|
||||||
|
|
||||||
|
# Handle "localhost" resolving to 127.0.0.1 on IPv6-addressed systems
|
||||||
|
# (bug #737230).
|
||||||
|
%patch39 -p1 -b .loopback
|
||||||
|
|
||||||
%if %lspp
|
%if %lspp
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
%patch100 -p1 -b .lspp
|
%patch100 -p1 -b .lspp
|
||||||
@ -646,6 +651,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man1/ipptool.1.gz
|
%{_mandir}/man1/ipptool.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 5 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-14
|
||||||
|
- Handle "localhost" resolving to 127.0.0.1 on IPv6-addressed systems
|
||||||
|
(bug #737230).
|
||||||
|
|
||||||
* Tue Oct 4 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-13
|
* Tue Oct 4 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-13
|
||||||
- Work around PPDs cache handling issue (bug #742989).
|
- Work around PPDs cache handling issue (bug #742989).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user