Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,11 @@
 shapelib-1.3.0b2.tar.gz
 /shapelib-1.3.0.tar.gz
+/shapelib-1.4.0RC1.tar.gz
+/shapelib-1.4.0.tar.gz
+/shapelib-1.4.1.tar.gz
+/shapelib-man.tar.gz
+/shapelib-1.5.0.tar.gz
+/shapelib-1.6.0.tar.gz
+/shapelib-1.6.1.tar.gz
+/shapelib-1.6.2.tar.gz
+/shapelib-1.6.3.tar.gz

shapelib.spec

@@ -1,28 +1,50 @@
+#global pre RC1
+
+%if %{defined rhel} || %{defined flatpak}
+%bcond_with mingw
+%else
+%bcond_without mingw
+%endif
+
 Name:          shapelib
-Version:       1.3.0
-Release:       3%{?dist}
+Version:       1.6.3
+Release:       2%{?dist}
 Summary:       C library for handling ESRI Shapefiles
 # The core library is dual-licensed LGPLv2 or MIT.
 # Some contributed files have different licenses:
 # - contrib/csv2shp.c: GPLv2+
 # - contrib/dbfinfo.c: Public domain
 # - contrib/dbfcat.c:  Public domain
-License:       (LGPLv2+ or MIT) and GPLv2+ and Public Domain
+License:       (LGPL-2.0-or-later OR MIT) AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain
 URL:           http://shapelib.maptools.org/
-Source:        http://download.osgeo.org/shapelib/%{name}-1.3.0.tar.gz
-# This patch replaces the handmade makefiles with autotools scripts. This patch was generated by
-# git clone https://github.com/manisandro/shapelib.git
-# cd shapelib
-# git checkout autotools
-# git diff master..autotools > shapelib_autotools.patch
-#
-# Upstream is notified about these modifications: http://bugzilla.maptools.org/show_bug.cgi?id=2447
-Patch0:        shapelib_autotools.patch
-# Backports from gdal bundled shapelib
-Patch1:        shapelib_backports.patch
+Source0:       http://download.osgeo.org/shapelib/%{name}-%{version}%{?pre:%pre}.tar.gz
+# Man pages from debian package
+# wget https://salsa.debian.org/debian-gis-team/shapelib/-/archive/master/shapelib-master.tar.gz
+# tar --strip-components=2 -xvf shapelib-master.tar.gz shapelib-master/debian/man
+# tar -czf shapelib-man.tar.gz man/
+# rm -r man
+Source1:       %{name}-man.tar.gz
+# Add library version suffix for mingw dlls
+Patch1:        shapelib_libver.patch
 
-BuildRequires: autoconf automake libtool
+BuildRequires: cmake
+BuildRequires: gcc-c++
 BuildRequires: proj-devel >= 4.4.1
+# For man pages
+BuildRequires: rubygem-ronn
+
+%if %{with mingw}
+BuildRequires: mingw32-filesystem
+BuildRequires: mingw32-gcc-c++
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-proj
+
+BuildRequires: mingw64-filesystem
+BuildRequires: mingw64-gcc-c++
+BuildRequires: mingw64-binutils
+BuildRequires: mingw64-proj
+%endif
+
 
 %description
 The Shapefile C Library provides the ability to write
@@ -30,6 +52,7 @@ simple C programs for reading, writing and updating (to a
 limited extent) ESRI Shapefiles, and the associated
 attribute file (.dbf).
 
+
 %package devel
 Summary:       Development files for shapelib
 Requires:      %{name}%{?_isa} = %{version}-%{release}
@@ -37,6 +60,7 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 %description devel
 This package contains libshp and the appropriate header files.
 
+
 %package tools
 Summary:       shapelib utility programs
 Requires:      %{name}%{?_isa} = %{version}-%{release}
@@ -44,45 +68,368 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 %description tools
 This package contains various utility programs distributed with shapelib.
 
+
+%if %{with mingw}
+%package -n mingw32-%{name}
+Summary:       MinGW Windows %{name} library
+BuildArch:     noarch
+Obsoletes:     mingw32-%{name}-static < 1.6.2-1
+Provides:      mingw32-%{name}-static = %{version}-%{release}
+
+%description -n mingw32-%{name}
+%{summary}.
+
+
+%package -n mingw32-%{name}-tools
+Summary:       Tools for the  MinGW Windows %{name} library
+Requires:      mingw32-%{name} = %{version}-%{release}
+BuildArch:     noarch
+
+%description -n mingw32-%{name}-tools
+%{summary}.
+
+
+%package -n mingw64-%{name}
+Summary:       MinGW Windows %{name} library
+BuildArch:     noarch
+Obsoletes:     mingw64-%{name}-static < 1.6.2-1
+Provides:      mingw64-%{name}-static = %{version}-%{release}
+
+%description -n mingw64-%{name}
+%{summary}.
+
+
+%package -n mingw64-%{name}-tools
+Summary:       Tools for the  MinGW Windows %{name} library
+Requires:      mingw64-%{name} = %{version}-%{release}
+BuildArch:     noarch
+
+%description -n mingw64-%{name}-tools
+%{summary}.
+%endif
+
+
+%{?mingw_debug_package}
+
+
 %prep
-%setup -q -n %{name}-1.3.0
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -a1
+
 
 %build
-NOCONFIGURE=1 sh ./autogen.sh
-%configure --disable-static
-make %{?_smp_mflags}
+# Native build
+%cmake -DBUILD_TESTING=OFF -DUSE_RPATH=OFF -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_INSTALL_CMAKEDIR=%{_libdir}/cmake/%{name}
+%cmake_build
+
+%if %{with mingw}
+# MinGW build
+MINGW32_CMAKE_ARGS="-DCMAKE_INSTALL_CMAKEDIR=%{mingw32_libdir}/cmake/%{name}" \
+MINGW64_CMAKE_ARGS="-DCMAKE_INSTALL_CMAKEDIR=%{mingw64_libdir}/cmake/%{name}" \
+%mingw_cmake -DBUILD_TESTING=OFF
+%mingw_make_build
+%endif
+
 
 %install
-%make_install
+%cmake_install
+%if %{with mingw}
+%mingw_make_install
+%endif
 
-# Remove static libraries
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# Build man pages
+ronn -r --date="$(LC_ALL=C date -u "+%Y-%m-%d")" --manual=%{name} man/*.md
+mkdir -p %{buildroot}%{_mandir}/man1/
+install -pm 0644 man/*.1 %{buildroot}%{_mandir}/man1/
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%{?mingw_debug_install_post}
+
 
 %files
-%doc COPYING README README.tree ChangeLog web/*.html
-%{_libdir}/libshp.so.*
+%doc README README.tree ChangeLog web/*.html
+%license LICENSE*
+%{_libdir}/libshp.so.%{version}
+%{_libdir}/libshp.so.4*
 
 %files devel
 %{_includedir}/shapefil.h
 %{_libdir}/libshp.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/%{name}/
 
 %files tools
 %doc contrib/doc/
 %{_bindir}/*
+%{_mandir}/man1/*.1*
+
+%if %{with mingw}
+%files -n mingw32-%{name}
+%license LICENSE*
+%{mingw32_bindir}/libshp-4.dll
+%{mingw32_includedir}/shapefil.h
+%{mingw32_libdir}/libshp.dll.a
+%{mingw32_libdir}/pkgconfig/shapelib.pc
+%{mingw32_libdir}/cmake/%{name}/
+
+%files -n mingw32-%{name}-tools
+%{mingw32_bindir}/*.exe
+
+%files -n mingw64-%{name}
+%license LICENSE*
+%{mingw64_bindir}/libshp-4.dll
+%{mingw64_includedir}/shapefil.h
+%{mingw64_libdir}/libshp.dll.a
+%{mingw64_libdir}/pkgconfig/shapelib.pc
+%{mingw64_libdir}/cmake/%{name}/
+
+%files -n mingw64-%{name}-tools
+%{mingw64_bindir}/*.exe
+%endif
+
 
 %changelog
-* Mon Feb 06 2023 Chris Muzyn <chris.muzyn@gmail.com> -  1.3.0-3
-- Backport double free fix to epel7
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 
-* Sun Apr 06 2014 Sandro Mani <manisandro@gmail.com> - 1.3.0-2
+* Thu Mar 19 2026 Sandro Mani <manisandro@gmail.com> - 1.6.3-1
+- Update to 1.6.3
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Tue Sep 23 2025 Sandro Mani <manisandro@gmail.com> - 1.6.2-1
+- Update to 1.6.2
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug 14 2024 Sandro Mani <manisandro@gmail.com> - 1.6.1-1
+- Update to 1.6.1
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 22 2023 Sandro Mani <manisandro@gmail.com> - 1.6.0-1
+- Update to 1.6.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 1.5.0-13
+- Rebuild with mingw-gcc-12
+
+* Wed Mar 02 2022 Sandro Mani <manisandro@gmail.com> - 1.5.0-12
+- Backport fix for CVE-2022-0699
+
+* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 1.5.0-11
+- Make mingw subpackages noarch
+
+* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 1.5.0-10
+- Make mingw subpackages noarch
+
+* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 1.5.0-9
+- Add mingw subpackage
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Sandro Mani <manisandro@gmail.com> - 1.5.0-1
+- Update to 1.5.0
+
+* Thu Feb 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.4.1-7
+- rebuilt (proj)
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Aug 20 2018 Sandro Mani <manisandro@gmail.com> - 1.4.1-5
+- Add man pages (#1619071)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Sandro Mani <manisandro@gmail.com> - 1.4.1-3
+- BR: gcc-c++
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Sep 14 2017 Sandro Mani <manisandro@gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 25 2017 Sandro Mani <manisandro@gmail.com> - 1.4.0-2
+- Rebuild (proj)
+
+* Sun Dec 11 2016 Sandro Mani <manisandro@gmail.com> - 1.4.0-1
+- Update to 1.4.0
+
+* Wed Dec 07 2016 Sandro Mani <manisandro@gmail.com> - 1.4.0-0.1.RC1
+- Update to 1.4.0-RC1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0f-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0f-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.3.0f-7
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 12 2015 Sandro Mani <manisandro@gmail.com> - 1.3.0f-5
+- Rebuild (proj)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0f-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0f-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Apr 06 2014 Sandro Mani <manisandro@gmail.com> - 1.3.0f-3
 - Backport some fixes from the gdal bundled shapelib
 
-* Mon Feb 03 2014 Sandro Mani <manisandro@gmail.com> - 1.3.0-1
-- Initial package for epel7
+* Thu Aug 08 2013 Sandro Mani <manisandro@gmail.com> - 1.3.0f-2
+- Add missing licenses
+
+* Mon Aug 05 2013 Sandro Mani <manisandro@gmail.com> - 1.3.0f-1
+- Update to 1.3.0 final
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0b2-10.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0b2-9.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0b2-8.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Apr 21 2011 Karsten Hopp <karsten@redhat.com> 1.3.0b2-7.1
+- remove endian definition from Makefile, leave it to endian.h
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0b2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed May 19 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b2-6
+- update to latest upstream beta
+
+* Tue Mar 09 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b1-5
+- update to latest upstream version
+
+* Fri Feb 19 2010 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-2.20100216cvs
+- update patch0-3 fix undefined symbols
+
+* Tue Feb 16 2010 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-1.20100216cvs
+- revert to latest cvs snapshot
+
+* Thu Feb 04 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b1-4
+- misc cleanups
+
+* Thu Feb 04 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b1-3
+- do not package static libfiles (#556094)
+
+* Thu Jan 07 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b1-2
+- fix patch2 - no not depend on gdal
+
+* Thu Jan 07 2010 Lucian Langa <cooly@gnome.eu.org> - 1.3.0b1-1
+- misc cleanups
+- update BR
+- fix source0
+- update to latest upstream snapshot
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.10-20.20060304cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.10-19.20060304cvs
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.2.10-18.20060304cvs
+- fix patch application
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.2.10-17.20060304cvs
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.2.10-16.20060304cvs
+- Autorebuild for GCC 4.3
+
+* Sun Oct  21 2007 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-15.20060304cvs
+- Fix for bug 339931
+
+* Sat Sep  16 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-12.20060304cvs
+- Rebuild for FC6
+
+* Sun Mar  5 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-11.20060304cvs
+- Fixed a makefile bug that messed up parallel builds
+
+* Sat Mar  4 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-10.20060304cvs
+- Upgraded to cvs snapshot taken on March 4, 2006
+
+* Sat Mar  4 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-9
+- Rebuild for Fedora Extras 5
+
+* Mon Apr 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.10-8
+- Fix "invalid lvalue in assignment" for GCC4.
+
+* Fri Apr  8 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Sun Feb 13 2005 David Woodhouse <dwmw2@infradead.org> 0:1.2.10-6
+- Don't hard-code endianness; just use endian.h
+
+* Wed Dec 15 2004 David M. Kaplan <dmk@erizo.ucdavis.edu> 0:1.2.10-5
+- Patched patch and spec file according to suggestions of Michael Schwendt
+- In particular, this separates the building from the installing in the rpm.
+
+* Thu Aug 12 2004 David M. Kaplan <dmk@erizo.ucdavis.edu> 0:1.2.10-0.fdr.4
+- Moved RPM_OPT_FLAGS out of make files.
+- Removed backup files from patch.
+- Made sure that make was using the appropriate libdir.
+
+* Mon Dec 22 2003 David M. Kaplan <dmk@erizo.ucdavis.edu> 0:1.2.10-0.fdr.3
+- Added url tag, changed copyright to license and changed permissions on patch file.
+
+* Mon Dec 22 2003 David M. Kaplan <dmk@erizo.ucdavis.edu> 0:1.2.10-0.fdr.2
+- Add source URL
+- Removed proj requirement as it is automatically detected.
+- Added epoch to proj-devel requirement
+- Fixed post and postun
+- Changed group to Development/Libraries, although this appears to be only
+  somewhat satisfactory.
+- Removed "which make"
+
+* Wed Nov  5 2003 David M. Kaplan <dmk@erizo.ucdavis.edu> 0:1.2.10-0.fdr.1
+- Updated to 1.2.10 release
+- Major changes to spec for Fedora
+- Changes to Makefile patch for Fedora
+- Split off devel package

shapelib_backports.patch

@@ -1,201 +0,0 @@
-diff --git a/dbfopen.c b/dbfopen.c
-index fbe7b06..69d8098 100644
---- a/dbfopen.c
-+++ b/dbfopen.c
-@@ -687,15 +687,22 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
- /* -------------------------------------------------------------------- */
-     fp = psHooks->FOpen( pszFullname, "wb" );
-     if( fp == NULL )
-+    {
-+        free( pszBasename );
-+        free( pszFullname );
-         return( NULL );
-+    }
-     
-     psHooks->FWrite( &chZero, 1, 1, fp );
-     psHooks->FClose( fp );
- 
-     fp = psHooks->FOpen( pszFullname, "rb+" );
-     if( fp == NULL )
-+    {
-+        free( pszBasename );
-+        free( pszFullname );
-         return( NULL );
--
-+    }
- 
-     sprintf( pszFullname, "%s.cpg", pszBasename );
-     if( pszCodePage != NULL )
-diff --git a/shptree.c b/shptree.c
-index 409134e..4fccfab 100644
---- a/shptree.c
-+++ b/shptree.c
-@@ -93,6 +93,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- 
- #ifdef USE_CPL
- #include "cpl_error.h"
-@@ -844,22 +845,23 @@ void SHPCloseDiskTree( SHPTreeDiskHandle hDiskTree )
- static int
- SHPSearchDiskTreeNode( SHPTreeDiskHandle hDiskTree, double *padfBoundsMin, double *padfBoundsMax,
-                        int **ppanResultBuffer, int *pnBufferMax, 
--                       int *pnResultCount, int bNeedSwap )
-+                       int *pnResultCount, int bNeedSwap, int nRecLevel )
- 
- {
--    int i;
--    int offset;
--    int numshapes, numsubnodes;
-+    unsigned int i;
-+    unsigned int offset;
-+    unsigned int numshapes, numsubnodes;
-     double adfNodeBoundsMin[2], adfNodeBoundsMax[2];
-+    int nFReadAcc;
- 
- /* -------------------------------------------------------------------- */
- /*      Read and unswap first part of node info.                        */
- /* -------------------------------------------------------------------- */
--    hDiskTree->sHooks.FRead( &offset, 4, 1, hDiskTree->fpQIX );
-+    nFReadAcc = (int)hDiskTree->sHooks.FRead( &offset, 4, 1, hDiskTree->fpQIX );
-     if ( bNeedSwap ) SwapWord ( 4, &offset );
- 
--    hDiskTree->sHooks.FRead( adfNodeBoundsMin, sizeof(double), 2, hDiskTree->fpQIX );
--    hDiskTree->sHooks.FRead( adfNodeBoundsMax, sizeof(double), 2, hDiskTree->fpQIX );
-+    nFReadAcc += (int)hDiskTree->sHooks.FRead( adfNodeBoundsMin, sizeof(double), 2, hDiskTree->fpQIX );
-+    nFReadAcc += (int)hDiskTree->sHooks.FRead( adfNodeBoundsMax, sizeof(double), 2, hDiskTree->fpQIX );
-     if ( bNeedSwap )
-     {
-         SwapWord( 8, adfNodeBoundsMin + 0 );
-@@ -868,9 +870,30 @@ SHPSearchDiskTreeNode( SHPTreeDiskHandle hDiskTree, double *padfBoundsMin, doubl
-         SwapWord( 8, adfNodeBoundsMax + 1 );
-     }
-       
--    hDiskTree->sHooks.FRead( &numshapes, 4, 1, hDiskTree->fpQIX );
-+    nFReadAcc += (int)hDiskTree->sHooks.FRead( &numshapes, 4, 1, hDiskTree->fpQIX );
-     if ( bNeedSwap ) SwapWord ( 4, &numshapes );
- 
-+    /* Check that we could read all previous values */
-+    if( nFReadAcc != 1 + 2 + 2 + 1 )
-+    {
-+        hDiskTree->sHooks.Error("I/O error");
-+        return FALSE;
-+    }
-+
-+    /* Sanity checks to avoid int overflows in later computation */
-+    if( offset > INT_MAX - sizeof(int) )
-+    {
-+        hDiskTree->sHooks.Error("Invalid value for offset");
-+        return FALSE;
-+    }
-+
-+    if( numshapes > (INT_MAX - offset - sizeof(int)) / sizeof(int) ||
-+        numshapes > INT_MAX / sizeof(int) - *pnResultCount )
-+    {
-+        hDiskTree->sHooks.Error("Invalid value for numshapes");
-+        return FALSE;
-+    }
-+
- /* -------------------------------------------------------------------- */
- /*      If we don't overlap this node at all, we can just fseek()       */
- /*      pass this node info and all subnodes.                           */
-@@ -890,13 +913,31 @@ SHPSearchDiskTreeNode( SHPTreeDiskHandle hDiskTree, double *padfBoundsMin, doubl
-     {
-         if( *pnResultCount + numshapes > *pnBufferMax )
-         {
--            *pnBufferMax = (int) ((*pnResultCount + numshapes + 100) * 1.25);
--            *ppanResultBuffer = (int *) 
-+            int* pNewBuffer;
-+
-+            *pnBufferMax = (*pnResultCount + numshapes + 100) * 5 / 4;
-+
-+            if( *pnBufferMax > INT_MAX / sizeof(int) )
-+                *pnBufferMax = *pnResultCount + numshapes;
-+
-+            pNewBuffer = (int *)
-                 SfRealloc( *ppanResultBuffer, *pnBufferMax * sizeof(int) );
-+
-+            if( pNewBuffer == NULL )
-+            {
-+                hDiskTree->sHooks.Error("Out of memory error");
-+                return FALSE;
-+            }
-+
-+            *ppanResultBuffer = pNewBuffer;
-         }
- 
--        hDiskTree->sHooks.FRead( *ppanResultBuffer + *pnResultCount, 
--               sizeof(int), numshapes, hDiskTree->fpQIX );
-+        if( hDiskTree->sHooks.FRead( *ppanResultBuffer + *pnResultCount,
-+                    sizeof(int), numshapes, hDiskTree->fpQIX ) != numshapes )
-+        {
-+            hDiskTree->sHooks.Error("I/O error");
-+            return FALSE;
-+        }
- 
-         if (bNeedSwap )
-         {
-@@ -910,14 +951,23 @@ SHPSearchDiskTreeNode( SHPTreeDiskHandle hDiskTree, double *padfBoundsMin, doubl
- /* -------------------------------------------------------------------- */
- /*      Process the subnodes.                                           */
- /* -------------------------------------------------------------------- */
--    hDiskTree->sHooks.FRead( &numsubnodes, 4, 1, hDiskTree->fpQIX );
-+    if( hDiskTree->sHooks.FRead( &numsubnodes, 4, 1, hDiskTree->fpQIX ) != 1 )
-+    {
-+        hDiskTree->sHooks.Error("I/O error");
-+        return FALSE;
-+    }
-     if ( bNeedSwap  ) SwapWord ( 4, &numsubnodes );
-+    if( numsubnodes > 0 && nRecLevel == 32 )
-+    {
-+        hDiskTree->sHooks.Error("Shape tree is too deep");
-+        return FALSE;
-+    }
- 
-     for(i=0; i<numsubnodes; i++)
-     {
-         if( !SHPSearchDiskTreeNode( hDiskTree, padfBoundsMin, padfBoundsMax, 
-                                     ppanResultBuffer, pnBufferMax, 
--                                    pnResultCount, bNeedSwap ) )
-+                                    pnResultCount, bNeedSwap, nRecLevel + 1 ) )
-             return FALSE;
-     }
- 
-@@ -1014,7 +1064,7 @@ int* SHPSearchDiskTreeEx( SHPTreeDiskHandle hDiskTree,
- /* -------------------------------------------------------------------- */
-     if( !SHPSearchDiskTreeNode( hDiskTree, padfBoundsMin, padfBoundsMax, 
-                                 &panResultBuffer, &nBufferMax, 
--                                pnShapeCount, bNeedSwap ) )
-+                                pnShapeCount, bNeedSwap, 0 ) )
-     {
-         if( panResultBuffer != NULL )
-             free( panResultBuffer );
-@@ -1025,6 +1075,10 @@ int* SHPSearchDiskTreeEx( SHPTreeDiskHandle hDiskTree,
- /*      Sort the id array                                               */
- /* -------------------------------------------------------------------- */
-     qsort(panResultBuffer, *pnShapeCount, sizeof(int), compare_ints);
-+
-+    /* To distinguish between empty intersection from error case */
-+    if( panResultBuffer == NULL )
-+        panResultBuffer = (int*) calloc(1, sizeof(int));
-     
-     return panResultBuffer;
- }
-
-diff --git a/contrib/shpsort.c b/contrib/shpsort.c
-index ae0bf6f..305648b 100644
---- a/contrib/shpsort.c
-+++ b/contrib/shpsort.c
-@@ -279,7 +279,6 @@ static char ** split(const char *arg, const char *delim)
- 	free(result[--i]);
-       }
-       free(result);
--      free(copy);
-       return NULL;
-     }
-     result = tmp;
--- 
-2.31.1
-

shapelib_libver.patch

@@ -0,0 +1,13 @@
+diff -rupN --no-dereference shapelib-1.6.3/CMakeLists.txt shapelib-1.6.3-new/CMakeLists.txt
+--- shapelib-1.6.3/CMakeLists.txt	2026-03-18 17:27:15.000000000 +0100
++++ shapelib-1.6.3-new/CMakeLists.txt	2026-03-19 14:28:33.599270296 +0100
+@@ -176,6 +176,9 @@ set_target_properties(${PACKAGE} PROPERT
+   SOVERSION ${shp_SOVERSION}
+   VERSION ${shp_VERSION}
+ )
++if(MINGW)
++    set_target_properties(${PACKAGE} PROPERTIES SUFFIX "-${shp_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++endif(MINGW)
+ 
+ if(USE_RPATH)
+   set_target_properties(${PACKAGE} PROPERTIES

sources

@@ -1 +1,2 @@
-2ff7d0b21d4b7506b452524492795f77  shapelib-1.3.0.tar.gz
+SHA512 (shapelib-1.6.3.tar.gz) = 9cb5625f6b94ca2f48c222b5adaee0d9955b70f621c51bc54a47e922e9b6ac547bc3efaf67df56ecb3829d9313d57c85afa46cf00a7e03f779c694407e371943
+SHA512 (shapelib-man.tar.gz) = 0625355e51005b032c2ea441d888868fa13bcdee862d9c5bae5aa26cb98e40e7eeb414f52dc63d433692dbe3873d037740e8bf650a30e6e4d56b216d48bda6da