From 3307e31e51461fff3cf9305fbf7f923ec1dd3f40 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Fri, 2 Mar 2012 14:20:13 +0100 Subject: Imported Upstream version 4.0.13 --- ChangeLog | 14 ++++++++++++++ README | 2 +- USAGE | 2 +- VERSION | 2 +- VERSION.full | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- spooler.c | 10 ++++++++-- 8 files changed, 37 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8ff426..d375dd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2012-03-02 Till Kamppeter + + * Tagged branch for release 4.0.13. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.13. + +2012-03-02 Lars Uebernickel + + * spooler.c: When using CUPS support option strings (5th command + line argument to a CUPS filter) of more than 512 bytes. For PPD + files with very many options this string can get very long (Thanks + to Yoshito Nishihara, yoshito dot nishihara at nts dot ricoh dot co + dot jp for reporting this). + 2012-02-10 Till Kamppeter * Tagged branch for release 4.0.12. diff --git a/README b/README index a4fca44..106a27a 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Foomatic 4.0.12 +Foomatic 4.0.13 =============== diff --git a/USAGE b/USAGE index 09df428..7f1f35a 100644 --- a/USAGE +++ b/USAGE @@ -1,5 +1,5 @@ -Foomatic 4.0.12 +Foomatic 4.0.13 =============== foomatic-filters diff --git a/VERSION b/VERSION index 4c05e4e..041792e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.12 +4.0.13 diff --git a/VERSION.full b/VERSION.full index 9f1f2a9..6dc0019 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.12.246 +4.0.13.247 diff --git a/configure b/configure index 9a0cc31..46e560d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.12. +# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.13. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='foomatic-rip' PACKAGE_TARNAME='foomatic-rip' -PACKAGE_VERSION='4.0.12' -PACKAGE_STRING='foomatic-rip 4.0.12' +PACKAGE_VERSION='4.0.13' +PACKAGE_STRING='foomatic-rip 4.0.13' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures foomatic-rip 4.0.12 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of foomatic-rip 4.0.12:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.13:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -foomatic-rip configure 4.0.12 +foomatic-rip configure 4.0.13 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by foomatic-rip $as_me 4.0.12, which was +It was created by foomatic-rip $as_me 4.0.13, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2705,7 +2705,7 @@ fi # Define the identity of the package. PACKAGE='foomatic-rip' - VERSION='4.0.12' + VERSION='4.0.13' # Some tools Automake needs. @@ -6871,7 +6871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by foomatic-rip $as_me 4.0.12, which was +This file was extended by foomatic-rip $as_me 4.0.13, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6937,7 +6937,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -foomatic-rip config.status 4.0.12 +foomatic-rip config.status 4.0.13 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 50ac368..9c9d551 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT(foomatic-rip, [4.0.12]) +AC_INIT(foomatic-rip, [4.0.13]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff --git a/spooler.c b/spooler.c index efe519e..150aed7 100644 --- a/spooler.c +++ b/spooler.c @@ -249,7 +249,8 @@ void init_cups(list_t *arglist, dstr_t *filelist, jobparams_t *job) char cups_user [128]; char cups_jobtitle [128]; char cups_copies [128]; - char cups_options [512]; + int cups_options_len; + char *cups_options; char cups_filename [256]; char texttopspath[PATH_MAX]; @@ -270,7 +271,10 @@ void init_cups(list_t *arglist, dstr_t *filelist, jobparams_t *job) strncpy_omit(cups_user, arglist_get(arglist, 1), 128, omit_shellescapes); strncpy_omit(cups_jobtitle, arglist_get(arglist, 2), 128, omit_shellescapes); strncpy_omit(cups_copies, arglist_get(arglist, 3), 128, omit_shellescapes); - strncpy_omit(cups_options, arglist_get(arglist, 4), 512, omit_shellescapes); + + cups_options_len = strlen(arglist_get(arglist, 4)); + cups_options = malloc(cups_options_len + 1); + strncpy_omit(cups_options, arglist_get(arglist, 4), cups_options_len, omit_shellescapes); /* Common job parameters */ strcpy(job->id, cups_jobid); @@ -312,6 +316,8 @@ void init_cups(list_t *arglist, dstr_t *filelist, jobparams_t *job) texttopspath, cups_jobid, cups_user, cups_jobtitle, cups_copies, cups_options); } } + + free(cups_options); } void init_solaris(list_t *arglist, dstr_t *filelist, jobparams_t *job) -- cgit v1.2.3