From f08db5c1cce9215155d23751aadb856013486b1d Mon Sep 17 00:00:00 2001 From: lwthiker Date: Sat, 19 Feb 2022 15:10:29 +0200 Subject: [PATCH] Move build files to 'firefox' folder In preparation for merging the support for Chrome impersonation, move all build files to the 'firefox' folder. The two builds will live separately as they are rather different (using two different SSL libraries for instance). --- Dockerfile => firefox/Dockerfile | 4 ++-- curl_ff91esr => firefox/curl_ff91esr | 0 curl_ff95 => firefox/curl_ff95 | 0 curl-configure.patch => firefox/patches/curl-configure.patch | 0 curl-lib-nss.patch => firefox/patches/curl-lib-nss.patch | 0 .../patches/curl-static-libnss.patch | 0 libnghttp2-pc.patch => firefox/patches/libnghttp2-pc.patch | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename Dockerfile => firefox/Dockerfile (96%) rename curl_ff91esr => firefox/curl_ff91esr (100%) rename curl_ff95 => firefox/curl_ff95 (100%) rename curl-configure.patch => firefox/patches/curl-configure.patch (100%) rename curl-lib-nss.patch => firefox/patches/curl-lib-nss.patch (100%) rename curl-static-libnss.patch => firefox/patches/curl-static-libnss.patch (100%) rename libnghttp2-pc.patch => firefox/patches/libnghttp2-pc.patch (100%) diff --git a/Dockerfile b/firefox/Dockerfile similarity index 96% rename from Dockerfile rename to firefox/Dockerfile index f8a5b64..9fc274c 100644 --- a/Dockerfile +++ b/firefox/Dockerfile @@ -33,7 +33,7 @@ RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL} RUN tar xf ${NGHTTP2_VERSION}.tar.bz2 # Patch nghttp2 pkg config file to support static builds. -COPY libnghttp2-*.patch ${NGHTTP2_VERSION}/ +COPY patches/libnghttp2-*.patch ${NGHTTP2_VERSION}/ RUN cd ${NGHTTP2_VERSION} && \ for p in $(ls libnghttp2-*.patch); do patch -p1 < $p; done && \ autoreconf -i && automake && autoconf @@ -49,7 +49,7 @@ RUN curl -o ${CURL_VERSION}.tar.xz https://curl.se/download/${CURL_VERSION}.tar. RUN tar xf ${CURL_VERSION}.tar.xz # Patch Curl. -COPY curl-*.patch ${CURL_VERSION}/ +COPY patches/curl-*.patch ${CURL_VERSION}/ # Re-generate the configure script RUN cd ${CURL_VERSION} && \ diff --git a/curl_ff91esr b/firefox/curl_ff91esr similarity index 100% rename from curl_ff91esr rename to firefox/curl_ff91esr diff --git a/curl_ff95 b/firefox/curl_ff95 similarity index 100% rename from curl_ff95 rename to firefox/curl_ff95 diff --git a/curl-configure.patch b/firefox/patches/curl-configure.patch similarity index 100% rename from curl-configure.patch rename to firefox/patches/curl-configure.patch diff --git a/curl-lib-nss.patch b/firefox/patches/curl-lib-nss.patch similarity index 100% rename from curl-lib-nss.patch rename to firefox/patches/curl-lib-nss.patch diff --git a/curl-static-libnss.patch b/firefox/patches/curl-static-libnss.patch similarity index 100% rename from curl-static-libnss.patch rename to firefox/patches/curl-static-libnss.patch diff --git a/libnghttp2-pc.patch b/firefox/patches/libnghttp2-pc.patch similarity index 100% rename from libnghttp2-pc.patch rename to firefox/patches/libnghttp2-pc.patch