svn commit: r289555 - stable/10/release

[Glen Barber]

Author: gjb
Date: Mon Oct 19 00:36:54 2015
New Revision: 289555
URL: https://svnweb.freebsd.org/changeset/base/289555

Log:
  MFC r289337:
    Deprecate MD5 checksum generation in favor of SHA512.
  
    This was discussed during the 10.2-RELEASE cycle, however
    since we were nearing the end of the cycle, we decided to
    defer this change until after 10.2-RELEASE.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
  stable/10/release/Makefile.mirrors
  stable/10/release/Makefile.vm
  stable/10/release/release.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Sun Oct 18 23:58:05 2015	(r289554)
+++ stable/10/release/Makefile	Mon Oct 19 00:36:54 2015	(r289555)
@@ -335,7 +335,7 @@ release-install:
 	${XZCMD} -k ${DESTDIR}/${OSRELEASE}-${I}
 . endif
 .endfor
+	cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
-	cd ${DESTDIR} && md5 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.MD5
 
 .include "${.CURDIR}/Makefile.vm"

Modified: stable/10/release/Makefile.mirrors
==============================================================================
--- stable/10/release/Makefile.mirrors	Sun Oct 18 23:58:05 2015	(r289554)
+++ stable/10/release/Makefile.mirrors	Mon Oct 19 00:36:54 2015	(r289555)
@@ -76,7 +76,7 @@ VM_DIR=			${TLD}/VM-IMAGES/${REVISION}-$
 .endif
 
 CLEANFILES+=		${STAGE_TARGETS}
-CHECKSUM_FILES?=	SHA256 MD5
+CHECKSUM_FILES?=	SHA512 SHA256
 SNAP_SUFFIX!=		echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' '
 ISO_DIR=		${TLD}/${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}
 FTP_DIR=		${TLD}/${TARGET}/${TARGET_ARCH}/${REVISION}-${BRANCH}

Modified: stable/10/release/Makefile.vm
==============================================================================
--- stable/10/release/Makefile.vm	Sun Oct 18 23:58:05 2015	(r289554)
+++ stable/10/release/Makefile.vm	Mon Oct 19 00:36:54 2015	(r289555)
@@ -68,10 +68,10 @@ cw${_CW:tl}-install:
 	mkdir -p ${DESTDIR}/${_CW:tl}
 	cp -p ${${_CW}IMAGE} \
 		${DESTDIR}/${_CW:tl}/${${_CW}_DISK}
+	cd ${DESTDIR}/${_CW:tl} && sha512 ${${_CW}_DISK}* > \
+		${DESTDIR}/${_CW:tl}/CHECKSUM.SHA512
 	cd ${DESTDIR}/${_CW:tl} && sha256 ${${_CW}_DISK}* > \
 		${DESTDIR}/${_CW:tl}/CHECKSUM.SHA256
-	cd ${DESTDIR}/${_CW:tl} && md5 ${${_CW}_DISK}* > \
-		${DESTDIR}/${_CW:tl}/CHECKSUM.MD5
 
 cw${_CW:tl}-package:
 	@# Special target to handle packaging cloud images in the formats
@@ -140,10 +140,10 @@ vm-install:
 	${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 .  endfor
 . endif
+	cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
+		${DESTDIR}/vmimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA256
-	cd ${DESTDIR}/vmimages && md5 ${OSRELEASE}* > \
-		${DESTDIR}/vmimages/CHECKSUM.MD5
 .endif
 
 vm-release:

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Sun Oct 18 23:58:05 2015	(r289554)
+++ stable/10/release/release.sh	Mon Oct 19 00:36:54 2015	(r289555)
@@ -362,10 +362,10 @@ chroot_arm_armv6_build_release() {
 	chroot ${CHROOTDIR} cp -p ${OBJDIR}/${OSRELEASE}-${KERNEL}.img \
 		/R/${OSRELEASE}-${KERNEL}.img
 	chroot ${CHROOTDIR} xz -T ${XZ_THREADS} /R/${OSRELEASE}-${KERNEL}.img
+	cd ${CHROOTDIR}/R && sha512 ${OSRELEASE}* \
+		> CHECKSUM.SHA512
 	cd ${CHROOTDIR}/R && sha256 ${OSRELEASE}* \
 		> CHECKSUM.SHA256
-	cd ${CHROOTDIR}/R && md5 ${OSRELEASE}* \
-		> CHECKSUM.MD5
 
 	return 0
 } # chroot_arm_armv6_build_release()