diff -pruN 3.6.0-3/AUTHORS 3.7.0-1/AUTHORS --- 3.6.0-3/AUTHORS 2018-06-04 16:23:26.000000000 +0000 +++ 3.7.0-1/AUTHORS 2018-08-31 14:59:17.000000000 +0000 @@ -180,6 +180,7 @@ TABLE CONTRIBUTORS Sreeja Parameswaran Stefan Moisei Sukil Etxenike + Sunian Loomee Tamru E. Belay , from Adaptive Technology Center for the Blind (ATCB) Tom Johnston Tsengel Maidar tsengel@digitalsunngo.org diff -pruN 3.6.0-3/configure 3.7.0-1/configure --- 3.6.0-3/configure 2018-06-04 16:23:49.000000000 +0000 +++ 3.7.0-1/configure 2018-09-03 11:50:13.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Liblouis 3.6.0. +# Generated by GNU Autoconf 2.69 for Liblouis 3.7.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Liblouis' PACKAGE_TARNAME='liblouis' -PACKAGE_VERSION='3.6.0' -PACKAGE_STRING='Liblouis 3.6.0' +PACKAGE_VERSION='3.7.0' +PACKAGE_STRING='Liblouis 3.7.0' PACKAGE_BUGREPORT='liblouis-liblouisxml@freelists.org' PACKAGE_URL='http://www.liblouis.org' @@ -1887,7 +1887,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 Liblouis 3.6.0 to adapt to many kinds of systems. +\`configure' configures Liblouis 3.7.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1958,7 +1958,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Liblouis 3.6.0:";; + short | recursive ) echo "Configuration of Liblouis 3.7.0:";; esac cat <<\_ACEOF @@ -2075,7 +2075,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Liblouis configure 3.6.0 +Liblouis configure 3.7.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2727,7 +2727,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 Liblouis $as_me 3.6.0, which was +It was created by Liblouis $as_me 3.7.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3609,7 +3609,7 @@ fi # Define the identity of the package. PACKAGE='liblouis' - VERSION='3.6.0' + VERSION='3.7.0' cat >>confdefs.h <<_ACEOF @@ -14100,7 +14100,7 @@ LIBLOUIS_CURRENT=16 # increment any time the source changes; set to 0 if you increment # CURRENT -LIBLOUIS_REVISION=0 +LIBLOUIS_REVISION=1 # increment if any interfaces have been added; set to 0 if any # interfaces have been changed or removed. removal has precedence over @@ -23724,7 +23724,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Liblouis $as_me 3.6.0, which was +This file was extended by Liblouis $as_me 3.7.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23791,7 +23791,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="\\ -Liblouis config.status 3.6.0 +Liblouis config.status 3.7.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -pruN 3.6.0-3/configure.ac 3.7.0-1/configure.ac --- 3.6.0-3/configure.ac 2018-06-04 16:23:26.000000000 +0000 +++ 3.7.0-1/configure.ac 2018-09-03 11:43:43.000000000 +0000 @@ -1,13 +1,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.68) -AC_INIT([Liblouis], [3.6.0], [liblouis-liblouisxml@freelists.org], [liblouis], [http://www.liblouis.org]) +AC_INIT([Liblouis], [3.7.0], [liblouis-liblouisxml@freelists.org], [liblouis], [http://www.liblouis.org]) AC_CONFIG_SRCDIR([liblouis/lou_backTranslateString.c]) AM_CONFIG_HEADER(liblouis/config.h) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([-Wall]) +AM_INIT_AUTOMAKE([-Wall dist-zip]) # Checks for programs. # Try to compile using C99 @@ -57,7 +57,7 @@ LIBLOUIS_CURRENT=16 # increment any time the source changes; set to 0 if you increment # CURRENT -LIBLOUIS_REVISION=0 +LIBLOUIS_REVISION=1 # increment if any interfaces have been added; set to 0 if any # interfaces have been changed or removed. removal has precedence over diff -pruN 3.6.0-3/debian/changelog 3.7.0-1/debian/changelog --- 3.6.0-3/debian/changelog 2018-08-17 17:06:38.000000000 +0000 +++ 3.7.0-1/debian/changelog 2018-09-15 08:11:03.000000000 +0000 @@ -1,3 +1,12 @@ +liblouis (3.7.0-1) unstable; urgency=medium + + * New upstream release. + - debian/patches/automake-1.16: upstream. + - debian/patches/cve-2018-12085: upstream. + - debian/patches/da-dk: upstream. + + -- Samuel Thibault Sat, 15 Sep 2018 10:11:03 +0200 + liblouis (3.6.0-3) unstable; urgency=medium * control: Bump Standards-Version to 4.2.0 (no changes). diff -pruN 3.6.0-3/debian/patches/automake-1.16 3.7.0-1/debian/patches/automake-1.16 --- 3.6.0-3/debian/patches/automake-1.16 2018-08-17 17:05:29.000000000 +0000 +++ 3.7.0-1/debian/patches/automake-1.16 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Enable automake to generate dependencies for libbrlcheck.la -Author: Adrian Bunk -Bug-Debian: https://bugs.debian.org/906376 - ---- liblouis-3.6.0.orig/tools/Makefile.am -+++ liblouis-3.6.0/tools/Makefile.am -@@ -14,7 +14,7 @@ lou_compare_CPPFLAGS = $(AM_CPPFLAGS) -w - LDADD = \ - $(top_builddir)/liblouis/liblouis.la \ - $(top_builddir)/tools/gnulib/libgnutools.la \ -- $(top_builddir)/tools/libbrlcheck.la \ -+ libbrlcheck.la \ - $(LTLIBINTL) - - # libbrlcheck is a convenience library that contains functionality to diff -pruN 3.6.0-3/debian/patches/cve-2018-12085 3.7.0-1/debian/patches/cve-2018-12085 --- 3.6.0-3/debian/patches/cve-2018-12085 2018-06-30 12:06:39.000000000 +0000 +++ 3.7.0-1/debian/patches/cve-2018-12085 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -commit dbfa58bb128cae86729578ac596056b3385817ef -Author: Christian Egli -Date: Wed Jun 6 16:41:53 2018 +0200 - - Check index before writing to result->chars - - Fixes #595 - -diff --git a/liblouis/compileTranslationTable.c b/liblouis/compileTranslationTable.c -index e3ca9607..c0282121 100644 ---- a/liblouis/compileTranslationTable.c -+++ b/liblouis/compileTranslationTable.c -@@ -1127,11 +1127,11 @@ parseChars(FileInfo *nested, CharsString *result, CharsString *token) { - } - in++; - } -- result->chars[out++] = (widechar)ch; - if (out >= MAXSTRING) { - result->length = out; - return 1; - } -+ result->chars[out++] = (widechar)ch; - continue; - } - lastOutSize = out; diff -pruN 3.6.0-3/debian/patches/da-dk 3.7.0-1/debian/patches/da-dk --- 3.6.0-3/debian/patches/da-dk 2018-07-07 13:11:25.000000000 +0000 +++ 3.7.0-1/debian/patches/da-dk 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ ---- - tests/braille-specs/da-dk-g26.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/tests/braille-specs/da-dk-g26.yaml -+++ b/tests/braille-specs/da-dk-g26.yaml -@@ -799,7 +799,7 @@ tests: - - ["⠠⠖⠨⠖", "!Fra"] - - ["⠖⠋⠗⠁", "!fra"] - - ["⠈⠨⠴", "'Af"] -- - ["⠈⠁⠋", "\'af"] -+ - ["⠈⠁⠋", "'af"] - - # No single cell contractions before or after dashes - diff -pruN 3.6.0-3/debian/patches/series 3.7.0-1/debian/patches/series --- 3.6.0-3/debian/patches/series 2018-08-17 17:05:29.000000000 +0000 +++ 3.7.0-1/debian/patches/series 2018-09-15 08:06:55.000000000 +0000 @@ -1,3 +1 @@ -cve-2018-12085 -da-dk -automake-1.16 +# empty diff -pruN 3.6.0-3/doc/liblouis.html 3.7.0-1/doc/liblouis.html --- 3.6.0-3/doc/liblouis.html 2018-06-04 16:24:49.000000000 +0000 +++ 3.7.0-1/doc/liblouis.html 2018-09-03 11:46:23.000000000 +0000 @@ -1,6 +1,6 @@ -