Date: Wed, 4 Jan 2012 23:47:21 +0000 (UTC) From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r229539 - in releng: 7.3 7.3/sys/conf 7.3/usr.sbin/freebsd-update 7.4 7.4/sys/conf 7.4/usr.sbin/freebsd-update 8.1 8.1/sys/conf 8.1/usr.sbin/freebsd-update 8.2 8.2/sys/conf 8.2/usr.sbin... Message-ID: <201201042347.q04NlLLs004352@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cperciva Date: Wed Jan 4 23:47:20 2012 New Revision: 229539 URL: http://svn.freebsd.org/changeset/base/229539 Log: 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 Modified: releng/7.3/UPDATING releng/7.3/sys/conf/newvers.sh releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh releng/7.4/UPDATING releng/7.4/sys/conf/newvers.sh releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh releng/8.1/UPDATING releng/8.1/sys/conf/newvers.sh releng/8.1/usr.sbin/freebsd-update/freebsd-update.sh releng/8.2/UPDATING releng/8.2/sys/conf/newvers.sh releng/8.2/usr.sbin/freebsd-update/freebsd-update.sh Modified: releng/7.3/UPDATING ============================================================================== --- releng/7.3/UPDATING Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.3/UPDATING Wed Jan 4 23:47:20 2012 (r229539) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /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 Modified: releng/7.3/sys/conf/newvers.sh ============================================================================== --- releng/7.3/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.3/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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 Modified: releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.3/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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}" Modified: releng/7.4/UPDATING ============================================================================== --- releng/7.4/UPDATING Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.4/UPDATING Wed Jan 4 23:47:20 2012 (r229539) @@ -8,6 +8,10 @@ Items affecting the ports and packages s /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 Modified: releng/7.4/sys/conf/newvers.sh ============================================================================== --- releng/7.4/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.4/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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 Modified: releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/7.4/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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}" Modified: releng/8.1/UPDATING ============================================================================== --- releng/8.1/UPDATING Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.1/UPDATING Wed Jan 4 23:47:20 2012 (r229539) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. 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 Modified: releng/8.1/sys/conf/newvers.sh ============================================================================== --- releng/8.1/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.1/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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 Modified: releng/8.1/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.1/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.1/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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}" Modified: releng/8.2/UPDATING ============================================================================== --- releng/8.2/UPDATING Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.2/UPDATING Wed Jan 4 23:47:20 2012 (r229539) @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +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 Modified: releng/8.2/sys/conf/newvers.sh ============================================================================== --- releng/8.2/sys/conf/newvers.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.2/sys/conf/newvers.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.2/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- releng/8.2/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:45:10 2012 (r229538) +++ releng/8.2/usr.sbin/freebsd-update/freebsd-update.sh Wed Jan 4 23:47:20 2012 (r229539) @@ -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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201042347.q04NlLLs004352>