diff options
| author | delphij <delphij@FreeBSD.org> | 2017-07-12 08:07:55 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-07-12 08:07:55 +0000 |
| commit | af83c8122b5689bbe24eadc0023615c7b3f93178 (patch) | |
| tree | 7b2d1f03d7e782bbef71362dc81f2d9f98df6d4b /sys/conf | |
| parent | c566b99bac77a9a14c76bf2c175ea4985cb30ffe (diff) | |
| download | FreeBSD-src-af83c8122b5689bbe24eadc0023615c7b3f93178.zip FreeBSD-src-af83c8122b5689bbe24eadc0023615c7b3f93178.tar.gz | |
Fix heimdal KDC-REP service name validation vulnerability [SA-17:05]
Boot compatibility improvements with Azure VMs. [EN-17:06]
Approved by: so
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index f91191b..48818ce 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -262,7 +262,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index e495da7..77ed414 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -240,7 +240,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 88c6932..00b7996 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p19" +BRANCH="RELEASE-p20" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
