Fixes #12488: Oracle jdk url has changed but not in ppa

Normation · Apr 18, 2018 · 1834fa5 · 1834fa5
1 parent 01c89a5
commit 1834fa5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/rudder-inventory-endpoint/debian/rules b/rudder-inventory-endpoint/debian/rules
@@ -56,9 +56,7 @@ java8:
 			cd /var/lib/dpkg/info; \
 			sed -i 's|JAVA_VERSION=8u161|JAVA_VERSION=8u172|' oracle-java8-installer.*; \
 			sed -i 's|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/|' oracle-java8-installer.*; \
-			# 32 bits
 			sed -i 's|SHA256SUM_TGZ="cf69617a74cccb262f06f7948f38e1c004d2663801e7724e7a7a0dabeb48d7dc"|SHA256SUM_TGZ="0a4310d31246924d5c3cd161b9da7f446acef373e6484452c80de8d8519f5a33"|' oracle-java8-installer.*; \
-			# 64 bits
 			sed -i 's|SHA256SUM_TGZ="6dbc56a0e3310b69e91bb64db63a485bd7b6a8083f08e48047276380a0e2021e"|SHA256SUM_TGZ="28a00b9400b6913563553e09e8024c286b506d8523334c93ddec6c9ec7e9d346"|' oracle-java8-installer.*; \
 			sed -i 's|J_DIR=jdk1.8.0_161|J_DIR=jdk1.8.0_172|' oracle-java8-installer.*; \
 			sed -i 's|seq 1 160|seq 1 171|' oracle-java8-installer.*; \

diff --git a/rudder-webapp/debian/rules b/rudder-webapp/debian/rules
@@ -54,9 +54,7 @@ java8:
 			cd /var/lib/dpkg/info; \
 			sed -i 's|JAVA_VERSION=8u161|JAVA_VERSION=8u172|' oracle-java8-installer.*; \
 			sed -i 's|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/|' oracle-java8-installer.*; \
-			# 32 bits
 			sed -i 's|SHA256SUM_TGZ="cf69617a74cccb262f06f7948f38e1c004d2663801e7724e7a7a0dabeb48d7dc"|SHA256SUM_TGZ="0a4310d31246924d5c3cd161b9da7f446acef373e6484452c80de8d8519f5a33"|' oracle-java8-installer.*; \
-			# 64 bits
 			sed -i 's|SHA256SUM_TGZ="6dbc56a0e3310b69e91bb64db63a485bd7b6a8083f08e48047276380a0e2021e"|SHA256SUM_TGZ="28a00b9400b6913563553e09e8024c286b506d8523334c93ddec6c9ec7e9d346"|' oracle-java8-installer.*; \
 			sed -i 's|J_DIR=jdk1.8.0_161|J_DIR=jdk1.8.0_172|' oracle-java8-installer.*; \
 			sed -i 's|seq 1 160|seq 1 171|' oracle-java8-installer.*; \