diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2012-01-04 23:47:20 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2012-01-04 23:47:20 +0000 |
| commit | a1e8e5c787547fcce016300478b009c4502dd602 (patch) | |
| tree | 387e0d15887fc4c052b7a79d6c1c47a2e03286b8 | |
| parent | 60183881171350323c0540e0a78442f67fbb8797 (diff) | |
| download | src-a1e8e5c787547fcce016300478b009c4502dd602.tar.gz src-a1e8e5c787547fcce016300478b009c4502dd602.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/7.4/; revision=229539
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -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: p6 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: p5 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 59404067e75d..e1e798473c39 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.4" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" 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}" |