Ensure that reference.zip is downloaded via HTTPS

4 files changed, 37 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be7db9b54290..57f3eaddf354 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = processing4-git
 	pkgdesc = Programming environment for creating images, animations and interactions
 	pkgver = 4.0b4.r65.g5fb933e29
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/processing/processing4
 	arch = x86_64
 	license = GPL
@@ -17,10 +17,12 @@ pkgbase = processing4-git
 	conflicts = processing
 	options = !strip
 	source = disable_update_check.patch
+	source = get_reference_via_https.patch
 	source = no_ffmpeg_download.patch
 	source = no_jdk_download.patch
 	sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
+	sha256sums = 1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5
 	sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126
-	sha256sums = 5e0cbbaf93fd4cf104fabe82c0ff98535bdae31f70d6e92ae7851477a40456d6
+	sha256sums = 5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201
 
 pkgname = processing4-git
diff --git a/PKGBUILD b/PKGBUILD
index c7f7a75f5c35..d5d0cdaeb4cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=processing4-git
 pkgver=4.0b4.r65.g5fb933e29
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='https://github.com/processing/processing4'
@@ -13,11 +13,13 @@ depends=( 'jdk-openjdk' 'java-openjfx')
 makedepends=('ant' 'gendesk' 'rsync' 'unzip')
 options=(!strip)
 source=(disable_update_check.patch
+        get_reference_via_https.patch
         no_ffmpeg_download.patch
         no_jdk_download.patch)
 sha256sums=('35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
+            '1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5'
             'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
-            '5e0cbbaf93fd4cf104fabe82c0ff98535bdae31f70d6e92ae7851477a40456d6')
+            '5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -38,6 +40,9 @@ prepare() {
   patch $pkgname/build/build.xml < no_jdk_download.patch
   patch $pkgname/build/shared/tools/MovieMaker/build.xml < no_ffmpeg_download.patch
 
+  # Ensure that reference.zip is downloaded via HTTPS
+  patch -p0 < get_reference_via_https.patch
+
   # Disable update check in default preferences
   patch $pkgname/build/shared/lib/defaults.txt < disable_update_check.patch
 }
diff --git a/get_reference_via_https.patch b/get_reference_via_https.patch
new file mode 100644
index 000000000000..bc43271e310f
--- /dev/null
+++ b/get_reference_via_https.patch
@@ -0,0 +1,24 @@
+diff -ruN processing4-git/build/build.xml processing4-git-patched/build/build.xml
+--- processing4-git/build/build.xml	2022-01-31 13:24:21.300634689 +0100
++++ processing4-git-patched/build/build.xml	2022-01-31 13:25:53.194256000 +0100
+@@ -369,7 +369,7 @@
+     </condition>
+ 
+     <!--<echo message="ref ignoreable? ${reference.ignorable}" />-->
+-    <get src="http://download.processing.org/reference.zip"
++    <get src="https://download.processing.org/reference.zip"
+          dest="../java/reference.zip"
+          ignoreerrors="${reference.ignorable}"
+          usetimestamp="true" />
+diff -ruN processing4-git/java/libraries/io/build.xml processing4-git-patched/java/libraries/io/build.xml
+--- processing4-git/java/libraries/io/build.xml	2022-01-31 13:24:21.483968605 +0100
++++ processing4-git-patched/java/libraries/io/build.xml	2022-01-31 13:25:06.487444000 +0100
+@@ -43,7 +43,7 @@
+     <replaceregexp file="library.properties" match="version = .*" replace="version = ${revision}" flags="g" />
+     <replaceregexp file="library.properties" match="prettyVersion = .*" replace="prettyVersion = ${revision}" flags="g" />
+ 
+-    <get src="http://download.processing.org/reference.zip"
++    <get src="https://download.processing.org/reference.zip"
+          dest="reference.zip"
+          usetimestamp="true" />
+     <mkdir dir="reference" />
diff --git a/no_jdk_download.patch b/no_jdk_download.patch
index b5efe69d5c26..314c954025b2 100644
--- a/no_jdk_download.patch
+++ b/no_jdk_download.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2022-01-31 12:44:46.824038995 +0100
-+++ build.xml.patched	2022-01-31 12:47:21.567810435 +0100
+--- a/build/build.xml	2022-01-31 12:44:46.824038995 +0100
++++ b/build/build.xml	2022-01-31 12:47:21.567810435 +0100
 @@ -940,7 +940,7 @@
      </if>
    </target>