sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Robin Cook (191f50477f9d7c3f6ebd62a1cdde07f1dfaedf07)
- 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 (191f50477f9d7c3f6ebd62a1cdde07f1dfaedf07)
- Date: Sun, 2 Dec 2012 08:36:28 -0600
GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:
dev/null |binary
e-17/e17/DEPENDS | 2
e-17/e17/HISTORY | 3
e-17/efreet/DEPENDS | 3
e-17/efreet/HISTORY | 3
e-17/elementary/DEPENDS | 2
e-17/elementary/HISTORY | 3
e-17/emap/DEPENDS | 2
e-17/emap/HISTORY | 3
e-17/emprint/DEPENDS | 3
e-17/emprint/HISTORY | 3
e-17/enki/DEPENDS | 3
e-17/enki/HISTORY | 3
e-17/ephysics/DEPENDS | 3
e-17/ephysics/HISTORY | 3
e-17/ethumb/DEPENDS | 5
e-17/ethumb/HISTORY | 4
e-17/eweather/DEPENDS | 3
e-17/eweather/HISTORY | 3
e-17/exchange/DEPENDS | 3
e-17/exchange/HISTORY | 3
e-17/exquisite/DEPENDS | 4
e-17/exquisite/HISTORY | 3
e-17/imlib2_loaders/DEPENDS | 2
e-17/imlib2_loaders/HISTORY | 3
e-17/libeweather/DEPENDS | 3
e-17/libeweather/HISTORY | 3
e-17/terminology/DEPENDS | 3
e-17/terminology/HISTORY | 3
java/icedtea7/DETAILS | 18
java/icedtea7/DOWNLOAD | 23
java/icedtea7/HISTORY | 4
java/icedtea7/PRE_BUILD | 6
java/icedtea7/corba.tar.gz.sig |binary
java/icedtea7/hotspot.tar.gz.sig |binary
java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch | 543
---------------
java/icedtea7/icedtea-2.2.1.tar.gz.sig | 0
java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch | 543
+++++++++++++++
java/icedtea7/icedtea-2.3.3.tar.gz.sig |binary
java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig |binary
java/icedtea7/icedtea7-2.1-fixed_paths.patch | 128 ---
java/icedtea7/icedtea7-2.2.1-fixed_paths.patch | 114 ---
java/icedtea7/icedtea7-2.3.1-fixed_paths.patch | 114 +++
java/icedtea7/jaxp.tar.gz.sig |binary
java/icedtea7/jaxws.tar.gz.sig |binary
java/icedtea7/jdk.tar.gz.sig |binary
java/icedtea7/langtools.tar.gz.sig |binary
java/icedtea7/openjdk.tar.gz.sig |binary
48 files changed, 747 insertions(+), 830 deletions(-)
New commits:
commit 6bb84d38f9b87708c69cc13ac24a807511aff67b
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
icedtea7: updated to 2.3.3
commit b4b976be3273e376a864e30bfd6051736908cacc
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
imlib2_loaders: changed to using efl
commit 67eb69e1682415984a54939ac22a604cd5507b8f
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
exquisite: changed to using efl
commit 6fcdbc569a63b85ea4891f58ea1d7797b993dd38
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
eweather: changed to using efl
commit 0b5f286fe3f0b67e8104353dd13567e4293ccabf
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
libeweather: changed to using efl
commit a6929ed68e931dbcf493c2cbbe8737a4f4a141ec
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
terminology: changed to using efl
commit b220941149465c56ade08c0682a8092a40bb383d
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
ephysics: change to using efl
commit a764c21e1e27d3317f434f367b2f9b96de8ea2ec
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
exchange: change to using efl
commit 41c971fc23290e01db46fe714513500fd329b451
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
emprint: change to using efl
commit d9ebe22d2afe29c7f290539a6b5344e1242b5a91
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
enki: change to using efl
commit 0136bc3c1424402f4771a9b791214d572a4c1236
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
emap: change to using efl
commit deb89442a5efa3ad7bd32b9b8b9e2cb72585b90b
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
elementary: changed e_dbus to edbus
commit 59e30560fce2d6c25f10b88c5fa330b6f6dce645
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
ethumb: changed e_dbus and use efl
commit 19ab8f28cdd8bc3a33e5fb8d0a7e684c11236604
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
efreet: changed to using efl
commit 177004515fb976ec453fcb6bfc34aad154c2ba1a
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
e17: changed e_dbus to edbus
diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS
index 51a51ac..56153de 100755
--- a/e-17/e17/DEPENDS
+++ b/e-17/e17/DEPENDS
@@ -1,6 +1,6 @@
depends subversion &&
depends efl &&
-depends e_dbus &&
+depends edbus &&
depends edje &&
depends efreet &&
depends imlib2 &&
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index f16c795..aef5f9c 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed e_dbus to edbus
+
2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: eet, eina, evas -> efl
diff --git a/e-17/efreet/DEPENDS b/e-17/efreet/DEPENDS
index 7332d4e..8092e87 100755
--- a/e-17/efreet/DEPENDS
+++ b/e-17/efreet/DEPENDS
@@ -1,5 +1,4 @@
depends subversion &&
-depends eina &&
+depends efl &&
depends ecore &&
-depends eobj &&
depends edbus
diff --git a/e-17/efreet/HISTORY b/e-17/efreet/HISTORY
index 44e9e2c..dc481a3 100644
--- a/e-17/efreet/HISTORY
+++ b/e-17/efreet/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2012-11-02 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: edbus added
diff --git a/e-17/elementary/DEPENDS b/e-17/elementary/DEPENDS
index 3f7810c..0f0adcb 100755
--- a/e-17/elementary/DEPENDS
+++ b/e-17/elementary/DEPENDS
@@ -7,7 +7,7 @@ optional_depends fbset "" "--disable-ecore-fb" \
optional_depends sdl "" "--disable-ecore-sdl" \
"Enable SDL support?" &&
-optional_depends e_dbus "" "--disable-edbus" \
+optional_depends edbus "" "--disable-edbus" \
"Enable e-dbus support?" &&
optional_depends efreet "" "--disable-efreet" \
diff --git a/e-17/elementary/HISTORY b/e-17/elementary/HISTORY
index 30919f3..3ff122c 100644
--- a/e-17/elementary/HISTORY
+++ b/e-17/elementary/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed e_dbus to edbus
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: corrected SOURCE_URL
* DEPENDS: changed some depends to optional and added optional depends
diff --git a/e-17/emap/DEPENDS b/e-17/emap/DEPENDS
index 05b5dfa..a66762a 100755
--- a/e-17/emap/DEPENDS
+++ b/e-17/emap/DEPENDS
@@ -1,3 +1,3 @@
-depends eina &&
+depends efl &&
depends ecore &&
depends subversion
diff --git a/e-17/emap/HISTORY b/e-17/emap/HISTORY
index 8e31f5b..5ec2692 100644
--- a/e-17/emap/HISTORY
+++ b/e-17/emap/HISTORY
@@ -1,2 +1,5 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* New Spell: DEPENDS, DETAILS, PRE_BUILD, PREPARE
diff --git a/e-17/emprint/DEPENDS b/e-17/emprint/DEPENDS
index c0cdfdd..e8ebe38 100755
--- a/e-17/emprint/DEPENDS
+++ b/e-17/emprint/DEPENDS
@@ -1,5 +1,4 @@
-depends eina &&
-depends evas &&
+depends efl &&
depends ecore &&
depends edje &&
depends subversion
diff --git a/e-17/emprint/HISTORY b/e-17/emprint/HISTORY
index 12ac762..02a23f3 100644
--- a/e-17/emprint/HISTORY
+++ b/e-17/emprint/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2008-11-01 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on eina
diff --git a/e-17/enki/DEPENDS b/e-17/enki/DEPENDS
index 1c52371..e53a584 100755
--- a/e-17/enki/DEPENDS
+++ b/e-17/enki/DEPENDS
@@ -1,6 +1,5 @@
-depends eina &&
+depends efl &&
depends ecore &&
-depends eet &&
depends enlil &&
depends elementary &&
depends subversion
diff --git a/e-17/enki/HISTORY b/e-17/enki/HISTORY
index 8369123..10c89df 100644
--- a/e-17/enki/HISTORY
+++ b/e-17/enki/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2012-01-13 Robin Cook <rcook AT wyrms.net>
* DEPENDS: fix typo
diff --git a/e-17/ephysics/DEPENDS b/e-17/ephysics/DEPENDS
index 8fad5a2..e96f1ed 100755
--- a/e-17/ephysics/DEPENDS
+++ b/e-17/ephysics/DEPENDS
@@ -1,5 +1,4 @@
-depends eina &&
-depends evas &&
+depends efs &&
depends ecore &&
depends bullet "" "" games &&
diff --git a/e-17/ephysics/HISTORY b/e-17/ephysics/HISTORY
index 40a8536..5a800a3 100644
--- a/e-17/ephysics/HISTORY
+++ b/e-17/ephysics/HISTORY
@@ -1,2 +1,5 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/ethumb/DEPENDS b/e-17/ethumb/DEPENDS
index 856a825..d1a5625 100755
--- a/e-17/ethumb/DEPENDS
+++ b/e-17/ethumb/DEPENDS
@@ -1,10 +1,9 @@
depends subversion &&
-depends eina &&
-depends evas &&
+depends efl &&
depends ecore &&
depends edje &&
-optional_depends e_dbus \
+optional_depends edbus \
"--enable-ethumbd" "--disable-ethumbd" &&
optional_depends emotion \
diff --git a/e-17/ethumb/HISTORY b/e-17/ethumb/HISTORY
index 61f876d..a7c0895 100644
--- a/e-17/ethumb/HISTORY
+++ b/e-17/ethumb/HISTORY
@@ -1,3 +1,7 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed e_dbus to edbus
+ changed to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added optionals e_dbus, emotion, epdf, libexif
diff --git a/e-17/eweather/DEPENDS b/e-17/eweather/DEPENDS
index 4b54279..529430b 100755
--- a/e-17/eweather/DEPENDS
+++ b/e-17/eweather/DEPENDS
@@ -1,7 +1,6 @@
+depends efl &&
depends ecore &&
depends edje &&
-depends eet &&
depends e17 &&
-depends evas &&
depends libeweather &&
depends subversion
diff --git a/e-17/eweather/HISTORY b/e-17/eweather/HISTORY
index 21d07f9..0f6de18 100644
--- a/e-17/eweather/HISTORY
+++ b/e-17/eweather/HISTORY
@@ -1,2 +1,5 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDES: changed to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* New Spell: BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD
diff --git a/e-17/exchange/DEPENDS b/e-17/exchange/DEPENDS
index 6a4a678..eb1f097 100755
--- a/e-17/exchange/DEPENDS
+++ b/e-17/exchange/DEPENDS
@@ -1,7 +1,6 @@
-depends eina &&
+depends efl &&
depends ecore &&
depends edje &&
-depends evas &&
depends libxml2 &&
depends subversion &&
depends pkgconfig
diff --git a/e-17/exchange/HISTORY b/e-17/exchange/HISTORY
index 48b9f85..faa1dad 100644
--- a/e-17/exchange/HISTORY
+++ b/e-17/exchange/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: change from git to svn
* DEPENDS: added missing depends
diff --git a/e-17/exquisite/DEPENDS b/e-17/exquisite/DEPENDS
index d5fce5d..dd8299e 100755
--- a/e-17/exquisite/DEPENDS
+++ b/e-17/exquisite/DEPENDS
@@ -1,6 +1,4 @@
-depends eet &&
-depends evas &&
+depends efl &&
depends ecore &&
-depends embryo &&
depends edje &&
depends subversion
diff --git a/e-17/exquisite/HISTORY b/e-17/exquisite/HISTORY
index 5e94442..513f486 100644
--- a/e-17/exquisite/HISTORY
+++ b/e-17/exquisite/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2008-09-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: CVS -> SVN
Remove unneeded modification of SPELL for SOURCE_URL
diff --git a/e-17/imlib2_loaders/DEPENDS b/e-17/imlib2_loaders/DEPENDS
index eb181e1..20a711b 100755
--- a/e-17/imlib2_loaders/DEPENDS
+++ b/e-17/imlib2_loaders/DEPENDS
@@ -1,6 +1,6 @@
depends imlib2 &&
depends edb &&
-depends eet &&
+depends efl &&
if [ "$IMLIB2_LOADERS_CVS" == "y" ]; then
depends CVS
diff --git a/e-17/imlib2_loaders/HISTORY b/e-17/imlib2_loaders/HISTORY
index 6691b5c..6f3b158 100644
--- a/e-17/imlib2_loaders/HISTORY
+++ b/e-17/imlib2_loaders/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2011-09-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.5
diff --git a/e-17/libeweather/DEPENDS b/e-17/libeweather/DEPENDS
index 97b7433..5bb4c48 100755
--- a/e-17/libeweather/DEPENDS
+++ b/e-17/libeweather/DEPENDS
@@ -1,5 +1,4 @@
-depends eina &&
+depends efl &&
depends ecore &&
depends edje &&
-depends evas &&
depends subversion
diff --git a/e-17/libeweather/HISTORY b/e-17/libeweather/HISTORY
index 0c77103..b84feb6 100644
--- a/e-17/libeweather/HISTORY
+++ b/e-17/libeweather/HISTORY
@@ -1,2 +1,5 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* New Spell: DETAILS, DEPENDS, PREPARE, PRE_BUILD
diff --git a/e-17/terminology/DEPENDS b/e-17/terminology/DEPENDS
index de3597c..b3fb2e5 100755
--- a/e-17/terminology/DEPENDS
+++ b/e-17/terminology/DEPENDS
@@ -1,5 +1,4 @@
-depends eina &&
-depends evas &&
+depends efl &&
depends ecore &&
depends emotion &&
depends elementary
diff --git a/e-17/terminology/HISTORY b/e-17/terminology/HISTORY
index bc0d59b..6170fda 100644
--- a/e-17/terminology/HISTORY
+++ b/e-17/terminology/HISTORY
@@ -1,3 +1,6 @@
+2012-11-24 Robin Cook <rcook AT wyrms.net>
+ * DEPENDS: changed to using efl
+
2012-10-31 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: elementary added
diff --git a/java/icedtea7/DETAILS b/java/icedtea7/DETAILS
index 75f10aa..6ffda43 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 6656d62..fbb4acb 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 c2e495b..d6c0cd4 100644
--- a/java/icedtea7/HISTORY
+++ b/java/icedtea7/HISTORY
@@ -1,3 +1,7 @@
+2012-10-19 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 2.3.3
+ * DOWNLOAD: udated changeset numbers
+
2012-06-17 Robin Cook <rcook AT 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 bd2dc28..bc678eb 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 0000000..e69de29
diff --git a/java/icedtea7/corba.tar.gz.sig b/java/icedtea7/corba.tar.gz.sig
index 99d65a5..b616196 100644
Binary files a/java/icedtea7/corba.tar.gz.sig and
b/java/icedtea7/corba.tar.gz.sig differ
diff --git a/java/icedtea7/hotspot.tar.gz.sig
b/java/icedtea7/hotspot.tar.gz.sig
index 4bb30e4..fca6123 100644
Binary files a/java/icedtea7/hotspot.tar.gz.sig and
b/java/icedtea7/hotspot.tar.gz.sig differ
diff --git a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
b/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
deleted file mode 100644
index 440e32e..0000000
--- a/java/icedtea7/icedtea-2.2.1-add_cacerts-1.patch
+++ /dev/null
@@ -1,543 +0,0 @@
-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
deleted file mode 100644
index 4f02dff..0000000
Binary files a/java/icedtea7/icedtea-2.2.1.tar.gz.sig and /dev/null differ
diff --git a/java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch
b/java/icedtea7/icedtea-2.3.1-add_cacerts-1.patch
new file mode 100644
index 0000000..440e32e
--- /dev/null
+++ b/java/icedtea7/icedtea-2.3.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.3.3.tar.gz.sig
b/java/icedtea7/icedtea-2.3.3.tar.gz.sig
new file mode 100644
index 0000000..55d4355
Binary files /dev/null and b/java/icedtea7/icedtea-2.3.3.tar.gz.sig 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 95f5708..b1085ae 100644
Binary files a/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig and
b/java/icedtea7/icedtea-bin-core-7.2.2.1-amd64.tar.bz2.sig 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 887c33b..0000000
--- 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.2.1-fixed_paths.patch
deleted file mode 100644
index c2d98d2..0000000
--- a/java/icedtea7/icedtea7-2.2.1-fixed_paths.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-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/icedtea7-2.3.1-fixed_paths.patch
b/java/icedtea7/icedtea7-2.3.1-fixed_paths.patch
new file mode 100644
index 0000000..c2d98d2
--- /dev/null
+++ b/java/icedtea7/icedtea7-2.3.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/jaxp.tar.gz.sig b/java/icedtea7/jaxp.tar.gz.sig
index 411d198..72a40e0 100644
Binary files a/java/icedtea7/jaxp.tar.gz.sig and
b/java/icedtea7/jaxp.tar.gz.sig differ
diff --git a/java/icedtea7/jaxws.tar.gz.sig b/java/icedtea7/jaxws.tar.gz.sig
index 4676510..ff2cfa8 100644
Binary files a/java/icedtea7/jaxws.tar.gz.sig and
b/java/icedtea7/jaxws.tar.gz.sig differ
diff --git a/java/icedtea7/jdk.tar.gz.sig b/java/icedtea7/jdk.tar.gz.sig
index 7605238..b3402bc 100644
Binary files a/java/icedtea7/jdk.tar.gz.sig and
b/java/icedtea7/jdk.tar.gz.sig differ
diff --git a/java/icedtea7/langtools.tar.gz.sig
b/java/icedtea7/langtools.tar.gz.sig
index 98bf8d1..2db4de0 100644
Binary files a/java/icedtea7/langtools.tar.gz.sig and
b/java/icedtea7/langtools.tar.gz.sig differ
diff --git a/java/icedtea7/openjdk.tar.gz.sig
b/java/icedtea7/openjdk.tar.gz.sig
index bd0158e..72c41ab 100644
Binary files a/java/icedtea7/openjdk.tar.gz.sig and
b/java/icedtea7/openjdk.tar.gz.sig differ
- [SM-Commit] GIT changes to master grimoire by Robin Cook (191f50477f9d7c3f6ebd62a1cdde07f1dfaedf07), Robin Cook, 12/02/2012
Archive powered by MHonArc 2.6.24.