Compare commits
No commits in common. "058834dca009940d0847ae6973aa4057e9fbbfda" and "0ea9bd457c5da83c16ed07932ce1c4fa43d2decb" have entirely different histories.
058834dca0
...
0ea9bd457c
|
|
@ -21,4 +21,3 @@ libdap-3.10.2.tar.gz
|
|||
/libdap-3.20.6.tar.gz
|
||||
/libdap-3.20.8.tar.gz
|
||||
/libdap-3.20.9.tar.gz
|
||||
/libdap-3.20.10.tar.gz
|
||||
|
|
|
|||
26
192.patch
26
192.patch
|
|
@ -1,26 +0,0 @@
|
|||
From 5ccb4f14b0c620bf0271b00cb47770bca4c2439c Mon Sep 17 00:00:00 2001
|
||||
From: ndp-opendap <ndp@opendap.org>
|
||||
Date: Fri, 8 Jul 2022 08:23:02 -0700
|
||||
Subject: [PATCH] Fixing type issue in HTTPCache.cc
|
||||
|
||||
---
|
||||
HTTPCache.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/HTTPCache.cc b/HTTPCache.cc
|
||||
index 56e912be..f2b34214 100644
|
||||
--- a/HTTPCache.cc
|
||||
+++ b/HTTPCache.cc
|
||||
@@ -1028,10 +1028,10 @@ HTTPCache::read_metadata(const string &cachename, vector<string> &headers)
|
||||
"Could not open named cache entry meta data file.");
|
||||
}
|
||||
|
||||
- const unsigned long line_buf_len = 1024;
|
||||
+ const size_t line_buf_len = 1024;
|
||||
char line[line_buf_len];
|
||||
while (!feof(md) && fgets(line, line_buf_len, md)) {
|
||||
- line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
|
||||
+ line[std::min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
|
||||
headers.push_back(string(line));
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index d325e52..123e73d 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -122,7 +122,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE)
|
||||
diff -up libdap-3.20.3/tests/Makefile.am.orig libdap-3.20.3/tests/Makefile.am
|
||||
--- libdap-3.20.3/tests/Makefile.am.orig 2019-02-14 10:13:49.000000000 -0700
|
||||
+++ libdap-3.20.3/tests/Makefile.am 2019-02-17 15:27:32.426858748 -0700
|
||||
@@ -120,7 +120,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
|
||||
$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
|
||||
$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
|
||||
$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
|
||||
|
|
@ -10,19 +9,18 @@ index d325e52..123e73d 100644
|
|||
|
||||
# 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/unit-tests/Makefile.am b/unit-tests/Makefile.am
|
||||
index 58ecd20..abbf860 100644
|
||||
--- a/unit-tests/Makefile.am
|
||||
+++ b/unit-tests/Makefile.am
|
||||
@@ -85,9 +85,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
|
||||
diff -up libdap-3.20.3/unit-tests/Makefile.am.orig libdap-3.20.3/unit-tests/Makefile.am
|
||||
--- libdap-3.20.3/unit-tests/Makefile.am.orig 2019-02-17 15:27:32.426858748 -0700
|
||||
+++ libdap-3.20.3/unit-tests/Makefile.am 2019-02-17 15:28:10.725606175 -0700
|
||||
@@ -78,9 +78,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
|
||||
if CPPUNIT
|
||||
UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
|
||||
RegexTest ArrayTest GridTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
|
||||
RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
|
||||
- DDSTest DDXParserTest generalUtilTest HTTPConnectTest parserUtilTest \
|
||||
+ DDSTest DDXParserTest generalUtilTest parserUtilTest \
|
||||
RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \
|
||||
- HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
|
||||
+ ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
|
||||
Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \
|
||||
D4BaseTypeFactoryTest BaseTypeFactoryTest util_mitTest
|
||||
D4BaseTypeFactoryTest BaseTypeFactoryTest
|
||||
|
||||
|
|
|
|||
10
libdap.spec
10
libdap.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: libdap
|
||||
Summary: The C++ DAP2 library from OPeNDAP
|
||||
Version: 3.20.10
|
||||
Version: 3.20.9
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
|
|
@ -8,8 +8,6 @@ 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 for i686 build
|
||||
Patch1: https://github.com/OPENDAP/libdap4/pull/192.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -131,12 +129,6 @@ make check || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 01 2022 Orion Poplawski <orion@nwra.com> - 3.20.10-1
|
||||
- Update to 3.20.10
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libdap-3.20.10.tar.gz) = a3e58550eb4153a3c9c11fcfba56d87e56273ada6c25c78f7bf04d38f533dd873d124ef52e5c8fa4b648c0bb08ad7295f06c3d23fa09abeea0b169bd03f95117
|
||||
SHA512 (libdap-3.20.9.tar.gz) = 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c
|
||||
|
|
|
|||
Loading…
Reference in New Issue