Backport patch for CVE-2021-45943

.gitignore

@@ -59,85 +59,3 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-3.2.1.tar.gz
 /gdalautotest-3.2.2.tar.gz
 /gdal-3.2.2-fedora.tar.xz
-/gdalautotest-3.3.0.tar.gz
-/gdal-3.3.0-fedora.tar.xz
-/gdal-3.3.1-fedora.tar.xz
-/gdalautotest-3.3.1.tar.gz
-/gdal-3.3.2-fedora.tar.xz
-/gdalautotest-3.3.2.tar.gz
-/gdal-3.3.3-fedora.tar.xz
-/gdalautotest-3.3.3.tar.gz
-/gdal-3.4.0-fedora.tar.xz
-/gdalautotest-3.4.0.tar.gz
-/gdal-3.4.1-fedora.tar.xz
-/gdalautotest-3.4.1.tar.gz
-/gdal-3.4.2-fedora.tar.xz
-/gdalautotest-3.4.2.tar.gz
-/gdal-3.4.3-fedora.tar.xz
-/gdalautotest-3.4.3.tar.gz
-/gdalautotest-3.5.0.tar.gz
-/gdal-3.5.0-fedora.tar.xz
-/gdalautotest-3.5.1.tar.gz
-/gdal-3.5.1-fedora.tar.xz
-/gdal-3.5.2-fedora.tar.xz
-/gdalautotest-3.5.2.tar.gz
-/gdal-3.5.3-fedora.tar.xz
-/gdalautotest-3.5.3.tar.gz
-/gdal-3.6.0-fedora.tar.xz
-/gdalautotest-3.6.0.tar.gz
-/gdalautotest-3.6.1.tar.gz
-/gdal-3.6.1.tar.xz
-/gdal-3.6.1-fedora.tar.xz
-/gdal-3.6.2-fedora.tar.xz
-/gdalautotest-3.6.2.tar.gz
-/gdal-3.6.3-fedora.tar.xz
-/gdalautotest-3.6.3.tar.gz
-/gdal-3.6.4-fedora.tar.xz
-/gdalautotest-3.6.4.tar.gz
-/gdal-3.7.0-fedora.tar.xz
-/gdalautotest-3.7.0.tar.gz
-/gdal-3.7.1-fedora.tar.xz
-/gdalautotest-3.7.1.tar.gz
-/gdal-3.7.2-fedora.tar.xz
-/gdalautotest-3.7.2.tar.gz
-/gdal-3.7.3-fedora.tar.xz
-/gdalautotest-3.7.3.tar.gz
-/gdal-3.8.0-fedora.tar.xz
-/gdalautotest-3.8.0.tar.gz
-/gdal-3.8.1-fedora.tar.xz
-/gdalautotest-3.8.1.tar.gz
-/gdal-3.8.2-fedora.tar.xz
-/gdalautotest-3.8.2.tar.gz
-/gdal-3.8.3-fedora.tar.xz
-/gdalautotest-3.8.3.tar.gz
-/gdal-3.8.4-fedora.tar.xz
-/gdalautotest-3.8.4.tar.gz
-/gdal-3.8.5-fedora.tar.xz
-/gdalautotest-3.8.5.tar.gz
-/gdal-3.9.0-fedora.tar.xz
-/gdalautotest-3.9.0.tar.gz
-/gdal-3.9.1-fedora.tar.xz
-/gdalautotest-3.9.1.tar.gz
-/gdal-3.9.2-fedora.tar.xz
-/gdalautotest-3.9.2.tar.gz
-/gdalautotest-3.9.3.tar.gz
-/gdal-3.9.3-fedora.tar.xz
-/gdal-3.10.0-fedora.tar.xz
-/gdalautotest-3.10.0.tar.gz
-/gdal-3.10.1-fedora.tar.xz
-/gdalautotest-3.10.1.tar.gz
-/gdal-3.10.2-fedora.tar.xz
-/gdalautotest-3.10.2.tar.gz
-/gdal-3.10.3-fedora.tar.xz
-/gdalautotest-3.10.3.tar.gz
-/gdal-3.11.3-fedora.tar.xz
-/gdalautotest-3.11.3.tar.gz
-/gdal-3.11.4-fedora.tar.xz
-/gdalautotest-3.11.4.tar.gz
-/gdal-3.11.5-fedora.tar.xz
-/gdalautotest-3.11.5.tar.gz
-/gdal-3.12.0-fedora.tar.xz
-/gdal-3.12.0.tar.xz
-/gdalautotest-3.12.0.zip
-/gdal-3.12.1-fedora.tar.xz
-/gdalautotest-3.12.1.zip

0001-configure-Also-save-LDFLAGS-when-checking-compilabil.patch

@@ -0,0 +1,40 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/m4/geos.m4 gdal-3.2.2-fedora-new/m4/geos.m4
+--- gdal-3.2.2-fedora/m4/geos.m4	2021-03-05 12:39:54.000000000 +0100
++++ gdal-3.2.2-fedora-new/m4/geos.m4	2021-03-24 13:44:41.905428811 +0100
+@@ -129,6 +129,8 @@ AC_DEFUN([GEOS_INIT],[
+       LIBS=${GEOS_LIBS}
+       ax_save_CFLAGS="${CFLAGS}"
+       CFLAGS="${GEOS_CFLAGS}"
++      ax_save_LDFLAGS="${LDFLAGS}"
++      LDFLAGS=""
+ 
+       AC_CHECK_LIB([geos_c],
+         [GEOSversion],
+@@ -143,6 +145,7 @@ AC_DEFUN([GEOS_INIT],[
+ 
+       CFLAGS="${ax_save_CFLAGS}"
+       LIBS="${ax_save_LIBS}"
++      LDFLAGS="${ax_save_LDFLAGS}"
+ 
+     fi
+ 
+diff -rupN --no-dereference gdal-3.2.2-fedora/m4/sfcgal.m4 gdal-3.2.2-fedora-new/m4/sfcgal.m4
+--- gdal-3.2.2-fedora/m4/sfcgal.m4	2021-03-05 12:39:52.000000000 +0100
++++ gdal-3.2.2-fedora-new/m4/sfcgal.m4	2021-03-24 13:44:41.905428811 +0100
+@@ -128,6 +128,8 @@ AC_DEFUN([SFCGAL_INIT],[
+       LIBS=${SFCGAL_LIBS}
+       ax_save_CFLAGS="${CFLAGS}"
+       CFLAGS="${SFCGAL_CFLAGS}"
++      ax_save_LDFLAGS="${LDFLAGS}"
++      LDFLAGS=""
+ 
+       AC_CHECK_LIB([SFCGAL],
+         [sfcgal_version],
+@@ -143,6 +145,7 @@ AC_DEFUN([SFCGAL_INIT],[
+ 
+       CFLAGS="${ax_save_CFLAGS}"
+       LIBS="${ax_save_LIBS}"
++      LDFLAGS="${ax_save_LDFLAGS}"
+ 
+     fi
+ 

0002-configure-Ensure-with-geos-sfcgal-fail-if-unavailabl.patch

@@ -0,0 +1,84 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/m4/geos.m4 gdal-3.2.2-fedora-new/m4/geos.m4
+--- gdal-3.2.2-fedora/m4/geos.m4	2021-03-24 13:44:42.101428816 +0100
++++ gdal-3.2.2-fedora-new/m4/geos.m4	2021-03-24 13:44:42.103428816 +0100
+@@ -59,7 +59,9 @@ AC_DEFUN([GEOS_INIT],[
+   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
+ 
+     AC_PATH_PROG(GEOS_CONFIG, geos-config, no)
+-    ac_geos_config_auto=yes
++    if test x"$with_geos" = x"" ; then
++      ac_geos_config_auto=yes
++    fi
+ 
+   else
+ 
+@@ -140,7 +142,14 @@ AC_DEFUN([GEOS_INIT],[
+       )
+ 
+       if test x"$HAVE_GEOS" = "xno"; then
+-          GEOS_CFLAGS=""
++        if test $ac_geos_config_auto = "yes" ; then
++          AC_MSG_WARN([GEOS was found on your system, but the library could not be linked. GEOS support disabled.])
++        else
++          AC_MSG_ERROR([GEOS library could not be linked])
++        fi
++
++        GEOS_CFLAGS=""
++
+       fi
+ 
+       CFLAGS="${ax_save_CFLAGS}"
+@@ -149,6 +158,12 @@ AC_DEFUN([GEOS_INIT],[
+ 
+     fi
+ 
++  else
++
++    if test $ac_geos_config_auto = "no" ; then
++      AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found])
++    fi
++
+   fi
+ ])
+ 
+diff -rupN --no-dereference gdal-3.2.2-fedora/m4/sfcgal.m4 gdal-3.2.2-fedora-new/m4/sfcgal.m4
+--- gdal-3.2.2-fedora/m4/sfcgal.m4	2021-03-24 13:44:42.101428816 +0100
++++ gdal-3.2.2-fedora-new/m4/sfcgal.m4	2021-03-24 13:44:42.103428816 +0100
+@@ -58,7 +58,9 @@ AC_DEFUN([SFCGAL_INIT],[
+   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
+ 
+     AC_PATH_PROG(SFCGAL_CONFIG, sfcgal-config, no)
+-    ac_sfcgal_config_auto=yes
++    if test x"$with_sfcgal" = x"" ; then
++      ac_sfcgal_config_auto=yes
++    fi
+ 
+   else
+ 
+@@ -140,7 +142,13 @@ AC_DEFUN([SFCGAL_INIT],[
+ 
+ 
+       if test x"$HAVE_SFCGAL" = "xno"; then
+-          SFCGAL_CFLAGS=""
++        if test $ac_sfcgal_config_auto = "yes" ; then
++          AC_MSG_WARN([SFCGAL was found on your system, but the library could not be linked. SFCGAL support disabled.])
++        else
++          AC_MSG_ERROR([SFCGAL library could not be linked])
++        fi
++
++        SFCGAL_CFLAGS=""
+       fi
+ 
+       CFLAGS="${ax_save_CFLAGS}"
+@@ -149,5 +157,11 @@ AC_DEFUN([SFCGAL_INIT],[
+ 
+     fi
+ 
++  else
++
++    if test $ac_sfcgal_config_auto = "no" ; then
++      AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found])
++    fi
++
+   fi
+ ])

CVE-2021-45943.patch

@@ -0,0 +1,25 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp gdal-3.2.2-fedora-new/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp
+--- gdal-3.2.2-fedora/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp	2021-03-05 12:41:04.000000000 +0100
++++ gdal-3.2.2-fedora-new/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp	2022-02-04 19:04:08.266954175 +0100
+@@ -31,6 +31,7 @@
+ #include "pcidsk_exception.h"
+ #include "core/pcidsk_utils.h"
+ 
++#include <limits>
+ #include <vector>
+ #include <string>
+ #include <cassert>
+@@ -73,8 +74,12 @@ void CPCIDSKBinarySegment::Load()
+     if (loaded_) {
+         return;
+     }
++    if( data_size - 1024 > static_cast<uint64_t>(std::numeric_limits<int>::max()) )
++    {
++        return ThrowPCIDSKException("too large data_size");
++    }
+ 
+-    seg_data.SetSize((int)data_size - 1024);
++    seg_data.SetSize((int)(data_size - 1024));
+ 
+     ReadFromFile(seg_data.buffer, 0, data_size - 1024);
+ 

cpl-config.h

@@ -1,11 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "gdal/cpl_config-32.h"
-#else
-#if __WORDSIZE == 64
-#include "gdal/cpl_config-64.h"
-#else
-#error "Unknown word size"
-#endif
-#endif

gdal-1.9.0-java.patch

@@ -0,0 +1,11 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/swig/java/java.opt gdal-3.2.2-fedora-new/swig/java/java.opt
+--- gdal-3.2.2-fedora/swig/java/java.opt	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/swig/java/java.opt	2021-03-24 13:44:40.268428769 +0100
+@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
+ JAVAC=$(JAVA_HOME)/bin/javac
+ JAVA=$(JAVA_HOME)/bin/java
+ JAR=$(JAVA_HOME)/bin/jar
+-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
+ 
+ 

gdal-cleaner.sh

@@ -1,38 +1,30 @@
 #!/bin/bash
-set -e
 
 if [ $# -lt 1 ]; then
-	echo "Usage: $0 version pre"
+	echo "Usage: $0 version"
 	exit 1
 fi
 
 VERSION="$1"
-PRE="$2"
 
-if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
-    wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
-fi
+wget https://github.com/OSGeo/gdal/releases/download/v$VERSION/gdal-$VERSION.tar.gz
 
-if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
-    echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script"
-    exit 1
-fi
+tar xvf gdal-"${VERSION}".tar.gz
 
-tar xvf gdal-"${VERSION}${PRE}".tar.xz
-mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
+mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
 
-rm ogr/data/cubewerx_extra.wkt
-rm ogr/data/esri_StatePlane_extra.wkt
-rm ogr/data/ecw_cs.wkt
+rm data/cubewerx_extra.wkt
+rm data/esri_extra.wkt
+rm data/esri_Wisconsin_extra.wkt
+rm data/esri_StatePlane_extra.wkt
+rm data/ecw_cs.wkt
 
-
-sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt
-sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt
-sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt
+#Really necessary?
+rm -r swig/php
 
 popd
 
 
 #TODO: Insert Provenance file
 
-tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora
+tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora

gdal-config

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-ARCH=$(uname -m)
-case $ARCH in
-x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
-gdal-config-64 ${*}
-;;
-*)
-gdal-config-32 ${*}
-;;
-esac

gdal-gcc11.patch

@@ -0,0 +1,33 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
+--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp	2021-03-05 12:39:39.000000000 +0100
++++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp	2021-03-24 13:44:41.499428801 +0100
+@@ -34,6 +34,7 @@
+ #include <limits>
+ #include <math.h>
+ #include <algorithm>
++#include <limits>
+ 
+ //------------------------------------------------------------------------------
+ // CADVector
+diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2021-03-05 12:39:38.000000000 +0100
++++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp	2021-03-24 13:44:41.499428801 +0100
+@@ -39,6 +39,7 @@
+ #include <limits>
+ #include <memory>
+ #include <string>
++#include <limits>
+ 
+ #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
+ // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
+diff -rupN --no-dereference gdal-3.2.2-fedora/third_party/LercLib/Lerc2.h gdal-3.2.2-fedora-new/third_party/LercLib/Lerc2.h
+--- gdal-3.2.2-fedora/third_party/LercLib/Lerc2.h	2021-03-05 12:38:57.000000000 +0100
++++ gdal-3.2.2-fedora-new/third_party/LercLib/Lerc2.h	2021-03-24 13:44:41.500428801 +0100
+@@ -30,6 +30,7 @@ Contributors:  Thomas Maurer
+ #include <limits>
+ #include <string>
+ #include <typeinfo>
++#include <limits>
+ #include "Defines.h"
+ #include "BitMask.h"
+ #include "BitStuffer2.h"

gdal_installapps.patch

@@ -0,0 +1,11 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/apps/GNUmakefile gdal-3.2.2-fedora-new/apps/GNUmakefile
+--- gdal-3.2.2-fedora/apps/GNUmakefile	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/apps/GNUmakefile	2021-03-24 13:44:41.091428790 +0100
+@@ -233,6 +233,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
+ 
+ install: default
+ 	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
++	for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
+ 	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
+ 	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
+ 

gdal_iso8211.patch

@@ -0,0 +1,13 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/frmts/iso8211/GNUmakefile gdal-3.2.2-fedora-new/frmts/iso8211/GNUmakefile
+--- gdal-3.2.2-fedora/frmts/iso8211/GNUmakefile	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/frmts/iso8211/GNUmakefile	2021-03-24 13:44:40.686428780 +0100
+@@ -23,8 +23,7 @@ dist-clean:	clean
+ 	rm -rf $(DISTDIR)
+ 
+ $(ISOLIB):	$(OBJ:.o=.$(OBJ_EXT))
+-	$(AR) r $(ISOLIB) $?
+-	$(RANLIB) $(ISOLIB)
++	$(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
+ 
+ 8211createfromxml$(EXE):	8211createfromxml.$(OBJ_EXT)
+ 	$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)

gdal_no-diag-disable.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/configure.ac gdal-3.2.2-fedora-new/configure.ac
+--- gdal-3.2.2-fedora/configure.ac	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/configure.ac	2021-03-24 13:44:41.701428806 +0100
+@@ -61,7 +61,7 @@ dnl warning #2304: non-explicit construc
+ dnl warning #3280: declaration hides member
+ dnl remark #11074: Inlining inhibited by limit max-size
+ dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
+-AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
++#AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
+ 
+ AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
+ AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])

gdal_nopdf.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/doc/source/index.rst gdal-3.2.2-fedora-new/doc/source/index.rst
+--- gdal-3.2.2-fedora/doc/source/index.rst	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/doc/source/index.rst	2021-03-24 13:44:41.294428795 +0100
+@@ -4,8 +4,6 @@ GDAL
+ 
+ .. include:: ./about_no_title.rst
+ 
+-This documentation is also available as a `PDF file <gdal.pdf>`_.
+-
+ .. toctree::
+     :maxdepth: 2
+ 

gdal_sphinx.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/doc/Makefile gdal-3.2.2-fedora-new/doc/Makefile
+--- gdal-3.2.2-fedora/doc/Makefile	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/doc/Makefile	2021-03-24 13:44:40.886428785 +0100
+@@ -2,7 +2,7 @@
+ #
+ 
+ # You can set these variables from the command line.
+-SPHINXOPTS    = --keep-going -j auto -W
++SPHINXOPTS    = --keep-going
+ SPHINXBUILD   = sphinx-build
+ SOURCEDIR     = source
+ BUILDDIR      = build

gdal_tirpcinc.patch

@@ -0,0 +1,24 @@
+diff -rupN --no-dereference gdal-3.2.2-fedora/frmts/dods/GNUmakefile gdal-3.2.2-fedora-new/frmts/dods/GNUmakefile
+--- gdal-3.2.2-fedora/frmts/dods/GNUmakefile	2021-03-05 12:38:35.000000000 +0100
++++ gdal-3.2.2-fedora-new/frmts/dods/GNUmakefile	2021-03-24 13:44:40.477428774 +0100
+@@ -4,7 +4,7 @@ include ../../GDALmake.opt
+ 
+ OBJ	=	dodsdataset2.o
+ 
+-CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC)
++CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
+ 
+ default:	$(OBJ:.o=.$(OBJ_EXT))
+ 
+diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
+--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2021-03-05 12:38:36.000000000 +0100
++++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2021-03-24 13:44:40.477428774 +0100
+@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
+ OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
+ 		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
+ 
+-CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
++CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
+ 
+ default:	$(O_OBJ:.o=.$(OBJ_EXT))
+ 

gdal_utils.patch

@@ -1,37 +0,0 @@
-diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt	2025-12-18 15:15:18.000000000 +0100
-+++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt	2025-12-18 16:35:42.369730740 +0100
-@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P
- gdal_standard_includes(gdal_iso8211)
- 
- # Because linking an OBJECT library
--add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp)
-+add_executable(8211dump 8211dump.cpp)
- target_include_directories(8211dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
- target_link_libraries(8211dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
-+install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp)
-+add_executable(8211view 8211view.cpp)
- target_include_directories(8211view PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
- target_link_libraries(8211view PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
-+install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp)
-+add_executable(8211createfromxml 8211createfromxml.cpp)
- target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
- target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
-+install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2025-12-18 15:15:18.000000000 +0100
-+++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2025-12-18 16:35:42.369966573 +0100
-@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
-     target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
- endif()
- 
--add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
-+add_executable(s57dump s57dump.cpp)
- gdal_standard_includes(s57dump)
- target_include_directories(s57dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
- target_link_libraries(s57dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> ogr_S57 gdal_iso8211)
-+install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
-SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
+SHA512 (gdalautotest-3.2.2.tar.gz) = 324326f590fcd508e99f4ed5396a0d61065449f44894e2844e464650097c353eaf3c14074afa862c8d0784569e29545d4050ea65ded95cd02e5bb02deed80dc4
+SHA512 (gdal-3.2.2-fedora.tar.xz) = 3c3d84c77d93ab6943497571a4e6c1bea4a0b74f897f602abcdd59dda5e0799305d8b9444425593631f2d3852722568740237890c0af72ce3b8533367e04ab00