diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | USAGE | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | VERSION.full | 2 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | foomaticrip.c | 2 | ||||
| -rw-r--r-- | spooler.c | 2 |
9 files changed, 34 insertions, 17 deletions
@@ -1,3 +1,20 @@ +2012-06-18 Till Kamppeter <till.kamppeter@gmail.com> + + * Tagged branch for release 4.0.16. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.16. + + * foomaticrip.c: Fixed wrong access to command line option list which + prevented the command line options being passed on to the pdftops + CUPS filter when incoming PDF is converted to PostScript (Ubuntu + bug #1002699). + +2012-06-06 Till Kamppeter <till.kamppeter@gmail.com> + + * spooler.c: Fixed off-by-one bug which has cut off the last character + of the option string for CUPS (5th command line argument) and so made + the last option setting not being applied (Ubuntu bug #1003194). + 2012-03-23 Till Kamppeter <till.kamppeter@gmail.com> * Tagged branch for release 4.0.15. @@ -1,5 +1,5 @@ -Foomatic 4.0.15 +Foomatic 4.0.16 =============== @@ -1,5 +1,5 @@ -Foomatic 4.0.15 +Foomatic 4.0.16 =============== foomatic-filters @@ -1 +1 @@ -4.0.15 +4.0.16 diff --git a/VERSION.full b/VERSION.full index df3f72b..0cf72ec 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.15.251 +4.0.16.253 @@ -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.15. +# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.16. # # # 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.15' -PACKAGE_STRING='foomatic-rip 4.0.15' +PACKAGE_VERSION='4.0.16' +PACKAGE_STRING='foomatic-rip 4.0.16' 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.15 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.16 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.15:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.16:";; 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.15 +foomatic-rip configure 4.0.16 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.15, which was +It was created by foomatic-rip $as_me 4.0.16, 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.15' + VERSION='4.0.16' # 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.15, which was +This file was extended by foomatic-rip $as_me 4.0.16, 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.15 +foomatic-rip config.status 4.0.16 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 22cbdc9..939089a 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.15]) +AC_INIT(foomatic-rip, [4.0.16]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff --git a/foomaticrip.c b/foomaticrip.c index 3fdffe4..9209874 100644 --- a/foomaticrip.c +++ b/foomaticrip.c @@ -1062,7 +1062,7 @@ int print_file(const char *filename, int convert) if (spooler == SPOOLER_CUPS) snprintf(pdf2ps_cmd, PATH_MAX, "pdftops '%s' '%s' '%s' '%s' '%s' '%s'", - job->id, job->user, job->title, "1", job->optstr, + job->id, job->user, job->title, "1", job->optstr->data, filename); else snprintf(pdf2ps_cmd, PATH_MAX, @@ -274,7 +274,7 @@ void init_cups(list_t *arglist, dstr_t *filelist, jobparams_t *job) 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); + strncpy_omit(cups_options, arglist_get(arglist, 4), cups_options_len + 1, omit_shellescapes); /* Common job parameters */ strcpy(job->id, cups_jobid); |