From 36df0567649ef78839eac7f7863a5c016a990d5d Mon Sep 17 00:00:00 2001 From: cperciva Date: Wed, 4 Jan 2012 23:47:20 +0000 Subject: [PATCH] Extend the character set accepted by freebsd-update(8) in file names in order to allow upgrades to FreeBSD 9.0-RELEASE. Approved by: so (cperciva) Errata Notice: FreeBSD-EN-12:01.freebsd-update git-svn-id: svn://svn.freebsd.org/base/releng/8.1@229539 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- UPDATING | 4 ++++ sys/conf/newvers.sh | 2 +- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 3ade2628..8eca38f9 100644 --- a/UPDATING +++ b/UPDATING @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V: debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20120104: p8 FreeBSD-EN-12:01.freebsd-update + Extend the character set accepted by freebsd-update(8) in file + names in order to allow upgrades to FreeBSD 9.0-RELEASE. + 20111223: p7 FreeBSD-SA-11:06.bind, FreeBSD-SA-11:07.chroot FreeBSD-SA-11:08.telnetd, FreeBSD-SA-11:09.pam_ssh FreeBSD-SA-11:10.pam diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 2ddb0b98..be52b7ba 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.1" -BRANCH="RELEASE-p7" +BRANCH="RELEASE-p8" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index de0c1a56..c97947f7 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1185,7 +1185,7 @@ fetch_metadata_sanity () { # Some aliases to save space later: ${P} is a character which can # appear in a path; ${M} is the four numeric metadata fields; and # ${H} is a sha256 hash. - P="[-+./:=_[[:alnum:]]" + P="[-+./:=%@_[[:alnum:]]" M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+" H="[0-9a-f]{64}" -- 2.42.0