rpms
/
libdap
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8c
rpms:c8
rpms:i9
rpms:epel9
...
pull from: rpms:c8
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8c
rpms:c8
rpms:i9
rpms:epel9

No commits in common. 'epel9' and 'c8' have entirely different histories.
epel9 ... c8

8 changed files with 140 additions and 134 deletions
Show Stats

25
.gitignore vendored
Unescape View File

@ -1,24 +1 @@
libdap-3.10.2.tar.gz SOURCES/libdap-3.19.1.tar.gz
/libdap-3.11.0.tar.gz
/libdap-3.11.1.tar.gz
/libdap-3.11.3.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-3.15.1.tar.gz
/libdap-3.16.0.tar.gz
/libdap-3.17.0.tar.gz
/version-3.17.1.tar.gz
/libdap-3.17.2.tar.gz
/libdap-3.18.1.tar.gz
/libdap-3.18.2.tar.gz
/libdap-3.18.3.tar.gz
/libdap-3.19.1.tar.gz
/libdap-3.20.3.tar.gz
/libdap-3.20.4.tar.gz
/libdap-3.20.5.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

1
.libdap.metadata
Unescape View File

@ -0,0 +1 @@
6754f5e10fff42322d54154eda2e7b4c0e56272c SOURCES/libdap-3.19.1.tar.gz

26
192.patch
Unescape View File

@ -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));
}

94
SOURCES/libdap-3.19.1-use-libtirpc.patch
Unescape View File

@ -0,0 +1,94 @@
diff --git a/Makefile.am b/Makefile.am
index f5dab89..8c90f30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I conf -I gl/m4
aclocaldir=$(datadir)/aclocal
pkgconfigdir=$(libdir)/pkgconfig
-AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS)
+AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU $(XML2_CFLAGS) $(TIRPC_CFLAGS)
AM_CXXFLAGS =
if COMPILER_IS_GCC
@@ -47,7 +47,7 @@ man_MANS = getdap.1 dap-config.1 getdap4.1
groff -t -e -mandoc -Tascii $< | col -bx > $@
libparsers_la_SOURCES = $(FLEX_SRC) $(BISON_SRC)
-libparsers_la_CPPFLAGS = $(XML2_CFLAGS)
+libparsers_la_CPPFLAGS = $(XML2_CFLAGS) $(TIRPC_CFLAGS)
libparsers_la_LIBADD = $(XML2_LIBS)
libdap_la_SOURCES = $(DAP_SRC) $(GNU_SRC)
diff --git a/conf/acinclude.m4 b/conf/acinclude.m4
index 63a17e7..df3d7c9 100644
--- a/conf/acinclude.m4
+++ b/conf/acinclude.m4
@@ -558,12 +558,23 @@ AC_DEFUN([DODS_CHECK_SIZES], [dnl
#
# Unfortunately, there is little commonality about xdr
- # First, we need to see if the xdr routines are in libc, librpc,
+ # First, we need to see if the xdr routines are in libtirpc, libc, librpc,
# or librpcsvc or libnsl
dap_xdrlib=
- AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[
- dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[
- AC_MSG_WARN(Cannot locate library containing xdr functions.)])
+ PKG_PROG_PKG_CONFIG([0.9.0])
+ PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4],
+ [dap_xdrlib=`echo "${TIRPC_LIBS}" | sed -e 's/^-l//'`
+ AC_SUBST([TIRPC_CFLAGS])
+ AC_SUBST([TIRPC_LIBS])
+ AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use libtirpc.])],
+ [dap_xdrlib=""]
+ )
+ AS_IF(
+ [test "$dap_xdrlib" = ""],
+ [AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[
+ dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[
+ AC_MSG_WARN(Cannot locate library containing xdr functions.)])])
+
# Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi
diff --git a/d4_ce/Makefile.am b/d4_ce/Makefile.am
index aa1a070..fcae7a4 100644
--- a/d4_ce/Makefile.am
+++ b/d4_ce/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign
.NOTPARALLEL:
# Arrange to build with the backward compatibility mode enabled.
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce -I$(srcdir) $(XML2_CFLAGS) $(TIRPC_CFLAGS)
AM_CXXFLAGS =
if COMPILER_IS_GCC
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f32e7d0..d51d255 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
# Arrange to build with the backward compatibility mode enabled.
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/GNU -I$(top_srcdir)/d4_ce \
--I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS)
+-I$(top_srcdir)/d4_function $(XML2_CFLAGS) $(CURL_CFLAGS) $(TIRPC_CFLAGS)
AM_CXXFLAGS =
if COMPILER_IS_GCC
diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am
index be70132..c5ae5e7 100644
--- a/unit-tests/Makefile.am
+++ b/unit-tests/Makefile.am
@@ -7,7 +7,8 @@ AUTOMAKE_OPTIONS = foreign
# Headers in 'tests' are used by the arrayT unit tests.
-AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests \
+$(CURL_CFLAGS) $(XML2_CFLAGS) $(TIRPC_CFLAGS)
AM_LDADD = $(XML2_LIBS)
AM_CXXFLAGS =
# CXXFLAGS =

26
SOURCES/libdap-offline.patch
Unescape View File

@ -0,0 +1,26 @@
diff -up libdap-3.18.1/tests/Makefile.am.offline libdap-3.18.1/tests/Makefile.am
--- libdap-3.18.1/tests/Makefile.am.offline 2015-10-19 16:03:35.000000000 -0600
+++ libdap-3.18.1/tests/Makefile.am 2016-08-12 09:33:37.767696856 -0600
@@ -112,7 +112,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
$(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
# Delete the scripts here and not using CLEANFILES because this target is
diff -up libdap-3.18.1/unit-tests/Makefile.am.offline libdap-3.18.1/unit-tests/Makefile.am
--- libdap-3.18.1/unit-tests/Makefile.am.offline 2016-08-12 09:33:37.768696852 -0600
+++ libdap-3.18.1/unit-tests/Makefile.am 2016-08-12 09:34:12.984547765 -0600
@@ -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 \
+ DDSTest DDXParserTest generalUtilTest parserUtilTest \
RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \
- HTTPCacheTest ServerFunctionsListUnitTest
+ ServerFunctionsListUnitTest
if DAP4_DEFINED
UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \

73
libdap.spec → SPECS/libdap.spec
Unescape View File

@ -1,17 +1,17 @@
Name: libdap Name: libdap
Summary: The C++ DAP2 library from OPeNDAP Summary: The C++ DAP2 library from OPeNDAP
Version: 3.20.10 Version: 3.19.1
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries
URL: http://www.opendap.org/ URL: http://www.opendap.org/
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
#Don't run HTTP tests - builders don't have network connections #Don't run HTTP tests - builders don't have network connections
Patch0: libdap-offline.patch Patch0: libdap-offline.patch
# Fix for i686 build # Use libtirpc
Patch1: https://github.com/OPENDAP/libdap4/pull/192.patch Patch1: libdap-3.19.1-use-libtirpc.patch
BuildRequires: make
BuildRequires: gcc-c++ BuildRequires: gcc-c++
# For autoreconf # For autoreconf
BuildRequires: libtool BuildRequires: libtool
@ -26,7 +26,7 @@ BuildRequires: libuuid-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%ifnarch s390 %{mips} %ifarch %{valgrind_arches}
BuildRequires: valgrind BuildRequires: valgrind
%endif %endif
@ -43,6 +43,7 @@ library and demonstrates simple uses of it.
%package devel %package devel
Summary: Development and header files from libdap Summary: Development and header files from libdap
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: curl-devel Requires: curl-devel
Requires: libxml2-devel Requires: libxml2-devel
@ -57,6 +58,7 @@ will use libdap.
%package doc %package doc
Summary: Documentation of the libdap library Summary: Documentation of the libdap library
Group: Documentation
%description doc %description doc
Documentation of the libdap library. Documentation of the libdap library.
@ -80,7 +82,7 @@ make docs
%install %install
%make_install INSTALL="%{__install} -p" make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
mkdir -p $RPM_BUILD_ROOT%{_libdir}/libdap mkdir -p $RPM_BUILD_ROOT%{_libdir}/libdap
mv $RPM_BUILD_ROOT%{_libdir}/libtest-types.a $RPM_BUILD_ROOT%{_libdir}/libdap/ mv $RPM_BUILD_ROOT%{_libdir}/libtest-types.a $RPM_BUILD_ROOT%{_libdir}/libdap/
rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la
@ -100,15 +102,17 @@ touch -r ChangeLog __dist_docs/*
make check || : make check || :
%ldconfig_scriptlets %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%license COPYRIGHT_W3C COPYING COPYRIGHT_URI %license COPYRIGHT_W3C COPYING COPYRIGHT_URI
%doc README.md NEWS README.dodsrc %doc README NEWS README.dodsrc
%{_bindir}/getdap %{_bindir}/getdap
%{_bindir}/getdap4 %{_bindir}/getdap4
%{_libdir}/libdap.so.27* %{_libdir}/libdap.so.25*
%{_libdir}/libdapclient.so.6* %{_libdir}/libdapclient.so.6*
%{_libdir}/libdapserver.so.7* %{_libdir}/libdapserver.so.7*
%{_mandir}/man1/getdap.1* %{_mandir}/man1/getdap.1*
@ -131,55 +135,14 @@ make check || :
%changelog %changelog
* Fri Jul 01 2022 Orion Poplawski <orion@nwra.com> - 3.20.10-1 * Fri Aug 3 2018 Florian Weimer <fweimer@redhat.com> - 3.19.1-2
- Update to 3.20.10 - Honor %%{valgrind_arches}
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jan 13 2022 Orion Poplawski <orion@nwra.com> - 3.20.9-1
- Update to 3.20.9
* Sat Nov 20 2021 Orion Poplawski <orion@nwra.com> - 3.20.8-1
- Update to 3.20.8
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 08 2020 Orion Poplawski <orion@nwra.com> - 3.20.6-1
- Update to 3.20.6
* Sat Feb 08 2020 Orion Poplawski <orion@nwra.com> - 3.20.5-1
- Update to 3.20.5
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jul 29 2019 Orion Poplawski <orion@nwra.com> - 3.20.4-1
- Update to 3.20.4
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Orion Poplawski <orion@nwra.com> - 3.20.3-1
- Update to 3.20.3
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Orion Poplawski <orion@nwra.com> - 3.19.1-1 * Tue Jun 26 2018 Josef Ridky <jridky@redhat.com> - 3.19.1-1
- Update to 3.19.1 - Update to 3.19.1
- Add patch to use libtirpc - Add patch to use libtirpc
- Add BR gcc-c++ - Add BR gcc-c++
- Resolves: #1580754 - FTBFS in RHEL-8
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

28
libdap-offline.patch
Unescape View File

@ -1,28 +0,0 @@
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)
$(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
# 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
if CPPUNIT
UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
RegexTest ArrayTest GridTest 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

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (libdap-3.20.10.tar.gz) = a3e58550eb4153a3c9c11fcfba56d87e56273ada6c25c78f7bf04d38f533dd873d124ef52e5c8fa4b648c0bb08ad7295f06c3d23fa09abeea0b169bd03f95117
Write Preview
Loading…
Cancel
Save