From d56ec878e01a3878e763ed072c0e0cb5ce52edfa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 26 Jan 2020 21:45:01 +0100
Subject: [PROJ4] Fix build / move build script to PROJ repository itself
 (#3294)

---
 projects/proj4/Dockerfile   | 15 +++++++++++----
 projects/proj4/build.sh     | 24 ------------------------
 projects/proj4/project.yaml |  5 ++++-
 3 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100755 projects/proj4/build.sh

(limited to 'projects/proj4')

diff --git a/projects/proj4/Dockerfile b/projects/proj4/Dockerfile
index 12235d23c..56f887c98 100644
--- a/projects/proj4/Dockerfile
+++ b/projects/proj4/Dockerfile
@@ -16,7 +16,14 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER even.rouault@spatialys.com
-RUN apt-get update && apt-get install -y make autoconf automake libtool g++ sqlite3 libsqlite3-dev pkg-config
-RUN git clone --depth 1 https://github.com/OSGeo/proj.4 proj.4
-WORKDIR proj.4
-COPY build.sh $SRC/
+RUN dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get install -y make autoconf automake libtool g++ sqlite3 pkg-config
+
+RUN git clone --depth 1 https://github.com/OSGeo/proj proj
+
+RUN git clone --depth 1 https://github.com/curl/curl.git proj/curl
+
+WORKDIR proj
+
+RUN cp test/fuzzers/build.sh $SRC/
diff --git a/projects/proj4/build.sh b/projects/proj4/build.sh
deleted file mode 100755
index 37c65f77f..000000000
--- a/projects/proj4/build.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -eu
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-./autogen.sh
-./configure --disable-shared
-make clean -s
-make -j$(nproc) -s
-
-./test/fuzzers/build_google_oss_fuzzers.sh
-./test/fuzzers/build_seed_corpus.sh
diff --git a/projects/proj4/project.yaml b/projects/proj4/project.yaml
index 91e991a65..71bdcf8cd 100644
--- a/projects/proj4/project.yaml
+++ b/projects/proj4/project.yaml
@@ -1,6 +1,9 @@
-homepage: "http://proj4.org/"
+homepage: "https://proj.org/"
 primary_contact: "even.rouault@gmail.com"
 auto_ccs:
   - "hobu.inc@gmail.com"
   - "kristianevers@gmail.com"
   - "knudsen.thomas@gmail.com"
+architectures:
+  - x86_64
+  - i386
-- 
cgit v1.2.3


From 4dc4c0240f96105f2330a0fc1f5f321a6e796ddb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 29 Jan 2020 17:39:31 +0100
Subject: [PROJ4] Build libtiff from source to create a static archive (#3303)

Previously we linked against the dynamic libtiff library, but this
didn't work when running the fuzzers.
This time, actually tested by launching
python infra/helper.py run_fuzzer $PROJECT_NAME proj_crs_to_crs_fuzzer
---
 projects/proj4/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'projects/proj4')

diff --git a/projects/proj4/Dockerfile b/projects/proj4/Dockerfile
index 56f887c98..6e9ca2c22 100644
--- a/projects/proj4/Dockerfile
+++ b/projects/proj4/Dockerfile
@@ -24,6 +24,8 @@ RUN git clone --depth 1 https://github.com/OSGeo/proj proj
 
 RUN git clone --depth 1 https://github.com/curl/curl.git proj/curl
 
+RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff.git proj/libtiff
+
 WORKDIR proj
 
 RUN cp test/fuzzers/build.sh $SRC/
-- 
cgit v1.2.3