Hello community,
here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2018-04-06 17:45:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups-filters (Old)
and /work/SRC/openSUSE:Factory/.cups-filters.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-filters"
Fri Apr 6 17:45:30 2018 rev:31 rq:593548 version:1.20.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2018-02-22 14:58:22.390795575 +0100
+++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2018-04-06 17:45:38.035972931 +0200
@@ -1,0 +2,21 @@
+Wed Apr 4 13:49:32 CEST 2018 - jsmeix@suse.de
+
+- Version upgrade to 1.20.1
+ to provide upstream bugfixes also for SLE15 / Leap15
+ and be also already prepared for SLE12 (fate#323676).
+ This is a bug fix release fixing several issues
+ on the Braille support and other bugs, in particular
+ (for details see the NEWS file):
+ * libcupsfilters: Silenced warning when using CUPS < 2.x
+ by eliminating the use of a recently introduced
+ CUPS library function, see
+ https://bugs.linuxfoundation.org/show_bug.cgi?id=1421
+ * cups-browsed: Fixed crash when CUPS reports a print queue
+ without "device-uri" attribute when cups-browsed polls a
+ list of local CUPS queues, see
+ https://github.com/OpenPrinting/cups-filters/issues/16
+- fix_upstream_bug_1421.patch is no longer needed because
+ it is now fixed in the upstream sources
+ (see the "libcupsfilters ... bug ... 1421" entry above).
+
+-------------------------------------------------------------------
Old:
----
cups-filters-1.20.0.tar.xz
fix_upstream_bug_1421.patch
New:
----
cups-filters-1.20.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-filters.spec ++++++
--- /var/tmp/diff_new_pack.7uLJUz/_old 2018-04-06 17:45:38.991938407 +0200
+++ /var/tmp/diff_new_pack.7uLJUz/_new 2018-04-06 17:45:38.995938263 +0200
@@ -37,7 +37,7 @@
# and also run: zypper vcmp 'next version' 'current version'
# e.g. zypper vcmp '1.0.49' '1.0.49.20140326' -> 1.0.49 is older than 1.0.49.20140326
# and zypper vcmp '1.0.50' '1.0.49.20140326' -> 1.0.50 is newer than 1.0.49.20140326
-Version: 1.20.0
+Version: 1.20.1
Release: 0
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
# Upstream fix for https://bugs.linuxfoundation.org/show_bug.cgi?id=1421
@@ -46,7 +46,7 @@
# wget -O fix_upstream_bug_1421.patch https://github.com/OpenPrinting/cups-filters/commit/6db3b08d3b20332b1525b8dd...
# and then removed the changes of the NEWS file from that patch because
# the NEWS changes do not apply on the sources of the pristine 1.20.0 release:
-Patch100: fix_upstream_bug_1421.patch
+# Patch100 fix_upstream_bug_1421.patch is fixed in the cups-filters 1.20.1 sources.
# Since cups-filters version 1.0.42 foomatic-rip is also provided by cups-filters.
# The foomatic-rip version that is provided by cups-filters is not specified in the cups-filters sources
# but on http://www.openprinting.org/download/foomatic/ the foomatic-filters-4.0-current.tar.gz
@@ -219,9 +219,6 @@
%prep
%setup -q
-# Upstream fix for https://bugs.linuxfoundation.org/show_bug.cgi?id=1421
-# in https://github.com/OpenPrinting/cups-filters/commit/6db3b08d3b20332b1525b8dd...
-%patch100 -p1 -b fix_upstream_bug_1421.orig
%build
# Just do what is described in the upstream INSTALL file
@@ -341,12 +338,19 @@
# Serial backend needs to run as root
# see https://bugzilla.redhat.com/show_bug.cgi?id=212577#c4
%attr(0700,root,root) /usr/lib/cups/backend/serial
-# Explicit attr() mode not applicaple to symlink /usr/lib/cups/backend/driverless
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/backend/driverless
/usr/lib/cups/backend/driverless
%dir /usr/lib/cups/filter
%attr(0755,root,root) /usr/lib/cups/filter/bannertopdf
+%attr(0755,root,root) /usr/lib/cups/filter/brftopagedbrf
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/cgmtopdf
+/usr/lib/cups/filter/cgmtopdf
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/cmxtopdf
+/usr/lib/cups/filter/cmxtopdf
%attr(0755,root,root) /usr/lib/cups/filter/commandtoescpx
%attr(0755,root,root) /usr/lib/cups/filter/commandtopclx
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/emftopdf
+/usr/lib/cups/filter/emftopdf
%attr(0755,root,root) /usr/lib/cups/filter/foomatic-rip
%attr(0755,root,root) /usr/lib/cups/filter/gstoraster
%attr(0755,root,root) /usr/lib/cups/filter/gstopxl
@@ -354,32 +358,31 @@
%attr(0755,root,root) /usr/lib/cups/filter/imagetopdf
%attr(0755,root,root) /usr/lib/cups/filter/imagetops
%attr(0755,root,root) /usr/lib/cups/filter/imagetoraster
+%attr(0755,root,root) /usr/lib/cups/filter/musicxmltobrf
%attr(0755,root,root) /usr/lib/cups/filter/pdftoijs
%attr(0755,root,root) /usr/lib/cups/filter/pdftoopvp
%attr(0755,root,root) /usr/lib/cups/filter/pdftopdf
%attr(0755,root,root) /usr/lib/cups/filter/pdftops
%attr(0755,root,root) /usr/lib/cups/filter/pdftoraster
%attr(0755,root,root) /usr/lib/cups/filter/rastertoescpx
+%attr(0755,root,root) /usr/lib/cups/filter/rastertopclm
%attr(0755,root,root) /usr/lib/cups/filter/rastertopclx
%attr(0755,root,root) /usr/lib/cups/filter/rastertops
%attr(0755,root,root) /usr/lib/cups/filter/rastertopdf
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/svgtopdf
+/usr/lib/cups/filter/svgtopdf
%attr(0755,root,root) /usr/lib/cups/filter/sys5ippprinter
+%attr(0755,root,root) /usr/lib/cups/filter/vectortobrf
+%attr(0755,root,root) /usr/lib/cups/filter/vectortopdf
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/vectortoubrl
+/usr/lib/cups/filter/vectortoubrl
%attr(0755,root,root) /usr/lib/cups/filter/texttopdf
%attr(0755,root,root) /usr/lib/cups/filter/texttops
%attr(0755,root,root) /usr/lib/cups/filter/texttotext
-
-%attr(0755,root,root) /usr/lib/cups/filter/cgmtopdf
-%attr(0755,root,root) /usr/lib/cups/filter/cmxtopdf
-%attr(0755,root,root) /usr/lib/cups/filter/emftopdf
-%attr(0755,root,root) /usr/lib/cups/filter/rastertopclm
-%attr(0755,root,root) /usr/lib/cups/filter/svgtopdf
-%attr(0755,root,root) /usr/lib/cups/filter/vectortobrf
-%attr(0755,root,root) /usr/lib/cups/filter/vectortopdf
-%attr(0755,root,root) /usr/lib/cups/filter/vectortoubrl
-%attr(0755,root,root) /usr/lib/cups/filter/wmftopdf
-%attr(0755,root,root) /usr/lib/cups/filter/xfigtopdf
-%attr(0755,root,root) /usr/lib/cups/filter/musicxmltobrf
-
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/wmftopdf
+/usr/lib/cups/filter/wmftopdf
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/xfigtopdf
+/usr/lib/cups/filter/xfigtopdf
# See the "./configure --help" output
# --with-apple-raster-filter=rastertopdf|urftopdf
# Select filter for Apple Raster input. Default:
@@ -404,12 +407,12 @@
# Filters for braille embosser support:
%attr(0755,root,root) /usr/lib/cups/filter/brftoembosser
%attr(0755,root,root) /usr/lib/cups/filter/imagetobrf
-# Explicit attr() mode not applicaple to symlink /usr/lib/cups/filter/imagetoubrl
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/imagetoubrl
/usr/lib/cups/filter/imagetoubrl
%attr(0755,root,root) /usr/lib/cups/filter/imageubrltoindexv3
%attr(0755,root,root) /usr/lib/cups/filter/imageubrltoindexv4
%attr(0755,root,root) /usr/lib/cups/filter/textbrftoindexv3
-# Explicit attr() mode not applicaple to symlink /usr/lib/cups/filter/textbrftoindexv4
+# Explicit attr() mode not applicable to symlink /usr/lib/cups/filter/textbrftoindexv4
/usr/lib/cups/filter/textbrftoindexv4
%attr(0755,root,root) /usr/lib/cups/filter/texttobrf
%dir %{_datadir}/cups
++++++ cups-filters-1.20.0.tar.xz -> cups-filters-1.20.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/INSTALL new/cups-filters-1.20.1/INSTALL
--- old/cups-filters-1.20.0/INSTALL 2018-01-29 19:14:59.000000000 +0100
+++ new/cups-filters-1.20.1/INSTALL 2018-02-25 16:49:18.000000000 +0100
@@ -1,4 +1,4 @@
-INSTALL - OpenPrinting CUPS Filters v1.20.0 - 2018-01-29
+INSTALL - OpenPrinting CUPS Filters v1.20.1 - 2018-02-25
--------------------------------------------------------
This file describes how to compile and install OpenPrinting CUPS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/Makefile.am new/cups-filters-1.20.1/Makefile.am
--- old/cups-filters-1.20.0/Makefile.am 2017-12-15 02:15:32.000000000 +0100
+++ new/cups-filters-1.20.1/Makefile.am 2018-02-13 19:21:59.000000000 +0100
@@ -591,6 +591,7 @@
filter/braille/filters/vectortopdf \
filter/braille/filters/vectortobrf \
filter/braille/filters/texttobrf \
+ filter/braille/filters/brftopagedbrf \
filter/braille/filters/musicxmltobrf
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/Makefile.in new/cups-filters-1.20.1/Makefile.in
--- old/cups-filters-1.20.0/Makefile.in 2018-01-29 19:51:29.000000000 +0100
+++ new/cups-filters-1.20.1/Makefile.in 2018-02-25 16:49:47.000000000 +0100
@@ -186,6 +186,7 @@
filter/braille/filters/cups-braille.sh \
filter/braille/filters/imagetobrf \
filter/braille/filters/texttobrf \
+ filter/braille/filters/brftopagedbrf \
filter/braille/filters/vectortopdf \
filter/braille/filters/vectortobrf \
filter/braille/filters/musicxmltobrf \
@@ -874,6 +875,7 @@
$(top_srcdir)/filter/braille/drivers/index/indexv3.sh.in \
$(top_srcdir)/filter/braille/drivers/index/indexv4.sh.in \
$(top_srcdir)/filter/braille/drivers/index/textbrftoindexv3.in \
+ $(top_srcdir)/filter/braille/filters/brftopagedbrf.in \
$(top_srcdir)/filter/braille/filters/cups-braille.sh.in \
$(top_srcdir)/filter/braille/filters/imagetobrf.in \
$(top_srcdir)/filter/braille/filters/liblouis1.defs.gen.in \
@@ -1571,6 +1573,7 @@
@ENABLE_BRAILLE_TRUE@ filter/braille/filters/vectortopdf \
@ENABLE_BRAILLE_TRUE@ filter/braille/filters/vectortobrf \
@ENABLE_BRAILLE_TRUE@ filter/braille/filters/texttobrf \
+@ENABLE_BRAILLE_TRUE@ filter/braille/filters/brftopagedbrf \
@ENABLE_BRAILLE_TRUE@ filter/braille/filters/musicxmltobrf
bannertopdf_SOURCES = \
@@ -2051,6 +2054,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
filter/braille/filters/texttobrf: $(top_builddir)/config.status $(top_srcdir)/filter/braille/filters/texttobrf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+filter/braille/filters/brftopagedbrf: $(top_builddir)/config.status $(top_srcdir)/filter/braille/filters/brftopagedbrf.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
filter/braille/filters/vectortopdf: $(top_builddir)/config.status $(top_srcdir)/filter/braille/filters/vectortopdf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
filter/braille/filters/vectortobrf: $(top_builddir)/config.status $(top_srcdir)/filter/braille/filters/vectortobrf.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/NEWS new/cups-filters-1.20.1/NEWS
--- old/cups-filters-1.20.0/NEWS 2018-01-29 19:14:59.000000000 +0100
+++ new/cups-filters-1.20.1/NEWS 2018-02-25 16:49:18.000000000 +0100
@@ -1,6 +1,22 @@
-NEWS - OpenPrinting CUPS Filters v1.20.0 - 2018-01-29
+NEWS - OpenPrinting CUPS Filters v1.20.1 - 2018-02-25
-----------------------------------------------------
+CHANGES IN V1.20.1
+
+ - libcupsfilters: Silenced warning when using CUPS < 2.x by
+ eliminating the use of a recently introduced CUPS library
+ function (Bugzilla bug #1421).
+ - braille: Fix some missing options on indexv4. Thanks to
+ Samuel Thibault for this patch (Pull request #21).
+ - braille: Fix disabling margins on indexv4 in graphic
+ mode. Thanks to Samuel Thibault for this patch (Pull request
+ #20).
+ - braille: Fix installation of brftopagedbrf. Thanks to Samuel
+ Thibault for this patch (Pull request #18, Issue #17).
+ - cups-browsed: Fixed crash when CUPS reports a print queue
+ without "device-uri" attribute when cups-browsed polls a
+ list of local CUPS queues (Issue #16).
+
CHANGES IN V1.20.0
- libcupsfilters: Let the PPD generator prefer the English
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/README new/cups-filters-1.20.1/README
--- old/cups-filters-1.20.0/README 2018-01-29 19:14:59.000000000 +0100
+++ new/cups-filters-1.20.1/README 2018-02-25 16:49:18.000000000 +0100
@@ -1,4 +1,4 @@
-README - OpenPrinting CUPS Filters v1.20.0 - 2018-01-29
+README - OpenPrinting CUPS Filters v1.20.1 - 2018-02-25
-------------------------------------------------------
Looking for compile instructions? Read the file "INSTALL.txt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/aclocal.m4 new/cups-filters-1.20.1/aclocal.m4
--- old/cups-filters-1.20.0/aclocal.m4 2018-01-29 19:51:27.000000000 +0100
+++ new/cups-filters-1.20.1/aclocal.m4 2018-02-25 16:49:45.000000000 +0100
@@ -20,44 +20,6 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# ===========================================================================
-# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-# been defined and thus are available for use. This avoids random issues
-# where a macro isn't expanded. Instead the configure script emits a
-# non-fatal:
-#
-# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-# It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-# Here's an example:
-#
-# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-# Copyright (c) 2014 Mike Frysinger
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 2
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
- m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
-
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
dnl serial 11 (pkg-config-0.29.1)
dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/configure new/cups-filters-1.20.1/configure
--- old/cups-filters-1.20.0/configure 2018-01-29 19:51:29.000000000 +0100
+++ new/cups-filters-1.20.1/configure 2018-02-25 16:49:47.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cups-filters 1.20.0.
+# Generated by GNU Autoconf 2.69 for cups-filters 1.20.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='cups-filters'
PACKAGE_TARNAME='cups-filters'
-PACKAGE_VERSION='1.20.0'
-PACKAGE_STRING='cups-filters 1.20.0'
+PACKAGE_VERSION='1.20.1'
+PACKAGE_STRING='cups-filters 1.20.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1500,7 +1500,7 @@
# 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 cups-filters 1.20.0 to adapt to many kinds of systems.
+\`configure' configures cups-filters 1.20.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1571,7 +1571,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cups-filters 1.20.0:";;
+ short | recursive ) echo "Configuration of cups-filters 1.20.1:";;
esac
cat <<\_ACEOF
@@ -1801,7 +1801,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cups-filters configure 1.20.0
+cups-filters configure 1.20.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2439,7 +2439,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cups-filters $as_me 1.20.0, which was
+It was created by cups-filters $as_me 1.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3474,7 +3474,7 @@
# Define the identity of the package.
PACKAGE='cups-filters'
- VERSION='1.20.0'
+ VERSION='1.20.1'
cat >>confdefs.h <<_ACEOF
@@ -21214,7 +21214,7 @@
# =====================
# Prepare all .in files
# =====================
-ac_config_files="$ac_config_files libcupsfilters.pc libfontembed.pc Makefile utils/cups-browsed utils/cups-browsed.conf filter/foomatic-rip/foomatic-rip.1 filter/braille/drivers/index/indexv4.sh filter/braille/drivers/index/indexv3.sh filter/braille/drivers/index/index.sh filter/braille/drivers/index/textbrftoindexv3 filter/braille/drivers/index/imageubrltoindexv3 filter/braille/drivers/index/imageubrltoindexv4 filter/braille/drivers/generic/brftoembosser filter/braille/filters/cups-braille.sh filter/braille/filters/imagetobrf filter/braille/filters/texttobrf filter/braille/filters/vectortopdf filter/braille/filters/vectortobrf filter/braille/filters/musicxmltobrf filter/braille/filters/liblouis1.defs.gen mime/cupsfilters.convs"
+ac_config_files="$ac_config_files libcupsfilters.pc libfontembed.pc Makefile utils/cups-browsed utils/cups-browsed.conf filter/foomatic-rip/foomatic-rip.1 filter/braille/drivers/index/indexv4.sh filter/braille/drivers/index/indexv3.sh filter/braille/drivers/index/index.sh filter/braille/drivers/index/textbrftoindexv3 filter/braille/drivers/index/imageubrltoindexv3 filter/braille/drivers/index/imageubrltoindexv4 filter/braille/drivers/generic/brftoembosser filter/braille/filters/cups-braille.sh filter/braille/filters/imagetobrf filter/braille/filters/texttobrf filter/braille/filters/brftopagedbrf filter/braille/filters/vectortopdf filter/braille/filters/vectortobrf filter/braille/filters/musicxmltobrf filter/braille/filters/liblouis1.defs.gen mime/cupsfilters.convs"
ac_config_commands="$ac_config_commands executable-scripts"
@@ -21808,7 +21808,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cups-filters $as_me 1.20.0, which was
+This file was extended by cups-filters $as_me 1.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21874,7 +21874,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cups-filters config.status 1.20.0
+cups-filters config.status 1.20.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -22403,6 +22403,7 @@
"filter/braille/filters/cups-braille.sh") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/cups-braille.sh" ;;
"filter/braille/filters/imagetobrf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/imagetobrf" ;;
"filter/braille/filters/texttobrf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/texttobrf" ;;
+ "filter/braille/filters/brftopagedbrf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/brftopagedbrf" ;;
"filter/braille/filters/vectortopdf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/vectortopdf" ;;
"filter/braille/filters/vectortobrf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/vectortobrf" ;;
"filter/braille/filters/musicxmltobrf") CONFIG_FILES="$CONFIG_FILES filter/braille/filters/musicxmltobrf" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/configure.ac new/cups-filters-1.20.1/configure.ac
--- old/cups-filters-1.20.0/configure.ac 2018-01-29 19:14:59.000000000 +0100
+++ new/cups-filters-1.20.1/configure.ac 2018-02-25 16:49:18.000000000 +0100
@@ -7,7 +7,7 @@
# ====================
m4_define([cups_filters_version_major],[1])
m4_define([cups_filters_version_minor],[20])
-m4_define([cups_filters_version_micro],[0])
+m4_define([cups_filters_version_micro],[1])
m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro])
# =============
@@ -856,6 +856,7 @@
filter/braille/filters/cups-braille.sh
filter/braille/filters/imagetobrf
filter/braille/filters/texttobrf
+ filter/braille/filters/brftopagedbrf
filter/braille/filters/vectortopdf
filter/braille/filters/vectortobrf
filter/braille/filters/musicxmltobrf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/cupsfilters/ppdgenerator.c new/cups-filters-1.20.1/cupsfilters/ppdgenerator.c
--- old/cups-filters-1.20.0/cupsfilters/ppdgenerator.c 2018-01-29 15:22:03.000000000 +0100
+++ new/cups-filters-1.20.1/cupsfilters/ppdgenerator.c 2018-02-25 16:49:18.000000000 +0100
@@ -360,15 +360,14 @@
}
static int /* O - 1 on success, 0 on failure */
-cups_get_url(http_t **http, /* IO - Current HTTP connection */
- const char *url, /* I - URL to get */
- char *name, /* I - Temporary filename */
- size_t namesize) /* I - Size of temporary filename buffer */
+get_url(const char *url, /* I - URL to get */
+ char *name, /* I - Temporary filename */
+ size_t namesize) /* I - Size of temporary filename buffer */
{
+ http_t *http = NULL;
char scheme[32], /* URL scheme */
userpass[256], /* URL username:password */
host[256], /* URL host */
- curhost[256], /* Current host */
resource[256]; /* URL resource */
int port; /* URL port */
http_encryption_t encryption; /* Type of encryption to use */
@@ -384,21 +383,18 @@
else
encryption = HTTP_ENCRYPTION_IF_REQUESTED;
- if (!*http || strcasecmp(host, httpGetHostname(*http, curhost, sizeof(curhost))) || httpAddrPort(httpGetAddress(*http)) != port)
- {
- httpClose(*http);
- *http = httpConnect2(host, port, NULL, AF_UNSPEC, encryption, 1, 5000, NULL);
- }
+ http = httpConnect2(host, port, NULL, AF_UNSPEC, encryption, 1, 5000, NULL);
- if (!*http)
+ if (!http)
return (0);
if ((fd = cupsTempFd(name, (int)namesize)) < 0)
return (0);
- status = cupsGetFd(*http, resource, fd);
+ status = cupsGetFd(http, resource, fd);
close(fd);
+ httpClose(http);
if (status != HTTP_STATUS_OK)
{
@@ -736,7 +732,6 @@
void
load_opt_strings_catalog(const char *location, cups_array_t *options)
{
- http_t *http = NULL;
char tmpfile[1024];
const char *filename = NULL;
struct stat statbuf;
@@ -761,10 +756,8 @@
else
filename = location;
} else {
- if (cups_get_url(&http, location, tmpfile, sizeof(tmpfile)))
+ if (get_url(location, tmpfile, sizeof(tmpfile)))
filename = tmpfile;
- if (http)
- httpClose(http);
}
if (!filename)
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/filter/braille/drivers/index/indexv3.sh.in new/cups-filters-1.20.1/filter/braille/drivers/index/indexv3.sh.in
--- old/cups-filters-1.20.0/filter/braille/drivers/index/indexv3.sh.in 2017-10-05 00:09:29.000000000 +0200
+++ new/cups-filters-1.20.1/filter/braille/drivers/index/indexv3.sh.in 2018-02-20 19:03:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015-2017 Samuel Thibault
+# Copyright (c) 2015-2018 Samuel Thibault
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@
#INIT+=,BP
# Common options
- INIT+=$(commonOptions)
+ INIT+="$(commonOptions)"
# Paper size
case "$PAPERLENGTH" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/filter/braille/drivers/index/indexv4.sh.in new/cups-filters-1.20.1/filter/braille/drivers/index/indexv4.sh.in
--- old/cups-filters-1.20.0/filter/braille/drivers/index/indexv4.sh.in 2017-10-05 00:09:29.000000000 +0200
+++ new/cups-filters-1.20.1/filter/braille/drivers/index/indexv4.sh.in 2018-02-20 19:03:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015-2017 Samuel Thibault
+# Copyright (c) 2015-2018 Samuel Thibault
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -35,12 +35,12 @@
INIT+=TM$TOPMARGIN,BI$INNERMARGIN
else
# disable margins
- INIT+=TM0,BM0,IM0,OM0
+ INIT+=TM0,BI0
fi
# Common options
- INIT+="$(setCommonOptions)"
+ INIT+="$(commonOptions)"
# Paper size
INIT+=,CH$TEXTWIDTH,LP$TEXTHEIGHT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/filter/braille/filters/brftopagedbrf.in new/cups-filters-1.20.1/filter/braille/filters/brftopagedbrf.in
--- old/cups-filters-1.20.0/filter/braille/filters/brftopagedbrf.in 1970-01-01 01:00:00.000000000 +0100
+++ new/cups-filters-1.20.1/filter/braille/filters/brftopagedbrf.in 2018-02-07 23:08:42.000000000 +0100
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+#
+# Copyright (c) 2015-2017 Samuel Thibault
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+# Make sure we have enough options
+if [ $# != 5 -a $# != 6 ]; then
+ echo "ERROR: $0 jobid user name nb options [filename]" >&2
+ exit 1
+fi
+
+NB=$4
+OPTIONS=$5
+FILE=$6
+
+. @CUPS_DATADIR@/braille/cups-braille.sh
+
+shopt -s extglob
+
+# Construct list of pages from PAGERANGES
+
+PAGES=" " # Explicit list of pages
+AFTER= # All pages including and after this
+BEFORE= # All pages before and including this
+
+[ -n "$PAGERANGES" ] || PAGERANGES="1-"
+
+while [ -n "${PAGERANGES}" ]
+do
+ PAGERANGE=${PAGERANGES/,*}
+ PAGERANGE=${PAGERANGE%%*( )}
+ PAGERANGE=${PAGERANGE##*( )}
+ if [ -n "${PAGERANGES/*,*}" ]
+ then
+ # last range
+ PAGERANGES=""
+ else
+ # Remove leading range
+ PAGERANGES="${PAGERANGES#*,}"
+ fi
+
+ if [ -n "${PAGERANGE/*-*}" ]
+ then
+ # single-page
+ PAGES="$PAGES$PAGERANGE "
+
+ elif [ -z "${PAGERANGE%%*-}" ]
+ then
+ # To the end
+ FIRST=${PAGERANGE%%-*}
+ if [ -z "$AFTER" ] || [ "$FIRST" -lt "$AFTER" ]
+ then
+ AFTER="$FIRST"
+ fi
+
+ elif [ -z "${PAGERANGE##-*}" ]
+ then
+ # From the beginning
+ LAST=${PAGERANGE##*-}
+ if [ -z "$BEFORE" ] || [ "$LAST" -gt "$BEFORE" ]
+ then
+ BEFORE="$LAST"
+ fi
+
+ else
+ # page range
+ FIRST=${PAGERANGE/-*}
+ LAST=${PAGERANGE/*-}
+ PAGES="$PAGES$(seq "$FIRST" "$LAST" | tr $'\012' ' ')"
+
+ fi
+done
+
+# Determine whether to print this page
+doprint() {
+ PAGE="$1"
+ if [ -n "$BEFORE" ] && [ "$PAGE" -le "$BEFORE" ]
+ then
+ echo 1
+ return
+ elif [ -n "$AFTER" ] && [ "$PAGE" -ge "$AFTER" ]
+ then
+ echo 1
+ return
+ fi
+ case "$PAGES" in
+ *\ $PAGE\ *)
+ echo 1
+ return
+ ;;
+ esac
+ echo 0
+}
+
+if [ -z "$FILE" ]
+then
+ cat
+else
+ cat "$FILE"
+fi | (
+ P=1
+ DOPRINT=$(doprint $P)
+ while IFS=$'\n' read -r LINE
+ do
+ while [ -z "${LINE/*$'\014'*}" ]
+ do
+ # Possibly print before FF
+ HEAD=${LINE%%$'\014'*}
+ [ $DOPRINT == 0 ] || printf %s "$HEAD"$'\014'
+
+ # Next page
+ P=$(($P + 1))
+ DOPRINT=$(doprint $P)
+
+ # Drop head of line
+ LINE=${LINE#*$'\014'}
+ done
+
+ # Remainder of line
+ [ $DOPRINT == 0 ] || printf "%s\n" "$LINE"
+ done
+)
+
+echo "INFO: Ready" >&2
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.20.0/utils/cups-browsed.c new/cups-filters-1.20.1/utils/cups-browsed.c
--- old/cups-filters-1.20.0/utils/cups-browsed.c 2018-01-27 00:09:09.000000000 +0100
+++ new/cups-filters-1.20.1/utils/cups-browsed.c 2018-02-13 19:21:59.000000000 +0100
@@ -875,6 +875,8 @@
const char *device_uri = cupsGetOption ("device-uri",
dest->num_options,
dest->options);
+ if (device_uri == NULL)
+ device_uri = "";
/* Temporary CUPS queue? */
val = cupsGetOption ("printer-is-temporary",
@@ -5467,6 +5469,10 @@
record_printer_options(p->queue_name);
}
+ if (p->uri[0] == '\0') {
+ free (p->uri);
+ p->uri = strdup(uri);
+ }
if (p->location[0] == '\0') {
free (p->location);
p->location = strdup(location);