?mode=patch&uid=2006051720521469070
Discarded Patch: 2006051720521469070 (by stf)
- fake
+ stf
Votecheck 'core-strong': Got qualified contra votes (fake)
scripts/Check-PkgFormat
Votecheck 'unmatched': Got qualified contra votes (fake)
package/java/sun-jdk15/sun-jdk15.conf
package/java/sun-jdk15/sun-jdk15.desc
Stefan Fiedler: scripts/Check-PkgFormat: recognize new DLJ (Distributor License for Java) sun-jdk15: use new DLJ licensed download, add sun-jdk15-amd64 fork
builds fine but has not been tested runtime yet
*please* update the Documentation WRT to the allowed License Names!
replaced by [2006052317372439820]
Stefan Fiedler: scripts/Check-PkgFormat: recognize new DLJ (Distributor License for Java) sun-jdk15: use new DLJ licensed download, add sun-jdk15-amd64 fork --- scripts/Check-PkgFormat (Revision 26) +++ scripts/Check-PkgFormat (Revision 27) @@ -108,7 +108,7 @@ case $x in Unknown|GPL|LGPL|MPL|FDL|MIT|BSD) ;; OpenSource|Free-to-use|Commercial) ;; - IBM-Public-License) ;; + IBM-Public-License|DLJ) ;; *) echo "$package: Unknown package" \ "license: $x" ;; esac --- package/java/sun-jdk15/sun-jdk15.conf (Revision 27) +++ package/java/sun-jdk15/sun-jdk15.conf (Revision 28) @@ -22,7 +22,11 @@ install_jdk () { - cp -a $archdir/jdk-${ver//./_}-linux-i586.bin java.bin + if [[ "$xpkg" == *-amd64 ]] ; then + cp -a $archdir/jdk-${ver//./_}-distro-linux-amd64.bin java.bin + else + cp -a $archdir/jdk-${ver//./_}-distro-linux-i586.bin java.bin + fi chmod +x java.bin yes | ./java.bin cp -a --reply=yes jdk1.5* /opt @@ -41,3 +45,6 @@ # don't split this package postflist="pkgsplits=" + +# don't patch this package! +patchfiles="" --- package/java/sun-jdk15/sun-jdk15.desc (Revision 27) +++ package/java/sun-jdk15/sun-jdk15.desc (Revision 28) @@ -41,10 +41,16 @@ [C] extra/development [R] + x86 -[L] Commercial -#[L] https://java.sun.com/j2se/1.5.0/jdk-1_5_0_06-license.txt +[L] DLJ +#[L] https://download.java.net/dlj/DLJ-v1.1.pdf [S] Stable [V] 1.5.0_06 [P] O -?---5---9 240.300 -[D] X jdk-1_5_0_06-linux-i586.bin https://java.sun.com/j2se/1.5.0/download.jsp NODIST NOAUTO +#if xpkg == sun-jdk15 +[D] 455901274 jdk-1_5_0_06-distro-linux-i586.bin https://download.java.net/dlj/binaries/ +#endif + +#if xpkg == sun-jdk15-amd64 +[D] 107540031 jdk-1_5_0_06-distro-linux-amd64.bin https://download.java.net/dlj/binaries/ +#endif [Download this patch]