Updated SA-15:25 patches

Contents

  1. Full patches (relative to an unpatched tree)
  2. Patches relative to the current tree
  3. If buildworld fails on 9.3

Full patches (relative to an unpatched tree)

ntp-93.patch.xz Patch for FreeBSD 9.3
ntp-93.patch.xz.asc PGP signature for the above
ntp-101.patch.xz Patch for FreeBSD 10.1
ntp-101.patch.xz.asc PGP signature for the above
ntp-102.patch.xz Patch for FreeBSD 10.2
ntp-102.patch.xz.asc PGP signature for the above

To apply one of these patches:

# cd /usr/src
# fetch https://people.freebsd.org/~des/SA-15:25/ntp-N.patch.xz
# fetch https://people.freebsd.org/~des/SA-15:25/ntp-N.patch.xz.asc
# gpg --verify ntp-N.patch.xz.asc
# xzcat ntp-N.patch | patch -p0

Patches relative to the current tree

ntp-93-inc.patch Patch for FreeBSD 9.3
ntp-93-inc.patch.asc PGP signature for the above
ntp-101-inc.patch Patch for FreeBSD 10.1
ntp-101-inc.patch.asc PGP signature for the above
ntp-102-inc.patch Patch for FreeBSD 10.2
ntp-102-inc.patch.asc PGP signature for the above

To apply one of these patches:

# cd /usr/src
# fetch https://people.freebsd.org/~des/SA-15:25/ntp-N-inc.patch
# fetch https://people.freebsd.org/~des/SA-15:25/ntp-N-inc.patch.asc
# gpg --verify ntp-N-inc.patch.asc
# patch -p0 <ntp-N-inc.patch

If buildworld fails on 9.3

On 9.3, there is a possibility that buildworld will fail with an error message like this:

===> usr.sbin/ntp/libopts (depend)
rm -f .depend
mkdep -f .depend -a    -I/usr/src/usr.sbin/ntp/libopts/../../../contrib/ntp/incl
ude -I/usr/src/usr.sbin/ntp/libopts/../../../contrib/ntp/sntp/libopts -I/usr/src
/usr.sbin/ntp/libopts/../ -DSYS_FREEBSD -DPARSE -DHAVE_CONFIG_H -DOPENSSL -DUSE_
OPENSSL_CRYPTO_RAND -DAUTOKEY -std=gnu99   /usr/src/usr.sbin/ntp/libopts/../../.
./contrib/ntp/sntp/libopts/libopts.c
In file included from /usr/src/usr.sbin/ntp/libopts/../../../contrib/ntp/sntp/li
bopts/libopts.c:14:
/usr/src/usr.sbin/ntp/libopts/../../../contrib/ntp/sntp/libopts/autoopts.h:35:25
: error: stdnoreturn.h: No such file or directory
mkdep: compile failed
*** [.depend] Error code 1

If that happens, please apply the patch below:

stdnoreturn-93.patch Patch for FreeBSD 9.3
stdnoreturn-93.patch.asc PGP signature for the above

To apply this patch:

# cd /usr/src
# fetch https://people.freebsd.org/~des/SA-15:25/stdnoreturn-93.patch
# fetch https://people.freebsd.org/~des/SA-15:25/stdnoreturn-93.patch.asc
# gpg --verify stdnoreturn-93.patch.asc
# patch -p0 <stdnoreturn-93.patch
des@freebsd.org