sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Robin Cook (50ca3cae10e1dbba15db18c0827c97b3ff714f50)
- From: Robin Cook <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (50ca3cae10e1dbba15db18c0827c97b3ff714f50)
- Date: Wed, 7 Dec 2011 18:11:28 -0600
GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:
ChangeLog | 8
http/npapi-sdk/DETAILS | 21
http/npapi-sdk/HISTORY | 2
http/npapi-sdk/PREPARE | 2
http/npapi-sdk/PRE_BUILD | 3
java/icedtea-web/BUILD | 8
java/icedtea-web/CONFIGURE | 6
java/icedtea-web/DEPENDS | 15
java/icedtea-web/DETAILS | 16
java/icedtea-web/HISTORY | 2
java/icedtea-web/INSTALL | 3
java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig |binary
java/icedtea6/BUILD | 12
java/icedtea6/CONFIGURE | 11
java/icedtea6/CONFLICTS | 6
java/icedtea6/DEPENDS | 44 +
java/icedtea6/DETAILS | 69 ++
java/icedtea6/FINAL | 5
java/icedtea6/INSTALL | 10
java/icedtea6/PREPARE | 3
java/icedtea6/PRE_BUILD | 29
java/icedtea6/PROVIDES | 5
java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch | 230 ++++++
java/icedtea6/icedtea.gpg |binary
java/icedtea6/icedtea6-1.10.4-fixed_paths.patch | 147 ++++
java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch | 397
++++++++++++
java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig |binary
java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig |binary
java/icedtea6/icedtea6-hg-fixed_paths.patch | 133 ++++
java/icedtea6/icedtea6-hg-generate_cacerts-1.patch | 331 ++++++++++
java/icedtea6/java.sh | 6
java/icedtea6/jaxp144_01.zip.sig |binary
java/icedtea6/jaxp144_03.zip.sig |binary
java/icedtea6/jdk6-jaf-b20.zip.sig |binary
java/icedtea6/jdk6-jaxws-b20.zip.sig |binary
java/icedtea6/jdk6-jaxws2_1_6-2011_06_13.zip.sig |binary
java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig |binary
java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig |binary
java/rhino/BUILD | 6
java/rhino/DEPENDS | 2
java/rhino/DETAILS | 16
java/rhino/HISTORY | 2
java/rhino/INSTALL | 5
java/rhino/PRE_BUILD | 5
java/rhino/rhino-xbean-fix.patch | 24
java/rhino/rhino1_7R3.zip.sig |binary
xorg-lib/libxp/DEPENDS | 8
xorg-lib/libxp/DETAILS | 15
xorg-lib/libxp/HISTORY | 45 +
xorg-lib/libxp/PRE_BUILD | 4
xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig |binary
xorg-proto/printproto/DEPENDS | 2
xorg-proto/printproto/DETAILS | 14
xorg-proto/printproto/HISTORY | 41 +
xorg-proto/printproto/PRE_BUILD | 4
xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig |binary
56 files changed, 1717 insertions(+)
New commits:
commit 50ca3cae10e1dbba15db18c0827c97b3ff714f50
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
icedtea-web: icedtea java browser plugin
Needs more work for browsers other than firefox
commit ceadd0740bfae2a9d03b1530e72f8e56b335a9f9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
npapi-sdk: New spell, headers need to build firefox plugins
commit 34991b7d2ef532ea5f6c3868ea0c7abd687f6929
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
icedtea6: New Spell, OpenJDK build using autotools
commit bfebc77766a64f0cb11fb948a9c30c2aa9a3c0a9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
rhino: new spell, javascript implemented in java
commit 869224d8c830f975c561d10bc27d6e79a49503c5
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
libxp: adding back as needed to build openjdk
commit e9876ffda1f631bcfa99631e94fc3458faf12625
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
printproto: adding back to grimoire as needed by openjdk
diff --git a/ChangeLog b/ChangeLog
index 4f05c8b..d37f71e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-07 Robin Cook <rcook AT wyrms.net>
+ * xorg-proto/printproto: added back as needed to build openjdk
+ * xorg-lib/libxp: added back as needed to build openjdk
+ * java/rhino: New Spell, javascript implemented in java
+ * java/icedtea6: New Spell, openjdk build using autotools
+ * http/npapi-sdk: New Spell, Headers neede to build firefox plugins
+ * java/icedtea-web: New Spell, icedtea java browser plugin
+
2011-11-27 Ladislav Hagara <hgr AT vabo.cz>
* libs/json-c: new spell, JSON implementation in C
diff --git a/http/npapi-sdk/DETAILS b/http/npapi-sdk/DETAILS
new file mode 100755
index 0000000..581cd6e
--- /dev/null
+++ b/http/npapi-sdk/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=npapi-sdk
+ if [[ "$NSAPISDK_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/mgorny/npapi-sdk.git:$SPELL-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD="on"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ LICENSE[0]=BSD
+ WEB_SITE=https://code.google.com/p/npapi-sdk/
+ KEYWORDS="http plugin"
+ ENTERED=20111118
+ SHORT="reference NPAPI headers"
+cat << EOF
+Set of reference NPAPI headers which all browser and plugin projects can
use.
+Additionally it will contain utility code and sample code to make life
easier
+for NPAPI developers.
+EOF
diff --git a/http/npapi-sdk/HISTORY b/http/npapi-sdk/HISTORY
new file mode 100644
index 0000000..903441f
--- /dev/null
+++ b/http/npapi-sdk/HISTORY
@@ -0,0 +1,2 @@
+2011-11-18 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, PREPARE, PRE_BUILD
diff --git a/http/npapi-sdk/PREPARE b/http/npapi-sdk/PREPARE
new file mode 100755
index 0000000..85c2674
--- /dev/null
+++ b/http/npapi-sdk/PREPARE
@@ -0,0 +1,2 @@
+config_query NSAPI_SDK_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
diff --git a/http/npapi-sdk/PRE_BUILD b/http/npapi-sdk/PRE_BUILD
new file mode 100755
index 0000000..5345e7a
--- /dev/null
+++ b/http/npapi-sdk/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+autoreconf -f -i
diff --git a/java/icedtea-web/BUILD b/java/icedtea-web/BUILD
new file mode 100755
index 0000000..a99682f
--- /dev/null
+++ b/java/icedtea-web/BUILD
@@ -0,0 +1,8 @@
+OPTS="$ICEDTEAWEB_DOCS \
+ $ICEDTEAWEB_PLUGIN \
+ --with-jdk-home=$JAVA_HOME \
+ --with-jar=$JAVA_HOME/bin/jar \
+ --with-javadoc=$JAVA_HOME/bin/javadoc \
+ $OPTS" &&
+
+default_build
diff --git a/java/icedtea-web/CONFIGURE b/java/icedtea-web/CONFIGURE
new file mode 100755
index 0000000..5d76e1d
--- /dev/null
+++ b/java/icedtea-web/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_option ICEDTEAWEB_DOCS "Build Javadoc documentation?" y \
+ "--enable-docs" "--disable-docs" &&
+
+config_query_option ICEDTEAWEB_PLUGIN "Build browser plugin?" y \
+ "--enable-plugin" "--disable-plugin"
+
diff --git a/java/icedtea-web/DEPENDS b/java/icedtea-web/DEPENDS
new file mode 100755
index 0000000..827b66f
--- /dev/null
+++ b/java/icedtea-web/DEPENDS
@@ -0,0 +1,15 @@
+depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends -sub CXX gcc &&
+depends -sub JAVA gcc &&
+depends -sub JAVAHOME gcc &&
+depends icedtea6 &&
+depends libx11 &&
+depends zlib &&
+depends firefox &&
+depends npapi-sdk &&
+
+optional_depends rhino \
+ "--with-rhino=/usr/lib/java/other/lib/js.jar" \
+ "--without-rhino" \
+ "Enable support for proxy auto config files?"
+
diff --git a/java/icedtea-web/DETAILS b/java/icedtea-web/DETAILS
new file mode 100755
index 0000000..e81068a
--- /dev/null
+++ b/java/icedtea-web/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=icedtea-web
+ VERSION=1.1.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ KEYWORDS="java"
+ WEB_SITE=http://icedtea.classpath.org/wiki/IcedTea-Web
+ ENTERED=20111118
+ SHORT='Java browser plugin'
+cat << EOF
+Free Software web browser plugin running applets written in the Java
+programming language and an implementation of Java Web Start, originally
based
+on the NetX project.
+EOF
diff --git a/java/icedtea-web/HISTORY b/java/icedtea-web/HISTORY
new file mode 100644
index 0000000..5cfe68c
--- /dev/null
+++ b/java/icedtea-web/HISTORY
@@ -0,0 +1,2 @@
+2011-11-18 Robin Cook <rcook AT wyrms.net>
+ * NEW SPELL: DETAILS, DEPENDS, CONFIGURE, BUILD, INSTALL
diff --git a/java/icedtea-web/INSTALL b/java/icedtea-web/INSTALL
new file mode 100755
index 0000000..0e13bb5
--- /dev/null
+++ b/java/icedtea-web/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+ln -sfn $INSTALL_ROOT/usr/lib/IcedTeaPlugin.so
$INSTALL_ROOT/usr/lib/firefox/plugins
diff --git a/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
b/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
new file mode 100644
index 0000000..444ad6b
Binary files /dev/null and b/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
differ
diff --git a/java/icedtea6/BUILD b/java/icedtea6/BUILD
new file mode 100755
index 0000000..6d5a5e1
--- /dev/null
+++ b/java/icedtea6/BUILD
@@ -0,0 +1,12 @@
+export PATH_HOLD="${PATH}" &&
+export JAVA_HOME="$BUILD_DIRECTORY/icedtea6-bin-1.10.4" &&
+export CLASSPATH=".:/usr/share/java" &&
+export PATH="${PATH}:${JAVA_HOME}/bin" &&
+
+OPTS="$ICEDTEA6_DOCS $ICEDTEA6_OPT $ICEDTEA6_PARA $OPTS" &&
+OPTS="--with-tzdata-dir=/usr/share/zoneinfo $OPTS" &&
+OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea6-bin-1.10.4 $OPTS" &&
+
+unset JAVA_HOME &&
+
+default_build
diff --git a/java/icedtea6/CONFIGURE b/java/icedtea6/CONFIGURE
new file mode 100755
index 0000000..25110cc
--- /dev/null
+++ b/java/icedtea6/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option ICEDTEA6_DOCS "Generate Documentation?" y \
+ "--enable-docs" \
+ "--disable-docs" &&
+
+config_query_option ICEDTEA6_OPT "Enable build optimizations?" y \
+ "--enable-optimizations" \
+ "--disable-optimizations" &&
+
+config_query_option ICEDTEA6_PARA "Use parallel build?" n \
+ "--with-parallel-jobs" \
+ "--without-parallel-jobs"
diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS
new file mode 100755
index 0000000..0e66666
--- /dev/null
+++ b/java/icedtea6/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin
diff --git a/java/icedtea6/DEPENDS b/java/icedtea6/DEPENDS
new file mode 100755
index 0000000..fe59933
--- /dev/null
+++ b/java/icedtea6/DEPENDS
@@ -0,0 +1,44 @@
+depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends -sub CXX gcc
&&
+depends -sub JAVA gcc
&&
+depends -sub JAVAHOME gcc
&&
+depends lsb-release
&&
+depends pkgconfig
&&
+depends zip
&&
+depends unzip
&&
+depends libxslt
&&
+depends ant "--with-ant-home=/opt/ant"
&&
+depends cups
&&
+depends JPEG
&&
+depends libpng
&&
+depends alsa-lib
&&
+depends xproto
&&
+depends libx11
&&
+depends libxt
&&
+depends libxp
&&
+depends libxinerama
&&
+depends freetype2
&&
+depends gtk+2
&&
+depends ca-certificates "--enable-cacerts"
&&
+
+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?" &&
+
+optional_depends libxrender
\
+ "--enable-xrender"
\
+ "--disable-xrender"
\
+ "Enable inclusion of xrender pipeline?"
&&
+
+optional_depends nss
\
+ "--enable-nss"
\
+ "--disable-nss"
\
+ "Enable inclusion of NSS security provider?"
&&
+
+optional_depends fastjar "" "" "Use fashjar instead of slow jar?"
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
new file mode 100755
index 0000000..18a68c3
--- /dev/null
+++ b/java/icedtea6/DETAILS
@@ -0,0 +1,69 @@
+ SPELL=icedtea6
+if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
+ if [ "$ICEDTEA6_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=hg
+ fi
+ SOURCE=$SPELL-hg.tar.bz2
+ SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
+ SOURCE5=jaxp144_03.zip
+ SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
+FORCE_DOWNLOAD[1]=on
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
+ SOURCE_URL[0]=hg_http://icedtea.classpath.org/hg/$SPELL:$SPELL-hg
+ SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b24/$SOURCE3
+ SOURCE_IGNORE=volatile
+ PATCHLEVEL=1
+else
+ VERSION=1.10.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
+ SOURCE3=openjdk-6-src-b22-28_feb_2011.tar.gz
+ SOURCE5=jaxp144_01.zip
+ SOURCE6=jdk6-jaxws-b20.zip
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_GPG="icedtea.gpg:${SOURCE2}:UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
+ SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
+ SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b22/$SOURCE3
+fi
+ SOURCE4=jdk6-jaf-b20.zip
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
+ SOURCE7=icedtea6-bin-core-1.10.4-amd64.tar.bz2
+ else
+ SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ fi
+ ;;
+esac
+ 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"
+ SOURCE4_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE4
+ SOURCE5_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE5
+ SOURCE6_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE6
+ SOURCE7_URL[0]=http://distfiles.gentoo.org/distfiles/$SOURCE7
+ LICENSE[0]=GPL
+ KEYWORDS="JAVA"
+ WEB_SITE=http://icedtea.classpath.org/wiki/Main_Page
+ ENTERED=20111023
+ 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/icedtea6/FINAL b/java/icedtea6/FINAL
new file mode 100755
index 0000000..1b4e0f1
--- /dev/null
+++ b/java/icedtea6/FINAL
@@ -0,0 +1,5 @@
+default_final &&
+rm -rf $BUILD_DIRECTORY/doc &&
+rm -rf $BUILD_DIRECTORY/icedtea6-bin-1.10.4 &&
+export PATH="$PATH_HOLD"
+
diff --git a/java/icedtea6/INSTALL b/java/icedtea6/INSTALL
new file mode 100755
index 0000000..50fc51e
--- /dev/null
+++ b/java/icedtea6/INSTALL
@@ -0,0 +1,10 @@
+cp -R openjdk.build/j2sdk-image ${INSTALL_ROOT}/usr/lib/icedtea6-${VERSION}
&&
+chown -R root:root ${INSTALL_ROOT}/usr/lib/icedtea6-${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 icedtea6-${VERSION}/ j2sdk
&&
+ln -sfn icedtea6-${VERSION}/ java6
&&
+cd $SOURCE_DIRCETORY
+
+
diff --git a/java/icedtea6/PREPARE b/java/icedtea6/PREPARE
new file mode 100755
index 0000000..83f15d3
--- /dev/null
+++ b/java/icedtea6/PREPARE
@@ -0,0 +1,3 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
+
diff --git a/java/icedtea6/PRE_BUILD b/java/icedtea6/PRE_BUILD
new file mode 100755
index 0000000..609977f
--- /dev/null
+++ b/java/icedtea6/PRE_BUILD
@@ -0,0 +1,29 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+mkdir drops &&
+verify_file 3 &&
+cp $SOURCE_CACHE/$SOURCE3 ./ &&
+verify_file 4 &&
+cp $SOURCE_CACHE/$SOURCE4 ./drops &&
+verify_file 5 &&
+cp $SOURCE_CACHE/$SOURCE5 ./drops &&
+verify_file 6 &&
+cp $SOURCE_CACHE/$SOURCE6 ./drops &&
+
+
+if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-generate_cacerts-1.patch
&&
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-fixed_paths.patch
+else
+ patch -p1 <
$SCRIPT_DIRECTORY/backport-xsltproc-replacement-1.10.4-01.patch &&
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.10.4-generate_cacerts-1.patch
&&
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.10.4-fixed_paths.patch
+fi &&
+
+
+cd $BUILD_DIRECTORY &&
+verify_file 7 &&
+tar xjf $SOURCE_CACHE/$SOURCE7 &&
+cd $SOURCE_DIRECTORY &&
+
+./autogen.sh
diff --git a/java/icedtea6/PROVIDES b/java/icedtea6/PROVIDES
new file mode 100755
index 0000000..0f1a7a4
--- /dev/null
+++ b/java/icedtea6/PROVIDES
@@ -0,0 +1,5 @@
+JAVA
+JAVA6
+JDK5
+JDK
+
diff --git a/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
b/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
new file mode 100644
index 0000000..16bf436
--- /dev/null
+++ b/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
@@ -0,0 +1,230 @@
+diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
+--- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
++++ icedtea6-mod/acinclude.m4 2011-10-27 19:22:33.939728683 -0500
+@@ -630,101 +630,6 @@
+ AC_SUBST(ALT_JAR_CMD)
+ ])
+
+-AC_DEFUN([IT_FIND_XALAN2_JAR],
+-[
+- AC_MSG_CHECKING([for a xalan2 jar])
+- AC_ARG_WITH([xalan2-jar],
+- [AS_HELP_STRING(--with-xalan2-jar,specify location of the
xalan2 jar)],
+- [
+- if test -f "${withval}" ; then
+- XALAN2_JAR="${withval}"
+- fi
+- ],
+- [
+- XALAN2_JAR=
+- ])
+- if test -z "${XALAN2_JAR}"; then
+- if test -e "/usr/share/java/xalan-j2.jar"; then
+- XALAN2_JAR=/usr/share/java/xalan-j2.jar
+- elif test -e "/usr/share/java/xalan2.jar"; then
+- XALAN2_JAR=/usr/share/java/xalan2.jar
+- elif test -e "/usr/share/xalan/lib/xalan.jar"; then
+- XALAN2_JAR=/usr/share/xalan/lib/xalan.jar
+- else
+- AC_MSG_RESULT(no)
+- fi
+- fi
+- if test -z "${XALAN2_JAR}"; then
+- AC_MSG_ERROR("A xalan2 jar was not found.")
+- fi
+- AC_MSG_RESULT(${XALAN2_JAR})
+- AC_SUBST(XALAN2_JAR)
+-])
+-
+-AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR],
+-[
+- AC_MSG_CHECKING([for a xalan2 serializer jar])
+- AC_ARG_WITH([xalan2-serializer-jar],
+- [AS_HELP_STRING(--with-xalan2-serializer-jar,specify location
of the xalan2-serializer jar)],
+- [
+- if test -f "${withval}" ; then
+- XALAN2_SERIALIZER_JAR="${withval}"
+- fi
+- ],
+- [
+- XALAN2_SERIALIZER_JAR=
+- ])
+- if test -z "${XALAN2_SERIALIZER_JAR}"; then
+- if test -e "/usr/share/java/xalan-j2-serializer.jar"; then
+- XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar
+- elif test -e "/usr/share/xalan-serializer/lib/serializer.jar"; then
+- XALAN2_SERIALIZER_JAR=/usr/share/xalan-serializer/lib/serializer.jar
+- elif test -e "/usr/share/java/serializer.jar"; then
+- XALAN2_SERIALIZER_JAR=/usr/share/java/serializer.jar
+- else
+- AC_MSG_RESULT(no)
+- fi
+- fi
+- if test -z "${XALAN2_SERIALIZER_JAR}"; then
+- AC_MSG_ERROR("A xalan2-serializer jar was not found.")
+- fi
+- AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
+- AC_SUBST(XALAN2_SERIALIZER_JAR)
+-])
+-
+-AC_DEFUN([IT_FIND_XERCES2_JAR],
+-[
+- AC_MSG_CHECKING([for a xerces2 jar])
+- AC_ARG_WITH([xerces2-jar],
+- [AS_HELP_STRING(--with-xerces2-jar,specify location of the
xerces2 jar)],
+- [
+- if test -f "${withval}" ; then
+- XERCES2_JAR="${withval}"
+- fi
+- ],
+- [
+- XERCES2_JAR=
+- ])
+- if test -z "${XERCES2_JAR}"; then
+- if test -e "/usr/share/java/xerces-j2.jar"; then
+- XERCES2_JAR=/usr/share/java/xerces-j2.jar
+- elif test -e "/usr/share/java/xerces2.jar"; then
+- XERCES2_JAR=/usr/share/java/xerces2.jar
+- elif test -e "/usr/share/xerces-2/lib/xercesImpl.jar"; then
+- XERCES2_JAR=/usr/share/xerces-2/lib/xercesImpl.jar
+- elif test -e "/usr/share/java/xercesImpl.jar"; then
+- XERCES2_JAR=/usr/share/java/xercesImpl.jar
+- else
+- AC_MSG_RESULT(no)
+- fi
+- fi
+- if test -z "${XERCES2_JAR}"; then
+- AC_MSG_ERROR("A xerces2 jar was not found.")
+- fi
+- AC_MSG_RESULT(${XERCES2_JAR})
+- AC_SUBST(XERCES2_JAR)
+-])
+-
+ AC_DEFUN([IT_FIND_RHINO_JAR],
+ [
+ AC_MSG_CHECKING([whether to include Javascript support via Rhino])
+diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
+--- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
++++ icedtea6-mod/configure.ac 2011-10-27 19:24:20.455728608 -0500
+@@ -156,9 +156,7 @@
+ IT_FIND_NATIVE2ASCII
+ if test "x$enable_bootstrap" = "xyes"; then
+ IT_FIND_ECJ_JAR
+- IT_FIND_XALAN2_JAR
+- IT_FIND_XALAN2_SERIALIZER_JAR
+- IT_FIND_XERCES2_JAR
++ IT_FIND_TOOL([XSLTPROC], [xsltproc])
+ fi
+ AC_CONFIG_FILES([javac], [chmod +x javac])
+ AC_CONFIG_FILES([javap], [chmod +x javap])
+diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
+--- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
++++ icedtea6-mod/Makefile.am 2011-10-27 19:20:27.399728763 -0500
+@@ -40,7 +40,6 @@
+ ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
+ ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
+ BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+-ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
+ ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
+ ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
+ JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
+@@ -436,7 +435,9 @@
+ patches/ecj/jaxp-dependency.patch \
+ patches/ecj/bootver.patch \
+ patches/ecj/getannotation-cast.patch \
+- patches/ecj/override.patch
++ patches/ecj/override.patch \
++ patches/ecj/xsltproc.patch
++
+
+ if DTDTYPE_QNAME
+ ICEDTEA_ECJ_PATCHES += \
+@@ -491,8 +492,6 @@
+ ALT_BOOTDIR="$(BOOT_DIR)" \
+ BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
+ ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
+- ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
+- ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
+ CLASSPATH="" \
+ LD_LIBRARY_PATH="" \
+ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+@@ -580,7 +579,8 @@
+ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
+ JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
+ DISABLE_NIMBUS="true" \
+- NO_DOCS="true"
++ NO_DOCS="true" \
++ XSLT="$(XSLTPROC)"
+
+ # Source files
+ # FIXME (distclean): Add generated file list
+@@ -1271,11 +1271,6 @@
+ ln -sf $(NATIVE2ASCII) $(ECJ_BOOT_DIR)/bin/native2ascii
+ ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac
+ ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap
+- mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \
+- ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
+- ln -sf $(XALAN2_SERIALIZER_JAR) \
+- $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
+- ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
+ mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar &&
\
+ ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
+diff -urN icedtea6-1.10.4/patches/ecj/xsltproc.patch
icedtea6-mod/patches/ecj/xsltproc.patch
+--- icedtea6-1.10.4/patches/ecj/xsltproc.patch 1969-12-31 18:00:00.000000000
-0600
++++ icedtea6-mod/patches/ecj/xsltproc.patch 2011-10-27 19:28:04.711728486
-0500
+@@ -0,0 +1,54 @@
++diff -r 591c7dc0b2ee make/linux/makefiles/jvmti.make
++--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make Thu May 19
13:27:44 2011 +0200
+++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make Wed May 25 20:01:25
2011 +0100
++@@ -59,8 +59,6 @@
++
++ JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
++
++-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath
$(JvmtiOutDir) jvmtiGen
++-
++ .PHONY: all jvmtidocs clean cleanall
++
++ # #########################################################################
++@@ -77,34 +75,34 @@
++
++ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL
$(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM
interface jvmti
+++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnter.cpp --stringparam interface
jvmti $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml
++
++ $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass)
$(InterpreterSrcDir)/bytecodeInterpreter.cpp
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
-XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
+++ $(XSLT) -o $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
++
++ $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL
$(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM
interface jvmti -PARAM trace Trace
+++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnterTrace.cpp --stringparam interface
jvmti --stringparam trace Trace $(JvmtiSrcDir)/jvmtiEnter.xsl
$(JvmtiSrcDir)/jvmti.xml
++
++ $(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both)
$(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl
-OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
+++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnvStub.cpp
$(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmti.xml
++ $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir)
jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp
++
++ $(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl
-OUT $(JvmtiOutDir)/jvmtiEnv.hpp
+++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnv.hpp $(JvmtiSrcDir)/jvmtiHpp.xsl
$(JvmtiSrcDir)/jvmti.xml
++
++ $(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl
-OUT $(JvmtiOutDir)/jvmti.h
+++ $(XSLT) -o $(JvmtiOutDir)/jvmti.h $(JvmtiSrcDir)/jvmtiH.xsl
$(JvmtiSrcDir)/jvmti.xml
++
++ jvmtidocs: $(JvmtiOutDir)/jvmti.html
++
++ $(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
++ @echo Generating $@
++- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl
-OUT $(JvmtiOutDir)/jvmti.html
+++ $(XSLT) -o $(JvmtiOutDir)/jvmti.html $(JvmtiSrcDir)/jvmti.xsl
$(JvmtiSrcDir)/jvmti.xml
++
++ # #########################################################################
++
diff --git a/java/icedtea6/icedtea.gpg b/java/icedtea6/icedtea.gpg
new file mode 100644
index 0000000..c757d9d
Binary files /dev/null and b/java/icedtea6/icedtea.gpg differ
diff --git a/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
b/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
new file mode 100644
index 0000000..e6984e8
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
@@ -0,0 +1,147 @@
+diff -urN icedtea6-1.10.4/Makefile.am icedtea6-1.10.4-mod/Makefile.am
+--- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
++++ icedtea6-1.10.4-mod/Makefile.am 2011-12-06 21:57:16.152407873 -0600
+@@ -314,6 +314,7 @@
+ patches/numa_on_early_glibc.patch \
+ patches/jtreg-international-fonts.patch \
+ patches/openjdk/6967436-6976265-6967434-pisces.patch \
++ patches/openjdk6-b22-smgl-paths.patch \
+ patches/f14-fonts.patch \
+ patches/jtreg-T6638712-fix.patch \
+ patches/jtreg-T6650759m-fix.patch \
+diff -urN icedtea6-1.10.4/patches/hotspot/original/too-many-args.patch
icedtea6-1.10.4-mod/patches/hotspot/original/too-many-args.patch
+--- icedtea6-1.10.4/patches/hotspot/original/too-many-args.patch
2011-05-25 11:34:31.779471406 -0500
++++ icedtea6-1.10.4-mod/patches/hotspot/original/too-many-args.patch
2011-12-06 21:58:17.813407168 -0600
+@@ -1,8 +1,8 @@
+ --- openjdk/hotspot/make/linux/makefiles/sa.make.orig 2010-06-21
23:12:13.000000000 +0200
+ +++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-06-28
01:11:27.022322578 +0200
+ @@ -45,6 +45,9 @@
+- 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 := $(TOPDIR)/../agent1.classes.list
+ +AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list
+diff -urN icedtea6-1.10.4/patches/openjdk6-b22-smgl-paths.patch
icedtea6-1.10.4-mod/patches/openjdk6-b22-smgl-paths.patch
+--- icedtea6-1.10.4/patches/openjdk6-b22-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
++++ icedtea6-1.10.4-mod/patches/openjdk6-b22-smgl-paths.patch 2011-12-06
21:57:16.153407886 -0600
+@@ -0,0 +1,118 @@
++diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk
openjdk-mod/corba/make/common/shared/Defs-utils.gmk
++--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-02-28
10:02:15.000000000 -0600
+++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06
21:26:52.565428298 -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
++@@ -122,9 +122,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
++@@ -132,7 +132,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
++@@ -176,7 +176,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 (only sccs is not)
++diff -urN openjdk/hotspot/make/linux/makefiles/sa.make
openjdk-mod/hotspot/make/linux/makefiles/sa.make
++--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-02-28
10:03:13.000000000 -0600
+++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06
21:26:52.565428298 -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))
++
++ SA_CLASSDIR = $(GENERATED)/saclasses
++
++diff -urN openjdk/jdk/make/common/shared/Defs-utils.gmk
openjdk-mod/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-02-28
10:06:10.000000000 -0600
+++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06
21:26:52.565428298 -0600
++@@ -98,15 +98,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
++@@ -134,9 +134,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
++@@ -144,7 +144,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
++@@ -178,7 +178,7 @@
++ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
++ $(wildcard $(UTILS_USR_BIN_PATH)basename))
++
++- 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 (only sccs is not)
diff --git a/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
b/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
new file mode 100644
index 0000000..3f6f039
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
@@ -0,0 +1,397 @@
+diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
+--- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
++++ icedtea6-mod/acinclude.m4 2011-10-27 18:49:43.510729915 -0500
+@@ -326,6 +326,91 @@
+ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" =
"xyes")
+ ])
+
++AC_DEFUN([IT_GENERATE_CACERTS],
++[
++ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
++ AC_ARG_ENABLE([cacerts],
++ [AS_HELP_STRING(--enable-cacerts, generate a cacerts file for
distribution [[default=no]])],
++ [
++ case "${enableval}" in
++ no)
++ generate_cacerts=no
++ ;;
++ *)
++ generate_cacerts=yes
++ ;;
++ esac
++ ],
++ [
++ generate_cacerts=no
++ ])
++ AC_MSG_RESULT([$generate_cacerts])
++ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes")
++])
++
++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)],
++ [
++ if test -d "${withval}"; then
++ CADIR="${withval}"
++ fi
++ ],
++ [
++ CADIR=
++ ])
++ if test -z "${CADIR}"; 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 -z "${CADIR}"; 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)],
++ [
++ if test -f "${withval}"; then
++ CAFILE="${withval}"
++ fi
++ ],
++ [
++ CAFILE=
++ ])
++ if test -z "${CAFILE}"; 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 -z "${CAFILE}"; then
++ CAFILE=no
++ fi
++ fi
++ AC_MSG_RESULT(${CAFILE})
++ AC_SUBST(CAFILE)
++ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
++ AC_MSG_WARN([Could not find a suitable x509 certificate store.])
++ AC_MSG_ERROR([Supply a valid location using --with-ca-dir or
--with-ca-file, or remove the --enable-cacerts switch.])
++ fi
++])
++
+ AC_DEFUN([IT_FIND_ECJ_JAR],
+ [
+ AC_MSG_CHECKING([for an ecj JAR file])
+diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
+--- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
++++ icedtea6-mod/configure.ac 2011-10-27 18:51:27.674729852 -0500
+@@ -138,6 +138,13 @@
+ AC_MSG_RESULT([disabled by default (edit java.security to enable)])
+ fi
+
++IT_GENERATE_CACERTS
++
++if test "x${generate_cacerts}" = "xyes"
++then
++ IT_GET_LOCAL_CACERTS
++fi
++
+ IT_GET_PKGVERSION
+ IT_GET_LSB_DATA
+
+diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
+--- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
++++ icedtea6-mod/Makefile.am 2011-10-27 18:58:37.188729584 -0500
+@@ -1375,6 +1375,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch stamps/icedtea.stamp
+@@ -1406,6 +1419,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea (debug build) is served:" \
+ $(DEBUG_BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+@@ -1456,7 +1482,7 @@
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap.stamp
+
+@@ -1482,7 +1508,7 @@
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap-debug.stamp
+
+diff -urN icedtea6-1.10.4/Makefile.in icedtea6-mod/Makefile.in
+--- icedtea6-1.10.4/Makefile.in 2011-10-13 12:39:49.922906360 -0500
++++ icedtea6-mod/Makefile.in 2011-10-27 19:05:53.725729308 -0500
+@@ -175,6 +175,8 @@
+ BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+ BUILD_OS_DIR = @BUILD_OS_DIR@
+ CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
++CADIR = @CADIR@
++CAFILE = @CAFILE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -1867,7 +1869,7 @@
+ @ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ @ENABLE_SYSTEMTAP_TRUE@ fi
+ @ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
+-@ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++@ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ touch stamps/add-systemtap.stamp
+
+ clean-add-systemtap:
+@@ -1891,7 +1893,7 @@
+ @ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ @ENABLE_SYSTEMTAP_TRUE@ fi
+ @ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
+-@ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++@ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ touch stamps/add-systemtap-debug.stamp
+
+ clean-add-systemtap-debug:
+@@ -1961,6 +1963,17 @@
+ stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
+ @WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
+ @WITH_TZDATA_DIR_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
++@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@ -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@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ fi; \
++@GENERATE_CACERTS_TRUE@ cp -f
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++@GENERATE_CACERTS_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
+ touch stamps/add-tzdata-support.stamp
+
+ clean-add-tzdata-support:
+@@ -1970,6 +1983,17 @@
+ stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
+ @WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
+ @WITH_TZDATA_DIR_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
++@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@ -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@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++@GENERATE_CACERTS_TRUE@ fi; \
++@GENERATE_CACERTS_TRUE@ cp -f
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++@GENERATE_CACERTS_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
+ touch stamps/add-tzdata-support-debug.stamp
+
+ clean-add-tzdata-support-debug:
+diff -urN icedtea6-1.10.4/scripts/mkcacerts.sh
icedtea6-mod/scripts/mkcacerts.sh
+--- icedtea6-1.10.4/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
++++ icedtea6-mod/scripts/mkcacerts.sh 2011-10-27 19:07:38.521729245 -0500
+@@ -0,0 +1,154 @@
++#!/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
++ ;;
++ -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
++ }
++
++
++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 " -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=""
++KEYTOOL=""
++
++# 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 "${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}"
++ keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash`
++ echo "Generated PEM file with hash: ${keyhash}."
++ mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem"
++ done
++fi
++
++# Write the output file
++for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
++do
++ 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/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig
b/java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig
new file mode 100644
index 0000000..bdf57b0
Binary files /dev/null and
b/java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig differ
diff --git a/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig
b/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig
new file mode 100644
index 0000000..2303287
Binary files /dev/null and
b/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig differ
diff --git a/java/icedtea6/icedtea6-hg-fixed_paths.patch
b/java/icedtea6/icedtea6-hg-fixed_paths.patch
new file mode 100644
index 0000000..c5e6b7a
--- /dev/null
+++ b/java/icedtea6/icedtea6-hg-fixed_paths.patch
@@ -0,0 +1,133 @@
+diff -urN icedtea6-hg/Makefile.am icedtea6-hg-mod/Makefile.am
+--- icedtea6-hg/Makefile.am 2011-12-06 19:39:15.000000000 -0600
++++ icedtea6-hg-mod/Makefile.am 2011-12-06 21:32:21.737424651 -0600
+@@ -288,6 +288,7 @@
+ patches/openjdk/6650759-missing_inference.patch \
+ patches/numa_on_early_glibc.patch \
+ patches/jtreg-international-fonts.patch \
++ patches/openjdk6-b24-smgl-paths.patch \
+ patches/f14-fonts.patch \
+ patches/jtreg-T6638712-fix.patch \
+ patches/jtreg-T6650759m-fix.patch \
+diff -urN icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch
icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch
+--- icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
++++ icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch 2011-12-06
21:32:43.033424397 -0600
+@@ -0,0 +1,118 @@
++diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk
openjdk-mod/corba/make/common/shared/Defs-utils.gmk
++--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-11-14
16:05:59.000000000 -0600
+++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06
21:13:30.991437225 -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
++@@ -122,9 +122,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
++@@ -132,7 +132,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
++@@ -176,7 +176,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 (only sccs is not)
++diff -urN openjdk/hotspot/make/linux/makefiles/sa.make
openjdk-mod/hotspot/make/linux/makefiles/sa.make
++--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-11-14
16:07:29.000000000 -0600
+++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06
21:15:49.018435744 -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 -urN openjdk/jdk/make/common/shared/Defs-utils.gmk
openjdk-mod/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-11-14
16:11:40.000000000 -0600
+++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06
21:15:15.611436158 -0600
++@@ -98,15 +98,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
++@@ -134,9 +134,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
++@@ -144,7 +144,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
++@@ -178,7 +178,7 @@
++ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
++ $(wildcard $(UTILS_USR_BIN_PATH)basename))
++
++- 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 (only sccs is not)
diff --git a/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
b/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
new file mode 100644
index 0000000..0e3af9c
--- /dev/null
+++ b/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
@@ -0,0 +1,331 @@
+diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
+--- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
++++ icedtea6-mod/acinclude.m4 2011-10-27 18:49:43.510729915 -0500
+@@ -326,6 +326,91 @@
+ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" =
"xyes")
+ ])
+
++AC_DEFUN([IT_GENERATE_CACERTS],
++[
++ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
++ AC_ARG_ENABLE([cacerts],
++ [AS_HELP_STRING(--enable-cacerts, generate a cacerts file for
distribution [[default=no]])],
++ [
++ case "${enableval}" in
++ no)
++ generate_cacerts=no
++ ;;
++ *)
++ generate_cacerts=yes
++ ;;
++ esac
++ ],
++ [
++ generate_cacerts=no
++ ])
++ AC_MSG_RESULT([$generate_cacerts])
++ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes")
++])
++
++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)],
++ [
++ if test -d "${withval}"; then
++ CADIR="${withval}"
++ fi
++ ],
++ [
++ CADIR=
++ ])
++ if test -z "${CADIR}"; 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 -z "${CADIR}"; 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)],
++ [
++ if test -f "${withval}"; then
++ CAFILE="${withval}"
++ fi
++ ],
++ [
++ CAFILE=
++ ])
++ if test -z "${CAFILE}"; 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 -z "${CAFILE}"; then
++ CAFILE=no
++ fi
++ fi
++ AC_MSG_RESULT(${CAFILE})
++ AC_SUBST(CAFILE)
++ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
++ AC_MSG_WARN([Could not find a suitable x509 certificate store.])
++ AC_MSG_ERROR([Supply a valid location using --with-ca-dir or
--with-ca-file, or remove the --enable-cacerts switch.])
++ fi
++])
++
+ AC_DEFUN([IT_FIND_ECJ_JAR],
+ [
+ AC_MSG_CHECKING([for an ecj JAR file])
+diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
+--- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
++++ icedtea6-mod/configure.ac 2011-10-27 18:51:27.674729852 -0500
+@@ -138,6 +138,13 @@
+ AC_MSG_RESULT([disabled by default (edit java.security to enable)])
+ fi
+
++IT_GENERATE_CACERTS
++
++if test "x${generate_cacerts}" = "xyes"
++then
++ IT_GET_LOCAL_CACERTS
++fi
++
+ IT_GET_PKGVERSION
+ IT_GET_LSB_DATA
+
+diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
+--- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
++++ icedtea6-mod/Makefile.am 2011-10-27 18:58:37.188729584 -0500
+@@ -1375,6 +1375,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch stamps/icedtea.stamp
+@@ -1406,6 +1419,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea (debug build) is served:" \
+ $(DEBUG_BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+@@ -1456,7 +1482,7 @@
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap.stamp
+
+@@ -1482,7 +1508,7 @@
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap-debug.stamp
+
+diff -urN icedtea6-1.10.4/scripts/mkcacerts.sh
icedtea6-mod/scripts/mkcacerts.sh
+--- icedtea6-1.10.4/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
++++ icedtea6-mod/scripts/mkcacerts.sh 2011-10-27 19:07:38.521729245 -0500
+@@ -0,0 +1,154 @@
++#!/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
++ ;;
++ -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
++ }
++
++
++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 " -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=""
++KEYTOOL=""
++
++# 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 "${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}"
++ keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash`
++ echo "Generated PEM file with hash: ${keyhash}."
++ mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem"
++ done
++fi
++
++# Write the output file
++for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
++do
++ 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/icedtea6/java.sh b/java/icedtea6/java.sh
new file mode 100644
index 0000000..7091558
--- /dev/null
+++ b/java/icedtea6/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/icedtea6/jaxp144_01.zip.sig
b/java/icedtea6/jaxp144_01.zip.sig
new file mode 100644
index 0000000..39828d2
Binary files /dev/null and b/java/icedtea6/jaxp144_01.zip.sig differ
diff --git a/java/icedtea6/jaxp144_03.zip.sig
b/java/icedtea6/jaxp144_03.zip.sig
new file mode 100644
index 0000000..8f8efd8
Binary files /dev/null and b/java/icedtea6/jaxp144_03.zip.sig differ
diff --git a/java/icedtea6/jdk6-jaf-b20.zip.sig
b/java/icedtea6/jdk6-jaf-b20.zip.sig
new file mode 100644
index 0000000..14e66c8
Binary files /dev/null and b/java/icedtea6/jdk6-jaf-b20.zip.sig differ
diff --git a/java/icedtea6/jdk6-jaxws-b20.zip.sig
b/java/icedtea6/jdk6-jaxws-b20.zip.sig
new file mode 100644
index 0000000..0f8a70f
Binary files /dev/null and b/java/icedtea6/jdk6-jaxws-b20.zip.sig differ
diff --git a/java/icedtea6/jdk6-jaxws2_1_6-2011_06_13.zip.sig
b/java/icedtea6/jdk6-jaxws2_1_6-2011_06_13.zip.sig
new file mode 100644
index 0000000..b692290
Binary files /dev/null and b/java/icedtea6/jdk6-jaxws2_1_6-2011_06_13.zip.sig
differ
diff --git a/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig
b/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig
new file mode 100644
index 0000000..e54a35b
Binary files /dev/null and
b/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig differ
diff --git a/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig
b/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig
new file mode 100644
index 0000000..a8336ef
Binary files /dev/null and
b/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig differ
diff --git a/java/rhino/BUILD b/java/rhino/BUILD
new file mode 100755
index 0000000..deb1f72
--- /dev/null
+++ b/java/rhino/BUILD
@@ -0,0 +1,6 @@
+. $SECTION_DIRECTORY/java-functions
+
+set_java_env &&
+set_ant_env &&
+
+ant dist
diff --git a/java/rhino/DEPENDS b/java/rhino/DEPENDS
new file mode 100755
index 0000000..6894c68
--- /dev/null
+++ b/java/rhino/DEPENDS
@@ -0,0 +1,2 @@
+depends JAVA '' '' z-rejected &&
+depends ant
diff --git a/java/rhino/DETAILS b/java/rhino/DETAILS
new file mode 100755
index 0000000..f36145e
--- /dev/null
+++ b/java/rhino/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=rhino
+ VERSION=1_7R3
+ SOURCE=$SPELL$VERSION.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
+ SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/js/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=MPL
+ KEYWORDS="javascript"
+ WEB_SITE=http://www.mozilla.org/rhino/
+ ENTERED=20111023
+ SHORT='Javascript implemented in Java'
+cat << EOF
+Rhino is an open-source implementation of JavaScript written entirely in
Java.
+It is typically embedded into Java applications to provide scripting to end
+users.
+EOF
diff --git a/java/rhino/HISTORY b/java/rhino/HISTORY
new file mode 100644
index 0000000..61013bb
--- /dev/null
+++ b/java/rhino/HISTORY
@@ -0,0 +1,2 @@
+2011-10-23 Robin Cook <rcook AT wyrms.net>
+ * NEW SPELL: details, depends, pre_build, build, install
diff --git a/java/rhino/INSTALL b/java/rhino/INSTALL
new file mode 100755
index 0000000..a8731b5
--- /dev/null
+++ b/java/rhino/INSTALL
@@ -0,0 +1,5 @@
+. $SECTION_DIRECTORY/java-functions
+
+unzip $SOURCE &&
+extract_oth_src $SPELL ${SPELL}${VERSION} ${SPELL}${VERSION} &&
+register_oth_jar ${SPELL}${VERSION}/js.jar js.jar
diff --git a/java/rhino/PRE_BUILD b/java/rhino/PRE_BUILD
new file mode 100755
index 0000000..6632ec4
--- /dev/null
+++ b/java/rhino/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/rhino-xbean-fix.patch
+
diff --git a/java/rhino/rhino-xbean-fix.patch
b/java/rhino/rhino-xbean-fix.patch
new file mode 100644
index 0000000..3f02d0f
--- /dev/null
+++ b/java/rhino/rhino-xbean-fix.patch
@@ -0,0 +1,24 @@
+Only in rhino-mod: lib
+diff -ur rhino1_7R3/xmlimplsrc/build.xml rhino-mod/xmlimplsrc/build.xml
+--- rhino1_7R3/xmlimplsrc/build.xml 2011-05-09 20:04:38.000000000 -0500
++++ rhino-mod/xmlimplsrc/build.xml 2011-10-23 17:12:54.904949978 -0500
+@@ -147,7 +147,7 @@
+ <target name="xmlbeans-get" unless="xmlbeans-zip-present?">
+ <property
+ name="xmlbeans.url"
+-
value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
++
value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.zip";
+ />
+
+ <mkdir dir="${xmlbeans.tmp}" />
+@@ -157,8 +157,8 @@
+ <target name="xmlbeans-unzip" unless="xmlbeans-present?">
+ <antcall target="xmlbeans-get" />
+ <unzip src="${xmlbeans.zip}" dest="${xmlbeans.tmp}" />
+- <copy tofile="${xbean.jar}"
file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/xbean.jar" />
+- <copy tofile="${jsr173.jar}"
file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/jsr173_1.0_api.jar" />
++ <copy tofile="${xbean.jar}"
file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/xbean.jar" />
++ <copy tofile="${jsr173.jar}"
file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar" />
+ <delete dir="${xmlbeans.tmp}" />
+ </target>
+ </project>
diff --git a/java/rhino/rhino1_7R3.zip.sig b/java/rhino/rhino1_7R3.zip.sig
new file mode 100644
index 0000000..1029d40
Binary files /dev/null and b/java/rhino/rhino1_7R3.zip.sig differ
diff --git a/xorg-lib/libxp/DEPENDS b/xorg-lib/libxp/DEPENDS
new file mode 100755
index 0000000..155adb2
--- /dev/null
+++ b/xorg-lib/libxp/DEPENDS
@@ -0,0 +1,8 @@
+depends gawk &&
+depends pkgconfig &&
+depends libtool &&
+depends util-macros &&
+depends printproto &&
+depends libxau &&
+depends libx11 &&
+depends libxext
diff --git a/xorg-lib/libxp/DETAILS b/xorg-lib/libxp/DETAILS
new file mode 100755
index 0000000..aff7301
--- /dev/null
+++ b/xorg-lib/libxp/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=libxp
+ PKG=libXp
+ VERSION=1.0.1
+ SOURCE=${PKG}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=http://www.x.org/releases/individual/lib/${SOURCE}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ WEB_SITE=http://xorg.freedesktop.org
+ ENTERED=20051125
+ LICENSE[0]=XCL
+ SHORT="Xprint client library"
+cat << EOF
+libXp is an Xprint client library, it provides public APIs to allow client
+applications to render to non-display devices.
+EOF
diff --git a/xorg-lib/libxp/HISTORY b/xorg-lib/libxp/HISTORY
new file mode 100644
index 0000000..cf2d2d4
--- /dev/null
+++ b/xorg-lib/libxp/HISTORY
@@ -0,0 +1,45 @@
+2011-10-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.0.1
+ * PRE_BUILD: added to run autogen.sh
+
+2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
+2008-03-16 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
+2007-10-26 Ismael E. Luceno <ismael.luceno AT gmail.com>
+ * DETAILS: update description & short
+
+2005-12-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: added XORG_VER
+ updated SOURCE, SOURCE_URL, and SOURCE_DIRECTORY
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated VERSION to 1.0.0
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL to RC4
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated VERSION to 0.99.2
+ converted SOURCEHASH to SOURCE_GPG
+
+2005-12-14 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL
+
+2005-11-27 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: added gawk, pkgconfig, libtool
+
+2005-11-25 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DEPENDS: auto-created or updated
+
+2005-11-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added various depends
+
+2005-11-24 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: fix broken SOURCE_URL
+
+2005-11-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS, HISTORY: created spell
+
diff --git a/xorg-lib/libxp/PRE_BUILD b/xorg-lib/libxp/PRE_BUILD
new file mode 100755
index 0000000..c5b8fb6
--- /dev/null
+++ b/xorg-lib/libxp/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+./autogen.sh
diff --git a/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig
b/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig
new file mode 100644
index 0000000..87d5148
Binary files /dev/null and b/xorg-lib/libxp/libXp-1.0.1.tar.bz2.sig differ
diff --git a/xorg-proto/printproto/DEPENDS b/xorg-proto/printproto/DEPENDS
new file mode 100755
index 0000000..18ecac5
--- /dev/null
+++ b/xorg-proto/printproto/DEPENDS
@@ -0,0 +1,2 @@
+depends util-macros &&
+depends gawk
diff --git a/xorg-proto/printproto/DETAILS b/xorg-proto/printproto/DETAILS
new file mode 100755
index 0000000..1f4e31a
--- /dev/null
+++ b/xorg-proto/printproto/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=printproto
+ VERSION=1.0.5
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/proto/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=XCL
+ WEB_SITE=http://xorg.freedesktop.org/wiki
+ ENTERED=20051124
+ SHORT="the X.Org Xprint protocol headers"
+cat << EOF
+printproto provides the wire protocol for the Xprint extension in
+X.Org.
+EOF
diff --git a/xorg-proto/printproto/HISTORY b/xorg-proto/printproto/HISTORY
new file mode 100644
index 0000000..48938dd
--- /dev/null
+++ b/xorg-proto/printproto/HISTORY
@@ -0,0 +1,41 @@
+2011-10-28 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.0.5
+ * PRE_BUILD: added to do autogen.sh
+
+2008-03-20 Andraž ruskie Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed WEB_SITE
+ updated spell to 1.0.4
+
+2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
+2008-03-16 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
+2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update description & short (automated)
+
+2005-12-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: added XORG_VER
+ updated SOURCE, SOURCE_URL, and SOURCE_DIRECTORY
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated VERSION to 1.0.3
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL to RC4
+
+2005-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated VERSION to 1.0.2
+
+2005-12-14 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: Updated SOURCE_URL
+
+2005-11-25 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DEPENDS: auto-created or updated
+
+2005-11-24 Robin Cook <rcook AT wyrms.net>
+ * INITIAL: break up of xorg into modules X11R7.0.0
+
+
diff --git a/xorg-proto/printproto/PRE_BUILD b/xorg-proto/printproto/PRE_BUILD
new file mode 100755
index 0000000..c5b8fb6
--- /dev/null
+++ b/xorg-proto/printproto/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+./autogen.sh
diff --git a/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
new file mode 100644
index 0000000..2f21750
Binary files /dev/null and
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig differ
- [SM-Commit] GIT changes to master grimoire by Robin Cook (50ca3cae10e1dbba15db18c0827c97b3ff714f50), Robin Cook, 12/07/2011
Archive powered by MHonArc 2.6.24.