sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (c9907fc9ea34902000d94b60df2b2819a289b052)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (c9907fc9ea34902000d94b60df2b2819a289b052)
- Date: Thu, 23 May 2013 20:07:41 -0500
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
ChangeLog | 3 +
z-java/j2sdk-bin/CONFLICTS | 3 -
z-java/j2sdk-bin/HISTORY | 3 +
z-java/j2sdk/CONFLICTS | 3 -
z-java/j2sdk/HISTORY | 3 +
z-java/jdk1.5-bin/CONFLICTS | 3 -
z-java/jdk1.5-bin/HISTORY | 3 +
z-java/jdk6-bin/CONFLICTS | 3 -
z-java/jdk6-bin/HISTORY | 3 +
z-java/jre1.5-bin/CONFLICTS | 3 -
z-java/jre1.5-bin/HISTORY | 3 +
z-java/jre6-bin/CONFLICTS | 3 -
z-java/jre6-bin/HISTORY | 3 +
z-java/jre7-bin/BUILD | 1
z-java/jre7-bin/CONFIGURE | 9 +++
z-java/jre7-bin/CONFLICTS | 6 ++
z-java/jre7-bin/DEPENDS | 10 +++
z-java/jre7-bin/DETAILS | 39 ++++++++++++++
z-java/jre7-bin/FINAL | 3 +
z-java/jre7-bin/HISTORY | 3 +
z-java/jre7-bin/INSTALL | 80
+++++++++++++++++++++++++++++
z-java/jre7-bin/JAVA_WARNING | 13 ++++
z-java/jre7-bin/PRE_BUILD | 6 ++
z-java/jre7-bin/PROVIDES | 2
z-java/jre7-bin/UNATTEND_SAFE | 1
z-java/jre7-bin/java.sh | 6 ++
z-java/jre7-bin/jre-7u21-linux-i586.gz.sig |binary
z-java/jre7-bin/jre-7u21-linux-x64.gz.sig |binary
28 files changed, 212 insertions(+), 6 deletions(-)
New commits:
commit c9907fc9ea34902000d94b60df2b2819a289b052
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jre7-bin: Added Oracle Java Runtime Environment (JRE) 7
Only tested with x86_64 headless mode running Minecraft, but *should*
work for desktops, too. :)
diff --git a/ChangeLog b/ChangeLog
index 46e5c12..40a2fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * z-java/jre7-bin: Added Oracle Java Runtime Environment (JRE) 7
+
2013-03-07 Vlad Glagolev <stealth AT sourcemage.org>
* z-kernels/nvidia_legacy_304xx: new spell, certified NVIDIA binary
drivers for older cards, based on spell nvidia_driver
diff --git a/z-java/j2sdk-bin/CONFLICTS b/z-java/j2sdk-bin/CONFLICTS
index 246f7c5..2c10edf 100755
--- a/z-java/j2sdk-bin/CONFLICTS
+++ b/z-java/j2sdk-bin/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk &&
conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts jre7-bin
diff --git a/z-java/j2sdk-bin/HISTORY b/z-java/j2sdk-bin/HISTORY
index 91c354a..25e2fe7 100644
--- a/z-java/j2sdk-bin/HISTORY
+++ b/z-java/j2sdk-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on any provider of ODBC-MGR now
diff --git a/z-java/j2sdk/CONFLICTS b/z-java/j2sdk/CONFLICTS
index 6946a67..355a3fa 100755
--- a/z-java/j2sdk/CONFLICTS
+++ b/z-java/j2sdk/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts jre7-bin
diff --git a/z-java/j2sdk/HISTORY b/z-java/j2sdk/HISTORY
index ea6b16b..7f82d07 100644
--- a/z-java/j2sdk/HISTORY
+++ b/z-java/j2sdk/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on any provider of ODBC-MGR now
diff --git a/z-java/jdk1.5-bin/CONFLICTS b/z-java/jdk1.5-bin/CONFLICTS
index b3438cb..a54970d 100755
--- a/z-java/jdk1.5-bin/CONFLICTS
+++ b/z-java/jdk1.5-bin/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts jre7-bin
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index 622a5c1..37c7f6d 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on any provider of ODBC-MGR now
diff --git a/z-java/jdk6-bin/CONFLICTS b/z-java/jdk6-bin/CONFLICTS
index 69321cd..3227eee 100755
--- a/z-java/jdk6-bin/CONFLICTS
+++ b/z-java/jdk6-bin/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
-conflicts jdk1.5-bin
+conflicts jdk1.5-bin &&
+conflicts jre7-bin
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 4ef93d4..7dd60e8 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2013-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6u45, SECURITY_PATCH=12
diff --git a/z-java/jre1.5-bin/CONFLICTS b/z-java/jre1.5-bin/CONFLICTS
index 5d8c35c..83d5496 100755
--- a/z-java/jre1.5-bin/CONFLICTS
+++ b/z-java/jre1.5-bin/CONFLICTS
@@ -1,4 +1,5 @@
conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts jre7-bin
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 5a755e3..3f4f31f 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on any provider of ODBC-MGR now
diff --git a/z-java/jre6-bin/CONFLICTS b/z-java/jre6-bin/CONFLICTS
index e6d486e..a27e60f 100755
--- a/z-java/jre6-bin/CONFLICTS
+++ b/z-java/jre6-bin/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts jre7-bin
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index b31e79e..f3e1943 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jre7-bin
+
2013-03-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6u43; SECURITY_PATCH++
diff --git a/z-java/jre7-bin/BUILD b/z-java/jre7-bin/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-java/jre7-bin/BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-java/jre7-bin/CONFIGURE b/z-java/jre7-bin/CONFIGURE
new file mode 100755
index 0000000..7bc34db
--- /dev/null
+++ b/z-java/jre7-bin/CONFIGURE
@@ -0,0 +1,9 @@
+# download java sources warning.
+#
+source $SPELL_DIRECTORY/JAVA_WARNING &&
+
+# Standard rejected warnings.
+#
+source $GRIMOIRE/REJECTED_MSG &&
+
+config_query JRE6_BIN_X "Would you like to use Java with X?" n
diff --git a/z-java/jre7-bin/CONFLICTS b/z-java/jre7-bin/CONFLICTS
new file mode 100755
index 0000000..c2712c8
--- /dev/null
+++ b/z-java/jre7-bin/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jdk1.5-bin &&
+conflicts jre1.5-bin &&
+conflicts jdk6-bin &&
+conflicts jre6-bin
diff --git a/z-java/jre7-bin/DEPENDS b/z-java/jre7-bin/DEPENDS
new file mode 100755
index 0000000..1b9e3a2
--- /dev/null
+++ b/z-java/jre7-bin/DEPENDS
@@ -0,0 +1,10 @@
+depends ODBC-MGR &&
+depends alsa-lib &&
+
+if [[ "$JRE6_BIN_X" == "y" ]]; then
+ depends libxi &&
+ depends libxtst &&
+ depends libxext &&
+ depends libx11 &&
+ depends libxau
+fi
diff --git a/z-java/jre7-bin/DETAILS b/z-java/jre7-bin/DETAILS
new file mode 100755
index 0000000..de2fbab
--- /dev/null
+++ b/z-java/jre7-bin/DETAILS
@@ -0,0 +1,39 @@
+. $GRIMOIRE/FUNCTIONS
+ SPELL=jre7-bin
+ VERSION=7u21
+ VER="1.${VERSION:0:1}.0_${VERSION:2}"
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE=jre-$VERSION-linux-i586.gz
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}"
]]; then
+ SOURCE=jre-$VERSION-linux-x64.gz
+ else
+ SOURCE=jre-$VERSION-linux-i586.gz
+ fi
+ ;;
+###########################################################################
+# Missing support for sparc and sparcv9 tarballs say solaris not linux :\
+###########################################################################
+ *)
+ SOURCE=
+ VERSION=Unsupported
+ VER=Unsupported
+ ;;
+esac
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/jre$VER"
+ ENTERED=20130523
+ ARCHIVE='off'
+ REJECT='is non-source'
+ SHORT='Java Software Runtime Environment'
+ DOCS='COPYRIGHT LICENSE README
THIRDPARTYLICENSEREADME-JAVAFX.txt THIRDPARTYLICENSEREADME.txt'
+cat << EOF
+The JRE contains the Java Plug-In for Mozilla/Firefox and other Netscape
7.x+ plugin compatible browsers.
+
+Note: You need to download the JRE installer yourself from the Oracle
Website,
+see 'gaze website ${SPELL}' for the location. Put the downloaded file in
+/var/spool/sorcery so cast will find it.
+EOF
diff --git a/z-java/jre7-bin/FINAL b/z-java/jre7-bin/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/z-java/jre7-bin/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/z-java/jre7-bin/HISTORY b/z-java/jre7-bin/HISTORY
new file mode 100644
index 0000000..07b2c3b
--- /dev/null
+++ b/z-java/jre7-bin/HISTORY
@@ -0,0 +1,3 @@
+2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
+ * Copied and renamed from jre6-bin
+
diff --git a/z-java/jre7-bin/INSTALL b/z-java/jre7-bin/INSTALL
new file mode 100755
index 0000000..27433c1
--- /dev/null
+++ b/z-java/jre7-bin/INSTALL
@@ -0,0 +1,80 @@
+cd ${INSTALL_ROOT}/usr/lib &&
+
+cp -av "${SOURCE_DIRECTORY}" "${INSTALL_ROOT}"/usr/lib/ &&
+
+if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
+then
+ message "${PROBLEM_COLOR}The package says i586 so if you really are
running an i386 " \
+ "or i486 you may experience problems with this
package${DEFAULT_COLOR}"
+fi &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
+then
+ message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for mozilla${DEFAULT_COLOR}"
&&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
seamonkey${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libjavaplugin_oji.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/opera/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for opera${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/opera/plugins/libjavaplugin_oji.so
+ fi
+elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}"
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
seamonkey${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libnpjp2.so
+ fi
+fi &&
+
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SCRIPT_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ &&
+sedit "s/J2SDKDIR/jre$VER/" ${INSTALL_ROOT}/etc/profile.d/java.sh &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jre$VER/ ${INSTALL_ROOT}/usr/lib/java7
diff --git a/z-java/jre7-bin/JAVA_WARNING b/z-java/jre7-bin/JAVA_WARNING
new file mode 100644
index 0000000..092659a
--- /dev/null
+++ b/z-java/jre7-bin/JAVA_WARNING
@@ -0,0 +1,13 @@
+# Special messages with regards to JRE sources.
+#
+if [[ ! -f $SOURCE_CACHE/$SOURCE ]]; then
+ message "\n${MESSAGE_COLOR}For $SPELL you need to manually download the
sources for JRE \
+\nversion 6 in self-extracting format from Oracle's website: \
+${DEFAULT_COLOR}\n ${WEB_SITE} \
+\n${MESSAGE_COLOR}Put the downloaded file $SOURCE in \
+${DEFAULT_COLOR}/var/spool/sorcery/ \
+${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&
+
+ message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
+ return 1
+fi
diff --git a/z-java/jre7-bin/PRE_BUILD b/z-java/jre7-bin/PRE_BUILD
new file mode 100755
index 0000000..87f2134
--- /dev/null
+++ b/z-java/jre7-bin/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] && [[ ! -h
"$INSTALL_ROOT/lib64" ]]; then
+ ln -vsf "$TRACK_ROOT/lib" "$INSTALL_ROOT/lib64"
+fi
+
diff --git a/z-java/jre7-bin/PROVIDES b/z-java/jre7-bin/PROVIDES
new file mode 100755
index 0000000..9fb4a54
--- /dev/null
+++ b/z-java/jre7-bin/PROVIDES
@@ -0,0 +1,2 @@
+JAVA
+JAVA7
diff --git a/z-java/jre7-bin/UNATTEND_SAFE b/z-java/jre7-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..9a3364d
--- /dev/null
+++ b/z-java/jre7-bin/UNATTEND_SAFE
@@ -0,0 +1 @@
+License has already been agreed to when user gets sources seperately.
diff --git a/z-java/jre7-bin/java.sh b/z-java/jre7-bin/java.sh
new file mode 100644
index 0000000..18b0a14
--- /dev/null
+++ b/z-java/jre7-bin/java.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+JAVA_HOME=/usr/lib/J2SDKDIR
+
+export JAVA_HOME
+export PATH=$PATH:$JAVA_HOME/bin
diff --git a/z-java/jre7-bin/jre-7u21-linux-i586.gz.sig
b/z-java/jre7-bin/jre-7u21-linux-i586.gz.sig
new file mode 100644
index 0000000..26b02e3
Binary files /dev/null and b/z-java/jre7-bin/jre-7u21-linux-i586.gz.sig differ
diff --git a/z-java/jre7-bin/jre-7u21-linux-x64.gz.sig
b/z-java/jre7-bin/jre-7u21-linux-x64.gz.sig
new file mode 100644
index 0000000..24570b8
Binary files /dev/null and b/z-java/jre7-bin/jre-7u21-linux-x64.gz.sig differ
- [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (c9907fc9ea34902000d94b60df2b2819a289b052), Eric Sandall, 05/23/2013
Archive powered by MHonArc 2.6.24.