Accepting request 121920 from home:jsmeix:branches:Printing

Upgrade to CUPS 1.5.3

OBS-URL: https://build.opensuse.org/request/show/121920
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=241
This commit is contained in:
Johannes Meixner 2012-05-23 12:12:05 +00:00 committed by Git OBS Bridge
parent 1843c82322
commit ae203d9d2c
5 changed files with 96 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
size 9595665

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
size 9580485

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed May 16 14:32:36 CEST 2012 - jsmeix@suse.de
- Upgraded to CUPS 1.5.3 (mainly a bugfix release) that fixes
a number of PostScript, SSL, authenticated printing,
and networking issues.
Excerpt:
* The scheduler could crash if a PPD file contained
an invalid paper size (STR #4049).
* Missing localizations caused empty output (STR #4033).
* Changed how timeouts are implemented in the LPD backend
(STR #4013).
* The default InputSlot setting was never used (STR #3957).
* Fixed the IPP backend's handling of HTTP/1.0 compatibility
(STR #3988).
For a complete list see the CHANGES.txt file.
- revert_cups-ssl.m4_to_1.5.2.patch reverts cups-ssl.m4 to what
it was in CUPS 1.5.2 so that autoconf produces a syntactically
correct configure script otherwise "bash -n configure" fails
with "syntax error: unexpected end of file",
see http://www.cups.org/str.php?L4084
-------------------------------------------------------------------
Thu Apr 12 10:53:55 CEST 2012 - jsmeix@suse.de

View File

@ -55,9 +55,9 @@ Summary: The Common UNIX Printing System
License: GPL-2.0+ ; LGPL-2.1+
Group: Hardware/Printing
# Source0...Source9 is for sources from upstream:
# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.2/cups-1.5.2-source.tar.bz2
# MD5 sum for Source0 on http://www.cups.org/software.php 9471d2a7c920cfbb17133c32d2e6866f
Version: 1.5.2
# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.3/cups-1.5.3-source.tar.bz2
# MD5 sum for Source0 on http://www.cups.org/software.php e1ad15257aa6f162414ea3beae0c5df8
Version: 1.5.3
Release: 0
Source0: cups-%{version}-source.tar.bz2
# Require the exact matching version-release of the cups-libs sub-package because
@ -132,8 +132,16 @@ Patch103: cups-1.4-do_not_strip_recommended_from_PPDs.patch
# Patch104 adds the 'allowallforanybody' policy to cupsd.conf
# see https://fate.novell.com/303515
Patch104: cups-1.5-additional_policies.patch
# Patch105 adds complete systemd support (see http://www.cups.org/str.php?L3917):
Patch105: cups-0001-systemd-add-systemd-socket-activation-and-unit-files.patch
# Patch106 fixes option --libs in cups-config script:
Patch106: cups-config-libs.patch
# Patch107 revert_cups-ssl.m4_to_1.5.2.patch reverts config-scripts/cups-ssl.m4
# to what it was in CUPS 1.5.2 so that autoconf (at least with autoconf version 2.63)
# produces a syntactically correct configure script otherwise "bash -n configure" fails
# with "configure: line <last line number +1>: syntax error: unexpected end of file",
# see http://www.cups.org/str.php?L4084
Patch107: revert_cups-ssl.m4_to_1.5.2.patch
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -266,8 +274,21 @@ printer drivers for CUPS.
%patch103
# Patch104 adds the 'allowallforanybody' policy to cupsd.conf:
%patch104
# Patch105 adds complete systemd support (see http://www.cups.org/str.php?L3917):
%patch105
# Patch106 fixes option --libs in cups-config script:
%patch106
# Patch107 revert_cups-ssl.m4_to_1.5.2.patch reverts config-scripts/cups-ssl.m4
# to what it was in CUPS 1.5.2 so that autoconf (at least with autoconf version 2.63)
# produces a syntactically correct configure script otherwise "bash -n configure" fails
# with "configure: line <last line number +1>: syntax error: unexpected end of file",
# see http://www.cups.org/str.php?L4084
# It fails with autoconf-2.63 that we use on SUSE Linux Enterprise 11 products
# but it works with autoconf-2.68 that we use on openSUSE 11.4, 12.1, and "Factory"
# so that Patch107 is only needed if suse_version < 1140:
%if 0%{?suse_version} < 1140
%patch107 -p1
%endif
%build
# Disable SILENT run of make so that make runs verbose as usual:
@ -309,7 +330,7 @@ export CXX=g++
--with-cachedir=/var/cache/cups \
--with-pdftops=/usr/bin/pdftops \
%if 0%{?have_systemd}
--with-systemdsystemunitdir=%{_unitdir} \
--with-systemdsystemunitdir=%{_unitdir} \
%endif
--prefix=/
make %{?_smp_mflags} CXX=g++

View File

@ -0,0 +1,46 @@
--- cups-1.5.3/config-scripts/cups-ssl.m4 2012-03-21 05:45:48.000000000 +0100
+++ cups-1.5.2/config-scripts/cups-ssl.m4 2011-06-16 22:12:16.000000000 +0200
@@ -1,9 +1,9 @@
dnl
-dnl "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $"
+dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $"
dnl
dnl OpenSSL/GNUTLS stuff for CUPS.
dnl
-dnl Copyright 2007-2012 by Apple Inc.
+dnl Copyright 2007-2011 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
@@ -136,9 +136,9 @@ if test x$enable_ssl != xno; then
dnl case the RSAREF libraries are needed.
for libcrypto in \
- "-lcrypto" \
- "-lcrypto -lrsaref" \
- "-lcrypto -lRSAglue -lrsaref"
+ "-lcrypto" \
+ "-lcrypto -lrsaref" \
+ "-lcrypto -lRSAglue -lrsaref"
do
AC_CHECK_LIB(ssl,SSL_new,
[have_ssl=1
@@ -149,9 +149,6 @@ if test x$enable_ssl != xno; then
$libcrypto)
if test "x${SSLLIBS}" != "x"; then
- LIBS="$SAVELIBS $SSLLIBS"
- AC_CHECK_FUNC(SSL_set_tlsext_host_name,
- AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME))
break
fi
done
@@ -176,6 +173,7 @@ AC_SUBST(SSLLIBS)
EXPORT_SSLLIBS="$SSLLIBS"
AC_SUBST(EXPORT_SSLLIBS)
+
dnl
-dnl End of "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $".
+dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $".
dnl