Commit Graph

1325 Commits

Author SHA1 Message Date
Pavel Zhukov
86ced0c193 Fix for CVE-2017-18248 (#1561296) 2018-03-28 17:36:13 +02:00
Zdenek Dohnal
64bfa2dc8a remake of 1499261 2018-02-28 17:32:58 +01:00
Zdenek Dohnal
a9212b54ae mention library names explicitly to warn about soname change 2018-02-28 11:48:22 +01:00
Zdenek Dohnal
d0243322b0 1548120 - cups: Partial injection of Fedora build flags 2018-02-27 18:02:36 +01:00
Zdenek Dohnal
90a6038dcd pkgconfig is now shipped in pkgconf-pkg-config package 2018-02-26 12:52:53 +01:00
Zdenek Dohnal
dc96897f32 1499261 - Move log files into journal 2018-02-21 15:28:40 +01:00
Zdenek Dohnal
f5bc04cc1f gcc and gcc-c++ is not in buildroot by default now 2018-02-19 13:05:07 +01:00
Fedora Release Engineering
cebcd9a9f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 06:05:52 +00:00
Igor Gnatenko
25ae9b2790
Switch to %ldconfig_scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-02 11:14:44 +01:00
Björn Esser
579b072f12
Rebuilt for switch to libxcrypt 2018-01-20 23:06:36 +01:00
Zdenek Dohnal
056fd262df 1437345 - Remove cups-resolv_reload.patch 2018-01-12 12:03:58 +01:00
Zdenek Dohnal
ab1dfa50b3 rebase to 2.2.6 2017-11-03 16:44:04 +01:00
Zdenek Dohnal
cd39102794 rebase to 2.2.5 2017-10-17 19:21:25 +02:00
Zdenek Dohnal
a297474cdb removing ghostscript-cups dependency - cups-filters ships it 2017-10-09 19:27:14 +02:00
Zdenek Dohnal
d4e17e51c4 1498091 - Cannot browse CUPS servers in GNOME Control Panel Printers 2017-10-04 16:15:45 +02:00
Zdenek Dohnal
2a0cf20468 1484916 - Can not get destinations from CUPS server 2017-10-02 11:44:15 +02:00
Zdenek Dohnal
0d64488ce7 1494558 - CUPS may fail to start if NIS groups are used 2017-09-22 17:14:04 +02:00
Zdenek Dohnal
c758482de6 1494558 - CUPS may fail to start if NIS groups are used 2017-09-22 17:08:25 +02:00
Zdenek Dohnal
bb84095abf 1494558 - CUPS may fail to start if NIS groups are used 2017-09-22 16:57:30 +02:00
Fedora Release Engineering
0a560f366c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 19:21:28 +00:00
Fedora Release Engineering
fe388c0a9d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 05:46:24 +00:00
Zdenek Dohnal
7dc7717327 rebase to 2.2.4 2017-06-30 22:21:46 +02:00
Zdenek Dohnal
80c84f8105 update python dependencies accordingly Fedora Guideline for Python (python-cups -> python3-cups) 2017-06-29 08:49:58 +02:00
Zdenek Dohnal
933a717e1a copying cups-resolv_reload.patch from RHEL 2017-05-09 12:55:53 +02:00
Zdenek Dohnal
e8a468ba1d copying cups-resolv_reload.patch from RHEL 2017-05-09 12:44:07 +02:00
Zdenek Dohnal
d4dc7b0c24 copying cups-resolv_reload.patch from RHEL 2017-05-09 12:35:39 +02:00
Zdenek Dohnal
f8a15d6ee4 copying cups-resolv_reload.patch from RHEL 2017-04-27 10:44:02 +02:00
Zdenek Dohnal
b725e81f23 fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd 2017-04-05 21:43:00 +02:00
Zdenek Dohnal
06a5e3cbfe fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd 2017-04-05 21:36:46 +02:00
Zdenek Dohnal
25b70c2b70 fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd 2017-04-05 21:01:10 +02:00
Zdenek Dohnal
2b168451b0 fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd 2017-04-05 17:57:36 +02:00
Zdenek Dohnal
9b0e434ae9 disable patch for #1437065 for now until issue with stat is solved 2017-04-04 15:46:13 +02:00
Zdenek Dohnal
e54086a1f3 disable patch for #1437065 for now until issue with stat is solved 2017-04-04 15:42:57 +02:00
Zdenek Dohnal
87c3a7d070 disable patch for #1437065 for now until issue with stat is solved 2017-04-04 15:39:10 +02:00
Zdenek Dohnal
51ee42360b disable patch for #1437065 for now until issue with stat is solved 2017-04-04 15:36:19 +02:00
Zdenek Dohnal
3ad5f51fee 1437065 - CUPS does not recognize changes to /etc/resolv.conf until CUPS restart 2017-03-30 13:55:41 +02:00
Zdenek Dohnal
dc4c3cc029 1437065 - CUPS does not recognize changes to /etc/resolv.conf until CUPS restart 2017-03-30 13:46:57 +02:00
Zdenek Dohnal
aef9bcca76 1437065 - CUPS does not recognize changes to /etc/resolv.conf until CUPS restart 2017-03-30 13:24:42 +02:00
Zdenek Dohnal
61eac515ad 1437065 - CUPS does not recognize changes to /etc/resolv.conf until CUPS restart 2017-03-30 10:28:00 +02:00
Zdenek Dohnal
67c6cf37c3 rebase to 2.2.3 2017-03-29 14:56:55 +02:00
Fedora Release Engineering
68be7d5cbe - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 08:03:57 +00:00
Zdenek Dohnal
a5a6beb630 rebase to 2.2.2 2017-01-19 12:02:44 +01:00
Zdenek Dohnal
b1c96a522c bug 1405669 - adding group wheel to SystemGroup 2017-01-11 17:30:46 +01:00
Zdenek Dohnal
ccc656c306 bug 1405669 - adding group wheel to SystemGroup 2017-01-11 17:26:55 +01:00
Zdenek Dohnal
dbe3e75a6f bug 1405669 - adding group wheel to SystemGroup 2017-01-11 17:22:56 +01:00
Zdenek Dohnal
edf173cdfd Unable to print from Windows (7) on a Cups-Server(2.2.1-1) with german umlauts in the filename (bug #1386751) 2016-11-11 14:25:22 +01:00
Zdenek Dohnal
f937296141 873123 - (cups-usb-quirks) usb printer doesn't print (usblp0: USB Bidirectional printer dev) 2016-11-07 19:24:46 +01:00
Zdenek Dohnal
b804f627c2 873123 - (cups-usb-quirks) usb printer doesn't print (usblp0: USB Bidirectional printer dev) 2016-11-07 19:01:50 +01:00
Zdenek Dohnal
87d9daf0c8 rebase to 2.2.1 2016-10-04 19:13:34 +02:00
Zdenek Dohnal
523b1be22f fixing typo in cups-cpu-hammering.patch 2016-10-04 19:03:57 +02:00
Zdenek Dohnal
29a9aee6cb fixing looping in partial failing service (bug #1366775) 2016-09-22 11:27:58 +02:00
Jiri Popelka
8c714553f0 2.2.0 2016-09-15 14:54:01 +02:00
Zdenek Dohnal
e210215b6a fixing release number 2016-08-12 11:21:49 +02:00
Zdenek Dohnal
bd1cd7b34d rebase to cups-2.2rc1 2016-08-09 11:59:55 +02:00
Zdenek Dohnal
b8c3875a3b bug 1358589 - added information about syslog means systemd journal by default 2016-08-03 13:52:07 +02:00
Zdenek Dohnal
474e48d90b bug 1358589 - added information about syslog means systemd journal by default 2016-08-03 13:46:22 +02:00
Zdenek Dohnal
5d149992e9 Rebase to 2.2b2, editing patches and spec (no need for /etc/cups/interfaces) 2016-06-27 18:29:55 +02:00
Zdenek Dohnal
ddf3d6d470 substitution BuildRequires: pkgconfig(libsystemd-*) for BuildRequires: pkgconfig(libsystemd) 2016-06-27 13:43:31 +02:00
Zdenek Dohnal
438e9190dc Revert "2.1.4, 1346668 - Change symlink for smb backend to /usr/libexec/samba/cups_backend_smb"
This reverts commit 517e4ec2c9.
2016-06-27 12:37:06 +02:00
Zdenek Dohnal
517e4ec2c9 2.1.4, 1346668 - Change symlink for smb backend to /usr/libexec/samba/cups_backend_smb 2016-06-27 12:30:59 +02:00
Zdenek Dohnal
297482d2e7 2.1.4, 1346668 - Change symlink for smb backend to /usr/libexec/samba/cups_backend_smb 2016-06-15 16:23:18 +02:00
Jiri Popelka
a9b9d752e3 use %%{license} macro 2016-04-06 12:40:01 +02:00
Jiri Popelka
f40ea7c8d3 Merge branch 'f23' 2016-02-08 12:40:13 +01:00
Jiri Popelka
5aa9e698ac 2.1.3 2016-02-08 12:38:03 +01:00
Dennis Gilmore
9e2c5b0c64 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 18:19:35 +00:00
Jiri Popelka
ebc2dc281b 2.1.2 - interface scripts support is back (until 2.2) 2015-12-02 16:36:39 +01:00
Jiri Popelka
f39cae35c2 2.1.1 - interface scripts no longer supported. 2015-12-01 12:29:24 +01:00
Jiri Popelka
b1726bc83b Change mode of subscriptions.conf from 644 to 640 (bug #1259770). 2015-11-02 12:10:46 +01:00
Jiri Popelka
d74023bb36 2.1.0 2015-09-01 10:56:13 +02:00
Jiri Popelka
c24d1eaaa9 fix crash in scheduler (#1253135) 2015-08-13 11:16:19 +02:00
Jiri Popelka
6a53bfe80e better fix for STR#4687 2015-08-10 17:22:46 +02:00
Jiri Popelka
8d1f53d4a7 2.1rc1 2015-08-10 16:40:19 +02:00
Jiri Popelka
d3aa890d88 Merge branch 'f22' into f23 2015-08-10 14:21:20 +02:00
Jiri Popelka
45a9a3cd3b 2.0.4 2015-08-10 14:14:34 +02:00
Jiri Popelka
25f393d760 Merge branch 'f22' into f23 2015-07-28 13:05:28 +02:00
Jiri Popelka
404df9fdba BuildRequires: gnutls-devel -> pkgconfig(gnutls) 2015-07-28 13:04:33 +02:00
Jiri Popelka
05e2486c47 Merge branch 'f22' 2015-07-07 10:10:48 +02:00
Jiri Popelka
af6fe591d9 RPM_BUILD_ROOT -> %%{buildroot}, put braces around lspp and use_alternatives
Patch by David Walser (Mageia)
2015-07-07 10:08:06 +02:00
Tim Waugh
024ea5528c Merge branch 'f22' 2015-06-25 09:01:24 +01:00
Tim Waugh
10beaefb72 Fix slow resume of jobs after restart (STR #4646). 2015-06-25 08:59:36 +01:00
Tim Waugh
37fa67afb7 Fix redirection from CGI scripts (bug #1232030, STR #4538). 2015-06-25 08:37:32 +01:00
Dennis Gilmore
764362598e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 03:32:15 +00:00
Jiri Popelka
63c5f990b7 Merge branch 'f22' 2015-06-09 17:59:13 +02:00
Jiri Popelka
78f67073ef 2.0.3 2015-06-09 17:56:57 +02:00
Kalev Lember
48ae2e18ed Rebuilt for GCC 5 C++11 ABI change 2015-05-02 13:14:10 +02:00
Tim Waugh
746dd9cf56 Avoid busy loop in cupsd (bug #1179596).
Resolves: rhbz#1179596
2015-03-16 17:24:51 +00:00
Tim Waugh
9ca423a33b Avoid epoll for the moment (bug #1179596).
Resolves: rhbz#1179596
2015-03-15 18:00:22 +00:00
Tim Waugh
c8465a96a5 Avoid epoll for the moment (bug #1179596).
Resolves: rhbz#1179596
2015-03-13 09:25:35 +00:00
Jiri Popelka
d55138bf56 Fixed multilib.patch to check for gnutls instead of openssl. 2015-02-16 15:24:33 +01:00
Jiri Popelka
9347f32db4 2.0.2 2015-02-10 14:51:03 +01:00
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
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
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
Jiri Popelka
3e91a794f7 1.7.4: CVE-2014-3537 2014-07-14 16:20:20 +02:00
Dennis Gilmore
f01be03466 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 01:27:45 -05:00
Jiri Popelka
9914bc5355 Merge branch 'f20' 2014-05-28 10:32:29 +02:00
Jiri Popelka
09220e0319 1.7.3 2014-05-28 10:24:09 +02:00
Tim Waugh
8425e43657 Another attempt at avoiding race condition when sending IPP requests (STR #4386, bug #1072952).
Resolves: rhbz#1072952
(cherry picked from commit e3384fee59)

Conflicts:
	cups.spec
2014-05-12 15:32:34 +01:00
Tim Waugh
e3384fee59 Another attempt at avoiding race condition when sending IPP requests (STR #4386, bug #1072952).
Resolves: rhbz#1072952
2014-05-09 15:45:31 +01:00
Jiri Popelka
52c42a0a13 Make cups.service Type=notify (bug #1088918). 2014-04-17 16:59:54 +02:00
Jiri Popelka
5e0ad60bcb Merge branch 'f20' 2014-04-14 15:57:47 +02:00
Jiri Popelka
e53709b26f 1.7.2 2014-04-14 15:55:16 +02:00
Tim Waugh
08dafefb17 Log to the system journal by default (bug #1078781).
Resolves: rhbz#1078781
2014-04-04 14:22:14 +01:00
Tim Waugh
d2a88b36ba Merge branch 'f20'
Conflicts:
	cups.spec
2014-04-03 17:45:18 +01:00
Tim Waugh
ef073d1223 libcups: avoid race condition when sending IPP requests (STR #4386, bug #1072952).
New upstream patch to fix problems caused by first version of patch.

Resolves: rhbz#1072952
2014-04-03 17:20:33 +01:00
Jiri Popelka
7d8f9987c2 New client subpackage containing command line client tools (bug #1002342).
- Removed unneeded Group tags.
- Removed 'Requires: /sbin/chkconfig'.
- Moved 'Provides: lpd' to lpd subpackage.
2014-04-02 17:10:48 +02:00
Tim Waugh
ea58b56951 Removed patch for STR #4386 as it causes problems (bug #1077239).
Resolves: rhbz#1077239
2014-03-18 15:33:54 +00:00
Jiri Popelka
66abbacc23 BuildRequires: pkgconfig(foo) instead of foo-devel
https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires
2014-03-10 10:11:58 +01:00
Tim Waugh
fbc1998b1d Track local default in cupsEnumDests() (STR #4332). 2014-03-06 11:04:23 +00:00
Tim Waugh
fb3a0f4a71 libcups: avoid race condition when sending IPP requests (STR #4386). 2014-03-06 11:04:20 +00:00
Tim Waugh
3933cbca34 Prevent feedback loop when fetching error_log over HTTP (STR #4366). 2014-03-06 10:57:43 +00:00
Tim Waugh
fee478c5ac Fix for cupsEnumDest() 'removed' callbacks (bug #1054312, STR #4380).
Resolves: rhbz#1054312
2014-03-05 13:15:02 +00:00
Tim Waugh
7cb9904f3b Document 'journal' logging target. 2014-02-17 17:15:17 +00:00
Tim Waugh
7048cf473b Prevent dnssd backend exiting too early (bug #1026940).
Resolves: rhbz#1026940
2014-02-11 12:48:53 +00:00
Jiri Popelka
80d5b09737 move macros.cups from /etc/rpm/ to /usr/lib/rpm/macros.d 2014-02-03 12:34:36 +01:00
Jiri Popelka
6fc547202c 1.7.1 2014-01-08 18:53:40 +01:00
Tim Waugh
63b906b273 Apply upstream patch to improve cupsUser() (STR #4327). 2014-01-08 16:31:16 +00:00
Tim Waugh
a7745db8fb Removed cups-dbus-utf8.patch as no longer needed (see STR #4314). 2014-01-07 14:58:28 +00:00
Tim Waugh
ca5992f31a Return jobs in rank order when handling IPP-Get-Jobs (STR #4326). 2014-01-07 09:48:26 +00:00
Tim Waugh
fd624c76f2 dbus notifier: call _exit when handling SIGTERM (STR #4314). 2014-01-02 17:04:08 +00:00
Tim Waugh
ccb55ae4bc Use '-f' when using rm in %setup section. 2014-01-02 17:03:10 +00:00
Tim Waugh
9e47311571 Fixed avahi-no-threaded patch so it removes a call to avahi_threaded_poll_stop() (bug #1044602).
Resolves: rhbz#1044602
2014-01-02 12:08:49 +00:00
Tim Waugh
618d1c8838 Use string literal for format string in sd_journal_print call. 2013-12-13 15:28:03 +00:00
Tim Waugh
877241921a Merge branch 'f20'
Conflicts:
	cups.spec
2013-11-28 16:53:54 +00:00
Tim Waugh
b14fb4956c Prevent USB timeouts causing incorrect print output (bug #1026914).
Resolves: rhbz#1026914
2013-11-28 16:44:42 +00:00
Tim Waugh
476c560fb6 Merge branch 'f20'
Conflicts:
	cups.spec
2013-11-14 21:20:14 +00:00
Tim Waugh
2568000642 Merge branch 'f19' into f20
Conflicts:
	cups.spec
2013-11-14 18:14:23 +00:00
Tim Waugh
7e2a5812e7 Merge branch 'f18' into f19
Conflicts:
	cups.spec
2013-11-14 18:09:23 +00:00
Tim Waugh
c994ebe40f Avoid stale lockfile in dbus notifier (bug #1026949).
Resolves: rhbz#1026949
2013-11-14 17:58:25 +00:00
Tim Waugh
1e73bb4f8e Use upstream patch for stringpool corruption issue (bug #974048).
Resolves: rhbz#974048
2013-11-07 13:30:13 +00:00
Tim Waugh
46aab5fd7c Adjusted commented out default for SyncOnClose in cups-files.conf. 2013-11-04 11:45:33 +00:00
Tim Waugh
22be195ed4 Set the default for SyncOnClose to Yes. 2013-10-31 11:22:35 +00:00
Tim Waugh
5b52a14441 Use upstream patch to fix job history. 2013-10-28 16:31:46 +00:00
Tim Waugh
c874e6e680 Merge branch 'f20' 2013-10-24 16:50:13 +01:00
Tim Waugh
7632e7acbf 1.7.0. 2013-10-24 16:20:32 +01:00
Tim Waugh
3d3e404e3b Fix job history logging. 2013-10-24 15:44:10 +01:00
Tim Waugh
4fb45e11e6 Allow "journal" log type for log output to system journal. 2013-10-21 17:30:28 +01:00
Tim Waugh
1e8ec83658 Merge branch 'f19' into f20 2013-09-27 17:42:46 +01:00
Tim Waugh
77e3fed684 Reverted upstream change to FINAL_CONTENT_TYPE in order to fix printing to remote CUPS servers (bug #1010580).
Resolves: rhbz#1010580
2013-09-27 17:02:28 +01:00
Tim Waugh
2fa1ad240e 1.6.4. 2013-09-25 14:26:07 +01:00
Jaromír Končický
f14552855c Add SyncOnClose option (bug #984883). 2013-08-21 16:33:08 +02:00
Tim Waugh
87fad28bb7 Increase web interface get-devices timeout to 10s (bug #996664).
Resolves: rhbz#996664

(cherry picked from commit ae71d87ad6)
2013-08-16 16:39:09 +01:00
Tim Waugh
ae71d87ad6 Increase web interface get-devices timeout to 10s (bug #996664).
Resolves: rhbz#996664
2013-08-16 16:03:17 +01:00
Tim Waugh
2f41932707 Merge branch 'f19' 2013-08-15 12:50:22 +01:00
Tim Waugh
79bffad690 Build with full read-only relocations (bug #996740).
Resolves: rhbz#996740
2013-08-15 12:48:49 +01:00
Tim Waugh
03e73a97b8 Merge branch 'f19' 2013-08-06 17:29:24 +01:00
Tim Waugh
4f3285485a Fixes for jobs with multiple files and multiple formats.
Resolves: rhbz#972242
2013-08-06 17:27:37 +01:00
Dennis Gilmore
76a815e38f - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 01:23:13 -05:00
Tim Waugh
4ca8dddf86 Merge branch 'f19' 2013-07-24 09:11:27 +01:00
Tim Waugh
58a593e9fe Fixed cups-config, broken by last change (bug #987660).
Resolves: rhbz#987660
2013-07-24 09:04:35 +01:00
Tim Waugh
2529e37d00 Merge branch 'f19' 2013-07-22 15:00:43 +01:00
Tim Waugh
07b68eeeb1 Removed stale comment in spec file. 2013-07-22 14:47:47 +01:00
Tim Waugh
8dc0285c86 Link against OpenSSL instead of GnuTLS. 2013-07-22 14:41:55 +01:00
Tim Waugh
0fed0db9c4 Fixed avahi-no-threaded patch (was missing part of cupsd.h).
Thanks to Joseph Wang for spotting it.
2013-07-22 11:48:45 +01:00
Tim Waugh
821355b1d4 Merge branch 'f19' 2013-07-18 12:02:35 +01:00