Skip to content

Commit 84ce4df

Browse files
committed
LibSpiro 20200505 - Version 1.1.0
Collective fixes from tagpoint v1.0 (20190731) up to now v1.1 (20200505).
1 parent b4d0d4a commit 84ce4df

File tree

5 files changed

+44
-15
lines changed

5 files changed

+44
-15
lines changed

ChangeLog

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
- 2020-May-05
2+
* Libspiro Version 20200505 (1.1.0)
3+
* Bugfix for CVE-2019-19847 affecting {call-test14 to call-test19}.
4+
* Fix a memory access bug/error created earlier by patch 2017oct28
5+
Users using tagpoint libspiro20150702 are unaffected by this bug.
6+
Users using tagpoint libspiro20190731 are recommended to upgrade.
7+
Thanks to Frederic Cambus for calling attention to these faults.
8+
* Add optional 'end knot' for open curves (useful for displaying).
9+
* CRA Version also higher than so-bump 1.0.5 used on some distros;
10+
this maybe of interest to distros that bumped an earlier version.
11+
* Some garbage-in/garbage-out checks to verify we have 'ah' pairs,
12+
and we don't start with ']', or end with '['. Add libspiro.3 man.
13+
* Corrected set_di_to_x1y1() to use a constant bandwidth of 0.0005
14+
* Code improvements and bug fixes for better tagged/spiro results.
15+
* Several improvements added to further increase libspiro's speed.
16+
117
- 2019-Jul-31
2-
* Libspiro Version 20190731
18+
* Libspiro Version 20190731 (1.0.0)
319
* Corrected library to report correctly as next version up. This is
420
probably a significant change, therefore bumped library to start
521
at 1.0 even though backwards compatibility remains close to same.

config.guess

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2019 Free Software Foundation, Inc.
3+
# Copyright 1992-2020 Free Software Foundation, Inc.
44

5-
timestamp='2019-07-24'
5+
timestamp='2020-04-26'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
5050
GNU config.guess ($timestamp)
5151
5252
Originally written by Per Bothner.
53-
Copyright 1992-2019 Free Software Foundation, Inc.
53+
Copyright 1992-2020 Free Software Foundation, Inc.
5454
5555
This is free software; see the source for copying conditions. There is NO
5656
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -99,6 +99,8 @@ tmp=
9999
trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
100100

101101
set_cc_for_build() {
102+
# prevent multiple calls if $tmp is already set
103+
test "$tmp" && return 0
102104
: "${TMPDIR=/tmp}"
103105
# shellcheck disable=SC2039
104106
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -274,6 +276,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
274276
*:Sortix:*:*)
275277
echo "$UNAME_MACHINE"-unknown-sortix
276278
exit ;;
279+
*:Twizzler:*:*)
280+
echo "$UNAME_MACHINE"-unknown-twizzler
281+
exit ;;
277282
*:Redox:*:*)
278283
echo "$UNAME_MACHINE"-unknown-redox
279284
exit ;;
@@ -921,7 +926,7 @@ EOF
921926
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
922927
exit ;;
923928
alpha:Linux:*:*)
924-
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
929+
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
925930
EV5) UNAME_MACHINE=alphaev5 ;;
926931
EV56) UNAME_MACHINE=alphaev56 ;;
927932
PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -1624,6 +1629,12 @@ copies of config.guess and config.sub with the latest versions from:
16241629
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
16251630
and
16261631
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1632+
EOF
1633+
1634+
year=`echo $timestamp | sed 's,-.*,,'`
1635+
# shellcheck disable=SC2003
1636+
if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
1637+
cat >&2 <<EOF
16271638
16281639
If $0 has already been updated, send the following data and any
16291640
information you think might be pertinent to [email protected] to
@@ -1651,6 +1662,7 @@ UNAME_RELEASE = "$UNAME_RELEASE"
16511662
UNAME_SYSTEM = "$UNAME_SYSTEM"
16521663
UNAME_VERSION = "$UNAME_VERSION"
16531664
EOF
1665+
fi
16541666

16551667
exit 1
16561668

config.sub

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
3-
# Copyright 1992-2019 Free Software Foundation, Inc.
3+
# Copyright 1992-2020 Free Software Foundation, Inc.
44

5-
timestamp='2019-06-30'
5+
timestamp='2020-04-24'
66

77
# This file is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <[email protected]>."
6767
version="\
6868
GNU config.sub ($timestamp)
6969
70-
Copyright 1992-2019 Free Software Foundation, Inc.
70+
Copyright 1992-2020 Free Software Foundation, Inc.
7171
7272
This is free software; see the source for copying conditions. There is NO
7373
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1343,7 +1343,7 @@ case $os in
13431343
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
13441344
| sym* | kopensolaris* | plan9* \
13451345
| amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
1346-
| aos* | aros* | cloudabi* | sortix* \
1346+
| aos* | aros* | cloudabi* | sortix* | twizzler* \
13471347
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
13481348
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
13491349
| knetbsd* | mirbsd* | netbsd* \
@@ -1366,7 +1366,7 @@ case $os in
13661366
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
13671367
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
13681368
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
1369-
| nsk* | powerunix)
1369+
| nsk* | powerunix*)
13701370
# Remember, each alternative MUST END IN *, to match a version number.
13711371
;;
13721372
qnx*)

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# -*- Autoconf -*-
22
dnl Process this file with autoconf to produce a configure script.
33

4-
# Copyright (C) 2013...2019 by Joe Da Silva
4+
# Copyright (C) 2013...2020 by Joe Da Silva
55

66
AC_PREREQ([2.64])
77
#-------------------------------------------
88
# PackageTimestamp version
9-
m4_define([spiro_package_stamp], [20190731])
9+
m4_define([spiro_package_stamp], [20200505])
1010
#-------------------------------------------
1111
# Making point releases:
1212
# spiro_major_version += 0;
@@ -21,7 +21,7 @@ m4_define([spiro_package_stamp], [20190731])
2121
# spiro_minor_version = 0;
2222
#
2323
m4_define([spiro_major_version], [1])
24-
m4_define([spiro_minor_version], [0])
24+
m4_define([spiro_minor_version], [1])
2525
m4_define([spiro_version],[spiro_major_version.spiro_minor_version])
2626

2727
#-------------------------------------------
@@ -45,7 +45,7 @@ m4_define([spiro_version],[spiro_major_version.spiro_minor_version])
4545
# spiro_age = 0
4646
#
4747
m4_define([spiro_current], [1])
48-
m4_define([spiro_revision],[0])
48+
m4_define([spiro_revision],[1])
4949
m4_define([spiro_age], [0])
5050
m4_define([spiro_libver],[spiro_current:spiro_revision:spiro_age])
5151

spiro.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,7 @@ spiro_seg_to_bpath1(const double ks[4], double *dm, double *di,
11171117
}
11181118
}
11191119

1120+
/* deprecated / keep backwards compatibility / not scalable */
11201121
static void
11211122
spiro_seg_to_bpath(const double ks[4],
11221123
double x0, double y0, double x1, double y1,
@@ -1251,7 +1252,7 @@ spiro_to_bpath0(const spiro_cp *src, const spiro_seg *s,
12511252

12521253
nsegs = n;
12531254
if (s[0].ty == '{') {
1254-
if (n - 2 >= 0 && s[n - 2].ty == 'a')
1255+
if (n >= 2 && s[n - 2].ty == 'a')
12551256
--nsegs;
12561257
--nsegs;
12571258
z = -1;

0 commit comments

Comments
 (0)