From 8f1c1d53761079a12d86ec0429a9d6c0b201a168 Mon Sep 17 00:00:00 2001 From: ndp-opendap Date: Tue, 21 Apr 2020 14:11:08 -0700 Subject: [PATCH] Make release 3.20.6 --- ChangeLog | 113 +++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 9 ++++ README.md | 7 +++ configure.ac | 4 +- debian/changelog | 7 +++ libdap.spec | 2 +- 6 files changed, 139 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 805ce7c5b..9172d6ea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,116 @@ +2020-04-16 James Gallagher + + Merge pull request #115 from OPENDAP/error-msg-fix + Error msg fix + +2020-04-15 James Gallagher + + Test baselines for ce parser message fixes + And a few more fixes to the messages. + + Added tests for the DAP4 CE parser error messages + + Added tests for the parser error messages. + +2020-04-14 James Gallagher + + Additional work on the DAP4 function parser. + + Changes to the CE parser to address a xss attack. + +2020-04-04 James Gallagher + + Fixed a mistake in an error message in configure.ac + [skip ci] + +2020-02-16 James Gallagher + + Merge pull request #113 from OPENDAP/sonarscan-fix + Fix for travis and sonarscan based on travis support email + +2020-02-15 James Gallagher + + Fix for travis and sonarscan based on travis support email + +2020-02-13 James Gallagher + + Fixed CentOS6 pre std=c++0x issues. + + Merge branch 'master' of https://github.com/opendap/libdap4 + + Swapped out unique_ptr for auto_ptr because of CentOS6 build fail + This problem is exacerbated by flex 2.5.35 which fails to build code + that will compile on C6 using --std=c++0x. + + Merge pull request #112 from OPENDAP/parser-util-fix + Switched to faster functions for CE and Attribute value checking. + + Switched to faster functions for CE and Attribute value checking. + + Added README.md to EXTRA_DIST + + Changes that address (I think) issues with the recent rename of README to README.md + I'm pushing this directly onto master because the CI build on a PR branch + did not show the issues. + + Merge pull request #111 from OPENDAP/readme-rename + Renamed README to README.md + +2020-02-12 James Gallagher + + Added README.md; removed scan from build to test issues with said scan + + Renamed README to README.md + Also trying to debug the sonarscan issue where travis cannot find + executable. + + Revert "Merge pull request #109 from OPENDAP/cppunit-build-fix" + This reverts commit 3f07795a1e6e228802321797728209fce5ee4962, reversing + changes made to f4672a3fc673ad6e330cad00254bfb813865f8bd. + + Revert "Merge pull request #107 from OPENDAP/cppunit-build-fix" + This reverts commit 3f07795a1e6e228802321797728209fce5ee4962, reversing + changes made to f4672a3fc673ad6e330cad00254bfb813865f8bd. + + Merge pull request #109 from OPENDAP/cppunit-build-fix + This change to configure.ac fixes the build for cppunit 1.14.0 + + Merge pull request #108 from OPENDAP/natural_axes + Natural axes #1 + +2020-02-11 James Gallagher + + Suppres include of unistd.h by the flex sources + This is an attempt to fix a c++-11 build issue on linux with modern gcc + versions. + + This change to configure.ac fixes the build for cppunit 1.14.0 + The fix instructs the compiler to use --std=c++-11 or c++-0x which + enables cpp 1.14.0's use of std::bind. + + Removed geo/Makefile from configure.ac + + Removed geo from SUBDIRS in Makefile.am + + Added #include for unique_ptr and removed geo includes + + Removed %define api.parser.class from the two DAP4 CE parsers + This broke bison on Linux + + Merge branch 'master' into natural_axes + + Completed fixes for the DAP2 CE parser refactor. + I cannot figure out how to make UInt32 the default type for integer + constants for function arguments. I dropped back to Int32s by default. + I think this means that if functions are called with args that have + to be held in UInt32s, those function calls will not work. + +2020-02-10 James Gallagher + + Fixed broken parse of [*] in an array/grid projection + The parser was setting the projection to -1:1:-1 when t should have + set it to 0:1:-1. Also fixed the broken expr-test debug feature. + 2020-01-09 ndp-opendap updating aws keys for travis diff --git a/NEWS b/NEWS index 443a873e4..e0bf8cb14 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +News for version 3.20.6 + +Stopped CE parse errors from returning user supplied +strings in error messages. + +Switched to README.md from README + +Swapped out unique_ptr for auto_ptr because of CentOS6 issues. + News for version 3.20.5 Fixed memory leaks in imported aws signing code. diff --git a/README.md b/README.md index d7afff13e..168ea328a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ Please find the libdap4 API documentation here: https://opendap.github.io/libdap4/html/ +Updated for version 3.20.6 + +Stopped CE parse errors from returning user supplied +strings in error messages. + +README is now README.md + [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3641778.svg)](https://doi.org/10.5281/zenodo.3641778) Updated for version 3.20.5 diff --git a/configure.ac b/configure.ac index 095c5fc1f..58f95b462 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl m4_pattern_forbid([^_?(gl_[A-Z]|AX_|BISON_)]) dnl m4_pattern_allow([^BISON_USE_NLS$]) dnl Update version here and below at LIB_CURRENT, ..., if needed. -AC_INIT(libdap, 3.20.5, opendap-tech@opendap.org) +AC_INIT(libdap, 3.20.6, opendap-tech@opendap.org) AC_DEFINE(DAP_PROTOCOL_VERSION, ["4.0"], [Highest DAP version implemented?]) AC_SUBST([DAP_PROTOCOL_VERSION]) @@ -58,7 +58,7 @@ dnl ==> Increment CURRENT, set AGE and REVISION to 0. DAPLIB_CURRENT=27 DAPLIB_AGE=2 -DAPLIB_REVISION=2 +DAPLIB_REVISION=3 AC_SUBST(DAPLIB_CURRENT) AC_SUBST(DAPLIB_AGE) AC_SUBST(DAPLIB_REVISION) diff --git a/debian/changelog b/debian/changelog index 035eee5cd..da84b7c08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdap (3.20.6-1) trusty; urgency=medium + + * Stopped CE parse errors from returning user supplied strings in error messages. + * Swapped out unique_ptr for auto_ptr because of CentOS6 + + -- Nathan Potter Tue, 21 Apr 2020 01:47:00 +0700 + libdap (3.20.5-1) trusty; urgency=medium * Various bug fixes. CI grooming diff --git a/libdap.spec b/libdap.spec index 38a222680..d4da3240d 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,6 +1,6 @@ Name: libdap Summary: The C++ DAP2/DAP4 library from OPeNDAP -Version: 3.20.5 +Version: 3.20.6 Release: 1%{?dist} License: LGPLv2+