[lfs-patches] r2668 - trunk/icedtea

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Wed Jul 17 18:03:10 PDT 2013


Author: bdubbs
Date: Wed Jul 17 18:03:10 2013
New Revision: 2668

Log:
Add fresh iced tea patches

Added:
   trunk/icedtea/icedtea-2.4.1-add_cacerts-1.patch
   trunk/icedtea/icedtea-2.4.1-fix_tests-1.patch
   trunk/icedtea/icedtea-2.4.1-fixed_paths-1.patch

Added: trunk/icedtea/icedtea-2.4.1-add_cacerts-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/icedtea/icedtea-2.4.1-add_cacerts-1.patch	Wed Jul 17 18:03:10 2013	(r2668)
@@ -0,0 +1,551 @@
+Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
+Date: 2013-07-13
+Initial Package Version: 2.4.1
+Upstream Status: Submitted
+Origin: DJ Lucas <dj AT linuxfromscratch DOT org>, Bruce Dubbs (mydate function)
+Description: Allows the build to generate a valid JDK cacerts file using the
+             system installed CA certificates.
+
+diff -Naurp icedtea-2.4.1.orig/acinclude.m4 icedtea-2.4.1/acinclude.m4
+--- icedtea-2.4.1.orig/acinclude.m4	2013-07-05 16:56:07.728174173 -0300
++++ icedtea-2.4.1/acinclude.m4	2013-07-13 10:27:24.263437661 -0300
+@@ -295,6 +295,178 @@ AC_DEFUN_ONCE([IT_WITH_OPENJDK_SRC_DIR],
+   AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes")
+ ])
+ 
++AC_DEFUN([IT_WITH_CACERTS],
++[
++  AC_MSG_CHECKING([whether a cacerts file is provided for distribution])
++  AC_ARG_WITH([cacerts],
++              [AS_HELP_STRING(--with-cacerts=FILE,specify the location of a pre-generated cacerts file for distribution)],
++  [
++    if test -f "${withval}"; then
++      CACERTS_FILE="${withval}"
++      cacerts_file_set=yes
++    else
++      CACERTS_FILE=
++    fi
++  ],
++  [
++    CACERTS_FILE=
++  ])
++  if test x"${CACERTS_FILE}" = "x"; then
++    cacerts_file_set=no
++    CACERTS_FILE="no"
++  fi
++  AC_MSG_RESULT(${CACERTS_FILE})
++  AC_SUBST(CACERTS_FILE)
++  AM_CONDITIONAL([CACERTS_FILE_SET], test x"${cacerts_file_set}" = "xyes")
++])
++
++AC_DEFUN([IT_GENERATE_CACERTS],
++[
++  AC_REQUIRE([IT_WITH_CACERTS])
++  AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
++  AC_ARG_ENABLE([cacerts-generation],
++              [AS_HELP_STRING(--enable-cacerts-generation, generate a cacerts file for distribution [[default=auto]])],
++  [
++    case "${enableval}" in
++      no)
++        generate_cacerts=no
++        ;;
++      *)
++        generate_cacerts=yes
++        ;;
++    esac
++  ],
++  [
++    if test x"${cacerts_file_set}" = "xno"; then
++      generate_cacerts=forced
++    else
++      if test x"${cacerts_file_set}" = "xyes"; then
++        generate_cacerts=no
++      else
++        generate_cacerts=yes
++      fi
++    fi
++  ])
++  AC_MSG_RESULT([$generate_cacerts])
++  AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes" -o x"${generate_cacerts}" = "xforced")
++])
++
++AC_DEFUN([IT_GET_LOCAL_CACERTS],
++[
++  AC_MSG_CHECKING([for a local x509 certificate directory])
++  AC_ARG_WITH([ca-dir],
++              [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local x509 certificate directory for cacerts generation)],
++  [
++    if test -d "${withval}"; then
++      CADIR="${withval}"
++    else
++      if test x"${withval}" = "xno"; then
++        CADIR=no
++      else
++        CADIR=
++      fi
++    fi
++  ],
++  [
++    CADIR=
++  ])
++  if test x"${CADIR}" = "x"; then
++    for dir in /etc/pki/tls/certs \
++      /usr/share/ca-certificates \
++      /etc/ssl/certs \
++      /etc/certs ; do
++        if test -d "${dir}"; then
++          CADIR="${dir}"
++          break
++        fi
++    done
++    if test x"${CADIR}" = "x"; then
++      CADIR=no
++    fi
++  fi
++  AC_MSG_RESULT(${CADIR})
++  AC_SUBST(CADIR)
++
++  AC_MSG_CHECKING([for a local x509 certificate file])
++  AC_ARG_WITH([ca-file],
++              [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509 certificate file for cacerts generation)],
++  [
++    if test -f "${withval}"; then
++      CAFILE="${withval}"
++    else
++      if test x"${withval}" = "xno"; then
++        CAFILE=no
++      else
++        CAFILE=
++      fi
++    fi
++  ],
++  [
++    CAFILE=
++  ])
++  if test x"${CAFILE}" = "x"; then
++    for file in /etc/pki/tls/certs/ca-bundle.crt \
++      /etc/ssl/certs/ca-bundle.crt \
++      /etc/ssl/ca-bundle.crt \
++      /etc/ca-bundle.crt ; do
++        if test -e "${file}"; then
++          CAFILE=$file
++          break
++        fi
++    done
++    if test x"${CAFILE}" = "x"; then
++      CAFILE=no
++    fi
++  fi
++  AC_MSG_RESULT(${CAFILE})
++  AC_SUBST(CAFILE)
++  if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
++    AC_MSG_ERROR([You must supply a cacerts file or a list of CA certificates to generate one.])
++  fi
++])
++
++AC_DEFUN([IT_FIND_OPENSSL],
++[
++  AC_MSG_CHECKING([for openssl])
++  AC_ARG_WITH([openssl],
++              [AS_HELP_STRING(--with-openssl=PATH, specify the path of the openssl utility)],
++  [
++    if test -x "${withval}" -a -f "${withval}"; then
++      OPENSSL="${withval}"
++    else
++      if test x"${withval}" = "xno"; then
++        OPENSSL="no"
++      else
++        OPENSSL=
++      fi
++    fi
++  ],
++  [
++    OPENSSL=
++  ])
++  if test x"${OPENSSL}" = "x"; then
++
++    OPENSSL=$(
++      IFS=":"
++      for dir in ${withval}:${PATH}; do
++        if test -x "${dir}/openssl" -a -f "${dir}/openssl"; then
++          FOUNDSSL="${dir}/openssl"
++          break
++        fi
++      done
++      echo "${FOUNDSSL}"
++      )
++    if test x"${OPENSSL}" = "x"; then
++      OPENSSL=no
++    fi
++  fi
++  AC_MSG_RESULT(${OPENSSL})
++  AC_SUBST(OPENSSL)
++  if test x"${OPENSSL}" = "xno"; then
++    AC_MSG_ERROR([You must supply a cacerts file or have openssl available to generate one.])
++  fi
++])
++
+ AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE_TREE],
+ [
+   AC_CACHE_CHECK([if we can hard link rather than copy from ${abs_top_srcdir}], it_cv_hardlink_src, [
+diff -Naurp icedtea-2.4.1.orig/configure.ac icedtea-2.4.1/configure.ac
+--- icedtea-2.4.1.orig/configure.ac	2013-07-05 16:56:07.728174173 -0300
++++ icedtea-2.4.1/configure.ac	2013-07-13 10:27:24.263437661 -0300
+@@ -76,6 +76,13 @@ AM_CONDITIONAL([ENABLE_DOCS], [test x$EN
+ AC_MSG_RESULT(${ENABLE_DOCS})
+ 
+ IT_LOCATE_NSS
++IT_GENERATE_CACERTS
++
++if test x"${generate_cacerts}" = "xyes" -o x"${generate_cacerts}" = "xforced"; then
++    IT_GET_LOCAL_CACERTS
++    IT_FIND_OPENSSL
++fi
++
+ IT_GET_PKGVERSION
+ IT_GET_LSB_DATA
+ 
+diff -Naurp icedtea-2.4.1.orig/Makefile.am icedtea-2.4.1/Makefile.am
+--- icedtea-2.4.1.orig/Makefile.am	2013-07-13 10:06:36.306626335 -0300
++++ icedtea-2.4.1/Makefile.am	2013-07-13 10:31:21.427108406 -0300
+@@ -799,7 +799,8 @@ clean-local: clean-tests clean-pulse-jav
+  clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
+  clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
+  clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
+- clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug clean-cryptocheck
++ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug clean-cryptocheck \
++ clean-cacerts clean-cacerts-debug
+ 	if [ -e bootstrap ]; then \
+ 	  rmdir bootstrap ; \
+ 	fi
+@@ -834,7 +835,8 @@ install:
+ 	clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
+ 	clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \
+ 	clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
+-	clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck
++	clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
++	clean-cacerts clean-cacerts-debug
+ 
+ env:
+ 	@echo 'unset JAVA_HOME'
+@@ -1735,6 +1737,13 @@ endif
+ if ENABLE_JAMVM
+ 	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++	$(ARCH_PREFIX) $(MAKE) add-cacerts
++else
++if CACERTS_FILE_SET
++	$(ARCH_PREFIX) $(MAKE) add-cacerts
++endif
++endif
+ 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ 	mkdir -p stamps
+ 	touch $@
+@@ -1866,6 +1875,13 @@ endif
+ if ENABLE_JAMVM
+ 	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++	$(ARCH_PREFIX) $(MAKE) add-cacerts-debug
++else
++if CACERTS_FILE_SET
++	$(ARCH_PREFIX) $(MAKE) add-cacerts-debug
++endif
++endif
+ 	@echo "IcedTea (debug build) is served:" \
+ 	  $(DEBUG_BUILD_OUTPUT_DIR)
+ 	mkdir -p stamps
+@@ -2154,6 +2170,69 @@ else
+ 	@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
+ endif
+ 
++# CA Certs
++stamps/generate-cacerts.stamp:
++if GENERATE_CACERTS
++	if test -n "${CADIR}"; then \
++	  sh scripts/mkcacerts.sh -d "${CADIR}" \
++	    -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++	    -s $(OPENSSL) \
++	    -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++	else \
++	  sh scripts/mkcacerts.sh -f "${CAFILE}" \
++	    -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++	    -s $(OPENSSL) \
++	    -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++	fi
++endif
++	touch stamps/generate-cacerts.stamp
++
++stamps/add-cacerts.stamp: stamps/generate-cacerts.stamp
++if CACERTS_FILE_SET
++	cp $(CACERTS_FILE) $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++endif
++	cp $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++	touch stamps/add-cacerts.stamp
++
++clean-cacerts:
++	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++	rm -f stamps/add-cacerts.stamp
++	rm -f stamps/generate-cacerts.stamp
++
++stamps/generate-cacerts-debug.stamp:
++if GENERATE_CACERTS
++	if test -n "${CADIR}"; then \
++	  sh scripts/mkcacerts.sh -d "${CADIR}" \
++	    -k $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++	    -s $(OPENSSL) \
++	    -o $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++	else \
++	  sh scripts/mkcacerts.sh -f "${CAFILE}" \
++	    -k $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++	    -s $(OPENSSL) \
++	    -o $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++	fi
++endif
++	touch stamps/generate-cacerts-debug.stamp
++
++stamps/add-cacerts-debug.stamp: stamps/generate-cacerts-debug.stamp
++if CACERTS_FILE_SET
++	cp $(CACERTS_FILE) $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++endif
++	cp $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++	   $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++	touch stamps/add-cacerts-debug.stamp
++
++clean-cacerts-debug:
++	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts
++	rm -f stamps/add-cacerts-debug.stamp
++	rm -f stamps/generate-cacerts-debug.stamp
++
++# end of CA Certs
++
+ # PulseAudio based mixer
+ # (pulse-java)
+ if ENABLE_PULSE_JAVA
+@@ -2716,6 +2795,10 @@ add-tzdata-support: stamps/add-tzdata-su
+ 
+ add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
+ 
++add-cacerts: stamps/add-cacerts.stamp
++
++add-cacerts-debug: stamps/add-cacerts-debug.stamp
++
+ add-zero: stamps/add-zero.stamp
+ 
+ add-zero-debug: stamps/add-zero-debug.stamp
+diff -Naurp icedtea-2.4.1.orig/scripts/mkcacerts.sh icedtea-2.4.1/scripts/mkcacerts.sh
+--- icedtea-2.4.1.orig/scripts/mkcacerts.sh	1969-12-31 21:00:00.000000000 -0300
++++ icedtea-2.4.1/scripts/mkcacerts.sh	2013-07-13 10:27:24.267437573 -0300
+@@ -0,0 +1,208 @@
++#!/bin/sh
++# Simple script to extract x509 certificates and create a JRE cacerts file.
++
++function get_args()
++    {
++        if test -z "${1}" ; then
++            showhelp
++            exit 1
++        fi
++
++        while test -n "${1}" ; do
++            case "${1}" in
++                -f | --cafile)
++                    check_arg $1 $2
++                    CAFILE="${2}"
++                    shift 2
++                ;;
++                -d | --cadir)
++                    check_arg $1 $2
++                    CADIR="${2}"
++                    shift 2
++                ;;
++                -o | --outfile)
++                    check_arg $1 $2
++                    OUTFILE="${2}"
++                    shift 2
++                ;;
++                -k | --keytool)
++                    check_arg $1 $2
++                    KEYTOOL="${2}"
++                    shift 2
++                ;;
++                -s | --openssl)
++                    check_arg $1 $2
++                    OPENSSL="${2}"
++                    shift 2
++                ;;
++                -h | --help)
++                     showhelp
++                     exit 0
++                ;;
++                *)
++                   showhelp
++                   exit 1
++                ;;
++            esac
++        done
++    }
++
++function check_arg()
++    {
++        echo "${2}" | grep -v "^-" > /dev/null
++        if [ -z "$?" -o ! -n "$2" ]; then
++            echo "Error:  $1 requires a valid argument."
++            exit 1
++        fi
++    }
++
++# The date binary is not reliable on 32bit systems for dates after 2038
++function mydate()
++    {
++        local y=$( echo $1 | cut -d" " -f4 )
++        local M=$( echo $1 | cut -d" " -f1 )
++        local d=$( echo $1 | cut -d" " -f2 )
++        local m
++
++        if [ ${d} -lt 10 ]; then d="0${d}"; fi
++
++        case $M in
++            Jan) m="01";;
++            Feb) m="02";;
++            Mar) m="03";;
++            Apr) m="04";;
++            May) m="05";;
++            Jun) m="06";;
++            Jul) m="07";;
++            Aug) m="08";;
++            Sep) m="09";;
++            Oct) m="10";;
++            Nov) m="11";;
++            Dec) m="12";;
++        esac
++
++        certdate="${y}${m}${d}"
++    }
++
++function showhelp()
++    {
++        echo "`basename ${0}` creates a valid cacerts file for use with IcedTea."
++        echo ""
++        echo "        -f  --cafile        The path to a file containing PEM formated CA"
++        echo "                            certificates.  May not be used with -d/--cadir."
++        echo "        -d  --cadir         The path to a diectory of PEM formatted CA"
++        echo "                            certificates.  May not be used with -f/--cafile."
++        echo "        -o  --outfile       The path to the output file."
++        echo ""
++        echo "        -k  --keytool       The path to the java keytool utility."
++        echo ""
++        echo "        -s  --openssl       The path to the openssl utility."
++        echo ""
++        echo "        -h  --help          Show this help message and exit."
++        echo ""
++        echo ""
++    }
++
++# Initialize empty variables so that the shell does not polute the script
++CAFILE=""
++CADIR=""
++OUTFILE=""
++OPENSSL=""
++KEYTOOL=""
++certdate=""
++date=""
++today=$( date +%Y%m%d )
++
++# Process command line arguments
++get_args ${@}
++
++# Handle common errors
++if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
++    echo "ERROR!  You must provide an x509 certificate store!"
++    echo "\'$(basename ${0}) --help\' for more info."
++    echo ""
++    exit 1
++fi
++
++if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
++    echo "ERROR!  You cannot provide two x509 certificate stores!"
++    echo "\'$(basename ${0}) --help\' for more info."
++    echo ""
++    exit 1
++fi
++
++if test "${KEYTOOL}x" == "x" ; then
++    echo "ERROR!  You must provide a valid keytool program!"
++    echo "\'$(basename ${0}) --help\' for more info."
++    echo ""
++    exit 1
++fi
++
++if test "${OPENSSL}x" == "x" ; then
++    echo "ERROR!  You must provide a valid path to openssl!"
++    echo "\'$(basename ${0}) --help\' for more info."
++    echo ""
++    exit 1
++fi
++
++if test "${OUTFILE}x" == "x" ; then
++    echo "ERROR!  You must provide a valid output file!"
++    echo "\'$(basename ${0}) --help\' for more info."
++    echo ""
++    exit 1
++fi
++
++# Get on with the work
++
++# If using a CAFILE, split it into individual files in a temp directory
++if test "${CAFILE}x" != "x" ; then
++    TEMPDIR=`mktemp -d`
++    CADIR="${TEMPDIR}"
++
++    # Get a list of staring lines for each cert
++    CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1`
++
++    # Get a list of ending lines for each cert
++    ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1`
++
++    # Start a loop
++    for certbegin in `echo "${CERTLIST}"` ; do
++        for certend in `echo "${ENDCERTLIST}"` ; do
++            if test "${certend}" -gt "${certbegin}"; then
++                break
++            fi
++        done
++        sed -n "${certbegin},${certend}p" "${CAFILE}" > "${CADIR}/${certbegin}.pem"
++        keyhash=`${OPENSSL} x509 -noout -in "${CADIR}/${certbegin}.pem" -hash`
++        echo "Generated PEM file with hash:  ${keyhash}."
++    done
++fi
++
++# Write the output file
++for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
++do
++
++    # Make sure the certificate date is valid...
++    date=$( ${OPENSSL} x509 -enddate -in "${cert}" -noout | sed 's/^notAfter=//' )
++    mydate "${date}"
++    if test "${certdate}" -lt "${today}" ; then
++        echo "${cert} expired on ${certdate}! Skipping..."
++        unset date certdate
++        continue
++    fi
++    unset date certdate
++    ls "${cert}"
++    tempfile=`mktemp`
++    certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
++    certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
++    sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
++    echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
++                   "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
++    rm "${tempfile}"
++done
++
++if test "${TEMPDIR}x" != "x" ; then
++    rm -rf "${TEMPDIR}"
++fi
++exit 0
++

Added: trunk/icedtea/icedtea-2.4.1-fix_tests-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/icedtea/icedtea-2.4.1-fix_tests-1.patch	Wed Jul 17 18:03:10 2013	(r2668)
@@ -0,0 +1,245 @@
+Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
+Date: 2013-07-17
+Initial Package Version: 2.4.1
+Upstream Status: Not applicable
+Origin: DJ Lucas <dj AT linuxfromscratch DOT org> (fo just added FSFrame.java)
+Description: excludes known to fail tests from jtreg.
+
+diff -Naur icedtea-2.4.1.orig/test/jtreg/excludelist.jdk.jtx icedtea-2.4.1/test/jtreg/excludelist.jdk.jtx
+--- icedtea-2.4.1.orig/test/jtreg/excludelist.jdk.jtx	2013-07-05 16:56:08.448185601 -0300
++++ icedtea-2.4.1/test/jtreg/excludelist.jdk.jtx	2013-07-17 15:34:58.523131502 -0300
+@@ -1,3 +1,6 @@
++# Hung the tests
++java/awt/FullScreen/SetFSWindow/FSFrame.java
++
+ # Fail to compile
+ javax/imageio/metadata/DOML3Node.java
+ javax/swing/border/Test4856008.java
+@@ -116,6 +119,7 @@
+ java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html
+ java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java
+ java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java
++java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java
+ java/awt/EventQueue/6638195/bug6638195.java
+ java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html
+ java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
+@@ -203,3 +207,208 @@
+ # of build process (this class has questionable licence).
+ java/util/Locale/LocaleEnhanceTest.java
+ 
++# NoClassDefFoundError: -classpath is set incorrectly in the testcase
++com/sun/net/httpserver/Test2.java
++com/sun/net/httpserver/bugs/B6341616.java
++java/net/Authenticator/B6870935.java
++java/net/Authenticator/B4722333.java
++java/net/Authenticator/BasicTest.java
++java/net/Authenticator/Deadlock.java
++java/net/Authenticator/B4921848.java
++java/net/Authenticator/B4962064.java
++java/net/Authenticator/BasicTest4.java
++java/net/Authenticator/AuthNPETest.java
++java/net/Authenticator/B4678055.java
++java/net/Authenticator/B4933582.sh
++java/net/Authenticator/B4759514.java
++java/net/Authenticator/BasicTest3.java
++java/net/Authenticator/B4769350.java
++java/nio/channels/SocketChannel/ExceptionTranslation.java
++java/nio/channels/ServerSocketChannel/NonBlockingAccept.java
++java/nio/channels/etc/NetworkChannelTests.java
++java/nio/channels/AsynchronousSocketChannel/Basic.java
++java/nio/channels/AsynchronousServerSocketChannel/Basic.java
++sun/net/www/AuthHeaderTest.java
++sun/net/www/protocol/http/DigestTest.java
++sun/net/www/protocol/http/BasicLongCredentials.java
++sun/net/www/protocol/http/NTLMTest.java
++sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
++sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
++sun/security/krb5/auto/HttpNegotiateServer.java
++
++# Win32 failure only, exits 0 unexpectedly:
++java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java
++
++# robot failure (window not anchored in TWM):
++java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java
++java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java
++
++# Xorg behavior change, test successfully fails to render invalid screen, but exit is unexpected
++java/awt/GraphicsDevice/CloneConfigsTest.java
++
++# Tests fail unexpectedly if no printers defined
++java/awt/print/PrinterJob/PrtException.java
++javax/print/attribute/AttributeTest.java
++javax/print/attribute/GetCopiesSupported.java
++javax/print/attribute/SidesPageRangesTest.java
++javax/print/attribute/SupportedPrintableAreas.java
++javax/print/CheckDupFlavor.java
++
++# New Xorg or evdev? Both fail on simulated button 9 press
++java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
++java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java
++
++# This test looks to be WM dependent, window was disposed causing error
++java/awt/Window/Grab/GrabTest.java
++# Same here: Transparent frame is not transparent!
++javax/swing/JComponent/6683775/bug6683775.java
++# Anchor?
++java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java
++
++# Timed out (possibly -samevm issue)
++java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html
++java/awt/Window/WindowType/WindowType.java
++java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java
++java/beans/EventHandler/Test6179222.java
++java/beans/EventHandler/Test6277266.java
++java/beans/EventHandler/Test6788531.java
++
++# Test arguments invalid
++java/lang/invoke/ClassValueTest.java
++java/lang/invoke/InvokeGenericTest.java
++java/lang/invoke/JavaDocExamplesTest.java
++java/lang/invoke/MethodHandlesTest.java
++java/lang/invoke/MethodTypeTest.java
++java/lang/invoke/PermuteArgsTest.java
++java/lang/invoke/RicochetTest.java
++java/nio/file/Files/probeContentType/ForceLoad.java
++
++# Trust store not found (invalid argument)
++java/net/URL/TestHttps.java
++
++## Bad tests (I think, reason given before each)
++# Unexpected file type in tree
++java/nio/file/Files/probeContentType/Basic.java
++# Test passes then fails due to "exception: no exception"?!?!
++java/security/KeyPairGenerator/Failover.java
++# new/old jpeg library?
++javax/imageio/plugins/shared/BitDepth.java
++# Access denied error
++javax/management/openmbean/TabularDataOrderTest.java
++javax/swing/JFileChooser/6738668/bug6738668.java
++# Using newer version than expected (1.8.5 when 1.8 is expected)
++javax/script/VersionTest.java
++# Tests cause infinite loop (1.8.5 changes?)
++javax/swing/JEditorPane/6917744/bug6917744.java
++javax/swing/JInternalFrame/Test6325652.java
++javax/swing/JInternalFrame/Test6505027.java
++javax/swing/JInternalFrame/Test6802868.java
++javax/swing/JLabel/6596966/bug6596966.java
++javax/swing/JLabel/7004134/bug7004134.java
++javax/swing/JLayer/6824395/bug6824395.java
++javax/swing/JList/6462008/bug6462008.java
++javax/swing/JOptionPane/7138665/bug7138665.java
++javax/swing/JPopupMenu/4966112/bug4966112.java
++javax/swing/JPopupMenu/6495920/bug6495920.java
++javax/swing/JPopupMenu/6827786/bug6827786.java
++javax/swing/JPopupMenu/6987844/bug6987844.java
++javax/swing/JScrollBar/4708809/bug4708809.java
++javax/swing/JScrollBar/4865918/bug4865918.java
++javax/swing/JScrollBar/6542335/bug6542335.java
++javax/swing/JScrollPane/Test6526631.java
++javax/swing/JSlider/6348946/bug6348946.java
++javax/swing/JSlider/6848475/bug6848475.java
++javax/swing/JSplitPane/4885629/bug4885629.java
++javax/swing/JTabbedPane/4624207/bug4624207.java
++javax/swing/JTable/6263446/bug6263446.java
++javax/swing/JTable/6777378/bug6777378.java
++javax/swing/JTableHeader/6884066/bug6884066.java
++javax/swing/JTableHeader/6889007/bug6889007.java
++javax/swing/JTextArea/4697612/bug4697612.java
++javax/swing/JTree/6263446/bug6263446.java
++javax/swing/JTree/6505523/bug6505523.java
++javax/swing/JViewport/7107099/bug7107099.java
++javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java
++javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java
++javax/swing/Security/6657138/ComponentTest.java
++javax/swing/SwingUtilities/4917669/bug4917669.java
++javax/swing/text/CSSBorder/6796710/bug6796710.java
++javax/swing/text/DefaultEditorKit/4278839/bug4278839.java
++
++# Still using LCMS1 profile (LCMS2 tests need backported from java 8 tree)
++java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java
++sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java
++sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java
++
++# Invalid test case of initializer (constant)
++sun/net/idn/TestStringPrep.java
++
++# Fails to compile
++sun/security/ec/TestEC.java
++
++# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=914
++com/oracle/security/ucrypto/TestAES.java
++com/oracle/security/ucrypto/TestRSA.java
++
++# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=913
++com/oracle/security/ucrypto/TestDigest.java
++
++# Suspected WM behavior issues
++java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
++java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html
++java/awt/font/TextLayout/DecorationBoundsTest.java
++java/awt/font/TextLayout/UnderlinePositionTest.java
++java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
++java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java
++javax/swing/JComponent/4337267/bug4337267.java
++
++# Infinate Loop
++javax/swing/text/JTextComponent/5074573/bug5074573.java
++
++# nspr.so alread loaded
++sun/security/krb5/runNameEquals.sh
++sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
++sun/security/pkcs11/Cipher/TestRawRSACipher.java
++sun/security/pkcs11/Cipher/TestRSACipher.java
++sun/security/pkcs11/Cipher/TestSymmCiphers.java
++sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java
++sun/security/pkcs11/ec/ReadCertificates.java
++sun/security/pkcs11/ec/ReadPKCS12.java
++sun/security/pkcs11/ec/TestCurves.java
++sun/security/pkcs11/ec/TestECDH.java
++sun/security/pkcs11/ec/TestECDSA.java
++sun/security/pkcs11/ec/TestECGenSpec.java
++sun/security/pkcs11/ec/TestKeyFactory.java
++sun/security/pkcs11/fips/TrustManagerTest.java
++sun/security/pkcs11/KeyAgreement/TestShort.java
++sun/security/pkcs11/KeyGenerator/DESParity.java
++sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java
++sun/security/pkcs11/KeyStore/ClientAuth.sh
++sun/security/pkcs11/MessageDigest/ByteBuffers.java
++sun/security/pkcs11/MessageDigest/DigestKAT.java
++sun/security/pkcs11/MessageDigest/ReinitDigest.java
++sun/security/pkcs11/Provider/ConfigShortPath.java
++sun/security/pkcs11/rsa/TestCACerts.java
++sun/security/pkcs11/rsa/TestKeyFactory.java
++sun/security/pkcs11/Secmod/AddPrivateKey.java
++sun/security/pkcs11/Secmod/AddTrustedCert.java
++sun/security/pkcs11/Secmod/Crypto.java
++sun/security/pkcs11/Secmod/GetPrivateKey.java
++sun/security/pkcs11/Secmod/JksSetPrivateKey.java
++sun/security/pkcs11/Secmod/TrustAnchors.java
++sun/security/pkcs11/SecureRandom/Basic.java
++sun/security/pkcs11/SecureRandom/TestDeserialization.java
++sun/security/pkcs11/Serialize/SerializeProvider.java
++sun/security/pkcs11/Signature/ByteBuffers.java
++sun/security/pkcs11/Signature/ReinitSignature.java
++sun/security/pkcs11/Signature/TestDSA.java
++sun/security/pkcs11/Signature/TestRSAKeyLength.java
++sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
++sun/security/pkcs11/tls/TestKeyMaterial.java
++sun/security/pkcs11/tls/TestMasterSecret.java
++sun/security/pkcs11/tls/TestPremaster.java
++sun/security/pkcs11/tls/TestPRF.java
++sun/security/pkcs11/SampleTest.java
++sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
++sun/security/tools/jarsigner/ec.sh
++
+diff -Naur icedtea-2.4.1.orig/test/jtreg/excludelist.langtools.jtx icedtea-2.4.1/test/jtreg/excludelist.langtools.jtx
+--- icedtea-2.4.1.orig/test/jtreg/excludelist.langtools.jtx	2013-07-05 16:56:08.448185601 -0300
++++ icedtea-2.4.1/test/jtreg/excludelist.langtools.jtx	2013-07-17 15:34:03.275322332 -0300
+@@ -27,3 +27,7 @@
+ 
+ # `main' threw exception: java.lang.Error: 64/256 test cases passed
+ tools/javap/OptionTest.java
++
++# Fails to compile
++tools/javac/processing/6499119/ClassProcessor.java
++

Added: trunk/icedtea/icedtea-2.4.1-fixed_paths-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/icedtea/icedtea-2.4.1-fixed_paths-1.patch	Wed Jul 17 18:03:10 2013	(r2668)
@@ -0,0 +1,78 @@
+Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
+Date: 2012-05-30
+Initial Package Version: 1.9
+Upstream Status: Not applicable
+Origin: self
+Description: fixes path for utilities as installed in LFS
+
+diff -Naur icedtea-2.2-orig/Makefile.am icedtea-2.2/Makefile.am
+--- icedtea-2.2-orig/Makefile.am	2012-05-30 22:13:29.000000000 -0500
++++ icedtea-2.2/Makefile.am	2012-05-30 22:15:30.000000000 -0500
+@@ -258,6 +258,8 @@
+ 
+ ICEDTEA_PATCHES = 
+ 
++DISTRIBUTION_PATCHES = patches/lfs-fixed-paths.patch
++
+ # Conditional patches
+ 
+ if WITH_RHINO
+diff -Naur icedtea-2.2-orig/patches/lfs-fixed-paths.patch icedtea-2.2/patches/lfs-fixed-paths.patch
+--- icedtea-2.2-orig/patches/lfs-fixed-paths.patch	1969-12-31 18:00:00.000000000 -0600
++++ icedtea-2.2/patches/lfs-fixed-paths.patch	2012-05-30 22:16:50.000000000 -0500
+@@ -0,0 +1,55 @@
++diff -Nru openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk
++--- openjdk-orig/corba/make/common/shared/Defs-utils.gmk	2010-06-21 16:11:20.000000000 -0500
+++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2011-01-11 01:30:48.000000000 -0600
++@@ -88,12 +88,12 @@
++ EGREP          = $(UTILS_COMMAND_PATH)egrep
++ EXPR           = $(UTILS_USR_BIN_PATH)expr
++ FILE           = $(UTILS_USR_BIN_PATH)file
++-FIND           = $(UTILS_USR_BIN_PATH)find
+++FIND           = $(UTILS_COMMAND_PATH)find
++ FMT            = $(UTILS_COMMAND_PATH)fmt
++ GDB            = $(UTILS_USR_BIN_PATH)gdb
++ GREP           = $(UTILS_COMMAND_PATH)grep
++ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
++-HEAD           = $(UTILS_USR_BIN_PATH)head
+++HEAD           = $(UTILS_COMMAND_PATH)head
++ ID             = $(UTILS_COMMAND_PATH)id
++ ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
++ KSH            = $(UTILS_COMMAND_PATH)ksh
++@@ -125,7 +125,7 @@
++ TAIL           = $(UTILS_USR_BIN_PATH)tail
++ TAR            = $(UTILS_COMMAND_PATH)tar
++ TEST           = $(UTILS_USR_BIN_PATH)test
++-TOUCH          = $(UTILS_COMMAND_PATH)touch
+++TOUCH          = $(UTILS_USR_BIN_PATH)touch
++ TR             = $(UTILS_USR_BIN_PATH)tr
++ TRUE           = $(UTILS_COMMAND_PATH)true
++ UNAME          = $(UTILS_COMMAND_PATH)uname
++--- openjdk-orig/jdk/make/common/shared/Defs-utils.gmk	2012-04-16 02:09:00.000000000 +0000
+++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-04-16 02:10:44.000000000 +0000
++@@ -104,14 +104,14 @@
++ EGREP          = $(UTILS_COMMAND_PATH)egrep
++ EXPR           = $(UTILS_USR_BIN_PATH)expr
++ FILE           = $(UTILS_USR_BIN_PATH)file
++-FIND           = $(UTILS_USR_BIN_PATH)find
+++FIND           = $(UTILS_COMMAND_PATH)find
++ FMT            = $(UTILS_COMMAND_PATH)fmt
++ GDB            = $(UTILS_USR_BIN_PATH)gdb
++ GREP           = $(UTILS_COMMAND_PATH)grep
++ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
++ # GZIP is used for solaris. Linux and windows use tar czf
++ GZIP           = $(UTILS_COMMAND_PATH)gzip
++-HEAD           = $(UTILS_USR_BIN_PATH)head
+++HEAD           = $(UTILS_COMMAND_PATH)head
++ HG             = hg
++ ID             = $(UTILS_COMMAND_PATH)id
++ ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
++@@ -140,7 +140,7 @@
++ TAIL           = $(UTILS_USR_BIN_PATH)tail
++ TAR            = $(UTILS_COMMAND_PATH)tar
++ TEST           = $(UTILS_USR_BIN_PATH)test
++-TOUCH          = $(UTILS_COMMAND_PATH)touch
+++TOUCH          = $(UTILS_USR_BIN_PATH)touch
++ TR             = $(UTILS_USR_BIN_PATH)tr
++ TRUE           = $(UTILS_COMMAND_PATH)true
++ UNAME          = $(UTILS_COMMAND_PATH)uname



More information about the patches mailing list