rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Native Avahi support for announcing printers on the network.

Browse Source
This commit is contained in:
Tim Waugh 2010-12-24 13:14:06 +00:00
parent 6bf4b2c70e
commit 0b2684f38f
3 changed files with 2396 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2423
cups-avahi.patch
View File

File diff suppressed because it is too large Load Diff

104
cups-lspp.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.4.5/config.h.in.lspp cups-1.4.5/config.h.in
--- cups-1.4.5/config.h.in.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/config.h.in 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/config.h.in.lspp 2010-12-24 13:21:31.134859403 +0000
+++ cups-1.4.5/config.h.in 2010-12-24 13:21:31.173858387 +0000
@@ -672,6 +672,12 @@
#undef HAVE_SYS_STATVFS_H
#undef HAVE_SYS_VFS_H
@ -15,8 +15,8 @@ diff -up cups-1.4.5/config.h.in.lspp cups-1.4.5/config.h.in
#endif /* !_CUPS_CONFIG_H_ */
diff -up cups-1.4.5/config-scripts/cups-lspp.m4.lspp cups-1.4.5/config-scripts/cups-lspp.m4
--- cups-1.4.5/config-scripts/cups-lspp.m4.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/config-scripts/cups-lspp.m4 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/config-scripts/cups-lspp.m4.lspp 2010-12-24 13:21:31.174858361 +0000
+++ cups-1.4.5/config-scripts/cups-lspp.m4 2010-12-24 13:21:31.174858361 +0000
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
@ -55,8 +55,8 @@ diff -up cups-1.4.5/config-scripts/cups-lspp.m4.lspp cups-1.4.5/config-scripts/c
+ esac
+fi
diff -up cups-1.4.5/configure.in.lspp cups-1.4.5/configure.in
--- cups-1.4.5/configure.in.lspp 2010-06-22 23:42:44.000000000 +0200
+++ cups-1.4.5/configure.in 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/configure.in.lspp 2010-06-22 22:42:44.000000000 +0100
+++ cups-1.4.5/configure.in 2010-12-24 13:21:31.174858362 +0000
@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
sinclude(config-scripts/cups-pdf.m4)
sinclude(config-scripts/cups-scripting.m4)
@ -67,8 +67,8 @@ diff -up cups-1.4.5/configure.in.lspp cups-1.4.5/configure.in
UNINSTALL_LANGUAGES=""
LANGFILES=""
diff -up cups-1.4.5/cups/cups.h.lspp cups-1.4.5/cups/cups.h
--- cups-1.4.5/cups/cups.h.lspp 2010-06-22 05:18:27.000000000 +0200
+++ cups-1.4.5/cups/cups.h 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/cups/cups.h.lspp 2010-06-22 04:18:27.000000000 +0100
+++ cups-1.4.5/cups/cups.h 2010-12-24 13:21:31.176858307 +0000
@@ -15,6 +15,9 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
@ -93,8 +93,8 @@ diff -up cups-1.4.5/cups/cups.h.lspp cups-1.4.5/cups/cups.h
* Types and structures...
*/
diff -up cups-1.4.5/data/Makefile.lspp cups-1.4.5/data/Makefile
--- cups-1.4.5/data/Makefile.lspp 2008-11-12 20:30:57.000000000 +0100
+++ cups-1.4.5/data/Makefile 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000
+++ cups-1.4.5/data/Makefile 2010-12-24 13:21:31.177858282 +0000
@@ -25,7 +25,10 @@ BANNERS = \
secret \
standard \
@ -108,8 +108,8 @@ diff -up cups-1.4.5/data/Makefile.lspp cups-1.4.5/data/Makefile
CHARMAPS = \
euc-cn.txt \
diff -up cups-1.4.5/data/mls.lspp cups-1.4.5/data/mls
--- cups-1.4.5/data/mls.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/data/mls 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/data/mls.lspp 2010-12-24 13:21:31.177858282 +0000
+++ cups-1.4.5/data/mls 2010-12-24 13:21:31.178858258 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@ -373,8 +373,8 @@ diff -up cups-1.4.5/data/mls.lspp cups-1.4.5/data/mls
+%
+%%EOF
diff -up cups-1.4.5/data/selinux.lspp cups-1.4.5/data/selinux
--- cups-1.4.5/data/selinux.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/data/selinux 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/data/selinux.lspp 2010-12-24 13:21:31.178858258 +0000
+++ cups-1.4.5/data/selinux 2010-12-24 13:21:31.179858233 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@ -638,8 +638,8 @@ diff -up cups-1.4.5/data/selinux.lspp cups-1.4.5/data/selinux
+%
+%%EOF
diff -up cups-1.4.5/data/te.lspp cups-1.4.5/data/te
--- cups-1.4.5/data/te.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/data/te 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/data/te.lspp 2010-12-24 13:21:31.179858233 +0000
+++ cups-1.4.5/data/te 2010-12-24 13:21:31.180858207 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@ -903,8 +903,8 @@ diff -up cups-1.4.5/data/te.lspp cups-1.4.5/data/te
+%
+%%EOF
diff -up cups-1.4.5/filter/common.c.lspp cups-1.4.5/filter/common.c
--- cups-1.4.5/filter/common.c.lspp 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.4.5/filter/common.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100
+++ cups-1.4.5/filter/common.c 2010-12-24 13:21:31.181858180 +0000
@@ -30,6 +30,12 @@
* Include necessary headers...
*/
@ -1074,8 +1074,8 @@ diff -up cups-1.4.5/filter/common.c.lspp cups-1.4.5/filter/common.c
/*
diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c
--- cups-1.4.5/filter/pstops.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/filter/pstops.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/filter/pstops.c.lspp 2010-12-24 13:21:30.960863932 +0000
+++ cups-1.4.5/filter/pstops.c 2010-12-24 13:21:31.186858049 +0000
@@ -3335,6 +3335,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
@ -1232,8 +1232,8 @@ diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c
/*
diff -up cups-1.4.5/Makedefs.in.lspp cups-1.4.5/Makedefs.in
--- cups-1.4.5/Makedefs.in.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/Makedefs.in 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/Makedefs.in.lspp 2010-12-24 13:21:31.073860989 +0000
+++ cups-1.4.5/Makedefs.in 2010-12-24 13:21:31.187858023 +0000
@@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@
LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@
LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@ -1253,8 +1253,8 @@ diff -up cups-1.4.5/Makedefs.in.lspp cups-1.4.5/Makedefs.in
.c.o:
diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c
--- cups-1.4.5/scheduler/client.c.lspp 2010-10-17 06:13:56.000000000 +0200
+++ cups-1.4.5/scheduler/client.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/client.c.lspp 2010-10-17 05:13:56.000000000 +0100
+++ cups-1.4.5/scheduler/client.c 2010-12-24 13:21:31.194857839 +0000
@@ -44,6 +44,7 @@
* valid_host() - Is the Host: field valid?
* write_file() - Send a file via HTTP.
@ -1476,8 +1476,8 @@ diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c
* 'pipe_command()' - Pipe the output of a command to the remote client.
*/
diff -up cups-1.4.5/scheduler/client.h.lspp cups-1.4.5/scheduler/client.h
--- cups-1.4.5/scheduler/client.h.lspp 2009-05-27 00:01:23.000000000 +0200
+++ cups-1.4.5/scheduler/client.h 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100
+++ cups-1.4.5/scheduler/client.h 2010-12-24 13:21:31.195857813 +0000
@@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */
@ -1514,8 +1514,8 @@ diff -up cups-1.4.5/scheduler/client.h.lspp cups-1.4.5/scheduler/client.h
/*
diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c
--- cups-1.4.5/scheduler/conf.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/conf.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/conf.c.lspp 2010-12-24 13:21:30.897865572 +0000
+++ cups-1.4.5/scheduler/conf.c 2010-12-24 13:21:31.200857684 +0000
@@ -29,6 +29,7 @@
* read_configuration() - Read a configuration file.
* read_location() - Read a <Location path> definition.
@ -1626,8 +1626,8 @@ diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c
/*
* 'read_policy()' - Read a <Policy name> definition.
diff -up cups-1.4.5/scheduler/conf.h.lspp cups-1.4.5/scheduler/conf.h
--- cups-1.4.5/scheduler/conf.h.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/conf.h 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/conf.h.lspp 2010-12-24 13:21:30.897865572 +0000
+++ cups-1.4.5/scheduler/conf.h 2010-12-24 13:21:31.202857632 +0000
@@ -250,6 +250,12 @@ VAR char *ServerKey VALUE(NULL);
VAR int SSLOptions VALUE(CUPSD_SSL_NONE);
/* SSL/TLS options */
@ -1652,8 +1652,8 @@ diff -up cups-1.4.5/scheduler/conf.h.lspp cups-1.4.5/scheduler/conf.h
/*
* Prototypes...
diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c
--- cups-1.4.5/scheduler/ipp.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/ipp.c 2010-12-13 15:01:43.000000000 +0100
--- cups-1.4.5/scheduler/ipp.c.lspp 2010-12-24 13:21:31.114859924 +0000
+++ cups-1.4.5/scheduler/ipp.c 2010-12-24 13:21:31.217857242 +0000
@@ -41,6 +41,7 @@
* cancel_all_jobs() - Cancel all print jobs.
* cancel_job() - Cancel a print job.
@ -2252,8 +2252,8 @@ diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c
* Check the username against the owner...
*/
diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c
--- cups-1.4.5/scheduler/job.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/job.c 2010-12-13 15:02:11.000000000 +0100
--- cups-1.4.5/scheduler/job.c.lspp 2010-12-24 13:21:31.028862162 +0000
+++ cups-1.4.5/scheduler/job.c 2010-12-24 13:21:31.224857060 +0000
@@ -66,6 +66,9 @@
* update_job_attrs() - Update the job-printer-* attributes.
*/
@ -2649,8 +2649,8 @@ diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c
* Now start the first file in the job...
*/
diff -up cups-1.4.5/scheduler/job.h.lspp cups-1.4.5/scheduler/job.h
--- cups-1.4.5/scheduler/job.h.lspp 2009-05-12 00:46:01.000000000 +0200
+++ cups-1.4.5/scheduler/job.h 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100
+++ cups-1.4.5/scheduler/job.h 2010-12-24 13:21:31.225857034 +0000
@@ -13,6 +13,13 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@ -2677,8 +2677,8 @@ diff -up cups-1.4.5/scheduler/job.h.lspp cups-1.4.5/scheduler/job.h
typedef struct cupsd_joblog_s /**** Job log message ****/
diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c
--- cups-1.4.5/scheduler/main.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/main.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/main.c.lspp 2010-12-24 13:21:31.158858778 +0000
+++ cups-1.4.5/scheduler/main.c 2010-12-24 13:22:10.827825881 +0000
@@ -37,6 +37,8 @@
* usage() - Show scheduler usage.
*/
@ -2698,17 +2698,17 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c
/*
* Local functions...
@@ -161,6 +166,9 @@ main(int argc, /* I - Number of comm
int launchd_idle_exit;
/* Idle exit on select timeout? */
#endif /* HAVE_LAUNCHD */
@@ -145,6 +150,9 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+#if WITH_LSPP
+ auditfail_t failmode; /* Action for audit_open failure */
+#endif /* WITH_LSPP */
#ifdef HAVE_GETEUID
@@ -470,6 +478,25 @@ main(int argc, /* I - Number of comm
#ifdef __sgi
cups_file_t *fp; /* Fake lpsched lock file */
struct stat statbuf; /* Needed for checking lpsched FIFO */
@@ -474,6 +482,25 @@ main(int argc, /* I - Number of comm
#endif /* DEBUG */
}
@ -2734,7 +2734,7 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c
/*
* Set the timezone info...
*/
@@ -1219,6 +1246,11 @@ main(int argc, /* I - Number of comm
@@ -1241,6 +1268,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
@ -2747,8 +2747,8 @@ diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c
}
diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c
--- cups-1.4.5/scheduler/printers.c.lspp 2010-12-13 14:51:01.000000000 +0100
+++ cups-1.4.5/scheduler/printers.c 2010-12-13 14:51:01.000000000 +0100
--- cups-1.4.5/scheduler/printers.c.lspp 2010-12-24 13:21:31.168858518 +0000
+++ cups-1.4.5/scheduler/printers.c 2010-12-24 13:21:31.236856747 +0000
@@ -59,6 +59,8 @@
* write_xml_string() - Write a string with XML escaping.
*/
@ -2769,7 +2769,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c
/*
* 'cupsdAddPrinter()' - Add a printer to the system.
@@ -2266,6 +2272,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
@@ -2267,6 +2273,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
"username",
"password"
};
@ -2783,7 +2783,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
@@ -2396,6 +2409,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
@@ -2397,6 +2410,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
@ -2829,7 +2829,7 @@ diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c
}
p->raw = 0;
@@ -5535,7 +5587,6 @@ write_irix_state(cupsd_printer_t *p) /*
@@ -5536,7 +5588,6 @@ write_irix_state(cupsd_printer_t *p) /*
}
#endif /* __sgi */

12
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.5
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -54,7 +54,6 @@ Patch20: cups-res_init.patch
Patch21: cups-filter-debug.patch
Patch22: cups-uri-compat.patch
Patch23: cups-cups-get-classes.patch
Patch24: cups-avahi.patch
Patch25: cups-str3382.patch
Patch26: cups-force-gnutls.patch
Patch27: cups-serialize-gnutls.patch
@ -68,6 +67,7 @@ Patch36: cups-ricoh-deviceid-oid.patch
Patch37: cups-texttops-rotate-page.patch
Patch38: cups-autotype-crash.patch
Patch39: cups-str3754.patch
Patch40: cups-avahi.patch
Patch100: cups-lspp.patch
@ -251,8 +251,6 @@ module.
%patch22 -p1 -b .uri-compat
# Fix support for older CUPS servers in cupsGetDests.
%patch23 -p1 -b .cups-get-classes
# Avahi support in the dnssd backend.
%patch24 -p1 -b .avahi
# Fix temporary filename creation.
%patch25 -p1 -b .str3382
# Force the use of gnutls despite thread-safety concerns (bug #607159).
@ -284,6 +282,9 @@ module.
# Don't crash when job queued for printer that times out (bug #660604).
%patch39 -p1 -b .str3754
# Avahi support in the dnssd backend.
%patch40 -p1 -b .avahi
%if %lspp
# LSPP support.
%patch100 -p1 -b .lspp
@ -598,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Fri Dec 24 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.5-9
- Native Avahi support for announcing printers on the network.
* Wed Dec 22 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.5-8
- Don't crash when job queued for browsed printer that times out
(bug #660604).