aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-11-19 12:48:46 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-11-19 12:48:46 -0600
commit38008f279e84c3a51522041f3db55e47c0f2922e (patch)
tree8dd9b2268e9e7b4f73b5945e97fde80aa873563f
parentf7df97c7e5e3a7863cbb234b99d560e5b36ca01a (diff)
downloadaports-38008f279e84c3a51522041f3db55e47c0f2922e.tar.bz2
aports-38008f279e84c3a51522041f3db55e47c0f2922e.tar.xz
main/openjdk6: fix cacerts generation
-rw-r--r--main/openjdk6/APKBUILD4
-rw-r--r--main/openjdk6/icedtea6-1.9.7-generate_cacerts-1.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index f2bb026b2f..27c8d9ec51 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -3,7 +3,7 @@
pkgname=openjdk6
pkgver=1.6.0_p22
icedteaver=1.10.4
-pkgrel=3
+pkgrel=4
pkgdesc="Sun OpenJDK 6 via IcedTea"
url="http://icedtea.classpath.org/"
arch="all"
@@ -188,4 +188,4 @@ dc6a1e28a97d897d7a1057c11696727d icedtea-hotspot-uclibc-fixes.patch
7c0814181e5adc0763c5c0a24b01d4cb icedtea-jdk-iconv-uclibc.patch
dae2ba8b87e2106b53974ace07e4ca72 icedtea-jdk-execinfo.patch
c4bb40d5b1ff690b27900c5cd06bc1e5 icedtea-jdk-no-lib-nsl.patch
-01bdddb8adb0af0938bc9eeee79ba150 icedtea6-1.9.7-generate_cacerts-1.patch"
+0bc0131c87fcc0d1046e3ba20d205c73 icedtea6-1.9.7-generate_cacerts-1.patch"
diff --git a/main/openjdk6/icedtea6-1.9.7-generate_cacerts-1.patch b/main/openjdk6/icedtea6-1.9.7-generate_cacerts-1.patch
index 97b6ce522c..9f3074dff4 100644
--- a/main/openjdk6/icedtea6-1.9.7-generate_cacerts-1.patch
+++ b/main/openjdk6/icedtea6-1.9.7-generate_cacerts-1.patch
@@ -188,7 +188,7 @@
+#!/bin/sh
+# Simple script to extract x509 certificates and create a JRE cacerts file.
+
-+function get_args()
++get_args()
+ {
+ if test -z "${1}" ; then
+ showhelp
@@ -229,7 +229,7 @@
+ done
+ }
+
-+function check_arg()
++check_arg()
+ {
+ echo "${2}" | grep -v "^-" > /dev/null
+ if [ -z "$?" -o ! -n "$2" ]; then
@@ -239,7 +239,7 @@
+ }
+
+
-+function showhelp()
++showhelp()
+ {
+ echo "`basename ${0}` creates a valid cacerts file for use with IcedTea."
+ echo ""