diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-11 15:21:16 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-11 15:21:16 -0300 |
| commit | 8400c0790e456038fbca4995d032d4e3d44c3d31 (patch) | |
| tree | f83f0b852f452a91d21059a9a70ff02f129eafa6 /release | |
| parent | b05262eae8651c5f280c6fadf2e22f70af66d6ca (diff) | |
| parent | 6561e98b4c105596a44efb53466ecf8be2a3bbf3 (diff) | |
| download | FreeBSD-src-8400c0790e456038fbca4995d032d4e3d44c3d31.zip FreeBSD-src-8400c0790e456038fbca4995d032d4e3d44c3d31.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.vagrant | 4 | ||||
| -rw-r--r-- | release/doc/share/xml/errata.xml | 8 | ||||
| -rw-r--r-- | release/doc/share/xml/security.xml | 7 |
3 files changed, 17 insertions, 2 deletions
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 7ae6484..3b53ba9 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -17,11 +17,11 @@ ATLAS${VAR}:= ${VAGRANT${VAR}} .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +%Y%m%d +SNAPSHOT_DATE!= date +-%Y%m%d .endif VAGRANT_VERSION!= date +%Y.%m.%d -VAGRANT_TARGET:= ${OSRELEASE}-${SNAPSHOT_DATE} +VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} .if !empty(CLOUDWARE) . for _PROVIDER in ${CLOUDWARE} . if ${_PROVIDER:MVAGRANT*} diff --git a/release/doc/share/xml/errata.xml b/release/doc/share/xml/errata.xml index d7abca1..fb617dc 100644 --- a/release/doc/share/xml/errata.xml +++ b/release/doc/share/xml/errata.xml @@ -41,6 +41,14 @@ <entry><para>Allow size argument to &man.vidcontrol.1; for &man.syscons.4;.</para></entry> </row> + + <row> + <entry><link + xlink:href="&security.url;/FreeBSD-EN-15:15.pkg.asc">FreeBSD-EN-15:15.pkg</link></entry> + <entry>25 August 2015</entry> + <entry><para>Insufficient check of supported &man.pkg.7; + signature methods.</para></entry> + </row> </tbody> </tgroup> </informaltable> diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml index 82ebf3b..d5718ae 100644 --- a/release/doc/share/xml/security.xml +++ b/release/doc/share/xml/security.xml @@ -25,6 +25,13 @@ <entry><para>Fix multiple integer overflows in &man.libbsdxml.3;.</para></entry> </row> + + <row> + <entry><link + xlink:href="&security.url;/FreeBSD-SA-15:22.openssh.asc">FreeBSD-SA-15:22.openssh</link></entry> + <entry>25 August 2015</entry> + <entry><para>Multiple vulnerabilities</para></entry> + </row> </tbody> </tgroup> </informaltable> |
