rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use correct port number when publishing services through Avahi

Browse Source 
(Ubuntu #792309).
This commit is contained in:
Tim Waugh 2011-06-03 15:52:13 +01:00
parent 1cca59f9dc
commit 28f2e3ad02
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cups-avahi.patch
View File

@ -1929,7 +1929,7 @@ diff -up cups-1.4.6/scheduler/dirsvc.c.avahi cups-1.4.6/scheduler/dirsvc.c
+ "_http._tcp", /* type */ + "_http._tcp", /* type */
+ NULL, /* domain */ + NULL, /* domain */
+ NULL, /* host */ + NULL, /* host */
+ htons(DNSSDPort), /* port */ + DNSSDPort, /* port */
+ "path=/", NULL); + "path=/", NULL);
+ if (ret == 0) + if (ret == 0)
+ ret = avahi_entry_group_commit (AvahiWebIFGroup); + ret = avahi_entry_group_commit (AvahiWebIFGroup);
@ -2424,7 +2424,7 @@ diff -up cups-1.4.6/scheduler/dirsvc.c.avahi cups-1.4.6/scheduler/dirsvc.c
+ AVAHI_IF_UNSPEC, + AVAHI_IF_UNSPEC,
+ AVAHI_PROTO_UNSPEC, + AVAHI_PROTO_UNSPEC,
+ 0, name, regtype, NULL, NULL, + 0, name, regtype, NULL, NULL,
+ htons(DNSSDPort), + DNSSDPort,
+ ipp_txt); + ipp_txt);
+ if (ret < 0) + if (ret < 0)
+ goto add_failed; + goto add_failed;
@ -2443,7 +2443,7 @@ diff -up cups-1.4.6/scheduler/dirsvc.c.avahi cups-1.4.6/scheduler/dirsvc.c
+ AVAHI_PROTO_UNSPEC, + AVAHI_PROTO_UNSPEC,
+ 0, name, + 0, name,
+ "_printer._tcp", NULL, NULL, + "_printer._tcp", NULL, NULL,
+ htons(515), + 515,
+ printer_txt); + printer_txt);
+ if (ret < 0) + if (ret < 0)
+ goto add_failed; + goto add_failed;

6
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.6 Version: 1.4.6
Release: 19%{?dist} Release: 20%{?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
@ -617,6 +617,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Jun 3 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-20
- Use correct port number when publishing services through Avahi
(Ubuntu #792309).
* Fri Jun 3 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-19 * Fri Jun 3 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-19
- Don't crash when unable to connect to D-Bus. - Don't crash when unable to connect to D-Bus.