aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2012-01-04 23:47:20 +0000
committerColin Percival <cperciva@FreeBSD.org>2012-01-04 23:47:20 +0000
commitb12d946ac4405292a5881cfa55f4251f734635f5 (patch)
treee743e08e5294cacdd3b675e929b98184f4150ae2
parent795d49c5e0f91633fcd118c32d4adff995fdbd00 (diff)
downloadsrc-b12d946ac4405292a5881cfa55f4251f734635f5.tar.gz
src-b12d946ac4405292a5881cfa55f4251f734635f5.zip
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
Notes
Notes: svn path=/releng/8.1/; revision=229539
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh2
3 files changed, 6 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 3ade26282429..8eca38f90dc7 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 2ddb0b986112..be52b7baaccc 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 de0c1a5639f4..c97947f7c258 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}"