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 (e5ee7ca6febf5e96e0743a5b7e9a17b76a8a8a2f)
- 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 (e5ee7ca6febf5e96e0743a5b7e9a17b76a8a8a2f)
- Date: Tue, 9 May 2017 07:10:37 +0000
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
ChangeLog | 3 ++
z-java/jdk8-bin/CONFLICTS | 3 +-
z-java/jdk8-bin/DETAILS | 10 ++++-----
z-java/jdk8-bin/HISTORY | 7 ++++++
z-java/jdk8-bin/PROVIDES | 4 ++-
z-java/jre8-bin/CONFLICTS | 6 +++--
z-java/jre8-bin/DETAILS | 10 ++++-----
z-java/jre8-bin/HISTORY | 6 +++++
z-java/server-jre8-bin/BUILD | 1
z-java/server-jre8-bin/CONFIGURE | 7 ++++++
z-java/server-jre8-bin/CONFLICTS | 10 +++++++++
z-java/server-jre8-bin/DEPENDS | 7 ++++++
z-java/server-jre8-bin/DETAILS | 36
+++++++++++++++++++++++++++++++++++
z-java/server-jre8-bin/FINAL | 3 ++
z-java/server-jre8-bin/HISTORY | 6 +++++
z-java/server-jre8-bin/INSTALL | 7 ++++++
z-java/server-jre8-bin/JAVA_WARNING | 13 ++++++++++++
z-java/server-jre8-bin/PRE_BUILD | 5 ++++
z-java/server-jre8-bin/PRE_INSTALL | 3 ++
z-java/server-jre8-bin/PROVIDES | 6 +++++
z-java/server-jre8-bin/UNATTEND_SAFE | 1
z-java/server-jre8-bin/java.sh | 6 +++++
22 files changed, 146 insertions(+), 14 deletions(-)
New commits:
commit e5ee7ca6febf5e96e0743a5b7e9a17b76a8a8a2f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Adding z-java/server-jre8-bin
commit 11095ad9f5016a6251942e05037239d55622a3a5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jdk8-bin: Provides JAVA8 and JDK8
commit 5bd83bd1c5d0f05d01edb843909b69251033d564
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jre8-bin: Conflicts with jdk8-bin
commit f64cc7151165023a9c7be0bdd6f42527a2453bdf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jre8-bin: Updated to 8u131, use upstream hashes, SECURITY_PATCH++
commit 12492dec6db5be563870c48cb6fb7d4cc84b2949
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
jdk8-bin: Updated to 8u131, use upstream hashes, SECURITY_PATCH++
diff --git a/ChangeLog b/ChangeLog
index bae3311..da48d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-05-08 Eric Sandall <sandalle AT sourcemage.org>
+ * z-java/server-jre8-bin: Added server version of JRE8 binaries.
+
2016-10-19 Vlad Glagolev <stealth AT sourcemage.org>
* z-utils/zoom-client: new spell, Zoom client for Linux
diff --git a/z-java/jdk8-bin/CONFLICTS b/z-java/jdk8-bin/CONFLICTS
index 19f72d3..5b8ab44 100755
--- a/z-java/jdk8-bin/CONFLICTS
+++ b/z-java/jdk8-bin/CONFLICTS
@@ -6,4 +6,5 @@ conflicts jdk7-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jre7-bin &&
-conflicts jre8-bin
+conflicts jre8-bin &&
+conflicts server-jre8-bin
diff --git a/z-java/jdk8-bin/DETAILS b/z-java/jdk8-bin/DETAILS
index 0d41ea9..35e837c 100755
--- a/z-java/jdk8-bin/DETAILS
+++ b/z-java/jdk8-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jdk8-bin
- VERSION=8u121
- SECURITY_PATCH=7
+ VERSION=8u131
+ SECURITY_PATCH=8
VER="1.${VERSION:0:1}.0_$(printf %02d ${VERSION:2})"
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jdk-$VERSION-linux-i586.tar.gz
-
SOURCE_HASH=sha256:f7d6cf1468c5e71ff097bec0189caccdd8e709a2a88a2c9849ad6200c0f33d4c:UPSTREAM_HASH
+
SOURCE_HASH=sha256:0069a2b1b1cddbefa45f1ff12933fca3b114b6544d536ec0e2d4861a830d7154:UPSTREAM_HASH
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
SOURCE=jdk-$VERSION-linux-x64.tar.gz
-
SOURCE_HASH=sha256:97e30203f1aef324a07c94d9d078f5d19bb6c50e638e4492722debca588210bc:UPSTREAM_HASH
+
SOURCE_HASH=sha256:62b215bdfb48bace523723cdbb2157c665e6a25429c73828a32f00e587301236:UPSTREAM_HASH
else
SOURCE=jdk-$VERSION-linux-i586.tar.gz
-
SOURCE_HASH=sha256:f7d6cf1468c5e71ff097bec0189caccdd8e709a2a88a2c9849ad6200c0f33d4c:UPSTREAM_HASH
+
SOURCE_HASH=sha256:0069a2b1b1cddbefa45f1ff12933fca3b114b6544d536ec0e2d4861a830d7154:UPSTREAM_HASH
fi
;;
###########################################################################
diff --git a/z-java/jdk8-bin/HISTORY b/z-java/jdk8-bin/HISTORY
index 27c3275..a9c331a 100644
--- a/z-java/jdk8-bin/HISTORY
+++ b/z-java/jdk8-bin/HISTORY
@@ -1,3 +1,10 @@
+2017-05-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 8u131, use upstream hashes
+ https://www.oracle.com/webfolder/s/digest/8u131checksum.html
+ SECURITY_PATCH++
+ * CONFLICTS: Conflicts with server-jre8-bin.
+ * PROVIDES: Provides JAVA8 and JDK8.
+
2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: Updated to 8u121, use upstream hashes
https://www.oracle.com/webfolder/s/digest/8u121checksum.html
diff --git a/z-java/jdk8-bin/PROVIDES b/z-java/jdk8-bin/PROVIDES
index a8045c7..8184ed3 100755
--- a/z-java/jdk8-bin/PROVIDES
+++ b/z-java/jdk8-bin/PROVIDES
@@ -1,4 +1,6 @@
JAVA
JAVA7
-JDK7
+JAVA8
JDK
+JDK7
+JDK8
diff --git a/z-java/jre8-bin/CONFLICTS b/z-java/jre8-bin/CONFLICTS
index 74750e6..5a6b507 100755
--- a/z-java/jre8-bin/CONFLICTS
+++ b/z-java/jre8-bin/CONFLICTS
@@ -1,8 +1,10 @@
conflicts j2sdk &&
conflicts j2sdk-bin &&
conflicts jdk1.5-bin &&
-conflicts jre1.5-bin &&
conflicts jdk6-bin &&
+conflicts jdk7-bin &&
+conflicts jdk8-bin &&
+conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jre7-bin &&
-conflicts jdk7-bin
+conflicts server-jre8-bin
diff --git a/z-java/jre8-bin/DETAILS b/z-java/jre8-bin/DETAILS
index 4feb543..cf6f517 100755
--- a/z-java/jre8-bin/DETAILS
+++ b/z-java/jre8-bin/DETAILS
@@ -1,20 +1,20 @@
. $GRIMOIRE/FUNCTIONS
SPELL=jre8-bin
- VERSION=8u121
- SECURITY_PATCH=5
+ VERSION=8u131
+ SECURITY_PATCH=6
VER="1.${VERSION:0:1}.0_$(printf %02d ${VERSION:2})"
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
SOURCE=jre-$VERSION-linux-i586.tar.gz
-
SOURCE_HASH=sha256:1b28662780c98b3233e8dacaa07c505a70c53463d3b00720baa59f955ab1e1bb:UPSTREAM_HASH
+
SOURCE_HASH=sha256:a773f2fe17061ef637ed2094b06313a99c0b45ba3d3cb7f8f1ebf18448495aeb:UPSTREAM_HASH
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}"
]]; then
SOURCE=jre-$VERSION-linux-x64.tar.gz
-
SOURCE_HASH=sha256:30bf5fbac0cfbc9201cac1d6973dbc96e5f55043ab315eda8c7aeb23df4f2644:UPSTREAM_HASH
+
SOURCE_HASH=sha256:355e5cdb066d4cada1f9f16f358b6fa6280ff5caf7470cf0d5cdd43083408d35:UPSTREAM_HASH
else
SOURCE=jre-$VERSION-linux-i586.tar.gz
-
SOURCE_HASH=sha256:1b28662780c98b3233e8dacaa07c505a70c53463d3b00720baa59f955ab1e1bb:UPSTREAM_HASH
+
SOURCE_HASH=sha256:a773f2fe17061ef637ed2094b06313a99c0b45ba3d3cb7f8f1ebf18448495aeb:UPSTREAM_HASH
fi
;;
###########################################################################
diff --git a/z-java/jre8-bin/HISTORY b/z-java/jre8-bin/HISTORY
index 9a36d04..8a066a1 100644
--- a/z-java/jre8-bin/HISTORY
+++ b/z-java/jre8-bin/HISTORY
@@ -1,3 +1,9 @@
+2017-05-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 8u131, use upstream hashes
+ https://www.oracle.com/webfolder/s/digest/8u131checksum.html
+ SECURITY_PATCH++
+ * CONFLICTS: Add jdk8-bin and server-jre8-bin.
+
2017-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: Updated to 8u121, use upstream hashes
https://www.oracle.com/webfolder/s/digest/8u121checksum.html
diff --git a/z-java/server-jre8-bin/BUILD b/z-java/server-jre8-bin/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-java/server-jre8-bin/BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-java/server-jre8-bin/CONFIGURE
b/z-java/server-jre8-bin/CONFIGURE
new file mode 100755
index 0000000..ee38dba
--- /dev/null
+++ b/z-java/server-jre8-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/server-jre8-bin/CONFLICTS
b/z-java/server-jre8-bin/CONFLICTS
new file mode 100755
index 0000000..53a9c8a
--- /dev/null
+++ b/z-java/server-jre8-bin/CONFLICTS
@@ -0,0 +1,10 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin &&
+conflicts jdk7-bin &&
+conflicts jdk8-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jre7-bin &&
+conflicts jre8-bin
diff --git a/z-java/server-jre8-bin/DEPENDS b/z-java/server-jre8-bin/DEPENDS
new file mode 100755
index 0000000..d7947fa
--- /dev/null
+++ b/z-java/server-jre8-bin/DEPENDS
@@ -0,0 +1,7 @@
+depends ODBC-MGR &&
+depends alsa-lib &&
+depends libxi &&
+depends libxtst &&
+depends libxext &&
+depends libx11 &&
+depends libxau
diff --git a/z-java/server-jre8-bin/DETAILS b/z-java/server-jre8-bin/DETAILS
new file mode 100755
index 0000000..2614ae0
--- /dev/null
+++ b/z-java/server-jre8-bin/DETAILS
@@ -0,0 +1,36 @@
+. $GRIMOIRE/FUNCTIONS
+ SPELL=server-jre8-bin
+ VERSION=8u131
+ VER="1.${VERSION:0:1}.0_$(printf %02d ${VERSION:2})"
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}"
]]; then
+ SOURCE=server-jre-$VERSION-linux-x64.tar.gz
+
SOURCE_HASH=sha256:a80634d17896fe26e432f6c2b589ef6485685b2e717c82cd36f8f747d40ec84b:UPSTREAM_HASH
+ fi
+ ;;
+################################################################################
+# Missing support for i586, sparc, and sparcv9 tarballs say solaris not
linux :\
+################################################################################
+ *)
+ SOURCE=
+ VERSION=Unsupported
+ VER=Unsupported
+ ;;
+esac
+ WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/jdk$VER"
+ ENTERED=20170508
+ ARCHIVE='off'
+ REJECT='is non-source'
+ SHORT='Java 8 Software Developer Environment for servers'
+ STAGED_INSTALL="off"
+ DOCS='COPYRIGHT LICENSE README
THIRDPARTYLICENSEREADME-JAVAFX.txt THIRDPARTYLICENSEREADME.txt'
+cat << EOF
+The Java 8 Development Kit is a feature-complete development and deployment
+platform.
+
+Note: You need to download the JDK 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/server-jre8-bin/FINAL b/z-java/server-jre8-bin/FINAL
new file mode 100755
index 0000000..4d405ec
--- /dev/null
+++ b/z-java/server-jre8-bin/FINAL
@@ -0,0 +1,3 @@
+# ensure the JAVA_HOME is available.
+#
+source /etc/profile.d/java.sh
diff --git a/z-java/server-jre8-bin/HISTORY b/z-java/server-jre8-bin/HISTORY
new file mode 100644
index 0000000..b0f1df1
--- /dev/null
+++ b/z-java/server-jre8-bin/HISTORY
@@ -0,0 +1,6 @@
+2017-05-08 Eric Sandall <sandalle AT sourcemage.org>
+ * Created spell based on jdk8-bin
+ https://www.oracle.com/webfolder/s/digest/8u131checksum.html
+ x86_64 architecture only.
+ Still requires X11 libraries for things like AWT.
+
diff --git a/z-java/server-jre8-bin/INSTALL b/z-java/server-jre8-bin/INSTALL
new file mode 100755
index 0000000..e808a0e
--- /dev/null
+++ b/z-java/server-jre8-bin/INSTALL
@@ -0,0 +1,7 @@
+cd ${INSTALL_ROOT}/usr/lib &&
+
+cp -av "${SOURCE_DIRECTORY}" "${INSTALL_ROOT}"/usr/lib/ &&
+
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SCRIPT_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/ &&
+ln -sfn ${INSTALL_ROOT}/usr/lib/jdk$VER/ ${INSTALL_ROOT}/usr/lib/java8
diff --git a/z-java/server-jre8-bin/JAVA_WARNING
b/z-java/server-jre8-bin/JAVA_WARNING
new file mode 100644
index 0000000..76d50db
--- /dev/null
+++ b/z-java/server-jre8-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 8 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/server-jre8-bin/PRE_BUILD
b/z-java/server-jre8-bin/PRE_BUILD
new file mode 100755
index 0000000..0f13457
--- /dev/null
+++ b/z-java/server-jre8-bin/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+if [[ ! -h "$INSTALL_ROOT/lib64" ]]; then
+ ln -vsf "$TRACK_ROOT/lib" "$INSTALL_ROOT/lib64"
+fi
diff --git a/z-java/server-jre8-bin/PRE_INSTALL
b/z-java/server-jre8-bin/PRE_INSTALL
new file mode 100755
index 0000000..21bc514
--- /dev/null
+++ b/z-java/server-jre8-bin/PRE_INSTALL
@@ -0,0 +1,3 @@
+if spell_ok $SPELL; then
+ rm -rf old.binaries old.libraries
+fi
diff --git a/z-java/server-jre8-bin/PROVIDES b/z-java/server-jre8-bin/PROVIDES
new file mode 100755
index 0000000..8184ed3
--- /dev/null
+++ b/z-java/server-jre8-bin/PROVIDES
@@ -0,0 +1,6 @@
+JAVA
+JAVA7
+JAVA8
+JDK
+JDK7
+JDK8
diff --git a/z-java/server-jre8-bin/UNATTEND_SAFE
b/z-java/server-jre8-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..9a3364d
--- /dev/null
+++ b/z-java/server-jre8-bin/UNATTEND_SAFE
@@ -0,0 +1 @@
+License has already been agreed to when user gets sources seperately.
diff --git a/z-java/server-jre8-bin/java.sh b/z-java/server-jre8-bin/java.sh
new file mode 100644
index 0000000..37fa661
--- /dev/null
+++ b/z-java/server-jre8-bin/java.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+JAVA_HOME=/usr/lib/java8
+
+export JAVA_HOME
+export PATH=$PATH:$JAVA_HOME/bin
- [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (e5ee7ca6febf5e96e0743a5b7e9a17b76a8a8a2f), Eric Sandall, 05/09/2017
Archive powered by MHonArc 2.6.24.