From fbd70c1a116f2b80bc6e6928e234eec4becb30cb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 4 Dec 2024 00:50:22 +0100
Subject: [PATCH 1/4] autotest: put autotest/gdrivers/data/esric/Layers/ in a
 .tar to avoid OpenSSF Score Card binary false positive on R0000C0000.bundle

---
 .../L01/R0000C0000.bundle => Layers.tar}      | Bin 393950 -> 409600 bytes
 autotest/gdrivers/data/esric/Layers/conf.cdi  |   7 --
 autotest/gdrivers/data/esric/Layers/conf.xml  |  62 ------------------
 autotest/gdrivers/esric.py                    |   2 +-
 4 files changed, 1 insertion(+), 70 deletions(-)
 rename autotest/gdrivers/data/esric/{Layers/_alllayers/L01/R0000C0000.bundle => Layers.tar} (96%)
 delete mode 100644 autotest/gdrivers/data/esric/Layers/conf.cdi
 delete mode 100644 autotest/gdrivers/data/esric/Layers/conf.xml

diff --git a/autotest/gdrivers/data/esric/Layers/_alllayers/L01/R0000C0000.bundle b/autotest/gdrivers/data/esric/Layers.tar
similarity index 96%
rename from autotest/gdrivers/data/esric/Layers/_alllayers/L01/R0000C0000.bundle
rename to autotest/gdrivers/data/esric/Layers.tar
index b6faba1597b4443fc5abe5fa9d76a5ba131bb333..625d080cf715df62dd4bdc5390a92203b07628ee 100644
GIT binary patch
delta 4227
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
CS&|h1

delta 28
jcmZo@ki6F_(In9(!Pq9j)F#2)Cc)As!MaU??H&^VfT#!v

diff --git a/autotest/gdrivers/data/esric/Layers/conf.cdi b/autotest/gdrivers/data/esric/Layers/conf.cdi
deleted file mode 100644
index fe0b8358939e..000000000000
--- a/autotest/gdrivers/data/esric/Layers/conf.cdi
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<EnvelopeN xsi:type="typens:EnvelopeN" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:typens="http://www.esri.com/schemas/ArcGIS/10.0">
-    <XMin>-20037507.229594339</XMin>
-    <YMin>-20037507.229594339</YMin>
-    <XMax>20037507.229594339</XMax>
-    <YMax>20037507.229594339</YMax>
-</EnvelopeN>
diff --git a/autotest/gdrivers/data/esric/Layers/conf.xml b/autotest/gdrivers/data/esric/Layers/conf.xml
deleted file mode 100644
index dd1cbd9f11d6..000000000000
--- a/autotest/gdrivers/data/esric/Layers/conf.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<CacheInfo xsi:type="typens:CacheInfo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:typens="http://www.esri.com/schemas/ArcGIS/10.0">
-    <TileCacheInfo xsi:type="typens:TileCacheInfo">
-        <SpatialReference xsi:type="typens:ProjectedCoordinateSystem">
-            <WKT>PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0],AUTHORITY["EPSG",3857]]</WKT>
-            <XOrigin>-22041257.77387803</XOrigin>
-            <YOrigin>-32799975.422359161</YOrigin>
-            <XYScale>142878261.42550784</XYScale>
-            <ZOrigin>-100000</ZOrigin>
-            <ZScale>10000</ZScale>
-            <MOrigin>-100000</MOrigin>
-            <MScale>10000</MScale>
-            <XYTolerance>0.001</XYTolerance>
-            <ZTolerance>0.0002</ZTolerance>
-            <MTolerance>0.0002</MTolerance>
-            <HighPrecision>true</HighPrecision>
-            <WKID>3857</WKID>
-        </SpatialReference>
-        <TileOrigin xsi:type="typens:PointN">
-            <X>-20037508.342787001</X>
-            <Y>20037508.342787001</Y>
-        </TileOrigin>
-        <TileEnd xsi:type="typens:PointN">
-            <X>20037508.342787001</X>
-            <Y>-20037508.342787001</Y>
-        </TileEnd>
-        <TileCols>256</TileCols>
-        <TileRows>256</TileRows>
-        <DPI>96</DPI>
-        <LODInfos xsi:type="typens:ArrayOfLODInfo">
-            <LODInfo xsi:type="typens:LODInfo">
-                <LevelID>0</LevelID>
-                <Scale>591657527.591555</Scale>
-                <Resolution>156543.03392800014</Resolution>
-            </LODInfo>
-            <LODInfo xsi:type="typens:LODInfo">
-                <LevelID>1</LevelID>
-                <Scale>295828763.79577702</Scale>
-                <Resolution>78271.516963999937</Resolution>
-            </LODInfo>
-            <LODInfo xsi:type="typens:LODInfo">
-                <LevelID>2</LevelID>
-                <Scale>147914381.89788899</Scale>
-                <Resolution>39135.758482000092</Resolution>
-            </LODInfo>
-            <LODInfo xsi:type="typens:LODInfo">
-                <LevelID>3</LevelID>
-                <Scale>73957190.948944002</Scale>
-                <Resolution>19567.879240999919</Resolution>
-            </LODInfo>
-        </LODInfos>
-    </TileCacheInfo>
-    <TileImageInfo xsi:type="typens:TileImageInfo">
-        <CacheTileFormat>MIXED</CacheTileFormat>
-        <CompressionQuality>75</CompressionQuality>
-        <Antialiasing>false</Antialiasing>
-    </TileImageInfo>
-    <CacheStorageInfo xsi:type="typens:CacheStorageInfo">
-        <StorageFormat>esriMapCacheStorageModeCompactV2</StorageFormat>
-        <PacketSize>128</PacketSize>
-    </CacheStorageInfo>
-</CacheInfo>
diff --git a/autotest/gdrivers/esric.py b/autotest/gdrivers/esric.py
index 32f075e8f81a..7f43994d7ddc 100755
--- a/autotest/gdrivers/esric.py
+++ b/autotest/gdrivers/esric.py
@@ -24,7 +24,7 @@
 @pytest.fixture()
 def esric_ds():
 
-    ds = gdal.Open("data/esric/Layers/conf.xml")
+    ds = gdal.Open("/vsitar/data/esric/Layers.tar/Layers/conf.xml")
     assert ds is not None, "open failed"
 
     return ds

From 93983c11aa4e74301a064e2cd94ed6ac498e0541 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 4 Dec 2024 01:53:16 +0100
Subject: [PATCH 2/4] CI s390x: Try to avoid annoying warnings of OSSF
 ScoreCard about unpinned pip install

---
 .github/workflows/s390x/Dockerfile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/s390x/Dockerfile.ci b/.github/workflows/s390x/Dockerfile.ci
index ec5b2ce7c0aa..749592813678 100644
--- a/.github/workflows/s390x/Dockerfile.ci
+++ b/.github/workflows/s390x/Dockerfile.ci
@@ -80,4 +80,4 @@ RUN apt-get update && \
     zip
 
 COPY requirements.txt /tmp/
-RUN python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt
+RUN PIP_CMD="python3 -m pip" $PIP_CMD install -U --break-system-packages -r /tmp/requirements.txt

From a5d0388b023d1ebb5117e0bdafb77af3288c036d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 4 Dec 2024 02:19:33 +0100
Subject: [PATCH 3/4] .github/workflows/s390x/Dockerfile.ci: unbreak

---
 .github/workflows/s390x/Dockerfile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/s390x/Dockerfile.ci b/.github/workflows/s390x/Dockerfile.ci
index 749592813678..0450e8c517f8 100644
--- a/.github/workflows/s390x/Dockerfile.ci
+++ b/.github/workflows/s390x/Dockerfile.ci
@@ -80,4 +80,4 @@ RUN apt-get update && \
     zip
 
 COPY requirements.txt /tmp/
-RUN PIP_CMD="python3 -m pip" $PIP_CMD install -U --break-system-packages -r /tmp/requirements.txt
+RUN PYTHON_CMD=python3 $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt

From 7807597df5ba4567ec3bed2e0b0a0afbe14952dc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 4 Dec 2024 02:33:57 +0100
Subject: [PATCH 4/4] fix previous commit

---
 .github/workflows/s390x/Dockerfile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/s390x/Dockerfile.ci b/.github/workflows/s390x/Dockerfile.ci
index 0450e8c517f8..7e60290072fa 100644
--- a/.github/workflows/s390x/Dockerfile.ci
+++ b/.github/workflows/s390x/Dockerfile.ci
@@ -80,4 +80,4 @@ RUN apt-get update && \
     zip
 
 COPY requirements.txt /tmp/
-RUN PYTHON_CMD=python3 $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt
+RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt