7u79-2: Install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files

3 files changed, 17 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 236956fcc9a1..00cd60419165 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jre7
 	pkgdesc = Oracle Java 7 Runtime Environment (public release - end of support)
 	pkgver = 7u79
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
 	install = jre7.install
 	arch = i686
@@ -40,7 +40,9 @@ pkgbase = jre7
 	backup = etc/java-jre7/psfont.properties.ja
 	backup = etc/java-jre7/psfontj2d.properties
 	backup = etc/java-jre7/sound.properties
+	source = http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
 	source = policytool-jre7.desktop
+	md5sums = c47e997b90ddfd0d813a37ccc97fb933
 	md5sums = db24e699517801b35343cc7ebc93ce88
 	source_i686 = http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jre-7u79-linux-i586.tar.gz
 	md5sums_i686 = eba02bbd1dcb9546fed93a9854b84ed9
diff --git a/PKGBUILD b/PKGBUILD
index 1032f426680c..59bc4ceeebfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=7
 _minor=79
 _build=b15
 pkgver=${_major}u${_minor}
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle Java $_major Runtime Environment (public release - end of support)"
 arch=('i686' 'x86_64')
 url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
@@ -22,7 +22,7 @@ provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start
           "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_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/lib/jvm/java-$_major-$_pkgname/jre
 
@@ -42,10 +42,12 @@ backup=("etc/java-$_jname/amd64/jvm.cfg"
         "etc/java-$_jname/psfontj2d.properties"
         "etc/java-$_jname/sound.properties")
 install=$pkgname.install
-source=("policytool-$_jname.desktop")
+source=("http://download.oracle.com/otn-pub/java/jce/$_major/UnlimitedJCEPolicyJDK$_major.zip"
+        "policytool-$_jname.desktop")
 source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-i586.tar.gz")
 source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-x64.tar.gz")
-md5sums=('db24e699517801b35343cc7ebc93ce88')
+md5sums=('c47e997b90ddfd0d813a37ccc97fb933'
+         'db24e699517801b35343cc7ebc93ce88')
 md5sums_i686=('eba02bbd1dcb9546fed93a9854b84ed9')
 md5sums_x86_64=('fcd884a57920d90fa23240abb403fcf5')
 
@@ -120,6 +122,13 @@ package() {
     mv COPYRIGHT LICENSE README *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
     ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$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"/UnlimitedJCEPolicy/*.jar 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
@@ -131,4 +140,4 @@ package() {
         // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \
         permission java.awt.AWTPermission \"accessClipboard\";" \
     -i "$pkgdir"/etc/java-$_jname/security/java.policy
-}
\ No newline at end of file
+}
diff --git a/UnlimitedJCEPolicyJDK7.zip b/UnlimitedJCEPolicyJDK7.zip
new file mode 100644
index 000000000000..0a6890ccdfea
--- /dev/null
+++ b/UnlimitedJCEPolicyJDK7.zip