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 (91f4fb7fcfdeadb9929799f5e812b2d837ffc7d3)
- 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 (91f4fb7fcfdeadb9929799f5e812b2d837ffc7d3)
- Date: Tue, 17 Sep 2013 20:13:50 -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/jdk7-bin/BUILD | 1
z-java/jdk7-bin/CONFIGURE | 7
z-java/jdk7-bin/CONFLICTS | 7
z-java/jdk7-bin/DEPENDS | 7
z-java/jdk7-bin/DETAILS | 36 ++++
z-java/jdk7-bin/FINAL | 3
z-java/jdk7-bin/HISTORY | 197
+++++++++++++++++++++++++
z-java/jdk7-bin/INSTALL | 102 ++++++++++++
z-java/jdk7-bin/JAVA_WARNING | 13 +
z-java/jdk7-bin/PRE_BUILD | 12 +
z-java/jdk7-bin/PROVIDES | 4
z-java/jdk7-bin/UNATTEND_SAFE | 1
z-java/jdk7-bin/jdk-7u40-linux-i586.tar.gz.sig |binary
z-java/jdk7-bin/jdk-7u40-linux-x64.tar.gz.sig |binary
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/CONFLICTS | 3
z-java/jre7-bin/HISTORY | 3
29 files changed, 428 insertions(+), 7 deletions(-)
New commits:
commit 91f4fb7fcfdeadb9929799f5e812b2d837ffc7d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jdk7-bin: Added Java 7 Software Development Kit
diff --git a/ChangeLog b/ChangeLog
index 40a2fd3..221eef3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * z-java/jdk7-bin: Added Java 7 Software Development Kit
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* z-java/jre7-bin: Added Oracle Java Runtime Environment (JRE) 7
diff --git a/z-java/j2sdk-bin/CONFLICTS b/z-java/j2sdk-bin/CONFLICTS
index 2c10edf..7f421e9 100755
--- a/z-java/j2sdk-bin/CONFLICTS
+++ b/z-java/j2sdk-bin/CONFLICTS
@@ -3,4 +3,5 @@ conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk6-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/j2sdk-bin/HISTORY b/z-java/j2sdk-bin/HISTORY
index 25e2fe7..3d2b981 100644
--- a/z-java/j2sdk-bin/HISTORY
+++ b/z-java/j2sdk-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/j2sdk/CONFLICTS b/z-java/j2sdk/CONFLICTS
index 355a3fa..0a8f41e 100755
--- a/z-java/j2sdk/CONFLICTS
+++ b/z-java/j2sdk/CONFLICTS
@@ -3,4 +3,5 @@ conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk6-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/j2sdk/HISTORY b/z-java/j2sdk/HISTORY
index 7f82d07..66c5f6f 100644
--- a/z-java/j2sdk/HISTORY
+++ b/z-java/j2sdk/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/jdk1.5-bin/CONFLICTS b/z-java/jdk1.5-bin/CONFLICTS
index a54970d..4531c23 100755
--- a/z-java/jdk1.5-bin/CONFLICTS
+++ b/z-java/jdk1.5-bin/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk6-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index 37c7f6d..3cb430f 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/jdk6-bin/CONFLICTS b/z-java/jdk6-bin/CONFLICTS
index 3227eee..ab00c46 100755
--- a/z-java/jdk6-bin/CONFLICTS
+++ b/z-java/jdk6-bin/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk1.5-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index 7dd60e8..63ab804 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/jdk7-bin/BUILD b/z-java/jdk7-bin/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-java/jdk7-bin/BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-java/jdk7-bin/CONFIGURE b/z-java/jdk7-bin/CONFIGURE
new file mode 100755
index 0000000..ee38dba
--- /dev/null
+++ b/z-java/jdk7-bin/CONFIGURE
@@ -0,0 +1,7 @@
+# download java sources warning.
+#
+source $SPELL_DIRECTORY/JAVA_WARNING &&
+
+# Standard rejected warnings.
+#
+source $GRIMOIRE/REJECTED_MSG
diff --git a/z-java/jdk7-bin/CONFLICTS b/z-java/jdk7-bin/CONFLICTS
new file mode 100755
index 0000000..0837bc0
--- /dev/null
+++ b/z-java/jdk7-bin/CONFLICTS
@@ -0,0 +1,7 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jre7-bin
diff --git a/z-java/jdk7-bin/DEPENDS b/z-java/jdk7-bin/DEPENDS
new file mode 100755
index 0000000..2343910
--- /dev/null
+++ b/z-java/jdk7-bin/DEPENDS
@@ -0,0 +1,7 @@
+depends alsa-lib &&
+depends gcc &&
+depends libx11 &&
+depends libxext &&
+depends libxt &&
+depends libxtst &&
+depends ODBC-MGR
diff --git a/z-java/jdk7-bin/DETAILS b/z-java/jdk7-bin/DETAILS
new file mode 100755
index 0000000..65df3e9
--- /dev/null
+++ b/z-java/jdk7-bin/DETAILS
@@ -0,0 +1,36 @@
+. $GRIMOIRE/FUNCTIONS
+ SPELL=jdk7-bin
+ VERSION=7u40
+ VER=1.7.0_40
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE=jdk-$VERSION-linux-i586.tar.gz
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
+ SOURCE=jdk-$VERSION-linux-x64.tar.gz
+ else
+ SOURCE=jdk-$VERSION-linux-i586.tar.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/jdk${VER}"
+ ENTERED=20130917
+ ARCHIVE="off"
+ REJECT="is non-source"
+ SHORT="Java 7 Software Development Kit"
+cat << EOF
+The Java 7 Development Kit is a feature-complete development and
+deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
+and Mozilla/Netscape 6.x, if you've installed the i586.
+EOF
diff --git a/z-java/jdk7-bin/FINAL b/z-java/jdk7-bin/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/z-java/jdk7-bin/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/z-java/jdk7-bin/HISTORY b/z-java/jdk7-bin/HISTORY
new file mode 100644
index 0000000..7dd60e8
--- /dev/null
+++ b/z-java/jdk7-bin/HISTORY
@@ -0,0 +1,197 @@
+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
+
+2013-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u43; SECURITY_PATCH++
+
+2013-02-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u41; SECURITY_PATCH++
+
+2013-02-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6u39, SECURITY_PATCH++
+
+2013-01-14 Vlad Glagolev <stealth AT sourcemage.org>
+ DETAILS: SECURITY_PATCH++, this was a security update
+
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6u38
+
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u37; SECURITY_PATCH++
+ * JAVA_WARNING: "Sun" -> "Oracle"
+
+2012-09-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u35; SECURITY_PATCH++
+
+2012-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6u34
+
+2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: renewed hashes (upstream reuploaded tarballs without note)
+
+2012-05-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u33
+
+2012-05-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u32
+
+2012-03-31 Ladislav Hagara <hgr AT vabo.cz>
+ * INSTALL: google-chrome-bin plugin installed
+
+2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u31; SECURITY_PATCH++
+
+2012-01-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u30
+
+2011-10-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 6u29; SECURITY_PATCH++
+ See
http://www.oracle.com/technetwork/topics/security/javacpuoct2011-443431.html
+ for security info and
+
http://www.oracle.com/technetwork/java/javase/6u29-relnotes-507960.html
+ for release notes
+
+2011-10-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6u27; SECURITY_PATCH++; cleaned up;
+ DLJ had been retired (http://robilad.livejournal.com/90792.html)
+ * INSTALL: added seamonkey support for installing java plugin;
+ fixed firefox-bin plugin installation for x64
+ * PRE_BUILD: fixed "press enter" issue
+ * CONFIGURE: use internal JAVA_WARNING
+ * JAVA_WARNING: added
+ * volatiles: removed, deprecated
+
+2011-08-31 Bor Kraljič <pyrobor AT ver.si>
+ * INSTALL: added path to install plugin for firefox
+
+2011-06-13 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u26, SECURITY_PATCH++, PATCHLEVEL--
+
+2011-04-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u25
+
+2011-02-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u24
+
+2011-02-09 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: added new /usr/lib/java6 symlink to INSTALL_DIR
+ * PROVIDES: added JAVA6
+
+2010-12-15 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u23
+
+2010-10-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6u22
+
+2010-08-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6u21
+
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
+2010-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u18
+
+2009-11-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u17
+
+2009-08-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u16
+
+2009-06-06 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u14
+
+2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated x86 and x86_64 to 6u13
+ Shortened SHORT
+ * DEPENDS: Removed gcc33, libstdc++.so.5 is no longer needed
+ Bug #15164
+ Remove xorg-modular check and add as dependencies
+ Make X libraries non-optional to avoid `cleanse` failure
+
+2009-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Install plugins to xulrunner instead of firefox
+ Firefox picks up it's plugins from xulrunner now:
+ /usr/lib/firefox/plugins -> /usr/lib/xulrunner/plugins
+ Added plugin support for firefox-bin (/opt/firefox/plugins)
+
+2009-02-15 David Kowis <dkowis AT shlrm.org>
+ * PRE_BUILD: changed extraction method to use the one sun provides
+ This also builds a few more jars than it used to.
+ * INSTALL: fixed installing of plugins, and added amd64 plugin
+
+2009-02-08 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u12
+
+2008-12-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: fixed sha512 sum for ia32 version
+
+2008-12-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u11
+
+2008-10-16 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u10
+
+2008-07-09 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u7
+
+2008-04-17 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * CONFLICTS: made conflict with jre6-bin
+
+2008-04-17 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u6
+
+2008-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 6u5
+
+2008-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: added alsa-lib and gcc33
+
+2008-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated to version 6u4
+
+2007-11-24 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: SOURCE_DIRECTORY uses _03, not _01 now
+ Updated PATCHLEVEL, anyone on amd64 will have no JAVA from this
+ * PRE_BUILD: Extraction script for amd64 is broken, us unzip method
+ Unzip always fails, even when successful, here so pass || true
+ Unpack JAR files (done with the --unpack command to the script)
+ * INSTALL: Copy files to $INSTALL_ROOT/usr/lib, don't extract in
INSTALL
+
+2007-10-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated to version 6u3
+
+2007-09-23 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Remove debugging code (bad me)
+
+2007-08-19 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Also conflicts with jdk1.5-bin
+
+2007-08-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Increment PATCHLEVEL to install plugin (for ia32
architectures)
+ * INSTALL: SMGL_COMPAT_ARCH[0] -> SMGL_COMPAT_ARCHS[1]
+
+2007-08-09 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, INSTALL: updated to use the DLJ licensed binaries
+
+2007-07-29 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: Also provides JDK5 (Bug #13891)
+
+2007-07-23 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated 6u2
+
+2007-04-20 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added libxtst for modular xorg, use
+ check_if_xorg_modular_libs now
+ * DETAILS: fixed VER and SOURCE_DIRECTORY for proper symlinking
+
+2007-02-08 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version bump to 6u1
+
+2007-02-08 David Kowis <dkowis AT shlrm.org>
+ * ALL: created spell based off the jdk1.5-bin spell
+
diff --git a/z-java/jdk7-bin/INSTALL b/z-java/jdk7-bin/INSTALL
new file mode 100755
index 0000000..904325e
--- /dev/null
+++ b/z-java/jdk7-bin/INSTALL
@@ -0,0 +1,102 @@
+cp -pPR "${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
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/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/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}"
&&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/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/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/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/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libjavaplugin_oji.so
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/google/chrome/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
google-chrome-bin${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/opt/google/chrome/plugins/libjavaplugin_oji.so
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/google/chrome/plugins/libnpjp2.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/jdk$VER/jre/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/jdk$VER/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for firefox${DEFAULT_COLOR}"
&&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/firefox/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/jdk$VER/jre/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/jdk$VER/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libnpjp2.so
+ fi
+fi &&
+
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SECTION_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk$VER/ ${INSTALL_ROOT}/usr/lib/j2sdk &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk$VER/ ${INSTALL_ROOT}/usr/lib/java7
diff --git a/z-java/jdk7-bin/JAVA_WARNING b/z-java/jdk7-bin/JAVA_WARNING
new file mode 100644
index 0000000..e8d5a46
--- /dev/null
+++ b/z-java/jdk7-bin/JAVA_WARNING
@@ -0,0 +1,13 @@
+# Special messages with regards to JRE 1.6.0 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/jdk7-bin/PRE_BUILD b/z-java/jdk7-bin/PRE_BUILD
new file mode 100755
index 0000000..eb807ae
--- /dev/null
+++ b/z-java/jdk7-bin/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+
+#
+# Java binaries have hardcoded /lib64/ld-linux-x86-64.so.2
+#
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+ if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
+ then
+ ln -sf $INSTALL_ROOT/lib $INSTALL_ROOT/lib64
+ fi
+fi
diff --git a/z-java/jdk7-bin/PROVIDES b/z-java/jdk7-bin/PROVIDES
new file mode 100755
index 0000000..a8045c7
--- /dev/null
+++ b/z-java/jdk7-bin/PROVIDES
@@ -0,0 +1,4 @@
+JAVA
+JAVA7
+JDK7
+JDK
diff --git a/z-java/jdk7-bin/UNATTEND_SAFE b/z-java/jdk7-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..b3d64f9
--- /dev/null
+++ b/z-java/jdk7-bin/UNATTEND_SAFE
@@ -0,0 +1 @@
+License has already been agreed to on first cast
diff --git a/z-java/jdk7-bin/jdk-7u40-linux-i586.tar.gz.sig
b/z-java/jdk7-bin/jdk-7u40-linux-i586.tar.gz.sig
new file mode 100644
index 0000000..86507a3
Binary files /dev/null and b/z-java/jdk7-bin/jdk-7u40-linux-i586.tar.gz.sig
differ
diff --git a/z-java/jdk7-bin/jdk-7u40-linux-x64.tar.gz.sig
b/z-java/jdk7-bin/jdk-7u40-linux-x64.tar.gz.sig
new file mode 100644
index 0000000..610b7b6
Binary files /dev/null and b/z-java/jdk7-bin/jdk-7u40-linux-x64.tar.gz.sig
differ
diff --git a/z-java/jre1.5-bin/CONFLICTS b/z-java/jre1.5-bin/CONFLICTS
index 83d5496..10b4883 100755
--- a/z-java/jre1.5-bin/CONFLICTS
+++ b/z-java/jre1.5-bin/CONFLICTS
@@ -2,4 +2,5 @@ conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jdk6-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 3f4f31f..c5a98ec 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-05-23 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Conflicts with jre7-bin
diff --git a/z-java/jre6-bin/CONFLICTS b/z-java/jre6-bin/CONFLICTS
index a27e60f..0354dd3 100755
--- a/z-java/jre6-bin/CONFLICTS
+++ b/z-java/jre6-bin/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jdk6-bin &&
-conflicts jre7-bin
+conflicts jre7-bin &&
+conflicts jdk7-bin
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 580e53e..d23e06e 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 6u45; SECURITY_PATCH++
* INSTALL: Install plugin for firefox
diff --git a/z-java/jre7-bin/CONFLICTS b/z-java/jre7-bin/CONFLICTS
index c2712c8..337842e 100755
--- a/z-java/jre7-bin/CONFLICTS
+++ b/z-java/jre7-bin/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
conflicts jre1.5-bin &&
conflicts jdk6-bin &&
-conflicts jre6-bin
+conflicts jre6-bin &&
+conflicts jdk7-bin
diff --git a/z-java/jre7-bin/HISTORY b/z-java/jre7-bin/HISTORY
index ed0a1b2..5c39053 100644
--- a/z-java/jre7-bin/HISTORY
+++ b/z-java/jre7-bin/HISTORY
@@ -1,3 +1,6 @@
+2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with jdk7-bin
+
2013-06-07 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Disable castfs (STAGED_INSTALL) (see bug #410)
* INSTALL: Install plugin for firefox
- [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (91f4fb7fcfdeadb9929799f5e812b2d837ffc7d3), Eric Sandall, 09/17/2013
Archive powered by MHonArc 2.6.24.