From d21d780a73ad05c5940fea0226b10664211121c6 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Sun, 5 Jul 2020 20:41:50 +0200
Subject: [PATCH 1/2] change sfcgal repo ; Oslandia/SFCGAL migrates from GitHub
 to GitLab

 fix https://github.com/postgis/docker-postgis/issues/199

 Changes to be committed:
	modified:   Dockerfile.master.template
	modified:   update.sh
---
 Dockerfile.master.template | 2 +-
 update.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.master.template b/Dockerfile.master.template
index 6585792c3..b4557f405 100644
--- a/Dockerfile.master.template
+++ b/Dockerfile.master.template
@@ -68,7 +68,7 @@ RUN set -ex \
     && mkdir -p /usr/src/sfcgal \
     && cd /usr/src/sfcgal \
     && git init \
-    && git remote add origin https://github.com/Oslandia/SFCGAL.git \
+    && git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
     && git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
     && git reset --hard FETCH_HEAD \
     && mkdir cmake-build \
diff --git a/update.sh b/update.sh
index 68a9e58aa..5a3899bfd 100755
--- a/update.sh
+++ b/update.sh
@@ -34,7 +34,7 @@ declare -A postgisDebPkgNameVersionSuffixes=(
 
 packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
 
-sfcgalGitHash="$(git ls-remote https://github.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')"
+sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')"
 projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')"
 gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')"
 geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/master | awk '{ print $1}')"

From 381725816f91872def513f42f5fa117631cb3363 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Sun, 5 Jul 2020 20:44:33 +0200
Subject: [PATCH 2/2] update 12-master , 13-master  (./update.sh)

---
 12-master/Dockerfile | 12 ++++++------
 13-master/Dockerfile | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/12-master/Dockerfile b/12-master/Dockerfile
index 191fcb471..2f7344422 100644
--- a/12-master/Dockerfile
+++ b/12-master/Dockerfile
@@ -3,15 +3,15 @@ FROM postgres:12
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV SFCGAL_VERSION master
-ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
+ENV SFCGAL_GIT_HASH 7e91a52fd90ef47e2f0b8925145e59ef1043fdd4
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
+ENV PROJ_GIT_HASH b8fef0901bd92056b92b028476d160e0804de16b
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
+ENV GDAL_GIT_HASH 1890a2eea4615d23093734c28164b076930d352a
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
+ENV GEOS_GIT_HASH 0f938979b58f9a451670032a7199ece23d52c3c1
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
+ENV POSTGIS_GIT_HASH 6700df0e2db7965458b36f973d0216ce1cada762
 
 RUN set -ex \
     && apt-get update \
@@ -68,7 +68,7 @@ RUN set -ex \
     && mkdir -p /usr/src/sfcgal \
     && cd /usr/src/sfcgal \
     && git init \
-    && git remote add origin https://github.com/Oslandia/SFCGAL.git \
+    && git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
     && git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
     && git reset --hard FETCH_HEAD \
     && mkdir cmake-build \
diff --git a/13-master/Dockerfile b/13-master/Dockerfile
index a55cc8aae..d98ffd1e8 100644
--- a/13-master/Dockerfile
+++ b/13-master/Dockerfile
@@ -3,15 +3,15 @@ FROM postgres:13
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV SFCGAL_VERSION master
-ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
+ENV SFCGAL_GIT_HASH 7e91a52fd90ef47e2f0b8925145e59ef1043fdd4
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
+ENV PROJ_GIT_HASH b8fef0901bd92056b92b028476d160e0804de16b
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
+ENV GDAL_GIT_HASH 1890a2eea4615d23093734c28164b076930d352a
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
+ENV GEOS_GIT_HASH 0f938979b58f9a451670032a7199ece23d52c3c1
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
+ENV POSTGIS_GIT_HASH 6700df0e2db7965458b36f973d0216ce1cada762
 
 RUN set -ex \
     && apt-get update \
@@ -68,7 +68,7 @@ RUN set -ex \
     && mkdir -p /usr/src/sfcgal \
     && cd /usr/src/sfcgal \
     && git init \
-    && git remote add origin https://github.com/Oslandia/SFCGAL.git \
+    && git remote add origin https://gitlab.com/Oslandia/SFCGAL.git \
     && git fetch --depth 1 origin :${SFCGAL_GIT_HASH} \
     && git reset --hard FETCH_HEAD \
     && mkdir cmake-build \