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
This commit is contained in:
Colin Percival 2012-01-04 23:47:20 +00:00
parent d7071cce13
commit 52876b70cd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/releng/7.3/; revision=229539
3 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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}"