summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-01-14 09:33:16 -0200
committerRenato Botelho <renato@netgate.com>2016-01-14 09:33:16 -0200
commit58b7eab7d39d983cc70f6f1d611f00470a76fca1 (patch)
treebb36653da0e7ff3eb5ec994f6923513a77973ba0 /release
parent3e0bf52f358eb969d165c4b1e54942ee94cf2c8d (diff)
parente9becf4ed022809a585e21a1d3da8a3a233ff648 (diff)
downloadFreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.zip
FreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/errata/article.xml2
-rw-r--r--release/doc/share/xml/errata.xml23
-rw-r--r--release/doc/share/xml/security.xml46
-rwxr-xr-xrelease/release.sh1
4 files changed, 71 insertions, 1 deletions
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 1ec6688..fee035f 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -19,7 +19,7 @@
<pubdate>$FreeBSD$</pubdate>
<copyright>
- <year>2015</year>
+ <year>2016</year>
<holder role="mailto:doc@FreeBSD.org">The &os; Documentation
Project</holder>
diff --git a/release/doc/share/xml/errata.xml b/release/doc/share/xml/errata.xml
index 95438a8..b476244 100644
--- a/release/doc/share/xml/errata.xml
+++ b/release/doc/share/xml/errata.xml
@@ -89,6 +89,29 @@
<entry><para>Applications exiting due to segmentation
violation on a correct memory address.</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:01.filemon.asc">FreeBSD-EN-16:01.filemon</link></entry>
+ <entry>14&nbsp;January&nbsp;2016</entry>
+ <entry><para><application>bmake</application> and
+ &man.filemon.4; stability issues.</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:02.pf.asc">FreeBSD-EN-16:02.pf</link></entry>
+ <entry>14&nbsp;January&nbsp;2016</entry>
+ <entry><para>Invalid TCP checksum issue.</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:03.yplib.asc">FreeBSD-EN-16:03.yplib</link></entry>
+ <entry>14&nbsp;January&nbsp;2016</entry>
+ <entry><para><application>YP/NIS</application> library
+ bug.</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml
index 660e434..8bd3cbe 100644
--- a/release/doc/share/xml/security.xml
+++ b/release/doc/share/xml/security.xml
@@ -53,6 +53,52 @@
<entry>5&nbsp;December&nbsp;2015</entry>
<entry><para>Multiple vulnerabilities</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:01.sctp.asc">FreeBSD-SA-16:01.sctp</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>ICMPv6 error message vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:02.ntp.asc">FreeBSD-SA-16:02.ntp</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>Panic threshold bypass
+ vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:03.linux.asc">FreeBSD-SA-16:03.linux</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>Incorrect <literal>futex</literal>
+ handling</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:04.linux.asc">FreeBSD-SA-16:04.linux</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>&man.setgroups.2; system call
+ vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:05.tcp.asc">FreeBSD-SA-16:05.tcp</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>MD5 signature denial of service</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:06.bsnmpd.asc">FreeBSD-SA-16:06.bsnmpd</link></entry>
+ <entry>15&nbsp;January&nbsp;2016</entry>
+ <entry><para>Insecure default configuration file
+ permissions</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/release/release.sh b/release/release.sh
index 313a16c..caa6f26 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -275,6 +275,7 @@ extra_chroot_setup() {
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ FORCE_PKG_REGISTER=1 \
install clean distclean
fi
fi
OpenPOWER on IntegriCloud