commit cups for openSUSE:Factory
Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at Fri Jan 14 16:15:39 CET 2011. -------- --- cups/cups.changes 2010-12-09 14:36:27.000000000 +0100 +++ cups/cups.changes 2011-01-14 14:29:10.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 14 14:25:39 CET 2011 - jsmeix@suse.de + +- Upgraded to CUPS 1.4.6 + CUPS 1.4.6 fixes in particular a regression: + * A change was made in CUPS 1.4.5's pstops filter + that it did not support landscape printing + of PostScript files (STR #3722) + * For a complete list see the CHANGES.txt file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cups-1.4.5-source.tar.bz2 New: ---- cups-1.4.6-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.gOCBe9/_old 2011-01-14 16:14:37.000000000 +0100 +++ /var/tmp/diff_new_pack.gOCBe9/_new 2011-01-14 16:14:37.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package cups (Version 1.4.5) +# spec file for package cups # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,8 +34,12 @@ License: GPLv2+ ; LGPLv2.1+ Group: Hardware/Printing Summary: The Common UNIX Printing System -Version: 1.4.5 -Release: 2 +# Source0...Source9 is for sources from upstream: +# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.6/cups-1.4.6-source.tar.bz2 +# MD5 sum for Source0 on http://www.cups.org/software.php de8fb5a29c36554925c0c6a6e2c0dae1 +Version: 1.4.6 +Release: 1 +Source0: cups-%{version}-source.tar.bz2 # Require the exact matching version-release of the cups-libs sub-package because # non-matching CUPS libraries may let CUPS software crash (e.g. segfault) # because all CUPS software is built from the one same CUPS source tar ball @@ -47,19 +51,19 @@ # and all required packages are provided on the same repository: Requires: cups-libs = %{version}-%{release} Requires: cups-client = %{version} -Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters -Requires: util-linux /usr/bin/pdftops +Requires: ghostscript_any, ghostscript-fonts-std +Requires: util-linux +# See the configure setting '--with-pdftops=/usr/bin/pdftops': +Requires: /usr/bin/pdftops %if 0%{?suse_version} >= 1100 Requires: pdftools_any %endif +# Our Source105 PSLEVEL1.PPD.bz2 and Source106 PSLEVEL2.PPD.bz2 require foomatic-rip: +Requires: foomatic-filters Suggests: poppler-tools Conflicts: plp lprold lprng Obsoletes: cups-SUSE-ppds-dat Provides: cups-SUSE-ppds-dat -# Source0...Source9 is for sources from upstream: -# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.5/cups-1.4.5-source.tar.bz2 -# MD5 sum for Source0 on http://www.cups.org/software.php 50729f6fc46ba54223e0eaf5009f3419 -Source0: cups-%{version}-source.tar.bz2 # Patch0...Patch9 is for patches from upstream: # Source10...Source99 is for sources from Novell/openSUSE which are intended for upstream: # Patch10...Patch99 is for patches from Novell/openSUSE which are intended for upstream: @@ -374,7 +378,7 @@ # (In CUPS 1.3.10 a configure magic did silently skip to build # the pdftops filter when there was no /usr/bin/pdftops # installed in the build system regardless of an explicite -# configure setting ' --with-pdftops=/usr/bin/pdftops', +# configure setting '--with-pdftops=/usr/bin/pdftops', # see also http://www.cups.org/str.php?L3278). # When all mandatory files are explicitely listed, # the build fails intentionally if a mandatory file was not built ++++++ cups-1.4.5-source.tar.bz2 -> cups-1.4.6-source.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/CHANGES.txt new/cups-1.4.6/CHANGES.txt --- old/cups-1.4.5/CHANGES.txt 2010-11-11 18:40:35.000000000 +0100 +++ new/cups-1.4.6/CHANGES.txt 2011-01-06 23:21:05.000000000 +0100 @@ -1,6 +1,17 @@ -CHANGES.txt - 2010-11-11 +CHANGES.txt - 2011-01-06 ------------------------ +CHANGES IN CUPS V1.4.6 + + - Fixed a "make check" issue on Solaris (STR #3729) + - Regression: The pstops filter did not support landscape printing of + PostScript files (STR #3722) + - The scheduler killed retried (fax) jobs after restarting them + (STR #3697) + - The cupsAdminSetServerSettings() function disabled sharing when + debug logging was enabled (STR #3712) + + CHANGES IN CUPS V1.4.5 - Documentation fixes (STR #3542, STR #3650) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/INSTALL.txt new/cups-1.4.6/INSTALL.txt --- old/cups-1.4.5/INSTALL.txt 2010-11-11 18:40:35.000000000 +0100 +++ new/cups-1.4.6/INSTALL.txt 2011-01-06 23:25:46.000000000 +0100 @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.4.5 - 2010-11-11 +INSTALL - CUPS v1.4.6 - 2011-01-06 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/README.txt new/cups-1.4.6/README.txt --- old/cups-1.4.5/README.txt 2010-11-11 18:40:35.000000000 +0100 +++ new/cups-1.4.6/README.txt 2011-01-06 23:25:46.000000000 +0100 @@ -1,4 +1,4 @@ -README - CUPS v1.4.4 - 2010-11-11 +README - CUPS v1.4.6 - 2011-01-06 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" @@ -150,7 +150,7 @@ LEGAL STUFF - CUPS is Copyright 2007-2010 by Apple Inc. CUPS and the CUPS logo are + CUPS is Copyright 2007-2011 by Apple Inc. CUPS and the CUPS logo are trademarks of Apple Inc. The MD5 Digest code is Copyright 1999 Aladdin Enterprises. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/config-scripts/cups-common.m4 new/cups-1.4.6/config-scripts/cups-common.m4 --- old/cups-1.4.5/config-scripts/cups-common.m4 2010-11-11 21:11:32.000000000 +0100 +++ new/cups-1.4.6/config-scripts/cups-common.m4 2011-01-06 23:27:54.000000000 +0100 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 9259 2010-08-13 04:11:46Z mike $" +dnl "$Id: cups-common.m4 9377 2010-11-17 19:59:14Z mike $" dnl dnl Common configuration stuff for CUPS. dnl @@ -20,7 +20,7 @@ AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION=1.4.5 +CUPS_VERSION=1.4.6 CUPS_REVISION= #if test -z "$CUPS_REVISION" -a -d .svn; then # CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" @@ -370,5 +370,5 @@ AC_SUBST(LEGACY_BACKENDS) dnl -dnl End of "$Id: cups-common.m4 9259 2010-08-13 04:11:46Z mike $". +dnl End of "$Id: cups-common.m4 9377 2010-11-17 19:59:14Z mike $". dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/configure new/cups-1.4.6/configure --- old/cups-1.4.5/configure 2010-11-11 21:11:36.000000000 +0100 +++ new/cups-1.4.6/configure 2011-01-06 23:27:57.000000000 +0100 @@ -1989,7 +1989,7 @@ ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION=1.4.5 +CUPS_VERSION=1.4.6 CUPS_REVISION= #if test -z "$CUPS_REVISION" -a -d .svn; then # CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" @@ -23217,7 +23217,7 @@ cat >>$CONFIG_STATUS <<_ACEOF # First, check the format of the line: cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*/b def /^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def b :def diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/cups/adminutil.c new/cups-1.4.6/cups/adminutil.c --- old/cups-1.4.5/cups/adminutil.c 2010-08-31 17:56:40.000000000 +0200 +++ new/cups-1.4.6/cups/adminutil.c 2010-11-17 20:58:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 9282 2010-08-31 15:56:40Z mike $" + * "$Id: adminutil.c 9376 2010-11-17 19:58:22Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -17,16 +17,14 @@ * * Contents: * - * cupsAdminCreateWindowsPPD() - Create the Windows PPD file for a printer. - * cupsAdminExportSamba() - Export a printer to Samba. - * cupsAdminGetServerSettings() - Get settings from the server. - * _cupsAdminGetServerSettings() - Get settings from the server (private). - * cupsAdminSetServerSettings() - Set settings on the server. - * _cupsAdminSetServerSettings() - Set settings on the server (private). - * do_samba_command() - Do a SAMBA command. - * get_cupsd_conf() - Get the current cupsd.conf file. - * invalidate_cupsd_cache() - Invalidate the cached cupsd.conf settings. - * write_option() - Write a CUPS option to a PPD file. + * cupsAdminCreateWindowsPPD() - Create the Windows PPD file for a printer. + * cupsAdminExportSamba() - Export a printer to Samba. + * cupsAdminGetServerSettings() - Get settings from the server. + * cupsAdminSetServerSettings() - Set settings on the server. + * do_samba_command() - Do a SAMBA command. + * get_cupsd_conf() - Get the current cupsd.conf file. + * invalidate_cupsd_cache() - Invalidate the cached cupsd.conf settings. + * write_option() - Write a CUPS option to a PPD file. */ /* @@ -50,12 +48,6 @@ * Local functions... */ -extern int _cupsAdminGetServerSettings(http_t *http, - int *num_settings, - cups_option_t **settings); -extern int _cupsAdminSetServerSettings(http_t *http, - int num_settings, - cups_option_t *settings); static int do_samba_command(const char *command, const char *address, const char *subcommand, @@ -1024,7 +1016,7 @@ && *value != '/' #endif /* AF_LOCAL */ #ifdef AF_INET6 - && strcmp(value, "::1") + && strcmp(value, "[::1]") #endif /* AF_INET6 */ ) remote_access = 1; @@ -1284,12 +1276,18 @@ else old_debug_logging = 0; + DEBUG_printf(("1cupsAdminSetServerSettings: old debug_logging=%d", + old_debug_logging)); + if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ADMIN, cupsd_num_settings, cupsd_settings)) != NULL) old_remote_admin = atoi(val); else old_remote_admin = 0; + DEBUG_printf(("1cupsAdminSetServerSettings: old remote_admin=%d", + old_remote_admin)); + if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, cupsd_num_settings, cupsd_settings)) != NULL) remote_any = atoi(val); @@ -1305,18 +1303,27 @@ else old_remote_printers = 1; + DEBUG_printf(("1cupsAdminSetServerSettings: old remote_printers=%d", + old_remote_printers)); + if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, cupsd_num_settings, cupsd_settings)) != NULL) old_share_printers = atoi(val); else old_share_printers = 0; + DEBUG_printf(("1cupsAdminSetServerSettings: old share_printers=%d", + old_share_printers)); + if ((val = cupsGetOption(CUPS_SERVER_USER_CANCEL_ANY, cupsd_num_settings, cupsd_settings)) != NULL) old_user_cancel_any = atoi(val); else old_user_cancel_any = 0; + DEBUG_printf(("1cupsAdminSetServerSettings: old user_cancel_any=%d", + old_user_cancel_any)); + cupsFreeOptions(cupsd_num_settings, cupsd_settings); /* @@ -1340,16 +1347,22 @@ else debug_logging = -1; + DEBUG_printf(("1cupsAdminSetServerSettings: debug_logging=%d", + debug_logging)); + if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, num_settings, settings)) != NULL) remote_any = atoi(val); + DEBUG_printf(("1cupsAdminSetServerSettings: remote_any=%d", + remote_any)); + if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ADMIN, num_settings, settings)) != NULL) { remote_admin = atoi(val); - if (remote_admin == old_remote_admin && remote_any < 0) + if (remote_admin == old_remote_admin) { /* * No change to this setting... @@ -1361,6 +1374,9 @@ else remote_admin = -1; + DEBUG_printf(("1cupsAdminSetServerSettings: remote_admin=%d", + remote_admin)); + if ((val = cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS, num_settings, settings)) != NULL) { @@ -1378,12 +1394,15 @@ else remote_printers = -1; + DEBUG_printf(("1cupsAdminSetServerSettings: remote_printers=%d", + remote_printers)); + if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, num_settings, settings)) != NULL) { share_printers = atoi(val); - if (share_printers == old_share_printers && remote_any < 0) + if (share_printers == old_share_printers) { /* * No change to this setting... @@ -1395,6 +1414,9 @@ else share_printers = -1; + DEBUG_printf(("1cupsAdminSetServerSettings: share_printers=%d", + share_printers)); + if ((val = cupsGetOption(CUPS_SERVER_USER_CANCEL_ANY, num_settings, settings)) != NULL) { @@ -1412,6 +1434,9 @@ else user_cancel_any = -1; + DEBUG_printf(("1cupsAdminSetServerSettings: user_cancel_any=%d", + user_cancel_any)); + /* * Create a temporary file for the new cupsd.conf file... */ @@ -1463,7 +1488,7 @@ while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum)) { if ((!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")) && - (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0)) + (remote_admin >= 0 || remote_any > 0 || share_printers >= 0)) { if (!wrote_port_listen) { @@ -1678,7 +1703,7 @@ remote_any > 0 ? "all" : "@LOCAL"); } else if (in_root_location && - (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0)) + (remote_admin >= 0 || remote_any > 0 || share_printers >= 0)) { wrote_root_location = 1; @@ -1780,7 +1805,7 @@ in_cancel_job = 0; } else if ((((in_admin_location || in_conf_location || in_root_location) && - (remote_admin >= 0 || remote_any >= 0)) || + (remote_admin >= 0 || remote_any > 0)) || (in_root_location && share_printers >= 0)) && (!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny") || !strcasecmp(line, "Order"))) @@ -1826,7 +1851,7 @@ /* * Record the non-policy, non-location directives that we find * in the server settings, since we cache this info and record it - * in _cupsAdminGetServerSettings()... + * in cupsAdminGetServerSettings()... */ cupsd_num_settings = cupsAddOption(line, value, cupsd_num_settings, @@ -1885,7 +1910,7 @@ } if (!wrote_port_listen && - (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0)) + (remote_admin >= 0 || remote_any > 0 || share_printers >= 0)) { if (remote_admin > 0 || remote_any > 0 || share_printers > 0) { @@ -1906,7 +1931,7 @@ } if (!wrote_root_location && - (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0)) + (remote_admin >= 0 || remote_any > 0 || share_printers >= 0)) { if (remote_admin > 0 && share_printers > 0) cupsFilePuts(temp, @@ -2430,5 +2455,5 @@ /* - * End of "$Id: adminutil.c 9282 2010-08-31 15:56:40Z mike $". + * End of "$Id: adminutil.c 9376 2010-11-17 19:58:22Z mike $". */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/cups/cups.h new/cups-1.4.6/cups/cups.h --- old/cups-1.4.5/cups/cups.h 2010-06-22 05:18:27.000000000 +0200 +++ new/cups-1.4.6/cups/cups.h 2010-11-17 20:59:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 9171 2010-06-22 03:18:27Z mike $" + * "$Id: cups.h 9377 2010-11-17 19:59:14Z mike $" * * API definitions for CUPS. * @@ -61,10 +61,10 @@ * Constants... */ -# define CUPS_VERSION 1.0405 +# define CUPS_VERSION 1.0406 # define CUPS_VERSION_MAJOR 1 # define CUPS_VERSION_MINOR 4 -# define CUPS_VERSION_PATCH 5 +# define CUPS_VERSION_PATCH 6 # define CUPS_BC_FD 3 /* Back-channel file descriptor for select/poll */ # define CUPS_DATE_ANY (time_t)-1 @@ -336,5 +336,5 @@ #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 9171 2010-06-22 03:18:27Z mike $". + * End of "$Id: cups.h 9377 2010-11-17 19:59:14Z mike $". */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/doc/help/kerberos.html new/cups-1.4.6/doc/help/kerberos.html --- old/cups-1.4.5/doc/help/kerberos.html 2010-03-31 00:07:33.000000000 +0200 +++ new/cups-1.4.6/doc/help/kerberos.html 2010-11-19 17:48:37.000000000 +0100 @@ -113,7 +113,7 @@ <P>In order to support printing to a shared printer, CUPS has to ask the KDC for a copy of your credentials (this is called delegation) that can be sent to -the remote server for authenticatation. Delegation only works when the system +the remote server for authentication. Delegation only works when the system has a stable hostname which maps to the current address of the system, which is why you need a static IP address or DHCP that updates the DNS entry for your system.</P> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-1.4.5/doc/help/spec-ppd.html new/cups-1.4.6/doc/help/spec-ppd.html --- old/cups-1.4.5/doc/help/spec-ppd.html 2010-06-22 05:06:13.000000000 +0200 +++ new/cups-1.4.6/doc/help/spec-ppd.html 2010-12-08 08:23:22.000000000 +0100 @@ -8,7 +8,7 @@ </head> <body> Reply
participants (1)
-
root@hilbert.suse.de