c8ed96c8a8
- Merges the fix for CVE-2012-4540 - Fixes an issue with iDrac console applets (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1161 & https://bugzilla.redhat.com/show_bug.cgi?id=753960), reported by jirib - Fix javaws launcher to not depend on bash, and correctly find libjava.so, from dcoppa@ - A regression with logmein.com has been filed upstream by giovanni@ : http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1213 Thx to all involved!
31 lines
617 B
Plaintext
31 lines
617 B
Plaintext
$OpenBSD: patch-launcher_javaws_in,v 1.2 2012/11/10 10:37:27 landry Exp $
|
|
--- launcher/javaws.in.orig Mon Aug 27 21:36:42 2012
|
|
+++ launcher/javaws.in Sat Nov 10 10:40:00 2012
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
|
|
JAVA=@JAVA@
|
|
LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
|
|
@@ -8,9 +8,9 @@ BINARY_LOCATION=@JAVAWS_BIN_LOCATION@
|
|
PROGRAM_NAME=javaws
|
|
CP=@JRE@/lib/rt.jar
|
|
|
|
-JAVA_ARGS=( )
|
|
-ARGS=( )
|
|
-COMMAND=()
|
|
+set -A JAVA_ARGS
|
|
+set -A ARGS
|
|
+set -A COMMAND
|
|
|
|
i=0
|
|
j=0
|
|
@@ -59,6 +59,6 @@ while [ "$j" -lt "${#ARGS[@]}" ]; do
|
|
k=$((k+1))
|
|
done
|
|
|
|
-exec -a "javaws" "${COMMAND[@]}"
|
|
+exec "${COMMAND[@]}"
|
|
|
|
exit $?
|