Author: dj
Date: 2012-04-19 17:58:28 -0600 (Thu, 19 Apr 2012)
New Revision: 2420
Added:
trunk/icedtea/
trunk/icedtea/icedtea-2.1-add_cacerts-1.patch
trunk/icedtea/icedtea-2.1-fixed_paths-1.patch
Log:
Added icedtea-2.1 patches.
Added: trunk/icedtea/icedtea-2.1-add_cacerts-1.patch
===================================================================
--- trunk/icedtea/icedtea-2.1-add_cacerts-1.patch
(rev 0)
+++ trunk/icedtea/icedtea-2.1-add_cacerts-1.patch 2012-04-19 23:58:28 UTC
(rev 2420)
@@ -0,0 +1,723 @@
+Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
+Date: 2012-04-19
+Initial Package Version: 2.1
+Upstream Status: Submitted
+Origin: Self
+Description: Allows the build to generate a valid JDK cacerts file using the
+ system installed CA certificates.
+
+diff -Naurp icedtea-2.1-orig/acinclude.m4 icedtea-2.1/acinclude.m4
+--- icedtea-2.1-orig/acinclude.m4 2012-02-14 04:43:32.000000000 -0600
++++ icedtea-2.1/acinclude.m4 2012-04-19 18:55:43.000000000 -0500
+@@ -302,6 +302,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.1-orig/configure.ac icedtea-2.1/configure.ac
+--- icedtea-2.1-orig/configure.ac 2012-02-15 04:49:51.000000000 -0600
++++ icedtea-2.1/configure.ac 2012-04-19 18:55:43.000000000 -0500
+@@ -84,6 +84,14 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test
+ AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
+
+ 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.1-orig/Makefile.am icedtea-2.1/Makefile.am
+--- icedtea-2.1-orig/Makefile.am 2012-04-16 01:09:23.000000000 -0500
++++ icedtea-2.1/Makefile.am 2012-04-19 18:55:47.000000000 -0500
+@@ -731,10 +731,12 @@ check-local: jtregcheck
+ clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+- clean-bootstrap-directory-symlink-stage1
clean-bootstrap-directory-symlink-stage2 \
+- clean-extract clean-generated clean-native-ecj clean-hgforest
clean-icedtea-stage2 \
+- 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-bootstrap-directory-symlink-stage1 \
++ clean-bootstrap-directory-symlink-stage2 \
++ clean-extract clean-generated clean-native-ecj clean-hgforest \
++ clean-icedtea-stage2 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-cacerts clean-cacerts-debug
+ if [ -e bootstrap ]; then \
+ rmdir bootstrap ; \
+ fi
+@@ -755,15 +757,17 @@ distclean-local: clean-local clean-downl
+ install:
+
+ .PHONY: \
+- env env-boot snapshot clean-clone clean-patch \
+- clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
+- clean-bootstrap-directory-symlink-stage2
clean-bootstrap-directory-stage1 \
++ env env-boot snapshot clean-clone clean-patch clean-clone-boot \
++ clean-patch-boot clean-bootstrap-directory-stage2 \
++ clean-bootstrap-directory-symlink-stage2 \
++ clean-bootstrap-directory-stage1 \
+ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
+ clean-icedtea icedtea-stage2 clean-icedtea-boot \
+ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
+- jtregcheck clean-remove-intree-libraries \
+- clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
+- clean-extract-hotspot clean-sanitise-openjdk
++ jtregcheck clean-remove-intree-libraries clean-jamvm \
++ clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
++ clean-extract-hotspot clean-sanitise-openjdk clean-cacerts \
++ clean-cacerts-debug
+
+ env:
+ @echo 'unset JAVA_HOME'
+@@ -1662,6 +1666,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 $@
+@@ -1727,6 +1738,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
+@@ -1814,6 +1832,69 @@ stamps/icedtea-stage1.stamp: stamps/iced
+ clean-icedtea-stage1:
+ rm -f stamps/icedtea-stage1.stamp
+
++# 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
+@@ -2316,6 +2397,10 @@ clean-rt:
+ # Target Aliases
+ # ===============
+
++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.1-orig/Makefile.in icedtea-2.1/Makefile.in
+--- icedtea-2.1-orig/Makefile.in 2012-02-15 05:33:14.000000000 -0600
++++ icedtea-2.1/Makefile.in 2012-04-19 18:55:43.000000000 -0500
+@@ -205,6 +205,9 @@ AWK = @AWK@
+ BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+ BUILD_OS_DIR = @BUILD_OS_DIR@
+ CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
++CACERTS_FILE = @CACERTS_FILE@
++CADIR = @CADIR@
++CAFILE = @CAFILE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -309,6 +312,7 @@ NSS_LIBS = @NSS_LIBS@
+ OBJEXT = @OBJEXT@
+ OPENJDK_BUILD_DIR = @OPENJDK_BUILD_DIR@
+ OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
++OPENSSL = @OPENSSL@
+ OS_PATH = @OS_PATH@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -587,6 +591,7 @@ REWRITER_SRCS = $(top_srcdir)/rewriter/c
+ ICEDTEA_PATCHES = $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4) $(am__append_5) $(am__append_6) \
+ $(am__append_7) $(am__append_8) $(DISTRIBUTION_PATCHES)
++DISTRIBUTION_PATCHES = patches/lfs-fixed-paths.patch
+
+ # Bootstrapping patches
+ ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
+@@ -1240,10 +1245,12 @@ check-local: jtregcheck
+ clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+- clean-bootstrap-directory-symlink-stage1
clean-bootstrap-directory-symlink-stage2 \
+- clean-extract clean-generated clean-native-ecj clean-hgforest
clean-icedtea-stage2 \
+- 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-bootstrap-directory-symlink-stage1 \
++ clean-bootstrap-directory-symlink-stage2 \
++ clean-extract clean-generated clean-native-ecj clean-hgforest \
++ clean-icedtea-stage2 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-cacerts clean-cacerts-debug
+ if [ -e bootstrap ]; then \
+ rmdir bootstrap ; \
+ fi
+@@ -1264,15 +1271,17 @@ distclean-local: clean-local clean-downl
+ install:
+
+ .PHONY: \
+- env env-boot snapshot clean-clone clean-patch \
+- clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
+- clean-bootstrap-directory-symlink-stage2
clean-bootstrap-directory-stage1 \
++ env env-boot snapshot clean-clone clean-patch clean-clone-boot \
++ clean-patch-boot clean-bootstrap-directory-stage2 \
++ clean-bootstrap-directory-symlink-stage2 \
++ clean-bootstrap-directory-stage1 \
+ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
+ clean-icedtea icedtea-stage2 clean-icedtea-boot \
+ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
+- jtregcheck clean-remove-intree-libraries \
+- clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
+- clean-extract-hotspot clean-sanitise-openjdk
++ jtregcheck clean-remove-intree-libraries clean-jamvm \
++ clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
++ clean-extract-hotspot clean-sanitise-openjdk clean-cacerts \
++ clean-cacerts-debug
+
+ env:
+ @echo 'unset JAVA_HOME'
+@@ -2043,7 +2052,7 @@ clean-bootstrap-directory-symlink-stage2
+ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
+ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
+ stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
+- stamps/jamvm.stamp
++ stamps/jamvm.stamp stamps/add-cacerts.stamp
+ $(ARCH_PREFIX) $(MAKE) \
+ $(ICEDTEA_ENV) \
+ -C openjdk/ \
+@@ -2094,7 +2103,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
+ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
+ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
+ stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
+- stamps/jamvm.stamp
++ stamps/jamvm.stamp stamps/add-cacerts-debug.stamp
+ $(ARCH_PREFIX) $(MAKE) \
+ $(ICEDTEA_ENV) \
+ -C openjdk/ \
+@@ -2219,6 +2228,61 @@ stamps/icedtea-stage1.stamp: stamps/iced
+ clean-icedtea-stage1:
+ rm -f stamps/icedtea-stage1.stamp
+
++# CA Certs
++stamps/generate-cacerts.stamp: stamps/icedtea.stamp
++@GENERATE_CACERTS_TRUE@ if test -n "${CADIR}"; then \
++@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -d "${CADIR}" \
++@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++@GENERATE_CACERTS_TRUE@ -s $(OPENSSL) \
++@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ else
++@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++@GENERATE_CACERTS_TRUE@ -s $(OPENSSL) \
++@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ fi
++ touch stamps/generate-cacerts.stamp
++
++stamps/add-cacerts.stamp: stamps/generate-cacerts.stamp
++@CACERTS_FILE_SET_TRUE@ cp $(CACERTS_FILE)
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++ 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: stamps/icedtea-debug.stamp
++@GENERATE_CACERTS_TRUE@ if test -n "${CADIR}"; then \
++@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -d "${CADIR}" \
++@GENERATE_CACERTS_TRUE@ -k
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++@GENERATE_CACERTS_TRUE@ -s $(OPENSSL) \
++@GENERATE_CACERTS_TRUE@ -o
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ else
++@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++@GENERATE_CACERTS_TRUE@ -k
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++@GENERATE_CACERTS_TRUE@ -s $(OPENSSL) \
++@GENERATE_CACERTS_TRUE@ -o
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ fi
++ touch stamps/generate-cacerts-debug.stamp
++
++stamps/add-cacerts-debug.stamp: stamps/generate-cacerts-debug.stamp
++@CACERTS_FILE_SET_TRUE@ cp $(CACERTS_FILE)
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts
++ 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)
+
+diff -Naurp icedtea-2.1-orig/scripts/mkcacerts.sh
icedtea-2.1/scripts/mkcacerts.sh
+--- icedtea-2.1-orig/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
++++ icedtea-2.1/scripts/mkcacerts.sh 2012-04-19 18:55:51.000000000 -0500
+@@ -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.1-fixed_paths-1.patch
===================================================================
--- trunk/icedtea/icedtea-2.1-fixed_paths-1.patch
(rev 0)
+++ trunk/icedtea/icedtea-2.1-fixed_paths-1.patch 2012-04-19 23:58:28 UTC
(rev 2420)
@@ -0,0 +1,79 @@
+Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
+Date: 2012-04-18
+Initial Package Version: 1.9
+Upstream Status: Not applicable
+Origin: http://icedtea.classpath.org/hg/icedtea6/
+Description: Includes various fixes from upstream to allow a for a proper
+ bootstrap build.
+
+diff -Naurp icedtea-2.1-orig/Makefile.am icedtea-2.1/Makefile.am
+--- icedtea-2.1-orig/Makefile.am 2012-02-15 11:31:02.000000000 +0000
++++ icedtea-2.1/Makefile.am 2012-04-16 05:58:26.000000000 +0000
+@@ -277,6 +277,8 @@ else
+ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+
++DISTRIBUTION_PATCHES = patches/lfs-fixed-paths.patch
++
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+
+ # Bootstrapping patches
+diff -Naurp icedtea-2.1-orig/patches/lfs-fixed-paths.patch
icedtea-2.1/patches/lfs-fixed-paths.patch
+--- icedtea-2.1-orig/patches/lfs-fixed-paths.patch 1970-01-01
00:00:00.000000000 +0000
++++ icedtea-2.1/patches/lfs-fixed-paths.patch 2012-04-16 05:56:32.000000000
+0000
+@@ -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
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
