Hello community,
here is the log from the commit of package cups
checked in at Fri Aug 3 14:08:57 CEST 2007.
--------
--- cups/cups.changes 2007-06-25 10:19:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups/cups.changes 2007-07-30 15:43:33.745858000 +0200
@@ -1,0 +2,31 @@
+Mon Jul 30 15:41:27 CEST 2007 - kssingvo@suse.de
+
+- upgrade to cups-1.2.12:
+ * The PHP cups_print_file() function crashed if the options array
+ contained non-string option values
+ * The image/tiff file matching rule incorrectly identified some
+ text files as TIFF files
+ * The filter(7) man page incorrectly documented the "PAGE: total
+ #-pages" message
+ * PCL text files were mis-identified as HP-GL/2 and caused the
+ HP-GL/2 filter to hang
+ * When printing to a queue with user ACLs, the scheduler
+ incorrectly returned a quota error instead of a "not allowed to
+ print" error
+ * cupsaddsmb could get in a loop if no printer drivers were
+ installed
+ * cupsRasterReadHeader() did not byte-swap the header properly
+ when compiled with certain versions of GCC.
+ * The IPP backend did not send the document-format attribute for
+ filtered jobs
+ * Some PPD files could cause a crash in ppdOpen2
+ * The web admin interface incorrectly handled the "share
+ printers" and "show remote printers" settings
+ * The scheduler's log messages about AuthClass and AuthGroupName
+ advised using a replacement directive but had the wrong syntax
+ * Updated the PostScript/PJL and HP-GL/2 MIME rules to look in
+ the first 4k of the file, not just the first 1k
+ * Updated the Italian localization
+- updated the mime and the psrewrite patch
+
+-------------------------------------------------------------------
Old:
----
cups-1.2.11-source.tar.bz2
cups-1.2rc3-mime.patch
cups-1.2rc3-pswrite.patch
New:
----
cups-1.2.12-mime.patch
cups-1.2.12-pswrite.patch
cups-1.2.12-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.a27097/_old 2007-08-03 14:06:39.000000000 +0200
+++ /var/tmp/diff_new_pack.a27097/_new 2007-08-03 14:06:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cups (Version 1.2.11)
+# spec file for package cups (Version 1.2.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,11 +13,11 @@
Name: cups
BuildRequires: gcc-c++ libpng-devel libtiff-devel openldap2-devel openslp-devel openssl-devel pam-devel tcpd-devel update-desktop-files
URL: http://www.cups.org/
-License: GNU General Public License (GPL), individual distribution permission.
+License: GPL v2 or later, individual distribution permission.
Group: Hardware/Printing
Summary: The Common UNIX Printing System
-Version: 1.2.11
-Release: 19
+Version: 1.2.12
+Release: 1
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux
@@ -38,7 +38,7 @@
Source15: PSLEVEL1.PPD.bz2
Source16: PSLEVEL2.PPD.bz2
Source17: cups.SuSEfirewall2
-Patch1: cups-1.2rc3-mime.patch
+Patch1: cups-1.2.12-mime.patch
Patch2: cups-1.2.0-ppdsdat_generation.patch
Patch3: cups-1.2rc1-template.patch
Patch4: cups-1.2.7-libwrap.patch
@@ -46,7 +46,7 @@
Patch6: cups-1.2b2-access_conf.patch
Patch9: cups-1.1.21rc2-preauth_security.patch
Patch10: cups-1.1.21rc2-usermode.patch
-Patch12: cups-1.2rc3-pswrite.patch
+Patch12: cups-1.2.12-pswrite.patch
Patch13: cups-1.1.21-umlaut_printer.patch
Patch14: cups-1.1.21-testppd_duplex.patch
Patch15: cups-1.2.11-testppd_filename.patch
@@ -381,6 +381,34 @@
%{_datadir}/locale/*/cups_*
%changelog
+* Mon Jul 30 2007 - kssingvo@suse.de
+- upgrade to cups-1.2.12:
+ * The PHP cups_print_file() function crashed if the options array
+ contained non-string option values
+ * The image/tiff file matching rule incorrectly identified some
+ text files as TIFF files
+ * The filter(7) man page incorrectly documented the "PAGE: total
+ [#]-pages" message
+ * PCL text files were mis-identified as HP-GL/2 and caused the
+ HP-GL/2 filter to hang
+ * When printing to a queue with user ACLs, the scheduler
+ incorrectly returned a quota error instead of a "not allowed to
+ print" error
+ * cupsaddsmb could get in a loop if no printer drivers were
+ installed
+ * cupsRasterReadHeader() did not byte-swap the header properly
+ when compiled with certain versions of GCC.
+ * The IPP backend did not send the document-format attribute for
+ filtered jobs
+ * Some PPD files could cause a crash in ppdOpen2
+ * The web admin interface incorrectly handled the "share
+ printers" and "show remote printers" settings
+ * The scheduler's log messages about AuthClass and AuthGroupName
+ advised using a replacement directive but had the wrong syntax
+ * Updated the PostScript/PJL and HP-GL/2 MIME rules to look in
+ the first 4k of the file, not just the first 1k
+ * Updated the Italian localization
+- updated the mime and the psrewrite patch
* Mon Jun 25 2007 - kssingvo@suse.de
- added quosnmp script to %%doc
* Wed Jun 20 2007 - kssingvo@suse.de
++++++ cups-1.2rc3-mime.patch -> cups-1.2.12-mime.patch ++++++
--- cups/cups-1.2rc3-mime.patch 2006-05-10 16:06:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups/cups-1.2.12-mime.patch 2007-07-30 15:34:24.200936000 +0200
@@ -1,17 +1,17 @@
---- cups-1.2rc3/conf/mime.types.orig 2006-04-14 21:21:03.000000000 +0200
-+++ cups-1.2rc3/conf/mime.types 2006-04-26 16:31:35.000000000 +0200
-@@ -80,6 +80,8 @@
- contains(0,1024,"LANGUAGE = POSTSCRIPT") \
- (contains(0,1024,<0a>%!) + \
- !contains(0,1024,"ENTER LANGUAGE")))
+--- cups-1.2.12/conf/mime.types.orig 2007-07-07 00:39:54.000000000 +0200
++++ cups-1.2.12/conf/mime.types 2007-07-30 15:33:38.000000000 +0200
+@@ -84,6 +84,8 @@
+ contains(0,4096,"LANGUAGE = POSTSCRIPT") \
+ (contains(0,4096,<0a>%!) + \
+ !contains(0,4096,"ENTER LANGUAGE")))
+#application/x-dvi dvi string(0,<F702>)
+application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla"))
- application/vnd.hp-HPGL hpgl string(0,<1B>&)\
+ application/vnd.hp-HPGL hpgl \
string(0,<1B>E<1B>%0B) \
string(0,<1B>%-1B) string(0,<201B>)\
---- cups-1.2rc3/conf/mime.convs.orig 2006-04-14 21:21:03.000000000 +0200
-+++ cups-1.2rc3/conf/mime.convs 2006-04-26 16:31:04.000000000 +0200
-@@ -45,6 +45,8 @@
+--- cups-1.2.12/conf/mime.convs.orig 2007-03-27 18:11:27.000000000 +0200
++++ cups-1.2.12/conf/mime.convs 2007-07-30 15:31:46.000000000 +0200
+@@ -49,6 +49,8 @@
application/pdf application/postscript 33 pdftops
application/postscript application/vnd.cups-postscript 66 pstops
++++++ cups-1.2rc3-pswrite.patch -> cups-1.2.12-pswrite.patch ++++++
--- cups/cups-1.2rc3-pswrite.patch 2006-05-10 16:06:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups/cups-1.2.12-pswrite.patch 2007-07-30 15:38:51.533338000 +0200
@@ -1,6 +1,20 @@
---- cups-1.2rc3/conf/mime.convs.orig 2006-04-26 17:24:57.000000000 +0200
-+++ cups-1.2rc3/conf/mime.convs 2006-04-26 17:32:16.000000000 +0200
-@@ -46,7 +46,9 @@
+--- cups-1.2.12/conf/mime.types.orig 2007-07-30 15:34:55.000000000 +0200
++++ cups-1.2.12/conf/mime.types 2007-07-30 15:37:43.000000000 +0200
+@@ -85,7 +85,10 @@
+ (contains(0,4096,<0a>%!) + \
+ !contains(0,4096,"ENTER LANGUAGE")))
+ #application/x-dvi dvi string(0,<F702>)
+-application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla"))
++application/mozilla-ps ps (string(0,%!) + \
++ contains(30,200,"Creator: Mozilla PostScript"))
++application/netscape-ps ps (string(0,%!) + \
++ contains(30,200,"Creator: Mozilla (NetScape)"))
+ application/vnd.hp-HPGL hpgl \
+ string(0,<1B>E<1B>%0B) \
+ string(0,<1B>%-1B) string(0,<201B>)\
+--- cups-1.2.12/conf/mime.convs.orig 2007-07-30 15:34:55.000000000 +0200
++++ cups-1.2.12/conf/mime.convs 2007-07-30 15:34:55.000000000 +0200
+@@ -50,7 +50,9 @@
application/pdf application/postscript 33 pdftops
application/postscript application/vnd.cups-postscript 66 pstops
#application/x-dvi application/postscript 50 dvitops
@@ -11,17 +25,3 @@
application/vnd.hp-HPGL application/postscript 66 hpgltops
application/x-cshell application/postscript 33 texttops
application/x-csource application/postscript 33 texttops
---- cups-1.2rc3/conf/mime.types.orig 2006-04-26 17:24:57.000000000 +0200
-+++ cups-1.2rc3/conf/mime.types 2006-04-26 17:30:33.000000000 +0200
-@@ -81,7 +81,10 @@
- (contains(0,1024,<0a>%!) + \
- !contains(0,1024,"ENTER LANGUAGE")))
- #application/x-dvi dvi string(0,<F702>)
--application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla"))
-+application/mozilla-ps ps (string(0,%!) + \
-+ contains(30,200,"Creator: Mozilla PostScript"))
-+application/netscape-ps ps (string(0,%!) + \
-+ contains(30,200,"Creator: Mozilla (NetScape)"))
- application/vnd.hp-HPGL hpgl string(0,<1B>&)\
- string(0,<1B>E<1B>%0B) \
- string(0,<1B>%-1B) string(0,<201B>)\
++++++ cups-1.2.11-source.tar.bz2 -> cups-1.2.12-source.tar.bz2 ++++++
++++ 21062 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/backend/ipp.c new/cups-1.2.12/backend/ipp.c
--- old/cups-1.2.11/backend/ipp.c 2007-04-30 19:18:21.000000000 +0200
+++ new/cups-1.2.12/backend/ipp.c 2007-06-21 00:07:55.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: ipp.c 6484 2007-04-30 17:18:21Z mike $"
+ * "$Id: ipp.c 6583 2007-06-20 22:07:55Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
@@ -870,8 +870,8 @@
break;
if (i < format_sup->num_values)
- num_options = cupsAddOption("document-format", content_type,
- num_options, &options);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ "document-format", NULL, content_type);
}
if (copies_sup && version > 0 && send_options)
@@ -1671,5 +1671,5 @@
/*
- * End of "$Id: ipp.c 6484 2007-04-30 17:18:21Z mike $".
+ * End of "$Id: ipp.c 6583 2007-06-20 22:07:55Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/CHANGES.txt new/cups-1.2.12/CHANGES.txt
--- old/cups-1.2.11/CHANGES.txt 2007-05-08 23:10:50.000000000 +0200
+++ new/cups-1.2.12/CHANGES.txt 2007-07-09 20:03:39.000000000 +0200
@@ -1,6 +1,39 @@
-CHANGES.txt - 2007-05-08
+CHANGES.txt - 2007-07-09
------------------------
+CHANGES IN CUPS V1.2.12
+
+ - The PHP cups_print_file() function crashed if the options
+ array contained non-string option values (STR #2430)
+ - The image/tiff file matching rule incorrectly identified
+ some text files as TIFF files (STR #2431)
+ - The filter(7) man page incorrectly documented the
+ "PAGE: total #-pages" message (STR #2427)
+ - PCL text files were mis-identified as HP-GL/2 and
+ caused the HP-GL/2 filter to hang (STR #2423)
+ - When printing to a queue with user ACLs, the scheduler
+ incorrectly returned a quota error instead of a "not
+ allowed to print" error (STR #2409)
+ - cupsaddsmb could get in a loop if no printer drivers
+ were installed (STR #2407)
+ - cupsRasterReadHeader() did not byte-swap the header
+ properly when compiled with certain versions of GCC.
+ - The IPP backend did not send the document-format
+ attribute for filtered jobs (STR #2411)
+ - Some PPD files could cause a crash in ppdOpen2 (STR
+ #2408)
+ - The web admin interface incorrectly handled the "share
+ printers" and "show remote printers" settings (STR
+ #2393)
+ - The scheduler's log messages about AuthClass and
+ AuthGroupName advised using a replacement directive but
+ had the wrong syntax (STR #2400)
+ - Updated the PostScript/PJL and HP-GL/2 MIME rules to
+ look in the first 4k of the file, not just the first 1k
+ (STR #2386)
+ - Updated the Italian localization (STR #2382)
+
+
CHANGES IN CUPS V1.2.11
- Updated the launchd support on Mac OS X to better
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/conf/mime.types new/cups-1.2.12/conf/mime.types
--- old/cups-1.2.11/conf/mime.types 2007-03-27 18:11:27.000000000 +0200
+++ new/cups-1.2.12/conf/mime.types 2007-07-07 00:39:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# "$Id: mime.types 6406 2007-03-27 16:11:27Z mike $"
+# "$Id: mime.types 6625 2007-07-06 22:39:54Z mike $"
#
# MIME types file for the Common UNIX Printing System (CUPS).
#
@@ -78,20 +78,20 @@
application/pdf pdf string(0,%PDF)
application/postscript ai eps ps string(0,%!) string(0,<04>%!) \
contains(0,128,<1B>%-12345X) + \
- (contains(0,1024,"LANGUAGE=POSTSCRIPT") \
- contains(0,1024,"LANGUAGE = Postscript") \
- contains(0,1024,"LANGUAGE = PostScript") \
- contains(0,1024,"LANGUAGE = POSTSCRIPT") \
- (contains(0,1024,<0a>%!) + \
- !contains(0,1024,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL hpgl string(0,<1B>&)\
+ (contains(0,4096,"LANGUAGE=POSTSCRIPT") \
+ contains(0,4096,"LANGUAGE = Postscript") \
+ contains(0,4096,"LANGUAGE = PostScript") \
+ contains(0,4096,"LANGUAGE = POSTSCRIPT") \
+ (contains(0,4096,<0a>%!) + \
+ !contains(0,4096,"ENTER LANGUAGE")))
+application/vnd.hp-HPGL hpgl \
string(0,<1B>E<1B>%0B) \
string(0,<1B>%-1B) string(0,<201B>)\
string(0,BP;) string(0,IN;) string(0,DF;) \
string(0,BPINPS;) \
(contains(0,128,<1B>%-12345X) + \
- (contains(0,1024,"LANGUAGE=HPGL") \
- contains(0,1024,"LANGUAGE = HPGL")))
+ (contains(0,4096,"LANGUAGE=HPGL") \
+ contains(0,4096,"LANGUAGE = HPGL")))
########################################################################
#
@@ -105,7 +105,7 @@
char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff tiff tif string(0,MM) string(0,II)
+image/tiff tiff tif string(0,MM<002A>) string(0,II<2A00>)
image/x-photocd pcd string(2048,PCD_IPI)
image/x-portable-anymap pnm
image/x-portable-bitmap pbm string(0,P1) string(0,P4)
@@ -171,5 +171,5 @@
application/octet-stream
#
-# End of "$Id: mime.types 6406 2007-03-27 16:11:27Z mike $".
+# End of "$Id: mime.types 6625 2007-07-06 22:39:54Z mike $".
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/config-scripts/cups-common.m4 new/cups-1.2.12/config-scripts/cups-common.m4
--- old/cups-1.2.11/config-scripts/cups-common.m4 2007-05-08 23:11:23.000000000 +0200
+++ new/cups-1.2.12/config-scripts/cups-common.m4 2007-07-11 14:45:51.000000000 +0200
@@ -1,5 +1,5 @@
dnl
-dnl "$Id: cups-common.m4 6382 2007-03-21 15:20:37Z mike $"
+dnl "$Id: cups-common.m4 6550 2007-06-04 15:38:28Z mike $"
dnl
dnl Common configuration stuff for the Common UNIX Printing System (CUPS).
dnl
@@ -29,7 +29,7 @@
AC_CONFIG_HEADER(config.h)
dnl Version number information...
-CUPS_VERSION=1.2.11
+CUPS_VERSION=1.2.12
CUPS_REVISION=
AC_SUBST(CUPS_VERSION)
@@ -264,5 +264,5 @@
AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
dnl
-dnl End of "$Id: cups-common.m4 6382 2007-03-21 15:20:37Z mike $".
+dnl End of "$Id: cups-common.m4 6550 2007-06-04 15:38:28Z mike $".
dnl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/cups/adminutil.c new/cups-1.2.12/cups/adminutil.c
--- old/cups-1.2.11/cups/adminutil.c 2007-03-19 17:02:17.000000000 +0100
+++ new/cups-1.2.12/cups/adminutil.c 2007-07-07 00:39:54.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: adminutil.c 6362 2007-03-19 16:02:17Z mike $"
+ * "$Id: adminutil.c 6625 2007-07-06 22:39:54Z mike $"
*
* Administration utility API definitions for the Common UNIX Printing
* System (CUPS).
@@ -656,12 +656,15 @@
"are installed!")),
sizeof(message));
- _cupsSetError(IPP_INTERNAL_ERROR, message);
+ _cupsSetError(IPP_NOT_FOUND, message);
_cupsLangPrintf(logfile, "%s\n", message);
}
if (have_drivers == 0)
+ {
+ _cupsSetError(IPP_NOT_FOUND, message);
return (0);
+ }
/*
* Finally, associate the drivers we just added with the queue...
@@ -1260,14 +1263,21 @@
{
if (!wrote_browsing)
{
+ int new_remote_printers = (remote_printers > 0 ||
+ (remote_printers == -1 &&
+ old_remote_printers > 0));
+ int new_share_printers = (share_printers > 0 ||
+ (share_printers == -1 &&
+ old_share_printers > 0));
+
wrote_browsing = 1;
- if (remote_printers > 0 || share_printers > 0)
+ if (new_remote_printers || new_share_printers)
{
- if (remote_printers > 0 && share_printers > 0)
+ if (new_remote_printers && new_share_printers)
cupsFilePuts(temp,
"# Enable printer sharing and shared printers.\n");
- else if (remote_printers > 0)
+ else if (new_remote_printers)
cupsFilePuts(temp,
"# Show shared printers on the local network.\n");
else
@@ -1277,10 +1287,10 @@
cupsFilePuts(temp, "Browsing On\n");
cupsFilePuts(temp, "BrowseOrder allow,deny\n");
- if (remote_printers > 0)
+ if (new_remote_printers)
cupsFilePuts(temp, "BrowseAllow @LOCAL\n");
- if (share_printers > 0)
+ if (new_share_printers)
cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
}
else
@@ -2127,5 +2137,5 @@
/*
- * End of "$Id: adminutil.c 6362 2007-03-19 16:02:17Z mike $".
+ * End of "$Id: adminutil.c 6625 2007-07-06 22:39:54Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/cups/cups.h new/cups-1.2.12/cups/cups.h
--- old/cups-1.2.11/cups/cups.h 2007-03-21 16:20:37.000000000 +0100
+++ new/cups-1.2.12/cups/cups.h 2007-06-04 17:38:28.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: cups.h 6382 2007-03-21 15:20:37Z mike $"
+ * "$Id: cups.h 6550 2007-06-04 15:38:28Z mike $"
*
* API definitions for the Common UNIX Printing System (CUPS).
*
@@ -68,10 +68,10 @@
* Constants...
*/
-# define CUPS_VERSION 1.0211
+# define CUPS_VERSION 1.0212
# define CUPS_VERSION_MAJOR 1
# define CUPS_VERSION_MINOR 2
-# define CUPS_VERSION_PATCH 11
+# define CUPS_VERSION_PATCH 12
# define CUPS_DATE_ANY -1
@@ -251,5 +251,5 @@
#endif /* !_CUPS_CUPS_H_ */
/*
- * End of "$Id: cups.h 6382 2007-03-21 15:20:37Z mike $".
+ * End of "$Id: cups.h 6550 2007-06-04 15:38:28Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/cups/ppd.c new/cups-1.2.12/cups/ppd.c
--- old/cups-1.2.11/cups/ppd.c 2007-04-05 01:43:50.000000000 +0200
+++ new/cups-1.2.12/cups/ppd.c 2007-06-20 23:17:49.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: ppd.c 6446 2007-04-04 23:43:50Z mike $"
+ * "$Id: ppd.c 6581 2007-06-20 21:17:49Z mike $"
*
* PPD file routines for the Common UNIX Printing System (CUPS).
*
@@ -1013,11 +1013,15 @@
if ((option = ppdFindOption(ppd, keyword + 6)) == NULL)
{
+ int groupidx; /* Index for current group */
ppd_group_t *gtemp; /* Temporary group */
DEBUG_printf(("%s option not found for %s...\n", keyword + 6, keyword));
+ if (group)
+ groupidx = group - ppd->groups; /* Save index for current group */
+
if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
encoding)) == NULL)
{
@@ -1026,6 +1030,9 @@
goto error;
}
+ if (group)
+ group = ppd->groups + groupidx; /* Restore group pointer */
+
if ((option = ppd_get_option(gtemp, keyword + 6)) == NULL)
{
DEBUG_printf(("Unable to get %s option!\n", keyword + 6));
@@ -1079,8 +1086,12 @@
if ((option = ppdFindOption(ppd, "PageRegion")) == NULL)
{
+ int groupidx; /* Index to current group */
ppd_group_t *gtemp; /* Temporary group */
+ if (group)
+ groupidx = group - ppd->groups; /* Save index for current group */
+
if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
encoding)) == NULL)
{
@@ -1089,6 +1100,9 @@
goto error;
}
+ if (group)
+ group = ppd->groups + groupidx; /* Restore group pointer */
+
option = ppd_get_option(gtemp, "PageRegion");
}
@@ -3102,5 +3116,5 @@
/*
- * End of "$Id: ppd.c 6446 2007-04-04 23:43:50Z mike $".
+ * End of "$Id: ppd.c 6581 2007-06-20 21:17:49Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/filter/hpgl-input.c new/cups-1.2.12/filter/hpgl-input.c
--- old/cups-1.2.11/filter/hpgl-input.c 2006-02-22 20:21:50.000000000 +0100
+++ new/cups-1.2.12/filter/hpgl-input.c 2007-07-07 00:39:54.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $"
+ * "$Id: hpgl-input.c 6625 2007-07-06 22:39:54Z mike $"
*
* HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
*
@@ -182,7 +182,9 @@
{
bufptr = buf;
while ((ch = getc(fp)) != ';')
- if (bufptr < (buf + sizeof(buf) - 1))
+ if (ch == EOF)
+ break;
+ else if (bufptr < (buf + sizeof(buf) - 1))
*bufptr++ = ch;
*bufptr = '\0';
@@ -194,6 +196,10 @@
while (!done)
switch (ch = getc(fp))
{
+ case EOF :
+ done = 1;
+ break;
+
case ',' :
case ' ' :
case '\n' :
@@ -269,5 +275,5 @@
/*
- * End of "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $".
+ * End of "$Id: hpgl-input.c 6625 2007-07-06 22:39:54Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/filter/raster.c new/cups-1.2.12/filter/raster.c
--- old/cups-1.2.11/filter/raster.c 2006-10-23 02:26:52.000000000 +0200
+++ new/cups-1.2.12/filter/raster.c 2007-06-21 19:24:22.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: raster.c 6061 2006-10-23 00:26:52Z mike $"
+ * "$Id: raster.c 6585 2007-06-21 17:24:22Z mike $"
*
* Raster file routines for the Common UNIX Printing System (CUPS).
*
@@ -171,6 +171,8 @@
r->sync == CUPS_RASTER_REVSYNCv1 ||
r->sync == CUPS_RASTER_REVSYNCv2)
r->swapped = 1;
+
+ DEBUG_printf(("r->swapped=%d, r->sync=%08x\n", r->swapped, r->sync));
}
else
{
@@ -524,10 +526,8 @@
unsigned char *p, /* I - Bytes to write */
unsigned len)/* I - Number of bytes to write */
{
-#ifdef DEBUG
- fprintf(stderr, "cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n",
- r, p, len, r->remaining);
-#endif /* DEBUG */
+ DEBUG_printf(("cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n",
+ r, p, len, r->remaining));
if (r == NULL || r->mode != CUPS_RASTER_WRITE || r->remaining == 0)
return (0);
@@ -550,12 +550,7 @@
cups_raster_read_header(
cups_raster_t *r) /* I - Raster stream */
{
- int len; /* Number of words to swap */
- union swap_s /* Swapping structure */
- {
- unsigned char b[4];
- unsigned v;
- } *s;
+ int len; /* Length for read/swap */
if (r == NULL || r->mode != CUPS_RASTER_READ)
@@ -584,10 +579,28 @@
*/
if (r->swapped)
- for (len = 81, s = (union swap_s *)&(r->header.AdvanceDistance);
+ {
+ unsigned *s, /* Current word */
+ temp; /* Temporary copy */
+
+
+ DEBUG_puts("Swapping header bytes...");
+
+ for (len = 81, s = &(r->header.AdvanceDistance);
len > 0;
len --, s ++)
- s->v = (((((s->b[3] << 8) | s->b[2]) << 8) | s->b[1]) << 8) | s->b[0];
+ {
+ DEBUG_printf(("%08x =>", *s));
+
+ temp = *s;
+ *s = ((temp & 0xff) << 24) |
+ ((temp & 0xff00) << 8) |
+ ((temp & 0xff0000) >> 8) |
+ ((temp & 0xff000000) >> 24);
+
+ DEBUG_printf((" %08x\n", *s));
+ }
+ }
/*
* Update the header and row count...
@@ -928,5 +941,5 @@
/*
- * End of "$Id: raster.c 6061 2006-10-23 00:26:52Z mike $".
+ * End of "$Id: raster.c 6585 2007-06-21 17:24:22Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/locale/cups_it.po new/cups-1.2.12/locale/cups_it.po
--- old/cups-1.2.11/locale/cups_it.po 2007-01-23 15:22:26.000000000 +0100
+++ new/cups-1.2.12/locale/cups_it.po 2007-06-04 17:38:28.000000000 +0200
@@ -17,13 +17,13 @@
# EMail: cups-info@cups.org
# WWW: http://www.cups.org
#
-# Vincenzo Reale , 2006.
+# Vincenzo Reale , 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: cups_it\n"
"Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
"POT-Creation-Date: 2007-01-23 09:19-0500\n"
-"PO-Revision-Date: 2006-11-16 00:34+0100\n"
+"PO-Revision-Date: 2007-05-13 07:50+0200\n"
"Last-Translator: Vincenzo Reale \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
@@ -104,10 +104,8 @@
msgid "The printer or class was not found."
msgstr "La stampante o la classe non è stata trovata."
-msgid ""
-"The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
-msgstr ""
-"printer-uri deve essere nella forma \"ipp://NOMEHOST/classes/NOMECLASSE\"."
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
+msgstr "printer-uri deve essere nella forma \"ipp://NOMEHOST/classes/NOMECLASSE\"."
#, c-format
msgid "The printer-uri \"%s\" contains invalid characters."
@@ -144,14 +142,12 @@
msgid "The notify-user-data value is too large (%d > 63 octets)!"
msgstr "Il valore notify-user-data è troppo grande (%d > 63 ottetti)!"
-msgid ""
-"The notify-lease-duration attribute cannot be used with job subscriptions."
+msgid "The notify-lease-duration attribute cannot be used with job subscriptions."
msgstr ""
"L'attributo notify-lease-duration non può essere usato con le sottoscrizioni "
"delle operazioni."
-msgid ""
-"The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
+msgid "The printer-uri must be of the form \"ipp://HOSTNAME/printers/PRINTERNAME\"."
msgstr ""
"printer-uri deve essere nella forma \"ipp://NOMEHOST/printers/NOMESTAMPANTE"
"\"."
@@ -216,8 +212,7 @@
#, c-format
msgid "You are not authorized to authenticate job #%d owned by \"%s\"!"
-msgstr ""
-"Non sei autorizzato ad autenticare l'operazione #%d di proprietà di \"%s\"!"
+msgstr "Non sei autorizzato ad autenticare l'operazione #%d di proprietà di \"%s\"!"
msgid "The printer-uri attribute is required!"
msgstr "L'attributo printer-uri è richiesto!"
@@ -235,8 +230,7 @@
#, c-format
msgid "You are not authorized to delete job #%d owned by \"%s\"!"
-msgstr ""
-"Non sei autorizzato ad eliminare l'operazione #%d di proprietà di \"%s\"!"
+msgstr "Non sei autorizzato ad eliminare l'operazione #%d di proprietà di \"%s\"!"
#, c-format
msgid "Job #%d is already %s - can't cancel."
@@ -281,10 +275,10 @@
msgstr "Nessuna stampante predefinita"
msgid "cups-deviced failed to execute."
-msgstr "esecuzione di cups-deviced fallita."
+msgstr "esecuzione di cups-deviced non riuscita."
msgid "cups-driverd failed to execute."
-msgstr "esecuzione di cups-driverd fallita."
+msgstr "esecuzione di cups-driverd non riuscita."
msgid "No destinations added."
msgstr "Nessuna destinazione aggiunta."
@@ -314,8 +308,7 @@
#, c-format
msgid "You are not authorized to move job #%d owned by \"%s\"!"
-msgstr ""
-"Non sei autorizzato a spostare l'operazione #%d di proprietà di \"%s\"!"
+msgstr "Non sei autorizzato a spostare l'operazione #%d di proprietà di \"%s\"!"
msgid "job-printer-uri attribute missing!"
msgstr "attributo job-printer-uri mancante!"
@@ -470,8 +463,7 @@
msgstr "lpq: Destinazione \"%s\" sconosciuta!\n"
#, c-format
-msgid ""
-"lp: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "lp: error - %s environment variable names non-existent destination \"%s\"!\n"
msgstr ""
"lp: errore - i nomi della variabile d'ambiente %s non esistono nella "
"destinazione \"%s\"!\n"
@@ -481,10 +473,9 @@
#, c-format
msgid "lpq: get-jobs failed: %s\n"
-msgstr "lpq: get-jobs fallito: %s\n"
+msgstr "lpq: get-jobs non riuscito: %s\n"
-msgid ""
-"Rank Owner Pri Job Files Total Size\n"
+msgid "Rank Owner Pri Job Files Total Size\n"
msgstr "Posiz. Proprietario Stamp. Operaz. File Dim. totali\n"
msgid "Rank Owner Job File(s) Total Size\n"
@@ -511,7 +502,7 @@
#, c-format
msgid "lpq: get-printer-attributes failed: %s\n"
-msgstr "lpq: get-printer-attributes fallito: %s\n"
+msgstr "lpq: get-printer-attributes non riuscito: %s\n"
#, c-format
msgid "%s is ready\n"
@@ -544,8 +535,7 @@
msgstr "lpr: errore - attesa opzione=valore dopo l'opzione -o !\n"
msgid "lpr: warning - email notification is not currently supported!\n"
-msgstr ""
-"lpr: attenzione - le notifiche via email non sono al momento supportate!\n"
+msgstr "lpr: attenzione - le notifiche via email non sono al momento supportate!\n"
msgid "lpr: error - expected destination after -P option!\n"
msgstr "lpr: errore - destinazione attesa dopo l'opzione -P!\n"
@@ -573,8 +563,7 @@
msgstr "lpr: errore - troppi file - \"%s\"\n"
#, c-format
-msgid ""
-"lpr: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "lpr: error - %s environment variable names non-existent destination \"%s\"!\n"
msgstr ""
"lpr: errore - i nomi della variabile d'ambiente %s non esistono nella "
"destinazione \"%s\"!\n"
@@ -587,11 +576,11 @@
#, c-format
msgid "lpr: error - unable to create temporary file \"%s\" - %s\n"
-msgstr "lpr: errore - impossible creare il file temporaneo \"%s\" - %s\n"
+msgstr "lpr: errore - impossibile creare il file temporaneo \"%s\" - %s\n"
#, c-format
msgid "lpr: error - unable to write to temporary file \"%s\" - %s\n"
-msgstr "lpr: errore - impossible scrivere il file temporaneo \"%s\" - %s\n"
+msgstr "lpr: errore - impossibile scrivere il file temporaneo \"%s\" - %s\n"
msgid "lpr: error - stdin is empty, so no job has been sent.\n"
msgstr "lpr: errore - stdin è vuoto, nessuna operazione può essere inviata.\n"
@@ -649,7 +638,7 @@
#, c-format
msgid "%s: Operation failed: %s\n"
-msgstr "%s: Operazione fallita: %s\n"
+msgstr "%s: Operazione non riuscita: %s\n"
msgid "cancel: Error - expected hostname after '-h' option!\n"
msgstr "cancel: Errore - nome host atteso dopo l'opzione '-h'!\n"
@@ -670,7 +659,7 @@
#, c-format
msgid "cancel: %s failed: %s\n"
-msgstr "cancel: %s fallito: %s\n"
+msgstr "cancel: %s non riuscito: %s\n"
#, c-format
msgid "cupsaddsmb: Missing value on line %d!\n"
@@ -694,7 +683,7 @@
#, c-format
msgid "cupsaddsmb: get-printer-attributes failed for \"%s\": %s\n"
-msgstr "cupsaddsmb: get-printer-attributes fallito per \"%s\": %s\n"
+msgstr "cupsaddsmb: get-printer-attributes non riuscito per \"%s\": %s\n"
#, c-format
msgid "cupsaddsmb: Unable to convert PPD file for %s - %s\n"
@@ -708,8 +697,7 @@
#, c-format
msgid "cupsaddsmb: Unable to copy CUPS printer driver files (%d)!\n"
-msgstr ""
-"cupsaddsmb: Impossibile copiare i file del driver di stampa di CUPS (%d)!\n"
+msgstr "cupsaddsmb: Impossibile copiare i file del driver di stampa di CUPS (%d)!\n"
#, c-format
msgid "cupsaddsmb: Unable to install Windows 2000 printer driver files (%d)!\n"
@@ -1183,7 +1171,7 @@
" WARN %s condivide un prefisso comune con %s\n"
" RIF: Pagina 15, sezione 3.2.\n"
-#, fuzzy, c-format
+#, c-format
msgid " %d ERROR%s FOUND\n"
msgstr " %d ERROR%s TROVATI\n"
@@ -1234,7 +1222,7 @@
#, c-format
msgid "lpstat: get-printers failed: %s\n"
-msgstr "lpstat: get-printers fallita: %s\n"
+msgstr "lpstat: get-printers non riuscita: %s\n"
#, c-format
msgid "%s accepting requests since Jan 01 00:00\n"
@@ -1262,7 +1250,7 @@
#, c-format
msgid "lpstat: get-classes failed: %s\n"
-msgstr "lpstat: get-classes fallita: %s\n"
+msgstr "lpstat: get-classes non riuscita: %s\n"
#, c-format
msgid "members of class %s:\n"
@@ -1289,8 +1277,7 @@
#, c-format
msgid "Output for printer %s is sent to remote printer %s on %s\n"
-msgstr ""
-"L'uscita per la stampante %s è inviata alla stampante remota %s su %s\n"
+msgstr "L'uscita per la stampante %s è inviata alla stampante remota %s su %s\n"
#, c-format
msgid "Output for printer %s is sent to %s\n"
@@ -1298,8 +1285,7 @@
#, c-format
msgid "Output for printer %s/%s is sent to remote printer %s on %s\n"
-msgstr ""
-"L'uscita per la stampante %s/%s è inviata alla stampante remota %s su %s\n"
+msgstr "L'uscita per la stampante %s/%s è inviata alla stampante remota %s su %s\n"
#, c-format
msgid "Output for printer %s/%s is sent to %s\n"
@@ -1315,7 +1301,7 @@
#, c-format
msgid "lpstat: get-jobs failed: %s\n"
-msgstr "lpstat: get-jobs fallita: %s\n"
+msgstr "lpstat: get-jobs non riuscita: %s\n"
#, c-format
msgid "\tqueued for %s\n"
@@ -1443,15 +1429,13 @@
msgstr "lpadmin: Atteso nome classe dopo l'opzione '-c'!\n"
msgid "lpadmin: Class name can only contain printable characters!\n"
-msgstr ""
-"lpadmin: Il nome della classe può contenere solo caratteri stampabili!\n"
+msgstr "lpadmin: Il nome della classe può contenere solo caratteri stampabili!\n"
msgid "lpadmin: Expected printer name after '-d' option!\n"
msgstr "lpadmin: Atteso nome stampante dopo l'opzione '-d'!\n"
msgid "lpadmin: Printer name can only contain printable characters!\n"
-msgstr ""
-"lpadmin: Il nome della stampante può contenere solo caratteri stampabili!\n"
+msgstr "lpadmin: Il nome della stampante può contenere solo caratteri stampabili!\n"
msgid "lpadmin: Expected hostname after '-h' option!\n"
msgstr "lpadmin: Atteso nome host dopo l'opzione '-h'!\n"
@@ -1596,15 +1580,15 @@
#, c-format
msgid "lpadmin: add-printer (set model) failed: %s\n"
-msgstr "lpadmin: add-printer (impostazione modello) fallito: %s\n"
+msgstr "lpadmin: add-printer (impostazione modello) non riuscito: %s\n"
#, c-format
msgid "lpadmin: add-printer (set description) failed: %s\n"
-msgstr "lpadmin: add-printer (impostazione descrizione) fallito: %s\n"
+msgstr "lpadmin: add-printer (impostazione descrizione) non riuscito: %s\n"
#, c-format
msgid "lpadmin: add-printer (set location) failed: %s\n"
-msgstr "lpadmin: add-printer (impostazione posizione) fallito: %s\n"
+msgstr "lpadmin: add-printer (impostazione posizione) non riuscito: %s\n"
#, c-format
msgid "lpadmin: Unable to create temporary file - %s\n"
@@ -1616,7 +1600,7 @@
#, c-format
msgid "lpadmin: %s failed: %s\n"
-msgstr "lpadmin: %s fallito: %s\n"
+msgstr "lpadmin: %s non riuscito: %s\n"
msgid "lp: Expected destination after -d option!\n"
msgstr "lp: Attesa destinazione dopo l'opzione -d\n"
@@ -1685,10 +1669,8 @@
msgid "lp: Unknown option '%c'!\n"
msgstr "lp: Opzione '%c' sconosciuta!\n"
-msgid ""
-"lp: Error - cannot print from stdin if files or a job ID are provided!\n"
-msgstr ""
-"lp: Errore - impossibile stampare da stdin senza file o ID dell'operazione!\n"
+msgid "lp: Error - cannot print from stdin if files or a job ID are provided!\n"
+msgstr "lp: Errore - impossibile stampare da stdin senza file o ID dell'operazione!\n"
#, c-format
msgid "lp: Unable to access \"%s\" - %s\n"
@@ -1725,11 +1707,11 @@
#, c-format
msgid "lp: restart-job failed: %s\n"
-msgstr "lp: restart-job fallito: %s\n"
+msgstr "lp: restart-job non riuscito: %s\n"
#, c-format
msgid "lp: set-job-attributes failed: %s\n"
-msgstr "lp: set-job-attributes fallito: %s\n"
+msgstr "lp: set-job-attributes non riuscito: %s\n"
#, c-format
msgid "lpinfo: Unable to connect to server: %s\n"
@@ -1745,7 +1727,7 @@
#, c-format
msgid "lpinfo: cups-get-devices failed: %s\n"
-msgstr "lpinfo: cups-get-devices fallito: %s\n"
+msgstr "lpinfo: cups-get-devices non riuscito: %s\n"
#, c-format
msgid ""
@@ -1761,7 +1743,7 @@
#, c-format
msgid "lpinfo: cups-get-ppds failed: %s\n"
-msgstr "lpinfo: cups-get-ppds fallito: %s\n"
+msgstr "lpinfo: cups-get-ppds non riuscito: %s\n"
#, c-format
msgid ""
@@ -1790,7 +1772,7 @@
#, c-format
msgid "lpmove: move-job failed: %s\n"
-msgstr "lpmove: move-job fallito: %s\n"
+msgstr "lpmove: move-job non riuscito: %s\n"
msgid "lpoptions: Unknown printer or class!\n"
msgstr "lpoptions: Stampante o classe sconosciuta!\n"
@@ -1872,12 +1854,11 @@
#, c-format
msgid "lppasswd: failed to backup old password file: %s\n"
-msgstr ""
-"lppasswd: copia di sicurezza del vecchio file delle password fallita: %s\n"
+msgstr "lppasswd: copia di sicurezza del vecchio file delle password non riuscita: %s\n"
#, c-format
msgid "lppasswd: failed to rename password file: %s\n"
-msgstr "lppasswd: rinomina del file delle password fallita: %s\n"
+msgstr "lppasswd: rinomina del file delle password non riuscita: %s\n"
msgid "Usage: lppasswd [-g groupname]\n"
msgstr "Uso: lppasswd [-g nomegruppo]\n"
@@ -2069,7 +2050,7 @@
#, c-format
msgid "cupsaddsmb failed with status %d"
-msgstr "cupsaddsmb fallito con stato %d"
+msgstr "cupsaddsmb non riuscito con stato %d"
#, c-format
msgid "cupsaddsmb crashed on signal %d"
@@ -2133,7 +2114,7 @@
msgstr "Operazioni"
msgid "Job operation failed:"
-msgstr "Operazione fallita:"
+msgstr "Operazione non riuscita:"
msgid "Printers"
msgstr "Stampanti"
@@ -2330,8 +2311,7 @@
msgstr "%s: Errore - atteso nome host dopo l'opzione '-h'!\n"
#, c-format
-msgid ""
-"%s: error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "%s: error - %s environment variable names non-existent destination \"%s\"!\n"
msgstr ""
"%s: errore - i nomi della variabile d'ambiente %s non esistono nella "
"destinazione \"%s\"!\n"
@@ -2340,10 +2320,8 @@
msgid "%s: error - no default destination available.\n"
msgstr "%s: errore - nessuna destinazione predefinita disponibile.\n"
-msgid ""
-"Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
-msgstr ""
-"Uso: lpq [-P dest] [-U nomeutente] [-h nomehost[:porta]] [-l] [+intervallo]\n"
+msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]\n"
+msgstr "Uso: lpq [-P dest] [-U nomeutente] [-h nomehost[:porta]] [-l] [+intervallo]\n"
#, c-format
msgid "%s: Error - expected hostname after '-H' option!\n"
@@ -2390,8 +2368,7 @@
msgstr "%s: Errore - troppi file - \"%s\"\n"
#, c-format
-msgid ""
-"%s: Error - %s environment variable names non-existent destination \"%s\"!\n"
+msgid "%s: Error - %s environment variable names non-existent destination \"%s\"!\n"
msgstr ""
"%s: Errore - i nomi della variabile d'ambiente %s non esistono nella "
"destinazione \"%s\"!\n"
@@ -2430,7 +2407,7 @@
#, c-format
msgid "%s: %s failed: %s\n"
-msgstr "%s: %s fallito: %s\n"
+msgstr "%s: %s non riuscito: %s\n"
#, c-format
msgid "%s: Error - expected destination after '-d' option!\n"
@@ -2492,8 +2469,7 @@
#, c-format
msgid "%s: Need job ID ('-i jobid') before '-H restart'!\n"
-msgstr ""
-"%s: Usare l'ID dell'operazione ('-i idoperazione') prima di '-H restart'!\n"
+msgstr "%s: Usare l'ID dell'operazione ('-i idoperazione') prima di '-H restart'!\n"
#, c-format
msgid "%s: Error - expected page list after '-P' option!\n"
@@ -2516,10 +2492,8 @@
msgstr "%s: Attenzione - opzione del tipo di contenuto ignorata!\n"
#, c-format
-msgid ""
-"%s: Error - cannot print from stdin if files or a job ID are provided!\n"
-msgstr ""
-"%s: Errore - impossibile stampare da stdin senza file o ID dell'operazione!\n"
+msgid "%s: Error - cannot print from stdin if files or a job ID are provided!\n"
+msgstr "%s: Errore - impossibile stampare da stdin senza file o ID dell'operazione!\n"
#, c-format
msgid ""
@@ -2587,8 +2561,7 @@
msgstr "cupsd: Atteso nome file di configurazione dopo l'opzione \"-c\"!\n"
msgid "cupsd: launchd(8) support not compiled in, running in normal mode.\n"
-msgstr ""
-"cupsd: supporto launchd(8) non compilato, esecuzione in modalità normale.\n"
+msgstr "cupsd: supporto launchd(8) non compilato, esecuzione in modalità normale.\n"
#, c-format
msgid "cupsd: Unknown option \"%c\" - aborting!\n"
@@ -2619,8 +2592,7 @@
msgid " WARN Line %d only contains whitespace!\n"
msgstr " WARN La riga %d contiene solamente spazi bianchi!\n"
-msgid ""
-" WARN File contains a mix of CR, LF, and CR LF line endings!\n"
+msgid " WARN File contains a mix of CR, LF, and CR LF line endings!\n"
msgstr ""
" WARN Il file contiene un misto di interruzioni di riga CR, LF, e "
"CR LF!\n"
@@ -2652,8 +2624,7 @@
#, c-format
msgid " **FAIL** Missing \"%s\" translation string for option %s!\n"
-msgstr ""
-" **FAIL** Stringa di traduzione \"%s\" mancante per l'opzione %s!\n"
+msgstr " **FAIL** Stringa di traduzione \"%s\" mancante per l'opzione %s!\n"
#, c-format
msgid ""
@@ -2664,8 +2635,7 @@
"contiene caratteri di 8-bit!\n"
#, c-format
-msgid ""
-" **FAIL** Missing \"%s\" translation string for option %s, choice %s!\n"
+msgid " **FAIL** Missing \"%s\" translation string for option %s, choice %s!\n"
msgstr ""
" **FAIL** Stringa di traduzione \"%s\" mancante per l'opzione %s, "
"scelta %s!\n"
@@ -2699,8 +2669,7 @@
#, c-format
msgid "Unable to copy Windows 2000 printer driver files (%d)!\n"
-msgstr ""
-"Impossibile copiare i file dei driver di stampa di Windows 2000 (%d)!\n"
+msgstr "Impossibile copiare i file dei driver di stampa di Windows 2000 (%d)!\n"
#, c-format
msgid "Unable to copy CUPS printer driver files (%d)!\n"
@@ -2708,8 +2677,7 @@
#, c-format
msgid "Unable to install Windows 2000 printer driver files (%d)!\n"
-msgstr ""
-"Impossibile installare i file dei driver di stampa di Windows 2000 (%d)!\n"
+msgstr "Impossibile installare i file dei driver di stampa di Windows 2000 (%d)!\n"
#, c-format
msgid "Unable to copy Windows 9x printer driver files (%d)!\n"
@@ -2717,8 +2685,7 @@
#, c-format
msgid "Unable to install Windows 9x printer driver files (%d)!\n"
-msgstr ""
-"Impossibile installare i file dei driver di stampa di Windows 9x (%d)!\n"
+msgstr "Impossibile installare i file dei driver di stampa di Windows 9x (%d)!\n"
msgid "No Windows printer drivers are installed!\n"
msgstr "Nessun driver di stampa di Windows è installato!\n"
@@ -2763,8 +2730,7 @@
#, c-format
msgid "Unable to install Windows 2000 printer driver files (%d)!"
-msgstr ""
-"Impossibile installare i file dei driver di stampa di Windows 2000 (%d)!"
+msgstr "Impossibile installare i file dei driver di stampa di Windows 2000 (%d)!"
#, c-format
msgid "Unable to copy Windows 9x printer driver files (%d)!"
@@ -2782,7 +2748,7 @@
#, c-format
msgid "open of %s failed: %s"
-msgstr "apertura di %s fallita: %s"
+msgstr "apertura di %s non riuscita: %s"
#, c-format
msgid "Running command: %s %s -N -A %s -c '%s'\n"
@@ -2790,7 +2756,7 @@
#, c-format
msgid "stat of %s failed: %s"
-msgstr "verifica di %s fallita: %s"
+msgstr "verifica di %s non riuscita: %s"
#, c-format
msgid "Job #%d is already cancelled - can't cancel."
@@ -2948,54 +2914,54 @@
" **FAIL** 1284DeviceId deve essere 1284DeviceID!\n"
" RIF: Pagina 72, sezione 5.5\n"
-#, fuzzy, c-format
+#, c-format
msgid "Missing value on line %d!"
-msgstr "Valore mancante alla riga %d!\n"
+msgstr "Valore mancante alla riga %d!"
-#, fuzzy, c-format
+#, c-format
msgid "Missing double quote on line %d!"
-msgstr "Doppi apici mancanti alla riga %d!\n"
+msgstr "Doppi apici mancanti alla riga %d!"
-#, fuzzy, c-format
+#, c-format
msgid "Bad option + choice on line %d!"
-msgstr "Opzione + scelta errata alla riga %d!\n"
+msgstr "Opzione + scelta errata alla riga %d!"
-#, fuzzy
msgid "Empty PPD file!"
-msgstr "Impossibile copiare il file PPD!"
+msgstr "File PPD vuoto!"
-#, fuzzy, c-format
+#, c-format
msgid "Unable to set Windows printer driver (%d)!"
-msgstr "Impossibile configurare il driver di stampa di Windows (%d)!\n"
+msgstr "Impossibile configurare il driver di stampa di Windows (%d)!"
-#, fuzzy, c-format
+#, c-format
msgid "Unable to run \"%s\": %s\n"
-msgstr "cupsaddsmb: Impossibile eseguire \"%s\": %s\n"
+msgstr "Impossibile eseguire \"%s\": %s\n"
-#, fuzzy, c-format
+#, c-format
msgid "Job #%d is already canceled - can't cancel."
-msgstr "L'operazione #%d è già annullata - impossibile annullare."
+msgstr "L'operazione #%d è stata già annullata - impossibile annullare."
#, c-format
msgid "Bad notify-recipient URI \"%s\"!"
-msgstr ""
+msgstr "URI notify-recipient \"%s\" errato!"
#, c-format
msgid "notify-recipient URI \"%s\" uses unknown scheme!"
-msgstr ""
+msgstr "L'URI notify-recipient \"%s\" utilizza uno schema sconosciuto!"
-#, fuzzy, c-format
+#, c-format
msgid "Bad notify-pull-method \"%s\"!"
-msgstr "port-monitor \"%s\" errato!"
+msgstr "notify-pull-method \"%s\" errato!"
-#, fuzzy, c-format
+#, c-format
msgid ""
" **FAIL** %s must be 1284DeviceID!\n"
" REF: Page 72, section 5.5\n"
msgstr ""
-" **FAIL** 1284DeviceId deve essere 1284DeviceID!\n"
+" **FAIL** %s deve essere 1284DeviceID!\n"
" RIF: Pagina 72, sezione 5.5\n"
-#, fuzzy, c-format
+#, c-format
msgid "lpoptions: Unable to get PPD file for %s: %s\n"
-msgstr "lpoptions: Impossibile aprire il file PPD per %s!\n"
+msgstr "lpoptions: Impossibile ottenere il file PPD per %s: %s\n"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/man/filter.man new/cups-1.2.12/man/filter.man
--- old/cups-1.2.11/man/filter.man 2006-03-23 20:53:24.000000000 +0100
+++ new/cups-1.2.12/man/filter.man 2007-07-07 00:39:54.000000000 +0200
@@ -1,9 +1,9 @@
.\"
-.\" "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id: filter.man 6625 2007-07-06 22:39:54Z mike $"
.\"
.\" filter man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2006 by Easy Software Products.
+.\" Copyright 1997-2007 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
@@ -21,7 +21,7 @@
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH filter 7 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
+.TH filter 7 "Common UNIX Printing System" "6 July 2007" "Easy Software Products"
.SH NAME
filter \- cups file conversion filter interface
.SH SYNOPSIS
@@ -104,7 +104,7 @@
.TP 5
PAGE: page-number #-copies
.TP 5
-PAGE: #-pages total
+PAGE: total #-pages
.br
Adds an entry to the current \fIPageLog\fR. The first form adds
#-copies to the job-media-sheets-completed attribute. The second
@@ -226,5 +226,5 @@
.SH COPYRIGHT
Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id: filter.man 6625 2007-07-06 22:39:54Z mike $".
.\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/packaging/cups.spec new/cups-1.2.12/packaging/cups.spec
--- old/cups-1.2.11/packaging/cups.spec 2007-05-08 23:11:28.000000000 +0200
+++ new/cups-1.2.12/packaging/cups.spec 2007-07-11 14:45:57.000000000 +0200
@@ -43,12 +43,12 @@
Summary: Common UNIX Printing System
Name: cups
-Version: 1.2.11
+Version: 1.2.12
Release: 1
Epoch: 1
License: GPL
Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/1.2.11/cups-1.2.11-source.tar.bz2
+Source: ftp://ftp.easysw.com/pub/cups/1.2.12/cups-1.2.12-source.tar.bz2
Url: http://www.cups.org
Packager: Anonymous
Vendor: Easy Software Products
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/scheduler/conf.c new/cups-1.2.12/scheduler/conf.c
--- old/cups-1.2.11/scheduler/conf.c 2007-03-28 20:03:19.000000000 +0200
+++ new/cups-1.2.12/scheduler/conf.c 2007-06-04 17:38:28.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: conf.c 6410 2007-03-28 18:03:19Z mike $"
+ * "$Id: conf.c 6550 2007-06-04 15:38:28Z mike $"
*
* Configuration routines for the Common UNIX Printing System (CUPS).
*
@@ -1745,7 +1745,7 @@
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider using "
- "\"Require @groupname\" on line %d.",
+ "\"Require user @groupname\" on line %d.",
value, linenum);
}
else if (!strcasecmp(value, "system"))
@@ -1756,7 +1756,7 @@
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider using "
- "\"Require @SYSTEM\" on line %d.",
+ "\"Require user @SYSTEM\" on line %d.",
value, linenum);
}
else
@@ -1773,7 +1773,7 @@
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthGroupName %s\" directive is deprecated; consider "
- "using \"Require @%s\" on line %d.",
+ "using \"Require user @%s\" on line %d.",
value, value, linenum);
}
else if (!strcasecmp(line, "Require"))
@@ -3290,5 +3290,5 @@
/*
- * End of "$Id: conf.c 6410 2007-03-28 18:03:19Z mike $".
+ * End of "$Id: conf.c 6550 2007-06-04 15:38:28Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/scheduler/ipp.c new/cups-1.2.12/scheduler/ipp.c
--- old/cups-1.2.11/scheduler/ipp.c 2007-04-23 22:36:09.000000000 +0200
+++ new/cups-1.2.12/scheduler/ipp.c 2007-07-07 00:39:54.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: ipp.c 6465 2007-04-23 20:36:09Z mike $"
+ * "$Id: ipp.c 6625 2007-07-06 22:39:54Z mike $"
*
* IPP routines for the Common UNIX Printing System (CUPS) scheduler.
*
@@ -1296,11 +1296,16 @@
return (NULL);
}
- if (!check_quotas(con, printer))
+ if ((i = check_quotas(con, printer)) < 0)
{
send_ipp_status(con, IPP_NOT_POSSIBLE, _("Quota limit reached."));
return (NULL);
}
+ else if (i == 0)
+ {
+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Not allowed to print."));
+ return (NULL);
+ }
/*
* Create the job and set things up...
@@ -3240,7 +3245,7 @@
cupsdLogMessage(CUPSD_LOG_ERROR,
"Unable to allocate quota data for user \"%s\"!",
username);
- return (0);
+ return (-1);
}
if ((q->k_count >= p->k_limit && p->k_limit) ||
@@ -3248,7 +3253,7 @@
{
cupsdLogMessage(CUPSD_LOG_INFO, "User \"%s\" is over the quota limit...",
username);
- return (0);
+ return (-1);
}
}
@@ -9164,5 +9169,5 @@
/*
- * End of "$Id: ipp.c 6465 2007-04-23 20:36:09Z mike $".
+ * End of "$Id: ipp.c 6625 2007-07-06 22:39:54Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/scripting/php/phpcups.c new/cups-1.2.12/scripting/php/phpcups.c
--- old/cups-1.2.11/scripting/php/phpcups.c 2006-02-25 09:44:43.000000000 +0100
+++ new/cups-1.2.12/scripting/php/phpcups.c 2007-07-12 21:15:13.000000000 +0200
@@ -1,9 +1,9 @@
/*
- * "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $"
+ * "$Id: phpcups.c 6652 2007-07-12 19:15:13Z mike $"
*
* Printing utilities for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2006 by Easy Software Products.
+ * Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
@@ -23,6 +23,15 @@
*
* Contents:
*
+ * cups_convert_options() - Convert a PHP options array to a CUPS options array.
+ * zm_startup_phpcups() - Initialize the CUPS module.
+ * zif_cups_cancel_job() - Cancel a job.
+ * zif_cups_get_dests() - Get a list of printers and classes.
+ * zif_cups_get_jobs() - Get a list of jobs.
+ * zif_cups_last_error() - Return the last IPP status code.
+ * zif_cups_last_error_string() - Return the last IPP status
+ * zif_cups_print_file() - Print a single file.
+ * zif_cups_print_files() - Print multiple files.
*/
/*
@@ -87,15 +96,43 @@
int num_options; /* Number of options */
HashTable *ht; /* Option array hash table */
Bucket *current; /* Current element in array */
+ zval *value; /* Current value in array */
+ char temp[255]; /* String value for numbers */
ht = Z_ARRVAL_P(optionsobj);
num_options = 0;
for (current = ht->pListHead; current; current = current->pListNext)
- num_options = cupsAddOption(current->arKey,
- Z_STRVAL_P(((zval *)current->pDataPtr)),
- num_options, options);
+ {
+ value = (zval *)current->pDataPtr;
+
+ switch (Z_TYPE_P(value))
+ {
+ case IS_LONG :
+ sprintf(temp, "%ld", Z_LVAL_P(value));
+ num_options = cupsAddOption(current->arKey, temp, num_options,
+ options);
+ break;
+
+ case IS_DOUBLE :
+ sprintf(temp, "%g", Z_DVAL_P(value));
+ num_options = cupsAddOption(current->arKey, temp, num_options,
+ options);
+ break;
+
+ case IS_BOOL :
+ num_options = cupsAddOption(current->arKey,
+ Z_BVAL_P(value) ? "true" : "false",
+ num_options, options);
+ break;
+
+ case IS_STRING :
+ num_options = cupsAddOption(current->arKey, Z_STRVAL_P(value),
+ num_options, options);
+ break;
+ }
+ }
return (num_options);
}
@@ -204,7 +241,7 @@
/*
- * 'zif_cups_get_dests()' - .
+ * 'zif_cups_get_dests()' - Get a list of printers and classes.
*/
PHP_FUNCTION(cups_get_dests)
@@ -454,5 +491,5 @@
/*
- * End of "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $".
+ * End of "$Id: phpcups.c 6652 2007-07-12 19:15:13Z mike $".
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cups-1.2.11/systemv/cupsaddsmb.c new/cups-1.2.12/systemv/cupsaddsmb.c
--- old/cups-1.2.11/systemv/cupsaddsmb.c 2006-09-05 22:45:47.000000000 +0200
+++ new/cups-1.2.12/systemv/cupsaddsmb.c 2007-07-07 00:39:54.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * "$Id: cupsaddsmb.c 5926 2006-09-05 20:45:47Z mike $"
+ * "$Id: cupsaddsmb.c 6625 2007-07-06 22:39:54Z mike $"
*
* "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
*
@@ -263,6 +263,9 @@
status = cupsAdminExportSamba(dest, ppdfile, SAMBAServer,
SAMBAUser, SAMBAPassword,
Verbosity ? stderr : NULL);
+
+ if (!status && cupsLastError() == IPP_NOT_FOUND)
+ break;
}
unlink(ppdfile);
@@ -294,5 +297,5 @@
/*
- * End of "$Id: cupsaddsmb.c 5926 2006-09-05 20:45:47Z mike $".
+ * End of "$Id: cupsaddsmb.c 6625 2007-07-06 22:39:54Z mike $".
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org