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
commit52876b70cd6330061dc60a87e4880f6ee6ab3d43 (patch)
treeaccdd9c77e36b975dabf380a15989f740a35d96a
parentd7071cce137418952864dba0c9c57ee4f858a5d0 (diff)
downloadsrc-releng/7.3.tar.gz
src-releng/7.3.zip
Extend the character set accepted by freebsd-update(8) in filereleng/7.3
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/7.3/; 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 0cc5d5737807..a645544998d6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20120104: p10 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: p9 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 2a2f2bb28469..f7a7453499ae 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="7.3"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
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 9d28c190a2ba..86fbe7b40898 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1110,7 +1110,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}"