From b9c6bf93d7c136a103cf0f13633a01437149a919 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 20 Sep 2023 22:39:31 +0300 Subject: [PATCH] import libdap-3.20.10-1.el9 --- .gitignore | 1 + .libdap.metadata | 1 + SOURCES/192.patch | 26 +++ SOURCES/libdap-offline.patch | 28 +++ SPECS/libdap.spec | 424 +++++++++++++++++++++++++++++++++++ 5 files changed, 480 insertions(+) create mode 100644 .gitignore create mode 100644 .libdap.metadata create mode 100644 SOURCES/192.patch create mode 100644 SOURCES/libdap-offline.patch create mode 100644 SPECS/libdap.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d764b0b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libdap-3.20.10.tar.gz diff --git a/.libdap.metadata b/.libdap.metadata new file mode 100644 index 0000000..3bb7fee --- /dev/null +++ b/.libdap.metadata @@ -0,0 +1 @@ +ea8a3073fc05c06f9d01d8696fbc10b306428d93 SOURCES/libdap-3.20.10.tar.gz diff --git a/SOURCES/192.patch b/SOURCES/192.patch new file mode 100644 index 0000000..39b3e97 --- /dev/null +++ b/SOURCES/192.patch @@ -0,0 +1,26 @@ +From 5ccb4f14b0c620bf0271b00cb47770bca4c2439c Mon Sep 17 00:00:00 2001 +From: ndp-opendap +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 &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)); + } + diff --git a/SOURCES/libdap-offline.patch b/SOURCES/libdap-offline.patch new file mode 100644 index 0000000..2ecf385 --- /dev/null +++ b/SOURCES/libdap-offline.patch @@ -0,0 +1,28 @@ +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 + diff --git a/SPECS/libdap.spec b/SPECS/libdap.spec new file mode 100644 index 0000000..6189383 --- /dev/null +++ b/SPECS/libdap.spec @@ -0,0 +1,424 @@ +Name: libdap +Summary: The C++ DAP2 library from OPeNDAP +Version: 3.20.10 +Release: 1%{?dist} + +License: LGPLv2+ +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++ +# For autoreconf +BuildRequires: libtool +BuildRequires: bison >= 3.0 +BuildRequires: cppunit-devel +BuildRequires: curl-devel +BuildRequires: doxygen +BuildRequires: flex +BuildRequires: graphviz +BuildRequires: libtirpc-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig +%ifnarch s390 %{mips} +BuildRequires: valgrind +%endif + +Provides: bundled(gnulib) + + +%description +The libdap++ library contains an implementation of DAP2. This package +contains the library, dap-config, and getdap. The script dap-config +simplifies using the library in other projects. The getdap utility is a +simple command-line tool to read from DAP2 servers. It is built using the +library and demonstrates simple uses of it. + + +%package devel +Summary: Development and header files from libdap +Requires: %{name} = %{version}-%{release} +Requires: curl-devel +Requires: libxml2-devel +Requires: pkgconfig +# for the /usr/share/aclocal directory ownership +Requires: automake + +%description devel +This package contains all the files needed to develop applications that +will use libdap. + + +%package doc +Summary: Documentation of the libdap library + +%description doc +Documentation of the libdap library. + + +%prep +%autosetup -n %{name}-%{version} -p1 +iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 +touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 +mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C + + +%build +# To fix rpath +autoreconf -f -i +%configure --disable-static --disable-dependency-tracking +# --enable-valgrind - missing valgrind exclusions file +%make_build + +make docs + + +%install +%make_install INSTALL="%{__install} -p" +mkdir -p $RPM_BUILD_ROOT%{_libdir}/libdap +mv $RPM_BUILD_ROOT%{_libdir}/libtest-types.a $RPM_BUILD_ROOT%{_libdir}/libdap/ +rm $RPM_BUILD_ROOT%{_libdir}/*.la +mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config + +rm -rf __dist_docs +cp -pr html __dist_docs +# those .map and .md5 are of dubious use, remove them +rm -f __dist_docs/*.map __dist_docs/*.md5 +# use the ChangeLog timestamp to have the same timestamps for the doc files +# for all arches +touch -r ChangeLog __dist_docs/* + + +%check +# tarball is missing some needed files +make check || : + + +%ldconfig_scriptlets + + +%files +%license COPYRIGHT_W3C COPYING COPYRIGHT_URI +%doc README.md NEWS README.dodsrc +%{_bindir}/getdap +%{_bindir}/getdap4 +%{_libdir}/libdap.so.27* +%{_libdir}/libdapclient.so.6* +%{_libdir}/libdapserver.so.7* +%{_mandir}/man1/getdap.1* +%{_mandir}/man1/getdap4.1* + +%files devel +%{_libdir}/libdap.so +%{_libdir}/libdapclient.so +%{_libdir}/libdapserver.so +%{_libdir}/libdap/ +%{_libdir}/pkgconfig/libdap*.pc +%{_bindir}/dap-config +%{_includedir}/libdap/ +%{_datadir}/aclocal/* +%{_mandir}/man1/dap-config.1* + +%files doc +%license COPYING COPYRIGHT_URI COPYRIGHT_W3C +%doc __dist_docs/ + + +%changelog +* Wed Sep 20 2023 Arkady L. Shane - 3.20.10-1 +- Rebuilt for MSVSphere 9.2 + +* Fri Jul 01 2022 Orion Poplawski - 3.20.10-1 +- Update to 3.20.10 + +* Thu Jan 20 2022 Fedora Release Engineering - 3.20.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Orion Poplawski - 3.20.9-1 +- Update to 3.20.9 + +* Sat Nov 20 2021 Orion Poplawski - 3.20.8-1 +- Update to 3.20.8 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.20.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 3.20.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.20.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 08 2020 Orion Poplawski - 3.20.6-1 +- Update to 3.20.6 + +* Sat Feb 08 2020 Orion Poplawski - 3.20.5-1 +- Update to 3.20.5 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.20.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jul 29 2019 Orion Poplawski - 3.20.4-1 +- Update to 3.20.4 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.20.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Orion Poplawski - 3.20.3-1 +- Update to 3.20.3 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Orion Poplawski - 3.19.1-1 +- Update to 3.19.1 +- Add patch to use libtirpc +- Add BR gcc-c++ + +* Wed Feb 07 2018 Fedora Release Engineering - 3.18.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.18.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.18.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.18.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 11 2017 Orion Poplawski - 3.18.3-1 +- Update to 3.18.3 + +* Tue Dec 6 2016 Orion Poplawski - 3.18.2-1 +- Update to 3.18.2 +- Drop getopt and big endian baselines patches applied upstream + +* Fri Aug 26 2016 Dan Horák - 3.18.1-2 +- Add missing big endian baselines (#1366787) + +* Fri Aug 12 2016 Orion Poplawski - 3.18.1-1 +- Update to 3.18.1 +- Add patch to fix getopt usage again + +* Thu Aug 11 2016 Michal Toman - 3.17.2-2 +- No valgrind on MIPS + +* Fri Apr 15 2016 Than Ngo - 3.17.2-1 +- update to 3.17.2 + +* Fri Apr 15 2016 Dan Horák - 3.17.1-1 +- Update to 3.17.1 +- Switch to github for source archive +- Add missing big endian baselines (#1325114) + +* Tue Feb 9 2016 Orion Poplawski - 3.17.0-1 +- Update to 3.17.0 +- Add patch for gcc 6 support + +* Thu Feb 04 2016 Fedora Release Engineering - 3.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 14 2016 Orion Poplawski - 3.16.0-1 +- Update to 3.16.0 + +* Wed Sep 23 2015 Orion Poplawski - 3.15.1-1 +- Update to 3.15.1 +- Drop flex, getopt, and include patches fixed upstream + +* Wed Jun 17 2015 Fedora Release Engineering - 3.14.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 04 2015 Dan Horák - 3.14.0-4 +- valgrind available only on selected arches + +* Fri Apr 17 2015 Orion Poplawski - 3.14.0-3 +- Add patch to add needed includes + +* Fri Apr 17 2015 Orion Poplawski - 3.14.0-2 +- Ship libtest-types.a for dependent package tests + +* Thu Apr 16 2015 Orion Poplawski - 3.14.0-1 +- Update to 3.14.0 +- Add patch to fix flex compilation +- Add patch to fix getopt usage +- Update offline patch for new test + +* Mon Feb 23 2015 Orion Poplawski - 3.13.3-1 +- Update to 3.13.3 + +* Sun Aug 17 2014 Fedora Release Engineering - 3.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 15 2014 Orion Poplawski - 3.13.1-2 +- Add patch to fix tests on ppc and arm + +* Wed Jul 9 2014 Orion Poplawski - 3.13.1-1 +- Update to 3.13.1 +- Run autoreconf to fix rpaths + +* Sat Jun 07 2014 Fedora Release Engineering - 3.11.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 3.11.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 29 2013 Orion Poplawski - 3.11.7-1 +- Update to 3.11.7 +- Drop gcc47 patch applied upstream +- spec cleanup +- Add BR openssl-devel + +* Thu Feb 14 2013 Fedora Release Engineering - 3.11.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 3.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 15 2012 Orion Poplawski - 3.11.3-1 +- Update to 3.11.3 +- Drop curl and test patches applied upstream +- Add Provides: bundled(gnulib) (bug 821766) + +* Tue Feb 28 2012 Fedora Release Engineering - 3.11.1-5 +- Rebuilt for c++ ABI breakage + +* Sat Jan 14 2012 Orion Poplawski - 3.11.1-4 +- Add patch to compile with gcc 4.7 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 28 2011 Orion Poplawski - 3.11.1-2 +- Add upstream patch to fix failing test + +* Tue Nov 22 2011 Orion Poplawski - 3.11.1-1 +- Update to 3.11.1 +- Add patch for current libcurl + +* Mon Feb 07 2011 Fedora Release Engineering - 3.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 10 2010 Orion Poplawski - 3.11.0-1 +- Update to 3.11.0 +- Drop libuuid patch fixed upstream +- Drop soname patch + +* Thu Jul 15 2010 Orion Poplawski - 3.10.2-3 +- Add patch to bump soname as this dropped the AIS* functions +- Add BR cppunit-devel and %%check section +- Add patch to not run HTTP network tests + +* Wed Jul 14 2010 Orion Poplawski - 3.10.2-2 +- Add patch to remove -luuid from pkg-config libs + +* Tue Jul 13 2010 Orion Poplawski - 3.10.2-1 +- Update to 3.10.2 +- Deflate is no longer shipped +- Drop includes patch fixed upstream +- Add license to doc sub-package + +* Fri Jul 24 2009 Fedora Release Engineering - 3.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Orion Poplawski - 3.9.3-1 +- Update to 3.9.3 + +* Tue Mar 3 2009 Caolán McNamara - 3.8.2-3 +- include cstdio for std::sprintf + +* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Sep 5 2008 Patrice Dumas 3.8.2-1 +- update to 3.8.2 + +* Sun Mar 16 2008 Patrice Dumas 3.8.0-1 +- update to 3.8.0 + +* Tue Feb 19 2008 Fedora Release Engineering - 3.7.10-3 +- Autorebuild for GCC 4.3 + +* Wed Jan 2 2008 Patrice Dumas 3.7.10-2 +- use pkg-config in dap-config + +* Mon Dec 17 2007 Patrice Dumas 3.7.10-1 +- update to 3.7.10 + +* Sun Oct 21 2007 Patrice Dumas 3.7.8-3 +- remove reference to libdir in dap-config + +* Wed Aug 29 2007 Fedora Release Engineering - 3.7.8-2 +- Rebuild for selinux ppc32 issue. + +* Thu Jul 5 2007 Patrice Dumas 3.7.8-1.1 +- update to 3.7.8 + +* Thu May 31 2007 Patrice Dumas 3.7.7-1.1 +- update to 3.7.7 + +* Sat May 12 2007 Patrice Dumas 3.7.6-4 +- remove static libs +- set the same doc file timestamps for all arches + +* Mon Apr 30 2007 Patrice Dumas 3.7.6-3 +- correct the library install order +- keep timestamps +- add documentation in a subpackage + +* Mon Apr 30 2007 Patrice Dumas 3.7.6-2 +- update to 3.7.6 + +* Tue Oct 31 2006 Patrice Dumas 3.7.2-3 +- rebuild for new libcurl soname + +* Thu Oct 05 2006 Christian Iseli 3.7.2-2 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 Patrice Dumas 3.7.2-1 +- update to 3.7.2 + +* Wed Sep 6 2006 Patrice Dumas 3.7.1-1 +- update to 3.7.1 +- set licence to LGPL instead of W3C/LGPL, since only deflate is W3C, so + the whole is under the LGPL + +* Fri Jul 21 2006 Patrice Dumas 3.7.0-1 +- update to 3.7.0 + +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- update to 3.6.0 + +* Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 +- fix Source0 + +* Tue Aug 30 2005 Patrice Dumas - 3.5.2-3 +- Add missing Requires + +* Sat Jul 2 2005 Patrice Dumas - 3.5.1-2 +- Support for shared libraries +- Add COPYING +- Update with fedora template + +* Thu May 12 2005 James Gallagher - 3.5.0-1 +- Changed: Requires xml2 to libxml2 + +* Wed May 11 2005 James Gallagher 3.5.0-1 +- Removed version numbers from .a and includes directory. + +* Tue May 10 2005 James Gallagher +- Mostly works. Problems: Not sure if the %%post script stuff works. +- Must also address the RHEL3 package deps issue (curl 7.12.0 isn't available; + not sure about xml2 2.5.7). At least the deps fail when they are not present! + +* Fri May 6 2005 James Gallagher +- Initial build.