Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (1c255bfc71c6f7da1aa334644733d4b25d2ceb9c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (1c255bfc71c6f7da1aa334644733d4b25d2ceb9c)
  • Date: Mon, 3 Dec 2012 16:57:44 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 3
crypto/libssh2/DETAILS | 2
crypto/libssh2/HISTORY | 3
database/mariadb/DETAILS | 6
database/mariadb/HISTORY | 3
database/redis/DETAILS | 4
database/redis/HISTORY | 3
dev/null |binary
devel/gdb/DETAILS | 2
devel/gdb/HISTORY | 3
devel/ltrace/DETAILS | 6
devel/ltrace/HISTORY | 3
e-17/e17/DEPENDS | 2
e-17/e17/HISTORY | 3
e-17/efl/CONFLICTS | 1
e-17/efl/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
editors/ed/DETAILS | 2
editors/ed/HISTORY | 3
http/firefox/DEPENDS | 1
http/firefox/DETAILS | 4
http/firefox/HISTORY | 4
http/seamonkey/DETAILS | 4
http/seamonkey/HISTORY | 3
http/xombrero/DETAILS | 2
http/xombrero/HISTORY | 3
http/xombrero/xombrero-1.3.1.tgz.sig | 0
http/xombrero/xombrero-1.4.0.tgz.sig |binary
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
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.53 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.20 | 5
libs/glibc/DETAILS | 10
libs/glibc/HISTORY | 3
libs/libqrencode/DEPENDS | 9
libs/libqrencode/DETAILS | 23
libs/libqrencode/HISTORY | 2
net/net-snmp/DETAILS | 2
net/net-snmp/HISTORY | 3
security/nmap/DETAILS | 4
security/nmap/HISTORY | 3
security/wireshark/DETAILS | 6
security/wireshark/HISTORY | 3
shell-term-fm/mksh/DETAILS | 6
shell-term-fm/mksh/HISTORY | 4
shell-term-fm/mksh/PRE_BUILD | 6
utils/smartmontools/DEPENDS | 4
utils/smartmontools/DETAILS | 4
utils/smartmontools/HISTORY | 4
video-libs/xine-lib/CONFIGURE | 27
video-libs/xine-lib/DEPENDS | 68 -
video-libs/xine-lib/HISTORY | 7
xfce/exo/DETAILS | 4
xfce/exo/HISTORY | 3
xfce/thunar/DETAILS | 4
xfce/thunar/HISTORY | 3
99 files changed, 969 insertions(+), 902 deletions(-)

New commits:
commit ad86d1ebbf5dac6c86cd891a0288fb056f4f61a4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

smartmontools: => 6.0

commit e164a7a6ab3c347f59f514b4913761007dd463fd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

net-snmp: => 5.7.2

commit a9d24dde7d3fc86dcd6a261a87228e384d7c1dc4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gdb: => 7.5.1

commit 5c08ca4906d5d3f52e8af72e0bcc9c4df8b50737
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

redis: => 2.6.7

commit 5fe7421b57338515d2443a78cc3d4e9d76a4d3b2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: => 5.2.13 (security)

commit 934a1e9d0fad4cc002373ef91ec7eb1100cb6fd3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

thunar: => 1.6.0

commit 46ed8fba6dff32c47f98b8590ff45a0cd830f8cd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exo: => 0.10.0

commit 167db4901b8767e63a46d84973f7c717ae9e294f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

efl contains ecore now

commit 528783a4132dee11c50548a985d97e08d4f3fafd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

ed 1.7

commit 6e1844dfc1215f9123748fa923a3a0566a4a7940
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 17.0.1

commit fef6d0b0f43d2ed0f3391fd935bd730bf4a2b536
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

xombrero 1.4.0

commit 443e3cfeec3c09ea32ddd7229f64ff5224cea4bd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

ltrace 0.7.1

commit a903bb4127a005cef8d5b67c77ac76838fca880a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libssh2 1.4.3

commit f2a97616dad552921222ac99d1c16b04ce1e2700
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wireshark 1.8.4, SECURITY_PATCH=40

commit 91415a129b02819706a3c222b22549211b706fc3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nmap 6.25

commit 6bb84d38f9b87708c69cc13ac24a807511aff67b
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

icedtea7: updated to 2.3.3

commit efbd9c89b751e0698df733e12551e0d4a9d8327a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.4.20 (lts)

commit 0ed16e7bbbf72d2673277f09a5ec1dddd3889f8a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.53 (lts)

commit f9758ae4ae3d7f7ef56916dc74cef4fc24d31ca4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

glibc: use 2.6.39 kernel headers instead of 2.6.39.4 due to removed
upstream sources

commit 51e084a5c8714c1e7b9636d474faf7da6c9a3f07
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: added optipng suggest dependency

commit 84e8c7cca759368a3f5fe6c6b58cbbe4b0ed3253
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: added internal and optional dependencies

commit 1acb4f4f777df82f8e6de2aa37ac1e32a84787f6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.14.1

commit 2d56536bec9fb42e522d552294ae34b4686641fb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mksh: => R41

commit 7eec2ddc364ed5c8a59f06d04788ff974673e012
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libqrencode: new spell, QR Code encoding library

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/ChangeLog b/ChangeLog
index a069c7d..cce9ef3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * libs/libqrencode: new spell, QR Code encoding library
+
2012-11-30 Vlad Glagolev <stealth AT sourcemage.org>
* xfce/tumbler: new spell, image thumbnailer service

diff --git a/crypto/libssh2/DETAILS b/crypto/libssh2/DETAILS
index 280b2d9..aba7133 100755
--- a/crypto/libssh2/DETAILS
+++ b/crypto/libssh2/DETAILS
@@ -1,5 +1,5 @@
SPELL=libssh2
- VERSION=1.4.2
+ VERSION=1.4.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index d771609..d727e22 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.3
+
2012-05-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2

diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 9261999..97a0b18 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,9 +1,9 @@
SPELL=mariadb
- VERSION=5.2.12
- SECURITY_PATCH=1
+ VERSION=5.2.13
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333
+
SOURCE_HASH=sha512:696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 63d39d3..652b119 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.13; SECURITY_PATCH++ (CVE-2012-5579)
+
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.12; SECURITY_PATCH=1 (CVE-2012-2122)
* DEPENDS: disabled system readline support
diff --git a/database/redis/DETAILS b/database/redis/DETAILS
index 6b0b9f5..b4badce 100755
--- a/database/redis/DETAILS
+++ b/database/redis/DETAILS
@@ -1,8 +1,8 @@
SPELL=redis
- VERSION=2.6.5
+ VERSION=2.6.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://redis.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:05acc3596db20a246a355849b393e2148b2d63d647ee6205cab134ff1a20a3c281ee217b601d67e483928b35a52392befd936f7888001b62ae5e96760af1404a
+
SOURCE_HASH=sha512:60ac4f5ae9fed038117cbcb5d81c0c1c6bb274ff9ed3792dbd5bac4bc5db835b87431c41a99ca1d455638171a587a27bdec882b175db69945d1493bcb62278cc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=BSD
WEB_SITE=http://redis.io/
diff --git a/database/redis/HISTORY b/database/redis/HISTORY
index 9112041..dfb5cf3 100644
--- a/database/redis/HISTORY
+++ b/database/redis/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.7
+
2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.5

diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index fed8ab3..ec09086 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdb
- VERSION=7.5
+ VERSION=7.5.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index ab9feac..309fe8e 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.5.1
+
2012-11-27 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: changed --with-libunwind to --with-libunwind-`uname -m`
* and --without also. --with-libunwind is deprecated
diff --git a/devel/ltrace/DETAILS b/devel/ltrace/DETAILS
index 05947a7..6a2932f 100755
--- a/devel/ltrace/DETAILS
+++ b/devel/ltrace/DETAILS
@@ -1,9 +1,9 @@
SPELL=ltrace
- VERSION=0.7.0
+ VERSION=0.7.1
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/3822/$SOURCE
-
SOURCE_HASH=sha512:8d6e362d9e99c55a16eddc903a8d5288c78b3f42712bae9e9248a82dbc6a37721fed8323eb06e71a8003410222d29b84424e941725d4cca18d873fe530325f26
+ SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/3844/$SOURCE
+
SOURCE_HASH=sha512:496f451823d2bc1c462eddc921721c8da217b82a627bd632a2b375c52fe41d1be6c88955dce37c546f29d14a35c4c975a3b6f1d0bdb32d330a503f25201f02f0
LICENSE[0]=GPL
WEB_SITE=http://ltrace.alioth.debian.org/
ENTERED=20020413
diff --git a/devel/ltrace/HISTORY b/devel/ltrace/HISTORY
index b8cced2..67b11dc 100644
--- a/devel/ltrace/HISTORY
+++ b/devel/ltrace/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.1
+
2012-11-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.0, SOURCE and SOURCE_URL[0] updated
* DETAILS, PRE_BUILD, ltrace_0.5-3.1.diff.gz: patch removed
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/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 855763f..5c8c707 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -2,4 +2,5 @@ conflicts eina &&
conflicts eet &&
conflicts embryo &&
conflicts evas &&
+conflicts ecore &&
conflicts eobj
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index c5bcbd8..46c060f 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,2 +1,5 @@
+2012-12-03 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: ecore added
+
2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD, CONFLICTS: spell created
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/editors/ed/DETAILS b/editors/ed/DETAILS
index 1278b80..270a8fb 100755
--- a/editors/ed/DETAILS
+++ b/editors/ed/DETAILS
@@ -1,5 +1,5 @@
SPELL=ed
- VERSION=1.6
+ VERSION=1.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/editors/ed/HISTORY b/editors/ed/HISTORY
index d690115..abb95a3 100644
--- a/editors/ed/HISTORY
+++ b/editors/ed/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 2797604..1a93daf 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,3 +1,4 @@
+depends castfs &&
depends atk &&
depends curl &&
depends -sub CXX gcc &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 577fdb0..ea302f8 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=17.0
+ VERSION=17.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=17.0
+ VERSION=17.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 79319d6..edbcc0d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.0.1
+ * DEPENDS: castfs added
+
2012-11-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 17.0, SECURITY_PATCH=57

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7921ebf..e70d879 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,8 +1,8 @@
SPELL=seamonkey
- VERSION=2.14
+ VERSION=2.14.1
SECURITY_PATCH=50
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:6afeb6d142f17e17786118daef6b1b519ba7d7c5279cd1212c966d0f49cfde70ab0f2f8c0e8687cb08117d075b66631ca87c86b5704ee26672c257d4f22b32dd
+
SOURCE_HASH=sha512:0a676523386df2fc61ca04f0f311d440f3871703a366b4966cd2dc8205c1be715c0dfc031421d9f68bc752c8932b758c33d5b683fc070a308e19af5dbc2445d2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index e06b6d8..1812cfd 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.14.1
+
2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.14; SECURITY_PATCH++
* mailnews.patch: updated
diff --git a/http/xombrero/DETAILS b/http/xombrero/DETAILS
index 355e689..478b65a 100755
--- a/http/xombrero/DETAILS
+++ b/http/xombrero/DETAILS
@@ -1,5 +1,5 @@
SPELL=xombrero
- VERSION=1.3.1
+ VERSION=1.4.0
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://opensource.conformal.com/snapshots/$SPELL/$SOURCE
diff --git a/http/xombrero/HISTORY b/http/xombrero/HISTORY
index 2f5f9bf..9fec8a4 100644
--- a/http/xombrero/HISTORY
+++ b/http/xombrero/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.0
+
2012-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.1

diff --git a/http/xombrero/xombrero-1.3.1.tgz.sig
b/http/xombrero/xombrero-1.3.1.tgz.sig
deleted file mode 100644
index 984f208..0000000
Binary files a/http/xombrero/xombrero-1.3.1.tgz.sig and /dev/null differ
diff --git a/http/xombrero/xombrero-1.4.0.tgz.sig
b/http/xombrero/xombrero-1.4.0.tgz.sig
new file mode 100644
index 0000000..d4360ba
Binary files /dev/null and b/http/xombrero/xombrero-1.4.0.tgz.sig differ
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
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index afdda6e..78140a8 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.53: added
+ * info/patches/maintenance_patches_3/patch-3.4.20: added
+
2012-11-27 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.6.8
* info/patches/maintenance_patches_3/patch-3.6.8: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.53
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.53
new file mode 100755
index 0000000..dcde558
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.53
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.53"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="f9dc53159955cf8748a41dbb009cc16eba0f665b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.20
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.20
new file mode 100755
index 0000000..4e2846b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.20
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.20"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="49ccd1045759aa6c40bfa06b04183bf0323a46c7"
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 98eac80..256b589 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -93,15 +93,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
SOURCE6_URL="${SOURCE3_URL}.sign"
- if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
- SOURCE7=patch-${HEADERS_VERSION}.bz2
- SOURCE8="${SOURCE7}.sign"
- SOURCE8_IGNORE=signature
- SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
- SOURCE8_URL="${SOURCE7_URL}.sign"
- fi
- fi
+ fi
fi
fi
WEB_SITE=http://www.gnu.org/software/libc
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 6ebca03..226bfde 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: fixed source urls for GLIBC_SANITIZE_HEADERS=y in 2.6
+
2012-09-06 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: specify slibdir to force install libs to /lib (fixes #411)
* PREPARE: scm-2.13 renamed to scm
diff --git a/libs/libqrencode/DEPENDS b/libs/libqrencode/DEPENDS
new file mode 100755
index 0000000..b42316f
--- /dev/null
+++ b/libs/libqrencode/DEPENDS
@@ -0,0 +1,9 @@
+optional_depends libpng \
+ "--with-tools" \
+ "--without-tools" \
+ "to build utility tools" &&
+
+optional_depends sdl \
+ "--with-tests" \
+ "--without-tests" \
+ "to build tests"
diff --git a/libs/libqrencode/DETAILS b/libs/libqrencode/DETAILS
new file mode 100755
index 0000000..7e022b3
--- /dev/null
+++ b/libs/libqrencode/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=libqrencode
+ SPELLX=qrencode
+ VERSION=3.4.1
+ SOURCE="${SPELLX}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://fukuchi.org/works/qrencode/${SOURCE}
+
SOURCE_HASH=sha512:5829697c5a7d137c3918dc0c0ec8505ad7fdc6deb7207d7fa8feb3856dedf1db5ec6de4a90c19a4a14f369a7cd513e15147c9b20d08bfb867a02b0eb5325d6ca
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=http://fukuchi.org/works/qrencode/
+ LICENSE[0]=LGPL
+ ENTERED=20121201
+ SHORT="QR Code encoding library"
+cat << EOF
+Libqrencode is a C library for encoding data in a QR Code symbol, a kind of
2D
+symbology that can be scanned by handy terminals such as a mobile phone with
+CCD. The capacity of QR Code is up to 7000 digits or 4000 characters, and is
+highly robust.
+
+This library is characterized by:
+
+ - Does not require any additional files at run time.
+ - Fast symbol encoding.
+ - Automatic optimization of input data.
+EOF
diff --git a/libs/libqrencode/HISTORY b/libs/libqrencode/HISTORY
new file mode 100644
index 0000000..bb89275
--- /dev/null
+++ b/libs/libqrencode/HISTORY
@@ -0,0 +1,2 @@
+2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: spell created
diff --git a/net/net-snmp/DETAILS b/net/net-snmp/DETAILS
index 1cdc44f..fd31864 100755
--- a/net/net-snmp/DETAILS
+++ b/net/net-snmp/DETAILS
@@ -1,5 +1,5 @@
SPELL=net-snmp
- VERSION=5.7.1
+ VERSION=5.7.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index a228be8..995f5a3 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.7.2
+
2012-08-27 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added, to prevent linking with itself (old libs) on
update

diff --git a/security/nmap/DETAILS b/security/nmap/DETAILS
index e5e3ee6..9905b4d 100755
--- a/security/nmap/DETAILS
+++ b/security/nmap/DETAILS
@@ -1,5 +1,5 @@
SPELL=nmap
- VERSION=6.01
+ VERSION=6.25
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[1]=http://sectools.org/nmap/sigs/$SOURCE2
# SOURCE_GPG=nmap.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_HASH=sha512:0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9
+
SOURCE_HASH=sha512:6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d
WEB_SITE=http://nmap.org/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index fccb14a..b44dbf6 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.25
+
2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.01

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index a3070c4..18be552 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.8.3
- SECURITY_PATCH=39
+ VERSION=1.8.4
+ SECURITY_PATCH=40
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:acc6a6fcbf86f67d3d5cb9cfbe4eed3699465f4687c2eca88fa51b417b3bbb68e80630ae5ace814e1a5dfd6f269b286237e4dcaafe510eb4ce87bde044413504
+
SOURCE_HASH=sha512:4f0b7fd181eb74c5eb03e4b5e74546f9f02aa3d481faed2b08a84d98f4a61d808a86e5348046d66f8333ba8f8921db344c2187a1590117ae4bdc2ff85a96d305
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 6ee662e..36513f9 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.4, SECURITY_PATCH=40
+
2012-10-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.3, SECURITY_PATCH=39

diff --git a/shell-term-fm/mksh/DETAILS b/shell-term-fm/mksh/DETAILS
index 5893f46..9d0d683 100755
--- a/shell-term-fm/mksh/DETAILS
+++ b/shell-term-fm/mksh/DETAILS
@@ -1,12 +1,12 @@
SPELL=mksh
- VERSION=R40f
- SOURCE=$SPELL-$VERSION.cpio.gz
+ VERSION=R41
+ SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://www.mirbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
SOURCE_URL[1]=http://pub.allbsd.org/MirOS/dist/mir/$SPELL/$SOURCE
WEB_SITE=http://www.mirbsd.org/mksh.htm
ENTERED=20060928
-
SOURCE_HASH=sha512:a396ef02aecd713d44597da286bac2bdfe12f12f9712ebc21825283f3900bfca5b79125ca7e191c9970bde761e7873fc68ad3c822238e70697d65eb373560c75
+
SOURCE_HASH=sha512:b28c52face5227964fee8dd60f088e4c0866c3572240a0d9529c31f49892f7589fb68db4ed58528b51e4dd7cfc1f94713755eb4cd0fc6bd257c39954f9a463f3
# I suggest to add this to the list (shortname MIROS or MIRBSD please)
LICENSE[0]=http://mirbsd.de/MirOS-Licence
SHORT="MirBSD Korn Shell"
diff --git a/shell-term-fm/mksh/HISTORY b/shell-term-fm/mksh/HISTORY
index 707d166..7eed051 100644
--- a/shell-term-fm/mksh/HISTORY
+++ b/shell-term-fm/mksh/HISTORY
@@ -1,3 +1,7 @@
+2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to R41; .cpio.gz -> .tgz
+ * PRE_BUILD: dropped, no longer needed
+
2012-04-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to R40f

diff --git a/shell-term-fm/mksh/PRE_BUILD b/shell-term-fm/mksh/PRE_BUILD
deleted file mode 100755
index ce0b943..0000000
--- a/shell-term-fm/mksh/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-verify_file &&
-mk_source_dir "$SOURCE_DIRECTORY" &&
-cd "$BUILD_DIRECTORY" &&
-
-# We need a cpio handler...
-gzip -dc "$SOURCE_CACHE/$SOURCE" | cpio -mid
diff --git a/utils/smartmontools/DEPENDS b/utils/smartmontools/DEPENDS
new file mode 100755
index 0000000..5830309
--- /dev/null
+++ b/utils/smartmontools/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends libselinux \
+ "--with-selinux" \
+ "--without-selinux" \
+ "for SELinux support"
diff --git a/utils/smartmontools/DETAILS b/utils/smartmontools/DETAILS
index e6acbb5..c6133b7 100755
--- a/utils/smartmontools/DETAILS
+++ b/utils/smartmontools/DETAILS
@@ -1,6 +1,6 @@
SPELL=smartmontools
- VERSION=5.42
-
SOURCE_HASH=sha512:0c3dc9fe41a874ef72152b94fe46bd367961012096529cfaea4e48a2c849770a6f2b5e92437359ad9cc7bc0b5c654093310bfaa2ee8726421c2a22386fc1278c
+ VERSION=6.0
+
SOURCE_HASH=sha512:85ff4ae574be5ef386754e33856154d56ff4f97ef1a88e80d037cefc1a58e5afec93a8769003f0b98bd655579503b217f48bea8483e287a4c2a74ebfb371f064
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/smartmontools/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/utils/smartmontools/HISTORY b/utils/smartmontools/HISTORY
index 98cb966..8f2dc2c 100644
--- a/utils/smartmontools/HISTORY
+++ b/utils/smartmontools/HISTORY
@@ -1,3 +1,7 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.0
+ * DEPENDS: added, for optional SELinux support
+
2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.42

diff --git a/video-libs/xine-lib/CONFIGURE b/video-libs/xine-lib/CONFIGURE
index dd357be..cb6527b 100755
--- a/video-libs/xine-lib/CONFIGURE
+++ b/video-libs/xine-lib/CONFIGURE
@@ -11,4 +11,29 @@ config_query_option XINE_LIB_OPTS \
# V4L 1 is deprecated
if list_find "$XINE_LIB_OPTS" "--enable-v4l"; then
list_remove "XINE_LIB_OPTS" "--enable-v4l"
-fi
+fi &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable support for a52dec decoding library?" y \
+ "" \
+ "--disable-a52dec" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable FAAD decoder support?" y \
+ "" \
+ "--disable-faad" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable DTS decoding library support?" y \
+ "" \
+ "--disable-dts" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable MAD decoding library support?" y \
+ "" \
+ "--disable-mad" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable Musepack decoding support?" y \
+ "" \
+ "--disable-musepack"
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 0308c0b..790c7ca 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -3,6 +3,11 @@ depends LIBAVCODEC &&
depends libcdio &&
depends vcdimager-unstable &&

+optional_depends libxdg-basedir \
+ "--with-external-libxdg-basedir" \
+ "--without-external-libxdg-basedir" \
+ "to use system version of libxdg-basedir" &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
@@ -107,34 +112,40 @@ if is_depends_enabled $SPELL speex; then
depends libogg
fi &&

-# not recommended as system libraries
-#
-# libdvdnav: --with-external-dvdnav
-
-optional_depends libmpcdec \
- "--enable-musepack" \
- "--disable-musepack" \
- "for Musepack decoding support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-musepack"; then
+ optional_depends libmpcdec \
+ "--enable-musepack" \
+ "--enable-musepack=internal" \
+ "to use system version of Musepack decoding library"
+fi &&

-optional_depends faad2 \
- "--enable-faad" \
- "--disable-faad" \
- "for FAAD decoder support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-faad"; then
+ optional_depends faad2 \
+ "--enable-faad" \
+ "--enable-faad=internal" \
+ "to use system version of FAAD decoder"
+fi &&

-optional_depends libdca \
- "--enable-dts" \
- "--disable-dts" \
- "for DTS decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-dts"; then
+ optional_depends libdca \
+ "--enable-dts" \
+ "--enable-dts=internal" \
+ "to use system version of DTS decoding library"
+fi &&

-optional_depends a52dec \
- "--enable-a52dec" \
- "--disable-a52dec" \
- "for a52dec decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-a52dec"; then
+ optional_depends a52dec \
+ "--enable-a52dec" \
+ "--enable-a52dec=internal" \
+ "to use system version of a52dec decoding library"
+fi &&

-optional_depends libmad \
- "--enable-mad" \
- "--disable-mad" \
- "for MAD decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-mad"; then
+ optional_depends libmad \
+ "--enable-mad" \
+ "--enable-mad=internal" \
+ "to use system version of MAD decoding library"
+fi &&

optional_depends libmodplug \
"--enable-modplug" \
@@ -167,6 +178,11 @@ if is_depends_enabled $SPELL freetype2; then
"--disable-antialiasing"
fi &&

+optional_depends libdvdnav \
+ "--with-external-dvdnav" \
+ "--without-external-dvdnav" \
+ "to use system version of dvdnav library
(${PROBLEM_COLOR}not recommended${DEFAULT_COLOR})" &&
+
optional_depends libdvdcss "" "" "to play encrypted DVDs" &&

optional_depends real-codecs \
@@ -207,4 +223,6 @@ optional_depends samba \
optional_depends libfame \
"--enable-dxr3" \
"--disable-dxr3" \
- "build DXR3/HW+ plugins"
+ "build DXR3/HW+ plugins" &&
+
+suggest_depends optipng "" "" "for PNG optimisation"
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index ad69eb7..75743c4 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,8 +1,15 @@
+2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added default selection for internal libraries
+ * DEPENDS: added switches between internal and external versions;
+ added dependencies: libxdg-basedir, libdvdnav (with a warning);
+ added optipng suggest dependency
+
2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libv4l -> v4l-utils

2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: replaced libdts with libdca
+
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.2; switched source to .xz

diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index c30ef59..1d3c6de 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,10 +1,10 @@
SPELL=exo
- VERSION=0.9.1
+ VERSION=0.10.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:c77c1e8e101894afcdee67180ff5047fb4b74c5819fb640e81981f03a59ed6df091bcb94e4a1b35e6642010ea25e39645911afda89e3f707cf40f4c5aae44d94
+
SOURCE_HASH=sha512:75ffd791b68e54613ac8f6f564a1ae476943415860f25c0a0d25ea283e231a1234667b5031ef2c8dc1d09c598b78f7140364d167530639ffd031f08fac5ac150
WEB_SITE=http://thunar.xfce.org/
ENTERED=20050101
LICENSE=LGPL
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index 9395c08..1e2643d 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.10.0
+
2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.1
* DEPENDS: dropped deprecated dependencies
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index ee7cfa4..7ba7cf6 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar
- VERSION=1.5.2
+ VERSION=1.6.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
-
SOURCE_HASH=sha512:d7ab13245db59e37b8c71ede15a076127746be6a3119e0ef65a996ac260476c483513e310fd236fafc46bd8ee8d5617a9fbdfeb5225b6dba5ccc111ed55ef6c2
+
SOURCE_HASH=sha512:f869b3cb27bdf664d0ec7c39e2019cc3ddcbcb474c53efd3cda56777a570800b51d3792d9c9c4232a17e4ef10156562085b211047cff2c668846e98fe7a641ad
LICENSE[0]=GPL
LICENSE[1]=LGPL
ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 95eb5db..b0dafea 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.0
+
2012-11-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.5.2
* DEPENDS: dropped deprecated dependencies



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (1c255bfc71c6f7da1aa334644733d4b25d2ceb9c), Eric Sandall, 12/03/2012

Archive powered by MHonArc 2.6.24.

Top of Page