Hi, Thanks Niels and Tony for your reviews and advices!
Le 15/01/2013 11:38, tony mancill a écrit : > On 01/14/2013 11:48 PM, Niels Thykier wrote: >> Seems to me your patch will prevent anyone from using java-package on >> the older Java7 binaries. Right, I didn't thought it would worth the trouble to support “infested with security issues making them unsuitable”-versions. >> I think it should have a nice little error message saying "Nope, >> won't do this - That version is vulnerable/unsupported/$whatever". Right, I did bother to update the (multiple duplicates of the same) documentation, but a better handling of such error would have indeed be worthwhile. > I had the same thought - there may be a valid reason for someone to want > to run jdk-7u9. OK, so let's just continue to support its building then. > This issue already appears to be addressed in the 0.51 > package (but with a different patch). I'm assuming we want to keep the > patch minimal That was the idea (both because we're in freeze, and because it's an NMU to fix an issue opened yesterday). If the release team is fine with 0.51, I guess it could be uploaded to unstable ;). > can we use this these patterns instead? > > jdk-7u+([0-9])-linux-i586.tar.gz > jdk-7u+([0-9])-linux-x64.tar.gz I'm afraid it won't cope with the ${archive_name:6:1} versus ${archive_name:6:2} expansion currently used in the scripts (or would need some more intrusive changes that may not be desirable). > David, if you'd prefer not to upload again, could you remove the upload > and I'll prepare the update. (But thank you for taking the initiative > in the first place!) I've prepared another one, debdiff attached. It explicitly adds support for two digits version, without touching to the one digit version support nor the documentation (since it's still accurate with that change). I'll upload it to DELAYED/1 in about four hours (that is one day after after the initial DELAYED/2 upload), unless we find something else that need fixing in the mean time or if someone prefers to take care of it another way. Regards. David
diff -Nru java-package-0.50+nmu1/debian/changelog java-package-0.50+nmu2/debian/changelog --- java-package-0.50+nmu1/debian/changelog 2012-09-06 18:38:09.000000000 -0400 +++ java-package-0.50+nmu2/debian/changelog 2013-01-15 15:07:11.000000000 -0400 @@ -1,3 +1,10 @@ +java-package (0.50+nmu2) unstable; urgency=high + + * Non-maintainer upload. + * Allow two digits in Java 7 updates. Closes: #597294, #698108 + + -- David Prévot <taf...@debian.org> Tue, 15 Jan 2013 15:06:26 -0400 + java-package (0.50+nmu1) unstable; urgency=low * Non-maintainer upload. diff -Nru java-package-0.50+nmu1/lib/oracle-j2re.sh java-package-0.50+nmu2/lib/oracle-j2re.sh --- java-package-0.50+nmu1/lib/oracle-j2re.sh 2012-01-21 08:21:00.000000000 -0400 +++ java-package-0.50+nmu2/lib/oracle-j2re.sh 2013-01-15 15:03:51.000000000 -0400 @@ -18,6 +18,12 @@ j2se_priority=316 found=true ;; + "jre-7u"[0-9][0-9]"-linux-i586.tar.gz") # SUPPORTED + j2se_version=1.7.0+update${archive_name:6:2}${revision} + j2se_expected_min_size=94 #Mb + j2se_priority=316 + found=true + ;; esac ;; amd64|x86_64-linux-gnu) @@ -33,6 +39,12 @@ j2se_expected_min_size=88 #Mb j2se_priority=316 found=true + ;; + "jre-7u"[0-9][0-9]"-linux-x64.tar.gz") # SUPPORTED + j2se_version=1.7.0+update${archive_name:6:2}${revision} + j2se_expected_min_size=88 #Mb + j2se_priority=316 + found=true ;; esac ;; diff -Nru java-package-0.50+nmu1/lib/oracle-j2sdk-doc.sh java-package-0.50+nmu2/lib/oracle-j2sdk-doc.sh --- java-package-0.50+nmu1/lib/oracle-j2sdk-doc.sh 2012-01-21 08:21:00.000000000 -0400 +++ java-package-0.50+nmu2/lib/oracle-j2sdk-doc.sh 2013-01-15 15:02:36.000000000 -0400 @@ -12,6 +12,11 @@ j2se_expected_min_size=290 #Mb found=true ;; + "jdk-7u"[0-9][0-9]"-apidocs.zip") # SUPPORTED + j2se_version=1.7.0+update${archive_name:6:2}${revision} + j2se_expected_min_size=290 #Mb + found=true + ;; esac if [[ -n "$found" ]]; then cat << EOF diff -Nru java-package-0.50+nmu1/lib/oracle-j2sdk.sh java-package-0.50+nmu2/lib/oracle-j2sdk.sh --- java-package-0.50+nmu1/lib/oracle-j2sdk.sh 2012-01-21 08:21:00.000000000 -0400 +++ java-package-0.50+nmu2/lib/oracle-j2sdk.sh 2013-01-15 15:02:05.000000000 -0400 @@ -18,6 +18,12 @@ j2se_priority=317 found=true ;; + "jdk-7u"[0-9][0-9]"-linux-i586.tar.gz") # SUPPORTED + j2se_version=1.7.0+update${archive_name:6:2}${revision} + j2se_expected_min_size=190 #Mb + j2se_priority=317 + found=true + ;; esac ;; amd64|x86_64-linux-gnu) @@ -33,6 +39,12 @@ j2se_expected_min_size=180 #Mb j2se_priority=317 found=true + ;; + "jdk-7u"[0-9][0-9]"-linux-x64.tar.gz") # SUPPORTED + j2se_version=1.7.0+update${archive_name:6:2}${revision} + j2se_expected_min_size=180 #Mb + j2se_priority=317 + found=true ;; esac ;;
signature.asc
Description: OpenPGP digital signature