reinit the tree, so we can have metadata

6 files changed, 224 insertions, 0 deletions

diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch
new file mode 100644
index 000000000000..09c33e6f381a
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-disable-broken-tests.patch
@@ -0,0 +1,18 @@
+Description: D4FilterClauseTest breaks on arm*, powerpc, s390x.
+Author: Alastair McKinstry <mckinstry@debian.org>
+Last-Updated: 2016-08-31
+Forwarded: no
+
+Index: libdap-3.18.0/unit-tests/Makefile.am
+===================================================================
+--- libdap-3.18.0.orig/unit-tests/Makefile.am
++++ libdap-3.18.0/unit-tests/Makefile.am
+@@ -74,7 +74,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
+ if DAP4_DEFINED
+ UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
+ 	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
+-	chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
++	chunked_iostream_test D4AsyncDocTest DMRTest  \
+ 	D4SequenceTest
+ endif
+ 
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch
new file mode 100644
index 000000000000..6ce7ae0c4f6d
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-disable-cache-test.patch
@@ -0,0 +1,22 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Disable test as website appears to be down
+Forwarded: no
+Last-Updated: 2015-10-20
+
+Index: libdap-3.18.0/unit-tests/Makefile.am
+===================================================================
+--- libdap-3.18.0.orig/unit-tests/Makefile.am
++++ libdap-3.18.0/unit-tests/Makefile.am
+@@ -67,9 +67,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 \
+-	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
+-	HTTPCacheTest ServerFunctionsListUnitTest
++	DDSTest	DDXParserTest  generalUtilTest  parserUtilTest \
++	SequenceTest SignalHandlerTest  MarshallerTest \
++	ServerFunctionsListUnitTest
+ 
+ if DAP4_DEFINED
+ UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch
new file mode 100644
index 000000000000..d4691f59518f
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-disable-dmr-tests.patch
@@ -0,0 +1,31 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Disable DMR tests which break on big-endian archs at the moment
+Last-Updated: 2015-11-08
+Forwarded: no
+
+Index: libdap-3.18.0/tests/Makefile.am
+===================================================================
+--- libdap-3.18.0.orig/tests/Makefile.am
++++ libdap-3.18.0/tests/Makefile.am
+@@ -31,7 +31,7 @@ endif
+ # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
+ 
+ check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
+-	$(DMRTESTSUITE) $(GETDAPTESTSUITE)
++	$(GETDAPTESTSUITE)
+ 
+ # Build the test drivers. The drivers all use the
+ # subclassed types in Test*.cc and the TestTypesFactory.
+@@ -107,11 +107,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest
+ GETDAPTESTSUITE = $(srcdir)/getdapTest
+ 
+ check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
+-$(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE) 
++$(EXPRTESTSUITE)  $(GETDAPTESTSUITE) 
+ 	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+-	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+ 
+ # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
diff --git a/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch b/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch
new file mode 100644
index 000000000000..7c42ec1199c4
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-disable-net-tests.patch
@@ -0,0 +1,33 @@
+Author: Alastair McKinstry <mckinstry@debian.org>
+Description: Disable network tests, as network not available on
+ most build systems
+Last-Updated: 2016-02-06
+Forwarded: not-needed
+
+Index: libdap-3.18.0/tests/Makefile.am
+===================================================================
+--- libdap-3.18.0.orig/tests/Makefile.am
++++ libdap-3.18.0/tests/Makefile.am
+@@ -30,8 +30,7 @@ endif
+ 
+ # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
+ 
+-check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) \
+-	$(GETDAPTESTSUITE)
++check_SCRIPTS = $(DASTESTSUITE) $(DDSTESTSUITE) $(EXPRTESTSUITE) 
+ 
+ # Build the test drivers. The drivers all use the
+ # subclassed types in Test*.cc and the TestTypesFactory.
+@@ -107,11 +106,10 @@ DMRTESTSUITE = $(srcdir)/DMRTest
+ GETDAPTESTSUITE = $(srcdir)/getdapTest
+ 
+ check-local: atconfig atlocal $(DASTESTSUITE) $(DDSTESTSUITE) \
+-$(EXPRTESTSUITE)  $(GETDAPTESTSUITE) 
++$(EXPRTESTSUITE) 
+ 	$(SHELL) '$(DASTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+-	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+ 
+ # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
+ # Delete the scripts here and not using CLEANFILES because this target is
diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..f36fdceb1fd0
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-fix-buildsystem.patch
@@ -0,0 +1,20 @@
+Do not install headers and static library required only for test suite.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -36,13 +36,13 @@
+ # Build the test drivers. The drivers all use the
+ # subclassed types in Test*.cc and the TestTypesFactory.
+ 
+-lib_LIBRARIES = libtest-types.a
++noinst_LIBRARIES = libtest-types.a
+ 
+ libtest_types_a_SOURCES = $(TESTSRCS) $(TEST_HDR)
+ libtest_types_a_CXXFLAGS = -fPIC
+ 
+ testheadersdir = $(pkgincludedir)/test
+-testheaders_HEADERS = $(TEST_HDR)
++noinst_testheaders = $(TEST_HDR)
+ 
+ das_test_SOURCES = das-test.cc
+ das_test_LDADD =  libtest-types.a ../libdapserver.la ../libdap.la 
diff --git a/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch b/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch
new file mode 100644
index 000000000000..6b74fa10a240
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.18.1-fix-c++14.patch
@@ -0,0 +1,100 @@
+C++11 changed destructor semantics to be noexcept(true)
+by default, leading to potentially changed semantics.
+
+--- a/HTTPResponse.h
++++ b/HTTPResponse.h
+@@ -115,6 +115,9 @@
+     temp_file and headers are deleted. If the tmp file name is "", it is
+     not deleted. */
+     virtual ~HTTPResponse()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
+     {
+         DBG(cerr << "Freeing HTTPConnect resources (" + d_file + ")... ");
+ 
+--- a/MarshallerThread.cc
++++ b/MarshallerThread.cc
+@@ -106,6 +106,9 @@
+  * Unlock the mutex
+  */
+ Locker::~Locker()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
+ {
+     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
+ 
+@@ -140,6 +143,9 @@
+ }
+ 
+ ChildLocker::~ChildLocker()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
+ {
+     DBG(cerr << "Unlocking the mutex! (" << pthread_self() << ")" << endl);
+ 
+@@ -164,6 +170,9 @@
+ }
+ 
+ MarshallerThread::~MarshallerThread()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
+ {
+     int status = pthread_mutex_lock(&d_out_mutex);
+     if (status != 0) throw InternalErr(__FILE__, __LINE__, "Could not lock m_mutex");
+--- a/MarshallerThread.h
++++ b/MarshallerThread.h
+@@ -52,7 +52,11 @@
+ class Locker {
+ public:
+     Locker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
+-    virtual ~Locker();
++    virtual ~Locker()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
++    ;
+ 
+ private:
+     pthread_mutex_t& m_mutex;
+@@ -74,7 +78,11 @@
+ class ChildLocker {
+ public:
+     ChildLocker(pthread_mutex_t &lock, pthread_cond_t &cond, int &count);
+-    virtual ~ChildLocker();
++    virtual ~ChildLocker()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
++    ;
+ 
+ private:
+     pthread_mutex_t& m_mutex;
+@@ -144,7 +152,11 @@
+ 
+ public:
+     MarshallerThread();
+-    virtual ~MarshallerThread();
++    virtual ~MarshallerThread()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
++    ;
+ 
+     pthread_mutex_t &get_mutex() { return d_out_mutex; }
+     pthread_cond_t &get_cond() { return d_out_cond; }
+--- a/Response.h
++++ b/Response.h
+@@ -93,6 +93,9 @@
+ 
+     /** Close the stream. */
+     virtual ~Response()
++#if __cplusplus >= 201103L
++    noexcept(false)
++#endif
+     {
+         if (d_stream)
+             fclose(d_stream);