Adding JCE to the package

2 files changed, 27 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 255167d01cc5..bcf3b4766144 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jdk6
 	pkgdesc = Oracle Java 6 Development Kit (public release - end of support)
 	pkgver = 6u45
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.java.com/en/download/faq/java_6.xml
 	install = jdk6.install
 	arch = i686
@@ -33,8 +33,8 @@ pkgbase = jdk6
 	provides = java-web-start-jre=6
 	provides = java-environment-jdk=6
 	options = !strip
-	backup = etc/java-jdk6/amd64/jvm.cfg
-	backup = etc/java-jdk6/amd64/server/Xusage.txt
+	backup = etc/java-jdk6/i386/jvm.cfg
+	backup = etc/java-jdk6/i386/server/Xusage.txt
 	backup = etc/java-jdk6/images/cursors/cursors.properties
 	backup = etc/java-jdk6/management/jmxremote.access
 	backup = etc/java-jdk6/management/jmxremote.password.template
@@ -53,18 +53,22 @@ pkgbase = jdk6
 	backup = etc/java-jdk6/psfont.properties.ja
 	backup = etc/java-jdk6/psfontj2d.properties
 	backup = etc/java-jdk6/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin
 	source = javaws-launcher
 	source = jconsole-jdk6.desktop
 	source = jmc-jdk6.desktop
 	source = jvisualvm-jdk6.desktop
 	source = policytool-jdk6.desktop
-	md5sums = 40c1a87563c5c6a90a0ed6994615befe
+	source = http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip
 	md5sums = 45c15a6b4767288f2f745598455ea2bf
 	md5sums = 4ecc28010b77b31c101e61f420a415fa
 	md5sums = 6ab27fa31a5a83f98f4a36ec3bd47911
 	md5sums = b30ca4304c8bb6b01650d9d235f97995
 	md5sums = e513ee55f55467f7fd323195ae70f418
+	md5sums = b20f9d6ed14e55d73a5ed204bca01e7a
+	source_i686 = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
+	md5sums_i686 = 3269370b7c34e6cbfed8785d3d0c5cbd
+	source_x86_64 = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin
+	md5sums_x86_64 = 40c1a87563c5c6a90a0ed6994615befe
 
 pkgname = jdk6
 
diff --git a/PKGBUILD b/PKGBUILD
index 99825e1d685f..77bfbae26492 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: 
+# Maintainer: Giovanni Santini 'ItachiSan' <giovannisantini93@yahoo.it>
 # Contributors: Det, JavaAtom, Ethan Hall, Giovanni Santini, Guillaume ALAUX, Daniel J Griffiths,
 #               Jason Chu, Geoffroy Carrier, Thomas Dziedzic, Dan Serban
 
@@ -8,7 +8,7 @@ _major=6
 _minor=45
 _build=b06
 pkgver=${_major}u${_minor}
-pkgrel=3
+pkgrel=4
 pkgdesc="Oracle Java $_major Development Kit (public release - end of support)"
 arch=('i686' 'x86_64')
 url=https://www.java.com/en/download/faq/java_6.xml
@@ -26,9 +26,10 @@ provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start
 
 # Variables
 DLAGENTS=('http::/usr/bin/curl -LC - -b oraclelicense=a -O')
+if [[ $CARCH = x86_64 ]]; then
 _arch=x64
 _arch2=amd64
-if [[ $CARCH = i686 ]]; then
+else # Force fallback to i386 for AUR
   _arch=i586
   _arch2=i386
 fi
@@ -57,19 +58,22 @@ backup=("etc/java-$_jname/$_arch2/jvm.cfg"
         "etc/java-$_jname/sound.properties")
 options=(!strip) # JDK debug-symbols
 install=$pkgname.install
-source=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-$_arch.bin"
-        'javaws-launcher'
+source=('javaws-launcher'
         "jconsole-$_jname.desktop"
         "jmc-$_jname.desktop"
         "jvisualvm-$_jname.desktop"
-        "policytool-$_jname.desktop")
-md5sums=('40c1a87563c5c6a90a0ed6994615befe'
-         '45c15a6b4767288f2f745598455ea2bf'
+        "policytool-$_jname.desktop"
+        "http://download.oracle.com/otn-pub/java/jce_policy/$_major/jce_policy-$_major.zip")
+source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-i586.bin")
+source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_pkgname-$pkgver-linux-x64.bin")
+md5sums=('45c15a6b4767288f2f745598455ea2bf'
          '4ecc28010b77b31c101e61f420a415fa'
          '6ab27fa31a5a83f98f4a36ec3bd47911'
          'b30ca4304c8bb6b01650d9d235f97995'
-         'e513ee55f55467f7fd323195ae70f418')
-[[ $CARCH = i686 ]] && md5sums[0]='3269370b7c34e6cbfed8785d3d0c5cbd'
+         'e513ee55f55467f7fd323195ae70f418'
+         'b20f9d6ed14e55d73a5ed204bca01e7a')
+md5sums_i686=('3269370b7c34e6cbfed8785d3d0c5cbd')
+md5sums_x86_64=('40c1a87563c5c6a90a0ed6994615befe')
 
 package() {
   msg2 "Extracting the .bin"
@@ -128,6 +132,10 @@ package() {
   mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/
   ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
+  # Java Cryptography Extension (JCE) Unlimited Strength files
+  rename -- ".jar" "-limited.jar" jre/lib/security/*
+  install -Dm644 "$srcdir"/jce/* jre/lib/security/
+
   # Do the move
   mv * "$pkgdir"/$_jvmdir