svn commit: r333563 - in head/contrib/unbound: . cachedb contrib daemon dns64 dnscrypt doc iterator libunbound services services/cache sldns smallapp util util/data util/shm_side util/storage valid...
Author: des Date: Sat May 12 14:48:38 2018 New Revision: 333563 URL: https://svnweb.freebsd.org/changeset/base/333563 Log: Upgrade Unbound to 1.6.6. More to follow. Added: head/contrib/unbound/dnscrypt/dnscrypt_config.h (contents, props changed) Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/acx_nlnetlabs.m4 head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/dns64/dns64.c head/contrib/unbound/dnscrypt/dnscrypt.c head/contrib/unbound/dnscrypt/dnscrypt.h head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iterator.c head/contrib/unbound/iterator/iterator.h head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/services/authzone.c head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/sldns/parseutil.c head/contrib/unbound/sldns/str2wire.c head/contrib/unbound/sldns/wire2str.c head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/shm_side/shm_main.c head/contrib/unbound/util/storage/lookup3.c head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/val_utils.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inSat May 12 14:39:41 2018 (r333562) +++ head/contrib/unbound/Makefile.inSat May 12 14:48:38 2018 (r333563) @@ -426,7 +426,7 @@ libunbound/python/libunbound_wrap.c: $(srcdir)/libunbo # Pyunbound python unbound wrapper _unbound.la: libunbound_wrap.lo libunbound.la - $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound + $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound util/config_file.c:util/configparser.h util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h @@ -735,9 +735,9 @@ iter_utils.lo iter_utils.o: $(srcdir)/iterator/iter_ut $(srcdir)/sldns/str2wire.h listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/dnscrypt/cert.h $(srcdir)/services/outside_network.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/log.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dn
svn commit: r333564 - in head/contrib/unbound: . cachedb contrib daemon dns64 dnscrypt doc edns-subnet iterator libunbound libunbound/python/doc/examples services services/cache sldns smallapp util...
Author: des
Date: Sat May 12 14:51:18 2018
New Revision: 333564
URL: https://svnweb.freebsd.org/changeset/base/333564
Log:
Upgrade Unbound to 1.6.7. More to follow.
Modified:
head/contrib/unbound/cachedb/cachedb.c
head/contrib/unbound/config.h
head/contrib/unbound/configure
head/contrib/unbound/configure.ac
head/contrib/unbound/contrib/-filter-iterator.patch
head/contrib/unbound/contrib/parseunbound.pl
head/contrib/unbound/daemon/remote.c
head/contrib/unbound/daemon/stats.c
head/contrib/unbound/daemon/unbound.c
head/contrib/unbound/daemon/worker.c
head/contrib/unbound/dns64/dns64.c
head/contrib/unbound/dnscrypt/dnscrypt.c
head/contrib/unbound/dnscrypt/dnscrypt.h
head/contrib/unbound/doc/Changelog
head/contrib/unbound/doc/README
head/contrib/unbound/doc/example.conf
head/contrib/unbound/doc/example.conf.in
head/contrib/unbound/doc/libunbound.3
head/contrib/unbound/doc/libunbound.3.in
head/contrib/unbound/doc/requirements.txt
head/contrib/unbound/doc/unbound-anchor.8
head/contrib/unbound/doc/unbound-anchor.8.in
head/contrib/unbound/doc/unbound-checkconf.8
head/contrib/unbound/doc/unbound-checkconf.8.in
head/contrib/unbound/doc/unbound-control.8
head/contrib/unbound/doc/unbound-control.8.in
head/contrib/unbound/doc/unbound-host.1
head/contrib/unbound/doc/unbound-host.1.in
head/contrib/unbound/doc/unbound.8
head/contrib/unbound/doc/unbound.8.in
head/contrib/unbound/doc/unbound.conf.5
head/contrib/unbound/doc/unbound.conf.5.in
head/contrib/unbound/edns-subnet/addrtree.h
head/contrib/unbound/edns-subnet/subnetmod.c
head/contrib/unbound/edns-subnet/subnetmod.h
head/contrib/unbound/iterator/iter_utils.h
head/contrib/unbound/iterator/iterator.c
head/contrib/unbound/iterator/iterator.h
head/contrib/unbound/libunbound/context.h
head/contrib/unbound/libunbound/libunbound.c
head/contrib/unbound/libunbound/libworker.c
head/contrib/unbound/libunbound/python/doc/examples/example7.rst
head/contrib/unbound/libunbound/unbound.h
head/contrib/unbound/services/cache/dns.c
head/contrib/unbound/services/cache/dns.h
head/contrib/unbound/services/mesh.c
head/contrib/unbound/services/outside_network.c
head/contrib/unbound/services/view.h
head/contrib/unbound/sldns/parse.c
head/contrib/unbound/sldns/parse.h
head/contrib/unbound/sldns/parseutil.c
head/contrib/unbound/sldns/parseutil.h
head/contrib/unbound/sldns/rrdef.h
head/contrib/unbound/sldns/sbuffer.h
head/contrib/unbound/sldns/str2wire.c
head/contrib/unbound/sldns/wire2str.c
head/contrib/unbound/smallapp/unbound-anchor.c
head/contrib/unbound/smallapp/unbound-control.c
head/contrib/unbound/smallapp/unbound-host.c
head/contrib/unbound/util/config_file.c
head/contrib/unbound/util/config_file.h
head/contrib/unbound/util/configlexer.lex
head/contrib/unbound/util/configparser.y
head/contrib/unbound/util/data/msgreply.c
head/contrib/unbound/util/data/msgreply.h
head/contrib/unbound/util/fptr_wlist.c
head/contrib/unbound/util/module.h
head/contrib/unbound/util/netevent.c
head/contrib/unbound/util/shm_side/shm_main.c
head/contrib/unbound/util/storage/slabhash.h
head/contrib/unbound/util/ub_event.h
head/contrib/unbound/validator/autotrust.c
head/contrib/unbound/validator/val_nsec3.c
head/contrib/unbound/validator/val_secalgo.c
head/contrib/unbound/validator/val_sigcrypt.c
head/contrib/unbound/validator/val_utils.h
head/contrib/unbound/validator/validator.c
Directory Properties:
head/contrib/unbound/ (props changed)
Modified: head/contrib/unbound/cachedb/cachedb.c
==
--- head/contrib/unbound/cachedb/cachedb.c Sat May 12 14:48:38 2018
(r333563)
+++ head/contrib/unbound/cachedb/cachedb.c Sat May 12 14:51:18 2018
(r333564)
@@ -347,6 +347,13 @@ prep_data(struct module_qstate* qstate, struct sldns_b
if(!qstate->return_msg || !qstate->return_msg->rep)
return 0;
+ /* We don't store the reply if its TTL is 0 unless serve-expired is
+* enabled. Such a reply won't be reusable and simply be a waste for
+* the backend. It's also compatible with the default behavior of
+* dns_cache_store_msg(). */
+ if(qstate->return_msg->rep->ttl == 0 &&
+ !qstate->env->cfg->serve_expired)
+ return 0;
if(verbosity >= VERB_ALGO)
log_dns_msg("cachedb encoding", &qstate->return_msg->qinfo,
qstate->return_msg->rep);
@@ -387,32 +394,37 @@ good_expiry_and_qinfo(struct module_qstate* qstate, st
&expiry, sizeof(expiry));
expiry = be64toh(expiry);
- if((time_t)expiry < *qstate->env->now)
+ if((time_t)expiry < *qstate->env->now &&
+ !qstate->env->cfg->serve_expired)
return 0;
return 1;
}
+/* Adjust the TTL of the given RRset by 'subtract'. If 'su
svn commit: r333565 - head/contrib/unbound/libunbound/python
Author: des Date: Sat May 12 14:51:53 2018 New Revision: 333565 URL: https://svnweb.freebsd.org/changeset/base/333565 Log: No reason to keep this around. Deleted: head/contrib/unbound/libunbound/python/ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333566 - in head/contrib/unbound: . doc validator
Author: des Date: Sat May 12 14:57:42 2018 New Revision: 333566 URL: https://svnweb.freebsd.org/changeset/base/333566 Log: Upgrade Unbound to 1.6.8. More to follow. Modified: head/contrib/unbound/aclocal.m4 head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/validator/autotrust.c head/contrib/unbound/validator/autotrust.h head/contrib/unbound/validator/val_nsec.c head/contrib/unbound/validator/val_nsec.h head/contrib/unbound/validator/val_nsec3.c head/contrib/unbound/validator/val_nsec3.h head/contrib/unbound/validator/val_sigcrypt.c head/contrib/unbound/validator/val_sigcrypt.h head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/val_utils.h head/contrib/unbound/validator/validator.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/aclocal.m4 == --- head/contrib/unbound/aclocal.m4 Sat May 12 14:51:53 2018 (r333565) +++ head/contrib/unbound/aclocal.m4 Sat May 12 14:57:42 2018 (r333566) @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9390,7 +9390,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "ye # AM_CONDITIONAL-*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9421,7 +9421,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Modified: head/contrib/unbound/config.h == --- head/contrib/unbound/config.h Sat May 12 14:51:53 2018 (r333565) +++ head/contrib/unbound/config.h Sat May 12 14:57:42 2018 (r333566) @@ -605,7 +605,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.6.7" +#define PACKAGE_STRING "unbound 1.6.8" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -614,7 +614,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.7" +#define PACKAGE_VERSION "1.6.8" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -633,7 +633,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,6,7,0 +#define RSRC_PACKAGE_VERSION 1,6,8,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" Modified: head/contrib/unbound/configure == --- head/contrib/unbound/configure Sat May 12 14:51:53 2018 (r333565) +++ head/contrib/unbound/configure Sat May 12 14:57:42 2018 (r333566) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.6.7. +# Generated by GNU Autoconf 2.69 for unbound 1.6.8. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.6.7' -PACKAGE_STRING='unbound 1.6.7' +PACKAGE_VERSION='1.6.8' +PACKAGE_STRING='unbound 1.6.8' PACKAGE_BUGREPORT='unbound-b...@nlnetlabs.nl' PACKAGE_URL='' @@ -1437,7 +1437,7 @@ if test "$ac_init_help" = "lon
svn commit: r333567 - in head/contrib/unbound: . cachedb compat contrib daemon dnscrypt dnstap doc edns-subnet iterator libunbound services services/cache sldns smallapp util util/data validator
Author: des Date: Sat May 12 15:04:05 2018 New Revision: 333567 URL: https://svnweb.freebsd.org/changeset/base/333567 Log: Upgrade Unbound to 1.7.0. More to follow. Added: head/contrib/unbound/contrib/libunbound.so.conf - copied unchanged from r333547, vendor/unbound/dist/contrib/libunbound.so.conf Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/compat/arc4_lock.c head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/README head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/daemon/cachedump.c head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/dnscrypt/dnscrypt.c head/contrib/unbound/dnscrypt/dnscrypt.h head/contrib/unbound/dnscrypt/dnscrypt.m4 head/contrib/unbound/dnstap/dnstap.proto head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/edns-subnet/addrtree.c head/contrib/unbound/edns-subnet/subnetmod.c head/contrib/unbound/iterator/iter_delegpt.h head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_scrub.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iter_utils.h head/contrib/unbound/iterator/iterator.c head/contrib/unbound/iterator/iterator.h head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/services/authzone.c head/contrib/unbound/services/authzone.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/dns.h head/contrib/unbound/services/cache/rrset.c head/contrib/unbound/services/cache/rrset.h head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/sldns/str2wire.c head/contrib/unbound/sldns/str2wire.h head/contrib/unbound/sldns/wire2str.c head/contrib/unbound/sldns/wire2str.h head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/msgreply.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/log.c head/contrib/unbound/util/log.h head/contrib/unbound/util/module.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/ub_event.c head/contrib/unbound/validator/val_neg.c head/contrib/unbound/validator/val_neg.h head/contrib/unbound/validator/val_nsec.c head/contrib/unbound/validator/val_sigcrypt.c head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/val_utils.h head/contrib/unbound/validator/validator.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inSat May 12 14:57:42 2018 (r333566) +++ head/contrib/unbound/Makefile.inSat May 12 15:04:05 2018 (r333567) @@ -137,8 +137,7 @@ slabhash.lo timehist.lo tube.lo winsock_event.lo autot validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo authzone.lo\ $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \ -$(IPSECMOD_OBJ) -COMMON_OBJ_WITHOUT_NETCALL+=respip.lo +$(IPSECMOD_OBJ) respip.lo COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \ outside_network.lo COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo @@ -265,7 +264,7 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ COMPILE=$(LIBTOOL) --tag=CC -
svn commit: r333568 - in head/contrib/unbound: . cachedb contrib daemon doc iterator libunbound services services/cache sldns smallapp util util/data validator
Author: des Date: Sat May 12 15:20:39 2018 New Revision: 333568 URL: https://svnweb.freebsd.org/changeset/base/333568 Log: Upgrade Unbound to 1.7.1. Added: head/contrib/unbound/cachedb/redis.c - copied unchanged from r333549, vendor/unbound/dist/cachedb/redis.c head/contrib/unbound/cachedb/redis.h - copied unchanged from r333549, vendor/unbound/dist/cachedb/redis.h head/contrib/unbound/contrib/unbound-querycachedb.py - copied unchanged from r333549, vendor/unbound/dist/contrib/unbound-querycachedb.py Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/cachedb/cachedb.h head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/README head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iter_delegpt.c head/contrib/unbound/iterator/iter_delegpt.h head/contrib/unbound/iterator/iter_fwd.c head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iter_utils.h head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/libworker.h head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/libunbound/worker.h head/contrib/unbound/services/authzone.c head/contrib/unbound/services/authzone.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/rrset.c head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/mesh.c head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/sldns/keyraw.c head/contrib/unbound/sldns/keyraw.h head/contrib/unbound/sldns/str2wire.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/smallapp/worker_cb.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/dname.c head/contrib/unbound/util/data/dname.h head/contrib/unbound/util/data/msgparse.c head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/packed_rrset.c head/contrib/unbound/util/data/packed_rrset.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/fptr_wlist.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/module.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/tube.c head/contrib/unbound/util/ub_event.c head/contrib/unbound/validator/val_anchor.c head/contrib/unbound/validator/val_anchor.h head/contrib/unbound/validator/val_neg.c head/contrib/unbound/validator/val_neg.h head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/validator.c head/contrib/unbound/validator/validator.h Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inSat May 12 15:04:05 2018 (r333567) +++ head/contrib/unbound/Makefile.inSat May 12 15:20:39 2018 (r333568) @@ -112,7 +112,7 @@ iterator/iter_scrub.c iterator/iter_utils.c services/l services/localzone.c services/mesh.c services/modstack.c services/view.c \ services/outbound_list.c services/outside_network.c util/alloc.c \ util/config_file.c util/configlexer.c util/configparser.c \ -util/shm_side/shm_main.c services/authzone.c\ +util/shm_side/shm_main.c services/authzone.c \ util/fptr_wlist.c util/locks.c util/log.c util/mini_event.c util/module.c \ util/netevent.c util/net_help.c util/random.c util/rbtree.c util/regional.c \ util/rtt.c util/storage/dnstree.c util/storage/lookup3.c \ @@ -124,7 +124,7 @@ validator/val_nsec3.c validator/val_nsec.c validator/v vali
svn commit: r333569 - head/usr.sbin/cpucontrol
Author: emaste
Date: Sat May 12 15:34:35 2018
New Revision: 333569
URL: https://svnweb.freebsd.org/changeset/base/333569
Log:
cpucontrol: improve Intel microcode revision check
According to the Intel SDM (Volme 3, 9.11.7) the BIOS signature MSR
should be zeroed before executing cpuid (although in practice it does
not seem to matter).
PR: 192487
Submitted by: Dan Lukes
Reported by: Henrique de Moraes Holschuh
MFC after:3 days
Modified:
head/usr.sbin/cpucontrol/intel.c
Modified: head/usr.sbin/cpucontrol/intel.c
==
--- head/usr.sbin/cpucontrol/intel.cSat May 12 15:20:39 2018
(r333568)
+++ head/usr.sbin/cpucontrol/intel.cSat May 12 15:34:35 2018
(r333569)
@@ -95,7 +95,8 @@ intel_update(const char *dev, const char *path)
void *fw_data;
size_t data_size, total_size;
cpuctl_msr_args_t msrargs = {
- .msr = MSR_IA32_PLATFORM_ID,
+ .msr = MSR_BIOS_SIGN,
+ .data = 0,
};
cpuctl_cpuid_args_t idargs = {
.level = 1,/* Signature. */
@@ -115,12 +116,18 @@ intel_update(const char *dev, const char *path)
WARN(0, "could not open %s for writing", dev);
return;
}
+ error = ioctl(devfd, CPUCTL_WRMSR, &msrargs);
+ if (error < 0) {
+ WARN(0, "ioctl(%s)", dev);
+ goto fail;
+ }
error = ioctl(devfd, CPUCTL_CPUID, &idargs);
if (error < 0) {
WARN(0, "ioctl(%s)", dev);
goto fail;
}
signature = idargs.data[0];
+ msrargs.msr = MSR_IA32_PLATFORM_ID;
error = ioctl(devfd, CPUCTL_RDMSR, &msrargs);
if (error < 0) {
WARN(0, "ioctl(%s)", dev);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333570 - head/sys/cddl/dev/dtrace/aarch64
Author: markj
Date: Sat May 12 15:35:26 2018
New Revision: 333570
URL: https://svnweb.freebsd.org/changeset/base/333570
Log:
DTrace aarch64: Avoid calling unwind_frame() in the probe context.
unwind_frame() may be instrumented by FBT, leading to recursion into
dtrace_probe(). Manually inline unwind_frame() as we do with stack
unwinding code for other architectures.
Submitted by: Domagoj Stolfa
Reviewed by: manu
MFC after:1 week
Sponsored by: DARPA / AFRL
Differential Revision:https://reviews.freebsd.org/D15359
Modified:
head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
Modified: head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c Sat May 12 15:34:35
2018(r333569)
+++ head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c Sat May 12 15:35:26
2018(r333570)
@@ -70,7 +70,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in
{
struct unwind_state state;
int scp_offset;
- register_t sp;
+ register_t sp, fp;
int depth;
depth = 0;
@@ -88,11 +88,15 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in
state.pc = (uint64_t)dtrace_getpcstack;
while (depth < pcstack_limit) {
- if (unwind_frame(&state))
- break;
-
if (!INKERNEL(state.pc) || !INKERNEL(state.fp))
break;
+
+ fp = state.fp;
+ state.sp = fp + 0x10;
+ /* FP to previous frame (X29) */
+ state.fp = *(register_t *)(fp);
+ /* LR (X30) */
+ state.pc = *(register_t *)(fp + 8) - 4;
/*
* NB: Unlike some other architectures, we don't need to
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333571 - head/lib/libfetch
Author: des Date: Sat May 12 17:02:27 2018 New Revision: 333571 URL: https://svnweb.freebsd.org/changeset/base/333571 Log: Preserve if-modified-since timestamps across redirects. PR: 224426 MFC after:1 week Modified: head/lib/libfetch/http.c Modified: head/lib/libfetch/http.c == --- head/lib/libfetch/http.cSat May 12 15:35:26 2018(r333570) +++ head/lib/libfetch/http.cSat May 12 17:02:27 2018(r333571) @@ -1874,6 +1874,7 @@ http_request_body(struct url *URL, const char *op, str } new->offset = url->offset; new->length = url->length; + new->ims_time = url->ims_time; break; case hdr_transfer_encoding: /* XXX weak test*/ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333572 - head/usr.bin/fetch
Author: des
Date: Sat May 12 17:04:40 2018
New Revision: 333572
URL: https://svnweb.freebsd.org/changeset/base/333572
Log:
Support If-Modified-Since for https as well as http.
PR: 224426
Submitted by: zsnaf...@edu.uwaterloo.ca
MFC after:1 week
Modified:
head/usr.bin/fetch/fetch.c
Modified: head/usr.bin/fetch/fetch.c
==
--- head/usr.bin/fetch/fetch.c Sat May 12 17:02:27 2018(r333571)
+++ head/usr.bin/fetch/fetch.c Sat May 12 17:04:40 2018(r333572)
@@ -552,9 +552,10 @@ fetch(char *URL, const char *path)
goto signal;
if (f == NULL) {
warnx("%s: %s", URL, fetchLastErrString);
- if (i_flag && strcmp(url->scheme, SCHEME_HTTP) == 0
- && fetchLastErrCode == FETCH_OK
- && strcmp(fetchLastErrString, "Not Modified") == 0) {
+ if (i_flag && (strcmp(url->scheme, SCHEME_HTTP) == 0 ||
+ strcmp(url->scheme, SCHEME_HTTPS) == 0) &&
+ fetchLastErrCode == FETCH_OK &&
+ strcmp(fetchLastErrString, "Not Modified") == 0) {
/* HTTP Not Modified Response, return OK. */
r = 0;
goto done;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333573 - in head: . contrib/unbound/daemon contrib/unbound/doc contrib/unbound/smallapp etc/rc.d tools/build/mk usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr....
Author: des
Date: Sat May 12 17:10:36 2018
New Revision: 333573
URL: https://svnweb.freebsd.org/changeset/base/333573
Log:
Rename all Unbound binaries and man pages from unbound* to local-unbound*.
PR: 222902
Added:
head/usr.sbin/unbound/setup/
- copied from r333572, head/usr.sbin/unbound/local-setup/
Deleted:
head/usr.sbin/unbound/local-setup/
Modified:
head/ObsoleteFiles.inc
head/contrib/unbound/daemon/unbound.c
head/contrib/unbound/doc/unbound-checkconf.8.in
head/contrib/unbound/smallapp/unbound-anchor.c
head/contrib/unbound/smallapp/unbound-checkconf.c
head/contrib/unbound/smallapp/unbound-control.c
head/etc/rc.d/local_unbound
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.sbin/unbound/Makefile
head/usr.sbin/unbound/Makefile.inc
head/usr.sbin/unbound/anchor/Makefile
head/usr.sbin/unbound/checkconf/Makefile
head/usr.sbin/unbound/control/Makefile
head/usr.sbin/unbound/daemon/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Sat May 12 17:04:40 2018(r333572)
+++ head/ObsoleteFiles.inc Sat May 12 17:10:36 2018(r333573)
@@ -38,6 +38,16 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180512: Rename Unbound tools
+OLD_FILES+=usr/sbin/unbound
+OLD_FILES+=usr/sbin/unbound-anchor
+OLD_FILES+=usr/sbin/unbound-checkconf
+OLD_FILES+=usr/sbin/unbound-control
+OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
+OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
+OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
+OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
+OLD_FILES+=usr/share/man/man8/unbound.8.gz
# 20180508: retire nxge
OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
OLD_FILES+=usr/share/man/man4/nxge.4.gz
Modified: head/contrib/unbound/daemon/unbound.c
==
--- head/contrib/unbound/daemon/unbound.c Sat May 12 17:04:40 2018
(r333572)
+++ head/contrib/unbound/daemon/unbound.c Sat May 12 17:10:36 2018
(r333573)
@@ -95,7 +95,7 @@ static void usage(void)
time_t t;
struct timeval now;
struct ub_event_base* base;
- printf("usage: unbound [options]\n");
+ printf("usage: local-unbound [options]\n");
printf("start unbound daemon DNS resolver.\n");
printf("-h this help\n");
printf("-c file config file to read instead of %s\n", CONFIGFILE);
Modified: head/contrib/unbound/doc/unbound-checkconf.8.in
==
--- head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:04:40
2018(r333572)
+++ head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:10:36
2018(r333573)
@@ -8,7 +8,7 @@
.\"
.\"
.SH "NAME"
-unbound\-checkconf
+.B unbound\-checkconf
\- Check unbound configuration file for errors.
.SH "SYNOPSIS"
.B unbound\-checkconf
Modified: head/contrib/unbound/smallapp/unbound-anchor.c
==
--- head/contrib/unbound/smallapp/unbound-anchor.c Sat May 12 17:04:40
2018(r333572)
+++ head/contrib/unbound/smallapp/unbound-anchor.c Sat May 12 17:10:36
2018(r333573)
@@ -174,7 +174,7 @@ struct ip_list {
static void
usage(void)
{
- printf("Usage: unbound-anchor [opts]\n");
+ printf("Usage: local-unbound-anchor [opts]\n");
printf("Setup or update root anchor. "
"Most options have defaults.\n");
printf("Run this program before you start the validator.\n");
Modified: head/contrib/unbound/smallapp/unbound-checkconf.c
==
--- head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:04:40
2018(r333572)
+++ head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:10:36
2018(r333573)
@@ -80,7 +80,7 @@
static void
usage(void)
{
- printf("Usage: unbound-checkconf [file]\n");
+ printf("Usage: local-unbound-checkconf [file]\n");
printf("Checks unbound configuration file for errors.\n");
printf("fileif omitted %s is used.\n", CONFIGFILE);
printf("-o option print value of option to stdout.\n");
Modified: head/contrib/unbound/smallapp/unbound-control.c
==
--- head/contrib/unbound/smallapp/unbound-control.c Sat May 12 17:04:40
2018(r333572)
+++ head/contrib/unbound/smallapp/unbound-control.c Sat May 12 17:10:36
2018(r333573)
@@ -77,7 +77,7 @@
static void
usage
Re: svn commit: r333573 - in head: . contrib/unbound/daemon contrib/unbound/doc contrib/unbound/smallapp etc/rc.d tools/build/mk usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr
> Author: des
> Date: Sat May 12 17:10:36 2018
> New Revision: 333573
> URL: https://svnweb.freebsd.org/changeset/base/333573
>
> Log:
> Rename all Unbound binaries and man pages from unbound* to local-unbound*.
>
> PR: 222902
>
> Added:
> head/usr.sbin/unbound/setup/
> - copied from r333572, head/usr.sbin/unbound/local-setup/
> Deleted:
> head/usr.sbin/unbound/local-setup/
> Modified:
> head/ObsoleteFiles.inc
> head/contrib/unbound/daemon/unbound.c
> head/contrib/unbound/doc/unbound-checkconf.8.in
> head/contrib/unbound/smallapp/unbound-anchor.c
> head/contrib/unbound/smallapp/unbound-checkconf.c
> head/contrib/unbound/smallapp/unbound-control.c
> head/etc/rc.d/local_unbound
> head/tools/build/mk/OptionalObsoleteFiles.inc
> head/usr.sbin/unbound/Makefile
> head/usr.sbin/unbound/Makefile.inc
> head/usr.sbin/unbound/anchor/Makefile
> head/usr.sbin/unbound/checkconf/Makefile
> head/usr.sbin/unbound/control/Makefile
> head/usr.sbin/unbound/daemon/Makefile
>
> Modified: head/ObsoleteFiles.inc
> ==
> --- head/ObsoleteFiles.incSat May 12 17:04:40 2018(r333572)
> +++ head/ObsoleteFiles.incSat May 12 17:10:36 2018(r333573)
> @@ -38,6 +38,16 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20180512: Rename Unbound tools
> +OLD_FILES+=usr/sbin/unbound
> +OLD_FILES+=usr/sbin/unbound-anchor
> +OLD_FILES+=usr/sbin/unbound-checkconf
> +OLD_FILES+=usr/sbin/unbound-control
> +OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
> +OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
> +OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
> +OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
> +OLD_FILES+=usr/share/man/man8/unbound.8.gz
> # 20180508: retire nxge
> OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
> OLD_FILES+=usr/share/man/man4/nxge.4.gz
>
> Modified: head/contrib/unbound/daemon/unbound.c
> ==
> --- head/contrib/unbound/daemon/unbound.c Sat May 12 17:04:40 2018
> (r333572)
> +++ head/contrib/unbound/daemon/unbound.c Sat May 12 17:10:36 2018
> (r333573)
> @@ -95,7 +95,7 @@ static void usage(void)
> time_t t;
> struct timeval now;
> struct ub_event_base* base;
> - printf("usage: unbound [options]\n");
> + printf("usage: local-unbound [options]\n");
> printf("start unbound daemon DNS resolver.\n");
> printf("-h this help\n");
> printf("-c file config file to read instead of %s\n", CONFIGFILE);
>
> Modified: head/contrib/unbound/doc/unbound-checkconf.8.in
> ==
> --- head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:04:40
> 2018(r333572)
> +++ head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:10:36
> 2018(r333573)
> @@ -8,7 +8,7 @@
> .\"
> .\"
> .SH "NAME"
> -unbound\-checkconf
> +.B unbound\-checkconf
Is that one missing a local-, or did unbound-checkconf not get renamed?
> \- Check unbound configuration file for errors.
> .SH "SYNOPSIS"
> .B unbound\-checkconf
>
> Modified: head/contrib/unbound/smallapp/unbound-anchor.c
> ==
> --- head/contrib/unbound/smallapp/unbound-anchor.cSat May 12 17:04:40
> 2018(r333572)
> +++ head/contrib/unbound/smallapp/unbound-anchor.cSat May 12 17:10:36
> 2018(r333573)
> @@ -174,7 +174,7 @@ struct ip_list {
> static void
> usage(void)
> {
> - printf("Usage: unbound-anchor [opts]\n");
> + printf("Usage: local-unbound-anchor [opts]\n");
> printf("Setup or update root anchor. "
> "Most options have defaults.\n");
> printf("Run this program before you start the validator.\n");
>
> Modified: head/contrib/unbound/smallapp/unbound-checkconf.c
> ==
> --- head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:04:40
> 2018(r333572)
> +++ head/contrib/unbound/smallapp/unbound-checkconf.c Sat May 12 17:10:36
> 2018(r333573)
> @@ -80,7 +80,7 @@
> static void
> usage(void)
> {
> - printf("Usage: unbound-checkconf [file]\n");
> + printf("Usage: local-unbound-checkconf [file]\n");
Looks like it is renamed
svn commit: r333574 - head/usr.sbin/unbound/setup
Author: des
Date: Sat May 12 18:07:53 2018
New Revision: 333574
URL: https://svnweb.freebsd.org/changeset/base/333574
Log:
If the sole non-option command line argument is "none", remove any
pre-existing forwarder configuration and set Unbound up to recurse.
PR: 222902
MFC after:1 week
Modified:
head/usr.sbin/unbound/setup/local-unbound-setup.sh
Modified: head/usr.sbin/unbound/setup/local-unbound-setup.sh
==
--- head/usr.sbin/unbound/setup/local-unbound-setup.sh Sat May 12 17:10:36
2018(r333573)
+++ head/usr.sbin/unbound/setup/local-unbound-setup.sh Sat May 12 18:07:53
2018(r333574)
@@ -253,6 +253,18 @@ gen_unbound_conf() {
}
#
+# Rename a file we are about to replace.
+#
+backup() {
+ local file="$1"
+ if [ -f "${file}" ] ; then
+ local bkfile="${file}.${bkext}"
+ echo "Original ${file} saved as ${bkfile}"
+ mv "${file}" "${bkfile}"
+ fi
+}
+
+#
# Replace one file with another, making a backup copy of the first,
# but only if the new file is different from the old.
#
@@ -263,9 +275,7 @@ replace() {
echo "${file} created"
mv "${newfile}" "${file}"
elif ! cmp -s "${file}" "${newfile}" ; then
- local oldfile="${file}.${bkext}"
- echo "original ${file} saved as ${oldfile}"
- mv "${file}" "${oldfile}"
+ backup "${file}"
mv "${newfile}" "${file}"
else
echo "${file} not modified"
@@ -359,13 +369,20 @@ main() {
# from resolv.conf.
#
forwarders="$@"
- if [ -z "$forwarders" ] ; then
+ case "${forwarders}" in
+ [Nn][Oo][Nn][Ee])
+ forwarders="none"
+ style=recursing
+ ;;
+ "")
echo "Extracting forwarders from ${resolv_conf}."
forwarders=$(get_nameservers <"${resolv_conf}")
style=dynamic
- else
+ ;;
+ *)
style=static
- fi
+ ;;
+ esac
#
# Generate forward.conf.
@@ -377,6 +394,9 @@ main() {
else
echo "unbound will recurse."
fi
+ elif [ "${forwarders}" = "none" ] ; then
+ echo "Forwarding disabled, unbound will recurse."
+ backup "${forward_conf}"
else
local tmp_forward_conf=$(mktemp -u "${forward_conf}.X")
gen_forward_conf ${forwarders} | unexpand >"${tmp_forward_conf}"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333573 - in head: . contrib/unbound/daemon contrib/unbound/doc contrib/unbound/smallapp etc/rc.d tools/build/mk usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr
"Rodney W. Grimes" writes:
> Dag-Erling Smørgrav writes:
> > Modified: head/contrib/unbound/doc/unbound-checkconf.8.in
> > ==
> > --- head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:04:40
> > 2018(r333572)
> > +++ head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 17:10:36
> > 2018(r333573)
> > @@ -8,7 +8,7 @@
> > .\"
> > .\"
> > .SH "NAME"
> > -unbound\-checkconf
> > +.B unbound\-checkconf
> Is that one missing a local-, or did unbound-checkconf not get
> renamed?
This was just a markup error, the man pages are preprocessed at build
time:
> > Modified: head/usr.sbin/unbound/Makefile.inc
> > ==
> > --- head/usr.sbin/unbound/Makefile.inc Sat May 12 17:04:40 2018
> > (r333572)
> > +++ head/usr.sbin/unbound/Makefile.inc Sat May 12 17:10:36 2018
> > (r333573)
> > @@ -4,4 +4,14 @@ NO_WERROR= true
> > NO_WTHREAD_SAFETY= true
> > PACKAGE= unbound
> >
> > +.for man in ${MAN}
> > +${man}: ${UNBOUNDDIR}/doc/${man:S/local-//}
> > + sed -E \
> > + -e 's/\<(fI)?unbound\>/\1local-unbound/g' \
> > + -e 's/\<(fI)?Unbound\>/Local-unbound/g' \
> > + -e 's/\/local-unbound/\/unbound/g' \
> > + <${.ALLSRC} >${.TARGET}
> > +CLEANFILES += ${man}
> > +.endfor
> > +
> > .include "../Makefile.inc"
DES
--
Dag-Erling Smørgrav - d...@des.no
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333575 - in head/sys: dev/hwpmc kern
Author: mmacy
Date: Sat May 12 20:00:29 2018
New Revision: 333575
URL: https://svnweb.freebsd.org/changeset/base/333575
Log:
hwpmc/epoch - don't reference domain if NUMA is not set
It appears that domain information is set correctly independent
of whether or not NUMA is defined. However, there is no memory
backing secondary domains leading to allocation failure.
Reported by: pho@, np@
Approved by: sbruno@
Modified:
head/sys/dev/hwpmc/hwpmc_logging.c
head/sys/dev/hwpmc/hwpmc_mod.c
head/sys/kern/subr_epoch.c
Modified: head/sys/dev/hwpmc/hwpmc_logging.c
==
--- head/sys/dev/hwpmc/hwpmc_logging.c Sat May 12 18:07:53 2018
(r333574)
+++ head/sys/dev/hwpmc/hwpmc_logging.c Sat May 12 20:00:29 2018
(r333575)
@@ -61,6 +61,24 @@ __FBSDID("$FreeBSD$");
#include
#include
+#ifdef NUMA
+#define NDOMAINS vm_ndomains
+
+static int
+getdomain(int cpu)
+{
+ struct pcpu *pc;
+
+ pc = pcpu_find(cpu);
+ return (pc->pc_domain);
+}
+#else
+#define NDOMAINS 1
+#define malloc_domain(size, type, domain, flags) malloc((size), (type),
(flags))
+#define free_domain(addr, type) free(addr, type)
+#define getdomain(cpu) 0
+#endif
+
/*
* Sysctl tunables
*/
@@ -1148,7 +1166,6 @@ void
pmclog_initialize()
{
int domain, cpu;
- struct pcpu *pc;
struct pmclog_buffer *plb;
if (pmclog_buffer_size <= 0 || pmclog_buffer_size > 16*1024) {
@@ -1170,20 +1187,18 @@ pmclog_initialize()
pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU;
pmclog_buffer_size = PMC_LOG_BUFFER_SIZE;
}
- for (domain = 0; domain < vm_ndomains; domain++) {
+ for (domain = 0; domain < NDOMAINS; domain++) {
pmc_dom_hdrs[domain] = malloc_domain(sizeof(struct
pmc_domain_buffer_header), M_PMC, domain,
M_WAITOK|M_ZERO);
mtx_init(&pmc_dom_hdrs[domain]->pdbh_mtx, "pmc_bufferlist_mtx",
"pmc-leaf", MTX_SPIN);
TAILQ_INIT(&pmc_dom_hdrs[domain]->pdbh_head);
}
CPU_FOREACH(cpu) {
- if (CPU_ABSENT(cpu))
- continue;
- pc = pcpu_find(cpu);
- domain = pc->pc_domain;
+ domain = getdomain(cpu);
+ KASSERT(pmc_dom_hdrs[domain] != NULL, ("no mem allocated for
domain: %d", domain));
pmc_dom_hdrs[domain]->pdbh_ncpus++;
}
- for (domain = 0; domain < vm_ndomains; domain++) {
+ for (domain = 0; domain < NDOMAINS; domain++) {
int ncpus = pmc_dom_hdrs[domain]->pdbh_ncpus;
int total = ncpus*pmc_nlogbuffers_pcpu;
@@ -1215,7 +1230,7 @@ pmclog_shutdown()
mtx_destroy(&pmc_kthread_mtx);
- for (domain = 0; domain < vm_ndomains; domain++) {
+ for (domain = 0; domain < NDOMAINS; domain++) {
mtx_destroy(&pmc_dom_hdrs[domain]->pdbh_mtx);
while ((plb = TAILQ_FIRST(&pmc_dom_hdrs[domain]->pdbh_head)) !=
NULL) {
TAILQ_REMOVE(&pmc_dom_hdrs[domain]->pdbh_head, plb,
plb_next);
Modified: head/sys/dev/hwpmc/hwpmc_mod.c
==
--- head/sys/dev/hwpmc/hwpmc_mod.c Sat May 12 18:07:53 2018
(r333574)
+++ head/sys/dev/hwpmc/hwpmc_mod.c Sat May 12 20:00:29 2018
(r333575)
@@ -76,6 +76,14 @@ __FBSDID("$FreeBSD$");
#include "hwpmc_soft.h"
+#ifdef NUMA
+#define NDOMAINS vm_ndomains
+#else
+#define NDOMAINS 1
+#define malloc_domain(size, type, domain, flags) malloc((size), (type),
(flags))
+#define free_domain(addr, type) free(addr, type)
+#endif
+
/*
* Types
*/
Modified: head/sys/kern/subr_epoch.c
==
--- head/sys/kern/subr_epoch.c Sat May 12 18:07:53 2018(r333574)
+++ head/sys/kern/subr_epoch.c Sat May 12 20:00:29 2018(r333575)
@@ -119,7 +119,7 @@ static __read_mostly int inited;
static void epoch_call_task(void *context);
-#if defined(__powerpc64__) || defined(__powerpc__)
+#if defined(__powerpc64__) || defined(__powerpc__) || !defined(NUMA)
static bool usedomains = false;
#else
static bool usedomains = true;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333509 - in head/sys: dev/hwpmc kern sys
Fixed in 333575. On Sat, May 12, 2018 at 00:35 Peter Holm wrote: > On Sat, May 12, 2018 at 01:26:34AM +, Matt Macy wrote: > > Author: mmacy > > Date: Sat May 12 01:26:34 2018 > > New Revision: 333509 > > URL: https://svnweb.freebsd.org/changeset/base/333509 > > > > Log: > > hwpmc(9): Make pmclog buffer pcpu and update constants > > > > On non-trivial SMP systems the contention on the pmc_owner mutex leads > > to a substantial number of samples captured being from the pmc process > > itself. This change a) makes buffers larger to avoid contention on the > > global list b) makes the working sample buffer per cpu. > > > > Run pmcstat in the background (default event rate of 64k): > > pmcstat -S UNHALTED_CORE_CYCLES -O /dev/null sleep 600 & > > > > Before: > > make -j96 buildkernel -s >&/dev/null 3336.68s user 24684.10s system > 7442% cpu 6:16.50 total > > > > After: > > make -j96 buildkernel -s >&/dev/null 2697.82s user 1347.35s system > 6058% cpu 1:06.77 total > > > > For more realistic overhead measurement set the sample rate for ~2khz > > on a 2.1Ghz processor: > > pmcstat -n 105 -S UNHALTED_CORE_CYCLES -O /dev/null sleep 6000 & > > > > Collecting 10 samples of `make -j96 buildkernel` from each: > > > > x before > > + after > > > > real time: > > N Min MaxMedian Avg > Stddev > > x 10 76.4127.6284.84588.577 > 15.100031 > > + 10 59.71 60.7960.13560.179 > 0.29957192 > > Difference at 95.0% confidence > > -28.398 +/- 10.0344 > > -32.0602% +/- 7.69825% > > (Student's t, pooled s = 10.6794) > > > > system time: > > N Min MaxMedian Avg > Stddev > > x 10 2277.96 6948.53 2949.47 3341.492 > 1385.2677 > > + 101038.7 1081.06 1070.555 1064.017 > 15.85404 > > Difference at 95.0% confidence > > -2277.47 +/- 920.425 > > -68.1574% +/- 8.77623% > > (Student's t, pooled s = 979.596) > > > > x no pmc > > + pmc running > > real time: > > > > HEAD: > > N Min MaxMedian Avg > Stddev > > x 10 58.38 59.15 58.8658.847 > 0.22504567 > > + 10 76.4127.6284.84588.577 > 15.100031 > > Difference at 95.0% confidence > > 29.73 +/- 10.0335 > > 50.5208% +/- 17.0525% > > (Student's t, pooled s = 10.6785) > > > > patched: > > N Min MaxMedian Avg > Stddev > > x 10 58.38 59.15 58.8658.847 > 0.22504567 > > + 10 59.71 60.7960.13560.179 > 0.29957192 > > Difference at 95.0% confidence > > 1.332 +/- 0.248939 > > 2.2635% +/- 0.426506% > > (Student's t, pooled s = 0.264942) > > > > system time: > > > > HEAD: > > N Min MaxMedian Avg > Stddev > > x 10 1010.15 1073.31 1025.465 1031.524 > 18.135705 > > + 10 2277.96 6948.53 2949.47 3341.492 > 1385.2677 > > Difference at 95.0% confidence > > 2309.97 +/- 920.443 > > 223.937% +/- 89.3039% > > (Student's t, pooled s = 979.616) > > > > patched: > > N Min MaxMedian Avg > Stddev > > x 10 1010.15 1073.31 1025.465 1031.524 > 18.135705 > > + 101038.7 1081.06 1070.555 1064.017 > 15.85404 > > Difference at 95.0% confidence > > 32.493 +/- 16.0042 > > 3.15% +/- 1.5794% > > (Student's t, pooled s = 17.0331) > > > > Reviewed by:jeff@ > > Approved by:sbruno@ > > Differential Revision: https://reviews.freebsd.org/D15155 > > > > Modified: > > head/sys/dev/hwpmc/hwpmc_amd.c > > head/sys/dev/hwpmc/hwpmc_core.c > > head/sys/dev/hwpmc/hwpmc_e500.c > > head/sys/dev/hwpmc/hwpmc_intel.c > > head/sys/dev/hwpmc/hwpmc_logging.c > > head/sys/dev/hwpmc/hwpmc_mod.c > > head/sys/dev/hwpmc/hwpmc_mpc7xxx.c > > head/sys/dev/hwpmc/hwpmc_piv.c > > head/sys/dev/hwpmc/hwpmc_ppc970.c > > head/sys/dev/hwpmc/hwpmc_ppro.c > > head/sys/dev/hwpmc/hwpmc_soft.c > > head/sys/kern/kern_pmc.c > > head/sys/sys/pmc.h > > head/sys/sys/pmckern.h > > > > Modified: head/sys/dev/hwpmc/hwpmc_amd.c > > > == > > --- head/sys/dev/hwpmc/hwpmc_amd.cFri May 11 22:16:23 2018 > (r333508) > > Got this during boot: > > ada1: Serial Number 15150F3BC143 > ada1: 600.000MB/s transfers (SATA 3.x, UDMA6, PIO 8192bytes) > ada1: Command Queueing enabled > ada1: 976762MB (2000409264 512 byte sectors) > > > Fatal trap 12: page fault while in kernel mode > cpuid = 103; apic id
Re: svn commit: r333509 - in head/sys: dev/hwpmc kern sys
On Sat, May 12, 2018 at 01:26:34AM +, Matt Macy wrote: > Author: mmacy > Date: Sat May 12 01:26:34 2018 > New Revision: 333509 > URL: https://svnweb.freebsd.org/changeset/base/333509 > > Log: > hwpmc(9): Make pmclog buffer pcpu and update constants > > On non-trivial SMP systems the contention on the pmc_owner mutex leads > to a substantial number of samples captured being from the pmc process > itself. This change a) makes buffers larger to avoid contention on the > global list b) makes the working sample buffer per cpu. > > Run pmcstat in the background (default event rate of 64k): > pmcstat -S UNHALTED_CORE_CYCLES -O /dev/null sleep 600 & > > Before: > make -j96 buildkernel -s >&/dev/null 3336.68s user 24684.10s system 7442% > cpu 6:16.50 total > > After: > make -j96 buildkernel -s >&/dev/null 2697.82s user 1347.35s system 6058% > cpu 1:06.77 total > > For more realistic overhead measurement set the sample rate for ~2khz > on a 2.1Ghz processor: > pmcstat -n 105 -S UNHALTED_CORE_CYCLES -O /dev/null sleep 6000 & > > Collecting 10 samples of `make -j96 buildkernel` from each: > > x before > + after > > real time: > N Min MaxMedian AvgStddev > x 10 76.4127.6284.84588.577 15.100031 > + 10 59.71 60.7960.13560.1790.29957192 > Difference at 95.0% confidence > -28.398 +/- 10.0344 > -32.0602% +/- 7.69825% > (Student's t, pooled s = 10.6794) > > system time: > N Min MaxMedian AvgStddev > x 10 2277.96 6948.53 2949.47 3341.492 1385.2677 > + 101038.7 1081.06 1070.555 1064.017 15.85404 > Difference at 95.0% confidence > -2277.47 +/- 920.425 > -68.1574% +/- 8.77623% > (Student's t, pooled s = 979.596) > > x no pmc > + pmc running > real time: > > HEAD: > N Min MaxMedian AvgStddev > x 10 58.38 59.15 58.8658.8470.22504567 > + 10 76.4127.6284.84588.577 15.100031 > Difference at 95.0% confidence > 29.73 +/- 10.0335 > 50.5208% +/- 17.0525% > (Student's t, pooled s = 10.6785) > > patched: > N Min MaxMedian AvgStddev > x 10 58.38 59.15 58.8658.8470.22504567 > + 10 59.71 60.7960.13560.1790.29957192 > Difference at 95.0% confidence > 1.332 +/- 0.248939 > 2.2635% +/- 0.426506% > (Student's t, pooled s = 0.264942) > > system time: > > HEAD: > N Min MaxMedian AvgStddev > x 10 1010.15 1073.31 1025.465 1031.524 18.135705 > + 10 2277.96 6948.53 2949.47 3341.492 1385.2677 > Difference at 95.0% confidence > 2309.97 +/- 920.443 > 223.937% +/- 89.3039% > (Student's t, pooled s = 979.616) > > patched: > N Min MaxMedian AvgStddev > x 10 1010.15 1073.31 1025.465 1031.524 18.135705 > + 101038.7 1081.06 1070.555 1064.017 15.85404 > Difference at 95.0% confidence > 32.493 +/- 16.0042 > 3.15% +/- 1.5794% > (Student's t, pooled s = 17.0331) > > Reviewed by:jeff@ > Approved by:sbruno@ > Differential Revision: https://reviews.freebsd.org/D15155 > > Modified: > head/sys/dev/hwpmc/hwpmc_amd.c > head/sys/dev/hwpmc/hwpmc_core.c > head/sys/dev/hwpmc/hwpmc_e500.c > head/sys/dev/hwpmc/hwpmc_intel.c > head/sys/dev/hwpmc/hwpmc_logging.c > head/sys/dev/hwpmc/hwpmc_mod.c > head/sys/dev/hwpmc/hwpmc_mpc7xxx.c > head/sys/dev/hwpmc/hwpmc_piv.c > head/sys/dev/hwpmc/hwpmc_ppc970.c > head/sys/dev/hwpmc/hwpmc_ppro.c > head/sys/dev/hwpmc/hwpmc_soft.c > head/sys/kern/kern_pmc.c > head/sys/sys/pmc.h > head/sys/sys/pmckern.h > > Modified: head/sys/dev/hwpmc/hwpmc_amd.c > == > --- head/sys/dev/hwpmc/hwpmc_amd.cFri May 11 22:16:23 2018 > (r333508) Got this during boot: ada1: Serial Number 15150F3BC143 ada1: 600.000MB/s transfers (SATA 3.x, UDMA6, PIO 8192bytes) ada1: Command Queueing enabled ada1: 976762MB (2000409264 512 byte sectors) Fatal trap 12: page fault while in kernel mode cpuid = 103; apic id = 7b fault virtual address = 0x38 fault code = supervisor write data, page not present instruction pointer = 0x20:0x826d0a3e stack pointer = 0x28:0x827c62c0 frame poi
svn commit: r333520 - head/etc/rc.d
Author: des
Date: Sat May 12 08:23:17 2018
New Revision: 333520
URL: https://svnweb.freebsd.org/changeset/base/333520
Log:
Remove the ability to generate long since useless SSH1 RSA keys.
Modified:
head/etc/rc.d/sshd
Modified: head/etc/rc.d/sshd
==
--- head/etc/rc.d/sshd Sat May 12 06:23:30 2018(r333519)
+++ head/etc/rc.d/sshd Sat May 12 08:23:17 2018(r333520)
@@ -21,7 +21,6 @@ configtest_cmd="sshd_configtest"
pidfile="/var/run/${name}.pid"
extra_commands="configtest keygen reload"
-: ${sshd_rsa1_enable:="no"}
: ${sshd_rsa_enable:="yes"}
: ${sshd_dsa_enable:="no"}
: ${sshd_ecdsa_enable:="yes"}
@@ -38,9 +37,6 @@ sshd_keygen_alg()
fi
case $alg in
- rsa1)
- keyfile="/etc/ssh/ssh_host_key"
- ;;
rsa|dsa|ecdsa|ed25519)
keyfile="/etc/ssh/ssh_host_${alg}_key"
;;
@@ -65,7 +61,6 @@ sshd_keygen_alg()
sshd_keygen()
{
- sshd_keygen_alg rsa1
sshd_keygen_alg rsa
sshd_keygen_alg dsa
sshd_keygen_alg ecdsa
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333521 - head/lib/libc/sys
Author: kib Date: Sat May 12 10:11:33 2018 New Revision: 333521 URL: https://svnweb.freebsd.org/changeset/base/333521 Log: PROC_PDEATHSIG_CTL will appear first in 11.2. Submitted by: Thomas Munro MFC after:3 days Differential revision:https://reviews.freebsd.org/D15399 Modified: head/lib/libc/sys/procctl.2 Modified: head/lib/libc/sys/procctl.2 == --- head/lib/libc/sys/procctl.2 Sat May 12 08:23:17 2018(r333520) +++ head/lib/libc/sys/procctl.2 Sat May 12 10:11:33 2018(r333521) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 20, 2018 +.Dd May 12, 2018 .Dt PROCCTL 2 .Os .Sh NAME @@ -550,4 +550,4 @@ The .Dv PROC_PDEATHSIG_CTL facility is based on the prctl(PR_SET_PDEATHSIG, ...) feature of Linux, and first appeared in -.Fx 12.0 . +.Fx 11.2 . ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333522 - head/sys/i386/i386
Author: kib Date: Sat May 12 10:48:53 2018 New Revision: 333522 URL: https://svnweb.freebsd.org/changeset/base/333522 Log: Fix use of the custom TSS on i386 after the 4/4 split. Record common_tssd, the descriptor to be written in GDT to point to the common TSS, before LTR is executed. The LTR instruction sets the loaded descriptor type to 386 TSS busy, which traps on reloads. Sponsored by: The FreeBSD Foundation Modified: head/sys/i386/i386/machdep.c Modified: head/sys/i386/i386/machdep.c == --- head/sys/i386/i386/machdep.cSat May 12 10:11:33 2018 (r333521) +++ head/sys/i386/i386/machdep.cSat May 12 10:48:53 2018 (r333522) @@ -2532,12 +2532,12 @@ machdep_init_trampoline(void) gdt[GPROC0_SEL].sd.sd_lobase = (int)tss; gdt[GPROC0_SEL].sd.sd_hibase = (u_int)tss >> 24; gdt[GPROC0_SEL].sd.sd_type = SDT_SYS386TSS; - ltr(GSEL(GPROC0_SEL, SEL_KPL)); PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd); PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd); PCPU_SET(common_tssd, *PCPU_GET(tss_gdt)); PCPU_SET(common_tssp, tss); + ltr(GSEL(GPROC0_SEL, SEL_KPL)); trampoline = pmap_trm_alloc(end_exceptions - start_exceptions, M_NOWAIT); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333523 - head/sys/i386/include
Author: kib Date: Sat May 12 10:51:50 2018 New Revision: 333523 URL: https://svnweb.freebsd.org/changeset/base/333523 Log: Create a macro for PIC code which loads %cr3 from tramp_idleptd. Sponsored by: The FreeBSD Foundation Modified: head/sys/i386/include/asmacros.h Modified: head/sys/i386/include/asmacros.h == --- head/sys/i386/include/asmacros.hSat May 12 10:48:53 2018 (r333522) +++ head/sys/i386/include/asmacros.hSat May 12 10:51:50 2018 (r333523) @@ -198,11 +198,15 @@ movl%edx, %esp .endm - .macro MOVE_STACKS + .macro LOAD_KCR3 call1000f 1000: popl%eax movl(tramp_idleptd - 1000b)(%eax), %eax movl%eax, %cr3 + .endm + + .macro MOVE_STACKS + LOAD_KCR3 NMOVE_STACKS .endm ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333524 - head/sys/i386/i386
Author: kib
Date: Sat May 12 10:57:34 2018
New Revision: 333524
URL: https://svnweb.freebsd.org/changeset/base/333524
Log:
Initialize tramp_idleptd during cold pmap startup, before the
exception code is copied to the trampoline.
The correct value is then copied to trampoline automatically, so
tramp_idleptd_reloced can be eliminated.
This will allow to use the same exception entry code to handle traps
from vm86 bios calls on early boot stage, as after the trampoline is
configured.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/i386/i386/machdep.c
head/sys/i386/i386/pmap.c
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cSat May 12 10:51:50 2018
(r333523)
+++ head/sys/i386/i386/machdep.cSat May 12 10:57:34 2018
(r333524)
@@ -2508,15 +2508,12 @@ init386(int first)
return ((register_t)thread0.td_pcb);
}
-extern u_int tramp_idleptd;
-
static void
machdep_init_trampoline(void)
{
struct region_descriptor r_gdt, r_idt;
struct i386tss *tss;
char *copyout_buf, *trampoline, *tramp_stack_base;
- u_int *tramp_idleptd_reloced;
int x;
gdt = pmap_trm_alloc(sizeof(union descriptor) * NGDT * mp_ncpus,
@@ -2553,14 +2550,6 @@ machdep_init_trampoline(void)
/* Re-initialize new IDT since the handlers were relocated */
setidt_disp = trampoline - start_exceptions;
fixup_idt();
-
- tramp_idleptd_reloced = (u_int *)((uintptr_t)&tramp_idleptd +
- setidt_disp);
-#if defined(PAE) || defined(PAE_TABLES)
- *tramp_idleptd_reloced = (u_int)IdlePDPT;
-#else
- *tramp_idleptd_reloced = (u_int)IdlePTD;
-#endif
r_idt.rd_limit = sizeof(struct gate_descriptor) * NIDT - 1;
r_idt.rd_base = (int)idt;
Modified: head/sys/i386/i386/pmap.c
==
--- head/sys/i386/i386/pmap.c Sat May 12 10:51:50 2018(r333523)
+++ head/sys/i386/i386/pmap.c Sat May 12 10:57:34 2018(r333524)
@@ -366,6 +366,7 @@ pdpt_entry_t *IdlePDPT; /* phys addr of kernel PDPT */
#endif
pt_entry_t *KPTmap;/* address of kernel page tables */
u_long KPTphys;/* phys addr of kernel page tables */
+extern u_long tramp_idleptd;
static u_long
allocpages(u_int cnt, u_long *physfree)
@@ -531,6 +532,7 @@ pmap_cold(void)
#else
cr3 = (u_int)IdlePTD;
#endif
+ tramp_idleptd = cr3;
load_cr3(cr3);
load_cr0(rcr0() | CR0_PG);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333525 - head/sys/i386/i386
Author: kib Date: Sat May 12 11:02:39 2018 New Revision: 333525 URL: https://svnweb.freebsd.org/changeset/base/333525 Log: On return from exception or interrupt, returns to vm86 mode with PCB_VM86CALL pcb flag not set should be treated same as return to userspace. Most important, the address space must be switched. This fixes usermode vm86 operations after the 4/4 split. Sponsored by: The FreeBSD Foundation Modified: head/sys/i386/i386/exception.s Modified: head/sys/i386/i386/exception.s == --- head/sys/i386/i386/exception.s Sat May 12 10:57:34 2018 (r333524) +++ head/sys/i386/i386/exception.s Sat May 12 11:02:39 2018 (r333525) @@ -502,11 +502,15 @@ doreti_exit: je doreti_iret_nmi cmpl$T_TRCTRAP, TF_TRAPNO(%esp) je doreti_iret_nmi - testl $SEL_RPL_MASK, TF_CS(%esp) + movl$TF_SZ, %ecx + testl $PSL_VM,TF_EFLAGS(%esp) + jz 1f /* PCB_VM86CALL is not set */ + addl$VM86_STACK_SPACE, %ecx + jmp 2f +1: testl $SEL_RPL_MASK, TF_CS(%esp) jz doreti_popl_fs - movl%esp, %esi +2: movl%esp, %esi movlPCPU(TRAMPSTK), %edx - movl$TF_SZ, %ecx subl%ecx, %edx movl%edx, %edi rep; movsb ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333526 - head/sys/i386/include
Author: kib Date: Sat May 12 11:06:59 2018 New Revision: 333526 URL: https://svnweb.freebsd.org/changeset/base/333526 Log: Kernel entry from vm86 mode, where PCB_VM86CALL pcb flag is not set, is executed on the right stack already. No copy from the entry stack to the kstack must be performed for vm86 bios call code to function. To access the pcb flags on kernel entry, unconditionally switch to kernel address space if vm86 mode is detected. This fixes very early vm86 bios calls, typically done when boot is performed by boot2 without loader, and kernel falls back to BIOS calls to get SMAP. Reported by: bde Sponsored by: The FreeBSD Foundation Modified: head/sys/i386/include/asmacros.h Modified: head/sys/i386/include/asmacros.h == --- head/sys/i386/include/asmacros.hSat May 12 11:02:39 2018 (r333525) +++ head/sys/i386/include/asmacros.hSat May 12 11:06:59 2018 (r333526) @@ -212,11 +212,17 @@ .macro KENTER testl $PSL_VM, TF_EFLAGS(%esp) - jnz 1f - testb $SEL_RPL_MASK, TF_CS(%esp) - jz 2f -1: MOVE_STACKS -2: + jz 1f + LOAD_KCR3 + movlPCPU(CURPCB), %eax + testl $PCB_VM86CALL, PCB_FLAGS(%eax) + jnz 3f + NMOVE_STACKS + jmp 2f +1: testb $SEL_RPL_MASK, TF_CS(%esp) + jz 3f +2: MOVE_STACKS +3: .endm #endif /* LOCORE */ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333534 - head/tools/test/vm86
Author: kib
Date: Sat May 12 11:53:49 2018
New Revision: 333534
URL: https://svnweb.freebsd.org/changeset/base/333534
Log:
Add a test for vm86(2), simple to use and diagnose.
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Added:
head/tools/test/vm86/
head/tools/test/vm86/Makefile (contents, props changed)
head/tools/test/vm86/vm86_test.c (contents, props changed)
head/tools/test/vm86/vm86_test_asm.s (contents, props changed)
Added: head/tools/test/vm86/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/test/vm86/Makefile Sat May 12 11:53:49 2018
(r333534)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+all: vm86_test
+
+vm86_test: vm86_test_asm.s vm86_test.c
+ $(CC) -Wall -Wextra -g -m32 -O -o vm86_test vm86_test_asm.s vm86_test.c
+
Added: head/tools/test/vm86/vm86_test.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/test/vm86/vm86_test.cSat May 12 11:53:49 2018
(r333534)
@@ -0,0 +1,122 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2018 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+/* $Id: vm86_test.c,v 1.10 2018/05/12 11:35:58 kostik Exp kostik $ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+static u_int gs;
+
+static void
+sig_handler(int signo, siginfo_t *si __unused, void *ucp)
+{
+ ucontext_t *uc;
+ mcontext_t *mc;
+
+ uc = ucp;
+ mc = &uc->uc_mcontext;
+
+ /*
+* Reload pointer to the TLS base, so that malloc inside
+* printf() works.
+*/
+ load_gs(gs);
+
+ printf("sig %d %%eax %#x %%ecx %#x %%eip %#x\n", signo,
+ mc->mc_eax, mc->mc_ecx, mc->mc_eip);
+ exit(0);
+}
+
+extern char vm86_code_start[], vm86_code_end[];
+
+int
+main(void)
+{
+ ucontext_t uc;
+ struct sigaction sa;
+ struct vm86_init_args va;
+ stack_t ssa;
+ char *vm86_code;
+
+ gs = rgs();
+
+ memset(&ssa, 0, sizeof(ssa));
+ ssa.ss_size = PAGE_SIZE * 128;
+ ssa.ss_sp = mmap(NULL, ssa.ss_size, PROT_READ | PROT_WRITE |
+ PROT_EXEC, MAP_ANON, -1, 0);
+ if (ssa.ss_sp == MAP_FAILED)
+ err(1, "mmap sigstack");
+ if (sigaltstack(&ssa, NULL) == -1)
+ err(1, "sigaltstack");
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_sigaction = sig_handler;
+ sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
+ if (sigaction(SIGBUS, &sa, NULL) == -1)
+ err(1, "sigaction SIGBUS");
+ if (sigaction(SIGSEGV, &sa, NULL) == -1)
+ err(1, "sigaction SIGSEGV");
+ if (sigaction(SIGILL, &sa, NULL) == -1)
+ err(1, "sigaction SIGILL");
+
+ vm86_code = mmap((void *)0x1, PAGE_SIZE, PROT_READ | PROT_WRITE |
+ PROT_EXEC, MAP_ANON | MAP_FIXED, -1, 0);
+ if (vm86_code == MAP_FAILED)
+ err(1, "mmap");
+ memcpy(vm86_code, vm86_code_start, vm86_code_end - vm86_code_start);
+
+ memset(&va, 0, sizeof(va));
+ if (i386_vm86(VM86_INIT, &va) == -1)
+ err(1, "VM86_INIT");
+
+ memset(&uc, 0, sizeof(uc));
+ uc.uc_mcontext.mc_ecx = 0x2345;
+ uc.uc_mcontext.mc_eflags = PSL_VM | PSL_USER;
+ uc.uc_mcontex
svn commit: r333551 - in head/contrib/ldns: . compat drill ldns m4 packaging
Author: des Date: Sat May 12 12:00:18 2018 New Revision: 333551 URL: https://svnweb.freebsd.org/changeset/base/333551 Log: Upgrade LDNS to 1.7.0. I've been holding back on this because 1.7.0 requires OpenSSL 1.1.0 or newer for full DANE support. But we can't wait forever, and nothing in base uses DANE anyway, so here we go. Added: head/contrib/ldns/m4/ax_config_feature.m4 - copied unchanged from r313156, vendor/ldns/dist/m4/ax_config_feature.m4 head/contrib/ldns/m4/ax_have_poll.m4 - copied unchanged from r313156, vendor/ldns/dist/m4/ax_have_poll.m4 Modified: head/contrib/ldns/Changelog head/contrib/ldns/Makefile.in head/contrib/ldns/README head/contrib/ldns/README.git head/contrib/ldns/aclocal.m4 head/contrib/ldns/acx_nlnetlabs.m4 head/contrib/ldns/buffer.c head/contrib/ldns/compat/b64_pton.c head/contrib/ldns/compat/malloc.c head/contrib/ldns/compat/snprintf.c head/contrib/ldns/config.guess head/contrib/ldns/config.sub head/contrib/ldns/configure head/contrib/ldns/configure.ac head/contrib/ldns/dane.c head/contrib/ldns/dname.c head/contrib/ldns/dnssec.c head/contrib/ldns/dnssec_sign.c head/contrib/ldns/dnssec_verify.c head/contrib/ldns/dnssec_zone.c head/contrib/ldns/drill/chasetrace.c head/contrib/ldns/drill/config.h head/contrib/ldns/drill/config.h.in head/contrib/ldns/drill/configure head/contrib/ldns/drill/configure.ac head/contrib/ldns/drill/drill.1 head/contrib/ldns/drill/drill.1.in head/contrib/ldns/drill/drill.c head/contrib/ldns/drill/drill.h head/contrib/ldns/drill/error.c head/contrib/ldns/drill/securetrace.c head/contrib/ldns/drill/work.c head/contrib/ldns/duration.c head/contrib/ldns/error.c head/contrib/ldns/freebsd-configure.sh head/contrib/ldns/higher.c head/contrib/ldns/host2str.c head/contrib/ldns/host2wire.c head/contrib/ldns/install-sh head/contrib/ldns/keys.c head/contrib/ldns/ldns/buffer.h head/contrib/ldns/ldns/common.h head/contrib/ldns/ldns/common.h.in head/contrib/ldns/ldns/config.h head/contrib/ldns/ldns/config.h.in head/contrib/ldns/ldns/dane.h head/contrib/ldns/ldns/dname.h head/contrib/ldns/ldns/dnssec.h head/contrib/ldns/ldns/dnssec_sign.h head/contrib/ldns/ldns/dnssec_verify.h head/contrib/ldns/ldns/dnssec_zone.h head/contrib/ldns/ldns/duration.h head/contrib/ldns/ldns/error.h head/contrib/ldns/ldns/higher.h head/contrib/ldns/ldns/host2str.h head/contrib/ldns/ldns/host2wire.h head/contrib/ldns/ldns/keys.h head/contrib/ldns/ldns/net.h head/contrib/ldns/ldns/net.h.in head/contrib/ldns/ldns/packet.h head/contrib/ldns/ldns/radix.h head/contrib/ldns/ldns/rbtree.h head/contrib/ldns/ldns/rdata.h head/contrib/ldns/ldns/resolver.h head/contrib/ldns/ldns/rr.h head/contrib/ldns/ldns/str2host.h head/contrib/ldns/ldns/tsig.h head/contrib/ldns/ldns/update.h head/contrib/ldns/ldns/util.h head/contrib/ldns/ldns/util.h.in head/contrib/ldns/ldns/wire2host.h head/contrib/ldns/ldns/zone.h head/contrib/ldns/libdns.doxygen head/contrib/ldns/ltmain.sh head/contrib/ldns/m4/libtool.m4 head/contrib/ldns/m4/ltoptions.m4 head/contrib/ldns/m4/ltsugar.m4 head/contrib/ldns/m4/ltversion.m4 head/contrib/ldns/m4/lt~obsolete.m4 head/contrib/ldns/net.c head/contrib/ldns/packaging/ldns-config.1 head/contrib/ldns/packaging/ldns-config.in head/contrib/ldns/packet.c head/contrib/ldns/parse.c head/contrib/ldns/radix.c head/contrib/ldns/rbtree.c head/contrib/ldns/rdata.c head/contrib/ldns/resolver.c head/contrib/ldns/rr.c head/contrib/ldns/rr_functions.c head/contrib/ldns/str2host.c head/contrib/ldns/tsig.c head/contrib/ldns/update.c head/contrib/ldns/util.c head/contrib/ldns/wire2host.c head/contrib/ldns/zone.c Directory Properties: head/contrib/ldns/ (props changed) Modified: head/contrib/ldns/Changelog == --- head/contrib/ldns/Changelog Sat May 12 11:56:59 2018(r333550) +++ head/contrib/ldns/Changelog Sat May 12 12:00:18 2018(r333551) @@ -1,3 +1,118 @@ +1.7.0 2016-12-20 + * Fix lookup of relative names in ldns_resolver_search. + * bugfix #548: Double free for answers > 4096 in ldns_resolver_send_pkt + * Follow CNAME's when tracing with drill (TODO dnssec trace) + * Fix #551 change Regent to Copyright holder in BSD license in + some of the headings of the file, to match the opensource.org + BSD license. + * -e option makes ldns-compare-zones exit with status code 2 on difference + * Filter out specified RR types with ldns-read-zone -e and -E options + * bugfix #563: Correct DNSKEY from DSA private key. Thanks Peter Koch. + * bugfix #562: ldns-keygen match DSA key maximum size with library. + And check keysizes with all algorithms. Thanks Peter Koch. + * ldns-verify-zone accepts only one single zonefile as argument. +
Re: svn commit: r333500 - head/sys/kern
> On 11 May 2018, at 19:37, Matt Macy wrote: > > Author: mmacy > Date: Fri May 11 18:37:14 2018 > New Revision: 333500 > URL: https://svnweb.freebsd.org/changeset/base/333500 > > Log: > epoch(9): always set inited in epoch_init I don’t see a man page for epoch in the tree indicating calling it epoch(9) is incorrect. Do you plan to commit one soon? Andrew ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333552 - in head: contrib/unbound contrib/unbound/cachedb contrib/unbound/contrib contrib/unbound/daemon contrib/unbound/dns64 contrib/unbound/doc contrib/unbound/iterator contrib/unbo...
Author: des Date: Sat May 12 12:57:34 2018 New Revision: 333552 URL: https://svnweb.freebsd.org/changeset/base/333552 Log: Upgrade Unbound to 1.6.0. More to follow. Added: head/contrib/unbound/.gitattributes - copied unchanged from r313158, vendor/unbound/dist/.gitattributes head/contrib/unbound/doc/CNAME-basedRedirectionDesignNotes.pdf - copied unchanged from r313158, vendor/unbound/dist/doc/CNAME-basedRedirectionDesignNotes.pdf head/contrib/unbound/services/view.c - copied unchanged from r313158, vendor/unbound/dist/services/view.c head/contrib/unbound/services/view.h - copied unchanged from r313158, vendor/unbound/dist/services/view.h Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/libunbound.pc.in head/contrib/unbound/contrib/unbound_munin_ head/contrib/unbound/daemon/acl_list.c head/contrib/unbound/daemon/acl_list.h head/contrib/unbound/daemon/cachedump.c head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/daemon.h head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/stats.h head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/daemon/worker.h head/contrib/unbound/dns64/dns64.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iter_delegpt.c head/contrib/unbound/iterator/iter_delegpt.h head/contrib/unbound/iterator/iter_fwd.c head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/libworker.h head/contrib/unbound/libunbound/python/doc/conf.py head/contrib/unbound/libunbound/python/doc/examples/example1a.rst head/contrib/unbound/libunbound/python/doc/examples/example1b.rst head/contrib/unbound/libunbound/python/doc/examples/example2.rst head/contrib/unbound/libunbound/python/doc/examples/example3.rst head/contrib/unbound/libunbound/python/doc/examples/example4.rst head/contrib/unbound/libunbound/python/doc/examples/example5.rst head/contrib/unbound/libunbound/python/doc/examples/example6.rst head/contrib/unbound/libunbound/python/doc/examples/example7.rst head/contrib/unbound/libunbound/python/doc/examples/example8.rst head/contrib/unbound/libunbound/python/doc/examples/index.rst head/contrib/unbound/libunbound/python/doc/install.rst head/contrib/unbound/libunbound/python/doc/intro.rst head/contrib/unbound/libunbound/worker.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/sldns/str2wire.c head/contrib/unbound/sldns/wire2str.c head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/smallapp/worker_cb.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgencode.c head/contrib/unbound/util/data/msgparse.c head/contrib/unbound/util/data/msgparse.h head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/msgreply.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/fptr_wlist.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/module.c head/contrib/unbound/util/module.h head/contrib/unbound/validator/autotrust.c head/contrib/unbound/validator/val_neg.c head/contrib/unbound/validator/val_nsec.c head/contrib/unbound/validator/val_nsec3.c head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/val_sigcrypt.c head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/validator.c head/lib/libunbound/Makefile Directory Properties: head/contrib/unbound/ (props changed) Copied: head/contrib/unbound/.gitattributes (from r313158, vendor/unbound/dist/.gitattributes) == --- /dev/null 00:00:00 1970 (empty, b
svn commit: r333553 - head/sys/arm/allwinner
Author: manu Date: Sat May 12 13:12:26 2018 New Revision: 333553 URL: https://svnweb.freebsd.org/changeset/base/333553 Log: aw_mmc: Read interrupt register value before writing to it Reported by: jmcneill Modified: head/sys/arm/allwinner/aw_mmc.c Modified: head/sys/arm/allwinner/aw_mmc.c == --- head/sys/arm/allwinner/aw_mmc.c Sat May 12 12:57:34 2018 (r333552) +++ head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:12:26 2018 (r333553) @@ -450,6 +450,7 @@ aw_mmc_prepare_dma(struct aw_mmc_softc *sc) AW_MMC_DMAC_IDMAC_IDMA_ON | AW_MMC_DMAC_IDMAC_FIX_BURST); /* Enable RX or TX DMA interrupt */ + val = AW_MMC_READ_4(sc, AW_MMC_IDIE); if (cmd->data->flags & MMC_DATA_WRITE) val |= AW_MMC_IDST_TX_INT; else ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333554 - head/sys/arm/allwinner
Author: manu
Date: Sat May 12 13:12:59 2018
New Revision: 333554
URL: https://svnweb.freebsd.org/changeset/base/333554
Log:
aw_mmc: Remove hardware reset
From all the BSP (Board Source Package) source that I've looked at it seems
that it's never done, remove it.
Tested On: A31, A64
Modified:
head/sys/arm/allwinner/aw_mmc.c
Modified: head/sys/arm/allwinner/aw_mmc.c
==
--- head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:12:26 2018
(r333553)
+++ head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:12:59 2018
(r333554)
@@ -246,12 +246,6 @@ aw_mmc_attach(device_t dev)
SYSCTL_ADD_INT(ctx, tree, OID_AUTO, "req_timeout", CTLFLAG_RW,
&sc->aw_timeout, 0, "Request timeout in seconds");
- /* Hardware reset */
- AW_MMC_WRITE_4(sc, AW_MMC_HWRST, 1);
- DELAY(100);
- AW_MMC_WRITE_4(sc, AW_MMC_HWRST, 0);
- DELAY(500);
-
/* Soft Reset controller. */
if (aw_mmc_reset(sc) != 0) {
device_printf(dev, "cannot reset the controller\n");
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333555 - head/sys/arm/allwinner
Author: manu
Date: Sat May 12 13:13:34 2018
New Revision: 333555
URL: https://svnweb.freebsd.org/changeset/base/333555
Log:
aw_mmc: Do not fully init the controller in attach
Only do a reset of the controller at attach and init it at power_up.
We use to enable some interrupts in reset, only enable the interrupts
we are interested in when doing a request.
While here remove the regulators handling in power_on as it is very wrong
and will be dealt with in another commit.
Tested on: A31, A64
Modified:
head/sys/arm/allwinner/aw_mmc.c
head/sys/arm/allwinner/aw_mmc.h
Modified: head/sys/arm/allwinner/aw_mmc.c
==
--- head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:12:59 2018
(r333554)
+++ head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:13:34 2018
(r333555)
@@ -140,6 +140,7 @@ static int aw_mmc_attach(device_t);
static int aw_mmc_detach(device_t);
static int aw_mmc_setup_dma(struct aw_mmc_softc *);
static int aw_mmc_reset(struct aw_mmc_softc *);
+static int aw_mmc_init(struct aw_mmc_softc *);
static void aw_mmc_intr(void *);
static int aw_mmc_update_clock(struct aw_mmc_softc *, uint32_t);
@@ -475,18 +476,37 @@ aw_mmc_reset(struct aw_mmc_softc *sc)
if (timeout == 0)
return (ETIMEDOUT);
+ return (0);
+}
+
+static int
+aw_mmc_init(struct aw_mmc_softc *sc)
+{
+ int ret;
+
+ ret = aw_mmc_reset(sc);
+ if (ret != 0)
+ return (ret);
+
/* Set the timeout. */
AW_MMC_WRITE_4(sc, AW_MMC_TMOR,
AW_MMC_TMOR_DTO_LMT_SHIFT(AW_MMC_TMOR_DTO_LMT_MASK) |
AW_MMC_TMOR_RTO_LMT_SHIFT(AW_MMC_TMOR_RTO_LMT_MASK));
+ /* Unmask interrupts. */
+ AW_MMC_WRITE_4(sc, AW_MMC_IMKR, 0);
+
/* Clear pending interrupts. */
AW_MMC_WRITE_4(sc, AW_MMC_RISR, 0x);
+
+ /* Debug register, undocumented */
+ AW_MMC_WRITE_4(sc, AW_MMC_DBGC, 0xdeb);
+
+ /* Function select register */
+ AW_MMC_WRITE_4(sc, AW_MMC_FUNS, 0xceaa);
+
AW_MMC_WRITE_4(sc, AW_MMC_IDST, 0x);
- /* Unmask interrupts. */
- AW_MMC_WRITE_4(sc, AW_MMC_IMKR,
- AW_MMC_INT_CMD_DONE | AW_MMC_INT_ERR_BIT |
- AW_MMC_INT_DATA_OVER | AW_MMC_INT_AUTO_STOP_DONE);
+
/* Enable interrupts and AHB access. */
AW_MMC_WRITE_4(sc, AW_MMC_GCTL,
AW_MMC_READ_4(sc, AW_MMC_GCTL) | AW_MMC_CTRL_INT_ENB);
@@ -655,7 +675,7 @@ aw_mmc_request(device_t bus, device_t child, struct mm
int blksz;
struct aw_mmc_softc *sc;
struct mmc_command *cmd;
- uint32_t cmdreg;
+ uint32_t cmdreg, imask;
int err;
sc = device_get_softc(bus);
@@ -664,11 +684,19 @@ aw_mmc_request(device_t bus, device_t child, struct mm
AW_MMC_UNLOCK(sc);
return (EBUSY);
}
+
sc->aw_req = req;
cmd = req->cmd;
cmdreg = AW_MMC_CMDR_LOAD;
+ imask = AW_MMC_INT_ERR_BIT;
+ sc->aw_intr_wait = 0;
+ sc->aw_intr = 0;
+ sc->aw_resid = 0;
+ cmd->error = MMC_ERR_NONE;
+
if (cmd->opcode == MMC_GO_IDLE_STATE)
cmdreg |= AW_MMC_CMDR_SEND_INIT_SEQ;
+
if (cmd->flags & MMC_RSP_PRESENT)
cmdreg |= AW_MMC_CMDR_RESP_RCV;
if (cmd->flags & MMC_RSP_136)
@@ -676,30 +704,52 @@ aw_mmc_request(device_t bus, device_t child, struct mm
if (cmd->flags & MMC_RSP_CRC)
cmdreg |= AW_MMC_CMDR_CHK_RESP_CRC;
- sc->aw_intr = 0;
- sc->aw_resid = 0;
- sc->aw_intr_wait = AW_MMC_INT_CMD_DONE;
- cmd->error = MMC_ERR_NONE;
- if (cmd->data != NULL) {
- sc->aw_intr_wait |= AW_MMC_INT_DATA_OVER;
+ if (cmd->data) {
cmdreg |= AW_MMC_CMDR_DATA_TRANS | AW_MMC_CMDR_WAIT_PRE_OVER;
+
if (cmd->data->flags & MMC_DATA_MULTI) {
cmdreg |= AW_MMC_CMDR_STOP_CMD_FLAG;
+ imask |= AW_MMC_INT_AUTO_STOP_DONE;
sc->aw_intr_wait |= AW_MMC_INT_AUTO_STOP_DONE;
+ } else {
+ sc->aw_intr_wait |= AW_MMC_INT_DATA_OVER;
+ imask |= AW_MMC_INT_DATA_OVER;
}
if (cmd->data->flags & MMC_DATA_WRITE)
cmdreg |= AW_MMC_CMDR_DIR_WRITE;
+
blksz = min(cmd->data->len, MMC_SECTOR_SIZE);
AW_MMC_WRITE_4(sc, AW_MMC_BKSR, blksz);
AW_MMC_WRITE_4(sc, AW_MMC_BYCR, cmd->data->len);
+ } else {
+ imask |= AW_MMC_INT_CMD_DONE;
+ }
+ /* Enable the interrupts we are interested in */
+ AW_MMC_WRITE_4(sc, AW_MMC_IMKR, imask);
+ AW_MMC_WRITE_4(sc, AW_MMC_RISR, 0x);
+
+ /* Enable auto stop if needed */
+ AW_MMC_WRITE_4(sc, AW_MMC_A12A,
+ cmdreg & AW_MMC_CMDR_STOP_CMD_FLAG ? 0 : 0x);
+
+ /* Wri
svn commit: r333556 - head/sys/arm/allwinner
Author: manu
Date: Sat May 12 13:14:01 2018
New Revision: 333556
URL: https://svnweb.freebsd.org/changeset/base/333556
Log:
aw_mmc: Rework regulator handling
Don't enable regulator on attach but dealt with them on power_up/power_off
Only set the voltage for the signaling regulator since I don't have boards
that can change the supply voltage.
Enable 1.8v signaling voltage.
Modified:
head/sys/arm/allwinner/aw_mmc.c
Modified: head/sys/arm/allwinner/aw_mmc.c
==
--- head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:13:34 2018
(r333555)
+++ head/sys/arm/allwinner/aw_mmc.c Sat May 12 13:14:01 2018
(r333556)
@@ -115,6 +115,7 @@ struct aw_mmc_softc {
uint32_taw_intr_wait;
void * aw_intrhand;
int32_t aw_vdd;
+ int32_t aw_vccq;
regulator_t aw_reg_vmmc;
regulator_t aw_reg_vqmmc;
unsigned intaw_clock;
@@ -265,13 +266,11 @@ aw_mmc_attach(device_t dev)
&sc->aw_reg_vmmc) == 0) {
if (bootverbose)
device_printf(dev, "vmmc-supply regulator found\n");
- regulator_enable(sc->aw_reg_vmmc);
}
if (regulator_get_by_ofw_property(dev, 0, "vqmmc-supply",
&sc->aw_reg_vqmmc) == 0 && bootverbose) {
if (bootverbose)
device_printf(dev, "vqmmc-supply regulator found\n");
- regulator_enable(sc->aw_reg_vqmmc);
}
sc->aw_host.f_min = 40;
@@ -281,7 +280,7 @@ aw_mmc_attach(device_t dev)
MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 |
MMC_CAP_UHS_DDR50 | MMC_CAP_MMC_DDR52;
- sc->aw_host.caps |= MMC_CAP_SIGNALING_330 /* | MMC_CAP_SIGNALING_180 */;
+ sc->aw_host.caps |= MMC_CAP_SIGNALING_330 | MMC_CAP_SIGNALING_180;
if (bus_width >= 4)
sc->aw_host.caps |= MMC_CAP_4_BIT_DATA;
@@ -800,6 +799,9 @@ aw_mmc_read_ivar(device_t bus, device_t child, int whi
case MMCBR_IVAR_VDD:
*(int *)result = sc->aw_host.ios.vdd;
break;
+ case MMCBR_IVAR_VCCQ:
+ *(int *)result = sc->aw_host.ios.vccq;
+ break;
case MMCBR_IVAR_CAPS:
*(int *)result = sc->aw_host.caps;
break;
@@ -848,6 +850,9 @@ aw_mmc_write_ivar(device_t bus, device_t child, int wh
case MMCBR_IVAR_VDD:
sc->aw_host.ios.vdd = value;
break;
+ case MMCBR_IVAR_VCCQ:
+ sc->aw_host.ios.vccq = value;
+ break;
case MMCBR_IVAR_TIMING:
sc->aw_host.ios.timing = value;
break;
@@ -906,36 +911,30 @@ aw_mmc_update_clock(struct aw_mmc_softc *sc, uint32_t
}
static void
-aw_mmc_set_power(struct aw_mmc_softc *sc, int32_t vdd)
+aw_mmc_set_vccq(struct aw_mmc_softc *sc, int32_t vccq)
{
- int min_uvolt, max_uvolt;
+ int uvolt;
- sc->aw_vdd = vdd;
-
if (sc->aw_reg_vqmmc == NULL)
return;
- switch (1 << vdd) {
- case MMC_OCR_LOW_VOLTAGE:
- min_uvolt = max_uvolt = 180;
+ switch (vccq) {
+ case vccq_180:
+ uvolt = 180;
break;
- case MMC_OCR_320_330:
- min_uvolt = 320;
- max_uvolt = 330;
+ case vccq_330:
+ uvolt = 330;
break;
- case MMC_OCR_330_340:
- min_uvolt = 330;
- max_uvolt = 340;
- break;
+ default:
+ return;
}
- if (sc->aw_reg_vqmmc)
- if (regulator_set_voltage(sc->aw_reg_vqmmc,
- min_uvolt, max_uvolt) != 0)
- device_printf(sc->aw_dev,
- "Cannot set vqmmc to %d<->%d\n",
- min_uvolt,
- max_uvolt);
+ if (regulator_set_voltage(sc->aw_reg_vqmmc,
+ uvolt, uvolt) != 0)
+ device_printf(sc->aw_dev,
+ "Cannot set vqmmc to %d<->%d\n",
+ uvolt,
+ uvolt);
}
static int
@@ -970,14 +969,30 @@ aw_mmc_update_ios(device_t bus, device_t child)
case power_off:
if (bootverbose)
device_printf(sc->aw_dev, "Powering down sd/mmc\n");
+
+ if (sc->aw_reg_vmmc)
+ regulator_disable(sc->aw_reg_vmmc);
+ if (sc->aw_reg_vqmmc)
+ regulator_disable(sc->aw_reg_vqmmc);
+
aw_mmc_reset(sc);
break;
case power_up:
if (bootverbose)
device_printf(sc->aw_dev, "Powering up sd/mmc\n");
+
+ if (sc->aw_reg_vmmc)
+
svn commit: r333558 - in head/contrib/unbound: . cachedb compat contrib daemon dnstap doc iterator libunbound services services/cache smallapp util util/data util/storage validator
Author: des Date: Sat May 12 14:04:48 2018 New Revision: 333558 URL: https://svnweb.freebsd.org/changeset/base/333558 Log: Upgrade Unbound to 1.6.1. More to follow. Added: - copied unchanged from r333529, vendor/unbound/dist/contrib/unbound.service.in - copied unchanged from r333529, vendor/unbound/dist/contrib/unbound.socket.in head/contrib/unbound/systemd.m4 - copied unchanged from r333529, vendor/unbound/dist/systemd.m4 Directory Properties: head/contrib/unbound/contrib/unbound.service.in (props changed) head/contrib/unbound/contrib/unbound.socket.in (props changed) Modified: head/contrib/unbound/aclocal.m4 head/contrib/unbound/compat/arc4_lock.c head/contrib/unbound/compat/ctime_r.c head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/README head/contrib/unbound/daemon/acl_list.h head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/stats.h head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/daemon/worker.h head/contrib/unbound/dnstap/dnstap.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iter_donotq.h head/contrib/unbound/iterator/iter_fwd.c head/contrib/unbound/iterator/iter_fwd.h head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_hints.h head/contrib/unbound/iterator/iter_priv.h head/contrib/unbound/iterator/iter_scrub.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/iterator/iterator.h head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/context.h head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound-event.h head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/dns.h head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/cache/infra.h head/contrib/unbound/services/cache/rrset.c head/contrib/unbound/services/cache/rrset.h head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/listen_dnsport.h head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/services/view.c head/contrib/unbound/services/view.h head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/alloc.c head/contrib/unbound/util/alloc.h head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/dname.c head/contrib/unbound/util/data/dname.h head/contrib/unbound/util/data/msgparse.c head/contrib/unbound/util/data/msgparse.h head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/msgreply.h head/contrib/unbound/util/data/packed_rrset.c head/contrib/unbound/util/data/packed_rrset.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/fptr_wlist.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/locks.c head/contrib/unbound/util/locks.h head/contrib/unbound/util/log.c head/contrib/unbound/util/mini_event.c head/contrib/unbound/util/mini_event.h head/contrib/unbound/util/module.c head/contrib/unbound/util/module.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/rbtree.c head/contrib/unbound/util/rbtree.h head/contrib/unbound/util/storage/dnstree.c head/contrib/unbound/util/storage/dnstree.h head/contrib/unbound/util/storage/lruhash.c head/contrib/unbound/util/storage/lruhash.h head/contrib/unbound/util/storage/slabhash.c head/contrib/unbound/util/storag
svn commit: r333557 - in head: lib/libunbound usr.sbin/unbound
Author: des Date: Sat May 12 14:04:30 2018 New Revision: 333557 URL: https://svnweb.freebsd.org/changeset/base/333557 Log: Upgrade Unbound to 1.6.1. More to follow. Modified: head/lib/libunbound/Makefile head/usr.sbin/unbound/Makefile.inc Modified: head/lib/libunbound/Makefile == --- head/lib/libunbound/MakefileSat May 12 13:14:01 2018 (r333556) +++ head/lib/libunbound/MakefileSat May 12 14:04:30 2018 (r333557) @@ -29,6 +29,7 @@ SRCS= alloc.c as112.c autotrust.c cachedb.c config_fil val_utils.c validator.c view.c winsock_event.c wire2str.c WARNS?=3 +NO_WTHREAD_SAFETY= true LIBADD=ssl crypto pthread Modified: head/usr.sbin/unbound/Makefile.inc == --- head/usr.sbin/unbound/Makefile.inc Sat May 12 13:14:01 2018 (r333556) +++ head/usr.sbin/unbound/Makefile.inc Sat May 12 14:04:30 2018 (r333557) @@ -1,6 +1,7 @@ # $FreeBSD$ -NO_WERROR= true +NO_WERROR= true +NO_WTHREAD_SAFETY= true PACKAGE= unbound .include "../Makefile.inc" ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333559 - in head: contrib/unbound contrib/unbound/contrib contrib/unbound/daemon contrib/unbound/dns64 contrib/unbound/dnscrypt contrib/unbound/doc contrib/unbound/edns-subnet contrib/...
Author: des Date: Sat May 12 14:15:39 2018 New Revision: 333559 URL: https://svnweb.freebsd.org/changeset/base/333559 Log: Upgrade Unbound to 1.6.2. More to follow. Added: head/contrib/unbound/dnscrypt/ - copied from r333532, vendor/unbound/dist/dnscrypt/ head/contrib/unbound/doc/IP-BasedActions.pdf - copied unchanged from r333532, vendor/unbound/dist/doc/IP-BasedActions.pdf head/contrib/unbound/edns-subnet/ - copied from r333532, vendor/unbound/dist/edns-subnet/ head/contrib/unbound/respip/ - copied from r333532, vendor/unbound/dist/respip/ head/contrib/unbound/util/shm_side/ - copied from r333532, vendor/unbound/dist/util/shm_side/ Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/ac_pkg_swig.m4 head/contrib/unbound/acx_python.m4 head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/unbound.service.in head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/daemon.h head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/stats.h head/contrib/unbound/daemon/worker.c head/contrib/unbound/dns64/dns64.c head/contrib/unbound/doc/CNAME-basedRedirectionDesignNotes.pdf head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/respip/respip.c head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/dns.h head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/listen_dnsport.h head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/modstack.c head/contrib/unbound/services/view.c head/contrib/unbound/services/view.h head/contrib/unbound/sldns/rrdef.h head/contrib/unbound/sldns/sbuffer.c head/contrib/unbound/sldns/sbuffer.h head/contrib/unbound/sldns/wire2str.c head/contrib/unbound/sldns/wire2str.h head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgencode.c head/contrib/unbound/util/data/msgreply.c head/contrib/unbound/util/data/msgreply.h head/contrib/unbound/util/data/packed_rrset.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/fptr_wlist.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/module.c head/contrib/unbound/util/module.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/storage/lruhash.c head/contrib/unbound/util/storage/lruhash.h head/contrib/unbound/validator/val_anchor.c head/contrib/unbound/validator/val_anchor.h head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/val_sigcrypt.c head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/validator.c head/lib/libunbound/Makefile head/usr.sbin/unbound/daemon/Makefile Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inSat May 12 14:04:48 2018 (r333558) +++ head/contrib/unbound/Makefile.inSat May 12 14:15:39 2018 (r333559) @@ -23,6 +23,8 @@ CHECKLOCK_SRC=testcode/checklocks.c CHECKLOCK_OBJ=@CHECKLOCK_OBJ@ DNSTAP_SRC=@DNSTAP_SRC@ DNSTAP_OBJ=@DNSTAP_OBJ@ +DNSCRYPT_SRC=@DNSCRYPT_SRC@ +DNSCRYPT_OBJ=@DNSCRYPT_OBJ@ WITH_PYTHONMODULE=@WITH_PYTHONMODULE@ WITH_PYUNBOUND=@WITH_PYUNBOUND@ PY_MAJOR_VERSION=@PY_MAJOR_VERSION@ @@ -95,6 +97,9 @@ PYTHONMOD_HEADER=@PYTHONMOD_HEADER@ PYUNBOUND_SRC= # libunbound_wrap.lo if python libunbound wrapper enabled. PYUNBOUND_OBJ=@PYUNBOUND_OBJ@ +SUBNET_SRC=edns-subnet/edns-subnet.c edns-subnet/subnetmod.c edns-subnet/addrtree.c edns-subnet/subnet-whitelist.c +SUBNE
svn commit: r333560 - in head/contrib/unbound: . doc services
Author: des Date: Sat May 12 14:19:14 2018 New Revision: 333560 URL: https://svnweb.freebsd.org/changeset/base/333560 Log: Upgrade Unbound to 1.6.3. More to follow. Modified: head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/services/outside_network.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/config.h == --- head/contrib/unbound/config.h Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/config.h Sat May 12 14:19:14 2018 (r333560) @@ -595,7 +595,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.6.2" +#define PACKAGE_STRING "unbound 1.6.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -604,7 +604,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.2" +#define PACKAGE_VERSION "1.6.3" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -623,7 +623,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,6,2,0 +#define RSRC_PACKAGE_VERSION 1,6,3,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" Modified: head/contrib/unbound/configure == --- head/contrib/unbound/configure Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/configure Sat May 12 14:19:14 2018 (r333560) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.6.2. +# Generated by GNU Autoconf 2.69 for unbound 1.6.3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='unbound 1.6.2' +PACKAGE_VERSION='1.6.3' +PACKAGE_STRING='unbound 1.6.3' PACKAGE_BUGREPORT='unbound-b...@nlnetlabs.nl' PACKAGE_URL='' @@ -1429,7 +1429,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.6.2 to adapt to many kinds of systems. +\`configure' configures unbound 1.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.6.2:";; + short | recursive ) echo "Configuration of unbound 1.6.3:";; esac cat <<\_ACEOF @@ -1703,7 +1703,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.6.2 +unbound configure 1.6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2412,7 +2412,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.6.2, which was +It was created by unbound $as_me 1.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2764,11 +2764,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=6 -UNBOUND_VERSION_MICRO=2 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=1 +LIBUNBOUND_REVISION=2 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2821,6 +2821,7 @@ LIBUNBOUND_AGE=5 # 1.6.0 had 6:3:4 # 1.6.1 had 7:0:5 # ub_callback_t typedef renamed to ub_callback_type # 1.6.2 had 7:1:5 +# 1.6.3 had 7:2:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -20487,7 +20488,7 @@ _ACEOF -version=1.6.2 +version=1.6.3 date=`date +'%b %e, %Y'` @@ -21006,7 +21007,7 @@ cat >>$CONFIG_S
svn commit: r333561 - in head: contrib/unbound contrib/unbound/cachedb contrib/unbound/contrib contrib/unbound/daemon contrib/unbound/dnscrypt contrib/unbound/doc contrib/unbound/edns-subnet contri...
Author: des Date: Sat May 12 14:36:58 2018 New Revision: 333561 URL: https://svnweb.freebsd.org/changeset/base/333561 Log: Upgrade Unbound to 1.6.4. More to follow. Added: head/contrib/unbound/contrib/fastrpz.patch - copied unchanged from r333537, vendor/unbound/dist/contrib/fastrpz.patch head/contrib/unbound/contrib/redirect-bogus.patch - copied unchanged from r333537, vendor/unbound/dist/contrib/redirect-bogus.patch head/contrib/unbound/ipsecmod/ - copied from r333537, vendor/unbound/dist/ipsecmod/ head/contrib/unbound/services/authzone.c - copied, changed from r333537, vendor/unbound/dist/services/authzone.c head/contrib/unbound/services/authzone.h - copied unchanged from r333537, vendor/unbound/dist/services/authzone.h Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/config.h head/contrib/unbound/config.h.in head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/README head/contrib/unbound/contrib/unbound.service.in head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/stats.h head/contrib/unbound/daemon/worker.c head/contrib/unbound/daemon/worker.h head/contrib/unbound/dnscrypt/cert.h head/contrib/unbound/dnscrypt/dnscrypt.c head/contrib/unbound/dnscrypt/dnscrypt.h head/contrib/unbound/dnscrypt/dnscrypt.m4 head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/edns-subnet/addrtree.c head/contrib/unbound/edns-subnet/subnet-whitelist.c head/contrib/unbound/edns-subnet/subnet-whitelist.h head/contrib/unbound/edns-subnet/subnetmod.c head/contrib/unbound/edns-subnet/subnetmod.h head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/respip/respip.c head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/cache/dns.h head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/cache/infra.h head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/localzone.c head/contrib/unbound/services/localzone.h head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/modstack.c head/contrib/unbound/services/modstack.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/view.c head/contrib/unbound/sldns/keyraw.c head/contrib/unbound/sldns/keyraw.h head/contrib/unbound/sldns/parse.c head/contrib/unbound/sldns/rrdef.c head/contrib/unbound/sldns/rrdef.h head/contrib/unbound/sldns/sbuffer.c head/contrib/unbound/sldns/str2wire.c head/contrib/unbound/sldns/str2wire.h head/contrib/unbound/sldns/wire2str.c head/contrib/unbound/sldns/wire2str.h head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/data/msgencode.c head/contrib/unbound/util/data/msgparse.c head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/fptr_wlist.h head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/log.c head/contrib/unbound/util/module.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/shm_side/shm_main.c head/contrib/unbound/util/shm_side/shm_main.h head/contrib/unbound/util/timehist.c head/contrib/unbound/util/timehist.h head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/val_utils.h head/contrib/unbound/validator/validator.c head/contrib/unbound/validator/validator.h head/lib/libunbound/Makefile Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inSat May 12 14:19:14 2018 (r333560) +++ head/contrib/unbou
Re: svn commit: r333500 - head/sys/kern
On Sat, May 12, 2018 at 5:10 AM, Andrew Turner wrote: > >> On 11 May 2018, at 19:37, Matt Macy wrote: >> >> Author: mmacy >> Date: Fri May 11 18:37:14 2018 >> New Revision: 333500 >> URL: https://svnweb.freebsd.org/changeset/base/333500 >> >> Log: >> epoch(9): always set inited in epoch_init > > I don’t see a man page for epoch in the tree indicating calling it epoch(9) > is incorrect. Do you plan to commit one soon? I think so. See r333466: "Documentation will follow initial use case." Conrad ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333562 - in head/contrib/unbound: . doc validator
Author: des Date: Sat May 12 14:39:41 2018 New Revision: 333562 URL: https://svnweb.freebsd.org/changeset/base/333562 Log: Upgrade Unbound to 1.6.5. More to follow. Modified: head/contrib/unbound/aclocal.m4 head/contrib/unbound/config.guess head/contrib/unbound/config.sub head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/validator/autotrust.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/aclocal.m4 == --- head/contrib/unbound/aclocal.m4 Sat May 12 14:36:58 2018 (r333561) +++ head/contrib/unbound/aclocal.m4 Sat May 12 14:39:41 2018 (r333562) @@ -9044,9 +9044,9 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -9319,6 +9319,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR + +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl -- +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, +[yes],[m4_pushdef([with_without], [--without-]with_arg)], +[m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, +[AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], +[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], +[auto],[PKG_CHECK_MODULES([$1],[$2], +[m4_n([def_action_if_found]) $3], +[m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl --- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl -- +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], +[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES # AM_CONDITIONAL-*- Autoconf -*- Modified: head/contrib/unbound/config.guess == --- head/contrib/unbound/config.guess Sat May 12 14:36:58 2018 (r333561) +++ head/contrib/unbound/config.guess Sat May 12 14:39:41 2018 (r333562) @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or
