Commit Graph

1479 Commits

Author SHA1 Message Date
Tim Waugh
e946d3c862 Fixed systemd notify support (bug #1184453).
Resolves: rhbz#1184453
2015-01-27 11:21:21 +00:00
Jiri Popelka
fce8f58b49 2.0.1 2014-11-15 15:42:30 +01:00
Tim Waugh
663d26f200 Re-introduce SSLOptions configuration directive, disable SSL3 by default (STR #4476). 2014-11-07 08:58:28 +00:00
Tim Waugh
3b2095db5b Enable SSL again via GnuTLS (bug #1161235). 2014-11-07 08:52:09 +00:00
Tim Waugh
ad5e24d0b0 libacl-devel is needed for certificate handling. 2014-11-07 08:51:39 +00:00
Tim Waugh
b88d91d780 Removed openssl requirements from spec file as it is no longer supported upstream (see bug #1161235). 2014-11-06 17:41:01 +00:00
Tim Waugh
40da4be99b cups-lspp.patch: use cupsdLogJob() when appropriate. 2014-11-06 15:09:52 +00:00
Tim Waugh
8955d8cc4e Merge branch 'f21' 2014-11-06 14:48:42 +00:00
Tim Waugh
d8d7143681 Fixed some warnings in cups-lspp.patch. 2014-11-06 13:43:32 +00:00
Tim Waugh
670e473864 New systemd journal fields CUPS_DEST and CUPS_PRINTER, as well as accurate code location fields. 2014-11-06 13:42:50 +00:00
Tim Waugh
1beae2847c Merge branch 'f21' 2014-10-22 10:05:37 +01:00
Tim Waugh
1bcc7be6ea Include the patch. 2014-10-22 10:04:13 +01:00
Tim Waugh
44dc073686 Include the patch. 2014-10-22 10:03:53 +01:00
Tim Waugh
299d5dde47 Merge branch 'f21' 2014-10-22 09:06:14 +01:00
Tim Waugh
2efac284b9 Upstream fix for cupsd crash on restart when colord not available (STR #4496). 2014-10-22 09:04:09 +01:00
Tim Waugh
6865fdab0b Merge branch 'f21' 2014-10-18 15:04:51 +01:00
Tim Waugh
442919f148 Fix for last fix (bug #1153660, bug #1154284).
Resolves: rhbz#1153660 rhbz#1154284
(cherry picked from commit 3555918139f0ba4021a504c129840d13b234f100)
2014-10-18 15:02:28 +01:00
Tim Waugh
72a35e5a7f Merge branch 'f21'
Conflicts:
	cups-systemd-socket.patch
	cups.spec
2014-10-16 14:40:39 +01:00
Tim Waugh
a52574af07 Start cups.service after network.target (bug #1153660).
Resolves: rhbz#1153660
2014-10-16 14:25:30 +01:00
Tim Waugh
f64b8b6106 Merge branch 'f21' 2014-10-15 13:13:41 +01:00
Tim Waugh
5b29618af3 Fix cupsGetPPD3() so it doesn't give the caller an unreadable file (bug #1150917, STR #4500).
Resolves: rhbz#1150917
2014-10-15 13:10:06 +01:00
Tim Waugh
49f89e6a10 Merge branch 'f21' 2014-10-15 12:10:44 +01:00
Tim Waugh
fbc989962d Removed final-content-type patch as it causes issues for some backends (bug #1149244).
Resolves: rhbz#1149244
2014-10-15 12:02:36 +01:00
Jiri Popelka
e469187dca comment out unnecessary PageLogFormat from cups-files.conf (#1148995) 2014-10-03 14:09:59 +02:00
Jiri Popelka
86c3b85e5a s/org.cups.cupsd/cups/ cups.service 2014-10-03 13:10:26 +02:00
Jiri Popelka
a8ab7d63bf 2.0.0 2014-10-01 19:19:50 +02:00
Jiri Popelka
cdaa46736b cups-systemd-socket.patch: use upstream version of cupsd.socket
Some time ago we were using the following in cupsd.socket:
ListenStream=631
ListenDatagram=0.0.0.0:631

Then later we removed it due to
https://bugzilla.redhat.com/show_bug.cgi?id=842365

Upstream now (2.0rc1) uses
ListenStream=[::1]:631
ListenStream=127.0.0.1:631
which I think avoids the vulnerability (CVE-2012-6094)
so I guess we can actually go along with it.
2014-09-25 15:46:51 +02:00
Jiri Popelka
6dd0746894 2.0rc1 2014-09-12 18:22:22 +02:00
Tim Waugh
716a7a34ad Merge branch 'f21' 2014-09-01 13:07:18 +01:00
Tim Waugh
b6a9026c2b Merge branch 'f20' into f21 2014-09-01 13:07:02 +01:00
Tim Waugh
ad38ac5163 Fix icon display in web interface during server restart (STR #4475). 2014-09-01 13:05:11 +01:00
Tim Waugh
969cefb69a Merge branch 'f21' 2014-09-01 10:49:55 +01:00
Tim Waugh
dcfab8a06c Merge branch 'f20' into f21 2014-09-01 10:48:56 +01:00
Tim Waugh
b7255586de More STR #4461 fixes from upstream. 2014-09-01 10:17:39 +01:00
Tim Waugh
262db768e0 Merge branch 'f21' 2014-08-26 14:59:47 +01:00
Tim Waugh
37f28ef8e0 Merge branch 'f20' into f21 2014-08-26 14:59:41 +01:00
Tim Waugh
d10ba26486 Use upstream patch for STR #4461. 2014-08-26 14:58:54 +01:00
Tim Waugh
38b9a80a9d Merge branch 'f21'
Conflicts:
	cups.spec
2014-08-20 17:26:01 +01:00
Tim Waugh
5577ebfef2 Merge branch 'f20' into f21
Conflicts:
	cups.spec
2014-08-20 17:25:28 +01:00
Tim Waugh
93ba33eb74 Upstream patch for STR #2913 to limit Get-Jobs replies to 500 jobs (bug #421671).
Also includes:
- Upstream patch for STR #4396, pre-requisite for STR #2913 patch.

Resolves: rhbz#421671
2014-08-20 17:24:37 +01:00
Tim Waugh
65b804b1a3 Trigger/script improvements. 2014-08-20 16:40:19 +01:00
Peter Robinson
ffa3ffe4f6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 01:53:26 +00:00
Tim Waugh
4d7f8aec82 Merge branch 'f20' into f21 2014-08-14 13:25:16 +01:00
Tim Waugh
ba58bf89e4 Fix conf/log file reading for authenticated users (STR #4461). 2014-08-14 13:18:53 +01:00
Jiri Popelka
37bbb7d93e Merge branch 'f20' into f21 2014-08-01 10:31:37 +02:00
Jiri Popelka
540a30d157 1.7.5 2014-08-01 10:31:06 +02:00
Jiri Popelka
e97153e718 Merge branch 'f20' into f21 2014-07-23 17:27:07 +02:00
Jiri Popelka
feafaa334e CVE-2014-5029, CVE-2014-5030, CVE-2014-5031 (#1122601) 2014-07-23 17:23:15 +02:00
Tim Waugh
3c29b9339f Fix CGI handling (STR #4454). 2014-07-23 14:32:05 +01:00
Jiri Popelka
2f16865a8f Merge branch 'f20' into f21 2014-07-14 16:22:53 +02:00