diff options
| author | Robin Cook | 2012-06-17 07:58:21 -0500 |
|---|---|---|
| committer | Robin Cook | 2012-06-17 07:58:21 -0500 |
| commit | 6886f689ca8679d00bbacf364809f3b776f0e9af (patch) | |
| tree | 5fd6611d256f186285266b946b6af0a65db00515 /java | |
| parent | 47a63034a2636de7d811af44540496b0c391ccfb (diff) | |
icedtea7: new spell - openjdk7
Diffstat (limited to 'java')
26 files changed, 1050 insertions, 0 deletions
diff --git a/java/icedtea7/BUILD b/java/icedtea7/BUILD new file mode 100755 index 0000000000..94549a014e --- /dev/null +++ b/java/icedtea7/BUILD @@ -0,0 +1,13 @@ +export PATH_HOLD="${PATH}" && +export JAVA_HOME="$BUILD_DIRECTORY/icedtea-bin-7.2.2.1" && +export CLASSPATH=".:/usr/share/java" && +export PATH="${PATH}:${JAVA_HOME}/bin" && + +OPTS="$ICEDTEA7_DOCS $ICEDTEA7_OPT $ICEDTEA7_PARA $OPTS" && +OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea-bin-7.2.2.1 $OPTS" && +OPTS="--with-abs-install-dir=${INSTALL_ROOT}/usr/lib/icedtea7-$VERSION $OPTS" && +OPTS="--disable-bootstrap --disable-downloading $OPTS" && + +unset JAVA_HOME && + +default_build diff --git a/java/icedtea7/CONFIGURE b/java/icedtea7/CONFIGURE new file mode 100755 index 0000000000..336fd1640f --- /dev/null +++ b/java/icedtea7/CONFIGURE @@ -0,0 +1,11 @@ +config_query_option ICEDTEA7_DOCS "Generate Documentation?" y \ + "--enable-docs" \ + "--disable-docs" && + +config_query_option ICEDTEA7_OPT "Enable build optimizations?" y \ + "--enable-optimizations" \ + "--disable-optimizations" && + +config_query_option ICEDTEA7_PARA "Use parallel build?" n \ + "--with-parallel-jobs=$MAKE_NJOBS" \ + "--without-parallel-jobs" diff --git a/java/icedtea7/CONFLICTS b/java/icedtea7/CONFLICTS new file mode 100755 index 0000000000..4e23c15e52 --- /dev/null +++ b/java/icedtea7/CONFLICTS @@ -0,0 +1,7 @@ +conflicts j2sdk && +conflicts j2sdk-bin && +conflicts jre1.5-bin && +conflicts jre6-bin && +conflicts jdk1.5-bin && +conflicts jdk6-bin && +conflicts icedtea6 diff --git a/java/icedtea7/DEPENDS b/java/icedtea7/DEPENDS new file mode 100755 index 0000000000..6b1f1522d1 --- /dev/null +++ b/java/icedtea7/DEPENDS @@ -0,0 +1,56 @@ +depends gcc && +depends -sub CXX gcc && +depends lsb-release && +depends pkgconfig && +depends giflib && +depends lcms && +depends libpng && +depends zlib && +depends JPEG && +depends zip && +depends unzip && +depends ca-certificates && +depends ant && +depends perl && +depends libxslt && +depends openssl && +depends attr && +depends cpio && +depends alsa-lib && +depends cups && +depends atk && +depends glib2 && +depends fontconfig && +depends cairo && +depends pango && +depends gdk-pixbuf2 && +depends gtk+2 && +depends libx11 && +depends libxext && +depends libxi && +depends libxrender && +depends libxtst && +depends libxau && +depends libxdmcp && +depends libxp && +depends libxinerama && +depends inputproto && +depends xextproto && +depends xineramaproto && +depends xproto && + +optional_depends rhino \ + "--with-rhino=/usr/lib/java/other/lib/js.jar" \ + "--without-rhino" \ + "Add javascript support?" && + +optional_depends pulseaudio \ + "--enable-pulse-java" \ + "--disable-pulse-java" \ + "Enable pulse-java - an audio mixer spi that uses PulseAudio?" && + +# note this depends on nss 3.12.5 or greater +optional_depends nss \ + "--enable-nss" \ + "--disable-nss" \ + "Enable inclusion of NSS security provider?" diff --git a/java/icedtea7/DETAILS b/java/icedtea7/DETAILS new file mode 100755 index 0000000000..75f10aa79d --- /dev/null +++ b/java/icedtea7/DETAILS @@ -0,0 +1,57 @@ + SPELL=icedtea7 + VERSION=2.2.1 + SOURCE=icedtea-$VERSION.tar.gz + SOURCE2=openjdk.tar.gz + SOURCE3=corba.tar.gz + SOURCE4=hotspot.tar.gz + SOURCE5=jaxp.tar.gz + SOURCE6=jaxws.tar.gz + SOURCE7=jdk.tar.gz + SOURCE8=langtools.tar.gz + SOURCE_DIRECTORY=$BUILD_DIRECTORY/icedtea-$VERSION +case "${SMGL_COMPAT_ARCHS[0]}" in + ia32|32) + SOURCE9=icedtea-bin-core-7.2.2.1-x86.tar.bz2 + ;; + x86-64|64) + if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then + SOURCE9=icedtea-bin-core-7.2.2.1-amd64.tar.bz2 + else + SOURCE9=icedtea-bin-core-7.2.2.1-x86.tar.bz2 + fi + ;; +esac + SOURCE_URL[0]=http://icedtea.classpath.org/download/source + SOURCE2_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/archive + SOURCE3_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba/archive + SOURCE4_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot/archive + SOURCE5_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp/archive + SOURCE6_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws/archive + SOURCE7_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk/archive + SOURCE8_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools/archive + SOURCE9_URL[0]=http://dev.gentoo.org/~caster/distfiles + SOURCE_GPG="gurus.gpg:${SOURCE}.sig" + SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig" + SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig" + SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig" + SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig" + SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig" + SOURCE7_GPG="gurus.gpg:${SOURCE7}.sig" + SOURCE8_GPG="gurus.gpg:${SOURCE8}.sig" + SOURCE9_GPG="gurus.gpg:${SOURCE9}.sig" + LICENSE[0]=GPL + KEYWORDS="JAVA" + WEB_SITE=http://icedtea.classpath.org/wiki/Main_Page + ENTERED=20120617 + SHORT='Harness to build OpenJDK with Free Software build tools' +cat << EOF +The IcedTea project provides a harness to build the source code from +http://openjdk.java.net using Free Software build tools and adds a number of key +features to the upstream OpenJDK codebase: + +A Free 64-bit plugin with LiveConnect and Java Web Start support +(see IcedTea-Web). +Support for additional platforms via a pure interpreted mode in HotSpot (Zero) +or the alternative CACAO virtual machine. Experimental JIT support for Zero is +also available via Shark. +EOF diff --git a/java/icedtea7/DOWNLOAD b/java/icedtea7/DOWNLOAD new file mode 100755 index 0000000000..6656d62714 --- /dev/null +++ b/java/icedtea7/DOWNLOAD @@ -0,0 +1,37 @@ +cd $SOURCE_CACHE && + +if ! test -f $SOURCE ; then + wget $SOURCE_URL/$SOURCE 2>&1 +fi && + +if ! test -f $SOURCE2 ; then + wget $SOURCE2_URL/0b776ef59474.tar.gz --progress=dot -O $SOURCE2 2>&1 +fi && + +if ! test -f $SOURCE3 ; then + wget $SOURCE3_URL/38deb372c569.tar.gz --progress=dot -O $SOURCE3 2>&1 +fi && + +if ! test -f $SOURCE4 ; then + wget $SOURCE4_URL/889dffcf4a54.tar.gz --progress=dot -O $SOURCE4 2>&1 +fi && + +if ! test -f $SOURCE5 ; then + wget $SOURCE5_URL/335fb0b059b7.tar.gz --progress=dot -O $SOURCE5 2>&1 +fi && + +if ! test -f $SOURCE6 ; then + wget $SOURCE6_URL/5471e01ef43b.tar.gz --progress=dot -O $SOURCE6 2>&1 +fi && + +if ! test -f $SOURCE7 ; then + wget $SOURCE7_URL/6c3b742b735d.tar.gz --progress=dot -O $SOURCE7 2>&1 +fi && + +if ! test -f $SOURCE8 ; then + wget $SOURCE8_URL/beea46c7086b.tar.gz --progress=dot -O $SOURCE8 2>&1 +fi && + +if ! test -f $SOURCE9 ; then + wget $SOURCE9_URL/$SOURCE9 2>&1 +fi diff --git a/java/icedtea7/FINAL b/java/icedtea7/FINAL new file mode 100755 index 0000000000..a6034d92a9 --- /dev/null +++ b/java/icedtea7/FINAL @@ -0,0 +1,5 @@ +default_final && +rm -rf $BUILD_DIRECTORY/doc && +rm -rf $BUILD_DIRECTORY/icedtea-bin-7.2.2.1 && +export PATH="$PATH_HOLD" + diff --git a/java/icedtea7/HISTORY b/java/icedtea7/HISTORY new file mode 100644 index 0000000000..c2e495bfee --- /dev/null +++ b/java/icedtea7/HISTORY @@ -0,0 +1,3 @@ +2012-06-17 Robin Cook <rcook@wyrms.net> + * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, DOWNLOAD, + FINAL, HISTORY, INSTALL, PRE_BUILD, PROVIDES diff --git a/java/icedtea7/INSTALL b/java/icedtea7/INSTALL new file mode 100755 index 0000000000..537a053b17 --- /dev/null +++ b/java/icedtea7/INSTALL @@ -0,0 +1,10 @@ +cp -R openjdk.build/j2sdk-image ${INSTALL_ROOT}/usr/lib/icedtea7-${VERSION} && +chown -R root:root ${INSTALL_ROOT}/usr/lib/icedtea7-${VERSION} && +mkdir -p ${INSTALL_ROOT}/etc/profile.d/ && +install -m 0644 $SCRIPT_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ && +cd ${INSTALL_ROOT}/usr/lib && +ln -sfn icedtea7-${VERSION}/ j2sdk && +ln -sfn icedtea7-${VERSION}/ java7 && +cd $SOURCE_DIRCETORY + + diff --git a/java/icedtea7/PRE_BUILD b/java/icedtea7/PRE_BUILD new file mode 100755 index 0000000000..bd2dc28b00 --- /dev/null +++ b/java/icedtea7/PRE_BUILD @@ -0,0 +1,28 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +verify_file 2 && +cp $SOURCE_CACHE/$SOURCE2 ./ && +verify_file 3 && +cp $SOURCE_CACHE/$SOURCE3 ./ && +verify_file 4 && +cp $SOURCE_CACHE/$SOURCE4 ./ && +verify_file 5 && +cp $SOURCE_CACHE/$SOURCE5 ./ && +verify_file 6 && +cp $SOURCE_CACHE/$SOURCE6 ./ && +verify_file 7 && +cp $SOURCE_CACHE/$SOURCE7 ./ && +verify_file 8 && +cp $SOURCE_CACHE/$SOURCE8 ./ && + +cd $SOURCE_DIRECTORY +patch -p1 < $SPELL_DIRECTORY/icedtea-2.2.1-add_cacerts-1.patch && +patch -p1 < $SPELL_DIRECTORY/icedtea-7.2.2-no_suffix.patch && +autoreconf && +patch -p1 < $SPELL_DIRECTORY/icedtea7-2.2.1-fixed_paths.patch && + +cd $BUILD_DIRECTORY && +verify_file 9 && +tar xjf $SOURCE_CACHE/$SOURCE9 && +cd $SOURCE_DIRECTORY + diff --git a/java/icedtea7/PROVIDES b/java/icedtea7/PROVIDES new file mode 100755 index 0000000000..1454ba3cbf --- /dev/null +++ b/java/icedtea7/PROVIDES @@ -0,0 +1,6 @@ +JAVA +JAVA6 +JAVA7 +JDK5 +JDK + diff --git a/java/icedtea7/corba.tar.gz.sig b/java/icedtea7/corba.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..99d65a5da4 --- /dev/null +++ b/java/icedtea7/corba.tar.gz.sig diff --git a/java/icedtea7/hotspot.tar.gz.sig b/java/icedtea7/hotspot.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..4bb30e4078 --- /dev/null +++ b/java/icedtea7/hotspot.tar.gz.sig diff --git a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch b/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch new file mode 100644 index 0000000000..440e32ed60 --- /dev/null +++ b/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch @@ -0,0 +1,543 @@ +diff -Nuarp icedtea-2.2-orig/acinclude.m4 icedtea-2.2/acinclude.m4 +--- icedtea-2.2-orig/acinclude.m4 2012-05-30 22:11:30.000000000 -0500 ++++ icedtea-2.2/acinclude.m4 2012-05-30 21:53:36.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 -Nuarp icedtea-2.2-orig/configure.ac icedtea-2.2/configure.ac +--- icedtea-2.2-orig/configure.ac 2012-05-30 22:11:30.000000000 -0500 ++++ icedtea-2.2/configure.ac 2012-05-30 21:53:36.000000000 -0500 +@@ -84,6 +84,13 @@ 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 -Nuarp icedtea-2.2-orig/Makefile.am icedtea-2.2/Makefile.am +--- icedtea-2.2-orig/Makefile.am 2012-05-30 22:11:35.000000000 -0500 ++++ icedtea-2.2/Makefile.am 2012-05-30 22:10:09.000000000 -0500 +@@ -746,7 +746,8 @@ clean-local: clean-tests clean-pulse-jav + 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-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 +@@ -776,7 +777,7 @@ install: + jtregcheck clean-remove-intree-libraries \ + clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \ + clean-extract-hotspot clean-sanitise-openjdk \ +- clean-tests clean-tapset-report ++ clean-tests clean-tapset-report clean-cacerts clean-cacerts-debug + + env: + @echo 'unset JAVA_HOME' +@@ -1703,6 +1704,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 $@ +@@ -1769,6 +1777,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 +@@ -1857,6 +1872,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 +@@ -2379,6 +2457,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 -Nuarp icedtea-2.2-orig/scripts/mkcacerts.sh icedtea-2.2/scripts/mkcacerts.sh +--- icedtea-2.2-orig/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000 -0600 ++++ icedtea-2.2/scripts/mkcacerts.sh 2012-05-30 21:53:36.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 ++ + diff --git a/java/icedtea7/icedtea-2.2.1.tar.gz.sig b/java/icedtea7/icedtea-2.2.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..4f02dfff73 --- /dev/null +++ b/java/icedtea7/icedtea-2.2.1.tar.gz.sig diff --git a/java/icedtea7/icedtea-7.2.2-no_suffix.patch b/java/icedtea7/icedtea-7.2.2-no_suffix.patch new file mode 100644 index 0000000000..8331b4f51a --- /dev/null +++ b/java/icedtea7/icedtea-7.2.2-no_suffix.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Andrew John Hughes <ahughes@redhat.com> +# Date 1338297380 -3600 +# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb +# Parent 2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d +Don't add a suffix for building the default, IcedTea. + +2012-05-25 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (versioning): Don't add a suffix if building + the default project, 'icedtea'. + +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -1435,7 +1435,7 @@ + echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \ + >>openjdk/jdk/make/common/shared/Defs.gmk ; + endif +- if test x"$(PROJECT_NAME)" != "xjdk7"; then \ ++ if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \ + proj_suffix="-$(PROJECT_NAME)"; \ + fi ; \ + if test x"$(VERSION_SUFFIX)" != "x"; then \ + diff --git a/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig b/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..95f57084a9 --- /dev/null +++ b/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig diff --git a/java/icedtea7/icedtea.gpg b/java/icedtea7/icedtea.gpg Binary files differnew file mode 100644 index 0000000000..c757d9d787 --- /dev/null +++ b/java/icedtea7/icedtea.gpg diff --git a/java/icedtea7/icedtea7-2.1-fixed_paths.patch b/java/icedtea7/icedtea7-2.1-fixed_paths.patch new file mode 100644 index 0000000000..887c33b453 --- /dev/null +++ b/java/icedtea7/icedtea7-2.1-fixed_paths.patch @@ -0,0 +1,128 @@ +diff -urN icedtea-2.1/Makefile.am icedtea-mod/Makefile.am +--- icedtea-2.1/Makefile.am 2012-02-15 05:31:02.313600639 -0600 ++++ icedtea-mod/Makefile.am 2012-02-24 22:55:28.648066501 -0600 +@@ -235,7 +235,8 @@ + + # Patch list + +-ICEDTEA_PATCHES = ++ICEDTEA_PATCHES = \ ++ patches/openjdk-smgl-paths.patch + + # Conditional patches + +diff -urN icedtea-2.1/patches/openjdk-smgl-paths.patch icedtea-mod/patches/openjdk-smgl-paths.patch +--- icedtea-2.1/patches/openjdk-smgl-paths.patch 1969-12-31 18:00:00.000000000 -0600 ++++ icedtea-mod/patches/openjdk-smgl-paths.patch 2012-02-24 22:42:53.452019788 -0600 +@@ -0,0 +1,111 @@ ++diff -ur openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba-mod/make/common/shared/Defs-utils.gmk ++--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2012-02-15 02:26:34.000000000 -0600 +++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2012-02-24 22:20:19.380936091 -0600 ++@@ -85,15 +85,15 @@ ++ DIFF = $(UTILS_USR_BIN_PATH)diff ++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname ++ ECHO = $(UTILS_COMMAND_PATH)echo ++-EGREP = $(UTILS_COMMAND_PATH)egrep +++EGREP = $(UTILS_USR_BIN_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++ FIND = $(UTILS_USR_BIN_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++-GREP = $(UTILS_COMMAND_PATH)grep +++GREP = $(UTILS_USR_BIN_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 ++@@ -121,9 +121,9 @@ ++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev ++ SORT = $(UTILS_COMMAND_PATH)sort ++ STRIP = $(UTILS_CCS_BIN_PATH)strip ++-TAIL = $(UTILS_USR_BIN_PATH)tail +++TAIL = $(UTILS_COMMAND_PATH)tail ++ TAR = $(UTILS_COMMAND_PATH)tar ++-TEST = $(UTILS_USR_BIN_PATH)test +++TEST = $(UTILS_COMMAND_PATH)test ++ TOUCH = $(UTILS_COMMAND_PATH)touch ++ TR = $(UTILS_USR_BIN_PATH)tr ++ TRUE = $(UTILS_COMMAND_PATH)true ++@@ -131,7 +131,7 @@ ++ UNIQ = $(UTILS_USR_BIN_PATH)uniq ++ UNZIP = $(UTILS_USR_BIN_PATH)unzip ++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx ++-WC = $(UTILS_USR_BIN_PATH)wc +++WC = $(UTILS_COMMAND_PATH)wc ++ WHICH = $(UTILS_USR_BIN_PATH)which ++ YACC = $(UTILS_CCS_BIN_PATH)yacc ++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip ++diff -ur openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot-mod/make/linux/makefiles/sa.make ++--- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2012-02-15 02:26:53.000000000 -0600 +++++ openjdk/hotspot/make/linux/makefiles/sa.make 2012-02-24 22:23:28.397947770 -0600 ++@@ -45,8 +45,8 @@ ++ ++ # gnumake 3.78.1 does not accept the *s that ++ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them ++-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) ++-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) +++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) +++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) ++ ++ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list ++ AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list ++diff -ur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk ++--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 02:26:50.000000000 -0600 +++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-24 22:29:40.256970757 -0600 ++@@ -101,17 +101,17 @@ ++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname ++ DUMP = $(UTILS_CCS_BIN_PATH)dump ++ ECHO = $(UTILS_COMMAND_PATH)echo ++-EGREP = $(UTILS_COMMAND_PATH)egrep +++EGREP = $(UTILS_USR_BIN_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++ FIND = $(UTILS_USR_BIN_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++-GREP = $(UTILS_COMMAND_PATH)grep +++GREP = $(UTILS_USR_BIN_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 ++@@ -137,9 +137,9 @@ ++ SH = $(UTILS_COMMAND_PATH)sh ++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev ++ SORT = $(UTILS_COMMAND_PATH)sort ++-TAIL = $(UTILS_USR_BIN_PATH)tail +++TAIL = $(UTILS_COMMAND_PATH)tail ++ TAR = $(UTILS_COMMAND_PATH)tar ++-TEST = $(UTILS_USR_BIN_PATH)test +++TEST = $(UTILS_COMMAND_PATH)test ++ TOUCH = $(UTILS_COMMAND_PATH)touch ++ TR = $(UTILS_USR_BIN_PATH)tr ++ TRUE = $(UTILS_COMMAND_PATH)true ++@@ -148,7 +148,7 @@ ++ UNZIP = $(UTILS_USR_BIN_PATH)unzip ++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx ++ XARGS = $(UTILS_USR_BIN_PATH)xargs ++-WC = $(UTILS_USR_BIN_PATH)wc +++WC = $(UTILS_COMMAND_PATH)wc ++ WHICH = $(UTILS_USR_BIN_PATH)which ++ YACC = $(UTILS_CCS_BIN_PATH)yacc ++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip ++@@ -195,7 +195,7 @@ ++ # others have it in /usr/bin. ++ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ ++ $(wildcard $(UTILS_USR_BIN_PATH)sort)) ++- NAWK = $(USRBIN_PATH)gawk +++ NAWK = $(UNIXCOMMAND_PATH)gawk ++ # Intrinsic unix command, with backslash-escaped character interpretation ++ ECHO = /bin/echo -e ++ # These are really in UTILS_USR_BIN_PATH on Linux diff --git a/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch b/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch new file mode 100644 index 0000000000..c2d98d2254 --- /dev/null +++ b/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch @@ -0,0 +1,114 @@ +diff -urN icedtea-2.2.1/Makefile.am icedtea-mod/Makefile.am +--- icedtea-2.2.1/Makefile.am 2012-06-16 21:28:55.521850613 -0500 ++++ icedtea-mod/Makefile.am 2012-06-16 21:44:32.499840110 -0500 +@@ -235,7 +235,8 @@ + + # Patch list + +-ICEDTEA_PATCHES = ++ICEDTEA_PATCHES = \ ++ patches/openjdk-smgl-paths.patch + + # Conditional patches + +diff -urN icedtea-2.2.1/patches/openjdk-smgl-paths.patch icedtea-mod/patches/openjdk-smgl-paths.patch +--- icedtea-2.2.1/patches/openjdk-smgl-paths.patch 1969-12-31 18:00:00.000000000 -0600 ++++ icedtea-mod/patches/openjdk-smgl-paths.patch 2012-06-16 21:43:04.238841099 -0500 +@@ -0,0 +1,97 @@ ++diff -ur 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 2012-06-16 21:31:20.103848993 -0500 +++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2012-06-16 21:35:09.405846422 -0500 ++@@ -92,15 +92,15 @@ ++ DIFF = $(UTILS_USR_BIN_PATH)diff ++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname ++ ECHO = $(UTILS_COMMAND_PATH)echo ++-EGREP = $(UTILS_COMMAND_PATH)egrep +++EGREP = $(UTILS_USR_BIN_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++ FIND = $(UTILS_USR_BIN_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++-GREP = $(UTILS_COMMAND_PATH)grep +++GREP = $(UTILS_USR_BIN_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 ++@@ -128,9 +128,9 @@ ++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev ++ SORT = $(UTILS_COMMAND_PATH)sort ++ STRIP = $(UTILS_CCS_BIN_PATH)strip ++-TAIL = $(UTILS_USR_BIN_PATH)tail +++TAIL = $(UTILS_COMMAND_PATH)tail ++ TAR = $(UTILS_COMMAND_PATH)tar ++-TEST = $(UTILS_USR_BIN_PATH)test +++TEST = $(UTILS_COMMAND_PATH)test ++ TOUCH = $(UTILS_COMMAND_PATH)touch ++ TR = $(UTILS_USR_BIN_PATH)tr ++ TRUE = $(UTILS_COMMAND_PATH)true ++@@ -138,7 +138,7 @@ ++ UNIQ = $(UTILS_USR_BIN_PATH)uniq ++ UNZIP = $(UTILS_USR_BIN_PATH)unzip ++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx ++-WC = $(UTILS_USR_BIN_PATH)wc +++WC = $(UTILS_COMMAND_PATH)wc ++ WHICH = $(UTILS_USR_BIN_PATH)which ++ YACC = $(UTILS_CCS_BIN_PATH)yacc ++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip ++diff -ur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk ++--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2012-06-16 21:31:18.773849007 -0500 +++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-06-16 21:39:14.804843671 -0500 ++@@ -108,17 +108,17 @@ ++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname ++ DUMP = $(UTILS_CCS_BIN_PATH)dump ++ ECHO = $(UTILS_COMMAND_PATH)echo ++-EGREP = $(UTILS_COMMAND_PATH)egrep +++EGREP = $(UTILS_USR_BIN_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++ FIND = $(UTILS_USR_BIN_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++-GREP = $(UTILS_COMMAND_PATH)grep +++GREP = $(UTILS_USR_BIN_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 ++@@ -145,9 +145,9 @@ ++ SH = $(UTILS_COMMAND_PATH)sh ++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev ++ SORT = $(UTILS_COMMAND_PATH)sort ++-TAIL = $(UTILS_USR_BIN_PATH)tail +++TAIL = $(UTILS_COMMAND_PATH)tail ++ TAR = $(UTILS_COMMAND_PATH)tar ++-TEST = $(UTILS_USR_BIN_PATH)test +++TEST = $(UTILS_COMMAND_PATH)test ++ TOUCH = $(UTILS_COMMAND_PATH)touch ++ TR = $(UTILS_USR_BIN_PATH)tr ++ TRUE = $(UTILS_COMMAND_PATH)true ++@@ -156,7 +156,7 @@ ++ UNZIP = $(UTILS_USR_BIN_PATH)unzip ++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx ++ XARGS = $(UTILS_USR_BIN_PATH)xargs ++-WC = $(UTILS_USR_BIN_PATH)wc +++WC = $(UTILS_COMMAND_PATH)wc ++ WHICH = $(UTILS_USR_BIN_PATH)which ++ YACC = $(UTILS_CCS_BIN_PATH)yacc ++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip ++@@ -203,7 +203,7 @@ ++ # others have it in /usr/bin. ++ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ ++ $(wildcard $(UTILS_USR_BIN_PATH)sort)) ++- NAWK = $(USRBIN_PATH)gawk +++ NAWK = $(UNIXCOMMAND_PATH)gawk ++ # Intrinsic unix command, with backslash-escaped character interpretation ++ ECHO = /bin/echo -e ++ # These are really in UTILS_USR_BIN_PATH on Linux diff --git a/java/icedtea7/java.sh b/java/icedtea7/java.sh new file mode 100644 index 0000000000..709155856a --- /dev/null +++ b/java/icedtea7/java.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# +JAVA_HOME=/usr/lib/j2sdk + +export JAVA_HOME +export PATH=$PATH:$JAVA_HOME/bin diff --git a/java/icedtea7/jaxp.tar.gz.sig b/java/icedtea7/jaxp.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..411d198341 --- /dev/null +++ b/java/icedtea7/jaxp.tar.gz.sig diff --git a/java/icedtea7/jaxws.tar.gz.sig b/java/icedtea7/jaxws.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..467651057e --- /dev/null +++ b/java/icedtea7/jaxws.tar.gz.sig diff --git a/java/icedtea7/jdk.tar.gz.sig b/java/icedtea7/jdk.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..7605238b70 --- /dev/null +++ b/java/icedtea7/jdk.tar.gz.sig diff --git a/java/icedtea7/langtools.tar.gz.sig b/java/icedtea7/langtools.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..98bf8d193e --- /dev/null +++ b/java/icedtea7/langtools.tar.gz.sig diff --git a/java/icedtea7/openjdk.tar.gz.sig b/java/icedtea7/openjdk.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..bd0158ede3 --- /dev/null +++ b/java/icedtea7/openjdk.tar.gz.sig |