Skip to Content.
Sympa Menu

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

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 (706885ae6e87262cf459cb6fadc3ab44db43794a)
  • Date: Fri, 9 Mar 2012 17:28:49 -0600

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

ChangeLog | 4
dev/null |binary
doc/zathura-pdf-poppler/BUILD | 1
doc/zathura-pdf-poppler/DEPENDS | 2
doc/zathura-pdf-poppler/DETAILS | 14
doc/zathura-pdf-poppler/HISTORY | 2
doc/zathura-pdf-poppler/INSTALL | 1
doc/zathura/DEPENDS | 4
doc/zathura/DETAILS | 6
doc/zathura/HISTORY | 5
doc/zathura/PRE_BUILD | 4
graphics-libs/freetype2/DETAILS | 4
graphics-libs/freetype2/HISTORY | 3
graphics/feh/DETAILS | 2
graphics/feh/HISTORY | 3
http/midori/DETAILS | 4
http/midori/HISTORY | 3
java/icedtea6/BUILD | 15
java/icedtea6/DEPENDS | 10
java/icedtea6/DETAILS | 41 -
java/icedtea6/FINAL | 6
java/icedtea6/HISTORY | 12
java/icedtea6/PREPARE | 3
java/icedtea6/PRE_BUILD | 10
java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch | 230 ------
java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig |binary
java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig |binary
java/icedtea6/icedtea6-1.10.4-fixed_paths.patch | 147 ----
java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch | 397
-----------
java/icedtea6/icedtea6-1.11.1-fixed_paths.patch | 133 +++
java/icedtea6/icedtea6-1.11.1-generate_cacerts-1.patch | 331 +++++++++
java/icedtea6/icedtea6-1.11.1.tar.gz.sig |binary
java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig | 0
java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig | 0
java/icedtea6/icedtea6-hg-fixed_paths.patch | 133 ---
java/icedtea6/icedtea6-hg-generate_cacerts-1.patch | 331 ---------
java/icedtea6/jaxp144_01.zip.sig | 0
java/icedtea6/jdk6-jaxws-b20.zip.sig | 0
java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig | 0
libs/girara/BUILD | 1
libs/girara/DEPENDS | 1
libs/girara/DETAILS | 18
libs/girara/HISTORY | 2
libs/girara/INSTALL | 1
mail/dspam/BUILD | 3
mail/dspam/DEPENDS | 15
mail/dspam/DETAILS | 1
mail/dspam/HISTORY | 11
mail/dspam/PRE_BUILD | 4
mail/dspam/init.d/dspam | 12
mail/dspam/rset.patch | 62 +
net/tcpflow/DETAILS | 8
net/tcpflow/HISTORY | 3
net/whois/DETAILS | 6
net/whois/HISTORY | 3
science/pcb/BUILD | 3
science/pcb/CONFIGURE | 17
science/pcb/DEPENDS | 23
science/pcb/DETAILS | 6
science/pcb/HISTORY | 4
utils/desktop-file-utils/DETAILS | 4
utils/desktop-file-utils/HISTORY | 3
utils/desktop-file-utils/desktop-file-utils-0.18.tar.bz2.sig | 0
utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig |binary
utils/newsyslog/0AFC7476.gpg | 0
utils/newsyslog/5736DE75.gpg |binary
utils/newsyslog/DETAILS | 4
utils/newsyslog/HISTORY | 5
68 files changed, 748 insertions(+), 1333 deletions(-)

New commits:
commit 4f5b4955c7128a4fc14a4987dcaad0c06c274515
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

icedtea6: updated to 1.11.1

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

dspam: fixed daemon crash in some case (official patch)

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

midori 0.4.4

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

dspam: renewed init script

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

freetype2 2.4.9, SECURITY_PATCH=7

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

doc/zathura-pdf-poppler: new spell, PDF support for zathura

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

zathura 0.1.0

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

libs/girara: new spell, user interface library

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

tcpflow 1.2.1

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

whois 5.0.15

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

feh 2.4

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

desktop-file-utils 0.20

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

newsyslog: => 1.9

commit 8501a9c15da6d5a6a94a541e099c92792bd54fe2
Author: Sven Lemke <catnip AT web.de>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pcb: update to 20110918

Acked-by: Ismael Luceno <ismael AT sourcemage.org>

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

dspam: added sqlite2 storage driver

diff --git a/ChangeLog b/ChangeLog
index 1874357..857d759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * libs/girara: new spell, user interface library
+ * doc/zathura-pdf-poppler: new spell, PDF support for zathura
+
2012-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* devel/wdiff: new spell, a front end to diff for comparing files on
a word
per word basis
diff --git a/doc/zathura-pdf-poppler/BUILD b/doc/zathura-pdf-poppler/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/doc/zathura-pdf-poppler/BUILD
@@ -0,0 +1 @@
+make
diff --git a/doc/zathura-pdf-poppler/DEPENDS b/doc/zathura-pdf-poppler/DEPENDS
new file mode 100755
index 0000000..7fd33f4
--- /dev/null
+++ b/doc/zathura-pdf-poppler/DEPENDS
@@ -0,0 +1,2 @@
+depends zathura &&
+depends poppler
diff --git a/doc/zathura-pdf-poppler/DETAILS b/doc/zathura-pdf-poppler/DETAILS
new file mode 100755
index 0000000..75b86a7
--- /dev/null
+++ b/doc/zathura-pdf-poppler/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=zathura-pdf-poppler
+ VERSION=0.1.0
+
SOURCE_HASH=sha512:d43019dedfc1e17f300779b0311241c12c41301c963d3c4773decc0356ee44efb1f00e7fa9dd32221c5c236f01f29ccae50113dfcbbf579c7928a62e9eb8b265
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://pwmt.org/projects/zathura/download/$SOURCE
+ WEB_SITE=http://pwmt.org/projects/zathura
+ ENTERED=20120309
+ LICENSE[0]=ZLIB
+ SHORT="plugin adds PDF support to zathura"
+cat << EOF
+The zathura-pdf-poppler plugin adds PDF support to zathura by using the
poppler
+rendering engine.
+EOF
diff --git a/doc/zathura-pdf-poppler/HISTORY b/doc/zathura-pdf-poppler/HISTORY
new file mode 100644
index 0000000..06587f0
--- /dev/null
+++ b/doc/zathura-pdf-poppler/HISTORY
@@ -0,0 +1,2 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 0.1.0
diff --git a/doc/zathura-pdf-poppler/INSTALL b/doc/zathura-pdf-poppler/INSTALL
new file mode 100755
index 0000000..621f3f8
--- /dev/null
+++ b/doc/zathura-pdf-poppler/INSTALL
@@ -0,0 +1 @@
+make PREFIX=${INSTALL_ROOT}/usr install
diff --git a/doc/zathura/DEPENDS b/doc/zathura/DEPENDS
index 1407c7e..d9c7415 100755
--- a/doc/zathura/DEPENDS
+++ b/doc/zathura/DEPENDS
@@ -1,3 +1,3 @@
-depends poppler &&
depends gtk+2 &&
-depends cairo
+depends girara &&
+depends docutils
diff --git a/doc/zathura/DETAILS b/doc/zathura/DETAILS
index 0dc9cdf..d87e059 100755
--- a/doc/zathura/DETAILS
+++ b/doc/zathura/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura
- VERSION=0.0.8.5
-
SOURCE_HASH=sha512:4f8d483ad4f08ee9d5b95dfe8db6edb82dce8b40966a22ba7701aeefe50ae74695ac0895f819ef3249de90c93e6d3ba6c12d9776fe693948a4c42292afadf59b
+ VERSION=0.1.0
+
SOURCE_HASH=sha512:48966be7a59f18defa2dfe5fcc058b85d3a95adcd209a43a9e6eb9ac492c72048e61294d34646b1cc52b9f52b10e047e0f0f71fe27a563c44abaffa7700d3427
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://pwmt.org/download/$SOURCE
+ SOURCE_URL[0]=http://pwmt.org/projects/zathura/download/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
WEB_SITE=http://pwmt.org/projects/zathura
ENTERED=20100725
diff --git a/doc/zathura/HISTORY b/doc/zathura/HISTORY
index e800db3..380a391 100644
--- a/doc/zathura/HISTORY
+++ b/doc/zathura/HISTORY
@@ -1,3 +1,8 @@
+2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.1.0, SOURCE_URL[0] updated
+ * DEPENDS: girara and docutils added, poppler removed
+ * PRE_BUILD: added, rst2man -> rst2man.py in Makefile
+
2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 0.0.8.5
* INSTALL: ensure INSTALL_ROOT is used
diff --git a/doc/zathura/PRE_BUILD b/doc/zathura/PRE_BUILD
new file mode 100755
index 0000000..503dd60
--- /dev/null
+++ b/doc/zathura/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i 's:rst2man:rst2man.py:' Makefile
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 3874d32..bc2559b 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,6 +1,6 @@
SPELL=freetype2
- VERSION=2.4.8
- SECURITY_PATCH=6
+ VERSION=2.4.9
+ SECURITY_PATCH=7
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/freetype-$VERSION"
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index af96852..3bbb23e 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,6 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.9, SECURITY_PATCH=7
+
2011-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.8, SECURITY_PATCH=6, CVE-2011-3439

diff --git a/graphics/feh/DETAILS b/graphics/feh/DETAILS
index daadf8f..4047ce8 100755
--- a/graphics/feh/DETAILS
+++ b/graphics/feh/DETAILS
@@ -1,5 +1,5 @@
SPELL=feh
- VERSION=2.3
+ VERSION=2.4
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index 51f0cab..a8ec118 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,6 @@
+2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4
+
2012-02-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3

diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 7e7c023..f39a6a7 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -11,11 +11,11 @@ if [[ $MIDORI_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=0.4.3
+ VERSION=0.4.4
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:98e08d85c3a2b1c0b52199967a2de1644580052f5e6bd0177714e71416e31a972b3dbd7d9791aa45731483c691d07f426796251d63e0c35ddebd93e61b9add82
+
SOURCE_HASH=sha512:328df9f40d035f3458c749a1d5f2e4d6f77fb17abd8e38a045897f750e444e960772636e82fbf76269a0c4fe430840120f0e936a715615b9eadb2b20205663ee
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 702eaa1..b063570 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.4.4
+
2012-01-15 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix SOURCE_DIRECTORY for scm version.

diff --git a/java/icedtea6/BUILD b/java/icedtea6/BUILD
index 6d5a5e1..ffd9a47 100755
--- a/java/icedtea6/BUILD
+++ b/java/icedtea6/BUILD
@@ -1,11 +1,12 @@
-export PATH_HOLD="${PATH}" &&
-export JAVA_HOME="$BUILD_DIRECTORY/icedtea6-bin-1.10.4" &&
-export CLASSPATH=".:/usr/share/java" &&
-export PATH="${PATH}:${JAVA_HOME}/bin" &&
+export PATH_HOLD="${PATH}" &&
+export JAVA_HOME="$BUILD_DIRECTORY/icedtea-bin-6.1.11.1" &&
+export CLASSPATH=".:/usr/share/java" &&
+export PATH="${PATH}:${JAVA_HOME}/bin" &&

-OPTS="$ICEDTEA6_DOCS $ICEDTEA6_OPT $ICEDTEA6_PARA $OPTS" &&
-OPTS="--with-tzdata-dir=/usr/share/zoneinfo $OPTS" &&
-OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea6-bin-1.10.4 $OPTS" &&
+OPTS="$ICEDTEA6_DOCS $ICEDTEA6_OPT $ICEDTEA6_PARA $OPTS" &&
+OPTS="--with-tzdata-dir=/usr/share/zoneinfo $OPTS" &&
+OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea-bin-6.1.11.1 $OPTS" &&
+OPTS="--disable-bootstrap $OPTS" &&

unset JAVA_HOME &&

diff --git a/java/icedtea6/DEPENDS b/java/icedtea6/DEPENDS
index fe59933..770663e 100755
--- a/java/icedtea6/DEPENDS
+++ b/java/icedtea6/DEPENDS
@@ -1,7 +1,5 @@
-depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends gcc
&&
depends -sub CXX gcc
&&
-depends -sub JAVA gcc
&&
-depends -sub JAVAHOME gcc
&&
depends lsb-release
&&
depends pkgconfig
&&
depends zip
&&
@@ -9,11 +7,17 @@ depends unzip
&&
depends libxslt
&&
depends ant "--with-ant-home=/opt/ant"
&&
depends cups
&&
+depends giflib
&&
depends JPEG
&&
depends libpng
&&
depends alsa-lib
&&
depends xproto
&&
depends libx11
&&
+depends libxext
&&
+depends libxi
&&
+depends libxtst
&&
+depends libxau
&&
+depends libxdmcp
&&
depends libxt
&&
depends libxp
&&
depends libxinerama
&&
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
index 18a68c3..f365072 100755
--- a/java/icedtea6/DETAILS
+++ b/java/icedtea6/DETAILS
@@ -1,44 +1,29 @@
SPELL=icedtea6
-if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
- if [ "$ICEDTEA6_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=hg
- fi
- SOURCE=$SPELL-hg.tar.bz2
+ VERSION=1.11.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
+ SOURCE4=jdk6-jaf-b20.zip
SOURCE5=jaxp144_03.zip
+# SOURCE5=jaxp145_01.zip
SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
-FORCE_DOWNLOAD[1]=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
- SOURCE_URL[0]=hg_http://icedtea.classpath.org/hg/$SPELL:$SPELL-hg
- SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b24/$SOURCE3
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.10.4
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
- SOURCE3=openjdk-6-src-b22-28_feb_2011.tar.gz
- SOURCE5=jaxp144_01.zip
- SOURCE6=jdk6-jaxws-b20.zip
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG="icedtea.gpg:${SOURCE2}:UPSTREAM_KEY"
- SOURCE2_IGNORE=signature
SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
+ SOURCE2_IGNORE=signature
SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
- SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b22/$SOURCE3
-fi
- SOURCE4=jdk6-jaf-b20.zip
+ SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b24/$SOURCE3
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_GPG="icedtea.gpg:${SOURCE2}:UPSTREAM_KEY"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
- SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ SOURCE7=icedtea-bin-core-6.1.11.1-x86.tar.bz2
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
- SOURCE7=icedtea6-bin-core-1.10.4-amd64.tar.bz2
+ SOURCE7=icedtea-bin-core-6.1.11.1-amd64.tar.bz2
else
- SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ SOURCE7=icedtea-bin-core-6.1.11.1-x86.tar.bz2
fi
;;
esac
diff --git a/java/icedtea6/FINAL b/java/icedtea6/FINAL
index 1b4e0f1..90ca98f 100755
--- a/java/icedtea6/FINAL
+++ b/java/icedtea6/FINAL
@@ -1,5 +1,5 @@
-default_final &&
-rm -rf $BUILD_DIRECTORY/doc &&
-rm -rf $BUILD_DIRECTORY/icedtea6-bin-1.10.4 &&
+default_final &&
+rm -rf $BUILD_DIRECTORY/doc &&
+rm -rf $BUILD_DIRECTORY/icedtea-bin-6.1.11.1 &&
export PATH="$PATH_HOLD"

diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
new file mode 100644
index 0000000..e612a92
--- /dev/null
+++ b/java/icedtea6/HISTORY
@@ -0,0 +1,12 @@
+2012-03-09 Robin Cook <rcook AT wyrms.net>
+ * BUILD: updated to 1.11
+ * DETAILS: updated to 1.11, removed scm option
+ * DEPENDS: removed gcj depends
+ added giflib, libxext, libxi, libxtst, libxau, libxdmcp
+ * FINAL: updated to 1.11
+ * PRE_BUILD: removed uneeded patches
+ * PREPARE: removed
+
+2011-10-23 Robin Cook <rcook AT wyrms.net>
+ * New Spell: BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, INSTALL,
+ PRE_BUILD, PREPARE, PROVIDES
diff --git a/java/icedtea6/PREPARE b/java/icedtea6/PREPARE
deleted file mode 100755
index 83f15d3..0000000
--- a/java/icedtea6/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
-
diff --git a/java/icedtea6/PRE_BUILD b/java/icedtea6/PRE_BUILD
index 609977f..0a9769a 100755
--- a/java/icedtea6/PRE_BUILD
+++ b/java/icedtea6/PRE_BUILD
@@ -11,14 +11,8 @@ verify_file 6 &&
cp $SOURCE_CACHE/$SOURCE6 ./drops &&


-if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-generate_cacerts-1.patch
&&
- patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-fixed_paths.patch

-else
- patch -p1 <
$SCRIPT_DIRECTORY/backport-xsltproc-replacement-1.10.4-01.patch &&
- patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.10.4-generate_cacerts-1.patch
&&
- patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.10.4-fixed_paths.patch

-fi &&
+patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.11.1-generate_cacerts-1.patch
&&
+patch -p1 < $SCRIPT_DIRECTORY/icedtea6-1.11.1-fixed_paths.patch


cd $BUILD_DIRECTORY &&
diff --git a/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
b/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
deleted file mode 100644
index 16bf436..0000000
--- a/java/icedtea6/backport-xsltproc-replacement-1.10.4-01.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
---- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
-+++ icedtea6-mod/acinclude.m4 2011-10-27 19:22:33.939728683 -0500
-@@ -630,101 +630,6 @@
- AC_SUBST(ALT_JAR_CMD)
- ])
-
--AC_DEFUN([IT_FIND_XALAN2_JAR],
--[
-- AC_MSG_CHECKING([for a xalan2 jar])
-- AC_ARG_WITH([xalan2-jar],
-- [AS_HELP_STRING(--with-xalan2-jar,specify location of the
xalan2 jar)],
-- [
-- if test -f "${withval}" ; then
-- XALAN2_JAR="${withval}"
-- fi
-- ],
-- [
-- XALAN2_JAR=
-- ])
-- if test -z "${XALAN2_JAR}"; then
-- if test -e "/usr/share/java/xalan-j2.jar"; then
-- XALAN2_JAR=/usr/share/java/xalan-j2.jar
-- elif test -e "/usr/share/java/xalan2.jar"; then
-- XALAN2_JAR=/usr/share/java/xalan2.jar
-- elif test -e "/usr/share/xalan/lib/xalan.jar"; then
-- XALAN2_JAR=/usr/share/xalan/lib/xalan.jar
-- else
-- AC_MSG_RESULT(no)
-- fi
-- fi
-- if test -z "${XALAN2_JAR}"; then
-- AC_MSG_ERROR("A xalan2 jar was not found.")
-- fi
-- AC_MSG_RESULT(${XALAN2_JAR})
-- AC_SUBST(XALAN2_JAR)
--])
--
--AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR],
--[
-- AC_MSG_CHECKING([for a xalan2 serializer jar])
-- AC_ARG_WITH([xalan2-serializer-jar],
-- [AS_HELP_STRING(--with-xalan2-serializer-jar,specify location
of the xalan2-serializer jar)],
-- [
-- if test -f "${withval}" ; then
-- XALAN2_SERIALIZER_JAR="${withval}"
-- fi
-- ],
-- [
-- XALAN2_SERIALIZER_JAR=
-- ])
-- if test -z "${XALAN2_SERIALIZER_JAR}"; then
-- if test -e "/usr/share/java/xalan-j2-serializer.jar"; then
-- XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar
-- elif test -e "/usr/share/xalan-serializer/lib/serializer.jar"; then
-- XALAN2_SERIALIZER_JAR=/usr/share/xalan-serializer/lib/serializer.jar
-- elif test -e "/usr/share/java/serializer.jar"; then
-- XALAN2_SERIALIZER_JAR=/usr/share/java/serializer.jar
-- else
-- AC_MSG_RESULT(no)
-- fi
-- fi
-- if test -z "${XALAN2_SERIALIZER_JAR}"; then
-- AC_MSG_ERROR("A xalan2-serializer jar was not found.")
-- fi
-- AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
-- AC_SUBST(XALAN2_SERIALIZER_JAR)
--])
--
--AC_DEFUN([IT_FIND_XERCES2_JAR],
--[
-- AC_MSG_CHECKING([for a xerces2 jar])
-- AC_ARG_WITH([xerces2-jar],
-- [AS_HELP_STRING(--with-xerces2-jar,specify location of the
xerces2 jar)],
-- [
-- if test -f "${withval}" ; then
-- XERCES2_JAR="${withval}"
-- fi
-- ],
-- [
-- XERCES2_JAR=
-- ])
-- if test -z "${XERCES2_JAR}"; then
-- if test -e "/usr/share/java/xerces-j2.jar"; then
-- XERCES2_JAR=/usr/share/java/xerces-j2.jar
-- elif test -e "/usr/share/java/xerces2.jar"; then
-- XERCES2_JAR=/usr/share/java/xerces2.jar
-- elif test -e "/usr/share/xerces-2/lib/xercesImpl.jar"; then
-- XERCES2_JAR=/usr/share/xerces-2/lib/xercesImpl.jar
-- elif test -e "/usr/share/java/xercesImpl.jar"; then
-- XERCES2_JAR=/usr/share/java/xercesImpl.jar
-- else
-- AC_MSG_RESULT(no)
-- fi
-- fi
-- if test -z "${XERCES2_JAR}"; then
-- AC_MSG_ERROR("A xerces2 jar was not found.")
-- fi
-- AC_MSG_RESULT(${XERCES2_JAR})
-- AC_SUBST(XERCES2_JAR)
--])
--
- AC_DEFUN([IT_FIND_RHINO_JAR],
- [
- AC_MSG_CHECKING([whether to include Javascript support via Rhino])
-diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
---- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
-+++ icedtea6-mod/configure.ac 2011-10-27 19:24:20.455728608 -0500
-@@ -156,9 +156,7 @@
- IT_FIND_NATIVE2ASCII
- if test "x$enable_bootstrap" = "xyes"; then
- IT_FIND_ECJ_JAR
-- IT_FIND_XALAN2_JAR
-- IT_FIND_XALAN2_SERIALIZER_JAR
-- IT_FIND_XERCES2_JAR
-+ IT_FIND_TOOL([XSLTPROC], [xsltproc])
- fi
- AC_CONFIG_FILES([javac], [chmod +x javac])
- AC_CONFIG_FILES([javap], [chmod +x javap])
-diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
---- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
-+++ icedtea6-mod/Makefile.am 2011-10-27 19:20:27.399728763 -0500
-@@ -40,7 +40,6 @@
- ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
- ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
- BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
--ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
- ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
- ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
- JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-@@ -436,7 +435,9 @@
- patches/ecj/jaxp-dependency.patch \
- patches/ecj/bootver.patch \
- patches/ecj/getannotation-cast.patch \
-- patches/ecj/override.patch
-+ patches/ecj/override.patch \
-+ patches/ecj/xsltproc.patch
-+
-
- if DTDTYPE_QNAME
- ICEDTEA_ECJ_PATCHES += \
-@@ -491,8 +492,6 @@
- ALT_BOOTDIR="$(BOOT_DIR)" \
- BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
- ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
-- ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
-- ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
- CLASSPATH="" \
- LD_LIBRARY_PATH="" \
- ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-@@ -580,7 +579,8 @@
- JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
- JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
- DISABLE_NIMBUS="true" \
-- NO_DOCS="true"
-+ NO_DOCS="true" \
-+ XSLT="$(XSLTPROC)"
-
- # Source files
- # FIXME (distclean): Add generated file list
-@@ -1271,11 +1271,6 @@
- ln -sf $(NATIVE2ASCII) $(ECJ_BOOT_DIR)/bin/native2ascii
- ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac
- ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap
-- mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \
-- ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
-- ln -sf $(XALAN2_SERIALIZER_JAR) \
-- $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
-- ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
- mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
- cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar &&
\
- ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
-diff -urN icedtea6-1.10.4/patches/ecj/xsltproc.patch
icedtea6-mod/patches/ecj/xsltproc.patch
---- icedtea6-1.10.4/patches/ecj/xsltproc.patch 1969-12-31 18:00:00.000000000
-0600
-+++ icedtea6-mod/patches/ecj/xsltproc.patch 2011-10-27 19:28:04.711728486
-0500
-@@ -0,0 +1,54 @@
-+diff -r 591c7dc0b2ee make/linux/makefiles/jvmti.make
-+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make Thu May 19
13:27:44 2011 +0200
-++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make Wed May 25 20:01:25
2011 +0100
-+@@ -59,8 +59,6 @@
-+
-+ JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
-+
-+-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath
$(JvmtiOutDir) jvmtiGen
-+-
-+ .PHONY: all jvmtidocs clean cleanall
-+
-+ # #########################################################################
-+@@ -77,34 +75,34 @@
-+
-+ $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL
$(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM
interface jvmti
-++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnter.cpp --stringparam interface
jvmti $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml
-+
-+ $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass)
$(InterpreterSrcDir)/bytecodeInterpreter.cpp
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
-XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
-++ $(XSLT) -o $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
$(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml
-+
-+ $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL
$(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM
interface jvmti -PARAM trace Trace
-++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnterTrace.cpp --stringparam interface
jvmti --stringparam trace Trace $(JvmtiSrcDir)/jvmtiEnter.xsl
$(JvmtiSrcDir)/jvmti.xml
-+
-+ $(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both)
$(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl
-OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
-++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnvStub.cpp
$(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmti.xml
-+ $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir)
jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp
-+
-+ $(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl
-OUT $(JvmtiOutDir)/jvmtiEnv.hpp
-++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnv.hpp $(JvmtiSrcDir)/jvmtiHpp.xsl
$(JvmtiSrcDir)/jvmti.xml
-+
-+ $(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl
-OUT $(JvmtiOutDir)/jvmti.h
-++ $(XSLT) -o $(JvmtiOutDir)/jvmti.h $(JvmtiSrcDir)/jvmtiH.xsl
$(JvmtiSrcDir)/jvmti.xml
-+
-+ jvmtidocs: $(JvmtiOutDir)/jvmti.html
-+
-+ $(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
-+ @echo Generating $@
-+- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl
-OUT $(JvmtiOutDir)/jvmti.html
-++ $(XSLT) -o $(JvmtiOutDir)/jvmti.html $(JvmtiSrcDir)/jvmti.xsl
$(JvmtiSrcDir)/jvmti.xml
-+
-+ # #########################################################################
-+
diff --git a/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig
b/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig
new file mode 100644
index 0000000..1d572e9
Binary files /dev/null and
b/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig differ
diff --git a/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig
b/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig
new file mode 100644
index 0000000..96ef44f
Binary files /dev/null and
b/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig differ
diff --git a/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
b/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
deleted file mode 100644
index e6984e8..0000000
--- a/java/icedtea6/icedtea6-1.10.4-fixed_paths.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -urN icedtea6-1.10.4/Makefile.am icedtea6-1.10.4-mod/Makefile.am
---- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
-+++ icedtea6-1.10.4-mod/Makefile.am 2011-12-06 21:57:16.152407873 -0600
-@@ -314,6 +314,7 @@
- patches/numa_on_early_glibc.patch \
- patches/jtreg-international-fonts.patch \
- patches/openjdk/6967436-6976265-6967434-pisces.patch \
-+ patches/openjdk6-b22-smgl-paths.patch \
- patches/f14-fonts.patch \
- patches/jtreg-T6638712-fix.patch \
- patches/jtreg-T6650759m-fix.patch \
-diff -urN icedtea6-1.10.4/patches/hotspot/original/too-many-args.patch
icedtea6-1.10.4-mod/patches/hotspot/original/too-many-args.patch
---- icedtea6-1.10.4/patches/hotspot/original/too-many-args.patch
2011-05-25 11:34:31.779471406 -0500
-+++ icedtea6-1.10.4-mod/patches/hotspot/original/too-many-args.patch
2011-12-06 21:58:17.813407168 -0600
-@@ -1,8 +1,8 @@
- --- openjdk/hotspot/make/linux/makefiles/sa.make.orig 2010-06-21
23:12:13.000000000 +0200
- +++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-06-28
01:11:27.022322578 +0200
- @@ -45,6 +45,9 @@
-- AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-- AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-+ AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-+ AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-
- +AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list
- +AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list
-diff -urN icedtea6-1.10.4/patches/openjdk6-b22-smgl-paths.patch
icedtea6-1.10.4-mod/patches/openjdk6-b22-smgl-paths.patch
---- icedtea6-1.10.4/patches/openjdk6-b22-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
-+++ icedtea6-1.10.4-mod/patches/openjdk6-b22-smgl-paths.patch 2011-12-06
21:57:16.153407886 -0600
-@@ -0,0 +1,118 @@
-+diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk
openjdk-mod/corba/make/common/shared/Defs-utils.gmk
-+--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-02-28
10:02:15.000000000 -0600
-++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06
21:26:52.565428298 -0600
-+@@ -85,15 +85,15 @@
-+ DIFF = $(UTILS_USR_BIN_PATH)diff
-+ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-+ ECHO = $(UTILS_COMMAND_PATH)echo
-+-EGREP = $(UTILS_COMMAND_PATH)egrep
-++EGREP = $(UTILS_USR_BIN_PATH)egrep
-+ EXPR = $(UTILS_USR_BIN_PATH)expr
-+ FILE = $(UTILS_USR_BIN_PATH)file
-+ FIND = $(UTILS_USR_BIN_PATH)find
-+ FMT = $(UTILS_COMMAND_PATH)fmt
-+ GDB = $(UTILS_USR_BIN_PATH)gdb
-+-GREP = $(UTILS_COMMAND_PATH)grep
-++GREP = $(UTILS_USR_BIN_PATH)grep
-+ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-+-HEAD = $(UTILS_USR_BIN_PATH)head
-++HEAD = $(UTILS_COMMAND_PATH)head
-+ ID = $(UTILS_COMMAND_PATH)id
-+ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-+ KSH = $(UTILS_COMMAND_PATH)ksh
-+@@ -122,9 +122,9 @@
-+ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-+ SORT = $(UTILS_COMMAND_PATH)sort
-+ STRIP = $(UTILS_CCS_BIN_PATH)strip
-+-TAIL = $(UTILS_USR_BIN_PATH)tail
-++TAIL = $(UTILS_COMMAND_PATH)tail
-+ TAR = $(UTILS_COMMAND_PATH)tar
-+-TEST = $(UTILS_USR_BIN_PATH)test
-++TEST = $(UTILS_COMMAND_PATH)test
-+ TOUCH = $(UTILS_COMMAND_PATH)touch
-+ TR = $(UTILS_USR_BIN_PATH)tr
-+ TRUE = $(UTILS_COMMAND_PATH)true
-+@@ -132,7 +132,7 @@
-+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
-+ UNZIP = $(UTILS_USR_BIN_PATH)unzip
-+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-+-WC = $(UTILS_USR_BIN_PATH)wc
-++WC = $(UTILS_COMMAND_PATH)wc
-+ WHICH = $(UTILS_USR_BIN_PATH)which
-+ YACC = $(UTILS_CCS_BIN_PATH)yacc
-+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-+@@ -176,7 +176,7 @@
-+ # others have it in /usr/bin.
-+ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
-+ $(wildcard $(UTILS_USR_BIN_PATH)sort))
-+- NAWK = $(USRBIN_PATH)gawk
-++ NAWK = $(UNIXCOMMAND_PATH)gawk
-+ # Intrinsic unix command, with backslash-escaped character interpretation
-+ ECHO = /bin/echo -e
-+ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
-+diff -urN openjdk/hotspot/make/linux/makefiles/sa.make
openjdk-mod/hotspot/make/linux/makefiles/sa.make
-+--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-02-28
10:03:13.000000000 -0600
-++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06
21:26:52.565428298 -0600
-+@@ -45,8 +45,8 @@
-+
-+ # gnumake 3.78.1 does not accept the *s that
-+ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-+-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-+-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-+
-+ SA_CLASSDIR = $(GENERATED)/saclasses
-+
-+diff -urN openjdk/jdk/make/common/shared/Defs-utils.gmk
openjdk-mod/jdk/make/common/shared/Defs-utils.gmk
-+--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-02-28
10:06:10.000000000 -0600
-++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06
21:26:52.565428298 -0600
-+@@ -98,15 +98,15 @@
-+ DIFF = $(UTILS_USR_BIN_PATH)diff
-+ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-+ ECHO = $(UTILS_COMMAND_PATH)echo
-+-EGREP = $(UTILS_COMMAND_PATH)egrep
-++EGREP = $(UTILS_USR_BIN_PATH)egrep
-+ EXPR = $(UTILS_USR_BIN_PATH)expr
-+ FILE = $(UTILS_USR_BIN_PATH)file
-+ FIND = $(UTILS_USR_BIN_PATH)find
-+ FMT = $(UTILS_COMMAND_PATH)fmt
-+ GDB = $(UTILS_USR_BIN_PATH)gdb
-+-GREP = $(UTILS_COMMAND_PATH)grep
-++GREP = $(UTILS_USR_BIN_PATH)grep
-+ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-+-HEAD = $(UTILS_USR_BIN_PATH)head
-++HEAD = $(UTILS_COMMAND_PATH)head
-+ ID = $(UTILS_COMMAND_PATH)id
-+ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-+ KSH = $(UTILS_COMMAND_PATH)ksh
-+@@ -134,9 +134,9 @@
-+ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-+ SORT = $(UTILS_COMMAND_PATH)sort
-+ STRIP = $(UTILS_CCS_BIN_PATH)strip
-+-TAIL = $(UTILS_USR_BIN_PATH)tail
-++TAIL = $(UTILS_COMMAND_PATH)tail
-+ TAR = $(UTILS_COMMAND_PATH)tar
-+-TEST = $(UTILS_USR_BIN_PATH)test
-++TEST = $(UTILS_COMMAND_PATH)test
-+ TOUCH = $(UTILS_COMMAND_PATH)touch
-+ TR = $(UTILS_USR_BIN_PATH)tr
-+ TRUE = $(UTILS_COMMAND_PATH)true
-+@@ -144,7 +144,7 @@
-+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
-+ UNZIP = $(UTILS_USR_BIN_PATH)unzip
-+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-+-WC = $(UTILS_USR_BIN_PATH)wc
-++WC = $(UTILS_COMMAND_PATH)wc
-+ WHICH = $(UTILS_USR_BIN_PATH)which
-+ YACC = $(UTILS_CCS_BIN_PATH)yacc
-+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-+@@ -178,7 +178,7 @@
-+ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-+ $(wildcard $(UTILS_USR_BIN_PATH)basename))
-+
-+- NAWK = $(USRBIN_PATH)gawk
-++ NAWK = $(UNIXCOMMAND_PATH)gawk
-+ # Intrinsic unix command, with backslash-escaped character interpretation
-+ ECHO = /bin/echo -e
-+ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
b/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
deleted file mode 100644
index 3f6f039..0000000
--- a/java/icedtea6/icedtea6-1.10.4-generate_cacerts-1.patch
+++ /dev/null
@@ -1,397 +0,0 @@
-diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
---- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
-+++ icedtea6-mod/acinclude.m4 2011-10-27 18:49:43.510729915 -0500
-@@ -326,6 +326,91 @@
- AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" =
"xyes")
- ])
-
-+AC_DEFUN([IT_GENERATE_CACERTS],
-+[
-+ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
-+ AC_ARG_ENABLE([cacerts],
-+ [AS_HELP_STRING(--enable-cacerts, generate a cacerts file for
distribution [[default=no]])],
-+ [
-+ case "${enableval}" in
-+ no)
-+ generate_cacerts=no
-+ ;;
-+ *)
-+ generate_cacerts=yes
-+ ;;
-+ esac
-+ ],
-+ [
-+ generate_cacerts=no
-+ ])
-+ AC_MSG_RESULT([$generate_cacerts])
-+ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes")
-+])
-+
-+AC_DEFUN([IT_GET_LOCAL_CACERTS],
-+[
-+ AC_MSG_CHECKING([for a local x509 certificate directory])
-+ AC_ARG_WITH([ca-dir],
-+ [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local
x509 certificate directory)],
-+ [
-+ if test -d "${withval}"; then
-+ CADIR="${withval}"
-+ fi
-+ ],
-+ [
-+ CADIR=
-+ ])
-+ if test -z "${CADIR}"; then
-+ for dir in /etc/pki/tls/certs \
-+ /usr/share/ca-certificates \
-+ /etc/ssl/certs \
-+ /etc/certs ; do
-+ if test -d "${dir}"; then
-+ CADIR="${dir}"
-+ break
-+ fi
-+ done
-+ if test -z "${CADIR}"; then
-+ CADIR=no
-+ fi
-+ fi
-+ AC_MSG_RESULT(${CADIR})
-+ AC_SUBST(CADIR)
-+
-+ AC_MSG_CHECKING([for a local x509 certificate file])
-+ AC_ARG_WITH([ca-file],
-+ [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509
certificate file)],
-+ [
-+ if test -f "${withval}"; then
-+ CAFILE="${withval}"
-+ fi
-+ ],
-+ [
-+ CAFILE=
-+ ])
-+ if test -z "${CAFILE}"; then
-+ for file in /etc/pki/tls/certs/ca-bundle.crt \
-+ /etc/ssl/certs/ca-bundle.crt \
-+ /etc/ssl/ca-bundle.crt \
-+ /etc/ca-bundle.crt ; do
-+ if test -e "${file}"; then
-+ CAFILE=$file
-+ break
-+ fi
-+ done
-+ if test -z "${CAFILE}"; then
-+ CAFILE=no
-+ fi
-+ fi
-+ AC_MSG_RESULT(${CAFILE})
-+ AC_SUBST(CAFILE)
-+ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
-+ AC_MSG_WARN([Could not find a suitable x509 certificate store.])
-+ AC_MSG_ERROR([Supply a valid location using --with-ca-dir or
--with-ca-file, or remove the --enable-cacerts switch.])
-+ fi
-+])
-+
- AC_DEFUN([IT_FIND_ECJ_JAR],
- [
- AC_MSG_CHECKING([for an ecj JAR file])
-diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
---- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
-+++ icedtea6-mod/configure.ac 2011-10-27 18:51:27.674729852 -0500
-@@ -138,6 +138,13 @@
- AC_MSG_RESULT([disabled by default (edit java.security to enable)])
- fi
-
-+IT_GENERATE_CACERTS
-+
-+if test "x${generate_cacerts}" = "xyes"
-+then
-+ IT_GET_LOCAL_CACERTS
-+fi
-+
- IT_GET_PKGVERSION
- IT_GET_LSB_DATA
-
-diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
---- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
-+++ icedtea6-mod/Makefile.am 2011-10-27 18:58:37.188729584 -0500
-@@ -1375,6 +1375,19 @@
- if ENABLE_JAMVM
- printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
- endif
-+if GENERATE_CACERTS
-+ if test -n "${CADIR}"; then \
-+ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ else \
-+ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ fi; \
-+ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
-+endif
- @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
- mkdir -p stamps
- touch stamps/icedtea.stamp
-@@ -1406,6 +1419,19 @@
- if ENABLE_JAMVM
- printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
- endif
-+if GENERATE_CACERTS
-+ if test -n "${CADIR}"; then \
-+ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ else \
-+ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ fi; \
-+ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
-+endif
- @echo "IcedTea (debug build) is served:" \
- $(DEBUG_BUILD_OUTPUT_DIR)
- mkdir -p stamps
-@@ -1456,7 +1482,7 @@
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi
- cp $(abs_top_builddir)/tapset/jstack.stp \
-- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- endif
- touch stamps/add-systemtap.stamp
-
-@@ -1482,7 +1508,7 @@
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi
- cp $(abs_top_builddir)/tapset/jstack.stp \
-- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- endif
- touch stamps/add-systemtap-debug.stamp
-
-diff -urN icedtea6-1.10.4/Makefile.in icedtea6-mod/Makefile.in
---- icedtea6-1.10.4/Makefile.in 2011-10-13 12:39:49.922906360 -0500
-+++ icedtea6-mod/Makefile.in 2011-10-27 19:05:53.725729308 -0500
-@@ -175,6 +175,8 @@
- BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
- BUILD_OS_DIR = @BUILD_OS_DIR@
- CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
-+CADIR = @CADIR@
-+CAFILE = @CAFILE@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
-@@ -1867,7 +1869,7 @@
- @ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- @ENABLE_SYSTEMTAP_TRUE@ fi
- @ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
--@ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+@ENABLE_SYSTEMTAP_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- touch stamps/add-systemtap.stamp
-
- clean-add-systemtap:
-@@ -1891,7 +1893,7 @@
- @ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- @ENABLE_SYSTEMTAP_TRUE@ fi
- @ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
--@ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+@ENABLE_SYSTEMTAP_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- touch stamps/add-systemtap-debug.stamp
-
- clean-add-systemtap-debug:
-@@ -1961,6 +1963,17 @@
- stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
- @WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
- @WITH_TZDATA_DIR_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
-+@GENERATE_CACERTS_TRUE@ if test -n "${CADIR}"; then \
-+@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+@GENERATE_CACERTS_TRUE@ else \
-+@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+@GENERATE_CACERTS_TRUE@ fi; \
-+@GENERATE_CACERTS_TRUE@ cp -f
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+@GENERATE_CACERTS_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
- touch stamps/add-tzdata-support.stamp
-
- clean-add-tzdata-support:
-@@ -1970,6 +1983,17 @@
- stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
- @WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
- @WITH_TZDATA_DIR_TRUE@
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
-+@GENERATE_CACERTS_TRUE@ if test -n "${CADIR}"; then \
-+@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+@GENERATE_CACERTS_TRUE@ else \
-+@GENERATE_CACERTS_TRUE@ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+@GENERATE_CACERTS_TRUE@ -k
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+@GENERATE_CACERTS_TRUE@ -o
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+@GENERATE_CACERTS_TRUE@ fi; \
-+@GENERATE_CACERTS_TRUE@ cp -f
$(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+@GENERATE_CACERTS_TRUE@
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
- touch stamps/add-tzdata-support-debug.stamp
-
- clean-add-tzdata-support-debug:
-diff -urN icedtea6-1.10.4/scripts/mkcacerts.sh
icedtea6-mod/scripts/mkcacerts.sh
---- icedtea6-1.10.4/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
-+++ icedtea6-mod/scripts/mkcacerts.sh 2011-10-27 19:07:38.521729245 -0500
-@@ -0,0 +1,154 @@
-+#!/bin/sh
-+# Simple script to extract x509 certificates and create a JRE cacerts file.
-+
-+function get_args()
-+ {
-+ if test -z "${1}" ; then
-+ showhelp
-+ exit 1
-+ fi
-+
-+ while test -n "${1}" ; do
-+ case "${1}" in
-+ -f | --cafile)
-+ check_arg $1 $2
-+ CAFILE="${2}"
-+ shift 2
-+ ;;
-+ -d | --cadir)
-+ check_arg $1 $2
-+ CADIR="${2}"
-+ shift 2
-+ ;;
-+ -o | --outfile)
-+ check_arg $1 $2
-+ OUTFILE="${2}"
-+ shift 2
-+ ;;
-+ -k | --keytool)
-+ check_arg $1 $2
-+ KEYTOOL="${2}"
-+ shift 2
-+ ;;
-+ -h | --help)
-+ showhelp
-+ exit 0
-+ ;;
-+ *)
-+ showhelp
-+ exit 1
-+ ;;
-+ esac
-+ done
-+ }
-+
-+function check_arg()
-+ {
-+ echo "${2}" | grep -v "^-" > /dev/null
-+ if [ -z "$?" -o ! -n "$2" ]; then
-+ echo "Error: $1 requires a valid argument."
-+ exit 1
-+ fi
-+ }
-+
-+
-+function showhelp()
-+ {
-+ echo "`basename ${0}` creates a valid cacerts file for use with
IcedTea."
-+ echo ""
-+ echo " -f --cafile The path to a file containing PEM
formated CA"
-+ echo " certificates. May not be used
with -d/--cadir."
-+ echo " -d --cadir The path to a diectory of PEM
formatted CA"
-+ echo " certificates. May not be used
with -f/--cafile."
-+ echo " -o --outfile The path to the output file."
-+ echo ""
-+ echo " -k --keytool The path to the java keytool
utility."
-+ echo ""
-+ echo " -h --help Show this help message and exit."
-+ echo ""
-+ echo ""
-+ }
-+
-+# Initialize empty variables so that the shell does not polute the script
-+CAFILE=""
-+CADIR=""
-+OUTFILE=""
-+KEYTOOL=""
-+
-+# Process command line arguments
-+get_args ${@}
-+
-+# Handle common errors
-+if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
-+ echo "ERROR! You must provide an x509 certificate store!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
-+ echo "ERROR! You cannot provide two x509 certificate stores!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${KEYTOOL}x" == "x" ; then
-+ echo "ERROR! You must provide a valid keytool program!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${OUTFILE}x" == "x" ; then
-+ echo "ERROR! You must provide a valid output file!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+# Get on with the work
-+
-+# If using a CAFILE, split it into individual files in a temp directory
-+if test "${CAFILE}x" != "x" ; then
-+ TEMPDIR=`mktemp -d`
-+ CADIR="${TEMPDIR}"
-+
-+ # Get a list of staring lines for each cert
-+ CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1`
-+
-+ # Get a list of ending lines for each cert
-+ ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1`
-+
-+ # Start a loop
-+ for certbegin in `echo "${CERTLIST}"` ; do
-+ for certend in `echo "${ENDCERTLIST}"` ; do
-+ if test "${certend}" -gt "${certbegin}"; then
-+ break
-+ fi
-+ done
-+ sed -n "${certbegin},${certend}p" "${CAFILE}" >
"${CADIR}/${certbegin}"
-+ keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash`
-+ echo "Generated PEM file with hash: ${keyhash}."
-+ mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem"
-+ done
-+fi
-+
-+# Write the output file
-+for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
-+do
-+ ls "${cert}"
-+ tempfile=`mktemp`
-+ certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
-+ certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
-+ sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
-+ echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
-+ "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
-+ rm "${tempfile}"
-+done
-+
-+if test "${TEMPDIR}x" != "x" ; then
-+ rm -rf "${TEMPDIR}"
-+fi
-+exit 0
-+
diff --git a/java/icedtea6/icedtea6-1.11.1-fixed_paths.patch
b/java/icedtea6/icedtea6-1.11.1-fixed_paths.patch
new file mode 100644
index 0000000..c5e6b7a
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.11.1-fixed_paths.patch
@@ -0,0 +1,133 @@
+diff -urN icedtea6-hg/Makefile.am icedtea6-hg-mod/Makefile.am
+--- icedtea6-hg/Makefile.am 2011-12-06 19:39:15.000000000 -0600
++++ icedtea6-hg-mod/Makefile.am 2011-12-06 21:32:21.737424651 -0600
+@@ -288,6 +288,7 @@
+ patches/openjdk/6650759-missing_inference.patch \
+ patches/numa_on_early_glibc.patch \
+ patches/jtreg-international-fonts.patch \
++ patches/openjdk6-b24-smgl-paths.patch \
+ patches/f14-fonts.patch \
+ patches/jtreg-T6638712-fix.patch \
+ patches/jtreg-T6650759m-fix.patch \
+diff -urN icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch
icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch
+--- icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
++++ icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch 2011-12-06
21:32:43.033424397 -0600
+@@ -0,0 +1,118 @@
++diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk
openjdk-mod/corba/make/common/shared/Defs-utils.gmk
++--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-11-14
16:05:59.000000000 -0600
+++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06
21:13:30.991437225 -0600
++@@ -85,15 +85,15 @@
++ DIFF = $(UTILS_USR_BIN_PATH)diff
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++ KSH = $(UTILS_COMMAND_PATH)ksh
++@@ -122,9 +122,9 @@
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++ STRIP = $(UTILS_CCS_BIN_PATH)strip
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -132,7 +132,7 @@
++ UNIQ = $(UTILS_USR_BIN_PATH)uniq
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++@@ -176,7 +176,7 @@
++ # others have it in /usr/bin.
++ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
++ $(wildcard $(UTILS_USR_BIN_PATH)sort))
++- NAWK = $(USRBIN_PATH)gawk
+++ NAWK = $(UNIXCOMMAND_PATH)gawk
++ # Intrinsic unix command, with backslash-escaped character interpretation
++ ECHO = /bin/echo -e
++ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
++diff -urN openjdk/hotspot/make/linux/makefiles/sa.make
openjdk-mod/hotspot/make/linux/makefiles/sa.make
++--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-11-14
16:07:29.000000000 -0600
+++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06
21:15:49.018435744 -0600
++@@ -45,8 +45,8 @@
++
++ # gnumake 3.78.1 does not accept the *s that
++ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
++-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
++-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
+++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
+++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
++
++ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
++ AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
++diff -urN openjdk/jdk/make/common/shared/Defs-utils.gmk
openjdk-mod/jdk/make/common/shared/Defs-utils.gmk
++--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-11-14
16:11:40.000000000 -0600
+++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06
21:15:15.611436158 -0600
++@@ -98,15 +98,15 @@
++ DIFF = $(UTILS_USR_BIN_PATH)diff
++ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
++ ECHO = $(UTILS_COMMAND_PATH)echo
++-EGREP = $(UTILS_COMMAND_PATH)egrep
+++EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_USR_BIN_PATH)expr
++ FILE = $(UTILS_USR_BIN_PATH)file
++ FIND = $(UTILS_USR_BIN_PATH)find
++ FMT = $(UTILS_COMMAND_PATH)fmt
++ GDB = $(UTILS_USR_BIN_PATH)gdb
++-GREP = $(UTILS_COMMAND_PATH)grep
+++GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
++-HEAD = $(UTILS_USR_BIN_PATH)head
+++HEAD = $(UTILS_COMMAND_PATH)head
++ ID = $(UTILS_COMMAND_PATH)id
++ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
++ KSH = $(UTILS_COMMAND_PATH)ksh
++@@ -134,9 +134,9 @@
++ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
++ SORT = $(UTILS_COMMAND_PATH)sort
++ STRIP = $(UTILS_CCS_BIN_PATH)strip
++-TAIL = $(UTILS_USR_BIN_PATH)tail
+++TAIL = $(UTILS_COMMAND_PATH)tail
++ TAR = $(UTILS_COMMAND_PATH)tar
++-TEST = $(UTILS_USR_BIN_PATH)test
+++TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_COMMAND_PATH)touch
++ TR = $(UTILS_USR_BIN_PATH)tr
++ TRUE = $(UTILS_COMMAND_PATH)true
++@@ -144,7 +144,7 @@
++ UNIQ = $(UTILS_USR_BIN_PATH)uniq
++ UNZIP = $(UTILS_USR_BIN_PATH)unzip
++ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
++-WC = $(UTILS_USR_BIN_PATH)wc
+++WC = $(UTILS_COMMAND_PATH)wc
++ WHICH = $(UTILS_USR_BIN_PATH)which
++ YACC = $(UTILS_CCS_BIN_PATH)yacc
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++@@ -178,7 +178,7 @@
++ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
++ $(wildcard $(UTILS_USR_BIN_PATH)basename))
++
++- NAWK = $(USRBIN_PATH)gawk
+++ NAWK = $(UNIXCOMMAND_PATH)gawk
++ # Intrinsic unix command, with backslash-escaped character interpretation
++ ECHO = /bin/echo -e
++ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/java/icedtea6/icedtea6-1.11.1-generate_cacerts-1.patch
b/java/icedtea6/icedtea6-1.11.1-generate_cacerts-1.patch
new file mode 100644
index 0000000..0e3af9c
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.11.1-generate_cacerts-1.patch
@@ -0,0 +1,331 @@
+diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
+--- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
++++ icedtea6-mod/acinclude.m4 2011-10-27 18:49:43.510729915 -0500
+@@ -326,6 +326,91 @@
+ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" =
"xyes")
+ ])
+
++AC_DEFUN([IT_GENERATE_CACERTS],
++[
++ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
++ AC_ARG_ENABLE([cacerts],
++ [AS_HELP_STRING(--enable-cacerts, generate a cacerts file for
distribution [[default=no]])],
++ [
++ case "${enableval}" in
++ no)
++ generate_cacerts=no
++ ;;
++ *)
++ generate_cacerts=yes
++ ;;
++ esac
++ ],
++ [
++ generate_cacerts=no
++ ])
++ AC_MSG_RESULT([$generate_cacerts])
++ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes")
++])
++
++AC_DEFUN([IT_GET_LOCAL_CACERTS],
++[
++ AC_MSG_CHECKING([for a local x509 certificate directory])
++ AC_ARG_WITH([ca-dir],
++ [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local
x509 certificate directory)],
++ [
++ if test -d "${withval}"; then
++ CADIR="${withval}"
++ fi
++ ],
++ [
++ CADIR=
++ ])
++ if test -z "${CADIR}"; then
++ for dir in /etc/pki/tls/certs \
++ /usr/share/ca-certificates \
++ /etc/ssl/certs \
++ /etc/certs ; do
++ if test -d "${dir}"; then
++ CADIR="${dir}"
++ break
++ fi
++ done
++ if test -z "${CADIR}"; then
++ CADIR=no
++ fi
++ fi
++ AC_MSG_RESULT(${CADIR})
++ AC_SUBST(CADIR)
++
++ AC_MSG_CHECKING([for a local x509 certificate file])
++ AC_ARG_WITH([ca-file],
++ [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509
certificate file)],
++ [
++ if test -f "${withval}"; then
++ CAFILE="${withval}"
++ fi
++ ],
++ [
++ CAFILE=
++ ])
++ if test -z "${CAFILE}"; then
++ for file in /etc/pki/tls/certs/ca-bundle.crt \
++ /etc/ssl/certs/ca-bundle.crt \
++ /etc/ssl/ca-bundle.crt \
++ /etc/ca-bundle.crt ; do
++ if test -e "${file}"; then
++ CAFILE=$file
++ break
++ fi
++ done
++ if test -z "${CAFILE}"; then
++ CAFILE=no
++ fi
++ fi
++ AC_MSG_RESULT(${CAFILE})
++ AC_SUBST(CAFILE)
++ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
++ AC_MSG_WARN([Could not find a suitable x509 certificate store.])
++ AC_MSG_ERROR([Supply a valid location using --with-ca-dir or
--with-ca-file, or remove the --enable-cacerts switch.])
++ fi
++])
++
+ AC_DEFUN([IT_FIND_ECJ_JAR],
+ [
+ AC_MSG_CHECKING([for an ecj JAR file])
+diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
+--- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
++++ icedtea6-mod/configure.ac 2011-10-27 18:51:27.674729852 -0500
+@@ -138,6 +138,13 @@
+ AC_MSG_RESULT([disabled by default (edit java.security to enable)])
+ fi
+
++IT_GENERATE_CACERTS
++
++if test "x${generate_cacerts}" = "xyes"
++then
++ IT_GET_LOCAL_CACERTS
++fi
++
+ IT_GET_PKGVERSION
+ IT_GET_LSB_DATA
+
+diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
+--- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
++++ icedtea6-mod/Makefile.am 2011-10-27 18:58:37.188729584 -0500
+@@ -1375,6 +1375,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch stamps/icedtea.stamp
+@@ -1406,6 +1419,19 @@
+ if ENABLE_JAMVM
+ printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ endif
++if GENERATE_CACERTS
++ if test -n "${CADIR}"; then \
++ sh scripts/mkcacerts.sh -d "${CADIR}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ else \
++ sh scripts/mkcacerts.sh -f "${CAFILE}" \
++ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
++ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
++ fi; \
++ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
++endif
+ @echo "IcedTea (debug build) is served:" \
+ $(DEBUG_BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+@@ -1456,7 +1482,7 @@
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap.stamp
+
+@@ -1482,7 +1508,7 @@
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
++ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
+ endif
+ touch stamps/add-systemtap-debug.stamp
+
+diff -urN icedtea6-1.10.4/scripts/mkcacerts.sh
icedtea6-mod/scripts/mkcacerts.sh
+--- icedtea6-1.10.4/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
++++ icedtea6-mod/scripts/mkcacerts.sh 2011-10-27 19:07:38.521729245 -0500
+@@ -0,0 +1,154 @@
++#!/bin/sh
++# Simple script to extract x509 certificates and create a JRE cacerts file.
++
++function get_args()
++ {
++ if test -z "${1}" ; then
++ showhelp
++ exit 1
++ fi
++
++ while test -n "${1}" ; do
++ case "${1}" in
++ -f | --cafile)
++ check_arg $1 $2
++ CAFILE="${2}"
++ shift 2
++ ;;
++ -d | --cadir)
++ check_arg $1 $2
++ CADIR="${2}"
++ shift 2
++ ;;
++ -o | --outfile)
++ check_arg $1 $2
++ OUTFILE="${2}"
++ shift 2
++ ;;
++ -k | --keytool)
++ check_arg $1 $2
++ KEYTOOL="${2}"
++ shift 2
++ ;;
++ -h | --help)
++ showhelp
++ exit 0
++ ;;
++ *)
++ showhelp
++ exit 1
++ ;;
++ esac
++ done
++ }
++
++function check_arg()
++ {
++ echo "${2}" | grep -v "^-" > /dev/null
++ if [ -z "$?" -o ! -n "$2" ]; then
++ echo "Error: $1 requires a valid argument."
++ exit 1
++ fi
++ }
++
++
++function showhelp()
++ {
++ echo "`basename ${0}` creates a valid cacerts file for use with
IcedTea."
++ echo ""
++ echo " -f --cafile The path to a file containing PEM
formated CA"
++ echo " certificates. May not be used
with -d/--cadir."
++ echo " -d --cadir The path to a diectory of PEM
formatted CA"
++ echo " certificates. May not be used
with -f/--cafile."
++ echo " -o --outfile The path to the output file."
++ echo ""
++ echo " -k --keytool The path to the java keytool
utility."
++ echo ""
++ echo " -h --help Show this help message and exit."
++ echo ""
++ echo ""
++ }
++
++# Initialize empty variables so that the shell does not polute the script
++CAFILE=""
++CADIR=""
++OUTFILE=""
++KEYTOOL=""
++
++# Process command line arguments
++get_args ${@}
++
++# Handle common errors
++if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
++ echo "ERROR! You must provide an x509 certificate store!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
++ echo "ERROR! You cannot provide two x509 certificate stores!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${KEYTOOL}x" == "x" ; then
++ echo "ERROR! You must provide a valid keytool program!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++if test "${OUTFILE}x" == "x" ; then
++ echo "ERROR! You must provide a valid output file!"
++ echo "\'$(basename ${0}) --help\' for more info."
++ echo ""
++ exit 1
++fi
++
++# Get on with the work
++
++# If using a CAFILE, split it into individual files in a temp directory
++if test "${CAFILE}x" != "x" ; then
++ TEMPDIR=`mktemp -d`
++ CADIR="${TEMPDIR}"
++
++ # Get a list of staring lines for each cert
++ CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1`
++
++ # Get a list of ending lines for each cert
++ ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1`
++
++ # Start a loop
++ for certbegin in `echo "${CERTLIST}"` ; do
++ for certend in `echo "${ENDCERTLIST}"` ; do
++ if test "${certend}" -gt "${certbegin}"; then
++ break
++ fi
++ done
++ sed -n "${certbegin},${certend}p" "${CAFILE}" >
"${CADIR}/${certbegin}"
++ keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash`
++ echo "Generated PEM file with hash: ${keyhash}."
++ mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem"
++ done
++fi
++
++# Write the output file
++for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
++do
++ ls "${cert}"
++ tempfile=`mktemp`
++ certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
++ certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
++ sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
++ echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
++ "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
++ rm "${tempfile}"
++done
++
++if test "${TEMPDIR}x" != "x" ; then
++ rm -rf "${TEMPDIR}"
++fi
++exit 0
++
diff --git a/java/icedtea6/icedtea6-1.11.1.tar.gz.sig
b/java/icedtea6/icedtea6-1.11.1.tar.gz.sig
new file mode 100644
index 0000000..ed09a43
Binary files /dev/null and b/java/icedtea6/icedtea6-1.11.1.tar.gz.sig differ
diff --git a/java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig
b/java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig
deleted file mode 100644
index bdf57b0..0000000
Binary files a/java/icedtea6/icedtea6-bin-core-1.10.4-amd64.tar.bz2.sig and
/dev/null differ
diff --git a/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig
b/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig
deleted file mode 100644
index 2303287..0000000
Binary files a/java/icedtea6/icedtea6-bin-core-1.10.4-x86.tar.bz2.sig and
/dev/null differ
diff --git a/java/icedtea6/icedtea6-hg-fixed_paths.patch
b/java/icedtea6/icedtea6-hg-fixed_paths.patch
deleted file mode 100644
index c5e6b7a..0000000
--- a/java/icedtea6/icedtea6-hg-fixed_paths.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urN icedtea6-hg/Makefile.am icedtea6-hg-mod/Makefile.am
---- icedtea6-hg/Makefile.am 2011-12-06 19:39:15.000000000 -0600
-+++ icedtea6-hg-mod/Makefile.am 2011-12-06 21:32:21.737424651 -0600
-@@ -288,6 +288,7 @@
- patches/openjdk/6650759-missing_inference.patch \
- patches/numa_on_early_glibc.patch \
- patches/jtreg-international-fonts.patch \
-+ patches/openjdk6-b24-smgl-paths.patch \
- patches/f14-fonts.patch \
- patches/jtreg-T6638712-fix.patch \
- patches/jtreg-T6650759m-fix.patch \
-diff -urN icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch
icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch
---- icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch 1969-12-31
18:00:00.000000000 -0600
-+++ icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch 2011-12-06
21:32:43.033424397 -0600
-@@ -0,0 +1,118 @@
-+diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk
openjdk-mod/corba/make/common/shared/Defs-utils.gmk
-+--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-11-14
16:05:59.000000000 -0600
-++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06
21:13:30.991437225 -0600
-+@@ -85,15 +85,15 @@
-+ DIFF = $(UTILS_USR_BIN_PATH)diff
-+ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-+ ECHO = $(UTILS_COMMAND_PATH)echo
-+-EGREP = $(UTILS_COMMAND_PATH)egrep
-++EGREP = $(UTILS_USR_BIN_PATH)egrep
-+ EXPR = $(UTILS_USR_BIN_PATH)expr
-+ FILE = $(UTILS_USR_BIN_PATH)file
-+ FIND = $(UTILS_USR_BIN_PATH)find
-+ FMT = $(UTILS_COMMAND_PATH)fmt
-+ GDB = $(UTILS_USR_BIN_PATH)gdb
-+-GREP = $(UTILS_COMMAND_PATH)grep
-++GREP = $(UTILS_USR_BIN_PATH)grep
-+ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-+-HEAD = $(UTILS_USR_BIN_PATH)head
-++HEAD = $(UTILS_COMMAND_PATH)head
-+ ID = $(UTILS_COMMAND_PATH)id
-+ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-+ KSH = $(UTILS_COMMAND_PATH)ksh
-+@@ -122,9 +122,9 @@
-+ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-+ SORT = $(UTILS_COMMAND_PATH)sort
-+ STRIP = $(UTILS_CCS_BIN_PATH)strip
-+-TAIL = $(UTILS_USR_BIN_PATH)tail
-++TAIL = $(UTILS_COMMAND_PATH)tail
-+ TAR = $(UTILS_COMMAND_PATH)tar
-+-TEST = $(UTILS_USR_BIN_PATH)test
-++TEST = $(UTILS_COMMAND_PATH)test
-+ TOUCH = $(UTILS_COMMAND_PATH)touch
-+ TR = $(UTILS_USR_BIN_PATH)tr
-+ TRUE = $(UTILS_COMMAND_PATH)true
-+@@ -132,7 +132,7 @@
-+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
-+ UNZIP = $(UTILS_USR_BIN_PATH)unzip
-+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-+-WC = $(UTILS_USR_BIN_PATH)wc
-++WC = $(UTILS_COMMAND_PATH)wc
-+ WHICH = $(UTILS_USR_BIN_PATH)which
-+ YACC = $(UTILS_CCS_BIN_PATH)yacc
-+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-+@@ -176,7 +176,7 @@
-+ # others have it in /usr/bin.
-+ SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
-+ $(wildcard $(UTILS_USR_BIN_PATH)sort))
-+- NAWK = $(USRBIN_PATH)gawk
-++ NAWK = $(UNIXCOMMAND_PATH)gawk
-+ # Intrinsic unix command, with backslash-escaped character interpretation
-+ ECHO = /bin/echo -e
-+ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
-+diff -urN openjdk/hotspot/make/linux/makefiles/sa.make
openjdk-mod/hotspot/make/linux/makefiles/sa.make
-+--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-11-14
16:07:29.000000000 -0600
-++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06
21:15:49.018435744 -0600
-+@@ -45,8 +45,8 @@
-+
-+ # gnumake 3.78.1 does not accept the *s that
-+ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-+-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-+-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES1))
-++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls
$(AGENT_FILES2))
-+
-+ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
-+ AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
-+diff -urN openjdk/jdk/make/common/shared/Defs-utils.gmk
openjdk-mod/jdk/make/common/shared/Defs-utils.gmk
-+--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-11-14
16:11:40.000000000 -0600
-++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06
21:15:15.611436158 -0600
-+@@ -98,15 +98,15 @@
-+ DIFF = $(UTILS_USR_BIN_PATH)diff
-+ DIRNAME = $(UTILS_USR_BIN_PATH)dirname
-+ ECHO = $(UTILS_COMMAND_PATH)echo
-+-EGREP = $(UTILS_COMMAND_PATH)egrep
-++EGREP = $(UTILS_USR_BIN_PATH)egrep
-+ EXPR = $(UTILS_USR_BIN_PATH)expr
-+ FILE = $(UTILS_USR_BIN_PATH)file
-+ FIND = $(UTILS_USR_BIN_PATH)find
-+ FMT = $(UTILS_COMMAND_PATH)fmt
-+ GDB = $(UTILS_USR_BIN_PATH)gdb
-+-GREP = $(UTILS_COMMAND_PATH)grep
-++GREP = $(UTILS_USR_BIN_PATH)grep
-+ GUNZIP = $(UTILS_COMMAND_PATH)gunzip
-+-HEAD = $(UTILS_USR_BIN_PATH)head
-++HEAD = $(UTILS_COMMAND_PATH)head
-+ ID = $(UTILS_COMMAND_PATH)id
-+ ISAINFO = $(UTILS_COMMAND_PATH)isainfo
-+ KSH = $(UTILS_COMMAND_PATH)ksh
-+@@ -134,9 +134,9 @@
-+ SHOWREV = $(UTILS_USR_BIN_PATH)showrev
-+ SORT = $(UTILS_COMMAND_PATH)sort
-+ STRIP = $(UTILS_CCS_BIN_PATH)strip
-+-TAIL = $(UTILS_USR_BIN_PATH)tail
-++TAIL = $(UTILS_COMMAND_PATH)tail
-+ TAR = $(UTILS_COMMAND_PATH)tar
-+-TEST = $(UTILS_USR_BIN_PATH)test
-++TEST = $(UTILS_COMMAND_PATH)test
-+ TOUCH = $(UTILS_COMMAND_PATH)touch
-+ TR = $(UTILS_USR_BIN_PATH)tr
-+ TRUE = $(UTILS_COMMAND_PATH)true
-+@@ -144,7 +144,7 @@
-+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
-+ UNZIP = $(UTILS_USR_BIN_PATH)unzip
-+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
-+-WC = $(UTILS_USR_BIN_PATH)wc
-++WC = $(UTILS_COMMAND_PATH)wc
-+ WHICH = $(UTILS_USR_BIN_PATH)which
-+ YACC = $(UTILS_CCS_BIN_PATH)yacc
-+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-+@@ -178,7 +178,7 @@
-+ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-+ $(wildcard $(UTILS_USR_BIN_PATH)basename))
-+
-+- NAWK = $(USRBIN_PATH)gawk
-++ NAWK = $(UNIXCOMMAND_PATH)gawk
-+ # Intrinsic unix command, with backslash-escaped character interpretation
-+ ECHO = /bin/echo -e
-+ # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
b/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
deleted file mode 100644
index 0e3af9c..0000000
--- a/java/icedtea6/icedtea6-hg-generate_cacerts-1.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-diff -urN icedtea6-1.10.4/acinclude.m4 icedtea6-mod/acinclude.m4
---- icedtea6-1.10.4/acinclude.m4 2011-07-11 16:43:43.361068652 -0500
-+++ icedtea6-mod/acinclude.m4 2011-10-27 18:49:43.510729915 -0500
-@@ -326,6 +326,91 @@
- AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" =
"xyes")
- ])
-
-+AC_DEFUN([IT_GENERATE_CACERTS],
-+[
-+ AC_MSG_CHECKING([whether to generate a cacerts file for distribution])
-+ AC_ARG_ENABLE([cacerts],
-+ [AS_HELP_STRING(--enable-cacerts, generate a cacerts file for
distribution [[default=no]])],
-+ [
-+ case "${enableval}" in
-+ no)
-+ generate_cacerts=no
-+ ;;
-+ *)
-+ generate_cacerts=yes
-+ ;;
-+ esac
-+ ],
-+ [
-+ generate_cacerts=no
-+ ])
-+ AC_MSG_RESULT([$generate_cacerts])
-+ AM_CONDITIONAL([GENERATE_CACERTS], test x"${generate_cacerts}" = "xyes")
-+])
-+
-+AC_DEFUN([IT_GET_LOCAL_CACERTS],
-+[
-+ AC_MSG_CHECKING([for a local x509 certificate directory])
-+ AC_ARG_WITH([ca-dir],
-+ [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local
x509 certificate directory)],
-+ [
-+ if test -d "${withval}"; then
-+ CADIR="${withval}"
-+ fi
-+ ],
-+ [
-+ CADIR=
-+ ])
-+ if test -z "${CADIR}"; then
-+ for dir in /etc/pki/tls/certs \
-+ /usr/share/ca-certificates \
-+ /etc/ssl/certs \
-+ /etc/certs ; do
-+ if test -d "${dir}"; then
-+ CADIR="${dir}"
-+ break
-+ fi
-+ done
-+ if test -z "${CADIR}"; then
-+ CADIR=no
-+ fi
-+ fi
-+ AC_MSG_RESULT(${CADIR})
-+ AC_SUBST(CADIR)
-+
-+ AC_MSG_CHECKING([for a local x509 certificate file])
-+ AC_ARG_WITH([ca-file],
-+ [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509
certificate file)],
-+ [
-+ if test -f "${withval}"; then
-+ CAFILE="${withval}"
-+ fi
-+ ],
-+ [
-+ CAFILE=
-+ ])
-+ if test -z "${CAFILE}"; then
-+ for file in /etc/pki/tls/certs/ca-bundle.crt \
-+ /etc/ssl/certs/ca-bundle.crt \
-+ /etc/ssl/ca-bundle.crt \
-+ /etc/ca-bundle.crt ; do
-+ if test -e "${file}"; then
-+ CAFILE=$file
-+ break
-+ fi
-+ done
-+ if test -z "${CAFILE}"; then
-+ CAFILE=no
-+ fi
-+ fi
-+ AC_MSG_RESULT(${CAFILE})
-+ AC_SUBST(CAFILE)
-+ if test "${CADIR}x" = "nox" -a "${CAFILE}x" = "nox"; then
-+ AC_MSG_WARN([Could not find a suitable x509 certificate store.])
-+ AC_MSG_ERROR([Supply a valid location using --with-ca-dir or
--with-ca-file, or remove the --enable-cacerts switch.])
-+ fi
-+])
-+
- AC_DEFUN([IT_FIND_ECJ_JAR],
- [
- AC_MSG_CHECKING([for an ecj JAR file])
-diff -urN icedtea6-1.10.4/configure.ac icedtea6-mod/configure.ac
---- icedtea6-1.10.4/configure.ac 2011-10-13 12:39:16.561204799 -0500
-+++ icedtea6-mod/configure.ac 2011-10-27 18:51:27.674729852 -0500
-@@ -138,6 +138,13 @@
- AC_MSG_RESULT([disabled by default (edit java.security to enable)])
- fi
-
-+IT_GENERATE_CACERTS
-+
-+if test "x${generate_cacerts}" = "xyes"
-+then
-+ IT_GET_LOCAL_CACERTS
-+fi
-+
- IT_GET_PKGVERSION
- IT_GET_LSB_DATA
-
-diff -urN icedtea6-1.10.4/Makefile.am icedtea6-mod/Makefile.am
---- icedtea6-1.10.4/Makefile.am 2011-10-13 11:27:35.063986484 -0500
-+++ icedtea6-mod/Makefile.am 2011-10-27 18:58:37.188729584 -0500
-@@ -1375,6 +1375,19 @@
- if ENABLE_JAMVM
- printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_JRE_ARCH_DIR)/jvm.cfg
- endif
-+if GENERATE_CACERTS
-+ if test -n "${CADIR}"; then \
-+ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ else \
-+ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ fi; \
-+ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
-+endif
- @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
- mkdir -p stamps
- touch stamps/icedtea.stamp
-@@ -1406,6 +1419,19 @@
- if ENABLE_JAMVM
- printf -- '-jamvm ALIASED_TO -server\n' >>
$(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
- endif
-+if GENERATE_CACERTS
-+ if test -n "${CADIR}"; then \
-+ sh scripts/mkcacerts.sh -d "${CADIR}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ else \
-+ sh scripts/mkcacerts.sh -f "${CAFILE}" \
-+ -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \
-+ -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts; \
-+ fi; \
-+ cp -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts \
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts;
-+endif
- @echo "IcedTea (debug build) is served:" \
- $(DEBUG_BUILD_OUTPUT_DIR)
- mkdir -p stamps
-@@ -1456,7 +1482,7 @@
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi
- cp $(abs_top_builddir)/tapset/jstack.stp \
-- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- endif
- touch stamps/add-systemtap.stamp
-
-@@ -1482,7 +1508,7 @@
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi
- cp $(abs_top_builddir)/tapset/jstack.stp \
-- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp;
- endif
- touch stamps/add-systemtap-debug.stamp
-
-diff -urN icedtea6-1.10.4/scripts/mkcacerts.sh
icedtea6-mod/scripts/mkcacerts.sh
---- icedtea6-1.10.4/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000
-0600
-+++ icedtea6-mod/scripts/mkcacerts.sh 2011-10-27 19:07:38.521729245 -0500
-@@ -0,0 +1,154 @@
-+#!/bin/sh
-+# Simple script to extract x509 certificates and create a JRE cacerts file.
-+
-+function get_args()
-+ {
-+ if test -z "${1}" ; then
-+ showhelp
-+ exit 1
-+ fi
-+
-+ while test -n "${1}" ; do
-+ case "${1}" in
-+ -f | --cafile)
-+ check_arg $1 $2
-+ CAFILE="${2}"
-+ shift 2
-+ ;;
-+ -d | --cadir)
-+ check_arg $1 $2
-+ CADIR="${2}"
-+ shift 2
-+ ;;
-+ -o | --outfile)
-+ check_arg $1 $2
-+ OUTFILE="${2}"
-+ shift 2
-+ ;;
-+ -k | --keytool)
-+ check_arg $1 $2
-+ KEYTOOL="${2}"
-+ shift 2
-+ ;;
-+ -h | --help)
-+ showhelp
-+ exit 0
-+ ;;
-+ *)
-+ showhelp
-+ exit 1
-+ ;;
-+ esac
-+ done
-+ }
-+
-+function check_arg()
-+ {
-+ echo "${2}" | grep -v "^-" > /dev/null
-+ if [ -z "$?" -o ! -n "$2" ]; then
-+ echo "Error: $1 requires a valid argument."
-+ exit 1
-+ fi
-+ }
-+
-+
-+function showhelp()
-+ {
-+ echo "`basename ${0}` creates a valid cacerts file for use with
IcedTea."
-+ echo ""
-+ echo " -f --cafile The path to a file containing PEM
formated CA"
-+ echo " certificates. May not be used
with -d/--cadir."
-+ echo " -d --cadir The path to a diectory of PEM
formatted CA"
-+ echo " certificates. May not be used
with -f/--cafile."
-+ echo " -o --outfile The path to the output file."
-+ echo ""
-+ echo " -k --keytool The path to the java keytool
utility."
-+ echo ""
-+ echo " -h --help Show this help message and exit."
-+ echo ""
-+ echo ""
-+ }
-+
-+# Initialize empty variables so that the shell does not polute the script
-+CAFILE=""
-+CADIR=""
-+OUTFILE=""
-+KEYTOOL=""
-+
-+# Process command line arguments
-+get_args ${@}
-+
-+# Handle common errors
-+if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
-+ echo "ERROR! You must provide an x509 certificate store!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
-+ echo "ERROR! You cannot provide two x509 certificate stores!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${KEYTOOL}x" == "x" ; then
-+ echo "ERROR! You must provide a valid keytool program!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+if test "${OUTFILE}x" == "x" ; then
-+ echo "ERROR! You must provide a valid output file!"
-+ echo "\'$(basename ${0}) --help\' for more info."
-+ echo ""
-+ exit 1
-+fi
-+
-+# Get on with the work
-+
-+# If using a CAFILE, split it into individual files in a temp directory
-+if test "${CAFILE}x" != "x" ; then
-+ TEMPDIR=`mktemp -d`
-+ CADIR="${TEMPDIR}"
-+
-+ # Get a list of staring lines for each cert
-+ CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1`
-+
-+ # Get a list of ending lines for each cert
-+ ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1`
-+
-+ # Start a loop
-+ for certbegin in `echo "${CERTLIST}"` ; do
-+ for certend in `echo "${ENDCERTLIST}"` ; do
-+ if test "${certend}" -gt "${certbegin}"; then
-+ break
-+ fi
-+ done
-+ sed -n "${certbegin},${certend}p" "${CAFILE}" >
"${CADIR}/${certbegin}"
-+ keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash`
-+ echo "Generated PEM file with hash: ${keyhash}."
-+ mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem"
-+ done
-+fi
-+
-+# Write the output file
-+for cert in `find "${CADIR}" -type f -name "*.pem" -o -name "*.crt"`
-+do
-+ ls "${cert}"
-+ tempfile=`mktemp`
-+ certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
-+ certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
-+ sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
-+ echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
-+ "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
-+ rm "${tempfile}"
-+done
-+
-+if test "${TEMPDIR}x" != "x" ; then
-+ rm -rf "${TEMPDIR}"
-+fi
-+exit 0
-+
diff --git a/java/icedtea6/jaxp144_01.zip.sig
b/java/icedtea6/jaxp144_01.zip.sig
deleted file mode 100644
index 39828d2..0000000
Binary files a/java/icedtea6/jaxp144_01.zip.sig and /dev/null differ
diff --git a/java/icedtea6/jdk6-jaxws-b20.zip.sig
b/java/icedtea6/jdk6-jaxws-b20.zip.sig
deleted file mode 100644
index 0f8a70f..0000000
Binary files a/java/icedtea6/jdk6-jaxws-b20.zip.sig and /dev/null differ
diff --git a/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig
b/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig
deleted file mode 100644
index e54a35b..0000000
Binary files a/java/icedtea6/openjdk-6-src-b22-28_feb_2011.tar.gz.sig and
/dev/null differ
diff --git a/libs/girara/BUILD b/libs/girara/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/libs/girara/BUILD
@@ -0,0 +1 @@
+make
diff --git a/libs/girara/DEPENDS b/libs/girara/DEPENDS
new file mode 100755
index 0000000..edffa0e
--- /dev/null
+++ b/libs/girara/DEPENDS
@@ -0,0 +1 @@
+depends gtk+2
diff --git a/libs/girara/DETAILS b/libs/girara/DETAILS
new file mode 100755
index 0000000..d3a4517
--- /dev/null
+++ b/libs/girara/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=girara
+ VERSION=0.1.0
+
SOURCE_HASH=sha512:86804dc4e37100eb6d4bf810c9bb99117971ddb0c7cbac8186dc60453dbd4d2a83a0183108506818f44d5e4565f7b71789eee69af6fb7101128b14c183be8da9
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://pwmt.org/projects/girara/download/$SOURCE
+ WEB_SITE=http://pwmt.org/projects/girara/
+ ENTERED=20120309
+ LICENSE[0]=ZLIB
+ SHORT="user interface library"
+cat << EOF
+girara is a library that implements a user interface that focuses on
simplicity
+and minimalism. It consists of three main components: The view is a widget
that
+represents the actual application (e.g.: a web site or a document). The input
+bar is used to execute commands of the application, while the status bar
+notifies the user with current information. It is designed to replace and the
+enhance the user interface that is used by zathura and jumanji.
+EOF
diff --git a/libs/girara/HISTORY b/libs/girara/HISTORY
new file mode 100644
index 0000000..06587f0
--- /dev/null
+++ b/libs/girara/HISTORY
@@ -0,0 +1,2 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 0.1.0
diff --git a/libs/girara/INSTALL b/libs/girara/INSTALL
new file mode 100755
index 0000000..621f3f8
--- /dev/null
+++ b/libs/girara/INSTALL
@@ -0,0 +1 @@
+make PREFIX=${INSTALL_ROOT}/usr install
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index 24147d4..a442fdf 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -16,6 +16,9 @@ STORAGE_DRIVERS='hash_drv' &&
if is_depends_enabled $SPELL sqlite ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
fi &&
+if is_depends_enabled $SPELL sqlite2 ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite_drv"
+fi &&
if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
fi &&
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 0b97eba..4d5da68 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -3,10 +3,17 @@ optional_depends MAIL-TRANSPORT-AGENT \
'' \
'Enable delivery agent support' &&

-optional_depends sqlite \
- '' \
- '' \
- 'Enable SQLite storage driver' &&
+if ! list_find "$DSPAM_OPTS" "--enable-daemon"; then
+ optional_depends sqlite \
+ '' \
+ '' \
+ 'Enable SQLite storage driver' &&
+
+ optional_depends sqlite2 \
+ '' \
+ '' \
+ 'Enable SQLite2 storage driver'
+fi &&

optional_depends MYSQL \
'--with-mysql-includes=/usr/include/mysql' \
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 18fd804..bb6d66d 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -18,6 +18,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=3.10.1
+ PATCHLEVEL=2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index c847fcc..fc8a3b0 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,14 @@
+2012-03-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=2
+ * PRE_BUILD: apply the patch for non-scm version
+ * rset.patch: added official patch to prevent daemon crash in some
case
+ * init.d/dspam: renewed init script for recent version -- it can fork
to
+ background now finally
+
+2012-03-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: added sqlite2 storage driver
+ * DEPENDS: non-thread-safe storage drivers are not allowed in daemon
mode
+
2012-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: corrected typo ('none' -> 'None'), fixed OPTS joining; moved
OPTS to the end of lines; removed deprecated db4 driver
diff --git a/mail/dspam/PRE_BUILD b/mail/dspam/PRE_BUILD
index 0a0667e..137213d 100755
--- a/mail/dspam/PRE_BUILD
+++ b/mail/dspam/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
-if [[ $DSPAM_BRANCH == scm ]]; then
cd $SOURCE_DIRECTORY &&
+if [[ $DSPAM_BRANCH == scm ]]; then
aclocal &&
NOCONFIGURE=1 ./autogen.sh
+else
+ patch -p0 < "$SPELL_DIRECTORY/rset.patch"
fi
diff --git a/mail/dspam/init.d/dspam b/mail/dspam/init.d/dspam
index f6fdfd5..263111e 100755
--- a/mail/dspam/init.d/dspam
+++ b/mail/dspam/init.d/dspam
@@ -1,17 +1,9 @@
#!/bin/bash

PROGRAM="/usr/bin/dspam"
-ARGS="--daemon > /dev/null 2>&1 &"
+ARGS="--daemon"
RUNLEVEL=3
-PIDFILE="/var/run/dspam/dspam.pid"
+PIDFILE="/var/run/dspam.pid"
NEEDS="+remote_fs +network"

. /etc/init.d/smgl_init
-
-start() {
- echo "Starting $NAME..."
-
- [[ -d /var/run/dspam ]] || mkdir -p /var/run/dspam
- su root -c "$PROGRAM $ARGS"
- evaluate_retval
-}
diff --git a/mail/dspam/rset.patch b/mail/dspam/rset.patch
new file mode 100644
index 0000000..883bc58
--- /dev/null
+++ b/mail/dspam/rset.patch
@@ -0,0 +1,62 @@
+--- src/daemon.c.orig
++++ src/daemon.c
+@@ -1,4 +1,4 @@
+-/* $Id: daemon.c,v 1.22 2011/06/28 00:13:48 sbajic Exp $ */
++/* $Id: daemon.c,v 1.23 2012/02/09 22:05:07 sbajic Exp $ */
+
+ /*
+ DSPAM
+@@ -992,33 +992,37 @@ char *daemon_expect(THREAD_CTX *TTX, const char
*command) {
+ char buf[128];
+ char *cmd;
+
+- cmd = daemon_getline(TTX, 300);
++ cmd = daemon_getline(TTX, 300);
+ if (cmd == NULL)
+ return NULL;
+
+ while(strncasecmp(cmd, command, strlen(command))) {
+ if (!strncasecmp(cmd, "QUIT", 4)) {
+ free(cmd);
+- daemon_reply(TTX, LMTP_QUIT, "2.0.0", "OK");
++ daemon_reply(TTX, LMTP_QUIT, "2.0.0", "OK");
+ return NULL;
+- }
+- if (!strncasecmp(cmd, "RSET", 4)) {
++ } else if (!strncasecmp(cmd, "RSET", 4)) {
+ snprintf(buf, sizeof(buf), "%d OK", LMTP_OK);
+ if (send_socket(TTX, buf)<=0)
+ return NULL;
+ free(cmd);
+- return "RSET";
++ if (!strncasecmp(command, "LHLO", 4)) {
++ cmd = daemon_getline(TTX, 300);
++ if (cmd == NULL)
++ return NULL;
++ } else {
++ return "RSET";
++ }
++ } else {
++ snprintf(buf, sizeof(buf), "%d 5.0.0 Need %s here.", LMTP_BAD_CMD,
command);
++ if (send_socket(TTX, buf)<=0)
++ return NULL;
++ free(cmd);
++ cmd = daemon_getline(TTX, 300);
++ if (cmd == NULL)
++ return NULL;
+ }
+-
+- snprintf(buf, sizeof(buf), "%d 5.0.0 Need %s here.", LMTP_BAD_CMD,
command);
+-
+- if (send_socket(TTX, buf)<=0)
+- return NULL;
+- free(cmd);
+- cmd = daemon_getline(TTX, 300);
+- if (cmd == NULL)
+- return NULL;
+- }
++ }
+ return cmd;
+ }
+
+--
diff --git a/net/tcpflow/DETAILS b/net/tcpflow/DETAILS
index ea06ef3..bbe7714 100755
--- a/net/tcpflow/DETAILS
+++ b/net/tcpflow/DETAILS
@@ -1,10 +1,10 @@
SPELL=tcpflow
- VERSION=0.21
+ VERSION=1.2.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.circlemud.org/pub/jelson/$SPELL/$SOURCE
- WEB_SITE=http://www.circlemud.org/~jelson/software/tcpflow/
-
SOURCE_HASH=sha512:aec7978e88c67671523187eadcf28ba4ef09394a461a7b65a5f5f23af5e87501567f9a3467be824b67ef7b31c554c91d82f25ba0f928308a32e701792095d8d1
+ SOURCE_URL[0]=http://afflib.org/downloads/$SOURCE
+ WEB_SITE=http://afflib.org/software/tcpflow
+
SOURCE_HASH=sha512:9368fe64240e11cff9d3379ccf58f5754f15dd6395f60a3b198c0ddd3cf435f6ad4b9a513a02c67b601fcd606706d05df5fec2a9c25c8b1140de7d78950d3934
LICENSE[0]=GPL
ENTERED=20030409
KEYWORDS="net"
diff --git a/net/tcpflow/HISTORY b/net/tcpflow/HISTORY
index 733ca50..59f4660 100644
--- a/net/tcpflow/HISTORY
+++ b/net/tcpflow/HISTORY
@@ -1,3 +1,6 @@
+2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.1, WEB_SITE and SOURCE_URL[0] updated
+
2009-11-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.21
fixed long description wrap
diff --git a/net/whois/DETAILS b/net/whois/DETAILS
index 5ef3dd2..1767454 100755
--- a/net/whois/DETAILS
+++ b/net/whois/DETAILS
@@ -1,9 +1,9 @@
SPELL=whois
- VERSION=5.0.14
- SOURCE=${SPELL}_$VERSION.tar.gz
+ VERSION=5.0.15
+ SOURCE=${SPELL}_$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/w/whois/$SOURCE
-
SOURCE_HASH=sha512:79a9453cebeb6df293e7c708c8d5e199161070e2ad54df89d4991c1d48d0a9a8b384c7850797aec30339e310ed2c49ba5b720d3ebc9a652541b040991caa55b3
+
SOURCE_HASH=sha512:d920d23b1c347be442c7eba72f9ffd348c891ea558cd7e82c810962ff59817eef723fc5d6de7e5b22161b008a6916ea5e89eed2b4461ecc31d0124b1e791454f
WEB_SITE=http://www.linux.it/~md/software/
ENTERED=20011228
LICENSE[0]=GPL
diff --git a/net/whois/HISTORY b/net/whois/HISTORY
index 254cbf4..fe39ce3 100644
--- a/net/whois/HISTORY
+++ b/net/whois/HISTORY
@@ -1,3 +1,6 @@
+2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.15, gz -> xz
+
2012-01-11 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated spell to 5.0.14

diff --git a/science/pcb/BUILD b/science/pcb/BUILD
new file mode 100755
index 0000000..a6e847d
--- /dev/null
+++ b/science/pcb/BUILD
@@ -0,0 +1,3 @@
+OPTS="${OPTS} ${PCB_DEBUG} ${PCB_EFENCE} ${PCB_DMALLOC} ${PCB_COORD64}
${PCB_COORD32} ${PCB_TOPO}" &&
+
+default_build
diff --git a/science/pcb/CONFIGURE b/science/pcb/CONFIGURE
new file mode 100755
index 0000000..c7dafeb
--- /dev/null
+++ b/science/pcb/CONFIGURE
@@ -0,0 +1,17 @@
+config_query_option PCB_DEBUG "Output lots of debug spew while running?" n \
+ "--enable-debug" ""
+
+config_query_option PCB_EFENCE "Link with ElectricFence for malloc
debugging?" n \
+ "--enable-efence" ""
+
+config_query_option PCB_DMALLOC "Compile and link with dmalloc for malloc
debugging?" n \
+ "--enable-dmalloc" ""
+
+config_query_option PCB_COORD64 "Force 64-bit coordinate types?" n \
+ "--enable-coord64" ""
+
+config_query_option PCB_COORD32 "Force 32-bit coordinate types?" n \
+ "--enable-coord32" ""
+
+config_query_option PCB_TOPO "Enable toporouter graphical output?" n \
+ "--enable-toporouter-output" ""
diff --git a/science/pcb/DEPENDS b/science/pcb/DEPENDS
index 53302cd..98eed98 100755
--- a/science/pcb/DEPENDS
+++ b/science/pcb/DEPENDS
@@ -3,7 +3,22 @@ depends glib2 &&
depends gd &&
depends tk &&

-optional_depends libstroke \
- "--with-libstroke" \
- "--without-libstroke" \
- "Enable libstroke support"
+#optional_depends libstroke \
+# "--with-libstroke" \
+# "--without-libstroke" \
+# "Enable libstroke support?" &&
+
+optional_depends OPENGL \
+ "--enable-gl" \
+ "--disable-gl" \
+ "Enable GL drawing (with GTK HID)?" &&
+
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "Compile and link with Xrender?" &&
+
+optional_depends dbus-glib \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "Enable DBUS IPC?"
diff --git a/science/pcb/DETAILS b/science/pcb/DETAILS
index a8c9c3b..1e5b9d1 100755
--- a/science/pcb/DETAILS
+++ b/science/pcb/DETAILS
@@ -1,10 +1,10 @@
SPELL=pcb
- VERSION=20080202
+ VERSION=20110918
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=${SOURCEFORGE_URL}/pcb/${SOURCE}
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/${SPELL}/${SPELL}/${SPELL}-${VERSION}/${SOURCE}
SOURCE_URL[1]=http://geda.seul.org/dist/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:ca74a273f0e63b6497e50cab9f4553ccc2149a4ffa9081c409477392c245c38a144deb5b106da4c1b89be09a5eb8e268870b4fb5820d182c647abfb0c19c288d
WEB_SITE=http://pcb.sourceforge.net/
ENTERED=20060309
LICENSE[0]=GPL
diff --git a/science/pcb/HISTORY b/science/pcb/HISTORY
index ce9bc6d..07a2e65 100644
--- a/science/pcb/HISTORY
+++ b/science/pcb/HISTORY
@@ -1,3 +1,7 @@
+2012-03-04 Sven Lemke <catnip AT web.de>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 20110918
+
2008-07-19 Remko van der Vossen <wich AT stack.nl>
* VERSION: 20080202

diff --git a/utils/desktop-file-utils/DETAILS
b/utils/desktop-file-utils/DETAILS
index 4b6943e..a940dcd 100755
--- a/utils/desktop-file-utils/DETAILS
+++ b/utils/desktop-file-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=desktop-file-utils
- VERSION=0.18
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.20
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/utils/desktop-file-utils/HISTORY
b/utils/desktop-file-utils/HISTORY
index e72639e..9687434 100644
--- a/utils/desktop-file-utils/HISTORY
+++ b/utils/desktop-file-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-03-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.20
+
2011-02-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.18

diff --git a/utils/desktop-file-utils/desktop-file-utils-0.18.tar.bz2.sig
b/utils/desktop-file-utils/desktop-file-utils-0.18.tar.bz2.sig
deleted file mode 100644
index 72c8ea8..0000000
Binary files a/utils/desktop-file-utils/desktop-file-utils-0.18.tar.bz2.sig
and /dev/null differ
diff --git a/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig
b/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig
new file mode 100644
index 0000000..3fa3597
Binary files /dev/null and
b/utils/desktop-file-utils/desktop-file-utils-0.20.tar.xz.sig differ
diff --git a/utils/newsyslog/0AFC7476.gpg b/utils/newsyslog/0AFC7476.gpg
deleted file mode 100644
index 0cf667a..0000000
Binary files a/utils/newsyslog/0AFC7476.gpg and /dev/null differ
diff --git a/utils/newsyslog/5736DE75.gpg b/utils/newsyslog/5736DE75.gpg
new file mode 100644
index 0000000..be7fef4
Binary files /dev/null and b/utils/newsyslog/5736DE75.gpg differ
diff --git a/utils/newsyslog/DETAILS b/utils/newsyslog/DETAILS
index 76dafe0..9ce5f3d 100755
--- a/utils/newsyslog/DETAILS
+++ b/utils/newsyslog/DETAILS
@@ -1,10 +1,10 @@
SPELL=newsyslog
- VERSION=1.8
+ VERSION=1.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://archives.eyrie.org/software/system/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SOURCE_GPG=0AFC7476.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=5736DE75.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.eyrie.org/~eagle/software/newsyslog/
diff --git a/utils/newsyslog/HISTORY b/utils/newsyslog/HISTORY
index ebcd647..04d5473 100644
--- a/utils/newsyslog/HISTORY
+++ b/utils/newsyslog/HISTORY
@@ -1,3 +1,8 @@
+2012-03-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9
+ * 0AFC7476.gpg: deleted
+ * 5736DE75.gpg: added new key
+
2009-07-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: converted to upstream signature checking; cleaned up;
quoting paths



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (706885ae6e87262cf459cb6fadc3ab44db43794a), Eric Sandall, 03/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page