From 48f49d04bccbb051052c29ae4a6bc4a47bd03fb0 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@flexion.org>
Date: Fri, 15 Jun 2012 10:58:39 +0100
Subject: [PATCH] Closes #31, #32, #33, #34 and #39. Thanks for all the pull
 requests guys!

---
 AUTHORS     |  2 ++
 CHANGES     | 16 ++++++++++++++++
 README.rst  | 23 ++++++++++++++++++++---
 TODO        |  1 -
 oab-java.sh |  8 ++++----
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bb31645..0186698 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,8 @@ Other contributors, listed alphabetically, are:
 * Derek Chen-Becker - Added an option to skip rebuilding packages.
 * Eshwar Andhavarapu - Added comments in the apt source file.
 * Hannes Schmidt - Added an option to use a pre-existing signing key.
+* Jameson J Lee - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
+* Ladios Jonquil - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
 * Martin Polden - Fixed download binary packages from Oracle.
 * Miah Johnson - Fixed download binary packages from Oracle.
 * onlymostlydead - Fixed downloading from Oracle (again).
diff --git a/CHANGES b/CHANGES
index 7d5ee89..183c6f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,22 @@
 History
 =======
 
+0.2.4
+-----
+* Added support for JCE Unlimited Strength Jurisdiction Policy Files. Thanks to Ladios Jonquil and Jameson J Lee.
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/31
+
+* Reverted to https for git clone of upstream tools. 
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/32
+  
+* Updated download links to Sun Java 6 and Oracle Java 7. Thanks to Ladios Jonquil and Jameson J Lee.
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/33
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/34
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/39
+
 0.2.3
 -----
 * Added an option to build ``oracle-java7`` packages.
diff --git a/README.rst b/README.rst
index 6f9878d..b716eb4 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
 OAB-Java
 ========
-oab-java.sh v0.2.3 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.
+oab-java.sh v0.2.4 - Create a local 'apt' repository for Sun Java 6 and/or Oracle Java 7 packages.
 
 Copyright (c) Martin Wimpress, http://flexion.org. MIT License
 
@@ -29,7 +29,7 @@ Like this.
 ::
 
   cd ~/
-  wget https://github.com/flexiondotorg/oab-java6/raw/0.2.3/oab-java.sh -O oab-java.sh
+  wget https://github.com/flexiondotorg/oab-java6/raw/0.2.4/oab-java.sh -O oab-java.sh
   chmod +x oab-java.sh
   sudo ./oab-java.sh
 
@@ -111,6 +111,22 @@ Because, O.A.B! ;-)
 History
 =======
 
+0.2.4
+-----
+* Added support for JCE Unlimited Strength Jurisdiction Policy Files. Thanks to Ladios Jonquil and Jameson J Lee.
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/31
+
+* Reverted to https for git clone of upstream tools. 
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/32
+  
+* Updated download links to Sun Java 6 and Oracle Java 7. Thanks to Ladios Jonquil and Jameson J Lee.
+
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/33
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/34
+  * Closes: https://github.com/flexiondotorg/oab-java6/issues/39
+
 0.2.3
 -----
 * Added an option to build ``oracle-java7`` packages.
@@ -255,6 +271,8 @@ Other contributors, listed alphabetically, are:
 * Derek Chen-Becker - Added an option to skip rebuilding packages.
 * Eshwar Andhavarapu - Added comments in the apt source file.
 * Hannes Schmidt - Added an option to use a pre-existing signing key.
+* Jameson J Lee - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
+* Ladios Jonquil - Added support for JCE Unlimited Strength Jurisdiction Policy Files and fixed downloading from Oracle (yet again).
 * Martin Polden - Fixed download binary packages from Oracle.
 * Miah Johnson - Fixed download binary packages from Oracle.
 * onlymostlydead - Fixed downloading from Oracle (again).
@@ -265,7 +283,6 @@ Many thanks for all contributions!
 Todo
 ====
 
-* Add support for JCE Unlimited Strength Jurisdiction Policy Files.
 * Check the binary packages downloaded from Oracle are the correct size.  
 * Add support to build for a given Ubuntu distribution.
 * Add support to optionally build using ``pbuilder``.
diff --git a/TODO b/TODO
index 5ee71d5..3f10fb6 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@
 Todo
 ====
 
-* Add support for JCE Unlimited Strength Jurisdiction Policy Files.
 * Check the binary packages downloaded from Oracle are the correct size.  
 * Add support to build for a given Ubuntu distribution.
 * Add support to optionally build using ``pbuilder``.
diff --git a/oab-java.sh b/oab-java.sh
index 4f320c7..33ffafb 100755
--- a/oab-java.sh
+++ b/oab-java.sh
@@ -9,7 +9,7 @@
 #  - http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html
 
 # Version
-VER="0.2.3"
+VER="0.2.4"
 
 # common ############################################################### START #
 sp="/-\|"
@@ -401,15 +401,15 @@ chown root:root ${WORK_PATH}/gpg 2>/dev/null
 chmod 0700 ${WORK_PATH}/gpg 2>/dev/null
 
 # Remove the 'src' directory everytime.
-ncecho " [x] Removing clones of http://github.com/rraptorr/${JAVA_UPSTREAM} "
+ncecho " [x] Removing clones of https://github.com/rraptorr/${JAVA_UPSTREAM} "
 rm -rfv ${WORK_PATH}/${JAVA_UPSTREAM}* 2>/dev/null >> "$log" 2>&1
 rm -rfv ${WORK_PATH}/src 2>/dev/null >> "$log" 2>&1 &
 pid=$!;progress $pid
 
 # Clone the code
-ncecho " [x] Cloning http://github.com/rraptorr/${JAVA_UPSTREAM} "
+ncecho " [x] Cloning https://github.com/rraptorr/${JAVA_UPSTREAM} "
 cd ${WORK_PATH}/ >> "$log" 2>&1
-git clone http://github.com/rraptorr/${JAVA_UPSTREAM} src >> "$log" 2>&1 &
+git clone https://github.com/rraptorr/${JAVA_UPSTREAM} src >> "$log" 2>&1 &
 pid=$!;progress $pid
 
 # Get the last commit tag.