Skip to content

GitLab

Commit c0003c9e authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge branch 'freebsd/current/main' into hardened/current/master

parents 0a4209b3 08a2504a
Hide whitespace changes
Inline Side-by-side
UPDATING
View file @ c0003c9e
......@@ -51,6 +51,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
lib/clang/include/llvm/Config/AsmPrinters.def
before the build to force everything to rebuild that needs to.
20211202:
Unbound support for RFC8375: The special-use domain 'home.arpa' is
by default blocked. To unblock it use a local-zone nodefault
statement in unbound.conf:
local-zone: "home.arpa." nodefault
Or use another type of local-zone to override with your choice.
The reason for this is discussed in Section 6.1 of RFC8375:
Because 'home.arpa.' is not globally scoped and cannot be secured
using DNSSEC based on the root domain's trust anchor, there is no way
to tell, using a standard DNS query, in which homenet scope an answer
belongs. Consequently, users may experience surprising results with
such names when roaming to different homenets.
20211110:
Commit b8d60729deef changed the TCP congestion control framework so
that any of the included congestion control modules could be
......
contrib/unbound/configure
View file @ c0003c9e
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for unbound 1.14.0rc1.
# Generated by GNU Autoconf 2.69 for unbound 1.14.0.
#
# Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
#
......@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='unbound'
PACKAGE_TARNAME='unbound'
PACKAGE_VERSION='1.14.0rc1'
PACKAGE_STRING='unbound 1.14.0rc1'
PACKAGE_VERSION='1.14.0'
PACKAGE_STRING='unbound 1.14.0'
PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
PACKAGE_URL=''
 
......@@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures unbound 1.14.0rc1 to adapt to many kinds of systems.
\`configure' configures unbound 1.14.0 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1531,7 +1531,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of unbound 1.14.0rc1:";;
short | recursive ) echo "Configuration of unbound 1.14.0:";;
esac
cat <<\_ACEOF
 
......@@ -1773,7 +1773,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
unbound configure 1.14.0rc1
unbound configure 1.14.0
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2482,7 +2482,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by unbound $as_me 1.14.0rc1, which was
It was created by unbound $as_me 1.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2834,7 +2834,7 @@ UNBOUND_VERSION_MAJOR=1
 
UNBOUND_VERSION_MINOR=14
 
UNBOUND_VERSION_MICRO=0rc1
UNBOUND_VERSION_MICRO=0
 
 
LIBUNBOUND_CURRENT=9
......@@ -21840,7 +21840,7 @@ _ACEOF
 
 
 
version=1.14.0rc1
version=1.14.0
 
date=`date +'%b %e, %Y'`
 
......@@ -22359,7 +22359,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by unbound $as_me 1.14.0rc1, which was
This file was extended by unbound $as_me 1.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -22425,7 +22425,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
unbound config.status 1.14.0rc1
unbound config.status 1.14.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
contrib/unbound/configure.ac
View file @ c0003c9e
......@@ -11,7 +11,7 @@ sinclude(dnscrypt/dnscrypt.m4)
# must be numbers. ac_defun because of later processing
m4_define([VERSION_MAJOR],[1])
m4_define([VERSION_MINOR],[14])
m4_define([VERSION_MICRO],[0rc1])
m4_define([VERSION_MICRO],[0])
AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound])
AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
......
contrib/unbound/doc/README
View file @ c0003c9e
README for Unbound 1.14.0rc1
README for Unbound 1.14.0
Copyright 2007 NLnet Labs
http://unbound.net
......
contrib/unbound/doc/example.conf.in
View file @ c0003c9e
#
# Example configuration file.
#
# See unbound.conf(5) man page, version 1.14.0rc1.
# See unbound.conf(5) man page, version 1.14.0.
#
# this is a comment.
......
contrib/unbound/doc/libunbound.3.in
View file @ c0003c9e
.TH "libunbound" "3" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "libunbound" "3" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" libunbound.3 -- unbound library functions manual
.\"
......@@ -44,7 +44,7 @@
.B ub_ctx_zone_remove,
.B ub_ctx_data_add,
.B ub_ctx_data_remove
\- Unbound DNS validating resolver 1.14.0rc1 functions.
\- Unbound DNS validating resolver 1.14.0 functions.
.SH "SYNOPSIS"
.B #include <unbound.h>
.LP
......
contrib/unbound/doc/unbound-anchor.8.in
View file @ c0003c9e
.TH "unbound-anchor" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound-anchor" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound-anchor.8 -- unbound anchor maintenance utility manual
.\"
......
contrib/unbound/doc/unbound-checkconf.8.in
View file @ c0003c9e
.TH "unbound-checkconf" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound-checkconf" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound-checkconf.8 -- unbound configuration checker manual
.\"
......
contrib/unbound/doc/unbound-control.8.in
View file @ c0003c9e
.TH "unbound-control" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound-control" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound-control.8 -- unbound remote control manual
.\"
......
contrib/unbound/doc/unbound-host.1.in
View file @ c0003c9e
.TH "unbound\-host" "1" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound\-host" "1" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound-host.1 -- unbound DNS lookup utility
.\"
......
contrib/unbound/doc/unbound.8.in
View file @ c0003c9e
.TH "unbound" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound.8 -- unbound manual
.\"
......@@ -9,7 +9,7 @@
.\"
.SH "NAME"
.B unbound
\- Unbound DNS validating resolver 1.14.0rc1.
\- Unbound DNS validating resolver 1.14.0.
.SH "SYNOPSIS"
.B unbound
.RB [ \-h ]
......
contrib/unbound/doc/unbound.conf.5.in
View file @ c0003c9e
.TH "unbound.conf" "5" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1"
.TH "unbound.conf" "5" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0"
.\"
.\" unbound.conf.5 -- unbound.conf manual
.\"
......
sys/modules/mgb/Makefile
View file @ c0003c9e
......@@ -5,7 +5,7 @@
KMOD = if_mgb
SRCS = if_mgb.c
SRCS += device_if.h bus_if.h pci_if.h
SRCS += ifdi_if.h
SRCS += ifdi_if.h opt_platform.h
SRCS += miibus_if.h
#CFLAGS+= -DIFLIB
......
usr.bin/fetch/fetch.c
View file @ c0003c9e
......@@ -425,7 +425,7 @@ query_auth(struct url *URL)
* Fetch a file
*/
static int
fetch(char *URL, const char *path)
fetch(char *URL, const char *path, int *is_http)
{
struct url *url;
struct url_stat us;
......@@ -475,6 +475,9 @@ fetch(char *URL, const char *path)
strcpy(url->scheme, SCHEME_HTTP);
}
/* for both of http and https */
*is_http = strncmp(url->scheme, "http", 4) == 0;
/* common flags */
switch (family) {
case PF_INET:
......@@ -911,7 +914,7 @@ main(int argc, char *argv[])
struct sigaction sa;
const char *p, *s;
char *end, *q;
int c, e, r;
int c, e, is_http, r;
while ((c = getopt_long(argc, argv,
......@@ -1176,16 +1179,16 @@ main(int argc, char *argv[])
if (o_flag) {
if (o_stdout) {
e = fetch(*argv, "-");
e = fetch(*argv, "-", &is_http);
} else if (o_directory) {
asprintf(&q, "%s/%s", o_filename, p);
e = fetch(*argv, q);
e = fetch(*argv, q, &is_http);
free(q);
} else {
e = fetch(*argv, o_filename);
e = fetch(*argv, o_filename, &is_http);
}
} else {
e = fetch(*argv, p);
e = fetch(*argv, p, &is_http);
}
if (sigint)
......@@ -1201,7 +1204,13 @@ main(int argc, char *argv[])
&& fetchLastErrCode != FETCH_MOVED
&& fetchLastErrCode != FETCH_URL
&& fetchLastErrCode != FETCH_RESOLV
&& fetchLastErrCode != FETCH_UNKNOWN)) {
&& fetchLastErrCode != FETCH_UNKNOWN
&& (is_http
&& fetchLastErrCode != FETCH_PROTO
&& fetchLastErrCode != FETCH_SERVER
&& fetchLastErrCode != FETCH_TEMP
&& fetchLastErrCode != FETCH_TIMEOUT
))) {
if (w_secs && v_level)
fprintf(stderr, "Waiting %ld seconds "
"before retrying\n", w_secs);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment