From 1933ba006a7d961ec6682d79a5f2e3b4eddfac23 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Mon, 19 Oct 2015 00:36:54 +0000
Subject: 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
---
 release/Makefile         | 2 +-
 release/Makefile.mirrors | 2 +-
 release/Makefile.vm      | 8 ++++----
 release/release.sh       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index e959760..6e522e4 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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"
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index d5e8949..92e5eda 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -76,7 +76,7 @@ VM_DIR=			${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH}
 .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}
diff --git a/release/Makefile.vm b/release/Makefile.vm
index f576d9c..f4de633 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -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:
diff --git a/release/release.sh b/release/release.sh
index e168422..313a16c 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -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()
-- 
cgit v1.1