summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorRobin Cook2012-12-02 08:34:50 -0600
committerRobin Cook2012-12-02 08:34:50 -0600
commit6bb84d38f9b87708c69cc13ac24a807511aff67b (patch)
tree1a78deba544959b5e6eb300e2feb21805e09d6aa /java
parent62207ad6432f72462ddf1747a240b2d8181f17aa (diff)
icedtea7: updated to 2.3.3
Diffstat (limited to 'java')
-rwxr-xr-xjava/icedtea7/DETAILS18
-rwxr-xr-xjava/icedtea7/DOWNLOAD23
-rw-r--r--java/icedtea7/HISTORY4
-rwxr-xr-xjava/icedtea7/PRE_BUILD6
-rw-r--r--java/icedtea7/SCRIBBLED0
-rw-r--r--java/icedtea7/corba.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/hotspot.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/icedtea-2.2.1.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch (renamed from java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch)0
-rw-r--r--java/icedtea7/icedtea-2.3.3.tar.gz.sigbin0 -> 543 bytes
-rw-r--r--java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/icedtea7-2.1-fixed_paths.patch128
-rw-r--r--java/icedtea7/icedtea7-2.3.1-fixed_paths.patch (renamed from java/icedtea7/icedtea7-2.2.1-fixed_paths.patch)0
-rw-r--r--java/icedtea7/jaxp.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/jaxws.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/jdk.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/langtools.tar.gz.sigbin543 -> 543 bytes
-rw-r--r--java/icedtea7/openjdk.tar.gz.sigbin543 -> 543 bytes
18 files changed, 32 insertions, 147 deletions
diff --git a/java/icedtea7/DETAILS b/java/icedtea7/DETAILS
index 75f10aa79d..6ffda43534 100755
--- a/java/icedtea7/DETAILS
+++ b/java/icedtea7/DETAILS
@@ -1,5 +1,5 @@
SPELL=icedtea7
- VERSION=2.2.1
+ VERSION=2.3.3
SOURCE=icedtea-$VERSION.tar.gz
SOURCE2=openjdk.tar.gz
SOURCE3=corba.tar.gz
@@ -22,13 +22,13 @@ case "${SMGL_COMPAT_ARCHS[0]}" in
;;
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
+ SOURCE2_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive
+ SOURCE3_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive
+ SOURCE4_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive
+ SOURCE5_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive
+ SOURCE6_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive
+ SOURCE7_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive
+ SOURCE8_URL[0]=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive
SOURCE9_URL[0]=http://dev.gentoo.org/~caster/distfiles
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
@@ -42,7 +42,7 @@ esac
LICENSE[0]=GPL
KEYWORDS="JAVA"
WEB_SITE=http://icedtea.classpath.org/wiki/Main_Page
- ENTERED=20120617
+ ENTERED=20120616
SHORT='Harness to build OpenJDK with Free Software build tools'
cat << EOF
The IcedTea project provides a harness to build the source code from
diff --git a/java/icedtea7/DOWNLOAD b/java/icedtea7/DOWNLOAD
index 6656d62714..fbb4acb7ad 100755
--- a/java/icedtea7/DOWNLOAD
+++ b/java/icedtea7/DOWNLOAD
@@ -1,37 +1,46 @@
cd $SOURCE_CACHE &&
if ! test -f $SOURCE ; then
+#icedtea source file
wget $SOURCE_URL/$SOURCE 2>&1
fi &&
if ! test -f $SOURCE2 ; then
- wget $SOURCE2_URL/0b776ef59474.tar.gz --progress=dot -O $SOURCE2 2>&1
+#openjdk changeset
+ wget $SOURCE2_URL/301e79a966b4.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
+#corba changeset
+ wget $SOURCE3_URL/9a95d714d136.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
+#hotspot changeset
+ wget $SOURCE4_URL/d2d0a106917c.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
+#jaxp changeset
+ wget $SOURCE5_URL/f45296ac69be.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
+#jaxws changeset
+ wget $SOURCE6_URL/03f54ef33914.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
+#jdk changeset
+ wget $SOURCE7_URL/5ec94d162f05.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
+#langtools changeset
+ wget $SOURCE8_URL/ec73c6927fb7.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/HISTORY b/java/icedtea7/HISTORY
index c2e495bfee..d6c0cd4419 100644
--- a/java/icedtea7/HISTORY
+++ b/java/icedtea7/HISTORY
@@ -1,3 +1,7 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated to 2.3.3
+ * DOWNLOAD: udated changeset numbers
+
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/PRE_BUILD b/java/icedtea7/PRE_BUILD
index bd2dc28b00..bc678ebd01 100755
--- a/java/icedtea7/PRE_BUILD
+++ b/java/icedtea7/PRE_BUILD
@@ -16,10 +16,10 @@ 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 &&
+patch -p1 < $SPELL_DIRECTORY/icedtea-2.3.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 &&
+patch -p1 < $SPELL_DIRECTORY/icedtea7-2.3.1-fixed_paths.patch &&
cd $BUILD_DIRECTORY &&
verify_file 9 &&
diff --git a/java/icedtea7/SCRIBBLED b/java/icedtea7/SCRIBBLED
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/java/icedtea7/SCRIBBLED
diff --git a/java/icedtea7/corba.tar.gz.sig b/java/icedtea7/corba.tar.gz.sig
index 99d65a5da4..b61619635c 100644
--- a/java/icedtea7/corba.tar.gz.sig
+++ b/java/icedtea7/corba.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/hotspot.tar.gz.sig b/java/icedtea7/hotspot.tar.gz.sig
index 4bb30e4078..fca6123255 100644
--- a/java/icedtea7/hotspot.tar.gz.sig
+++ b/java/icedtea7/hotspot.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/icedtea-2.2.1.tar.gz.sig b/java/icedtea7/icedtea-2.2.1.tar.gz.sig
deleted file mode 100644
index 4f02dfff73..0000000000
--- a/java/icedtea7/icedtea-2.2.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch b/java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch
index 440e32ed60..440e32ed60 100644
--- a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
+++ b/java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch
diff --git a/java/icedtea7/icedtea-2.3.3.tar.gz.sig b/java/icedtea7/icedtea-2.3.3.tar.gz.sig
new file mode 100644
index 0000000000..55d4355cf0
--- /dev/null
+++ b/java/icedtea7/icedtea-2.3.3.tar.gz.sig
Binary files differ
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
index 95f57084a9..b1085ae3f9 100644
--- 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 differ
diff --git a/java/icedtea7/icedtea7-2.1-fixed_paths.patch b/java/icedtea7/icedtea7-2.1-fixed_paths.patch
deleted file mode 100644
index 887c33b453..0000000000
--- a/java/icedtea7/icedtea7-2.1-fixed_paths.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-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.3.1-fixed_paths.patch
index c2d98d2254..c2d98d2254 100644
--- a/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch
+++ b/java/icedtea7/icedtea7-2.3.1-fixed_paths.patch
diff --git a/java/icedtea7/jaxp.tar.gz.sig b/java/icedtea7/jaxp.tar.gz.sig
index 411d198341..72a40e0760 100644
--- a/java/icedtea7/jaxp.tar.gz.sig
+++ b/java/icedtea7/jaxp.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/jaxws.tar.gz.sig b/java/icedtea7/jaxws.tar.gz.sig
index 467651057e..ff2cfa8f6c 100644
--- a/java/icedtea7/jaxws.tar.gz.sig
+++ b/java/icedtea7/jaxws.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/jdk.tar.gz.sig b/java/icedtea7/jdk.tar.gz.sig
index 7605238b70..b3402bcc72 100644
--- a/java/icedtea7/jdk.tar.gz.sig
+++ b/java/icedtea7/jdk.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/langtools.tar.gz.sig b/java/icedtea7/langtools.tar.gz.sig
index 98bf8d193e..2db4de0333 100644
--- a/java/icedtea7/langtools.tar.gz.sig
+++ b/java/icedtea7/langtools.tar.gz.sig
Binary files differ
diff --git a/java/icedtea7/openjdk.tar.gz.sig b/java/icedtea7/openjdk.tar.gz.sig
index bd0158ede3..72c41ab77e 100644
--- a/java/icedtea7/openjdk.tar.gz.sig
+++ b/java/icedtea7/openjdk.tar.gz.sig
Binary files differ