6u45-4: Install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files

3 files changed, 17 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9dc1f9b370c9..576b2ee5b484 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bin32-jdk6
 	pkgdesc = Oracle Java 6 Development Kit (32-bit) (public release - end of support)
 	pkgver = 6u45
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.java.com/en/download/faq/java_6.xml
 	install = bin32-jdk6.install
 	arch = x86_64
@@ -30,11 +30,13 @@ pkgbase = bin32-jdk6
 	backup = etc/java32-jdk6/psfont.properties.ja
 	backup = etc/java32-jdk6/psfontj2d.properties
 	backup = etc/java32-jdk6/sound.properties
+	source = http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip
 	source = javaws-launcher
 	source = jconsole32-jdk6.desktop
 	source = jmc32-jdk6.desktop
 	source = jvisualvm32-jdk6.desktop
 	source = policytool32-jdk6.desktop
+	md5sums = b20f9d6ed14e55d73a5ed204bca01e7a
 	md5sums = 45c15a6b4767288f2f745598455ea2bf
 	md5sums = 8e3fb5f39a1c24945fdb9315f9743263
 	md5sums = be4ebc20e7acd60e195231c36db4a8cf
diff --git a/PKGBUILD b/PKGBUILD
index ae73188a0bd4..03b81a8bddaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=6
 _minor=45
 _build=b06
 pkgver=${_major}u${_minor}
-pkgrel=3
+pkgrel=4
 pkgdesc="Oracle Java $_major Development Kit (32-bit) (public release - end of support)"
 arch=('x86_64')
 url=https://www.java.com/en/download/faq/java_6.xml
@@ -24,7 +24,7 @@ provides=("java32-runtime=$_major" "java32-runtime-headless=$_major" "java32-web
           "java32-runtime-jre=$_major" "java32-runtime-headless-jre=$_major" "java32-web-start-jre=$_major" "java32-environment-jdk=$_major")
 
 # Variables
-DLAGENTS=('http::/usr/bin/curl -LC - -b oraclelicense=a -O')
+DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 _jname=${_pkgname}${_major}
 _jvmdir=/usr/lib32/jvm/java32-$_major-$_pkgname
 
@@ -45,13 +45,15 @@ backup=("etc/java32-$_jname/i386/jvm.cfg"
         "etc/java32-$_jname/sound.properties")
 options=('!strip') # JDK debug-symbols
 install=$pkgname.install
-source=('javaws-launcher'
+source=("http://download.oracle.com/otn-pub/java/jce_policy/$_major/jce_policy-$_major.zip"
+        'javaws-launcher'
         "jconsole32-$_jname.desktop"
         "jmc32-$_jname.desktop"
         "jvisualvm32-$_jname.desktop"
         "policytool32-$_jname.desktop")
 source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-i586.bin")
-md5sums=('45c15a6b4767288f2f745598455ea2bf'
+md5sums=('b20f9d6ed14e55d73a5ed204bca01e7a'
+         '45c15a6b4767288f2f745598455ea2bf'
          '8e3fb5f39a1c24945fdb9315f9743263'
          'be4ebc20e7acd60e195231c36db4a8cf'
          'eaaf5c10579336af3474ccb23dce2911'
@@ -143,6 +145,13 @@ package() {
     mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java${_major}-${_pkgname}32/
     ln -sf /usr/share/licenses/java${_major}-${_pkgname}32/ "$pkgdir"/usr/share/licenses/$pkgname
 
+    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
+    # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
+    # things like 256-bit AES. Enabled by default in OpenJDK:
+    # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
+    # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
+    install -m644 "$srcdir"/jce/*.jar jre/lib/security/
+
     msg2 "Enabling copy+paste in unsigned applets..."
     # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
     # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
@@ -154,4 +163,4 @@ package() {
         // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
         permission java.awt.AWTPermission \"accessClipboard\";" \
     -i "$pkgdir"/etc/java32-$_jname/security/java.policy
-}
\ No newline at end of file
+}
diff --git a/jce_policy-6.zip b/jce_policy-6.zip
new file mode 100644
index 000000000000..1e590792dbd1
--- /dev/null
+++ b/jce_policy-6.zip