Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (996cb35df2ebb1e2dc7a4802bba24af433acea63)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (996cb35df2ebb1e2dc7a4802bba24af433acea63)
  • Date: Thu, 9 Aug 2007 21:38:17 -0500

GIT changes to master z-rejected grimoire by David Kowis <dkowis AT shlrm.org>:

dev/null |binary
z-java/JAVA_WARNING | 29
+++++----------------
z-java/jdk1.5-bin/DETAILS | 21 +++++++--------
z-java/jdk1.5-bin/HISTORY | 4 ++
z-java/jdk1.5-bin/INSTALL | 2 -
z-java/jdk1.5-bin/UNATTEND_SAFE | 2 -
z-java/jdk1.5-bin/jdk-1_5_0_12-linux-amd64.bin.sig | 0
z-java/jdk1.5-bin/jdk-1_5_0_12-linux-i586.bin.sig | 0
z-java/jdk6-bin/DETAILS | 18 +++++--------
z-java/jdk6-bin/HISTORY | 3 ++
z-java/jdk6-bin/INSTALL | 2 -
z-java/jdk6-bin/UNATTEND_SAFE | 2 -
12 files changed, 37 insertions(+), 46 deletions(-)

New commits:
commit 996cb35df2ebb1e2dc7a4802bba24af433acea63
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

JAVA_WARNING: made the question more sane, Actually asks smartly

commit 2d5349f40b15e466fb24b421beaab4b0fd9f1202
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk1.5-bin: removed the signature files

commit f6c98a61d551a9e6dff82a6e2daf2a09908abc32
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk6-bin: oops forgot to modify the source name

commit 80409c35d5856c08c69317810aab2412f088ac47
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

JAVA_WARNING: changed to reflect how the DLJ works

commit 45d24369f596fde0fa1e53e4e863f54f34c9b619
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk6-bin: Modifying the spell to use the DLJ license

commit 03d3d278b7ce2178ad5fb8d7febbe0df8982bdf3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk1.5-bin: woops forgot to add a history entry and needed --unpack

commit a06826b1cb56ca99e136cee0060132cd576a42da
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jdk1.5-bin: Changing the spell to work with the DLJ license

diff --git a/z-java/JAVA_WARNING b/z-java/JAVA_WARNING
index 827a566..a50d187 100755
--- a/z-java/JAVA_WARNING
+++ b/z-java/JAVA_WARNING
@@ -1,29 +1,14 @@
# Special messages with regards to Java sources.
#
message "\n${MESSAGE_COLOR}" \
- "For ${SPELL} you have to download the sources yourself from the Sun
Website, see\n\n" \
- "${PROBLEM_COLOR}'gaze what ${SPELL}'${MESSAGE_COLOR}\n\n" \
- "for the files and location. Put the downloaded files in
/var/spool/sorcery \n" \
- "so cast will find it.${DEFAULT_COLOR}\n"
+ "For ${SPELL} you have to agree to the DLJ license.\n\n" \
+ "Available at http://dlc.sun.com/dlj/DLJ-v1.1.txt${DEFAULT_COLOR}\n";
&&

-local JAVA_SOURCE_NUMBER
-local JAVA_SVAR
-local JAVA_ALL_SOURCES="y"
-for JAVA_SOURCE_NUMBER in $(get_source_nums X); do
- JAVA_SOURCE_NUMBER=${JAVA_SOURCE_NUMBER/X/}
- JAVA_SVAR="SOURCE${JAVA_SOURCE_NUMBER}"
- message "${MESSAGE_COLOR}Verifying
${SOURCE_CACHE}/${!JAVA_SVAR}${DEFAULT_COLOR}"
- if [ ! -e $SOURCE_CACHE/${!JAVA_SVAR} ]; then
- JAVA_ALL_SOURCES="n"
- fi
-done
+config_query DLJ_AGREE "Do you agree to the DLJ License?" n &&

-if [[ "$JAVA_ALL_SOURCES" != "y" ]]; then
-if ! query "YOU HAVE DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
-then
- message "${MESSAGE_COLOR}Please recast when you have the sources!\n"
- return 1
-fi
+if [[ "$DLJ_AGREE" != "y" ]] ; then
+ return 1
else
- message "${MESSAGE_COLOR}All sources already downloaded!.
Continuing.${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}Agreed to license, proceeding with
install.\n${DEFAULT_COLOR}"
fi
+
diff --git a/z-java/jdk1.5-bin/DETAILS b/z-java/jdk1.5-bin/DETAILS
index 720e8d0..6d2c549 100755
--- a/z-java/jdk1.5-bin/DETAILS
+++ b/z-java/jdk1.5-bin/DETAILS
@@ -4,17 +4,17 @@
VER=1.5.0_12
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
- SOURCE=jdk-$VERSION-linux-i586.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE=jdk-$VERSION-dlj-linux-i586.bin
+
SOURCE_HASH=sha512:0b169c94d93fdf58aaa9909d91e2aef9f3bc311cb2c646f2716e99017c6c2e827acee573f545ddd789c7441a3be289bc5b9d0ca5c411937243b533f274a5cd46
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
- SOURCE=jdk-$VERSION-linux-amd64.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE=jdk-$VERSION-dlj-linux-amd64.bin
+
SOURCE_HASH=sha512:3da7caedc103736ce0fd8955c155a0c0ae839c6492eab55c5d1d470ddbf7e16ee7e1b7d4b1743995115877cd2727ab998c6d594e0edffde1875255f7026c337b
else
- SOURCE=jdk-$VERSION-linux-i586.bin
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE=jdk-$VERSION-dlj-linux-i586.bin
+
SOURCE_HASH=sha512:0b169c94d93fdf58aaa9909d91e2aef9f3bc311cb2c646f2716e99017c6c2e827acee573f545ddd789c7441a3be289bc5b9d0ca5c411937243b533f274a5cd46
fi
;;
###########################################################################
@@ -26,7 +26,9 @@ case "${SMGL_COMPAT_ARCHS[0]}" in
VER=Unsupported
;;
esac
- WEB_SITE=http://java.sun.com/j2se/1.5.0/download.html
+ SOURCE_URL=http://dlc.sun.com/dlj/binaries/$SOURCE
+ LICENSE=DLJ
+ WEB_SITE=https://jdk-distros.dev.java.net/developer.html
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$VER
PATCHLEVEL=1
ENTERED=20041006
@@ -38,7 +40,6 @@ The Java 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.

-Note: You need to download the JDK installer yourself from the Sun Website,
-see 'gaze website jdk1.5-bin' for the location. Put the downloaded file in
-/var/spool/sorcery so cast will find it.
+The DLJ license allows linux distributions to distribute the JDK. One must
+agree to the license before one can install the software.
EOF
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index f43e2ec..053253b 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,7 @@
+2007-08-09 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: Updated to use the DLJ license. Now it can download!
+ * INSTALL: modified for the DLJ package
+
2007-06-30 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.5.0_12

diff --git a/z-java/jdk1.5-bin/INSTALL b/z-java/jdk1.5-bin/INSTALL
index c49ef5d..e8fce29 100755
--- a/z-java/jdk1.5-bin/INSTALL
+++ b/z-java/jdk1.5-bin/INSTALL
@@ -1,6 +1,6 @@
cd ${INSTALL_ROOT}/usr/lib &&

-yes | sh $SOURCE_CACHE/$SOURCE &&
+sh $SOURCE_CACHE/$SOURCE --accept-license --unpack &&

if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
then
diff --git a/z-java/jdk1.5-bin/UNATTEND_SAFE b/z-java/jdk1.5-bin/UNATTEND_SAFE
index 9a3364d..b021331 100644
--- a/z-java/jdk1.5-bin/UNATTEND_SAFE
+++ b/z-java/jdk1.5-bin/UNATTEND_SAFE
@@ -1 +1 @@
-License has already been agreed to when user gets sources seperately.
+License has already been agreed to during the first cast.
diff --git a/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-amd64.bin.sig
b/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-amd64.bin.sig
deleted file mode 100644
index 06a455d..0000000
Binary files a/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-amd64.bin.sig and
/dev/null differ
diff --git a/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-i586.bin.sig
b/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-i586.bin.sig
deleted file mode 100644
index 66df85e..0000000
Binary files a/z-java/jdk1.5-bin/jdk-1_5_0_12-linux-i586.bin.sig and
/dev/null differ
diff --git a/z-java/jdk6-bin/DETAILS b/z-java/jdk6-bin/DETAILS
index 7008471..5378b70 100755
--- a/z-java/jdk6-bin/DETAILS
+++ b/z-java/jdk6-bin/DETAILS
@@ -4,17 +4,17 @@
VER=1.6.0_02
case "${SMGL_COMPAT_ARCHS[0]}" in
ia32|32)
- SOURCE=jdk-$VERSION-linux-i586.bin
-
SOURCE_HASH=sha512:e087d3b5364e8de970d8e564e899c69061eed6162d178ae51f19f60b9b4627fc334feeccbb1663f8622f32770c6eb2dda00e526a36299842ab109f87c57a3ec9
+ SOURCE=jdk-$VERSION-dlj-linux-i586.bin
+
SOURCE_HASH=sha512:a5c924543b25358176aba3eb9ebd250e063a23a43afec5d887e6d3ea4f12f3d71740dfb75629047f3557df562d9f1d7c998b28fe0570c6b84f0f5cae2d3785c9
;;
x86-64|64)
if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]
then
- SOURCE=jdk-$VERSION-linux-amd64.bin
-
SOURCE_HASH=sha512:6bd1f5c675d5cdb23efe388804036a36de27e86cdeb5b437c7ac32b14046973bae8f7d238264546501a6781bb4e7c8b6474129fe6bd446610a8cc908091c9be0
+ SOURCE=jdk-$VERSION-dlj-linux-amd64.bin
+
SOURCE_HASH=sha512:e0c9a1e1744cce4531c38f5de10b4c5ec229a4fcbb05c01599d2490f4b688601b24ff67cd928a180e7a9222f27fd9ad0938399f83b0d8b2213990e57f6430dd2
else
- SOURCE=jdk-$VERSION-linux-i586.bin
-
SOURCE_HASH=sha512:e087d3b5364e8de970d8e564e899c69061eed6162d178ae51f19f60b9b4627fc334feeccbb1663f8622f32770c6eb2dda00e526a36299842ab109f87c57a3ec9
+ SOURCE=jdk-$VERSION-dlj-linux-i586.bin
+
SOURCE_HASH=sha512:a5c924543b25358176aba3eb9ebd250e063a23a43afec5d887e6d3ea4f12f3d71740dfb75629047f3557df562d9f1d7c998b28fe0570c6b84f0f5cae2d3785c9
fi
;;
###########################################################################
@@ -26,6 +26,8 @@ case "${SMGL_COMPAT_ARCHS[0]}" in
VER=Unsupported
;;
esac
+ SOURCE_URL=http://dlc.sun.com/dlj/binaries/$SOURCE
+ LICENSE=DLJ
WEB_SITE=http://java.sun.com/javase/downloads/index.jsp
SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk${VER/_01}
ENTERED=20070208
@@ -36,8 +38,4 @@ cat << EOF
The Java 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.
-
-Note: You need to download the JDK installer yourself from the Sun 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/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index dce8de3..46f83b8 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+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)

diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index 68c96d0..3c794fb 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -1,6 +1,6 @@
cd ${INSTALL_ROOT}/usr/lib &&

-yes | sh $SOURCE_CACHE/$SOURCE &&
+sh $SOURCE_CACHE/$SOURCE --accept-license --unpack &&

if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
then
diff --git a/z-java/jdk6-bin/UNATTEND_SAFE b/z-java/jdk6-bin/UNATTEND_SAFE
index 9a3364d..b3d64f9 100644
--- a/z-java/jdk6-bin/UNATTEND_SAFE
+++ b/z-java/jdk6-bin/UNATTEND_SAFE
@@ -1 +1 @@
-License has already been agreed to when user gets sources seperately.
+License has already been agreed to on first cast



  • [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (996cb35df2ebb1e2dc7a4802bba24af433acea63), David Kowis, 08/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page