Update to 3.14.0

- Add patch to fix flex compilation
- Update offline patch for new test

.gitignore

@@ -5,3 +5,4 @@ libdap-3.10.2.tar.gz
 /libdap-3.11.7.tar.gz
 /libdap-3.13.1.tar.gz
 /libdap-3.13.3.tar.gz
+/libdap-3.14.0.tar.gz

libdap-flex.patch

@@ -0,0 +1,48 @@
+diff -up libdap-3.14.0/d4_ce/lex.d4_ce.cc.flex libdap-3.14.0/d4_ce/lex.d4_ce.cc
+--- libdap-3.14.0/d4_ce/lex.d4_ce.cc.flex	2015-04-07 00:45:50.000000000 -0600
++++ libdap-3.14.0/d4_ce/lex.d4_ce.cc	2015-04-16 11:12:38.074231518 -0600
+@@ -1276,9 +1276,9 @@ void yyFlexLexer::switch_streams( std::i
+ }
+ 
+ #ifdef YY_INTERACTIVE
+-size_t yyFlexLexer::LexerInput( char* buf, size_t /* max_size */ )
++int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
+ #else
+-size_t yyFlexLexer::LexerInput( char* buf, size_t max_size )
++int yyFlexLexer::LexerInput( char* buf, int max_size )
+ #endif
+ {
+ 	if ( yyin->eof() || yyin->fail() )
+@@ -1305,7 +1305,7 @@ size_t yyFlexLexer::LexerInput( char* bu
+ #endif
+ }
+ 
+-void yyFlexLexer::LexerOutput( const char* buf, size_t size )
++void yyFlexLexer::LexerOutput( const char* buf, int size )
+ {
+ 	(void) yyout->write( buf, size );
+ }
+diff -up libdap-3.14.0/d4_ce/lex.d4_function.cc.flex libdap-3.14.0/d4_ce/lex.d4_function.cc
+--- libdap-3.14.0/d4_ce/lex.d4_function.cc.flex	2015-04-03 22:47:36.000000000 -0600
++++ libdap-3.14.0/d4_ce/lex.d4_function.cc	2015-04-16 11:12:52.096512693 -0600
+@@ -1303,9 +1303,9 @@ void yyFlexLexer::switch_streams( std::i
+ }
+ 
+ #ifdef YY_INTERACTIVE
+-size_t yyFlexLexer::LexerInput( char* buf, size_t /* max_size */ )
++int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
+ #else
+-size_t yyFlexLexer::LexerInput( char* buf, size_t max_size )
++int yyFlexLexer::LexerInput( char* buf, int max_size )
+ #endif
+ {
+ 	if ( yyin->eof() || yyin->fail() )
+@@ -1332,7 +1332,7 @@ size_t yyFlexLexer::LexerInput( char* bu
+ #endif
+ }
+ 
+-void yyFlexLexer::LexerOutput( const char* buf, size_t size )
++void yyFlexLexer::LexerOutput( const char* buf, int size )
+ {
+ 	(void) yyout->write( buf, size );
+ }

libdap-offline.patch

@@ -1,12 +1,35 @@
-diff -up libdap-3.13.1/unit-tests/Makefile.am.offline libdap-3.13.1/unit-tests/Makefile.am
+diff -up libdap-3.14.0/tests/Makefile.am.offline libdap-3.14.0/tests/Makefile.am
---- libdap-3.13.1/unit-tests/Makefile.am.offline	2014-02-04 16:17:16.000000000 -0700
+--- libdap-3.14.0/tests/Makefile.am.offline	2015-04-16 13:58:00.256001226 -0600
-+++ libdap-3.13.1/unit-tests/Makefile.am	2014-07-10 13:39:07.193789391 -0600
++++ libdap-3.14.0/tests/Makefile.am	2015-04-16 14:10:17.020831267 -0600
-@@ -48,7 +48,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
+@@ -23,7 +23,7 @@ if DAP4_DEFINED
- 	RegexTest                                                       \
+ check_PROGRAMS += dmr-test
- 	ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest 	\
+ endif
- 	DDSTest	DDXParserTest generalUtilTest 		\
+ 
--	HTTPCacheTest HTTPConnectTest parserUtilTest RCReaderTest 	\
+-TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
-+	parserUtilTest RCReaderTest 	\
++TESTS = DASTest DDSTest EXPRTest DMRTest
- 	SequenceTest SignalHandlerTest  MarshallerTest                  \
+ 
- 	ServerFunctionsListUnitTest 
+ dist_check_SCRIPTS = DASTest DDSTest EXPRTest DMRTest getdapTest atconfig atlocal
- 	
+ 
+diff -up libdap-3.14.0/unit-tests/Makefile.am.offline libdap-3.14.0/unit-tests/Makefile.am
+--- libdap-3.14.0/unit-tests/Makefile.am.offline	2015-02-26 21:33:44.000000000 -0700
++++ libdap-3.14.0/unit-tests/Makefile.am	2015-04-16 13:58:00.260001279 -0600
+@@ -10,7 +10,6 @@ AUTOMAKE_OPTIONS = foreign
+ AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS)
+ AM_LDADD =
+ AM_CXXFLAGS = 
+-CXXFLAGS = 
+ 
+ if COMPILER_IS_GCC
+ AM_CXXFLAGS += -Wall -W -Wcast-align
+@@ -66,9 +65,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+ if CPPUNIT
+ UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
+ 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+-	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
++	DDSTest	DDXParserTest  generalUtilTest parserUtilTest \
+ 	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
+-	HTTPCacheTest ServerFunctionsListUnitTest 
++	ServerFunctionsListUnitTest 
+ 
+ if DAP4_DEFINED
+ UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \

libdap.spec

@@ -1,6 +1,6 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.13.3
+Version: 3.14.0
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -9,17 +9,22 @@ URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 #Don't run HTTP tests - builders don't have network connections
 Patch0:  libdap-offline.patch
+# Fix flex types
+Patch1:  libdap-flex.patch
 
 # For autoreconf
 BuildRequires: libtool
+BuildRequires: bison
 BuildRequires: cppunit-devel
 BuildRequires: curl-devel
 BuildRequires: doxygen
+BuildRequires: flex
 BuildRequires: graphviz
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
+BuildRequires: valgrind
 
 Provides: bundled(gnulib)
 
@@ -62,15 +67,21 @@ Documentation of the libdap library.
 %prep
 %setup -q
 %patch0 -p1 -b .offline
+%patch1 -p1 -b .flex
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
+# Cleanup shipped flex/bison files
+rm -r d4_ce/gen_grammar_sources
+# Fix flags
+find -name Makefile.am | xargs sed -i -e '/^CXXFLAGS *=/d'
 
 
 %build
 # To fix rpath
 autoreconf -f -i
 %configure --disable-static --disable-dependency-tracking
+# --enable-valgrind - missing valgrind exclusions file
 make %{?_smp_mflags}
 
 make docs
@@ -102,10 +113,12 @@ make check
 
 %files
 %{_bindir}/getdap
+%{_bindir}/getdap4
 %{_libdir}/libdap.so.*
 %{_libdir}/libdapclient.so.*
 %{_libdir}/libdapserver.so.*
 %{_mandir}/man1/getdap.1*
+%{_mandir}/man1/getdap4.1*
 %doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
 %doc COPYRIGHT_W3C
 
@@ -125,6 +138,11 @@ make check
 
 
 %changelog
+* Thu Apr 16 2015 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-1
+- Update to 3.14.0
+- Add patch to fix flex compilation
+- Update offline patch for new test
+
 * Mon Feb 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.13.3-1
 - Update to 3.13.3
 

sources

@@ -1 +1 @@
-eda3d6c68abc93734a84f680eb546e6a  libdap-3.13.3.tar.gz
+83ac4c6eb4aa8e485587de94b9757d01  libdap-3.14.0.tar.gz