From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:05:17 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1F760E89; Sun, 15 Sep 2013 00:05:17 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 07D2E2356; Sun, 15 Sep 2013 00:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F05Grr071585; Sun, 15 Sep 2013 00:05:16 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F05GoO071583; Sun, 15 Sep 2013 00:05:16 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150005.r8F05GoO071583@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:05:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255577 - head/contrib/unbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:05:17 -0000 Author: des Date: Sun Sep 15 00:05:16 2013 New Revision: 255577 URL: http://svnweb.freebsd.org/changeset/base/255577 Log: Two helper scripts for porting Unbound: - freebsd-configure.sh runs ./configure with the correct parameters and regenerates the lex and yacc code. - freebsd-sources.pl untangles the upstream Makefile and generates source lists for our Makefiles. Approved by: re (blanket) Added: head/contrib/unbound/freebsd-configure.sh (contents, props changed) head/contrib/unbound/freebsd-sources.pl (contents, props changed) Added: head/contrib/unbound/freebsd-configure.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/freebsd-configure.sh Sun Sep 15 00:05:16 2013 (r255577) @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +error() { + echo "$@" >&2 + exit 1 +} + +unbound=$(dirname $(realpath $0)) +cd $unbound + +ldnssrc=$(realpath $unbound/../ldns) +[ -f $ldnssrc/ldns/ldns.h ] || error "can't find LDNS sources" +export CFLAGS="-I$ldnssrc" + +ldnsbld=$(realpath $unbound/../../lib/libldns) +[ -f $ldnsbld/Makefile ] || error "can't find LDNS build directory" + +ldnsobj=$(realpath $(make -C$ldnsbld -V.OBJDIR)) +[ -f $ldnsobj/libldns.a ] || error "can't find LDNS object directory" +export LDFLAGS="-L$ldnsobj" + +./configure \ + --with-conf-file=/etc/unbound/unbound.conf \ + --with-run-dir=/var/unbound \ + --with-username=unbound + +# Regenerate the configuration parser +{ +cat <util/configlexer.c + +/usr/bin/yacc -o util/configparser.c util/configparser.y Added: head/contrib/unbound/freebsd-sources.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/freebsd-sources.pl Sun Sep 15 00:05:16 2013 (r255577) @@ -0,0 +1,72 @@ +#!/usr/bin/perl -w +#- +# Copyright (c) 2013 Dag-Erling Smørgrav +# All rights reserved. +# +# 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. +# +# $Id$ +# + +use strict; +use warnings; +use Text::Wrap; + +our @targets = qw(LIBUNBOUND DAEMON UBANCHOR CHECKCONF); + +our %target_names = ( + LIBUNBOUND => "libunbound", + DAEMON => "unbound", + UBANCHOR => "unbound-anchor", + CHECKCONF => "unbound-checkconf", +); + +sub get_sources($) { + my ($target) = @_; + local $/; + + open(MAKE, "-|", "make", "-V${target}_OBJ_LINK") + or die("failed to exec make: $!\n"); + my $objs = ; + close(MAKE); + chomp($objs); + $objs =~ s/\.l?o\b/.c/g; + return (split(/\s+/, $objs)); +} + +MAIN:{ + my %sources; + foreach my $target (@targets) { + $sources{$target} = { + map({ $_ => 1 } + grep({ !exists($sources{LIBUNBOUND}->{$_}) } + get_sources($target))) + }; + print("# $target_names{$target}\n"); + my $SRCS = fill("SRCS=\t", "\t", sort keys %{$sources{$target}}); + $SRCS =~ s/\n/ \\\n/gm; + print("$SRCS\n"); + } +} + +1; + From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:07:52 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9B4971C3; Sun, 15 Sep 2013 00:07:52 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88AF32372; Sun, 15 Sep 2013 00:07:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F07qGX072163; Sun, 15 Sep 2013 00:07:52 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F07q4B072161; Sun, 15 Sep 2013 00:07:52 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150007.r8F07q4B072161@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:07:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255578 - head/contrib/unbound/util X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:07:52 -0000 Author: des Date: Sun Sep 15 00:07:51 2013 New Revision: 255578 URL: http://svnweb.freebsd.org/changeset/base/255578 Log: Move prototypes into header. Approved by: re (blanket) Modified: head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h Modified: head/contrib/unbound/util/config_file.c ============================================================================== --- head/contrib/unbound/util/config_file.c Sun Sep 15 00:05:16 2013 (r255577) +++ head/contrib/unbound/util/config_file.c Sun Sep 15 00:07:51 2013 (r255578) @@ -59,16 +59,6 @@ /** global config during parsing */ struct config_parser_state* cfg_parser = 0; -/** lex in file */ -extern FILE* ub_c_in; -/** lex out file */ -extern FILE* ub_c_out; -/** the yacc lex generated parse function */ -int ub_c_parse(void); -/** the lexer function */ -int ub_c_lex(void); -/** wrap function */ -int ub_c_wrap(void); /** init ports possible for use */ static void init_outgoing_availports(int* array, int num); Modified: head/contrib/unbound/util/config_file.h ============================================================================== --- head/contrib/unbound/util/config_file.h Sun Sep 15 00:05:16 2013 (r255577) +++ head/contrib/unbound/util/config_file.h Sun Sep 15 00:07:51 2013 (r255578) @@ -632,6 +632,16 @@ struct config_parser_state { /** global config parser object used during config parsing */ extern struct config_parser_state* cfg_parser; +/** lex in file */ +extern FILE* ub_c_in; +/** lex out file */ +extern FILE* ub_c_out; +/** the yacc lex generated parse function */ +int ub_c_parse(void); +/** the lexer function */ +int ub_c_lex(void); +/** wrap function */ +int ub_c_wrap(void); /** parsing helpers: print error with file and line numbers */ void ub_c_error(const char* msg); /** parsing helpers: print error with file and line numbers */ From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:36:20 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A57054F8; Sun, 15 Sep 2013 00:36:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 839F6248A; Sun, 15 Sep 2013 00:36:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F0aK27087194; Sun, 15 Sep 2013 00:36:20 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F0aIja087178; Sun, 15 Sep 2013 00:36:18 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150036.r8F0aIja087178@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:36:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255579 - in head/contrib/unbound: daemon libunbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:36:20 -0000 Author: des Date: Sun Sep 15 00:36:18 2013 New Revision: 255579 URL: http://svnweb.freebsd.org/changeset/base/255579 Log: Numerous fixes to make Unbound compile cleanly: - cast through void * to silence alignment warnings (presumably false positives resulting from poor API design) - constify a few function arguments - move prototypes for callbacks into a common header - now that the prototypes are in scope, fix instances of function definitions that don't match the prototype or what the caller actually passes - hide a conditionally unused global variable behind the same #ifdef that controls its use Approved by: re (blanket) Added: head/contrib/unbound/libunbound/worker.h Modified: head/contrib/unbound/daemon/cachedump.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/remote.h head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/daemon/worker.h head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/libworker.h Modified: head/contrib/unbound/daemon/cachedump.c ============================================================================== --- head/contrib/unbound/daemon/cachedump.c Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/cachedump.c Sun Sep 15 00:36:18 2013 (r255579) @@ -299,7 +299,7 @@ copy_msg(struct regional* region, struct sizeof(struct ub_packed_rrset_key*) * rep->rrset_count); if(!*d) return 0; - (*d)->rrsets = (struct ub_packed_rrset_key**)( + (*d)->rrsets = (struct ub_packed_rrset_key**)(void *)( (uint8_t*)(&((*d)->ref[0])) + sizeof(struct rrset_ref) * rep->rrset_count); *k = (struct query_info*)regional_alloc_init(region, Modified: head/contrib/unbound/daemon/remote.c ============================================================================== --- head/contrib/unbound/daemon/remote.c Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/remote.c Sun Sep 15 00:36:18 2013 (r255579) @@ -648,7 +648,7 @@ print_thread_stats(SSL* ssl, int i, stru /** print long number */ static int -print_longnum(SSL* ssl, char* desc, size_t x) +print_longnum(SSL* ssl, const char* desc, size_t x) { if(x > 1024*1024*1024) { /* more than a Gb */ @@ -1380,7 +1380,7 @@ do_flush_name(SSL* ssl, struct worker* w /** printout a delegation point info */ static int -ssl_print_name_dp(SSL* ssl, char* str, uint8_t* nm, uint16_t dclass, +ssl_print_name_dp(SSL* ssl, const char* str, uint8_t* nm, uint16_t dclass, struct delegpt* dp) { char buf[257]; Modified: head/contrib/unbound/daemon/remote.h ============================================================================== --- head/contrib/unbound/daemon/remote.h Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/remote.h Sun Sep 15 00:36:18 2013 (r255579) @@ -157,12 +157,6 @@ void daemon_remote_start_accept(struct d */ void daemon_remote_exec(struct worker* worker); -/** handle remote control accept callbacks */ -int remote_accept_callback(struct comm_point*, void*, int, struct comm_reply*); - -/** handle remote control data callbacks */ -int remote_control_callback(struct comm_point*, void*, int, struct comm_reply*); - #ifdef HAVE_SSL /** * Print fixed line of text over ssl connection in blocking mode @@ -192,7 +186,4 @@ int ssl_printf(SSL* ssl, const char* for int ssl_read_line(SSL* ssl, char* buf, size_t max); #endif /* HAVE_SSL */ -/** routine to printout option values over SSL */ -void remote_get_opt_ssl(char* line, void* arg); - #endif /* DAEMON_REMOTE_H */ Modified: head/contrib/unbound/daemon/unbound.c ============================================================================== --- head/contrib/unbound/daemon/unbound.c Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/unbound.c Sun Sep 15 00:36:18 2013 (r255579) @@ -53,6 +53,7 @@ #include "services/listen_dnsport.h" #include "services/cache/rrset.h" #include "services/cache/infra.h" +#include "util/fptr_wlist.h" #include "util/data/msgreply.h" #include "util/module.h" #include "util/net_help.h" @@ -92,8 +93,10 @@ # include "nss.h" #endif +#ifdef HAVE_SBRK /** global debug value to keep track of heap memory allocation */ void* unbound_start_brk = 0; +#endif #if !defined(HAVE_EVENT_BASE_GET_METHOD) && (defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)) static const char* ev_backend2str(int b) Modified: head/contrib/unbound/daemon/worker.c ============================================================================== --- head/contrib/unbound/daemon/worker.c Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/worker.c Sun Sep 15 00:36:18 2013 (r255579) @@ -70,6 +70,8 @@ #include "iterator/iter_hints.h" #include "validator/autotrust.h" #include "validator/val_anchor.h" +#include "libunbound/context.h" +#include "libunbound/libworker.h" #ifdef HAVE_SYS_TYPES_H # include @@ -819,7 +821,7 @@ worker_handle_request(struct comm_point* verbose(VERB_ALGO, "query with bad edns version."); log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen); error_encode(c->buffer, EDNS_RCODE_BADVERS&0xf, &qinfo, - *(uint16_t*)ldns_buffer_begin(c->buffer), + *(uint16_t*)(void *)ldns_buffer_begin(c->buffer), ldns_buffer_read_u16_at(c->buffer, 2), NULL); attach_edns_record(c->buffer, &edns); return 1; @@ -883,7 +885,7 @@ worker_handle_request(struct comm_point* /* answer from cache - we have acquired a readlock on it */ if(answer_from_cache(worker, &qinfo, (struct reply_info*)e->data, - *(uint16_t*)ldns_buffer_begin(c->buffer), + *(uint16_t*)(void *)ldns_buffer_begin(c->buffer), ldns_buffer_read_u16_at(c->buffer, 2), repinfo, &edns)) { /* prefetch it if the prefetch TTL expired */ @@ -905,7 +907,7 @@ worker_handle_request(struct comm_point* } if(!LDNS_RD_WIRE(ldns_buffer_begin(c->buffer))) { if(answer_norec_from_cache(worker, &qinfo, - *(uint16_t*)ldns_buffer_begin(c->buffer), + *(uint16_t*)(void *)ldns_buffer_begin(c->buffer), ldns_buffer_read_u16_at(c->buffer, 2), repinfo, &edns)) { return 1; @@ -926,8 +928,8 @@ worker_handle_request(struct comm_point* /* grab a work request structure for this new request */ mesh_new_client(worker->env.mesh, &qinfo, - ldns_buffer_read_u16_at(c->buffer, 2), - &edns, repinfo, *(uint16_t*)ldns_buffer_begin(c->buffer)); + ldns_buffer_read_u16_at(c->buffer, 2), &edns, repinfo, + *(uint16_t*)(void *)ldns_buffer_begin(c->buffer)); worker_mem_report(worker, NULL); return 0; } @@ -1303,7 +1305,8 @@ struct outbound_entry* libworker_send_qu uint16_t ATTR_UNUSED(qclass), uint16_t ATTR_UNUSED(flags), int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec), struct sockaddr_storage* ATTR_UNUSED(addr), - socklen_t ATTR_UNUSED(addrlen), struct module_qstate* ATTR_UNUSED(q)) + socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), + size_t ATTR_UNUSED(zonelen), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); return 0; Modified: head/contrib/unbound/daemon/worker.h ============================================================================== --- head/contrib/unbound/daemon/worker.h Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/daemon/worker.h Sun Sep 15 00:36:18 2013 (r255579) @@ -158,77 +158,9 @@ void worker_delete(struct worker* worker void worker_send_cmd(struct worker* worker, enum worker_commands cmd); /** - * Worker signal handler function. User argument is the worker itself. - * @param sig: signal number. - * @param arg: the worker (main worker) that handles signals. - */ -void worker_sighandler(int sig, void* arg); - -/** - * Worker service routine to send serviced queries to authoritative servers. - * @param qname: query name. (host order) - * @param qnamelen: length in bytes of qname, including trailing 0. - * @param qtype: query type. (host order) - * @param qclass: query class. (host order) - * @param flags: host order flags word, with opcode and CD bit. - * @param dnssec: if set, EDNS record will have DO bit set. - * @param want_dnssec: signatures needed. - * @param addr: where to. - * @param addrlen: length of addr. - * @param zone: wireformat dname of the zone. - * @param zonelen: length of zone name. - * @param q: wich query state to reactivate upon return. - * @return: false on failure (memory or socket related). no query was - * sent. - */ -struct outbound_entry* worker_send_query(uint8_t* qname, size_t qnamelen, - uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, - int want_dnssec, struct sockaddr_storage* addr, socklen_t addrlen, - uint8_t* zone, size_t zonelen, struct module_qstate* q); - -/** - * process control messages from the main thread. Frees the control - * command message. - * @param tube: tube control message came on. - * @param msg: message contents. Is freed. - * @param len: length of message. - * @param error: if error (NETEVENT_*) happened. - * @param arg: user argument - */ -void worker_handle_control_cmd(struct tube* tube, uint8_t* msg, size_t len, - int error, void* arg); - -/** handles callbacks from listening event interface */ -int worker_handle_request(struct comm_point* c, void* arg, int error, - struct comm_reply* repinfo); - -/** process incoming replies from the network */ -int worker_handle_reply(struct comm_point* c, void* arg, int error, - struct comm_reply* reply_info); - -/** process incoming serviced query replies from the network */ -int worker_handle_service_reply(struct comm_point* c, void* arg, int error, - struct comm_reply* reply_info); - -/** cleanup the cache to remove all rrset IDs from it, arg is worker */ -void worker_alloc_cleanup(void* arg); - -/** * Init worker stats - includes server_stats_init, outside network and mesh. * @param worker: the worker to init */ void worker_stats_clear(struct worker* worker); -/** statistics timer callback handler */ -void worker_stat_timer_cb(void* arg); - -/** probe timer callback handler */ -void worker_probe_timer_cb(void* arg); - -/** start accept callback handler */ -void worker_start_accept(void* arg); - -/** stop accept callback handler */ -void worker_stop_accept(void* arg); - #endif /* DAEMON_WORKER_H */ Modified: head/contrib/unbound/libunbound/libworker.c ============================================================================== --- head/contrib/unbound/libunbound/libworker.c Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/libunbound/libworker.c Sun Sep 15 00:36:18 2013 (r255579) @@ -50,11 +50,13 @@ #include "libunbound/libworker.h" #include "libunbound/context.h" #include "libunbound/unbound.h" +#include "libunbound/worker.h" #include "services/outside_network.h" #include "services/mesh.h" #include "services/localzone.h" #include "services/cache/rrset.h" #include "services/outbound_list.h" +#include "util/fptr_wlist.h" #include "util/module.h" #include "util/regional.h" #include "util/random.h" @@ -862,7 +864,8 @@ struct outbound_entry* worker_send_query uint16_t ATTR_UNUSED(qclass), uint16_t ATTR_UNUSED(flags), int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec), struct sockaddr_storage* ATTR_UNUSED(addr), - socklen_t ATTR_UNUSED(addrlen), struct module_qstate* ATTR_UNUSED(q)) + socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), + size_t ATTR_UNUSED(zonelen), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); return 0; Modified: head/contrib/unbound/libunbound/libworker.h ============================================================================== --- head/contrib/unbound/libunbound/libworker.h Sun Sep 15 00:07:51 2013 (r255578) +++ head/contrib/unbound/libunbound/libworker.h Sun Sep 15 00:36:18 2013 (r255579) @@ -41,8 +41,8 @@ * and if in the background continues until exit, if in the foreground * returns from the procedure when done. */ -#ifndef LIBUNBOUND_WORKER_H -#define LIBUNBOUND_WORKER_H +#ifndef LIBUNBOUND_LIBWORKER_H +#define LIBUNBOUND_LIBWORKER_H #include "util/data/packed_rrset.h" struct ub_ctx; struct ub_result; @@ -167,4 +167,4 @@ void libworker_bg_done_cb(void* arg, int void libworker_enter_result(struct ub_result* res, ldns_buffer* buf, struct regional* temp, enum sec_status msg_security); -#endif /* LIBUNBOUND_WORKER_H */ +#endif /* LIBUNBOUND_LIBWORKER_H */ Added: head/contrib/unbound/libunbound/worker.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/libunbound/worker.h Sun Sep 15 00:36:18 2013 (r255579) @@ -0,0 +1,122 @@ +/* + * libunbound/worker.h - prototypes for worker methods. + * + * Copyright (c) 2007, NLnet Labs. All rights reserved. + * + * This software is open source. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 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. + * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 REGENTS 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. + */ + +/** + * \file + * + * This file declares the methods any worker has to implement. + */ + +#ifndef LIBUNBOUND_WORKER_H +#define LIBUNBOUND_WORKER_H + +/** + * Worker signal handler function. User argument is the worker itself. + * @param sig: signal number. + * @param arg: the worker (main worker) that handles signals. + */ +void worker_sighandler(int sig, void* arg); + +/** + * Worker service routine to send serviced queries to authoritative servers. + * @param qname: query name. (host order) + * @param qnamelen: length in bytes of qname, including trailing 0. + * @param qtype: query type. (host order) + * @param qclass: query class. (host order) + * @param flags: host order flags word, with opcode and CD bit. + * @param dnssec: if set, EDNS record will have DO bit set. + * @param want_dnssec: signatures needed. + * @param addr: where to. + * @param addrlen: length of addr. + * @param zone: wireformat dname of the zone. + * @param zonelen: length of zone name. + * @param q: wich query state to reactivate upon return. + * @return: false on failure (memory or socket related). no query was + * sent. + */ +struct outbound_entry* worker_send_query(uint8_t* qname, size_t qnamelen, + uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, + int want_dnssec, struct sockaddr_storage* addr, socklen_t addrlen, + uint8_t* zone, size_t zonelen, struct module_qstate* q); + +/** + * process control messages from the main thread. Frees the control + * command message. + * @param tube: tube control message came on. + * @param msg: message contents. Is freed. + * @param len: length of message. + * @param error: if error (NETEVENT_*) happened. + * @param arg: user argument + */ +void worker_handle_control_cmd(struct tube* tube, uint8_t* msg, size_t len, + int error, void* arg); + +/** handles callbacks from listening event interface */ +int worker_handle_request(struct comm_point* c, void* arg, int error, + struct comm_reply* repinfo); + +/** process incoming replies from the network */ +int worker_handle_reply(struct comm_point* c, void* arg, int error, + struct comm_reply* reply_info); + +/** process incoming serviced query replies from the network */ +int worker_handle_service_reply(struct comm_point* c, void* arg, int error, + struct comm_reply* reply_info); + +/** cleanup the cache to remove all rrset IDs from it, arg is worker */ +void worker_alloc_cleanup(void* arg); + +/** statistics timer callback handler */ +void worker_stat_timer_cb(void* arg); + +/** probe timer callback handler */ +void worker_probe_timer_cb(void* arg); + +/** start accept callback handler */ +void worker_start_accept(void* arg); + +/** stop accept callback handler */ +void worker_stop_accept(void* arg); + +/** handle remote control accept callbacks */ +int remote_accept_callback(struct comm_point*, void*, int, struct comm_reply*); + +/** handle remote control data callbacks */ +int remote_control_callback(struct comm_point*, void*, int, struct comm_reply*); + +/** routine to printout option values over SSL */ +void remote_get_opt_ssl(char* line, void* arg); + +#endif /* LIBUNBOUND_WORKER_H */ From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:37:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2F31263C; Sun, 15 Sep 2013 00:37:31 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BB652493; Sun, 15 Sep 2013 00:37:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F0bUD5087571; Sun, 15 Sep 2013 00:37:30 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F0bUpk087570; Sun, 15 Sep 2013 00:37:30 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150037.r8F0bUpk087570@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:37:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255580 - head/contrib/unbound/util X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:37:31 -0000 Author: des Date: Sun Sep 15 00:37:30 2013 New Revision: 255580 URL: http://svnweb.freebsd.org/changeset/base/255580 Log: Forgotten in r255579: #include fixes. Approved by: re (blanket) Modified: head/contrib/unbound/util/fptr_wlist.c Modified: head/contrib/unbound/util/fptr_wlist.c ============================================================================== --- head/contrib/unbound/util/fptr_wlist.c Sun Sep 15 00:36:18 2013 (r255579) +++ head/contrib/unbound/util/fptr_wlist.c Sun Sep 15 00:37:30 2013 (r255580) @@ -46,8 +46,6 @@ #include "config.h" #include "util/fptr_wlist.h" #include "util/mini_event.h" -#include "daemon/worker.h" -#include "daemon/remote.h" #include "services/outside_network.h" #include "services/mesh.h" #include "services/localzone.h" @@ -69,6 +67,7 @@ #include "util/locks.h" #include "libunbound/libworker.h" #include "libunbound/context.h" +#include "libunbound/worker.h" #include "util/tube.h" #include "util/config_file.h" #ifdef UB_ON_WINDOWS From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:40:22 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9F9A1798; Sun, 15 Sep 2013 00:40:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7DE2424AF; Sun, 15 Sep 2013 00:40:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F0eMm5089192; Sun, 15 Sep 2013 00:40:22 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F0eMq7089188; Sun, 15 Sep 2013 00:40:22 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150040.r8F0eMq7089188@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:40:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255581 - in head/contrib/unbound: . doc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:40:22 -0000 Author: des Date: Sun Sep 15 00:40:21 2013 New Revision: 255581 URL: http://svnweb.freebsd.org/changeset/base/255581 Log: Generated configuration and documentation Approved by: re (blanket) Added: head/contrib/unbound/config.h head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.conf.5 Added: head/contrib/unbound/config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/config.h Sun Sep 15 00:40:21 2013 (r255581) @@ -0,0 +1,911 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Directory to chroot to */ +#define CHROOT_DIR "/var/unbound" + +/* Pathname to the Unbound configuration file */ +#define CONFIGFILE "/etc/unbound/unbound.conf" + +/* configure flags */ +#define CONFIGURE_BUILD_WITH " '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'" + +/* configure date */ +#define CONFIGURE_DATE "Sun Sep 15 02:01:38 CEST 2013" + +/* configure target system */ +#define CONFIGURE_TARGET "x86_64-unknown-freebsd10.0" + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +/* #undef DARWIN_BROKEN_SETREUID */ + +/* Whether daemon is deprecated */ +/* #undef DEPRECATED_DAEMON */ + +/* Define if you want to use debug lock checking (slow). */ +/* #undef ENABLE_LOCK_CHECKS */ + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +/* #undef EXPORT_ALL_SYMBOLS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Whether the C compiler accepts the "format" attribute */ +#define HAVE_ATTR_FORMAT 1 + +/* Whether the C compiler accepts the "unused" attribute */ +#define HAVE_ATTR_UNUSED 1 + +/* Define to 1 if your system has a working `chown' function. */ +#define HAVE_CHOWN 1 + +/* Define to 1 if you have the `chroot' function. */ +#define HAVE_CHROOT 1 + +/* Define to 1 if you have the `ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* Define to 1 if you have the `daemon' function. */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#define HAVE_DECL_NID_SECP384R1 1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#define HAVE_DECL_NID_X9_62_PRIME256V1 1 + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#define HAVE_DECL_SK_SSL_COMP_POP_FREE 1 + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#define HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `event_base_free' function. */ +/* #undef HAVE_EVENT_BASE_FREE */ + +/* Define to 1 if you have the `event_base_get_method' function. */ +/* #undef HAVE_EVENT_BASE_GET_METHOD */ + +/* Define to 1 if you have the `event_base_new' function. */ +/* #undef HAVE_EVENT_BASE_NEW */ + +/* Define to 1 if you have the `event_base_once' function. */ +/* #undef HAVE_EVENT_BASE_ONCE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EVENT_H */ + +/* Define to 1 if you have the `EVP_sha1' function. */ +#define HAVE_EVP_SHA1 1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define to 1 if you have the `ev_default_loop' function. */ +/* #undef HAVE_EV_DEFAULT_LOOP */ + +/* Define to 1 if you have the `ev_loop' function. */ +/* #undef HAVE_EV_LOOP */ + +/* Define to 1 if you have the header file. */ +#define HAVE_EXPAT_H 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the `FIPS_mode' function. */ +#define HAVE_FIPS_MODE 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Whether getaddrinfo is available */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getpwnam' function. */ +#define HAVE_GETPWNAM 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GRP_H 1 + +/* If you have HMAC_CTX_init */ +#define HAVE_HMAC_CTX_INIT 1 + +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +#define HAVE_INET_PTON 1 + +/* Define to 1 if you have the `initgroups' function. */ +#define HAVE_INITGROUPS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* if the function 'ioctlsocket' is available */ +/* #undef HAVE_IOCTLSOCKET */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IPHLPAPI_H */ + +/* Define to 1 if you have the `kill' function. */ +#define HAVE_KILL 1 + +/* Define to 1 if you have the `ldns_key_EVP_unload_gost' function. */ +/* #undef HAVE_LDNS_KEY_EVP_UNLOAD_GOST */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LDNS_LDNS_H 1 + +/* Define to 1 if you have the `ldns' library (-lldns). */ +#define HAVE_LIBLDNS 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOGIN_CAP_H 1 + +/* If have GNU libc compatible malloc */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Use libnss for crypto */ +/* #undef HAVE_NSS */ + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#define HAVE_OPENSSL_CONFIG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_CONF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ENGINE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_SSL_H 1 + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#define HAVE_PTHREAD_RWLOCK_T 1 + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#define HAVE_PTHREAD_SPINLOCK_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define if you have Python libraries and header files. */ +/* #undef HAVE_PYTHON */ + +/* Define to 1 if you have the `random' function. */ +#define HAVE_RANDOM 1 + +/* Define to 1 if you have the `recvmsg' function. */ +#define HAVE_RECVMSG 1 + +/* Define to 1 if you have the `sbrk' function. */ +/* #undef HAVE_SBRK */ + +/* Define to 1 if you have the `sendmsg' function. */ +#define HAVE_SENDMSG 1 + +/* Define to 1 if you have the `setregid' function. */ +/* #undef HAVE_SETREGID */ + +/* Define to 1 if you have the `setresgid' function. */ +#define HAVE_SETRESGID 1 + +/* Define to 1 if you have the `setresuid' function. */ +#define HAVE_SETRESUID 1 + +/* Define to 1 if you have the `setreuid' function. */ +/* #undef HAVE_SETREUID */ + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `setusercontext' function. */ +#define HAVE_SETUSERCONTEXT 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the `sleep' function. */ +#define HAVE_SLEEP 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `socketpair' function. */ +#define HAVE_SOCKETPAIR 1 + +/* Using Solaris threads */ +/* #undef HAVE_SOLARIS_THREADS */ + +/* Define to 1 if you have the `srandom' function. */ +#define HAVE_SRANDOM 1 + +/* Define if you have the SSL libraries installed. */ +#define HAVE_SSL /**/ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strptime' function. */ +#define HAVE_STRPTIME 1 + +/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */ + +/* Define if you have Swig libraries and header files. */ +/* #undef HAVE_SWIG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tzset' function. */ +#define HAVE_TZSET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `usleep' function. */ +#define HAVE_USLEEP 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINDOWS_H */ + +/* Using Windows threads */ +/* #undef HAVE_WINDOWS_THREADS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINSOCK2_H */ + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* Define to 1 if you have the `writev' function. */ +#define HAVE_WRITEV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Define to 1 if you have the `_beginthreadex' function. */ +/* #undef HAVE__BEGINTHREADEX */ + +/* if lex has yylex_destroy */ +#define LEX_HAS_YYLEX_DESTROY 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to the maximum message length to pass to syslog. */ +#define MAXSYSLOGMSGLEN 10240 + +/* Define if memcmp() does not compare unsigned bytes */ +/* #undef MEMCMP_IS_BROKEN */ + +/* Define if mkdir has one argument. */ +/* #undef MKDIR_HAS_ONE_ARG */ + +/* Define if the network stack does not fully support nonblocking io (causes + lower performance). */ +/* #undef NONBLOCKING_IS_BROKEN */ + +/* Put -D_ALL_SOURCE define in config.h */ +/* #undef OMITTED__D_ALL_SOURCE */ + +/* Put -D_BSD_SOURCE define in config.h */ +/* #undef OMITTED__D_BSD_SOURCE */ + +/* Put -D_GNU_SOURCE define in config.h */ +/* #undef OMITTED__D_GNU_SOURCE */ + +/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ +/* #undef OMITTED__D_LARGEFILE_SOURCE_1 */ + +/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ +/* #undef OMITTED__D_POSIX_C_SOURCE_200112 */ + +/* Put -D_XOPEN_SOURCE=600 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_600 */ + +/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 */ + +/* Put -D__EXTENSIONS__ define in config.h */ +/* #undef OMITTED__D__EXTENSIONS__ */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "unbound-bugs@nlnetlabs.nl" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "unbound" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "unbound 1.4.20" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "unbound" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.4.20" + +/* default pidfile location */ +#define PIDFILE "/var/unbound/unbound.pid" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* default rootkey location */ +#define ROOT_ANCHOR_FILE "/var/unbound/root.key" + +/* default rootcert location */ +#define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" + +/* version number for resource files */ +#define RSRC_PACKAGE_VERSION 1,4,2,0 + +/* Directory to chdir to */ +#define RUN_DIR "/var/unbound" + +/* Shared data */ +#define SHARE_DIR "/var/unbound" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* use default strptime. */ +#define STRPTIME_WORKS 1 + +/* Use win32 resources and API */ +/* #undef UB_ON_WINDOWS */ + +/* default username */ +#define UB_USERNAME "unbound" + +/* use to enable lightweight alloc assertions, for debug use */ +/* #undef UNBOUND_ALLOC_LITE */ + +/* use malloc not regions, for debug use */ +/* #undef UNBOUND_ALLOC_NONREGIONAL */ + +/* use statistics for allocs and frees, for debug use */ +/* #undef UNBOUND_ALLOC_STATS */ + +/* define this to enable debug checks. */ +/* #undef UNBOUND_DEBUG */ + +/* Define this to enable ECDSA support. */ +#define USE_ECDSA 1 + +/* Define this to enable an EVP workaround for older openssl */ +/* #undef USE_ECDSA_EVP_WORKAROUND */ + +/* Define this to enable GOST support. */ +/* #undef USE_GOST */ + +/* Define if you want to use internal select based events */ +#define USE_MINI_EVENT 1 + +/* Define this to enable SHA256 and SHA512 support. */ +#define USE_SHA2 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Whether the windows socket API is used */ +/* #undef USE_WINSOCK */ + +/* the version of the windows API enabled */ +#define WINVER 0x0502 + +/* Define if you want Python module. */ +/* #undef WITH_PYTHONMODULE */ + +/* Define if you want PyUnbound. */ +/* #undef WITH_PYUNBOUND */ + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* #undef _LARGEFILE_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `int' if doesn't define. */ +/* #undef gid_t */ + +/* in_addr_t */ +/* #undef in_addr_t */ + +/* in_port_t */ +/* #undef in_port_t */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `short' if does not define. */ +/* #undef int16_t */ + +/* Define to `int' if does not define. */ +/* #undef int32_t */ + +/* Define to `long long' if does not define. */ +/* #undef int64_t */ + +/* Define to `signed char' if does not define. */ +/* #undef int8_t */ + +/* Define if replacement function should be used. */ +/* #undef malloc */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to 'int' if not defined */ +/* #undef rlim_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to 'int' if not defined */ +/* #undef socklen_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to 'unsigned char if not defined */ +/* #undef u_char */ + +/* Define to `int' if doesn't define. */ +/* #undef uid_t */ + +/* Define to `unsigned short' if does not define. */ +/* #undef uint16_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef uint32_t */ + +/* Define to `unsigned long long' if does not define. */ +/* #undef uint64_t */ + +/* Define to `unsigned char' if does not define. */ +/* #undef uint8_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ + +#if defined(OMITTED__D_GNU_SOURCE) && !defined(_GNU_SOURCE) +#define _GNU_SOURCE 1 +#endif + +#if defined(OMITTED__D_BSD_SOURCE) && !defined(_BSD_SOURCE) +#define _BSD_SOURCE 1 +#endif + +#if defined(OMITTED__D__EXTENSIONS__) && !defined(__EXTENSIONS__) +#define __EXTENSIONS__ 1 +#endif + +#if defined(OMITTED__D_POSIX_C_SOURCE_200112) && !defined(_POSIX_C_SOURCE) +#define _POSIX_C_SOURCE 200112 +#endif + +#if defined(OMITTED__D_XOPEN_SOURCE_600) && !defined(_XOPEN_SOURCE) +#define _XOPEN_SOURCE 600 +#endif + +#if defined(OMITTED__D_XOPEN_SOURCE_EXTENDED_1) && !defined(_XOPEN_SOURCE_EXTENDED) +#define _XOPEN_SOURCE_EXTENDED 1 +#endif + +#if defined(OMITTED__D_ALL_SOURCE) && !defined(_ALL_SOURCE) +#define _ALL_SOURCE 1 +#endif + +#if defined(OMITTED__D_LARGEFILE_SOURCE_1) && !defined(_LARGEFILE_SOURCE) +#define _LARGEFILE_SOURCE 1 +#endif + + + + +#ifndef UNBOUND_DEBUG +# define NDEBUG +#endif + +#include +#include +#include +#include + +#if STDC_HEADERS +#include +#include +#endif + +#ifdef HAVE_STDINT_H +#include +#endif + +#include + +#if HAVE_SYS_PARAM_H +#include +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + +#ifdef HAVE_SYS_UIO_H +#include +#endif + +#ifdef HAVE_NETINET_IN_H +#include +#endif + +#ifdef HAVE_ARPA_INET_H +#include +#endif + +#ifdef HAVE_WINSOCK2_H +#include +#endif + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + + + +#ifdef HAVE_ATTR_FORMAT +# define ATTR_FORMAT(archetype, string_index, first_to_check) \ + __attribute__ ((format (archetype, string_index, first_to_check))) +#else /* !HAVE_ATTR_FORMAT */ +# define ATTR_FORMAT(archetype, string_index, first_to_check) /* empty */ +#endif /* !HAVE_ATTR_FORMAT */ + + +#if defined(DOXYGEN) +# define ATTR_UNUSED(x) x +#elif defined(__cplusplus) +# define ATTR_UNUSED(x) +#elif defined(HAVE_ATTR_UNUSED) +# define ATTR_UNUSED(x) x __attribute__((unused)) +#else /* !HAVE_ATTR_UNUSED */ +# define ATTR_UNUSED(x) x +#endif /* !HAVE_ATTR_UNUSED */ + + +#ifndef HAVE_FSEEKO +#define fseeko fseek +#define ftello ftell +#endif /* HAVE_FSEEKO */ + + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 256 +#endif + + +#ifndef HAVE_SNPRINTF +#define snprintf snprintf_unbound +#define vsnprintf vsnprintf_unbound +#include +int snprintf (char *str, size_t count, const char *fmt, ...); +int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); +#endif /* HAVE_SNPRINTF */ + + +#ifndef HAVE_INET_PTON +#define inet_pton inet_pton_unbound +int inet_pton(int af, const char* src, void* dst); +#endif /* HAVE_INET_PTON */ + + +#ifndef HAVE_INET_NTOP +#define inet_ntop inet_ntop_unbound +const char *inet_ntop(int af, const void *src, char *dst, size_t size); +#endif + + +#ifndef HAVE_INET_ATON +#define inet_aton inet_aton_unbound +int inet_aton(const char *cp, struct in_addr *addr); +#endif + + +#ifndef HAVE_MEMMOVE +#define memmove memmove_unbound +void *memmove(void *dest, const void *src, size_t n); +#endif + + +#ifndef HAVE_STRLCPY +#define strlcpy strlcpy_unbound +size_t strlcpy(char *dst, const char *src, size_t siz); +#endif + + +#ifndef HAVE_GMTIME_R +#define gmtime_r gmtime_r_unbound +struct tm *gmtime_r(const time_t *timep, struct tm *result); +#endif + + +#ifndef HAVE_SLEEP +#define sleep(x) Sleep((x)*1000) /* on win32 */ +#endif /* HAVE_SLEEP */ + + +#ifndef HAVE_USLEEP +#define usleep(x) Sleep((x)/1000 + 1) /* on win32 */ +#endif /* HAVE_USLEEP */ + + +#ifndef HAVE_RANDOM +#define random rand /* on win32, for tests only (bad random) */ +#endif /* HAVE_RANDOM */ + + +#ifndef HAVE_SRANDOM +#define srandom(x) srand(x) /* on win32, for tests only (bad random) */ +#endif /* HAVE_SRANDOM */ + + +/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */ +#ifdef HAVE_WINSOCK2_H +#define FD_SET_T (u_int) +#else +#define FD_SET_T +#endif + + +#ifndef IPV6_MIN_MTU +#define IPV6_MIN_MTU 1280 +#endif /* IPV6_MIN_MTU */ + + +#ifdef MEMCMP_IS_BROKEN +#include "compat/memcmp.h" +#define memcmp memcmp_unbound +int memcmp(const void *x, const void *y, size_t n); +#endif + + + +#ifndef HAVE_CTIME_R +#define ctime_r unbound_ctime_r +char *ctime_r(const time_t *timep, char *buf); +#endif + +#if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS) +#define strptime unbound_strptime +struct tm; +char *strptime(const char *s, const char *format, struct tm *tm); +#endif + +#if defined(HAVE_EVENT_H) && !defined(HAVE_EVENT_BASE_ONCE) && !(defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)) && (defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS)) + /* using version of libevent that is not threadsafe. */ +# define LIBEVENT_SIGNAL_PROBLEM 1 +#endif + +#ifndef CHECKED_INET6 +# define CHECKED_INET6 +# ifdef AF_INET6 +# define INET6 +# else +# define AF_INET6 28 +# endif +#endif /* CHECKED_INET6 */ + +/* maximum nesting of included files */ +#define MAXINCLUDES 10 +#ifndef HAVE_GETADDRINFO +struct sockaddr_storage; +#include "compat/fake-rfc2553.h" +#endif + +#ifdef UNBOUND_ALLOC_STATS +# define malloc(s) unbound_stat_malloc_log(s, __FILE__, __LINE__, __func__) +# define calloc(n,s) unbound_stat_calloc_log(n, s, __FILE__, __LINE__, __func__) +# define free(p) unbound_stat_free_log(p, __FILE__, __LINE__, __func__) +# define realloc(p,s) unbound_stat_realloc_log(p, s, __FILE__, __LINE__, __func__) +void *unbound_stat_malloc(size_t size); +void *unbound_stat_calloc(size_t nmemb, size_t size); +void unbound_stat_free(void *ptr); +void *unbound_stat_realloc(void *ptr, size_t size); +void *unbound_stat_malloc_log(size_t size, const char* file, int line, + const char* func); +void *unbound_stat_calloc_log(size_t nmemb, size_t size, const char* file, + int line, const char* func); +void unbound_stat_free_log(void *ptr, const char* file, int line, + const char* func); +void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file, + int line, const char* func); +#elif defined(UNBOUND_ALLOC_LITE) +# include "util/alloc.h" +#endif /* UNBOUND_ALLOC_LITE and UNBOUND_ALLOC_STATS */ + +/** default port for DNS traffic. */ +#define UNBOUND_DNS_PORT 53 +/** default port for unbound control traffic, registered port with IANA, + ub-dns-control 8953/tcp unbound dns nameserver control */ +#define UNBOUND_CONTROL_PORT 8953 +/** the version of unbound-control that this software implements */ +#define UNBOUND_CONTROL_VERSION 1 + + Added: head/contrib/unbound/doc/libunbound.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/doc/libunbound.3 Sun Sep 15 00:40:21 2013 (r255581) @@ -0,0 +1,386 @@ +.TH "libunbound" "3" "Mar 21, 2013" "NLnet Labs" "unbound 1.4.20" +.\" +.\" libunbound.3 -- unbound library functions manual +.\" +.\" Copyright (c) 2007, NLnet Labs. All rights reserved. +.\" +.\" See LICENSE for the license. +.\" +.\" +.SH "NAME" +.LP +.B libunbound, +.B unbound.h, +.B ub_ctx, +.B ub_result, +.B ub_callback_t, +.B ub_ctx_create, +.B ub_ctx_delete, +.B ub_ctx_set_option, +.B ub_ctx_get_option, +.B ub_ctx_config, +.B ub_ctx_set_fwd, +.B ub_ctx_resolvconf, +.B ub_ctx_hosts, +.B ub_ctx_add_ta, +.B ub_ctx_add_ta_file, +.B ub_ctx_trustedkeys, +.B ub_ctx_debugout, +.B ub_ctx_debuglevel, +.B ub_ctx_async, +.B ub_poll, +.B ub_wait, +.B ub_fd, +.B ub_process, +.B ub_resolve, +.B ub_resolve_async, +.B ub_cancel, +.B ub_resolve_free, +.B ub_strerror, +.B ub_ctx_print_local_zones, +.B ub_ctx_zone_add, +.B ub_ctx_zone_remove, +.B ub_ctx_data_add, +.B ub_ctx_data_remove +\- Unbound DNS validating resolver 1.4.20 functions. +.SH "SYNOPSIS" +.LP +.B #include +.LP +\fIstruct ub_ctx *\fR +\fBub_ctx_create\fR(\fIvoid\fR); +.LP +\fIvoid\fR +\fBub_ctx_delete\fR(\fIstruct ub_ctx*\fR ctx); +.LP +\fIint\fR +\fBub_ctx_set_option\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR opt, \fIchar*\fR val); +.LP +\fIint\fR +\fBub_ctx_get_option\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR opt, \fIchar**\fR val); +.LP +\fIint\fR +\fBub_ctx_config\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); +.LP +\fIint\fR +\fBub_ctx_set_fwd\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR addr); +.LP +\fIint\fR +\fBub_ctx_resolvconf\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); +.LP +\fIint\fR +\fBub_ctx_hosts\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); +.LP +\fIint\fR +\fBub_ctx_add_ta\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR ta); +.LP +\fIint\fR +\fBub_ctx_add_ta_file\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); +.LP +\fIint\fR +\fBub_ctx_trustedkeys\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); +.LP +\fIint\fR *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 00:40:46 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B35738E2; Sun, 15 Sep 2013 00:40:46 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F36B24B1; Sun, 15 Sep 2013 00:40:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F0ekei091164; Sun, 15 Sep 2013 00:40:46 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F0ekEo091162; Sun, 15 Sep 2013 00:40:46 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150040.r8F0ekEo091162@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 00:40:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255582 - head/contrib/unbound/util X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 00:40:46 -0000 Author: des Date: Sun Sep 15 00:40:46 2013 New Revision: 255582 URL: http://svnweb.freebsd.org/changeset/base/255582 Log: Regenerated lexer and parser Approved by: re (blanket) Modified: head/contrib/unbound/util/configlexer.c head/contrib/unbound/util/configparser.c Modified: head/contrib/unbound/util/configlexer.c ============================================================================== --- head/contrib/unbound/util/configlexer.c Sun Sep 15 00:40:21 2013 (r255581) +++ head/contrib/unbound/util/configlexer.c Sun Sep 15 00:40:46 2013 (r255582) @@ -10,13 +10,23 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 36 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif /* First, we deal with platform-specific or compiler-specific issues. */ +#if defined(__FreeBSD__) +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif +#include +#include +#else +#define __dead2 +#endif + /* begin standard C headers. */ #include #include @@ -32,7 +42,8 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if defined(__FreeBSD__) || \ + (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -265,6 +276,7 @@ static YY_BUFFER_STATE * yy_buffer_stack #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) +#define yy_current_buffer YY_CURRENT_BUFFER /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. @@ -350,7 +362,7 @@ extern char *yytext; static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static void yy_fatal_error (yyconst char msg[] ) __dead2; /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -375,12 +387,12 @@ struct yy_trans_info static yyconst flex_int16_t yy_accept[1343] = { 0, 1, 1, 124, 124, 128, 128, 132, 132, 136, 136, - 1, 1, 143, 140, 1, 122, 122, 141, 2, 140, + 1, 1, 143, 140, 1, 122, 122, 141, 2, 141, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 141, 124, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 124, 125, 125, 126, 141, 128, 129, 129, 130, 141, 135, 132, 133, 133, 134, 141, 136, 137, 137, 138, 141, - 139, 123, 2, 127, 139, 141, 140, 0, 1, 2, + 139, 123, 2, 127, 141, 139, 140, 0, 1, 2, 2, 2, 2, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, @@ -532,14 +544,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 2, 1, 5, 6, 1, 1, 1, 7, 1, 1, 1, 1, 1, 8, 1, 1, 1, 1, 1, 9, 10, 1, 11, 1, 1, 1, 12, 1, 1, - 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 1, 39, 1, 1, 1, 1, 40, 41, 42, 43, - - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 13, 1, 1, 1, 1, 14, 15, 16, 17, + + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -556,168 +568,165 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[66] = +static yyconst flex_int32_t yy_meta[40] = { 0, 1, 2, 3, 4, 5, 1, 6, 1, 1, 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; static yyconst flex_int16_t yy_base[1357] = { 0, - 0, 0, 63, 66, 69, 71, 77, 83, 88, 91, - 129, 135, 483, 443, 95, 3880, 3880, 3880, 107, 110, - 142, 140, 108, 50, 159, 147, 121, 148, 158, 174, - 191, 176, 190, 216, 225, 235, 214, 246, 116, 436, - 3880, 3880, 3880, 94, 402, 3880, 3880, 3880, 96, 335, - 329, 3880, 3880, 3880, 214, 282, 3880, 3880, 3880, 102, - 250, 3880, 289, 3880, 184, 293, 239, 297, 111, 0, - 301, 0, 0, 219, 223, 248, 273, 280, 285, 290, - 286, 283, 310, 294, 291, 297, 309, 316, 232, 319, - 338, 303, 334, 345, 326, 347, 349, 342, 350, 360, - - 343, 376, 370, 384, 371, 368, 187, 375, 374, 137, - 387, 403, 378, 390, 401, 386, 405, 400, 407, 229, - 154, 186, 199, 163, 448, 176, 115, 277, 90, 452, - 463, 0, 432, 441, 318, 433, 442, 439, 437, 465, - 462, 469, 493, 471, 455, 473, 453, 479, 490, 477, - 494, 496, 498, 510, 492, 517, 530, 526, 549, 522, - 525, 532, 542, 534, 536, 541, 544, 545, 556, 529, - 558, 552, 560, 559, 568, 578, 574, 561, 582, 591, - 603, 583, 599, 610, 607, 612, 608, 594, 611, 616, - 617, 618, 624, 640, 629, 635, 649, 637, 639, 658, - - 664, 643, 669, 657, 672, 677, 676, 663, 660, 665, - 680, 688, 679, 690, 698, 705, 699, 701, 703, 706, - 710, 738, 674, 720, 734, 716, 733, 736, 739, 752, - 747, 737, 756, 750, 767, 773, 761, 766, 777, 763, - 790, 771, 781, 791, 804, 797, 849, 800, 812, 789, - 814, 820, 809, 830, 826, 828, 839, 847, 831, 866, - 884, 857, 853, 859, 873, 883, 893, 881, 889, 896, - 892, 902, 909, 906, 910, 911, 916, 912, 926, 935, - 920, 937, 938, 948, 951, 934, 957, 3880, 959, 942, - 962, 965, 954, 3880, 952, 968, 953, 986, 990, 975, - - 978, 981, 1000, 992, 1001, 993, 995, 1041, 1012, 994, - 1033, 1023, 1025, 1019, 1034, 1036, 1046, 1039, 1029, 1050, - 1059, 1070, 1061, 1068, 1078, 1028, 1075, 1071, 1077, 1092, - 1081, 1084, 1085, 1098, 1102, 1103, 1113, 1122, 1121, 1124, - 1126, 1110, 1127, 1129, 1130, 1134, 1136, 1119, 1140, 1142, - 1148, 1168, 1151, 1154, 1146, 1161, 1166, 1167, 1173, 1178, - 1175, 1181, 1179, 1193, 1198, 1199, 1191, 1197, 1210, 1213, - 1212, 1233, 1194, 1218, 1229, 1234, 1239, 1244, 1230, 1231, - 1236, 1242, 1260, 1243, 1238, 1254, 1263, 1271, 1258, 1282, - 1280, 1281, 1276, 1269, 1287, 1290, 1289, 1295, 1296, 1307, - - 1308, 1311, 1316, 1279, 1327, 1328, 1329, 1309, 1339, 3880, - 1341, 1338, 1343, 1336, 1335, 3880, 3880, 1347, 3880, 3880, - 1363, 1367, 1374, 1353, 1404, 1371, 1365, 1357, 1390, 1385, - 1380, 1401, 1398, 1414, 1394, 1399, 1417, 1410, 1426, 1424, - 1429, 1425, 1432, 1438, 1445, 1449, 1450, 1452, 1443, 1457, - 1464, 1467, 1465, 1468, 1459, 3880, 1466, 1476, 1479, 1482, - 1499, 3880, 1487, 1491, 1484, 1493, 1496, 1492, 1509, 1503, - 1506, 1518, 1520, 1526, 1524, 1535, 1472, 1537, 1519, 1543, - 1545, 1536, 1559, 1562, 1553, 1548, 1554, 1573, 1558, 1574, - 1579, 1575, 1584, 1572, 1568, 1582, 1621, 1594, 1583, 1589, - - 1593, 1601, 1600, 1606, 1617, 1639, 1631, 1615, 1634, 1642, - 1649, 1644, 1641, 1656, 1650, 1658, 3880, 1664, 1677, 1659, - 1671, 1682, 1679, 1674, 1685, 1676, 1681, 1691, 1698, 3880, - 1692, 1701, 1694, 1708, 1719, 1720, 1730, 1734, 3880, 1736, - 1737, 1739, 1718, 1728, 1746, 1723, 1747, 1754, 1756, 1761, - 1753, 1763, 1760, 1774, 1764, 1765, 1773, 1783, 1780, 1790, - 1779, 1799, 1787, 1743, 1807, 1800, 1808, 1794, 1804, 1816, - 337, 1812, 1810, 1814, 1811, 3880, 76, 1834, 1817, 1827, - 1853, 1854, 1846, 1838, 1842, 1857, 1843, 1849, 1866, 1850, - 1863, 1877, 1867, 1883, 1873, 1893, 1878, 1881, 1891, 1889, - - 1884, 1900, 1880, 1911, 1907, 1909, 1923, 3880, 1875, 1912, - 1927, 1920, 1936, 1946, 1918, 1928, 1916, 1950, 1947, 1955, - 1956, 1961, 1958, 1953, 1965, 1969, 1970, 1977, 1991, 1979, - 3880, 1985, 1986, 1976, 1996, 1992, 1987, 2006, 1997, 2004, - 2025, 2026, 3880, 2027, 2034, 2016, 2040, 2021, 2044, 2045, - 2046, 2031, 2054, 2047, 2058, 2042, 2043, 2057, 3880, 2069, - 2079, 2075, 2083, 2084, 2070, 2077, 2092, 2074, 2072, 2087, - 2078, 2097, 2082, 2102, 2106, 2107, 2110, 2085, 3880, 2140, - 2112, 2123, 2137, 2125, 2127, 2144, 2131, 2153, 2104, 2136, - 2154, 2152, 2155, 2156, 2159, 2176, 2175, 2160, 2170, 2187, - - 2198, 2199, 2195, 3880, 2200, 2193, 2182, 2210, 2208, 2194, - 2197, 2211, 2209, 2202, 2212, 2214, 2225, 2226, 2232, 2227, - 2234, 2250, 2242, 2252, 2253, 2254, 2235, 2264, 2260, 2280, - 2268, 2271, 3880, 3880, 2281, 2269, 2272, 3880, 2285, 3880, - 2289, 3880, 2291, 2299, 2287, 2276, 2304, 2290, 2306, 2303, - 2318, 2298, 2311, 2330, 2316, 2332, 3880, 2321, 2326, 2341, - 2324, 2336, 2338, 2350, 2349, 2314, 2353, 2360, 2364, 3880, - 2367, 2357, 2375, 2328, 2385, 2371, 2369, 2383, 2387, 2381, - 2390, 2393, 2401, 2400, 2405, 2409, 2397, 2414, 2394, 2427, - 2415, 2417, 2419, 2424, 2436, 2438, 2432, 3880, 3880, 2449, - - 2452, 2441, 2451, 2442, 2471, 2463, 2462, 2473, 2465, 2468, - 2475, 2477, 2469, 2479, 2500, 2487, 2495, 3880, 2490, 2498, - 2509, 2505, 2519, 2510, 2526, 3880, 3880, 2525, 2518, 2521, - 2515, 2528, 2536, 3880, 2537, 2543, 2546, 2560, 2562, 2532, - 2549, 2564, 2569, 2561, 2568, 2570, 2581, 2571, 2585, 2584, - 2586, 2593, 2591, 2601, 2589, 2594, 2595, 2599, 2604, 2605, - 2623, 2624, 2609, 2626, 3880, 2637, 2616, 2639, 2613, 2644, - 2646, 2641, 2643, 2640, 2649, 2652, 2627, 2658, 2651, 2679, - 2661, 3880, 2674, 2671, 2684, 2685, 2666, 2689, 2676, 2693, - 3880, 2695, 2699, 2703, 2698, 2697, 2710, 2719, 2711, 2718, - - 2716, 2724, 2734, 2732, 2736, 2744, 2727, 2742, 2738, 2749, - 2757, 2768, 2758, 2776, 2761, 2774, 2765, 2755, 2785, 2764, - 2791, 2781, 3880, 2787, 2789, 2794, 2792, 2797, 2800, 2801, - 3880, 3880, 2784, 3880, 2814, 2804, 2821, 2823, 3880, 2809, - 3880, 3880, 2820, 2839, 2827, 2837, 2841, 2840, 3880, 2845, - 2831, 2854, 2835, 2848, 2857, 2861, 2859, 2865, 3880, 2871, - 2875, 2862, 2881, 2879, 2891, 2868, 2892, 2903, 2904, 2906, - 2895, 2896, 2914, 2910, 3880, 2907, 2921, 2925, 2917, 2937, - 2943, 2930, 2938, 2942, 2953, 3880, 2941, 2940, 2955, 3880, - 2957, 3880, 2969, 2934, 2970, 2928, 2974, 2951, 2972, 2984, - - 2987, 2976, 2993, 2986, 3880, 3880, 2995, 3000, 3006, 2996, - 3012, 3001, 3009, 3020, 3003, 3018, 3880, 3014, 3021, 3022, - 3030, 3032, 3880, 3046, 3047, 3041, 3045, 3059, 3055, 3061, - 3049, 3063, 3066, 3052, 3075, 3078, 3064, 3880, 3079, 3092, - 3076, 3094, 3081, 3090, 3097, 3112, 3104, 3088, 3109, 3880, - 3114, 3103, 3115, 3111, 3106, 3127, 3110, 3131, 3125, 3143, - 3134, 3141, 3142, 2999, 3153, 3880, 3140, 3880, 3154, 3164, - 3168, 3173, 3880, 3170, 3167, 3880, 3169, 3161, 3183, 3194, - 3186, 3202, 3199, 3187, 3201, 3188, 3206, 3190, 3197, 3880, - 3220, 3213, 3214, 3217, 3880, 3880, 3226, 3880, 3880, 3223, - - 3880, 3880, 3232, 3239, 3880, 3242, 3880, 3224, 3247, 3240, - 3230, 3238, 3880, 3255, 3880, 3880, 3253, 3259, 3246, 3257, - 3268, 3271, 3272, 3264, 3263, 3265, 3266, 3282, 3280, 3296, - 3288, 3275, 3286, 3298, 3290, 3302, 3292, 3307, 3313, 3320, - 3880, 3304, 3325, 3880, 3330, 3323, 3321, 3317, 3324, 3338, - 3337, 3346, 3359, 3343, 3341, 3347, 3880, 3352, 3880, 3880, - 3355, 3363, 3361, 3357, 3362, 3880, 3376, 3373, 3377, 3378, - 3880, 3880, 3880, 3390, 3374, 3386, 3401, 3403, 3389, 3880, - 3394, 3405, 3407, 3399, 3411, 3415, 3424, 3425, 3427, 3880, - 3426, 3417, 3880, 3437, 3430, 3436, 3438, 3448, 3441, 3880, - - 3442, 3452, 3446, 3451, 3455, 3454, 3475, 3880, 3457, 3470, - 3880, 3459, 3880, 3880, 3465, 3489, 3488, 3494, 3495, 3478, - 3486, 3503, 3501, 3502, 3880, 3880, 3498, 3880, 3880, 3492, - 3512, 3505, 3507, 3510, 3509, 3522, 3517, 3531, 3525, 3880, - 3547, 3880, 3528, 3548, 3552, 3551, 3880, 3553, 3549, 3532, - 3880, 3880, 3558, 3564, 3559, 3880, 3566, 3572, 3575, 3582, - 3596, 3591, 3585, 3584, 3598, 3599, 3587, 3588, 3605, 3611, - 3880, 3610, 3602, 3614, 3617, 3619, 3620, 3623, 3625, 3642, - 3641, 3648, 3632, 3880, 3640, 3650, 3656, 3657, 3658, 3659, - 3660, 3880, 3669, 3880, 3661, 3666, 3880, 3880, 3665, 3674, - - 3684, 3880, 3685, 3880, 3675, 3676, 3700, 3880, 3880, 3880, - 3679, 3880, 3701, 3880, 3694, 3692, 3880, 3681, 3709, 3710, - 3880, 3713, 3880, 3714, 3880, 3703, 3717, 3880, 3880, 3880, - 3880, 3716, 3719, 3723, 3724, 3880, 3734, 3711, 3729, 3735, - 3880, 3880, 3788, 3795, 3802, 3809, 3816, 82, 3823, 3830, - 3837, 3844, 3851, 3858, 3865, 3872 + 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, + 87, 108, 2577, 2563, 50, 2683, 2683, 2683, 129, 94, + 70, 104, 122, 90, 92, 115, 126, 95, 84, 132, + 135, 138, 50, 142, 148, 156, 169, 164, 179, 2493, + 2683, 2683, 2683, 70, 2371, 2683, 2683, 2683, 42, 2326, + 1987, 2683, 2683, 2683, 197, 1681, 2683, 2683, 2683, 154, + 1191, 2683, 201, 2683, 205, 111, 1082, 211, 120, 0, + 222, 0, 0, 103, 158, 165, 149, 155, 168, 206, + 207, 198, 217, 209, 204, 208, 215, 177, 136, 227, + 228, 219, 232, 236, 235, 240, 245, 229, 246, 247, + + 250, 251, 254, 256, 258, 262, 259, 263, 266, 269, + 267, 276, 268, 271, 273, 49, 280, 281, 283, 853, + 297, 751, 301, 603, 311, 572, 360, 299, 298, 315, + 319, 0, 296, 312, 320, 314, 316, 318, 321, 327, + 323, 330, 342, 331, 326, 334, 335, 336, 338, 347, + 337, 353, 348, 344, 350, 355, 359, 372, 369, 367, + 357, 379, 377, 385, 386, 383, 387, 384, 388, 389, + 391, 392, 395, 396, 397, 398, 405, 402, 406, 403, + 414, 412, 420, 418, 428, 424, 425, 427, 430, 434, + 435, 432, 433, 441, 439, 444, 452, 448, 450, 454, + + 455, 458, 461, 460, 462, 466, 473, 469, 470, 472, + 477, 475, 478, 479, 485, 481, 482, 483, 486, 492, + 487, 504, 498, 508, 501, 502, 510, 513, 509, 515, + 520, 522, 528, 524, 525, 526, 527, 531, 534, 537, + 533, 536, 539, 540, 545, 546, 565, 551, 549, 553, + 556, 555, 562, 576, 563, 572, 573, 569, 578, 585, + 596, 586, 591, 595, 598, 597, 600, 601, 602, 605, + 608, 610, 609, 620, 623, 622, 621, 624, 630, 638, + 625, 632, 635, 639, 643, 634, 644, 2683, 649, 636, + 651, 652, 642, 2683, 653, 656, 658, 660, 662, 668, + + 664, 666, 667, 669, 674, 675, 677, 697, 680, 678, + 690, 681, 686, 683, 692, 689, 699, 702, 706, 707, + 709, 710, 712, 715, 716, 726, 722, 718, 724, 728, + 732, 733, 735, 738, 739, 743, 747, 753, 755, 757, + 763, 740, 759, 762, 765, 767, 768, 749, 775, 772, + 774, 778, 779, 787, 776, 789, 791, 793, 783, 794, + 797, 805, 801, 803, 808, 810, 784, 804, 814, 813, + 820, 827, 828, 812, 829, 835, 831, 836, 824, 837, + 839, 840, 841, 843, 844, 846, 848, 854, 850, 856, + 861, 862, 866, 851, 868, 871, 872, 873, 874, 883, + + 875, 884, 876, 886, 887, 894, 895, 889, 902, 2683, + 901, 904, 898, 905, 906, 2683, 2683, 890, 2683, 2683, + 909, 914, 915, 917, 922, 923, 925, 927, 930, 932, + 935, 936, 938, 944, 946, 939, 947, 948, 950, 954, + 955, 957, 961, 963, 964, 965, 968, 970, 972, 974, + 975, 981, 977, 988, 984, 2683, 986, 987, 991, 993, + 994, 2683, 995, 996, 998, 999, 1000, 1002, 1006, 1004, + 1007, 1014, 1013, 1009, 1012, 1019, 1029, 1030, 1025, 1028, + 1031, 1035, 1037, 1046, 1039, 1043, 1045, 1052, 1048, 1050, + 1054, 1051, 1055, 1057, 1060, 1063, 1085, 1065, 1062, 1064, + + 1067, 1070, 1072, 1074, 1078, 1092, 1097, 1075, 1071, 1103, + 1105, 1099, 1095, 1106, 1112, 1113, 2683, 1119, 1120, 1108, + 1115, 1116, 1122, 1124, 1129, 1126, 1130, 1132, 1138, 2683, + 1135, 1136, 1137, 1140, 1147, 1139, 1149, 1159, 2683, 1161, + 1162, 1155, 1157, 1164, 1165, 1167, 1169, 1170, 1171, 1173, + 1181, 1176, 1178, 1183, 1182, 1187, 1189, 1190, 1192, 1193, + 1194, 1199, 1204, 1210, 1213, 1201, 1218, 1195, 1207, 1211, + 1224, 1219, 1222, 1225, 1226, 2683, 174, 1227, 1228, 1229, + 1235, 1238, 1234, 1232, 1236, 1240, 1242, 1247, 1253, 1248, + 1254, 1255, 1256, 1259, 1258, 1261, 1267, 1268, 1269, 1270, + + 1271, 1272, 1273, 1274, 1279, 1278, 1286, 2683, 1292, 1285, + 1281, 1288, 1296, 1305, 1297, 1302, 1312, 1313, 1315, 1316, + 1317, 1319, 1309, 1322, 1330, 1331, 1327, 1329, 1328, 1334, + 2683, 1335, 1336, 1338, 1341, 1343, 1349, 1347, 1348, 1350, + 1353, 1359, 2683, 1303, 1360, 1354, 1364, 1367, 1369, 1371, + 1378, 1370, 1374, 1372, 1381, 1382, 1383, 1384, 2683, 1393, + 1397, 1394, 1401, 1395, 1398, 1402, 1406, 1403, 1385, 1412, + 1409, 1410, 1414, 1415, 1411, 1418, 1419, 1421, 2683, 1425, + 1422, 1427, 1428, 1434, 1426, 1435, 1436, 1438, 1441, 1447, + 1440, 1451, 1442, 1453, 1450, 1460, 1461, 1464, 1463, 1466, + + 1472, 1478, 1474, 2683, 1477, 1465, 1480, 1486, 1488, 1483, + 1489, 1490, 1491, 1498, 1492, 1494, 1495, 1496, 1503, 1500, + 1501, 1504, 1507, 1506, 1518, 1519, 1520, 1523, 1524, 1526, + 1525, 1532, 2683, 2683, 1533, 1534, 1541, 2683, 1543, 2683, + 1547, 2683, 1548, 1549, 1537, 1539, 1553, 1544, 1555, 1556, + 1560, 1557, 1562, 1563, 1565, 1566, 2683, 1568, 1569, 1574, + 1570, 1572, 1577, 1578, 1582, 1593, 1581, 1585, 1589, 2683, + 1591, 1594, 1600, 1607, 1604, 1598, 1606, 1608, 1609, 1610, + 1612, 1621, 1613, 1611, 1615, 1622, 1623, 1624, 1626, 1632, + 1630, 1631, 1634, 1638, 1640, 1645, 1643, 2683, 2683, 1649, + + 1641, 1646, 1652, 1656, 1658, 1660, 1668, 1665, 1666, 1671, + 1672, 1673, 1674, 1676, 1677, 1679, 1680, 2683, 1688, 1682, + 1696, 1697, 1706, 1689, 1704, 2683, 2683, 1685, 1692, 1708, + 1709, 1711, 1712, 2683, 1714, 1715, 1716, 1717, 1718, 1720, + 1710, 1724, 1732, 1735, 1725, 1736, 1743, 1740, 1741, 1744, + 1746, 1754, 1742, 1756, 1762, 1747, 1758, 1760, 1764, 1761, + 1766, 1770, 1772, 1771, 2683, 1778, 1775, 1784, 1776, 1783, + 1785, 1792, 1788, 1789, 1790, 1791, 1794, 1796, 1797, 1798, + 1804, 2683, 1803, 1805, 1806, 1808, 1814, 1818, 1816, 1821, + 2683, 1822, 1830, 1826, 1828, 1832, 1829, 1836, 1833, 1839, + + 1838, 1841, 1843, 1850, 1844, 1848, 1851, 1852, 1863, 1862, + 1869, 1870, 1867, 1876, 1873, 1874, 1875, 1877, 1886, 1882, + 1888, 1880, 2683, 1890, 1895, 1897, 1899, 1884, 1900, 1898, + 2683, 2683, 1891, 2683, 1908, 1901, 1912, 1913, 2683, 1911, + 2683, 2683, 1914, 1923, 1915, 1916, 1924, 1930, 2683, 1927, + 1925, 1935, 1931, 1937, 1938, 1939, 1933, 1940, 2683, 1941, + 1942, 1943, 1947, 1953, 1955, 1957, 1958, 1962, 1965, 1966, + 1959, 1968, 1974, 1973, 2683, 1972, 1975, 1980, 1981, 1985, + 1982, 1986, 1987, 1996, 1998, 2683, 1992, 1990, 2000, 2683, + 2002, 2683, 2006, 2004, 2009, 2014, 2011, 2022, 2007, 2015, + + 2023, 2017, 2025, 2027, 2683, 2683, 2031, 2033, 2036, 2034, + 2038, 2041, 2039, 2042, 2044, 2048, 2683, 2049, 2050, 2051, + 2052, 2053, 2683, 2056, 2057, 2058, 2062, 2065, 2077, 2079, + 2068, 2083, 2085, 2061, 2087, 2089, 2090, 2683, 2091, 2093, + 2094, 2098, 2099, 2095, 2100, 2104, 2107, 2102, 2111, 2683, + 2115, 2108, 2118, 2116, 2112, 2122, 2123, 2126, 2128, 2130, + 2129, 2131, 2132, 2138, 2059, 2683, 2136, 2683, 2137, 2142, + 2150, 2151, 2683, 2147, 2153, 2683, 2154, 2158, 2167, 2155, + 2161, 2169, 2170, 2171, 2172, 2173, 2174, 2182, 2178, 2683, + 2180, 2181, 2187, 2183, 2683, 2683, 2188, 2683, 2683, 2198, + + 2683, 2683, 2194, 2201, 2683, 2203, 2683, 2209, 2205, 2192, + 2190, 2210, 2683, 2214, 2683, 2683, 2211, 2217, 2207, 2218, + 2225, 2227, 2229, 2220, 2222, 2230, 2231, 2233, 2234, 2236, + 2237, 2238, 2239, 2244, 2241, 2247, 2248, 2250, 2251, 2253, + 2683, 2249, 2262, 2683, 2269, 2270, 2258, 2260, 2271, 2272, + 2274, 2276, 2282, 2280, 2281, 2283, 2683, 2285, 2683, 2683, + 2286, 2284, 2291, 2292, 2294, 2683, 2297, 2298, 2302, 2309, + 2683, 2683, 2683, 2310, 2299, 2305, 2313, 2315, 2316, 2683, + 2319, 2322, 2323, 2325, 2330, 2332, 2338, 2336, 2342, 2683, + 2339, 2337, 2683, 2343, 2345, 2347, 2348, 2350, 2352, 2683, + + 2353, 2354, 2360, 2355, 2363, 2366, 2365, 2683, 2367, 2368, + 2683, 2378, 2683, 2683, 2369, 2379, 2382, 2384, 2387, 2375, + 2388, 2395, 2392, 2394, 2683, 2683, 2397, 2683, 2683, 2396, + 2399, 2400, 2404, 2401, 2406, 2408, 2409, 2412, 2410, 2683, + 2413, 2683, 2414, 2423, 2420, 2418, 2683, 2425, 2426, 2429, + 2683, 2683, 2431, 2439, 2433, 2683, 2441, 2443, 2437, 2444, + 2448, 2449, 2445, 2450, 2455, 2457, 2451, 2453, 2465, 2466, + 2683, 2468, 2460, 2470, 2474, 2476, 2478, 2479, 2481, 2483, + 2484, 2486, 2487, 2683, 2488, 2489, 2499, 2504, 2508, 2490, + 2510, 2683, 2511, 2683, 2514, 2500, 2683, 2683, 2515, 2517, + + 2519, 2683, 2520, 2683, 2518, 2522, 2526, 2683, 2683, 2683, + 2528, 2683, 2529, 2683, 2532, 2534, 2683, 2535, 2537, 2540, + 2683, 2542, 2683, 2544, 2683, 2545, 2546, 2683, 2683, 2683, + 2683, 2548, 2550, 2555, 2551, 2683, 2556, 2558, 2559, 2562, + 2683, 2683, 2591, 2598, 2605, 2612, 2619, 94, 2626, 2633, + 2640, 2647, 2654, 2661, 2668, 2675 } ; static yyconst flex_int16_t yy_def[1357] = @@ -873,880 +882,612 @@ static yyconst flex_int16_t yy_def[1357] 1342, 1342, 1342, 1342, 1342, 1342 } ; -static yyconst flex_int16_t yy_nxt[3946] = +static yyconst flex_int16_t yy_nxt[2723] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, - 14, 18, 20, 14, 21, 22, 23, 24, 14, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 14, 34, - 35, 36, 37, 38, 14, 14, 14, 14, 39, 20, - 14, 21, 22, 23, 24, 14, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 14, 34, 35, 36, 37, - 38, 14, 14, 14, 14, 41, 42, 43, 41, 42, - 43, 46, 47, 46, 47, 48, 86, 48, 51, 52, - 53, 54, 67, 18, 51, 52, 53, 54, 68, 18, - 57, 58, 59, 57, 58, 59, 69, 120, 120, 122, - - 70, 44, 122, 86, 44, 127, 127, 49, 72, 49, - 72, 72, 69, 72, 130, 55, 70, 67, 72, 67, - 67, 55, 67, 84, 74, 75, 60, 67, 130, 60, - 15, 16, 17, 62, 63, 64, 15, 16, 17, 62, - 63, 64, 76, 85, 176, 73, 68, 92, 68, 65, - 84, 74, 75, 128, 77, 65, 80, 120, 120, 68, - 81, 78, 89, 82, 93, 90, 83, 66, 79, 76, - 85, 87, 91, 66, 92, 68, 65, 126, 68, 88, - 68, 77, 65, 80, 94, 68, 68, 81, 78, 89, - 82, 93, 90, 83, 95, 79, 68, 68, 87, 91, - - 96, 125, 122, 98, 97, 122, 88, 99, 101, 133, - 102, 94, 68, 173, 68, 124, 103, 124, 124, 104, - 124, 95, 130, 100, 123, 68, 105, 96, 68, 68, - 98, 97, 106, 134, 99, 101, 133, 102, 135, 116, - 173, 109, 107, 103, 117, 108, 104, 113, 150, 114, - 100, 110, 68, 105, 68, 111, 112, 68, 118, 106, - 134, 68, 119, 68, 115, 135, 116, 121, 109, 107, - 68, 117, 108, 68, 113, 150, 114, 68, 110, 136, - 127, 127, 111, 112, 68, 118, 68, 137, 130, 119, - 72, 115, 72, 72, 129, 72, 129, 129, 67, 129, - - 67, 67, 72, 67, 72, 72, 136, 72, 67, 138, - 139, 68, 72, 140, 137, 141, 142, 143, 68, 145, - 128, 68, 146, 68, 68, 189, 147, 132, 68, 68, - 126, 149, 68, 155, 144, 68, 138, 139, 148, 73, - 140, 68, 141, 142, 151, 663, 145, 68, 68, 146, - 156, 160, 152, 147, 68, 153, 68, 68, 149, 158, - 155, 144, 161, 159, 68, 148, 163, 162, 164, 154, - 157, 151, 68, 125, 166, 68, 68, 156, 160, 152, - 68, 68, 153, 68, 165, 68, 158, 68, 68, 161, - 159, 167, 172, 163, 162, 164, 154, 157, 68, 168, - - 169, 166, 171, 175, 170, 174, 68, 180, 68, 68, - 177, 165, 68, 68, 68, 178, 68, 181, 167, 172, - 183, 184, 68, 185, 68, 68, 168, 169, 68, 171, - 175, 170, 174, 182, 180, 179, 186, 177, 68, 68, - 123, 68, 178, 68, 181, 68, 187, 183, 184, 124, - 185, 124, 124, 129, 124, 129, 129, 188, 129, 190, - 182, 191, 179, 186, 72, 192, 72, 72, 193, 72, - 130, 68, 194, 187, 121, 68, 196, 68, 195, 68, - 68, 68, 1342, 202, 188, 203, 190, 205, 191, 204, - 1342, 68, 192, 68, 206, 193, 1342, 1342, 1342, 1342, - - 68, 132, 208, 68, 1342, 195, 207, 68, 197, 68, - 202, 68, 203, 198, 205, 68, 204, 68, 199, 210, - 209, 206, 211, 214, 200, 201, 213, 212, 68, 208, - 68, 68, 68, 207, 68, 197, 68, 216, 217, 222, - 198, 224, 220, 225, 215, 199, 210, 209, 68, 211, - 214, 200, 201, 213, 212, 68, 218, 221, 223, 226, - 68, 227, 230, 68, 68, 217, 219, 68, 68, 220, - 68, 215, 68, 229, 68, 234, 228, 231, 232, 68, - 68, 238, 68, 68, 221, 223, 226, 68, 227, 230, - 68, 233, 239, 219, 68, 240, 68, 68, 68, 68, - - 229, 235, 234, 228, 231, 232, 68, 236, 237, 241, - 242, 244, 68, 243, 247, 1342, 68, 245, 233, 239, - 68, 68, 240, 253, 251, 248, 1342, 1342, 235, 68, - 252, 250, 68, 254, 236, 237, 241, 68, 244, 246, - 243, 68, 249, 258, 255, 68, 130, 259, 68, 68, - 68, 251, 248, 256, 68, 68, 68, 252, 250, 257, - 254, 260, 68, 265, 261, 262, 246, 68, 1342, 249, - 258, 255, 263, 68, 259, 68, 266, 68, 68, 264, - 256, 68, 267, 270, 268, 288, 257, 68, 260, 272, - 265, 261, 262, 269, 271, 68, 68, 273, 68, 263, - - 275, 68, 68, 68, 274, 278, 264, 68, 276, 267, - 68, 268, 68, 277, 68, 68, 272, 68, 68, 279, - 269, 271, 280, 283, 273, 1342, 68, 275, 68, 281, - 284, 274, 282, 285, 289, 276, 68, 68, 1342, 68, - 277, 68, 292, 68, 68, 1342, 279, 294, 68, 280, - 283, 286, 287, 293, 68, 295, 281, 284, 68, 282, - 285, 289, 290, 299, 296, 291, 1342, 1342, 298, 292, - 308, 68, 68, 297, 68, 68, 68, 68, 286, 287, - 293, 300, 295, 301, 1342, 68, 303, 302, 68, 290, - 68, 296, 291, 304, 68, 298, 305, 307, 306, 68, - - 297, 68, 1342, 310, 68, 68, 309, 1342, 300, 68, - 301, 68, 311, 303, 302, 68, 312, 1342, 313, 68, - 304, 325, 315, 305, 307, 306, 323, 130, 68, 68, - 310, 1342, 324, 309, 314, 68, 1342, 329, 68, 311, - 328, 1342, 68, 312, 326, 313, 327, 68, 325, 315, - 68, 1342, 68, 323, 331, 1342, 334, 330, 68, 324, - 1342, 314, 316, 317, 68, 332, 68, 328, 68, 68, - 1342, 326, 318, 327, 319, 320, 321, 68, 333, 322, - 339, 331, 335, 334, 330, 68, 340, 68, 338, 316, - 317, 68, 332, 336, 337, 68, 342, 68, 341, 318, - - 1342, 319, 320, 321, 68, 333, 322, 339, 343, 335, - 344, 68, 348, 340, 345, 338, 346, 352, 349, 68, - 1342, 68, 68, 342, 350, 341, 351, 68, 353, 347, - 68, 68, 354, 1342, 68, 343, 355, 344, 356, 348, - 68, 345, 357, 346, 68, 349, 1342, 68, 68, 68, - 68, 350, 358, 351, 68, 353, 347, 359, 68, 354, - 361, 360, 1342, 355, 68, 356, 363, 362, 1342, 364, - 1342, 365, 68, 68, 366, 68, 68, 369, 372, 358, - 68, 367, 375, 370, 359, 368, 68, 361, 360, 68, - 68, 68, 68, 363, 362, 68, 364, 68, 365, 371, - - 68, 366, 373, 68, 369, 372, 68, 376, 367, 374, - 370, 1342, 368, 68, 377, 378, 68, 380, 379, 68, - 381, 389, 1342, 1342, 68, 382, 371, 1342, 68, 373, - 68, 68, 68, 68, 376, 406, 374, 393, 68, 68, - 390, 377, 378, 388, 380, 379, 395, 381, 389, 391, - 68, 1342, 382, 383, 392, 394, 1342, 68, 384, 399, - 385, 68, 396, 68, 393, 398, 68, 68, 386, 397, - 388, 68, 68, 395, 68, 401, 391, 68, 387, 68, - 383, 392, 394, 400, 68, 384, 399, 385, 68, 396, - 402, 403, 398, 405, 404, 386, 397, 68, 407, 68, - - 408, 409, 401, 410, 411, 387, 68, 412, 68, 68, - 400, 413, 414, 68, 416, 68, 130, 402, 403, 68, - 405, 404, 68, 68, 417, 407, 415, 408, 409, 418, - 68, 411, 419, 421, 412, 420, 68, 425, 413, 414, - 68, 68, 422, 423, 424, 1342, 1342, 429, 68, 426, - 428, 68, 427, 415, 1342, 1342, 1342, 68, 430, 68, - 68, 436, 68, 435, 68, 68, 437, 68, 68, 422, - 423, 424, 68, 431, 68, 438, 426, 428, 68, 427, - 68, 439, 432, 441, 68, 430, 68, 433, 445, 68, - 435, 434, 68, 437, 443, 1342, 446, 442, 444, 68, - - 431, 457, 438, 440, 68, 68, 68, 447, 439, 432, - 441, 68, 448, 68, 433, 449, 68, 68, 434, 68, - 450, 443, 451, 446, 442, 444, 452, 453, 454, 68, - 440, 68, 68, 1342, 447, 68, 68, 68, 458, 448, - 455, 461, 449, 459, 456, 462, 1342, 450, 68, 451, - 68, 68, 463, 452, 453, 454, 68, 464, 460, 465, - 466, 1342, 1342, 470, 471, 458, 467, 68, 68, 68, - 459, 68, 68, 468, 68, 469, 68, 68, 474, 463, - 68, 68, 68, 472, 464, 460, 465, 466, 475, 473, - 470, 471, 68, 467, 476, 477, 68, 478, 68, 480, - - 468, 68, 469, 479, 490, 483, 1342, 68, 482, 68, - 472, 481, 485, 484, 68, 475, 473, 68, 68, 68, - 68, 476, 477, 486, 478, 68, 480, 68, 68, 488, - 479, 490, 483, 68, 68, 482, 489, 487, 481, 485, - 484, 494, 492, 491, 493, 68, 68, 68, 497, 68, - 486, 495, 1342, 498, 68, 500, 488, 1342, 1342, 496, - 506, 501, 1342, 489, 487, 130, 68, 68, 494, 492, - 491, 493, 499, 68, 68, 502, 68, 68, 495, 68, - 498, 68, 500, 503, 504, 68, 496, 513, 501, 505, - 1342, 68, 1342, 515, 514, 68, 517, 1342, 518, 499, - - 1342, 68, 502, 68, 516, 68, 1342, 1342, 522, 68, - 503, 504, 68, 519, 513, 1342, 505, 507, 68, 508, - 515, 514, 509, 68, 520, 518, 521, 510, 68, 525, - 523, 516, 68, 511, 512, 522, 68, 68, 526, 68, - 519, 529, 68, 530, 507, 531, 508, 524, 68, 509, - 527, 520, 68, 521, 510, 68, 525, 523, 528, 532, - 511, 512, 68, 68, 68, 526, 533, 68, 529, 534, - 68, 535, 536, 537, 524, 541, 68, 527, 539, 563, - 543, 68, 538, 68, 540, 528, 532, 68, 68, 542, - 68, 545, 1342, 533, 1342, 68, 534, 68, 535, 536, - - 537, 544, 68, 68, 68, 68, 68, 543, 546, 538, - 68, 540, 554, 547, 68, 551, 542, 68, 545, 549, - 68, 548, 68, 550, 555, 68, 552, 553, 544, 68, - 68, 68, 556, 1342, 68, 546, 557, 68, 558, 554, - 547, 68, 551, 560, 68, 559, 549, 68, 548, 565, - 550, 555, 564, 552, 553, 561, 68, 68, 68, 556, - 562, 567, 68, 557, 68, 558, 566, 571, 568, 570, - 560, 569, 559, 68, 68, 68, 565, 572, 573, 564, - 574, 68, 561, 68, 1342, 576, 68, 562, 567, 575, - 577, 68, 68, 566, 571, 568, 68, 68, 569, 579, - - 68, 578, 580, 581, 572, 573, 68, 582, 1342, 588, - 68, 68, 68, 68, 1342, 590, 575, 130, 591, 589, - 68, 68, 68, 594, 595, 593, 579, 68, 578, 580, - 581, 68, 68, 592, 582, 583, 588, 584, 68, 68, - 601, 585, 590, 586, 68, 591, 589, 600, 587, 1342, - 594, 596, 593, 68, 603, 68, 597, 602, 598, 68, - 592, 608, 583, 605, 584, 604, 606, 601, 585, 68, - 586, 610, 68, 609, 600, 587, 599, 68, 596, 68, - 68, 603, 68, 597, 602, 598, 607, 68, 68, 612, - 605, 611, 604, 606, 68, 613, 68, 68, 614, 615, - - 609, 617, 68, 599, 616, 621, 619, 618, 1342, 68, - 624, 620, 68, 607, 68, 68, 612, 68, 611, 68, - 68, 622, 613, 68, 625, 614, 615, 623, 617, 68, - 68, 616, 68, 619, 618, 626, 68, 624, 620, 68, - 627, 629, 628, 630, 635, 1342, 68, 631, 622, 632, - 656, 625, 633, 634, 623, 638, 68, 68, 68, 636, - 637, 68, 626, 639, 643, 1342, 68, 627, 68, 628, - 640, 635, 68, 641, 68, 68, 632, 68, 642, 633, - 634, 68, 638, 644, 68, 68, 636, 637, 646, 645, - 639, 68, 68, 647, 68, 648, 651, 640, 68, 68, - - 641, 68, 68, 68, 649, 642, 652, 650, 653, 655, - 644, 68, 68, 654, 657, 646, 645, 68, 68, 659, - 647, 68, 648, 651, 660, 68, 658, 1342, 68, 661, - 665, 649, 68, 652, 650, 653, 655, 68, 68, 662, - 654, 664, 68, 669, 666, 68, 68, 667, 68, 68, - 68, 660, 68, 658, 68, 68, 661, 665, 670, 668, - 671, 672, 673, 674, 1342, 68, 662, 675, 664, 677, - 669, 666, 68, 676, 667, 678, 68, 679, 1342, 680, - 68, 68, 698, 681, 68, 670, 668, 68, 68, 673, - 674, 68, 68, 682, 675, 68, 677, 683, 687, 684, - - 676, 68, 678, 685, 68, 68, 680, 688, 686, 693, - 681, 68, 690, 68, 691, 68, 68, 689, 68, 68, - 682, 68, 68, 707, 683, 687, 684, 68, 694, 68, - 685, 68, 692, 695, 688, 686, 693, 699, 68, 690, - 696, 691, 705, 697, 689, 68, 700, 68, 706, 68, - 68, 701, 702, 703, 68, 694, 68, 704, 68, 692, - 695, 68, 708, 709, 699, 68, 68, 696, 711, 705, - 697, 710, 715, 700, 68, 706, 716, 712, 701, 702, - 1342, 1342, 714, 713, 68, 68, 717, 1342, 68, 708, - 709, 68, 718, 68, 68, 711, 68, 1342, 710, 68, - - 724, 723, 1342, 68, 712, 726, 729, 68, 68, 714, - 713, 719, 725, 717, 68, 68, 720, 68, 721, 718, - 722, 727, 728, 68, 68, 68, 731, 724, 723, 68, - 68, 730, 726, 729, 68, 68, 733, 734, 719, 725, - 732, 735, 68, 720, 68, 721, 737, 722, 727, 728, - 736, 738, 739, 731, 68, 740, 1342, 742, 730, 68, - 748, 741, 743, 68, 68, 68, 745, 732, 735, 68, - 744, 747, 68, 737, 746, 749, 750, 736, 68, 739, - 68, 68, 68, 68, 68, 68, 751, 748, 741, 743, - 753, 752, 68, 745, 760, 68, 68, 744, 747, 756, - - 755, 746, 749, 757, 754, 758, 759, 68, 68, 761, - 68, 763, 68, 68, 764, 68, 68, 68, 752, 768, - 68, 68, 68, 68, 1342, 68, 756, 755, 762, 779, - 68, 754, 758, 759, 1342, 68, 761, 765, 763, 767, - 68, 764, 68, 766, 68, 68, 768, 769, 68, 771, - 68, 770, 772, 773, 774, 762, 779, 1342, 775, 776, - 777, 68, 780, 68, 765, 68, 767, 1342, 782, 68, - 766, 1342, 784, 783, 68, 68, 771, 788, 68, 772, - 773, 774, 68, 778, 781, 775, 776, 777, 785, 780, - 68, 68, 68, 68, 68, 782, 786, 68, 68, 784, - - 783, 787, 789, 790, 788, 791, 792, 793, 68, 804, - 778, 781, 796, 68, 68, 785, 794, 797, 795, 799, - 68, 798, 1342, 786, 800, 68, 803, 801, 787, 789, - 790, 68, 68, 68, 793, 68, 68, 68, 68, 796, - 68, 802, 805, 794, 806, 795, 68, 68, 68, 68, - 68, 800, 68, 803, 801, 807, 808, 809, 813, 810, - 811, 1342, 812, 68, 68, 68, 817, 814, 802, 805, - 68, 806, 68, 68, 816, 818, 819, 815, 822, 825, - 68, 824, 807, 808, 809, 813, 810, 811, 68, 812, - 68, 68, 68, 817, 814, 820, 826, 823, 68, 821, - - 827, 816, 68, 819, 815, 828, 68, 68, 824, 68, - 68, 829, 831, 830, 68, 1342, 833, 834, 68, 68, - 832, 850, 820, 68, 823, 68, 821, 68, 68, 68, - 836, 837, 828, 838, 835, 857, 68, 68, 829, 831, - 830, 68, 68, 833, 68, 839, 840, 832, 841, 68, - 842, 843, 68, 844, 68, 845, 68, 836, 837, 68, - 838, 835, 68, 848, 68, 849, 68, 846, 68, 847, - 68, 1342, 839, 840, 68, 841, 68, 842, 843, 68, - 844, 853, 845, 854, 851, 852, 1342, 68, 68, 856, - 848, 68, 849, 855, 846, 68, 847, 858, 68, 860, - - 859, 1342, 68, 862, 865, 68, 864, 68, 853, 68, - 854, 851, 852, 68, 861, 863, 856, 866, 872, 68, - 855, 68, 870, 68, 858, 68, 860, 859, 68, 867, - 862, 68, 68, 864, 873, 68, 868, 871, 68, 68, - 869, 861, 863, 68, 866, 872, 874, 68, 875, 870, - 877, 876, 68, 68, 878, 68, 867, 68, 879, 881, - 882, 880, 68, 868, 871, 68, 883, 869, 884, 890, - 68, 885, 886, 874, 68, 875, 68, 877, 876, 68, - 68, 878, 1342, 889, 891, 879, 881, 68, 880, 68, - 68, 887, 893, 883, 888, 884, 892, 901, 885, 886, - - 68, 68, 895, 68, 894, 896, 68, 68, 897, 68, - 889, 68, 898, 68, 899, 68, 903, 68, 887, 893, - 1342, 888, 904, 892, 900, 68, 905, 902, 68, 895, - 1342, 894, 896, 68, 906, 897, 68, 1342, 68, 898, - 907, 899, 910, 68, 909, 912, 908, 68, 68, 904, - 911, 900, 920, 68, 902, 913, 68, 68, 916, 68, - 1342, 906, 917, 68, 68, 914, 68, 907, 915, 910, - 68, 909, 912, 908, 68, 68, 918, 911, 919, 920, - 923, 68, 913, 921, 68, 916, 924, 68, 927, 917, - 922, 925, 914, 926, 928, 915, 935, 931, 68, 68, - - 68, 930, 68, 918, 932, 919, 68, 68, 68, 68, - 921, 933, 934, 924, 929, 939, 943, 922, 925, 68, - 926, 928, 68, 68, 68, 937, 936, 68, 930, 68, - 938, 68, 68, 68, 941, 942, 940, 68, 933, 68, - 944, 929, 68, 68, 945, 946, 947, 68, 951, 948, - 1342, 68, 937, 936, 68, 949, 1342, 938, 950, 958, - 1342, 68, 68, 940, 68, 68, 952, 944, 953, 959, - 1342, 955, 946, 954, 1342, 68, 948, 68, 68, 68, - 956, 68, 68, 957, 68, 950, 958, 68, 960, 68, - 68, 961, 962, 952, 963, 953, 68, 964, 955, 68, - - 954, 968, 965, 967, 68, 966, 972, 956, 975, 68, - 957, 971, 68, 969, 68, 960, 974, 68, 961, 962, - 970, 963, 68, 68, 964, 1342, 976, 68, 968, 965, - 967, 68, 966, 68, 973, 68, 68, 68, 971, 977, - 969, 68, 978, 974, 979, 989, 980, 970, 68, 68, - 981, 982, 983, 976, 68, 986, 68, 68, 984, 987, - 990, 973, 68, 985, 991, 68, 977, 988, 992, 978, - 68, 979, 68, 980, 68, 993, 68, 981, 982, 983, - 68, 994, 68, 995, 996, 984, 987, 68, 998, 997, - 985, 999, 1000, 68, 988, 68, 68, 1001, 1002, 68, - - 1005, 1004, 68, 68, 1003, 1006, 68, 1011, 994, 1007, - 1342, 996, 68, 1008, 68, 998, 997, 1009, 999, 68, - 1017, 1010, 68, 68, 1001, 68, 1012, 68, 1004, 68, - 68, 1003, 68, 1014, 1011, 68, 1007, 1013, 68, 68, - 1008, 1015, 68, 1016, 1009, 1018, 1019, 68, 1010, 1021, - 1342, 1023, 68, 1012, 1022, 1020, 1342, 1342, 68, 68, - 1014, 68, 1025, 1024, 1013, 68, 1026, 1027, 1015, 68, - 1016, 1028, 1018, 68, 1342, 68, 1021, 68, 68, 68, - 1029, 1022, 1020, 68, 1030, 1031, 68, 1033, 1034, 1025, - 1024, 1035, 68, 1026, 1027, 68, 1032, 68, 1028, 68, - - 68, 1036, 1038, 68, 1037, 1039, 68, 1029, 1040, 68, - 1342, 1030, 1031, 68, 1033, 1034, 1041, 68, 1035, 68, - 1042, 1046, 1043, 1032, 1044, 1342, 1047, 1045, 1036, 68, - 68, 1037, 1039, 68, 68, 1040, 1050, 1048, 1342, 1066, - 1051, 68, 68, 1041, 68, 68, 1049, 1042, 68, 1043, - 1055, 1044, 68, 1047, 1045, 68, 1054, 1052, 1057, 68, - 1053, 1056, 1068, 68, 1048, 1059, 68, 1051, 68, 1058, - 1064, 1060, 68, 1049, 1062, 68, 68, 1055, 68, 68, - 68, 68, 1061, 1054, 1052, 1057, 1063, 1053, 1056, 68, - 1065, 68, 1059, 68, 1067, 68, 1058, 1064, 1060, 1070, - - 1072, 1062, 1069, 1071, 1073, 1074, 1129, 68, 68, 1061, - 68, 1076, 68, 1063, 68, 1075, 1080, 1065, 1077, 1078, - 1342, 1067, 68, 1342, 68, 68, 1070, 1072, 1079, 1069, - 1071, 68, 1074, 68, 68, 1081, 1082, 68, 68, 68, - 1083, 68, 1075, 1080, 68, 1077, 1078, 68, 1084, 1085, - 68, 1086, 68, 1088, 1087, 1079, 68, 1090, 68, 68, - 68, 1091, 1081, 1082, 1089, 1092, 1095, 1083, 68, 1093, - 68, 1094, 1096, 1097, 1098, 1084, 1085, 1099, 1086, 68, - 1088, 1087, 1100, 68, 68, 68, 1101, 68, 1091, 1102, - 68, 1089, 1092, 68, 1103, 1104, 1093, 68, 1094, 68, - - 1097, 68, 68, 1105, 68, 1107, 1106, 1109, 1342, 1100, - 1108, 1110, 1342, 68, 68, 1113, 68, 68, 1114, 68, - 1115, 1103, 1104, 1342, 1111, 1116, 68, 1118, 68, 1120, - 68, 1119, 68, 1106, 1109, 68, 1342, 1108, 1110, 1112, - 1117, 68, 68, 1121, 68, 1114, 1122, 68, 68, 68, - 68, 1111, 68, 68, 1118, 1123, 1120, 1124, 1119, 1125, - 1126, 1127, 1128, 68, 1342, 68, 1112, 1117, 1130, 68, - 1121, 1131, 68, 1122, 1132, 1134, 1133, 1140, 68, 68, - 68, 68, 1123, 1139, 1124, 1135, 1125, 1126, 1127, 1128, - 1138, 68, 68, 1136, 1141, 1130, 1137, 1150, 1131, 68, - - 1143, 1132, 68, 1133, 1140, 68, 68, 68, 68, 1142, - 1139, 68, 1135, 1144, 1151, 1145, 1147, 1138, 1146, 1148, - 1136, 68, 1149, 1137, 68, 68, 68, 1143, 68, 1153, - 1155, 1161, 68, 1154, 1157, 68, 1142, 68, 1156, 68, - 68, 1151, 1145, 1147, 68, 1146, 1148, 1152, 1158, 1149, - 1159, 68, 68, 1160, 1165, 68, 1153, 1155, 68, 1162, - 1154, 68, 68, 1164, 68, 1156, 1166, 1163, 68, 1167, - 68, 1169, 1168, 1170, 1152, 1158, 68, 68, 68, 1171, - 68, 1165, 1172, 1173, 68, 68, 1162, 1174, 1176, 1177, - 1164, 68, 1175, 68, 1163, 68, 1167, 68, 1169, 1168, - - 1170, 68, 68, 68, 68, 1178, 68, 1180, 1181, 68, - 68, 1179, 1182, 68, 1174, 1176, 1177, 1183, 68, 1175, - 68, 1187, 1184, 1188, 68, 1185, 68, 1186, 68, 1189, - 68, 1190, 1178, 1191, 68, 1181, 68, 1192, 1179, 1182, - 68, 1193, 68, 1194, 1183, 68, 1196, 1195, 1187, 1184, - 1188, 68, 1185, 1197, 1186, 68, 1189, 1200, 68, 68, - 1191, 68, 68, 68, 1192, 1198, 1201, 1199, 68, 1202, - 1194, 1203, 1208, 1196, 1195, 68, 68, 1207, 1204, 68, - 1197, 68, 1205, 1209, 68, 68, 1206, 1211, 1213, 1214, - 68, 1210, 1198, 68, 1199, 68, 1202, 68, 1203, 68, - - 68, 68, 1215, 1212, 1207, 1204, 1217, 1216, 1220, 1205, - 1209, 68, 68, 1206, 68, 68, 68, 1218, 1210, 1219, - 1221, 1222, 1225, 1223, 68, 1224, 1226, 68, 68, 1215, - 1212, 1227, 68, 1217, 1216, 1220, 1228, 68, 1229, 68, - 1231, 68, 1230, 68, 1218, 68, 1219, 1221, 1222, 68, - 1223, 1232, 1224, 68, 1233, 68, 1234, 1240, 1235, 1342, - 1236, 1237, 68, 68, 68, 68, 1242, 1231, 68, 1230, - 1247, 1241, 1238, 1243, 68, 68, 68, 1245, 1232, 68, - 68, 1233, 1239, 1234, 68, 1235, 68, 1236, 1237, 68, - 68, 1244, 68, 68, 1246, 68, 1248, 68, 1241, 1238, - - 1243, 1249, 1250, 68, 1245, 1251, 1252, 1253, 68, 1239, - 1255, 1254, 1256, 68, 1342, 1258, 68, 1257, 1244, 1262, - 1342, 1246, 1259, 1248, 68, 1264, 68, 68, 1249, 1250, - 68, 1260, 68, 68, 1253, 1261, 68, 1263, 1254, 68, - 68, 68, 1258, 68, 1257, 68, 1262, 68, 68, 1259, - 68, 1267, 1264, 1265, 1266, 68, 1268, 1270, 1260, 1271, - 68, 1269, 1261, 68, 1263, 1342, 68, 1272, 1276, 68, - 68, 1273, 1275, 1274, 1277, 1342, 1278, 1342, 1267, 1279, - 1265, 1266, 1280, 1268, 1270, 68, 68, 68, 1269, 68, - 68, 68, 1281, 1342, 1272, 1276, 68, 68, 1273, 1275, - - 1274, 1277, 68, 1278, 68, 1282, 1279, 1284, 1283, 1280, - 68, 1285, 1286, 68, 1287, 1289, 1292, 1288, 1291, 1281, - 68, 1294, 68, 68, 1290, 68, 68, 1293, 1297, 68, - 1298, 1342, 1282, 1295, 68, 1283, 68, 68, 1285, 1286, - 68, 1287, 1289, 68, 1288, 1291, 1300, 1296, 68, 68, - 1299, 1290, 68, 1302, 1293, 68, 1301, 68, 68, 1304, - 1295, 68, 1305, 68, 1303, 1306, 1307, 1308, 1309, 1310, - 68, 1312, 1314, 1300, 1296, 1311, 1342, 1299, 68, 68, - 68, 1313, 1315, 1301, 1316, 1317, 68, 1321, 68, 1305, - 1323, 1303, 1306, 1307, 68, 68, 68, 68, 68, 68, - - 1318, 1319, 1311, 68, 68, 1325, 1320, 68, 1313, 1315, - 1327, 1316, 68, 68, 68, 1322, 1324, 68, 1326, 68, - 1328, 1329, 68, 68, 1330, 1331, 1332, 1318, 1319, 1333, - 68, 1334, 68, 1320, 1336, 1342, 1339, 1327, 68, 68, - 1342, 68, 1322, 1324, 1337, 1326, 1341, 68, 68, 68, - 1335, 68, 68, 1332, 68, 68, 1333, 68, 1334, 1340, - 1338, 68, 68, 1339, 1342, 1342, 1342, 68, 1342, 1342, - 1342, 1337, 68, 68, 1342, 1342, 1342, 1335, 1342, 1342, - 1342, 1342, 1342, 1342, 1342, 1342, 1340, 1338, 40, 40, - 40, 40, 40, 40, 40, 45, 45, 45, 45, 45, - - 45, 45, 50, 50, 50, 50, 50, 50, 50, 56, - 56, 56, 56, 56, 56, 56, 61, 61, 61, 61, - 61, 61, 61, 71, 71, 1342, 71, 71, 71, 71, - 120, 120, 1342, 1342, 1342, 120, 120, 122, 122, 1342, - 1342, 122, 1342, 122, 124, 1342, 1342, 1342, 1342, 1342, - 124, 127, 127, 1342, 1342, 1342, 127, 127, 129, 1342, - 1342, 1342, 1342, 1342, 129, 131, 131, 1342, 131, 131, - 131, 131, 72, 72, 1342, 72, 72, 72, 72, 13, - 1342, 1342, 1342, 1342, 1342, 1342, 1342, 1342, 1342, 1342, + 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 14, + 35, 36, 37, 38, 39, 14, 14, 14, 14, 41, + 42, 43, 41, 42, 43, 122, 46, 47, 122, 44, + 48, 69, 44, 46, 47, 70, 49, 48, 57, 58, + 59, 68, 68, 49, 51, 52, 53, 54, 60, 18, + 57, 58, 59, 120, 120, 55, 51, 52, 53, 54, + 60, 18, 68, 101, 183, 74, 75, 55, 15, 16, + 17, 62, 63, 64, 67, 67, 68, 67, 67, 65, + + 67, 93, 68, 76, 68, 67, 84, 68, 66, 15, + 16, 17, 62, 63, 64, 68, 68, 77, 134, 86, + 65, 69, 92, 130, 78, 70, 85, 68, 87, 66, + 72, 79, 72, 72, 68, 72, 88, 133, 68, 80, + 72, 73, 89, 81, 68, 90, 82, 68, 68, 83, + 68, 98, 91, 150, 68, 99, 95, 127, 127, 94, + 68, 68, 96, 102, 137, 106, 97, 68, 68, 103, + 68, 100, 104, 109, 135, 107, 68, 68, 108, 105, + 68, 68, 113, 110, 114, 138, 130, 111, 112, 68, + 116, 68, 118, 149, 139, 117, 119, 136, 124, 115, + + 124, 124, 72, 124, 72, 72, 129, 72, 129, 129, + 68, 129, 67, 132, 67, 67, 68, 67, 68, 68, + 68, 68, 67, 72, 143, 72, 72, 68, 72, 68, + 140, 68, 142, 72, 73, 145, 146, 141, 147, 68, + 68, 68, 144, 152, 68, 148, 153, 68, 68, 156, + 155, 158, 68, 151, 163, 159, 161, 68, 68, 68, + 154, 160, 68, 68, 162, 164, 68, 167, 68, 157, + 68, 68, 165, 169, 68, 68, 176, 170, 68, 68, + 68, 68, 166, 68, 168, 68, 173, 172, 68, 178, + 171, 177, 68, 68, 174, 68, 175, 184, 180, 181, + + 120, 120, 127, 127, 122, 185, 182, 122, 130, 179, + 130, 187, 124, 186, 124, 124, 129, 124, 129, 129, + 72, 129, 72, 72, 68, 72, 68, 189, 68, 188, + 68, 132, 68, 68, 194, 68, 191, 196, 68, 68, + 195, 190, 68, 68, 202, 192, 68, 68, 68, 68, + 68, 204, 206, 193, 68, 207, 68, 203, 197, 68, + 68, 213, 68, 198, 209, 68, 216, 68, 199, 68, + 205, 68, 128, 208, 200, 201, 218, 210, 212, 68, + 211, 68, 214, 215, 68, 217, 222, 219, 220, 68, + 221, 68, 224, 225, 223, 68, 68, 68, 68, 68, + + 68, 68, 226, 68, 68, 227, 229, 68, 68, 68, + 68, 231, 238, 234, 68, 68, 228, 68, 68, 232, + 240, 242, 241, 230, 68, 245, 68, 233, 236, 237, + 68, 235, 68, 244, 239, 247, 68, 130, 248, 68, + 68, 253, 68, 243, 68, 68, 68, 68, 246, 250, + 252, 68, 254, 68, 258, 249, 68, 259, 251, 255, + 68, 257, 68, 256, 68, 260, 68, 68, 266, 263, + 68, 264, 68, 68, 68, 268, 261, 262, 68, 265, + 270, 68, 68, 269, 68, 68, 267, 68, 275, 68, + 68, 68, 278, 68, 68, 68, 279, 68, 68, 68, + + 272, 271, 274, 277, 68, 273, 280, 283, 276, 288, + 68, 285, 281, 68, 68, 282, 68, 284, 286, 287, + 68, 68, 68, 289, 294, 68, 295, 68, 296, 292, + 290, 293, 68, 291, 68, 299, 68, 68, 68, 68, + 68, 302, 301, 68, 308, 68, 68, 297, 68, 68, + 309, 68, 68, 303, 298, 307, 300, 68, 68, 304, + 313, 68, 305, 68, 306, 130, 312, 68, 68, 310, + 324, 311, 315, 126, 68, 68, 314, 68, 323, 316, + 317, 68, 327, 329, 68, 68, 325, 326, 68, 318, + 68, 319, 320, 321, 328, 330, 322, 68, 68, 331, + + 332, 333, 335, 68, 334, 336, 337, 68, 68, 68, + 68, 342, 68, 68, 68, 125, 343, 68, 338, 339, + 68, 68, 68, 340, 341, 350, 346, 349, 345, 348, + 352, 344, 68, 68, 68, 68, 68, 68, 354, 347, + 353, 351, 68, 356, 68, 357, 68, 68, 68, 355, + 68, 68, 361, 359, 68, 68, 68, 364, 358, 360, + 362, 68, 365, 68, 68, 68, 369, 363, 68, 366, + 68, 367, 68, 368, 68, 375, 68, 373, 68, 68, + 68, 68, 374, 378, 372, 370, 68, 68, 371, 68, + 68, 380, 68, 68, 376, 68, 379, 390, 68, 393, + + 377, 68, 68, 381, 68, 395, 389, 391, 382, 68, + 383, 68, 388, 392, 68, 384, 396, 385, 68, 68, + 394, 68, 68, 397, 68, 386, 401, 68, 130, 398, + 68, 402, 405, 406, 68, 387, 68, 399, 68, 410, + 68, 400, 404, 403, 68, 68, 407, 68, 408, 409, + 68, 68, 68, 414, 416, 68, 411, 412, 417, 68, + 418, 68, 413, 123, 415, 68, 419, 68, 420, 68, + 421, 68, 425, 422, 68, 68, 423, 68, 424, 68, + 68, 428, 429, 426, 68, 427, 68, 68, 68, 430, + 68, 68, 435, 432, 436, 68, 68, 437, 433, 68, + + 431, 68, 434, 68, 438, 68, 68, 439, 442, 68, + 441, 443, 445, 68, 450, 68, 68, 68, 447, 446, + 68, 444, 68, 448, 68, 68, 68, 449, 453, 440, + 451, 452, 68, 458, 455, 457, 68, 454, 456, 68, + 68, 68, 461, 68, 459, 463, 462, 68, 68, 68, + 464, 68, 68, 68, 465, 68, 68, 469, 68, 460, + 68, 474, 68, 68, 470, 121, 68, 466, 68, 476, + 467, 471, 468, 68, 68, 473, 472, 477, 68, 478, + 68, 475, 480, 68, 68, 68, 68, 68, 68, 483, + 482, 485, 484, 481, 479, 68, 68, 489, 68, 130, + + 486, 68, 68, 488, 491, 487, 68, 68, 497, 492, + 68, 493, 490, 68, 68, 495, 68, 68, 68, 502, + 498, 68, 494, 496, 506, 500, 68, 68, 499, 68, + 503, 505, 504, 501, 68, 68, 507, 68, 508, 68, + 513, 509, 68, 517, 68, 516, 510, 68, 68, 519, + 68, 68, 511, 512, 518, 514, 68, 521, 68, 68, + 68, 522, 68, 526, 515, 520, 68, 68, 525, 68, + 531, 523, 530, 68, 529, 68, 68, 68, 524, 532, + 68, 527, 68, 533, 68, 528, 68, 68, 534, 68, + 535, 537, 539, 68, 538, 541, 68, 540, 68, 68, + + 68, 543, 536, 68, 545, 68, 68, 68, 68, 547, + 68, 68, 68, 544, 68, 542, 68, 548, 68, 68, + 546, 68, 555, 554, 68, 68, 68, 560, 549, 550, + 551, 68, 553, 552, 556, 558, 563, 68, 557, 559, + 68, 68, 68, 68, 561, 562, 564, 68, 567, 68, + 569, 68, 566, 570, 571, 68, 565, 68, 68, 574, + 68, 576, 68, 68, 68, 577, 130, 68, 568, 68, + 573, 579, 68, 572, 68, 68, 68, 68, 578, 68, + 575, 588, 68, 68, 68, 595, 68, 68, 580, 582, + 68, 590, 594, 591, 68, 602, 581, 68, 593, 589, + + 583, 601, 584, 592, 68, 596, 585, 68, 586, 68, + 597, 68, 598, 587, 600, 68, 603, 68, 68, 605, + 68, 606, 604, 608, 68, 68, 610, 68, 68, 609, + 599, 68, 68, 614, 68, 611, 68, 607, 68, 612, + 613, 68, 68, 615, 68, 621, 617, 68, 68, 68, + 68, 68, 68, 620, 624, 616, 619, 625, 618, 68, + 627, 68, 628, 623, 626, 622, 629, 68, 630, 68, + 634, 68, 631, 68, 68, 632, 68, 68, 633, 68, + 637, 68, 68, 68, 635, 68, 639, 640, 68, 641, + 68, 642, 643, 68, 68, 68, 636, 644, 646, 68, + + 638, 68, 68, 130, 68, 68, 68, 68, 645, 651, + 652, 68, 647, 68, 654, 650, 68, 656, 648, 68, + 657, 649, 68, 68, 653, 68, 660, 655, 658, 659, + 68, 68, 663, 661, 68, 662, 68, 68, 68, 68, + 68, 68, 671, 665, 68, 672, 68, 68, 68, 664, + 68, 673, 68, 668, 68, 669, 666, 676, 674, 68, + 68, 670, 675, 667, 679, 68, 68, 68, 68, 677, + 68, 68, 682, 68, 678, 681, 684, 686, 680, 68, + 68, 68, 68, 68, 68, 68, 68, 683, 687, 685, + 68, 68, 694, 68, 690, 688, 689, 68, 68, 698, + + 68, 700, 691, 693, 68, 692, 695, 697, 68, 68, + 696, 699, 703, 702, 68, 68, 704, 68, 735, 707, + 701, 68, 705, 706, 68, 68, 708, 68, 68, 68, + 711, 68, 709, 710, 68, 713, 712, 715, 716, 68, + 68, 68, 68, 68, 717, 718, 68, 68, 68, 719, + 68, 724, 714, 68, 720, 68, 721, 723, 722, 68, + 68, 68, 68, 725, 733, 68, 68, 727, 726, 729, + 734, 68, 68, 730, 728, 738, 68, 736, 731, 68, + 740, 68, 68, 68, 68, 737, 68, 732, 741, 742, + 68, 744, 745, 68, 68, 68, 68, 68, 746, 739, + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 01:29:00 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D750FC46; Sun, 15 Sep 2013 01:29:00 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B5843265E; Sun, 15 Sep 2013 01:29:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F1T0gq014390; Sun, 15 Sep 2013 01:29:00 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F1T0f6014382; Sun, 15 Sep 2013 01:29:00 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150129.r8F1T0f6014382@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 01:29:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255583 - head/contrib/unbound/libunbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 01:29:00 -0000 Author: des Date: Sun Sep 15 01:29:00 2013 New Revision: 255583 URL: http://svnweb.freebsd.org/changeset/base/255583 Log: Move more prototypes around, and remove one that wasn't used. Approved by: re (blanket) Modified: head/contrib/unbound/libunbound/libworker.h head/contrib/unbound/libunbound/worker.h Modified: head/contrib/unbound/libunbound/libworker.h ============================================================================== --- head/contrib/unbound/libunbound/libworker.h Sun Sep 15 00:40:46 2013 (r255582) +++ head/contrib/unbound/libunbound/libworker.h Sun Sep 15 01:29:00 2013 (r255583) @@ -109,52 +109,6 @@ int libworker_fg(struct ub_ctx* ctx, str /** cleanup the cache to remove all rrset IDs from it, arg is libworker */ void libworker_alloc_cleanup(void* arg); -/** - * Worker service routine to send serviced queries to authoritative servers. - * @param qname: query name. (host order) - * @param qnamelen: length in bytes of qname, including trailing 0. - * @param qtype: query type. (host order) - * @param qclass: query class. (host order) - * @param flags: host order flags word, with opcode and CD bit. - * @param dnssec: if set, EDNS record will have DO bit set. - * @param want_dnssec: signatures needed. - * @param addr: where to. - * @param addrlen: length of addr. - * @param zone: delegation point name. - * @param zonelen: length of zone name wireformat dname. - * @param q: wich query state to reactivate upon return. - * @return: false on failure (memory or socket related). no query was - * sent. - */ -struct outbound_entry* libworker_send_query(uint8_t* qname, size_t qnamelen, - uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, - int want_dnssec, struct sockaddr_storage* addr, socklen_t addrlen, - uint8_t* zone, size_t zonelen, struct module_qstate* q); - -/** process incoming replies from the network */ -int libworker_handle_reply(struct comm_point* c, void* arg, int error, - struct comm_reply* reply_info); - -/** process incoming serviced query replies from the network */ -int libworker_handle_service_reply(struct comm_point* c, void* arg, int error, - struct comm_reply* reply_info); - -/** handle control command coming into server */ -void libworker_handle_control_cmd(struct tube* tube, uint8_t* msg, size_t len, - int err, void* arg); - -/** handle opportunity to write result back */ -void libworker_handle_result_write(struct tube* tube, uint8_t* msg, size_t len, - int err, void* arg); - -/** mesh callback with fg results */ -void libworker_fg_done_cb(void* arg, int rcode, ldns_buffer* buf, - enum sec_status s, char* why_bogus); - -/** mesh callback with bg results */ -void libworker_bg_done_cb(void* arg, int rcode, ldns_buffer* buf, - enum sec_status s, char* why_bogus); - /** * fill result from parsed message, on error fills servfail * @param res: is clear at start, filled in at end. Modified: head/contrib/unbound/libunbound/worker.h ============================================================================== --- head/contrib/unbound/libunbound/worker.h Sun Sep 15 00:40:46 2013 (r255582) +++ head/contrib/unbound/libunbound/worker.h Sun Sep 15 01:29:00 2013 (r255583) @@ -42,6 +42,53 @@ #ifndef LIBUNBOUND_WORKER_H #define LIBUNBOUND_WORKER_H +struct comm_reply; +struct comm_point; +struct module_qstate; +struct tube; + +/** + * Worker service routine to send serviced queries to authoritative servers. + * @param qname: query name. (host order) + * @param qnamelen: length in bytes of qname, including trailing 0. + * @param qtype: query type. (host order) + * @param qclass: query class. (host order) + * @param flags: host order flags word, with opcode and CD bit. + * @param dnssec: if set, EDNS record will have DO bit set. + * @param want_dnssec: signatures needed. + * @param addr: where to. + * @param addrlen: length of addr. + * @param zone: delegation point name. + * @param zonelen: length of zone name wireformat dname. + * @param q: wich query state to reactivate upon return. + * @return: false on failure (memory or socket related). no query was + * sent. + */ +struct outbound_entry* libworker_send_query(uint8_t* qname, size_t qnamelen, + uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, + int want_dnssec, struct sockaddr_storage* addr, socklen_t addrlen, + uint8_t* zone, size_t zonelen, struct module_qstate* q); + +/** process incoming replies from the network */ +int libworker_handle_reply(struct comm_point* c, void* arg, int error, + struct comm_reply* reply_info); + +/** process incoming serviced query replies from the network */ +int libworker_handle_service_reply(struct comm_point* c, void* arg, int error, + struct comm_reply* reply_info); + +/** handle control command coming into server */ +void libworker_handle_control_cmd(struct tube* tube, uint8_t* msg, size_t len, + int err, void* arg); + +/** mesh callback with fg results */ +void libworker_fg_done_cb(void* arg, int rcode, ldns_buffer* buf, + enum sec_status s, char* why_bogus); + +/** mesh callback with bg results */ +void libworker_bg_done_cb(void* arg, int rcode, ldns_buffer* buf, + enum sec_status s, char* why_bogus); + /** * Worker signal handler function. User argument is the worker itself. * @param sig: signal number. From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 01:31:56 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A3528DAB; Sun, 15 Sep 2013 01:31:56 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 828E7269F; Sun, 15 Sep 2013 01:31:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F1VuSr017582; Sun, 15 Sep 2013 01:31:56 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F1Vtj3017571; Sun, 15 Sep 2013 01:31:55 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150131.r8F1Vtj3017571@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 01:31:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255584 - head/contrib/unbound/libunbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 01:31:56 -0000 Author: des Date: Sun Sep 15 01:31:55 2013 New Revision: 255584 URL: http://svnweb.freebsd.org/changeset/base/255584 Log: Wholesale constification. Approved by: re (blanket) Modified: head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/context.h head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/unbound.h Modified: head/contrib/unbound/libunbound/context.c ============================================================================== --- head/contrib/unbound/libunbound/context.c Sun Sep 15 01:29:00 2013 (r255583) +++ head/contrib/unbound/libunbound/context.c Sun Sep 15 01:31:55 2013 (r255584) @@ -124,7 +124,7 @@ find_id(struct ub_ctx* ctx, int* id) } struct ctx_query* -context_new(struct ub_ctx* ctx, char* name, int rrtype, int rrclass, +context_new(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, ub_callback_t cb, void* cbarg) { struct ctx_query* q = (struct ctx_query*)calloc(1, sizeof(*q)); Modified: head/contrib/unbound/libunbound/context.h ============================================================================== --- head/contrib/unbound/libunbound/context.h Sun Sep 15 01:29:00 2013 (r255583) +++ head/contrib/unbound/libunbound/context.h Sun Sep 15 01:31:55 2013 (r255584) @@ -234,8 +234,8 @@ void context_query_delete(struct ctx_que * @param cbarg: user arg for async queries. * @return new ctx_query or NULL for malloc failure. */ -struct ctx_query* context_new(struct ub_ctx* ctx, char* name, int rrtype, - int rrclass, ub_callback_t cb, void* cbarg); +struct ctx_query* context_new(struct ub_ctx* ctx, const char* name, + int rrtype, int rrclass, ub_callback_t cb, void* cbarg); /** * Get a new alloc. Creates a new one or uses a cached one. Modified: head/contrib/unbound/libunbound/libunbound.c ============================================================================== --- head/contrib/unbound/libunbound/libunbound.c Sun Sep 15 01:29:00 2013 (r255583) +++ head/contrib/unbound/libunbound/libunbound.c Sun Sep 15 01:31:55 2013 (r255584) @@ -229,7 +229,7 @@ ub_ctx_delete(struct ub_ctx* ctx) } int -ub_ctx_set_option(struct ub_ctx* ctx, char* opt, char* val) +ub_ctx_set_option(struct ub_ctx* ctx, const char* opt, const char* val) { lock_basic_lock(&ctx->cfglock); if(ctx->finalized) { @@ -245,7 +245,7 @@ ub_ctx_set_option(struct ub_ctx* ctx, ch } int -ub_ctx_get_option(struct ub_ctx* ctx, char* opt, char** str) +ub_ctx_get_option(struct ub_ctx* ctx, const char* opt, char** str) { int r; lock_basic_lock(&ctx->cfglock); @@ -258,7 +258,7 @@ ub_ctx_get_option(struct ub_ctx* ctx, ch } int -ub_ctx_config(struct ub_ctx* ctx, char* fname) +ub_ctx_config(struct ub_ctx* ctx, const char* fname) { lock_basic_lock(&ctx->cfglock); if(ctx->finalized) { @@ -274,7 +274,7 @@ ub_ctx_config(struct ub_ctx* ctx, char* } int -ub_ctx_add_ta(struct ub_ctx* ctx, char* ta) +ub_ctx_add_ta(struct ub_ctx* ctx, const char* ta) { char* dup = strdup(ta); if(!dup) return UB_NOMEM; @@ -294,7 +294,7 @@ ub_ctx_add_ta(struct ub_ctx* ctx, char* } int -ub_ctx_add_ta_file(struct ub_ctx* ctx, char* fname) +ub_ctx_add_ta_file(struct ub_ctx* ctx, const char* fname) { char* dup = strdup(fname); if(!dup) return UB_NOMEM; @@ -314,7 +314,7 @@ ub_ctx_add_ta_file(struct ub_ctx* ctx, c } int -ub_ctx_trustedkeys(struct ub_ctx* ctx, char* fname) +ub_ctx_trustedkeys(struct ub_ctx* ctx, const char* fname) { char* dup = strdup(fname); if(!dup) return UB_NOMEM; @@ -547,7 +547,7 @@ ub_wait(struct ub_ctx* ctx) } int -ub_resolve(struct ub_ctx* ctx, char* name, int rrtype, +ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, struct ub_result** result) { struct ctx_query* q; @@ -591,7 +591,7 @@ ub_resolve(struct ub_ctx* ctx, char* nam } int -ub_resolve_async(struct ub_ctx* ctx, char* name, int rrtype, +ub_resolve_async(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, void* mydata, ub_callback_t callback, int* async_id) { struct ctx_query* q; @@ -732,7 +732,7 @@ ub_strerror(int err) } int -ub_ctx_set_fwd(struct ub_ctx* ctx, char* addr) +ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr) { struct sockaddr_storage storage; socklen_t stlen; @@ -804,7 +804,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, char* } int -ub_ctx_resolvconf(struct ub_ctx* ctx, char* fname) +ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname) { FILE* in; int numserv = 0; @@ -890,7 +890,7 @@ ub_ctx_resolvconf(struct ub_ctx* ctx, ch } int -ub_ctx_hosts(struct ub_ctx* ctx, char* fname) +ub_ctx_hosts(struct ub_ctx* ctx, const char* fname) { FILE* in; char buf[1024], ldata[1024]; Modified: head/contrib/unbound/libunbound/unbound.h ============================================================================== --- head/contrib/unbound/libunbound/unbound.h Sun Sep 15 01:29:00 2013 (r255583) +++ head/contrib/unbound/libunbound/unbound.h Sun Sep 15 01:31:55 2013 (r255584) @@ -245,7 +245,7 @@ void ub_ctx_delete(struct ub_ctx* ctx); * @param val: value of the option. * @return: 0 if OK, else error. */ -int ub_ctx_set_option(struct ub_ctx* ctx, char* opt, char* val); +int ub_ctx_set_option(struct ub_ctx* ctx, const char* opt, const char* val); /** * Get an option from the context. @@ -261,7 +261,7 @@ int ub_ctx_set_option(struct ub_ctx* ctx * returned in the string. * @return 0 if OK else an error code (malloc failure, syntax error). */ -int ub_ctx_get_option(struct ub_ctx* ctx, char* opt, char** str); +int ub_ctx_get_option(struct ub_ctx* ctx, const char* opt, char** str); /** * setup configuration for the given context. @@ -273,7 +273,7 @@ int ub_ctx_get_option(struct ub_ctx* ctx * routines exist. * @return: 0 if OK, else error. */ -int ub_ctx_config(struct ub_ctx* ctx, char* fname); +int ub_ctx_config(struct ub_ctx* ctx, const char* fname); /** * Set machine to forward DNS queries to, the caching resolver to use. @@ -292,7 +292,7 @@ int ub_ctx_config(struct ub_ctx* ctx, ch * If the addr is NULL, forwarding is disabled. * @return 0 if OK, else error. */ -int ub_ctx_set_fwd(struct ub_ctx* ctx, char* addr); +int ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr); /** * Read list of nameservers to use from the filename given. @@ -308,7 +308,7 @@ int ub_ctx_set_fwd(struct ub_ctx* ctx, c * @param fname: file name string. If NULL "/etc/resolv.conf" is used. * @return 0 if OK, else error. */ -int ub_ctx_resolvconf(struct ub_ctx* ctx, char* fname); +int ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname); /** * Read list of hosts from the filename given. @@ -321,7 +321,7 @@ int ub_ctx_resolvconf(struct ub_ctx* ctx * @param fname: file name string. If NULL "/etc/hosts" is used. * @return 0 if OK, else error. */ -int ub_ctx_hosts(struct ub_ctx* ctx, char* fname); +int ub_ctx_hosts(struct ub_ctx* ctx, const char* fname); /** * Add a trust anchor to the given context. @@ -334,7 +334,7 @@ int ub_ctx_hosts(struct ub_ctx* ctx, cha * [domainname] [TTL optional] [type] [class optional] [rdata contents] * @return 0 if OK, else error. */ -int ub_ctx_add_ta(struct ub_ctx* ctx, char* ta); +int ub_ctx_add_ta(struct ub_ctx* ctx, const char* ta); /** * Add trust anchors to the given context. @@ -345,7 +345,7 @@ int ub_ctx_add_ta(struct ub_ctx* ctx, ch * @param fname: filename of file with keyfile with trust anchors. * @return 0 if OK, else error. */ -int ub_ctx_add_ta_file(struct ub_ctx* ctx, char* fname); +int ub_ctx_add_ta_file(struct ub_ctx* ctx, const char* fname); /** * Add trust anchors to the given context. @@ -357,7 +357,7 @@ int ub_ctx_add_ta_file(struct ub_ctx* ct * anchors. * @return 0 if OK, else error. */ -int ub_ctx_trustedkeys(struct ub_ctx* ctx, char* fname); +int ub_ctx_trustedkeys(struct ub_ctx* ctx, const char* fname); /** * Set debug output (and error output) to the specified stream. @@ -442,7 +442,7 @@ int ub_process(struct ub_ctx* ctx); * in that case (out of memory). * @return 0 if OK, else error. */ -int ub_resolve(struct ub_ctx* ctx, char* name, int rrtype, +int ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, struct ub_result** result); /** @@ -473,7 +473,7 @@ int ub_resolve(struct ub_ctx* ctx, char* * cancel the query. * @return 0 if OK, else error. */ -int ub_resolve_async(struct ub_ctx* ctx, char* name, int rrtype, +int ub_resolve_async(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, void* mydata, ub_callback_t callback, int* async_id); /** From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 01:32:33 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 42ABBEE4; Sun, 15 Sep 2013 01:32:33 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1538226A5; Sun, 15 Sep 2013 01:32:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F1WWdp017892; Sun, 15 Sep 2013 01:32:32 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F1WWxA017891; Sun, 15 Sep 2013 01:32:32 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150132.r8F1WWxA017891@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 01:32:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255585 - head/contrib/unbound/smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 01:32:33 -0000 Author: des Date: Sun Sep 15 01:32:32 2013 New Revision: 255585 URL: http://svnweb.freebsd.org/changeset/base/255585 Log: Add missing #includes and fix some incorrect definitions. Approved by: re (blanket) Modified: head/contrib/unbound/smallapp/worker_cb.c Modified: head/contrib/unbound/smallapp/worker_cb.c ============================================================================== --- head/contrib/unbound/smallapp/worker_cb.c Sun Sep 15 01:31:55 2013 (r255584) +++ head/contrib/unbound/smallapp/worker_cb.c Sun Sep 15 01:32:32 2013 (r255585) @@ -41,12 +41,11 @@ * linked into the resulting program. */ #include "config.h" +#include "libunbound/context.h" +#include "libunbound/worker.h" +#include "util/fptr_wlist.h" #include "util/log.h" #include "services/mesh.h" -struct comm_reply; -struct comm_point; -struct module_qstate; -struct tube; void worker_handle_control_cmd(struct tube* ATTR_UNUSED(tube), uint8_t* ATTR_UNUSED(buffer), size_t ATTR_UNUSED(len), @@ -103,9 +102,10 @@ void worker_sighandler(int ATTR_UNUSED(s struct outbound_entry* worker_send_query(uint8_t* ATTR_UNUSED(qname), size_t ATTR_UNUSED(qnamelen), uint16_t ATTR_UNUSED(qtype), uint16_t ATTR_UNUSED(qclass), uint16_t ATTR_UNUSED(flags), - int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec), + int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec), struct sockaddr_storage* ATTR_UNUSED(addr), - socklen_t ATTR_UNUSED(addrlen), struct module_qstate* ATTR_UNUSED(q)) + socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), + size_t ATTR_UNUSED(zonelen), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); return 0; @@ -136,7 +136,8 @@ struct outbound_entry* libworker_send_qu uint16_t ATTR_UNUSED(qclass), uint16_t ATTR_UNUSED(flags), int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec), struct sockaddr_storage* ATTR_UNUSED(addr), - socklen_t ATTR_UNUSED(addrlen), struct module_qstate* ATTR_UNUSED(q)) + socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone), + size_t ATTR_UNUSED(zonelen), struct module_qstate* ATTR_UNUSED(q)) { log_assert(0); return 0; From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 01:44:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4124111A; Sun, 15 Sep 2013 01:44:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2ECE626FB; Sun, 15 Sep 2013 01:44:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F1i8QM023262; Sun, 15 Sep 2013 01:44:08 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F1i88g023261; Sun, 15 Sep 2013 01:44:08 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309150144.r8F1i88g023261@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 01:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255586 - head/contrib/unbound/smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 01:44:08 -0000 Author: des Date: Sun Sep 15 01:44:07 2013 New Revision: 255586 URL: http://svnweb.freebsd.org/changeset/base/255586 Log: Massive constification + solve an alignment issue by using a union. Approved by: re (blanket) Modified: head/contrib/unbound/smallapp/unbound-anchor.c Modified: head/contrib/unbound/smallapp/unbound-anchor.c ============================================================================== --- head/contrib/unbound/smallapp/unbound-anchor.c Sun Sep 15 01:32:32 2013 (r255585) +++ head/contrib/unbound/smallapp/unbound-anchor.c Sun Sep 15 01:44:07 2013 (r255586) @@ -244,7 +244,7 @@ get_builtin_ds(void) /** print hex data */ static void -print_data(char* msg, char* data, int len) +print_data(const char* msg, const char* data, int len) { int i; printf("%s: ", msg); @@ -268,8 +268,8 @@ ub_ctx_error_exit(struct ub_ctx* ctx, co * Create a new unbound context with the commandline settings applied */ static struct ub_ctx* -create_unbound_context(char* res_conf, char* root_hints, char* debugconf, - int ip4only, int ip6only) +create_unbound_context(const char* res_conf, const char* root_hints, + const char* debugconf, int ip4only, int ip6only) { int r; struct ub_ctx* ctx = ub_ctx_create(); @@ -306,7 +306,7 @@ create_unbound_context(char* res_conf, c /** printout certificate in detail */ static void -verb_cert(char* msg, X509* x) +verb_cert(const char* msg, X509* x) { if(verb == 0 || verb == 1) return; if(verb == 2) { @@ -322,7 +322,7 @@ verb_cert(char* msg, X509* x) /** printout certificates in detail */ static void -verb_certs(char* msg, STACK_OF(X509)* sk) +verb_certs(const char* msg, STACK_OF(X509)* sk) { int i, num = sk_X509_num(sk); if(verb == 0 || verb == 1) return; @@ -360,7 +360,7 @@ read_cert_bio(BIO* bio) /* read the certificate file */ static STACK_OF(X509)* -read_cert_file(char* file) +read_cert_file(const char* file) { STACK_OF(X509)* sk; FILE* in; @@ -435,7 +435,7 @@ read_builtin_cert(void) /** read update cert file or use builtin */ static STACK_OF(X509)* -read_cert_or_builtin(char* file) +read_cert_or_builtin(const char* file) { STACK_OF(X509) *sk = read_cert_file(file); if(!sk) { @@ -459,7 +459,7 @@ do_list_builtin(void) /** printout IP address with message */ static void -verb_addr(char* msg, struct ip_list* ip) +verb_addr(const char* msg, struct ip_list* ip) { if(verb) { char out[100]; @@ -526,7 +526,7 @@ RR_to_ip(int tp, char* data, int len, in /** Resolve name, type, class and add addresses to iplist */ static void -resolve_host_ip(struct ub_ctx* ctx, char* host, int port, int tp, int cl, +resolve_host_ip(struct ub_ctx* ctx, const char* host, int port, int tp, int cl, struct ip_list** head) { struct ub_result* res = NULL; @@ -561,29 +561,27 @@ resolve_host_ip(struct ub_ctx* ctx, char /** parse a text IP address into a sockaddr */ static struct ip_list* -parse_ip_addr(char* str, int port) +parse_ip_addr(const char* str, int port) { socklen_t len = 0; - struct sockaddr_storage* addr = NULL; - struct sockaddr_in6 a6; - struct sockaddr_in a; + union { + struct sockaddr_in6 a6; + struct sockaddr_in a; + } addr; struct ip_list* ip; uint16_t p = (uint16_t)port; - memset(&a6, 0, sizeof(a6)); - memset(&a, 0, sizeof(a)); + memset(&addr, 0, sizeof(addr)); - if(inet_pton(AF_INET6, str, &a6.sin6_addr) > 0) { + if(inet_pton(AF_INET6, str, &addr.a6.sin6_addr) > 0) { /* it is an IPv6 */ - a6.sin6_family = AF_INET6; - a6.sin6_port = (in_port_t)htons(p); - addr = (struct sockaddr_storage*)&a6; - len = (socklen_t)sizeof(struct sockaddr_in6); + addr.a6.sin6_family = AF_INET6; + addr.a6.sin6_port = (in_port_t)htons(p); + len = (socklen_t)sizeof(addr.a6); } - if(inet_pton(AF_INET, str, &a.sin_addr) > 0) { + if(inet_pton(AF_INET, str, &addr.a.sin_addr) > 0) { /* it is an IPv4 */ - a.sin_family = AF_INET; - a.sin_port = (in_port_t)htons(p); - addr = (struct sockaddr_storage*)&a; + addr.a.sin_family = AF_INET; + addr.a.sin_port = (in_port_t)htons(p); len = (socklen_t)sizeof(struct sockaddr_in); } if(!len) return NULL; @@ -593,7 +591,7 @@ parse_ip_addr(char* str, int port) exit(0); } ip->len = len; - memmove(&ip->addr, addr, len); + memmove(&ip->addr, &addr, len); if(verb) printf("server address is %s\n", str); return ip; } @@ -613,8 +611,8 @@ parse_ip_addr(char* str, int port) * @return list of IP addresses. */ static struct ip_list* -resolve_name(char* host, int port, char* res_conf, char* root_hints, - char* debugconf, int ip4only, int ip6only) +resolve_name(const char* host, int port, const char* res_conf, + const char* root_hints, const char* debugconf, int ip4only, int ip6only) { struct ub_ctx* ctx; struct ip_list* list = NULL; @@ -801,7 +799,7 @@ TLS_shutdown(int fd, SSL* ssl, SSL_CTX* /** write a line over SSL */ static int -write_ssl_line(SSL* ssl, char* str, char* sec) +write_ssl_line(SSL* ssl, const char* str, const char* sec) { char buf[1024]; size_t l; @@ -1020,7 +1018,7 @@ do_chunked_read(SSL* ssl) /** start HTTP1.1 transaction on SSL */ static int -write_http_get(SSL* ssl, char* pathname, char* urlname) +write_http_get(SSL* ssl, const char* pathname, const char* urlname) { if(write_ssl_line(ssl, "GET /%s HTTP/1.1", pathname) && write_ssl_line(ssl, "Host: %s", urlname) && @@ -1091,7 +1089,7 @@ read_http_result(SSL* ssl) /** https to an IP addr, return BIO with pathname or NULL */ static BIO* -https_to_ip(struct ip_list* ip, char* pathname, char* urlname) +https_to_ip(struct ip_list* ip, const char* pathname, const char* urlname) { int fd; SSL* ssl; @@ -1131,7 +1129,7 @@ https_to_ip(struct ip_list* ip, char* pa * @return a memory BIO with the file in it. */ static BIO* -https(struct ip_list* ip_list, char* pathname, char* urlname) +https(struct ip_list* ip_list, const char* pathname, const char* urlname) { struct ip_list* ip; BIO* bio = NULL; @@ -1213,7 +1211,7 @@ xml_selectbio(struct xml_data* data, con * NOT zero terminated. * @param len: length of this part of the data. */ -void +static void xml_charhandle(void *userData, const XML_Char *s, int len) { struct xml_data* data = (struct xml_data*)userData; @@ -1256,7 +1254,7 @@ xml_charhandle(void *userData, const XML * @return the value or NULL. (ptr into atts). */ static const XML_Char* -find_att(const XML_Char **atts, XML_Char* name) +find_att(const XML_Char **atts, const XML_Char* name) { int i; for(i=0; atts[i]; i+=2) { @@ -1370,7 +1368,7 @@ handle_keydigest(struct xml_data* data, /** See if XML element equals the zone name */ static int -xml_is_zone_name(BIO* zone, char* name) +xml_is_zone_name(BIO* zone, const char* name) { char buf[1024]; char* z = NULL; @@ -1602,8 +1600,6 @@ xml_parse(BIO* xml, time_t now) XML_ParserFree(parser); if(verb >= 4) { - char* pp = NULL; - int len; (void)BIO_seek(data.ds, 0); len = BIO_get_mem_data(data.ds, &pp); printf("got DS bio %d: '", len); @@ -1646,7 +1642,7 @@ get_usage_of_ex(X509* cert) /** get valid signers from the list of signers in the signature */ static STACK_OF(X509)* -get_valid_signers(PKCS7* p7, char* p7signer) +get_valid_signers(PKCS7* p7, const char* p7signer) { int i; STACK_OF(X509)* validsigners = sk_X509_new_null(); @@ -1729,7 +1725,7 @@ get_valid_signers(PKCS7* p7, char* p7sig /** verify a PKCS7 signature, false on failure */ static int -verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust, char* p7signer) +verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust, const char* p7signer) { PKCS7* p7; X509_STORE *store = X509_STORE_new(); @@ -1807,7 +1803,7 @@ verify_p7sig(BIO* data, BIO* p7s, STACK_ /** write unsigned root anchor file, a 5011 revoked tp */ static void -write_unsigned_root(char* root_anchor_file) +write_unsigned_root(const char* root_anchor_file) { FILE* out; time_t now = time(NULL); @@ -1833,7 +1829,7 @@ write_unsigned_root(char* root_anchor_fi /** write root anchor file */ static void -write_root_anchor(char* root_anchor_file, BIO* ds) +write_root_anchor(const char* root_anchor_file, BIO* ds) { char* pp = NULL; int len; @@ -1859,8 +1855,8 @@ write_root_anchor(char* root_anchor_file /** Perform the verification and update of the trustanchor file */ static void -verify_and_update_anchor(char* root_anchor_file, BIO* xml, BIO* p7s, - STACK_OF(X509)* cert, char* p7signer) +verify_and_update_anchor(const char* root_anchor_file, BIO* xml, BIO* p7s, + STACK_OF(X509)* cert, const char* p7signer) { BIO* ds; @@ -1888,10 +1884,11 @@ static void do_wsa_cleanup(void) { WSACl /** perform actual certupdate work */ static int -do_certupdate(char* root_anchor_file, char* root_cert_file, - char* urlname, char* xmlname, char* p7sname, char* p7signer, - char* res_conf, char* root_hints, char* debugconf, - int ip4only, int ip6only, int port, struct ub_result* dnskey) +do_certupdate(const char* root_anchor_file, const char* root_cert_file, + const char* urlname, const char* xmlname, const char* p7sname, + const char* p7signer, const char* res_conf, const char* root_hints, + const char* debugconf, int ip4only, int ip6only, int port, + struct ub_result* dnskey) { STACK_OF(X509)* cert; BIO *xml, *p7s; @@ -1945,7 +1942,7 @@ do_certupdate(char* root_anchor_file, ch * 2 if it is OK. */ static int -try_read_anchor(char* file) +try_read_anchor(const char* file) { int empty = 1; char line[10240]; @@ -1989,7 +1986,7 @@ try_read_anchor(char* file) /** Write the builtin root anchor to a file */ static void -write_builtin_anchor(char* file) +write_builtin_anchor(const char* file) { const char* builtin_root_anchor = get_builtin_ds(); FILE* out = fopen(file, "w"); @@ -2015,7 +2012,7 @@ write_builtin_anchor(char* file) * @return 0 if trustpoint is insecure, 1 on success. Exit on failure. */ static int -provide_builtin(char* root_anchor_file, int* used_builtin) +provide_builtin(const char* root_anchor_file, int* used_builtin) { /* try to read it */ switch(try_read_anchor(root_anchor_file)) @@ -2037,7 +2034,7 @@ provide_builtin(char* root_anchor_file, * add an autotrust anchor for the root to the context */ static void -add_5011_probe_root(struct ub_ctx* ctx, char* root_anchor_file) +add_5011_probe_root(struct ub_ctx* ctx, const char* root_anchor_file) { int r; r = ub_ctx_set_option(ctx, "auto-trust-anchor-file:", root_anchor_file); @@ -2074,7 +2071,7 @@ prime_root_key(struct ub_ctx* ctx) /** see if ADDPEND keys exist in autotrust file (if possible) */ static int -read_if_pending_keys(char* file) +read_if_pending_keys(const char* file) { FILE* in = fopen(file, "r"); char line[8192]; @@ -2096,7 +2093,7 @@ read_if_pending_keys(char* file) /** read last successful probe time from autotrust file (if possible) */ static int32_t -read_last_success_time(char* file) +read_last_success_time(const char* file) { FILE* in = fopen(file, "r"); char line[1024]; @@ -2133,7 +2130,7 @@ read_last_success_time(char* file) * @return true if certupdate is ok. */ static int -probe_date_allows_certupdate(char* root_anchor_file) +probe_date_allows_certupdate(const char* root_anchor_file) { int has_pending_keys = read_if_pending_keys(root_anchor_file); int32_t last_success = read_last_success_time(root_anchor_file); @@ -2171,10 +2168,10 @@ probe_date_allows_certupdate(char* root_ /** perform the unbound-anchor work */ static int -do_root_update_work(char* root_anchor_file, char* root_cert_file, - char* urlname, char* xmlname, char* p7sname, char* p7signer, - char* res_conf, char* root_hints, char* debugconf, - int ip4only, int ip6only, int force, int port) +do_root_update_work(const char* root_anchor_file, const char* root_cert_file, + const char* urlname, const char* xmlname, const char* p7sname, + const char* p7signer, const char* res_conf, const char* root_hints, + const char* debugconf, int ip4only, int ip6only, int force, int port) { struct ub_ctx* ctx; struct ub_result* dnskey; @@ -2224,15 +2221,15 @@ extern char* optarg; int main(int argc, char* argv[]) { int c; - char* root_anchor_file = ROOT_ANCHOR_FILE; - char* root_cert_file = ROOT_CERT_FILE; - char* urlname = URLNAME; - char* xmlname = XMLNAME; - char* p7sname = P7SNAME; - char* p7signer = P7SIGNER; - char* res_conf = NULL; - char* root_hints = NULL; - char* debugconf = NULL; + const char* root_anchor_file = ROOT_ANCHOR_FILE; + const char* root_cert_file = ROOT_CERT_FILE; + const char* urlname = URLNAME; + const char* xmlname = XMLNAME; + const char* p7sname = P7SNAME; + const char* p7signer = P7SIGNER; + const char* res_conf = NULL; + const char* root_hints = NULL; + const char* debugconf = NULL; int dolist=0, ip4only=0, ip6only=0, force=0, port = HTTPS_PORT; /* parse the options */ while( (c=getopt(argc, argv, "46C:FP:a:c:f:hln:r:s:u:vx:")) != -1) { From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 07:48:43 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 43B18433; Sun, 15 Sep 2013 07:48:43 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EEEF23F7; Sun, 15 Sep 2013 07:48:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F7mhKC019068; Sun, 15 Sep 2013 07:48:43 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F7mg6H019063; Sun, 15 Sep 2013 07:48:42 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201309150748.r8F7mg6H019063@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sun, 15 Sep 2013 07:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255587 - head/sys/dev/drm2/radeon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 07:48:43 -0000 Author: dumbbell Date: Sun Sep 15 07:48:42 2013 New Revision: 255587 URL: http://svnweb.freebsd.org/changeset/base/255587 Log: drm/radeon: Add missing "return false" after unmapping invalid BIOS Without that, we would try to copy the unmapped BIOS. Submitted by: Christoph Mallon Approved by: re (blanket) Modified: head/sys/dev/drm2/radeon/radeon_bios.c Modified: head/sys/dev/drm2/radeon/radeon_bios.c ============================================================================== --- head/sys/dev/drm2/radeon/radeon_bios.c Sun Sep 15 01:44:07 2013 (r255586) +++ head/sys/dev/drm2/radeon/radeon_bios.c Sun Sep 15 07:48:42 2013 (r255587) @@ -123,6 +123,7 @@ static bool radeon_read_bios(struct rade __func__, bios[0], bios[1]); } vga_pci_unmap_bios(vga_dev, bios); + return false; } rdev->bios = malloc(size, DRM_MEM_DRIVER, M_WAITOK); memcpy(rdev->bios, bios, size); From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 11:58:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 073ECDB6; Sun, 15 Sep 2013 11:58:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7BC62D3D; Sun, 15 Sep 2013 11:58:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FBw7tc059778; Sun, 15 Sep 2013 11:58:07 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FBw7GJ059776; Sun, 15 Sep 2013 11:58:07 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151158.r8FBw7GJ059776@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 11:58:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255588 - in head/contrib/unbound: daemon libunbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 11:58:08 -0000 Author: des Date: Sun Sep 15 11:58:07 2013 New Revision: 255588 URL: http://svnweb.freebsd.org/changeset/base/255588 Log: Final #include tweak. Approved by: re (blanket) Modified: head/contrib/unbound/daemon/worker.h head/contrib/unbound/libunbound/worker.h Modified: head/contrib/unbound/daemon/worker.h ============================================================================== --- head/contrib/unbound/daemon/worker.h Sun Sep 15 07:48:42 2013 (r255587) +++ head/contrib/unbound/daemon/worker.h Sun Sep 15 11:58:07 2013 (r255588) @@ -43,6 +43,7 @@ #ifndef DAEMON_WORKER_H #define DAEMON_WORKER_H +#include "libunbound/worker.h" #include "util/netevent.h" #include "util/locks.h" #include "util/alloc.h" Modified: head/contrib/unbound/libunbound/worker.h ============================================================================== --- head/contrib/unbound/libunbound/worker.h Sun Sep 15 07:48:42 2013 (r255587) +++ head/contrib/unbound/libunbound/worker.h Sun Sep 15 11:58:07 2013 (r255588) @@ -42,6 +42,7 @@ #ifndef LIBUNBOUND_WORKER_H #define LIBUNBOUND_WORKER_H +#include "util/data/packed_rrset.h" /* for enum sec_status */ struct comm_reply; struct comm_point; struct module_qstate; From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 12:41:06 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1C03C2AD; Sun, 15 Sep 2013 12:41:06 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0999D2F98; Sun, 15 Sep 2013 12:41:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FCf52n084045; Sun, 15 Sep 2013 12:41:05 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FCf5Do084044; Sun, 15 Sep 2013 12:41:05 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151241.r8FCf5Do084044@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 12:41:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255589 - head/contrib/unbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 12:41:06 -0000 Author: des Date: Sun Sep 15 12:41:05 2013 New Revision: 255589 URL: http://svnweb.freebsd.org/changeset/base/255589 Log: Add unbound-control. Approved by: re (blanket) Modified: head/contrib/unbound/freebsd-sources.pl Modified: head/contrib/unbound/freebsd-sources.pl ============================================================================== --- head/contrib/unbound/freebsd-sources.pl Sun Sep 15 11:58:07 2013 (r255588) +++ head/contrib/unbound/freebsd-sources.pl Sun Sep 15 12:41:05 2013 (r255589) @@ -31,13 +31,14 @@ use strict; use warnings; use Text::Wrap; -our @targets = qw(LIBUNBOUND DAEMON UBANCHOR CHECKCONF); +our @targets = qw(LIBUNBOUND DAEMON UBANCHOR CHECKCONF CONTROL); our %target_names = ( LIBUNBOUND => "libunbound", DAEMON => "unbound", UBANCHOR => "unbound-anchor", CHECKCONF => "unbound-checkconf", + CONTROL => "unbound-control", ); sub get_sources($) { From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 13:07:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3396D802; Sun, 15 Sep 2013 13:07:31 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 072E120C6; Sun, 15 Sep 2013 13:07:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FD7UsZ096571; Sun, 15 Sep 2013 13:07:30 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FD7UYg096570; Sun, 15 Sep 2013 13:07:30 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151307.r8FD7UYg096570@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:07:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255590 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:07:31 -0000 Author: des Date: Sun Sep 15 13:07:30 2013 New Revision: 255590 URL: http://svnweb.freebsd.org/changeset/base/255590 Log: Complete the OPENSSH and LDNS sections. Approved by: re (blanket) Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 12:41:05 2013 (r255589) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 13:07:30 2013 (r255590) @@ -3389,6 +3389,19 @@ OLD_FILES+=usr/share/man/man8/verify_krb OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz .endif +.if ${MK_LDNS} == no +OLD_FILES+=usr/lib/private/libldns.a +OLD_FILES+=usr/lib/private/libldns.so +OLD_LIBS+=usr/lib/private/libldns.so.5 +OLD_FILES+=usr/lib/private/libldns_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libldns.a +OLD_FILES+=usr/lib32/private/libldns.so +OLD_LIBS+=usr/lib32/private/libldns.so.5 +OLD_FILES+=usr/lib32/private/libldns_p.a +.endif +.endif + #.if ${MK_LIB32} == no # to be filled in #.endif @@ -3715,7 +3728,27 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. #.endif .if ${MK_OPENSSH} == no -OLD_FILES+=usr.bin/ssh-copy-id +OLD_FILES+=usr/bin/sftp +OLD_FILES+=usr/bin/ssh +OLD_FILES+=usr/bin/ssh-add +OLD_FILES+=usr/bin/ssh-agent +OLD_FILES+=usr/bin/ssh-copy-id +OLD_FILES+=usr/bin/ssh-keygen +OLD_FILES+=usr/bin/ssh-keyscan +OLD_FILES+=usr/lib/private/libssh.a +OLD_FILES+=usr/lib/private/libssh.so +OLD_LIBS+=usr/lib/private/libssh.so.5 +OLD_FILES+=usr/lib/private/libssh_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libssh.a +OLD_FILES+=usr/lib32/private/libssh.so +OLD_LIBS+=usr/lib32/private/libssh.so.5 +OLD_FILES+=usr/lib32/private/libssh_p.a +.endif +OLD_FILES+=usr/libexec/sftp-server +OLD_FILES+=usr/libexec/ssh-keysign +OLD_FILES+=usr/libexec/ssh-pkcs11-helper +OLD_FILES+=usr/sbin/sshd .endif #.if ${MK_OPENSSL} == no @@ -3972,7 +4005,6 @@ OLD_FILES+=usr/lib/librt_p.a OLD_FILES+=usr/lib/libsbuf_p.a OLD_FILES+=usr/lib/libsdp_p.a OLD_FILES+=usr/lib/libsmb_p.a -OLD_FILES+=usr/lib/libssh_p.a OLD_FILES+=usr/lib/libssl_p.a OLD_FILES+=usr/lib/libstdc++_p.a OLD_FILES+=usr/lib/libsupc++_p.a @@ -3995,6 +4027,8 @@ OLD_FILES+=usr/lib/libwrap_p.a OLD_FILES+=usr/lib/liby_p.a OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/lib/libz_p.a +OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/private/libssh_p.a .endif .if ${MK_RCMDS} == no From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 13:11:14 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3F85E95C; Sun, 15 Sep 2013 13:11:14 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D3BD2100; Sun, 15 Sep 2013 13:11:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDBE61099762; Sun, 15 Sep 2013 13:11:14 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDBEnd099761; Sun, 15 Sep 2013 13:11:14 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151311.r8FDBEnd099761@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:11:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255591 - head/tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:11:14 -0000 Author: des Date: Sun Sep 15 13:11:13 2013 New Revision: 255591 URL: http://svnweb.freebsd.org/changeset/base/255591 Log: Tweak wording. Approved by: re (blanket) Modified: head/tools/build/options/WITHOUT_LDNS Modified: head/tools/build/options/WITHOUT_LDNS ============================================================================== --- head/tools/build/options/WITHOUT_LDNS Sun Sep 15 13:07:30 2013 (r255590) +++ head/tools/build/options/WITHOUT_LDNS Sun Sep 15 13:11:13 2013 (r255591) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Setting this variable will prevent LDNS from being built. +Setting this variable will prevent the LDNS library from being built. From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 13:48:09 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BEEB710B; Sun, 15 Sep 2013 13:48:09 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AA16C227A; Sun, 15 Sep 2013 13:48:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDm94w017886; Sun, 15 Sep 2013 13:48:09 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDm9gc017878; Sun, 15 Sep 2013 13:48:09 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151348.r8FDm9gc017878@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:48:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255592 - in head/contrib/unbound: . smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:48:09 -0000 Author: des Date: Sun Sep 15 13:48:08 2013 New Revision: 255592 URL: http://svnweb.freebsd.org/changeset/base/255592 Log: The unbound-control-setup script needs to be generated so it knows where to place the keys. Also, the correct umask is 027, not 026, although it's not likely to make any difference. Approved by: re (blanket) Added: head/contrib/unbound/smallapp/unbound-control-setup.sh.in (contents, props changed) Modified: head/contrib/unbound/configure.ac Modified: head/contrib/unbound/configure.ac ============================================================================== --- head/contrib/unbound/configure.ac Sun Sep 15 13:11:13 2013 (r255591) +++ head/contrib/unbound/configure.ac Sun Sep 15 13:48:08 2013 (r255592) @@ -1244,6 +1244,6 @@ void *unbound_stat_realloc_log(void *ptr ]) -AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8]) +AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh]) AC_CONFIG_HEADER([config.h]) AC_OUTPUT Added: head/contrib/unbound/smallapp/unbound-control-setup.sh.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/unbound/smallapp/unbound-control-setup.sh.in Sun Sep 15 13:48:08 2013 (r255592) @@ -0,0 +1,163 @@ +#!/bin/sh +# +# unbound-control-setup.sh - set up SSL certificates for unbound-control +# +# Copyright (c) 2008, NLnet Labs. All rights reserved. +# +# This software is open source. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 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. +# +# Neither the name of the NLNET LABS nor the names of its contributors may +# be used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 REGENTS 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. + +# settings: + +# directory for files +prefix=@prefix@ +DESTDIR=@sysconfdir@/unbound + +# issuer and subject name for certificates +SERVERNAME=unbound +CLIENTNAME=unbound-control + +# validity period for certificates +DAYS=7200 + +# size of keys in bits +BITS=1536 + +# hash algorithm +HASH=sha256 + +# base name for unbound server keys +SVR_BASE=unbound_server + +# base name for unbound-control keys +CTL_BASE=unbound_control + +# we want -rw-r--- access (say you run this as root: grp=yes (server), all=no). +umask 0026 + +# end of options + +# functions: +error ( ) { + echo "$0 fatal error: $1" + exit 1 +} + +# check arguments: +while test $# -ne 0; do + case $1 in + -d) + if test $# -eq 1; then error "need argument for -d"; fi + DESTDIR="$2" + shift + ;; + *) + echo "unbound-control-setup.sh - setup SSL keys for unbound-control" + echo " -d dir use directory to store keys and certificates." + echo " default: $DESTDIR" + echo "please run this command using the same user id that the " + echo "unbound daemon uses, it needs read privileges." + exit 1 + ;; + esac + shift +done + +# go!: +echo "setup in directory $DESTDIR" +cd "$DESTDIR" || error "could not cd to $DESTDIR" + +# create certificate keys; do not recreate if they already exist. +if test -f $SVR_BASE.key; then + echo "$SVR_BASE.key exists" +else + echo "generating $SVR_BASE.key" + openssl genrsa -out $SVR_BASE.key $BITS || error "could not genrsa" +fi +if test -f $CTL_BASE.key; then + echo "$CTL_BASE.key exists" +else + echo "generating $CTL_BASE.key" + openssl genrsa -out $CTL_BASE.key $BITS || error "could not genrsa" +fi + +# create self-signed cert for server +cat >request.cfg <request.cfg < Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 02148252; Sun, 15 Sep 2013 13:49:25 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E34772288; Sun, 15 Sep 2013 13:49:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDnOJ9018286; Sun, 15 Sep 2013 13:49:24 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDnO6q018283; Sun, 15 Sep 2013 13:49:24 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151349.r8FDnO6q018283@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:49:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255593 - in head/contrib/unbound: . smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:49:25 -0000 Author: des Date: Sun Sep 15 13:49:23 2013 New Revision: 255593 URL: http://svnweb.freebsd.org/changeset/base/255593 Log: Regenerate. Approved by: re (blanket) Modified: head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/smallapp/unbound-control-setup.sh Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/config.h Sun Sep 15 13:49:23 2013 (r255593) @@ -8,10 +8,10 @@ #define CONFIGFILE "/etc/unbound/unbound.conf" /* configure flags */ -#define CONFIGURE_BUILD_WITH " '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'" +#define CONFIGURE_BUILD_WITH " '--prefix=' '--exec-prefix=/usr' '--with-conf-file=/etc/unbound/unbound.conf' '--with-run-dir=/var/unbound' '--with-username=unbound'" /* configure date */ -#define CONFIGURE_DATE "Sun Sep 15 02:01:38 CEST 2013" +#define CONFIGURE_DATE "Sun Sep 15 15:38:41 CEST 2013" /* configure target system */ #define CONFIGURE_TARGET "x86_64-unknown-freebsd10.0" Modified: head/contrib/unbound/configure ============================================================================== --- head/contrib/unbound/configure Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/configure Sun Sep 15 13:49:23 2013 (r255593) @@ -12552,14 +12552,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18180,7 +18176,7 @@ _ACEOF -ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8" +ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh" ac_config_headers="$ac_config_headers config.h" @@ -19169,6 +19165,7 @@ do "doc/unbound-checkconf.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-checkconf.8" ;; "doc/unbound.conf.5") CONFIG_FILES="$CONFIG_FILES doc/unbound.conf.5" ;; "doc/unbound-control.8") CONFIG_FILES="$CONFIG_FILES doc/unbound-control.8" ;; + "smallapp/unbound-control-setup.sh") CONFIG_FILES="$CONFIG_FILES smallapp/unbound-control-setup.sh" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; Modified: head/contrib/unbound/smallapp/unbound-control-setup.sh ============================================================================== --- head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:48:08 2013 (r255592) +++ head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:49:23 2013 (r255593) @@ -36,7 +36,8 @@ # settings: # directory for files -DESTDIR=/usr/local/etc/unbound +prefix= +DESTDIR=${prefix}/etc/unbound # issuer and subject name for certificates SERVERNAME=unbound From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 13:49:44 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3E38F395; Sun, 15 Sep 2013 13:49:44 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C108228F; Sun, 15 Sep 2013 13:49:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDniNJ018390; Sun, 15 Sep 2013 13:49:44 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDniTK018389; Sun, 15 Sep 2013 13:49:44 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151349.r8FDniTK018389@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:49:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255594 - head/contrib/unbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:49:44 -0000 Author: des Date: Sun Sep 15 13:49:43 2013 New Revision: 255594 URL: http://svnweb.freebsd.org/changeset/base/255594 Log: Set the correct prefix and exec-prefix. Approved by: re (blanket) Modified: head/contrib/unbound/freebsd-configure.sh Modified: head/contrib/unbound/freebsd-configure.sh ============================================================================== --- head/contrib/unbound/freebsd-configure.sh Sun Sep 15 13:49:23 2013 (r255593) +++ head/contrib/unbound/freebsd-configure.sh Sun Sep 15 13:49:43 2013 (r255594) @@ -22,6 +22,7 @@ ldnsobj=$(realpath $(make -C$ldnsbld -V. export LDFLAGS="-L$ldnsobj" ./configure \ + --prefix= --exec-prefix=/usr \ --with-conf-file=/etc/unbound/unbound.conf \ --with-run-dir=/var/unbound \ --with-username=unbound From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 13:50:57 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4E5F04E2; Sun, 15 Sep 2013 13:50:57 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C27622D9; Sun, 15 Sep 2013 13:50:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FDovXg020853; Sun, 15 Sep 2013 13:50:57 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FDoud8020851; Sun, 15 Sep 2013 13:50:56 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151350.r8FDoud8020851@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:50:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255595 - head/contrib/unbound/smallapp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 13:50:57 -0000 Author: des Date: Sun Sep 15 13:50:56 2013 New Revision: 255595 URL: http://svnweb.freebsd.org/changeset/base/255595 Log: Previous commit accidentally left out the umask change. Approved by: re (blanket) Modified: head/contrib/unbound/smallapp/unbound-control-setup.sh head/contrib/unbound/smallapp/unbound-control-setup.sh.in Modified: head/contrib/unbound/smallapp/unbound-control-setup.sh ============================================================================== --- head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:49:43 2013 (r255594) +++ head/contrib/unbound/smallapp/unbound-control-setup.sh Sun Sep 15 13:50:56 2013 (r255595) @@ -58,8 +58,8 @@ SVR_BASE=unbound_server # base name for unbound-control keys CTL_BASE=unbound_control -# we want -rw-r--- access (say you run this as root: grp=yes (server), all=no). -umask 0026 +# we want -rw-r----- access (say you run this as root: grp=yes (server), all=no). +umask 0027 # end of options Modified: head/contrib/unbound/smallapp/unbound-control-setup.sh.in ============================================================================== --- head/contrib/unbound/smallapp/unbound-control-setup.sh.in Sun Sep 15 13:49:43 2013 (r255594) +++ head/contrib/unbound/smallapp/unbound-control-setup.sh.in Sun Sep 15 13:50:56 2013 (r255595) @@ -58,8 +58,8 @@ SVR_BASE=unbound_server # base name for unbound-control keys CTL_BASE=unbound_control -# we want -rw-r--- access (say you run this as root: grp=yes (server), all=no). -umask 0026 +# we want -rw-r----- access (say you run this as root: grp=yes (server), all=no). +umask 0027 # end of options From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 14:19:18 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8B78C975; Sun, 15 Sep 2013 14:19:18 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 785F12401; Sun, 15 Sep 2013 14:19:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FEJIXs034323; Sun, 15 Sep 2013 14:19:18 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FEJHH1034316; Sun, 15 Sep 2013 14:19:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309151419.r8FEJHH1034316@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 15 Sep 2013 14:19:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255596 - in head/sys: dev/ofw powerpc/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 14:19:18 -0000 Author: nwhitehorn Date: Sun Sep 15 14:19:17 2013 New Revision: 255596 URL: http://svnweb.freebsd.org/changeset/base/255596 Log: Add a kernel interface (OF_xref_phandle()) for systems where phandles used as cross-references in the device tree and phandles as used by the Open Firmware client interface are in different namespaces. This include IBM pSeries hardware as well as FDT systems. FDT certainly abuses ihandles for this purpose and should be modified to use this API eventually. This changes no behavior on systems where FreeBSD already worked. Reviewed by: marius Approved by: re (kib) MFC after: 2 weeks Modified: head/sys/dev/ofw/ofw_bus_subr.c head/sys/dev/ofw/openfirm.c head/sys/dev/ofw/openfirm.h head/sys/powerpc/ofw/ofw_pcibus.c Modified: head/sys/dev/ofw/ofw_bus_subr.c ============================================================================== --- head/sys/dev/ofw/ofw_bus_subr.c Sun Sep 15 13:50:56 2013 (r255595) +++ head/sys/dev/ofw/ofw_bus_subr.c Sun Sep 15 14:19:17 2013 (r255596) @@ -300,7 +300,7 @@ ofw_bus_search_intrmap(void *intr, int i i = imapsz; while (i > 0) { bcopy(mptr + physsz + intrsz, &parent, sizeof(parent)); - if (OF_searchprop(parent, "#interrupt-cells", + if (OF_searchprop(OF_xref_phandle(parent), "#interrupt-cells", &pintrsz, sizeof(pintrsz)) == -1) pintrsz = 1; /* default */ pintrsz *= sizeof(pcell_t); Modified: head/sys/dev/ofw/openfirm.c ============================================================================== --- head/sys/dev/ofw/openfirm.c Sun Sep 15 13:50:56 2013 (r255595) +++ head/sys/dev/ofw/openfirm.c Sun Sep 15 14:19:17 2013 (r255596) @@ -386,6 +386,48 @@ OF_package_to_path(phandle_t package, ch return (OFW_PACKAGE_TO_PATH(ofw_obj, package, buf, len)); } +/* Look up effective phandle (see FDT/PAPR spec) */ +static phandle_t +OF_child_xref_phandle(phandle_t parent, phandle_t xref) +{ + phandle_t child, rxref; + + /* + * Recursively descend from parent, looking for a node with a property + * named either "phandle", "ibm,phandle", or "linux,phandle" that + * matches the xref we are looking for. + */ + + for (child = OF_child(parent); child != 0; child = OF_peer(child)) { + rxref = OF_child_xref_phandle(child, xref); + if (rxref != -1) + return (rxref); + + if (OF_getprop(child, "phandle", &rxref, sizeof(rxref)) == -1 && + OF_getprop(child, "ibm,phandle", &rxref, + sizeof(rxref)) == -1 && OF_getprop(child, + "linux,phandle", &rxref, sizeof(rxref)) == -1) + continue; + + if (rxref == xref) + return (child); + } + + return (-1); +} + +phandle_t +OF_xref_phandle(phandle_t xref) +{ + phandle_t node; + + node = OF_child_xref_phandle(OF_peer(0), xref); + if (node == -1) + return (xref); + + return (node); +} + /* Call the method in the scope of a given instance. */ int OF_call_method(const char *method, ihandle_t instance, int nargs, int nreturns, Modified: head/sys/dev/ofw/openfirm.h ============================================================================== --- head/sys/dev/ofw/openfirm.h Sun Sep 15 13:50:56 2013 (r255595) +++ head/sys/dev/ofw/openfirm.h Sun Sep 15 14:19:17 2013 (r255596) @@ -118,6 +118,14 @@ ssize_t OF_canon(const char *path, char phandle_t OF_finddevice(const char *path); ssize_t OF_package_to_path(phandle_t node, char *buf, size_t len); +/* + * Some OF implementations (IBM, FDT) have a concept of effective phandles + * used for device-tree cross-references. Given one of these, returns the + * real phandle. If one can't be found (or running on OF implementations + * without this property), returns its input. + */ +phandle_t OF_xref_phandle(phandle_t xref); + /* Device I/O functions */ ihandle_t OF_open(const char *path); void OF_close(ihandle_t instance); Modified: head/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- head/sys/powerpc/ofw/ofw_pcibus.c Sun Sep 15 13:50:56 2013 (r255595) +++ head/sys/powerpc/ofw/ofw_pcibus.c Sun Sep 15 14:19:17 2013 (r255596) @@ -210,11 +210,12 @@ ofw_pcibus_enum_devtree(device_t dev, u_ icells = 1; OF_getprop(child, "interrupt-parent", &iparent, sizeof(iparent)); - OF_getprop(iparent, "#interrupt-cells", &icells, - sizeof(icells)); - - if (iparent != 0) + if (iparent != 0) { + OF_getprop(OF_xref_phandle(iparent), + "#interrupt-cells", &icells, + sizeof(icells)); intr[0] = MAP_IRQ(iparent, intr[0]); + } if (iparent != 0 && icells > 1) { powerpc_config_intr(intr[0], From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 14:51:27 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 91CC3DD7; Sun, 15 Sep 2013 14:51:27 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7CD4C2555; Sun, 15 Sep 2013 14:51:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FEpRju052535; Sun, 15 Sep 2013 14:51:27 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FEpNwg052510; Sun, 15 Sep 2013 14:51:23 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151451.r8FEpNwg052510@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 14:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255597 - in head: etc etc/mtree lib lib/libunbound share/mk tools/build/mk tools/build/options usr.sbin usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr.sbin/unb... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 14:51:27 -0000 Author: des Date: Sun Sep 15 14:51:23 2013 New Revision: 255597 URL: http://svnweb.freebsd.org/changeset/base/255597 Log: Build and install the Unbound caching DNS resolver daemon. Approved by: re (blanket) Added: head/lib/libunbound/ head/lib/libunbound/Makefile (contents, props changed) head/tools/build/options/WITHOUT_UNBOUND (contents, props changed) head/usr.sbin/unbound/ head/usr.sbin/unbound/Makefile (contents, props changed) head/usr.sbin/unbound/Makefile.inc (contents, props changed) head/usr.sbin/unbound/anchor/ head/usr.sbin/unbound/anchor/Makefile (contents, props changed) head/usr.sbin/unbound/checkconf/ head/usr.sbin/unbound/checkconf/Makefile (contents, props changed) head/usr.sbin/unbound/control/ head/usr.sbin/unbound/control/Makefile (contents, props changed) head/usr.sbin/unbound/daemon/ head/usr.sbin/unbound/daemon/Makefile (contents, props changed) Modified: head/etc/group head/etc/master.passwd head/etc/mtree/BSD.root.dist head/etc/mtree/BSD.var.dist head/lib/Makefile head/share/mk/bsd.libnames.mk head/share/mk/bsd.own.mk head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile Modified: head/etc/group ============================================================================== --- head/etc/group Sun Sep 15 14:19:17 2013 (r255596) +++ head/etc/group Sun Sep 15 14:51:23 2013 (r255597) @@ -19,6 +19,7 @@ mailnull:*:26: _atf:*:27: guest:*:31: bind:*:53: +unbound:*:59: proxy:*:62: authpf:*:63: _pflogd:*:64: Modified: head/etc/master.passwd ============================================================================== --- head/etc/master.passwd Sun Sep 15 14:19:17 2013 (r255596) +++ head/etc/master.passwd Sun Sep 15 14:51:23 2013 (r255597) @@ -15,6 +15,7 @@ smmsp:*:25:25::0:0:Sendmail Submission U mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin _atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin +unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin _dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin Modified: head/etc/mtree/BSD.root.dist ============================================================================== --- head/etc/mtree/BSD.root.dist Sun Sep 15 14:19:17 2013 (r255596) +++ head/etc/mtree/BSD.root.dist Sun Sep 15 14:51:23 2013 (r255597) @@ -66,6 +66,8 @@ .. ssl .. + unbound + .. zfs .. .. Modified: head/etc/mtree/BSD.var.dist ============================================================================== --- head/etc/mtree/BSD.var.dist Sun Sep 15 14:19:17 2013 (r255596) +++ head/etc/mtree/BSD.var.dist Sun Sep 15 14:51:23 2013 (r255597) @@ -97,6 +97,8 @@ vi.recover mode=01777 .. .. + unbound uname=unbound gname=unbound mode=0750 + .. yp .. .. Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sun Sep 15 14:19:17 2013 (r255596) +++ head/lib/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -12,6 +12,7 @@ # libcom_err must be built before libpam. # libcrypt must be built before libpam. # libkvm must be built before libdevstat. +# libldns must be built before libunbound. # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # ncurses must be built before libdialog, libedit and libreadline. @@ -116,6 +117,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libufs \ libugidfw \ libulog \ + ${_libunbound} \ ${_libusbhid} \ ${_libusb} \ ${_libvgl} \ @@ -261,6 +263,10 @@ _libsmutil= libsmutil _libtelnet= libtelnet .endif +.if ${MK_UNBOUND} != "no" +_libunbound= libunbound +.endif + .if ${MK_USB} != "no" _libusbhid= libusbhid _libusb= libusb Added: head/lib/libunbound/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libunbound/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,33 @@ +# $FreeBSD$ + +# Vendor sources and generated files +LDNSDIR= ${.CURDIR}/../../contrib/ldns +UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound + +# Hold my beer and watch this +.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator + +LIB= unbound +PRIVATELIB= + +CFLAGS= -I${LDNSDIR} -I${UNBOUNDDIR} + +SRCS= alloc.c autotrust.c config_file.c configlexer.c configparser.c \ + context.c dname.c dns.c dnstree.c fptr_wlist.c infra.c \ + iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \ + iter_resptype.c iter_scrub.c iter_utils.c iterator.c libunbound.c \ + libworker.c listen_dnsport.c localzone.c locks.c log.c lookup3.c \ + lruhash.c mesh.c mini_event.c modstack.c module.c msgencode.c \ + msgparse.c msgreply.c net_help.c netevent.c outbound_list.c \ + outside_network.c packed_rrset.c random.c rbtree.c regional.c \ + rrset.c rtt.c slabhash.c timehist.c tube.c val_anchor.c \ + val_kcache.c val_kentry.c val_neg.c val_nsec.c val_nsec3.c \ + val_secalgo.c val_sigcrypt.c val_utils.c validator.c \ + winsock_event.c + +WARNS?= 3 + +DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} +LDADD+= -lssl -lcrypto -lpthread + +.include Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Sun Sep 15 14:19:17 2013 (r255596) +++ head/share/mk/bsd.libnames.mk Sun Sep 15 14:51:23 2013 (r255597) @@ -164,6 +164,9 @@ LIBTINFO?= "don't use LIBTINFO, use LIBN LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a +.if ${MK_UNBOUND} != "no" +LIBUNBOUND?= ${DESTDIR}${LIBDIR}/libunbound.a +.endif LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sun Sep 15 14:19:17 2013 (r255596) +++ head/share/mk/bsd.own.mk Sun Sep 15 14:51:23 2013 (r255597) @@ -358,6 +358,7 @@ __DEFAULT_YES_OPTIONS = \ TELNET \ TEXTPROC \ TOOLCHAIN \ + UNBOUND \ USB \ UTMPX \ WIRELESS \ @@ -521,6 +522,7 @@ MK_LIBICONV_COMPAT:= no .if ${MK_LDNS} == "no" MK_LDNS_UTILS:= no +MK_UNBOUND:= no .endif .if ${MK_LDNS_UTILS} != "no" Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 14:19:17 2013 (r255596) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 14:51:23 2013 (r255597) @@ -4367,6 +4367,24 @@ OLD_FILES+=usr/share/man/man8/telnetd.8. # to be filled in #.endif +.if ${MK_UNBOUND} == no +OLD_FILES+=usr/lib/private/libunbound.a +OLD_FILES+=usr/lib/private/libunbound.so +OLD_LIBS+=usr/lib/private/libunbound.so.5 +OLD_FILES+=usr/lib/private/libunbound_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libunbound.a +OLD_FILES+=usr/lib32/private/libunbound.so +OLD_LIBS+=usr/lib32/private/libunbound.so.5 +OLD_FILES+=usr/lib32/private/libunbound_p.a +.endif +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/sbin/unbound-control-setup +.endif + #.if ${MK_USB} == no # to be filled in #.endif Added: head/tools/build/options/WITHOUT_UNBOUND ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_UNBOUND Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr unbound 8 +and related programs. Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Sun Sep 15 14:19:17 2013 (r255596) +++ head/usr.sbin/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -317,6 +317,10 @@ SUBDIR+= config SUBDIR+= crunch .endif +.if ${MK_UNBOUND} != "no" +SUBDIR+= unbound +.endif + .if ${MK_USB} != "no" SUBDIR+= uathload SUBDIR+= uhsoctl Added: head/usr.sbin/unbound/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR= daemon anchor checkconf control + +.include Added: head/usr.sbin/unbound/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/Makefile.inc Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Added: head/usr.sbin/unbound/anchor/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/anchor/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,18 @@ +# $FreeBSD$ + +# Vendor sources and generated files +LDNSDIR= ${.CURDIR}/../../../contrib/ldns +UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound +EXPATDIR= ${.CURDIR}/../../../contrib/expat + +.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc + +PROG= unbound-anchor +SRCS= unbound-anchor.c +CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib +DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} +LDADD= -lunbound -lldns -lutil -lbsdxml -lssl -lcrypto -lpthread +USEPRIVATELIB= ldns +MAN= unbound-anchor.8 + +.include Added: head/usr.sbin/unbound/checkconf/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/checkconf/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,17 @@ +# $FreeBSD$ + +# Vendor sources and generated files +LDNSDIR= ${.CURDIR}/../../../contrib/ldns +UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound + +.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc + +PROG= unbound-checkconf +SRCS= unbound-checkconf.c worker_cb.c +CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} +LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +USEPRIVATELIB= ldns +MAN= unbound-checkconf.8 + +.include Added: head/usr.sbin/unbound/control/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/control/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,18 @@ +# $FreeBSD$ + +# Vendor sources and generated files +LDNSDIR= ${.CURDIR}/../../../contrib/ldns +UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound + +.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc + +PROG= unbound-control +SCRIPTS= unbound-control-setup.sh +SRCS= unbound-control.c worker_cb.c +CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} +LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +USEPRIVATELIB= ldns +MAN= unbound-control.8 + +.include Added: head/usr.sbin/unbound/daemon/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/unbound/daemon/Makefile Sun Sep 15 14:51:23 2013 (r255597) @@ -0,0 +1,17 @@ +# $FreeBSD$ + +# Vendor sources and generated files +LDNSDIR= ${.CURDIR}/../../../contrib/ldns +UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound + +.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/doc + +PROG= unbound +SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c +CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} +LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +USEPRIVATELIB= ldns +MAN= unbound.8 unbound.conf.5 + +.include From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 15:23:51 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 20D93808; Sun, 15 Sep 2013 15:23:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DC0B2703; Sun, 15 Sep 2013 15:23:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FFNoI0069221; Sun, 15 Sep 2013 15:23:50 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FFNoBK069219; Sun, 15 Sep 2013 15:23:50 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151523.r8FFNoBK069219@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 15:23:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255598 - head/share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 15:23:51 -0000 Author: des Date: Sun Sep 15 15:23:50 2013 New Revision: 255598 URL: http://svnweb.freebsd.org/changeset/base/255598 Log: Regnerate. Approved by: re (blanket) Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sun Sep 15 14:51:23 2013 (r255597) +++ head/share/man/man5/src.conf.5 Sun Sep 15 15:23:50 2013 (r255598) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt .\" $FreeBSD$ -.Dd September 6, 2013 +.Dd September 15, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -686,13 +686,15 @@ Set to build some programs without optio .Nm libkvm support. .It Va WITHOUT_LDNS -.\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS 246827 2013-02-15 13:44:18Z des -Setting this variable will prevent LDNS from being built. +.\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS 255591 2013-09-15 13:11:13Z des +Setting this variable will prevent the LDNS library from being built. When set, it also enforces the following options: .Pp .Bl -item -compact .It .Va WITHOUT_LDNS_UTILS +.It +.Va WITHOUT_UNBOUND .El .It Va WITH_LDNS_UTILS .\" from FreeBSD: head/tools/build/options/WITH_LDNS_UTILS 246830 2013-02-15 13:57:51Z des @@ -1148,6 +1150,11 @@ When set, it also enforces the following .It .Va WITHOUT_GDB .El +.It Va WITHOUT_UNBOUND +.\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des +Set to not build +.Xr unbound 8 +and related programs. .It Va WITHOUT_USB .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 15:49:18 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 06125BD6; Sun, 15 Sep 2013 15:49:18 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7C9B27FF; Sun, 15 Sep 2013 15:49:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FFnH2v081103; Sun, 15 Sep 2013 15:49:17 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FFnHBc081102; Sun, 15 Sep 2013 15:49:17 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151549.r8FFnHBc081102@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 15:49:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255599 - head/contrib/ldns/ldns X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 15:49:18 -0000 Author: des Date: Sun Sep 15 15:49:17 2013 New Revision: 255599 URL: http://svnweb.freebsd.org/changeset/base/255599 Log: The Unbound developers have never met a pointer game they didn't like. Fix needless deconsting. Approved by: re (blanket) Modified: head/contrib/ldns/ldns/util.h Modified: head/contrib/ldns/ldns/util.h ============================================================================== --- head/contrib/ldns/ldns/util.h Sun Sep 15 15:23:50 2013 (r255598) +++ head/contrib/ldns/ldns/util.h Sun Sep 15 15:49:17 2013 (r255599) @@ -72,7 +72,7 @@ ldns_read_uint16(const void *src) #ifdef ALLOW_UNALIGNED_ACCESSES return ntohs(*(uint16_t *) src); #else - uint8_t *p = (uint8_t *) src; + const uint8_t *p = (const uint8_t *) src; return ((uint16_t) p[0] << 8) | (uint16_t) p[1]; #endif } @@ -83,7 +83,7 @@ ldns_read_uint32(const void *src) #ifdef ALLOW_UNALIGNED_ACCESSES return ntohl(*(uint32_t *) src); #else - uint8_t *p = (uint8_t *) src; + const uint8_t *p = (const uint8_t *) src; return ( ((uint32_t) p[0] << 24) | ((uint32_t) p[1] << 16) | ((uint32_t) p[2] << 8) From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 15:52:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7E8CAD62; Sun, 15 Sep 2013 15:52:08 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C8112838; Sun, 15 Sep 2013 15:52:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FFq8pH084417; Sun, 15 Sep 2013 15:52:08 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FFq8wX084416; Sun, 15 Sep 2013 15:52:08 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151552.r8FFq8wX084416@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 15:52:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255600 - head/contrib/ldns/ldns X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 15:52:08 -0000 Author: des Date: Sun Sep 15 15:52:07 2013 New Revision: 255600 URL: http://svnweb.freebsd.org/changeset/base/255600 Log: Remove duplicate function declaration. Approved by: re (blanket) Modified: head/contrib/ldns/ldns/dnssec_verify.h Modified: head/contrib/ldns/ldns/dnssec_verify.h ============================================================================== --- head/contrib/ldns/ldns/dnssec_verify.h Sun Sep 15 15:49:17 2013 (r255599) +++ head/contrib/ldns/ldns/dnssec_verify.h Sun Sep 15 15:52:07 2013 (r255600) @@ -294,23 +294,6 @@ void ldns_dnssec_derive_trust_tree_dnske ldns_rr *cur_rr, ldns_rr *cur_sig_rr, time_t check_time); - -/** - * Sub function for derive_trust_tree that is used for DNSKEY rrsets - * - * \param[in] new_tree The trust tree that we are building - * \param[in] data_chain The data chain containing the data for the trust tree - * \param[in] cur_rr The currently relevant DNSKEY RR - * \param[in] cur_sig_rr The currently relevant signature - * \param[in] check_time the time for which the validation is performed - */ -void ldns_dnssec_derive_trust_tree_dnskey_rrset_time( - ldns_dnssec_trust_tree *new_tree, - ldns_dnssec_data_chain *data_chain, - ldns_rr *cur_rr, ldns_rr *cur_sig_rr, - time_t check_time); - - /** * Sub function for derive_trust_tree that is used for DS rrsets * From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 15:55:22 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1473DFDB; Sun, 15 Sep 2013 15:55:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 02236285A; Sun, 15 Sep 2013 15:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FFtLDV085627; Sun, 15 Sep 2013 15:55:21 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FFtLCA085626; Sun, 15 Sep 2013 15:55:21 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151555.r8FFtLCA085626@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 15:55:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255601 - head/lib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 15:55:22 -0000 Author: des Date: Sun Sep 15 15:55:21 2013 New Revision: 255601 URL: http://svnweb.freebsd.org/changeset/base/255601 Log: Move libldns to the correct (ordered) library list. Approved by: re (blanket) Modified: head/lib/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sun Sep 15 15:52:07 2013 (r255600) +++ head/lib/Makefile Sun Sep 15 15:55:21 2013 (r255601) @@ -39,6 +39,7 @@ SUBDIR_ORDERED= ${_csu} \ libelf \ ${_libiconv_modules} \ libkvm \ + ${_libldns} \ msun \ libmd \ ncurses \ @@ -85,7 +86,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libipx} \ libjail \ libkiconv \ - ${_libldns} \ liblzma \ libmagic \ libmandoc \ From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 16:27:25 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D1DB98BE; Sun, 15 Sep 2013 16:27:25 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFBBE29BC; Sun, 15 Sep 2013 16:27:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FGRPOT001645; Sun, 15 Sep 2013 16:27:25 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FGRPE8001644; Sun, 15 Sep 2013 16:27:25 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151627.r8FGRPE8001644@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 16:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255602 - head/usr.sbin/unbound X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 16:27:25 -0000 Author: des Date: Sun Sep 15 16:27:25 2013 New Revision: 255602 URL: http://svnweb.freebsd.org/changeset/base/255602 Log: Set NO_WERROR for unbound until I can figure out how to unbreak the non-clang build. Approved by: re (blanket) Modified: head/usr.sbin/unbound/Makefile.inc Modified: head/usr.sbin/unbound/Makefile.inc ============================================================================== --- head/usr.sbin/unbound/Makefile.inc Sun Sep 15 15:55:21 2013 (r255601) +++ head/usr.sbin/unbound/Makefile.inc Sun Sep 15 16:27:25 2013 (r255602) @@ -1,3 +1,5 @@ # $FreeBSD$ +NO_WERROR= true + .include "../Makefile.inc" From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 19:54:00 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B53FEAC0 for ; Sun, 15 Sep 2013 19:54:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B32E227F for ; Sun, 15 Sep 2013 19:54:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FJs03d082915 for ; Sun, 15 Sep 2013 19:54:00 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8FJs0dp082910 for svn-src-head@freebsd.org; Sun, 15 Sep 2013 19:54:00 GMT (envelope-from bdrewery) Received: (qmail 16566 invoked from network); 15 Sep 2013 14:53:58 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 15 Sep 2013 14:53:58 -0500 Message-ID: <5236104F.2040706@FreeBSD.org> Date: Sun, 15 Sep 2013 14:53:51 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 Subject: Re: svn commit: r255597 - in head: etc etc/mtree lib lib/libunbound share/mk tools/build/mk tools/build/options usr.sbin usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr.sbin/unb... References: <201309151451.r8FEpNwg052510@svn.freebsd.org> In-Reply-To: <201309151451.r8FEpNwg052510@svn.freebsd.org> X-Enigmail-Version: 1.5.2 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eIg258oN0ASJCdlS8q1V4FJXCK08JPQad" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 19:54:00 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eIg258oN0ASJCdlS8q1V4FJXCK08JPQad Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 9/15/2013 9:51 AM, Dag-Erling Sm=F8rgrav wrote: > Author: des > Date: Sun Sep 15 14:51:23 2013 > New Revision: 255597 > URL: http://svnweb.freebsd.org/changeset/base/255597 >=20 > Log: > Build and install the Unbound caching DNS resolver daemon. > =20 > Approved by: re (blanket) >=20 > Added: > head/lib/libunbound/ > head/lib/libunbound/Makefile (contents, props changed) > head/tools/build/options/WITHOUT_UNBOUND (contents, props changed) > head/usr.sbin/unbound/ > head/usr.sbin/unbound/Makefile (contents, props changed) > head/usr.sbin/unbound/Makefile.inc (contents, props changed) > head/usr.sbin/unbound/anchor/ > head/usr.sbin/unbound/anchor/Makefile (contents, props changed) > head/usr.sbin/unbound/checkconf/ > head/usr.sbin/unbound/checkconf/Makefile (contents, props changed) > head/usr.sbin/unbound/control/ > head/usr.sbin/unbound/control/Makefile (contents, props changed) > head/usr.sbin/unbound/daemon/ > head/usr.sbin/unbound/daemon/Makefile (contents, props changed) > Modified: > head/etc/group > head/etc/master.passwd > head/etc/mtree/BSD.root.dist > head/etc/mtree/BSD.var.dist > head/lib/Makefile > head/share/mk/bsd.libnames.mk > head/share/mk/bsd.own.mk > head/tools/build/mk/OptionalObsoleteFiles.inc > head/usr.sbin/Makefile >=20 > Modified: head/etc/group > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/group Sun Sep 15 14:19:17 2013 (r255596) > +++ head/etc/group Sun Sep 15 14:51:23 2013 (r255597) > @@ -19,6 +19,7 @@ mailnull:*:26: > _atf:*:27: > guest:*:31: > bind:*:53: > +unbound:*:59: > proxy:*:62: > authpf:*:63: > _pflogd:*:64: >=20 > Modified: head/etc/master.passwd > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/master.passwd Sun Sep 15 14:19:17 2013 (r255596) > +++ head/etc/master.passwd Sun Sep 15 14:51:23 2013 (r255597) > @@ -15,6 +15,7 @@ smmsp:*:25:25::0:0:Sendmail Submission U > mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbi= n/nologin > _atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin > bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin > +unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nolog= in > proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/no= login > _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin > _dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin >=20 [...] > Modified: head/etc/mtree/BSD.var.dist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/etc/mtree/BSD.var.dist Sun Sep 15 14:19:17 2013 (r255596) > +++ head/etc/mtree/BSD.var.dist Sun Sep 15 14:51:23 2013 (r255597) > @@ -97,6 +97,8 @@ > vi.recover mode=3D01777 > .. > .. > + unbound uname=3Dunbound gname=3Dunbound mode=3D0750 > + .. > yp > .. > .. FYI poudriere users will run into a problem with this due to a bug in poudriere. It was not using DB_FROM_SRC properly with 'distrib-dirs'. mtree: line 100: unknown user unbound I've committed a fix to poudriere trunk and ports-mgmt/poudriere-devel to fix the issue. --=20 Regards, Bryan Drewery --eIg258oN0ASJCdlS8q1V4FJXCK08JPQad Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSNhBUAAoJEG54KsA8mwz5/O8P/0WzWMK/EaDT6OPb3+qjTa4Q kQRAlKDmawi53tBEfIz3YOFfgb2JZZZ2giSI1gQByXSwJpxSIT5AXdtdpU0NJscA bHnSx28DzDDcaJ/AVLkQ8qONDf3z/FfKVaCxSUIFS8oSbGBOp40UFLGKmfnr8IZq ypbNITIgN8lAehy3BGROyiz6hZaQWPHHZjxbtZT4BOAc0CMX0s05Ia9h27TMkZkQ 7xnuG88ntPHbnwZuIq82JFL86mbVdIg5rTm+RgrvzpE83b3N3cOyOm3y0LmVU0lC NM74rfTZlPHb5K/zsVN14t8TSFRkPPpLPEmSkZBYJ65fj8PoeyWFMJ1Y7qRh4kAG fNw/41xnP/iRQBKs7hh8ngChC7IkBAAFSLgH5q7T0R3DnD0fhRgzDW2ZTFFr4ZDH ZNG9JRt0PhSza0gs0wt8gdt9/G0wGgBRMzw4erlAxE0NXwzJOOyrbCIkVkb64Zem ScbnmOFz8RIr4xtWKWiwJNMCPNdU8lR5V44QcWfKwJQ/7ltTlrfrFpNjktyXr1Og InQJraoHl2Yo5kw1Bk/WTzJfrtcXtDi8gMndGLf/GnRq3mUWonNpycAhM4vuGUeB bvGLCzD2c+WfyHPiZ4P8o+avegU2mm5bGlFWK07WXDeQlRnLHIZl9fI3UJPXz+Jg bgCkdA98UKzD/T//aUag =PEK2 -----END PGP SIGNATURE----- --eIg258oN0ASJCdlS8q1V4FJXCK08JPQad-- From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 20:16:41 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AA94BF60; Sun, 15 Sep 2013 20:16:41 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mx1.stack.nl (unknown [IPv6:2001:610:1108:5012::107]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 67F682396; Sun, 15 Sep 2013 20:16:41 +0000 (UTC) Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132]) by mx1.stack.nl (Postfix) with ESMTP id 0961D1203C2; Sun, 15 Sep 2013 22:16:24 +0200 (CEST) Received: by turtle.stack.nl (Postfix, from userid 1677) id 00743CB4E; Sun, 15 Sep 2013 22:16:23 +0200 (CEST) Date: Sun, 15 Sep 2013 22:16:23 +0200 From: Jilles Tjoelker To: Joel Dahl Subject: Re: svn commit: r254273 - in head: . include lib lib/libc/iconv lib/libiconv_compat lib/libkiconv share/mk sys/sys tools/build/mk Message-ID: <20130915201623.GA28602@stack.nl> References: <201308130715.r7D7F1nu076335@svn.freebsd.org> <20130822155835.GA52789@devbox.vnode.local> <20130903195241.GA93218@devbox.vnode.local> <201309051013.35286.jhb@freebsd.org> <20130905201540.GA23637@devbox.vnode.local> <20130912221927.GA473@stack.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130912221927.GA473@stack.nl> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: src-committers@freebsd.org, John Baldwin , Peter Wemm , svn-src-all@freebsd.org, Dimitry Andric , gabor@freebsd.org, svn-src-head@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 20:16:41 -0000 On Fri, Sep 13, 2013 at 12:19:27AM +0200, Jilles Tjoelker wrote: > On Thu, Sep 05, 2013 at 10:15:40PM +0200, Joel Dahl wrote: > > Installworld is still broken on systems with readonly /usr/obj. > I use this. It makes the mapper.dir and similar files depend on their > actual sources instead of phony targets, and therefore only rebuilt when > needed. The previous patch had some problems (two makes in parallel in the same directory, no rebuild when the sources of the $i/foo.$i files changed in -DNOCLEAN mode). This patch should work better. It avoids changing the targets and instead leaves the destination file untouched if the content remains the same. Index: share/i18n/csmapper/Makefile =================================================================== --- share/i18n/csmapper/Makefile (revision 255570) +++ share/i18n/csmapper/Makefile (working copy) @@ -7,10 +7,11 @@ KAZAKH KOI KS MISC TCVN mapper.dir: ${SUBDIR} - > ${.TARGET} -.for i in ${SUBDIR} - cat ${i}/mapper.dir.${i} >> ${.TARGET} -.endfor + newfile=$$(for i in ${SUBDIR}; do \ + cat $$i/mapper.dir.$$i; \ + done); \ + [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ + printf '%s\n' "$$newfile" >${.TARGET} mapper.dir.db: mapper.dir ${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC} @@ -18,10 +19,11 @@ CLEANFILES+= mapper.dir mapper.dir.db charset.pivot: ${SUBDIR} - > ${.TARGET} -.for i in ${SUBDIR} - cat ${i}/charset.pivot.${i} >> ${.TARGET} -.endfor + newfile=$$(for i in ${SUBDIR}; do \ + cat $$i/charset.pivot.$$i; \ + done); \ + [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ + printf '%s\n' "$$newfile" >${.TARGET} charset.pivot.pvdb: charset.pivot ${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC} Index: share/i18n/esdb/Makefile =================================================================== --- share/i18n/esdb/Makefile (revision 255570) +++ share/i18n/esdb/Makefile (working copy) @@ -10,18 +10,20 @@ CLEANFILES= ${FILES} esdb.dir: ${SUBDIR} - > $@ -.for i in ${SUBDIR} - cat ${i}/esdb.dir.${i} >>${.TARGET} -.endfor + newfile=$$(for i in ${SUBDIR}; do \ + cat $$i/esdb.dir.$$i; \ + done); \ + [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ + printf '%s\n' "$$newfile" >${.TARGET} esdb.dir.db: esdb.dir ${MKESDB} -m -o ${.TARGET} ${.ALLSRC} esdb.alias: ${SUBDIR} - > $@ -.for i in ${SUBDIR} - cat ${i}/esdb.alias.${i} >>${.TARGET} -.endfor + newfile=$$(for i in ${SUBDIR}; do \ + cat $$i/esdb.alias.$$i; \ + done); \ + [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ + printf '%s\n' "$$newfile" >${.TARGET} esdb.alias.db: esdb.alias ${MKESDB} -m -o ${.TARGET} ${.ALLSRC} -- Jilles Tjoelker From owner-svn-src-head@FreeBSD.ORG Sun Sep 15 21:38:47 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5DCE7F80; Sun, 15 Sep 2013 21:38:47 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B26F2742; Sun, 15 Sep 2013 21:38:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FLclEu066018; Sun, 15 Sep 2013 21:38:47 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FLcliA066017; Sun, 15 Sep 2013 21:38:47 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201309152138.r8FLcliA066017@svn.freebsd.org> From: Mark Johnston Date: Sun, 15 Sep 2013 21:38:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255604 - head/cddl/lib/libdtrace X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 21:38:47 -0000 Author: markj Date: Sun Sep 15 21:38:46 2013 New Revision: 255604 URL: http://svnweb.freebsd.org/changeset/base/255604 Log: Use the address of the inpcb rather than the tcpcb to identify TCP connections. This keeps the tcp provider consistent with the other network providers. Approved by: re (delphij) Modified: head/cddl/lib/libdtrace/tcp.d Modified: head/cddl/lib/libdtrace/tcp.d ============================================================================== --- head/cddl/lib/libdtrace/tcp.d Sun Sep 15 21:18:50 2013 (r255603) +++ head/cddl/lib/libdtrace/tcp.d Sun Sep 15 21:38:46 2013 (r255604) @@ -144,7 +144,7 @@ typedef struct tcpinfo { #pragma D binding "1.0" translator translator csinfo_t < struct tcpcb *p > { cs_addr = NULL; - cs_cid = (uint64_t)p; + cs_cid = (uint64_t)(p == NULL ? 0 : p->t_inpcb); cs_pid = 0; cs_zoneid = 0; }; From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 06:15:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 22FEB233; Mon, 16 Sep 2013 06:15:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EBE72F19; Mon, 16 Sep 2013 06:15:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8G6FF8k039080; Mon, 16 Sep 2013 06:15:15 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8G6FFqh039079; Mon, 16 Sep 2013 06:15:15 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201309160615.r8G6FFqh039079@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 16 Sep 2013 06:15:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255607 - head/sys/amd64/amd64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 06:15:16 -0000 Author: kib Date: Mon Sep 16 06:15:15 2013 New Revision: 255607 URL: http://svnweb.freebsd.org/changeset/base/255607 Log: In pmap_copy(), when the copied region is mapped with superpage but does not cover entire superpage, avoid copying. Doing partial copy would require demotion, which is incompatible with the already held locks. Reported by: cperciva Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Approved by: re (delphij) Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Mon Sep 16 02:01:36 2013 (r255606) +++ head/sys/amd64/amd64/pmap.c Mon Sep 16 06:15:15 2013 (r255607) @@ -4356,6 +4356,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm continue; if (srcptepaddr & PG_PS) { + if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr) + continue; dstmpde = pmap_allocpde(dst_pmap, addr, NULL); if (dstmpde == NULL) break; From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 06:25:57 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8B861430; Mon, 16 Sep 2013 06:25:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6969C2F7E; Mon, 16 Sep 2013 06:25:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8G6Pvok044901; Mon, 16 Sep 2013 06:25:57 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8G6PtZs044888; Mon, 16 Sep 2013 06:25:55 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201309160625.r8G6PtZs044888@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 16 Sep 2013 06:25:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255608 - in head/sys: conf kern modules/cxgb/cxgb modules/sfxge modules/ti sys vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 06:25:57 -0000 Author: kib Date: Mon Sep 16 06:25:54 2013 New Revision: 255608 URL: http://svnweb.freebsd.org/changeset/base/255608 Log: Remove zero-copy sockets code. It only worked for anonymous memory, and the equivalent functionality is now provided by sendfile(2) over posix shared memory filedescriptor. Remove the cow member of struct vm_page, and rearrange the remaining members. While there, make hold_count unsigned. Requested and reviewed by: alc Tested by: pho Sponsored by: The FreeBSD Foundation Approved by: re (delphij) Modified: head/sys/conf/NOTES head/sys/conf/options head/sys/kern/subr_uio.c head/sys/kern/uipc_socket.c head/sys/modules/cxgb/cxgb/Makefile head/sys/modules/sfxge/Makefile head/sys/modules/ti/Makefile head/sys/sys/socketvar.h head/sys/sys/uio.h head/sys/vm/vm_fault.c head/sys/vm/vm_page.c head/sys/vm/vm_page.h Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/conf/NOTES Mon Sep 16 06:25:54 2013 (r255608) @@ -996,21 +996,6 @@ options TCP_SIGNATURE #include support # a smooth scheduling of the traffic. options DUMMYNET -# "Zero copy" sockets support is split into the send and receive path -# which operate very differently. -# For the send path the VM page with the data is wired into the kernel -# and marked as COW (copy-on-write). If the application touches the -# data while it is still in the send socket buffer the page is copied -# and divorced from its kernel wiring (no longer zero copy). -# The receive side requires explicit NIC driver support to create -# disposable pages which are flipped from kernel to user-space VM. -# See zero_copy(9) for more details. -# XXX: The COW based send mechanism is not safe and may result in -# kernel crashes. -# XXX: None of the current NIC drivers support disposable pages. -options SOCKET_SEND_COW -options SOCKET_RECV_PFLIP - ##################################################################### # FILESYSTEM OPTIONS Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/conf/options Mon Sep 16 06:25:54 2013 (r255608) @@ -528,8 +528,6 @@ NGATM_CCATM opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h -SOCKET_SEND_COW opt_zero.h -SOCKET_RECV_PFLIP opt_zero.h TI_SF_BUF_JUMBO opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h Modified: head/sys/kern/subr_uio.c ============================================================================== --- head/sys/kern/subr_uio.c Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/kern/subr_uio.c Mon Sep 16 06:25:54 2013 (r255608) @@ -37,8 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_zero.h" - #include #include #include @@ -58,84 +56,12 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef SOCKET_SEND_COW -#include -#endif SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV, "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)"); static int uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault); -#ifdef SOCKET_SEND_COW -/* Declared in uipc_socket.c */ -extern int so_zero_copy_receive; - -/* - * Identify the physical page mapped at the given kernel virtual - * address. Insert this physical page into the given address space at - * the given virtual address, replacing the physical page, if any, - * that already exists there. - */ -static int -vm_pgmoveco(vm_map_t mapa, vm_offset_t kaddr, vm_offset_t uaddr) -{ - vm_map_t map = mapa; - vm_page_t kern_pg, user_pg; - vm_object_t uobject; - vm_map_entry_t entry; - vm_pindex_t upindex; - vm_prot_t prot; - boolean_t wired; - - KASSERT((uaddr & PAGE_MASK) == 0, - ("vm_pgmoveco: uaddr is not page aligned")); - - /* - * Herein the physical page is validated and dirtied. It is - * unwired in sf_buf_mext(). - */ - kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr)); - kern_pg->valid = VM_PAGE_BITS_ALL; - KASSERT(kern_pg->queue == PQ_NONE && kern_pg->wire_count == 1, - ("vm_pgmoveco: kern_pg is not correctly wired")); - - if ((vm_map_lookup(&map, uaddr, - VM_PROT_WRITE, &entry, &uobject, - &upindex, &prot, &wired)) != KERN_SUCCESS) { - return(EFAULT); - } - VM_OBJECT_WLOCK(uobject); -retry: - if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - if (vm_page_sleep_if_busy(user_pg, "vm_pgmoveco")) - goto retry; - vm_page_lock(user_pg); - pmap_remove_all(user_pg); - vm_page_free(user_pg); - vm_page_unlock(user_pg); - } else { - /* - * Even if a physical page does not exist in the - * object chain's first object, a physical page from a - * backing object may be mapped read only. - */ - if (uobject->backing_object != NULL) - pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE); - } - if (vm_page_insert(kern_pg, uobject, upindex)) { - VM_OBJECT_WUNLOCK(uobject); - VM_WAIT; - VM_OBJECT_WLOCK(uobject); - goto retry; - } - vm_page_dirty(kern_pg); - VM_OBJECT_WUNLOCK(uobject); - vm_map_lookup_done(map, entry); - return(KERN_SUCCESS); -} -#endif /* SOCKET_SEND_COW */ - int copyin_nofault(const void *udaddr, void *kaddr, size_t len) { @@ -313,103 +239,6 @@ uiomove_frombuf(void *buf, int buflen, s return (uiomove((char *)buf + offset, n, uio)); } -#ifdef SOCKET_RECV_PFLIP -/* - * Experimental support for zero-copy I/O - */ -static int -userspaceco(void *cp, u_int cnt, struct uio *uio, int disposable) -{ - struct iovec *iov; - int error; - - iov = uio->uio_iov; - if (uio->uio_rw == UIO_READ) { - if ((so_zero_copy_receive != 0) - && ((cnt & PAGE_MASK) == 0) - && ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) - && ((uio->uio_offset & PAGE_MASK) == 0) - && ((((intptr_t) cp) & PAGE_MASK) == 0) - && (disposable != 0)) { - /* SOCKET: use page-trading */ - /* - * We only want to call vm_pgmoveco() on - * disposeable pages, since it gives the - * kernel page to the userland process. - */ - error = vm_pgmoveco(&curproc->p_vmspace->vm_map, - (vm_offset_t)cp, (vm_offset_t)iov->iov_base); - - /* - * If we get an error back, attempt - * to use copyout() instead. The - * disposable page should be freed - * automatically if we weren't able to move - * it into userland. - */ - if (error != 0) - error = copyout(cp, iov->iov_base, cnt); - } else { - error = copyout(cp, iov->iov_base, cnt); - } - } else { - error = copyin(iov->iov_base, cp, cnt); - } - return (error); -} - -int -uiomoveco(void *cp, int n, struct uio *uio, int disposable) -{ - struct iovec *iov; - u_int cnt; - int error; - - KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, - ("uiomoveco: mode")); - KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, - ("uiomoveco proc")); - - while (n > 0 && uio->uio_resid) { - iov = uio->uio_iov; - cnt = iov->iov_len; - if (cnt == 0) { - uio->uio_iov++; - uio->uio_iovcnt--; - continue; - } - if (cnt > n) - cnt = n; - - switch (uio->uio_segflg) { - - case UIO_USERSPACE: - maybe_yield(); - error = userspaceco(cp, cnt, uio, disposable); - if (error) - return (error); - break; - - case UIO_SYSSPACE: - if (uio->uio_rw == UIO_READ) - bcopy(cp, iov->iov_base, cnt); - else - bcopy(iov->iov_base, cp, cnt); - break; - case UIO_NOCOPY: - break; - } - iov->iov_base = (char *)iov->iov_base + cnt; - iov->iov_len -= cnt; - uio->uio_resid -= cnt; - uio->uio_offset += cnt; - cp = (char *)cp + cnt; - n -= cnt; - } - return (0); -} -#endif /* SOCKET_RECV_PFLIP */ - /* * Give next character to user as result of read. */ Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/kern/uipc_socket.c Mon Sep 16 06:25:54 2013 (r255608) @@ -105,7 +105,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_zero.h" #include "opt_compat.h" #include @@ -221,21 +220,6 @@ static int numopensockets; SYSCTL_INT(_kern_ipc, OID_AUTO, numopensockets, CTLFLAG_RD, &numopensockets, 0, "Number of open sockets"); -#if defined(SOCKET_SEND_COW) || defined(SOCKET_RECV_PFLIP) -SYSCTL_NODE(_kern_ipc, OID_AUTO, zero_copy, CTLFLAG_RD, 0, - "Zero copy controls"); -#ifdef SOCKET_RECV_PFLIP -int so_zero_copy_receive = 1; -SYSCTL_INT(_kern_ipc_zero_copy, OID_AUTO, receive, CTLFLAG_RW, - &so_zero_copy_receive, 0, "Enable zero copy receive"); -#endif -#ifdef SOCKET_SEND_COW -int so_zero_copy_send = 1; -SYSCTL_INT(_kern_ipc_zero_copy, OID_AUTO, send, CTLFLAG_RW, - &so_zero_copy_send, 0, "Enable zero copy send"); -#endif /* SOCKET_SEND_COW */ -#endif /* SOCKET_SEND_COW || SOCKET_RECV_PFLIP */ - /* * accept_mtx locks down per-socket fields relating to accept queues. See * socketvar.h for an annotation of the protected fields of struct socket. @@ -978,113 +962,6 @@ sodisconnect(struct socket *so) return (error); } -#ifdef SOCKET_SEND_COW -struct so_zerocopy_stats{ - int size_ok; - int align_ok; - int found_ifp; -}; -struct so_zerocopy_stats so_zerocp_stats = {0,0,0}; - -/* - * sosend_copyin() is only used if zero copy sockets are enabled. Otherwise - * sosend_dgram() and sosend_generic() use m_uiotombuf(). - * - * sosend_copyin() accepts a uio and prepares an mbuf chain holding part or - * all of the data referenced by the uio. If desired, it uses zero-copy. - * *space will be updated to reflect data copied in. - * - * NB: If atomic I/O is requested, the caller must already have checked that - * space can hold resid bytes. - * - * NB: In the event of an error, the caller may need to free the partial - * chain pointed to by *mpp. The contents of both *uio and *space may be - * modified even in the case of an error. - */ -static int -sosend_copyin(struct uio *uio, struct mbuf **retmp, int atomic, long *space, - int flags) -{ - struct mbuf *m, **mp, *top; - long len; - ssize_t resid; - int error; - int cow_send; - - *retmp = top = NULL; - mp = ⊤ - len = 0; - resid = uio->uio_resid; - error = 0; - do { - cow_send = 0; - if (resid >= MINCLSIZE) { - if (top == NULL) { - m = m_gethdr(M_WAITOK, MT_DATA); - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; - } else - m = m_get(M_WAITOK, MT_DATA); - if (so_zero_copy_send && - resid >= PAGE_SIZE && - *space >= PAGE_SIZE && - uio->uio_iov->iov_len >= PAGE_SIZE) { - so_zerocp_stats.size_ok++; - so_zerocp_stats.align_ok++; - cow_send = socow_setup(m, uio); - len = cow_send; - } - if (!cow_send) { - m_clget(m, M_WAITOK); - len = min(min(MCLBYTES, resid), *space); - } - } else { - if (top == NULL) { - m = m_gethdr(M_WAITOK, MT_DATA); - m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; - - len = min(min(MHLEN, resid), *space); - /* - * For datagram protocols, leave room - * for protocol headers in first mbuf. - */ - if (atomic && m && len < MHLEN) - MH_ALIGN(m, len); - } else { - m = m_get(M_WAITOK, MT_DATA); - len = min(min(MLEN, resid), *space); - } - } - if (m == NULL) { - error = ENOBUFS; - goto out; - } - - *space -= len; - if (cow_send) - error = 0; - else - error = uiomove(mtod(m, void *), (int)len, uio); - resid = uio->uio_resid; - m->m_len = len; - *mp = m; - top->m_pkthdr.len += len; - if (error) - goto out; - mp = &m->m_next; - if (resid <= 0) { - if (flags & MSG_EOR) - top->m_flags |= M_EOR; - break; - } - } while (*space > 0 && atomic); -out: - *retmp = top; - return (error); -} -#endif /* SOCKET_SEND_COW */ - #define SBLOCKWAIT(f) (((f) & MSG_DONTWAIT) ? 0 : SBL_WAIT) int @@ -1094,9 +971,6 @@ sosend_dgram(struct socket *so, struct s long space; ssize_t resid; int clen = 0, error, dontroute; -#ifdef SOCKET_SEND_COW - int atomic = sosendallatonce(so) || top; -#endif KASSERT(so->so_type == SOCK_DGRAM, ("sosend_dgram: !SOCK_DGRAM")); KASSERT(so->so_proto->pr_flags & PR_ATOMIC, @@ -1179,11 +1053,6 @@ sosend_dgram(struct socket *so, struct s if (flags & MSG_EOR) top->m_flags |= M_EOR; } else { -#ifdef SOCKET_SEND_COW - error = sosend_copyin(uio, &top, atomic, &space, flags); - if (error) - goto out; -#else /* * Copy the data from userland into a mbuf chain. * If no data is to be copied in, a single empty mbuf @@ -1196,7 +1065,6 @@ sosend_dgram(struct socket *so, struct s goto out; } space -= resid - uio->uio_resid; -#endif /* SOCKET_SEND_COW */ resid = uio->uio_resid; } KASSERT(resid == 0, ("sosend_dgram: resid != 0")); @@ -1368,12 +1236,6 @@ restart: if (flags & MSG_EOR) top->m_flags |= M_EOR; } else { -#ifdef SOCKET_SEND_COW - error = sosend_copyin(uio, &top, atomic, - &space, flags); - if (error != 0) - goto release; -#else /* * Copy the data from userland into a mbuf * chain. If no data is to be copied in, @@ -1388,7 +1250,6 @@ restart: goto release; } space -= resid - uio->uio_resid; -#endif /* SOCKET_SEND_COW */ resid = uio->uio_resid; } if (dontroute) { @@ -1480,20 +1341,6 @@ soreceive_rcvoob(struct socket *so, stru if (error) goto bad; do { -#ifdef SOCKET_RECV_PFLIP - if (so_zero_copy_receive) { - int disposable; - - if ((m->m_flags & M_EXT) - && (m->m_ext.ext_type == EXT_DISPOSABLE)) - disposable = 1; - else - disposable = 0; - - error = uiomoveco(mtod(m, void *), - min(uio->uio_resid, m->m_len), uio, disposable); - } else -#endif /* SOCKET_RECV_PFLIP */ error = uiomove(mtod(m, void *), (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); @@ -1816,20 +1663,6 @@ dontblock: SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_rcv); -#ifdef SOCKET_RECV_PFLIP - if (so_zero_copy_receive) { - int disposable; - - if ((m->m_flags & M_EXT) - && (m->m_ext.ext_type == EXT_DISPOSABLE)) - disposable = 1; - else - disposable = 0; - - error = uiomoveco(mtod(m, char *) + moff, - (int)len, uio, disposable); - } else -#endif /* SOCKET_RECV_PFLIP */ error = uiomove(mtod(m, char *) + moff, (int)len, uio); SOCKBUF_LOCK(&so->so_rcv); if (error) { Modified: head/sys/modules/cxgb/cxgb/Makefile ============================================================================== --- head/sys/modules/cxgb/cxgb/Makefile Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/modules/cxgb/cxgb/Makefile Mon Sep 16 06:25:54 2013 (r255608) @@ -10,7 +10,7 @@ SRCS= cxgb_mc5.c cxgb_vsc8211.c cxgb_ael SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c cxgb_aq100x.c SRCS+= cxgb_sge.c cxgb_tn1010.c SRCS+= device_if.h bus_if.h pci_if.h -SRCS+= opt_inet.h opt_inet6.h opt_zero.h opt_sched.h +SRCS+= opt_inet.h opt_inet6.h opt_sched.h SRCS+= uipc_mvec.c CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB} Modified: head/sys/modules/sfxge/Makefile ============================================================================== --- head/sys/modules/sfxge/Makefile Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/modules/sfxge/Makefile Mon Sep 16 06:25:54 2013 (r255608) @@ -5,7 +5,7 @@ KMOD= sfxge SFXGE= ${.CURDIR}/../../dev/sfxge SRCS= device_if.h bus_if.h pci_if.h -SRCS+= opt_inet.h opt_zero.h opt_sched.h +SRCS+= opt_inet.h opt_sched.h .PATH: ${.CURDIR}/../../dev/sfxge SRCS+= sfxge.c sfxge_dma.c sfxge_ev.c Modified: head/sys/modules/ti/Makefile ============================================================================== --- head/sys/modules/ti/Makefile Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/modules/ti/Makefile Mon Sep 16 06:25:54 2013 (r255608) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/ti KMOD= if_ti -SRCS= if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h +SRCS= if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h .include Modified: head/sys/sys/socketvar.h ============================================================================== --- head/sys/sys/socketvar.h Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/sys/socketvar.h Mon Sep 16 06:25:54 2013 (r255608) @@ -325,7 +325,6 @@ int soconnect(struct socket *so, struct int soconnectat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td); int soconnect2(struct socket *so1, struct socket *so2); -int socow_setup(struct mbuf *m0, struct uio *uio); int socreate(int dom, struct socket **aso, int type, int proto, struct ucred *cred, struct thread *td); int sodisconnect(struct socket *so); Modified: head/sys/sys/uio.h ============================================================================== --- head/sys/sys/uio.h Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/sys/uio.h Mon Sep 16 06:25:54 2013 (r255608) @@ -104,7 +104,6 @@ int uiomove_fromphys(struct vm_page *ma[ struct uio *uio); int uiomove_nofault(void *cp, int n, struct uio *uio); int uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio); -int uiomoveco(void *cp, int n, struct uio *uio, int disposable); #else /* !_KERNEL */ Modified: head/sys/vm/vm_fault.c ============================================================================== --- head/sys/vm/vm_fault.c Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/vm/vm_fault.c Mon Sep 16 06:25:54 2013 (r255608) @@ -333,24 +333,6 @@ RetryFault:; */ fs.m = vm_page_lookup(fs.object, fs.pindex); if (fs.m != NULL) { - /* - * check for page-based copy on write. - * We check fs.object == fs.first_object so - * as to ensure the legacy COW mechanism is - * used when the page in question is part of - * a shadow object. Otherwise, vm_page_cowfault() - * removes the page from the backing object, - * which is not what we want. - */ - vm_page_lock(fs.m); - if ((fs.m->cow) && - (fault_type & VM_PROT_WRITE) && - (fs.object == fs.first_object)) { - vm_page_cowfault(fs.m); - unlock_and_deallocate(&fs); - goto RetryFault; - } - /* * Wait/Retry if the page is busy. We have to do this * if the page is either exclusive or shared busy @@ -374,7 +356,6 @@ RetryFault:; * likely to reclaim it. */ vm_page_aflag_set(fs.m, PGA_REFERENCED); - vm_page_unlock(fs.m); if (fs.object != fs.first_object) { if (!VM_OBJECT_TRYWLOCK( fs.first_object)) { @@ -400,6 +381,7 @@ RetryFault:; vm_object_deallocate(fs.first_object); goto RetryFault; } + vm_page_lock(fs.m); vm_page_remque(fs.m); vm_page_unlock(fs.m); Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/vm/vm_page.c Mon Sep 16 06:25:54 2013 (r255608) @@ -674,8 +674,8 @@ vm_page_unhold(vm_page_t mem) { vm_page_lock_assert(mem, MA_OWNED); + KASSERT(mem->hold_count >= 1, ("vm_page_unhold: hold count < 0!!!")); --mem->hold_count; - KASSERT(mem->hold_count >= 0, ("vm_page_unhold: hold count < 0!!!")); if (mem->hold_count == 0 && (mem->flags & PG_UNHOLDFREE) != 0) vm_page_free_toq(mem); } @@ -3108,108 +3108,6 @@ vm_page_lock_assert_KBI(vm_page_t m, int } #endif -int so_zerocp_fullpage = 0; - -/* - * Replace the given page with a copy. The copied page assumes - * the portion of the given page's "wire_count" that is not the - * responsibility of this copy-on-write mechanism. - * - * The object containing the given page must have a non-zero - * paging-in-progress count and be locked. - */ -void -vm_page_cowfault(vm_page_t m) -{ - vm_page_t mnew; - vm_object_t object; - vm_pindex_t pindex; - - vm_page_lock_assert(m, MA_OWNED); - object = m->object; - VM_OBJECT_ASSERT_WLOCKED(object); - KASSERT(object->paging_in_progress != 0, - ("vm_page_cowfault: object %p's paging-in-progress count is zero.", - object)); - pindex = m->pindex; - - retry_alloc: - mnew = vm_page_alloc(NULL, pindex, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); - if (mnew == NULL) { - vm_page_unlock(m); - VM_OBJECT_WUNLOCK(object); - VM_WAIT; - VM_OBJECT_WLOCK(object); - if (m == vm_page_lookup(object, pindex)) { - vm_page_lock(m); - goto retry_alloc; - } else { - /* - * Page disappeared during the wait. - */ - return; - } - } - - if (m->cow == 0) { - /* - * check to see if we raced with an xmit complete when - * waiting to allocate a page. If so, put things back - * the way they were - */ - vm_page_unlock(m); - vm_page_lock(mnew); - vm_page_free(mnew); - vm_page_unlock(mnew); - } else { /* clear COW & copy page */ - pmap_remove_all(m); - mnew->object = object; - if (object->memattr != VM_MEMATTR_DEFAULT && - (object->flags & OBJ_FICTITIOUS) == 0) - pmap_page_set_memattr(mnew, object->memattr); - if (vm_page_replace(mnew, object, pindex) != m) - panic("vm_page_cowfault: invalid page replacement"); - if (!so_zerocp_fullpage) - pmap_copy_page(m, mnew); - mnew->valid = VM_PAGE_BITS_ALL; - vm_page_dirty(mnew); - mnew->wire_count = m->wire_count - m->cow; - m->wire_count = m->cow; - vm_page_unlock(m); - } -} - -void -vm_page_cowclear(vm_page_t m) -{ - - vm_page_lock_assert(m, MA_OWNED); - if (m->cow) { - m->cow--; - /* - * let vm_fault add back write permission lazily - */ - } - /* - * sf_buf_free() will free the page, so we needn't do it here - */ -} - -int -vm_page_cowsetup(vm_page_t m) -{ - - vm_page_lock_assert(m, MA_OWNED); - if ((m->flags & PG_FICTITIOUS) != 0 || - (m->oflags & VPO_UNMANAGED) != 0 || - m->cow == USHRT_MAX - 1 || !VM_OBJECT_TRYWLOCK(m->object)) - return (EBUSY); - m->cow++; - pmap_remove_write(m); - VM_OBJECT_WUNLOCK(m->object); - return (0); -} - #ifdef INVARIANTS void vm_page_object_lock_assert(vm_page_t m) Modified: head/sys/vm/vm_page.h ============================================================================== --- head/sys/vm/vm_page.h Mon Sep 16 06:15:15 2013 (r255607) +++ head/sys/vm/vm_page.h Mon Sep 16 06:25:54 2013 (r255608) @@ -142,23 +142,21 @@ struct vm_page { vm_pindex_t pindex; /* offset into object (O,P) */ vm_paddr_t phys_addr; /* physical address of page */ struct md_page md; /* machine dependant stuff */ + u_int wire_count; /* wired down maps refs (P) */ + volatile u_int busy_lock; /* busy owners lock */ + uint16_t hold_count; /* page hold count (P) */ + uint16_t flags; /* page PG_* flags (P) */ + uint8_t aflags; /* access is atomic */ + uint8_t oflags; /* page VPO_* flags (O) */ uint8_t queue; /* page queue index (P,Q) */ int8_t segind; - short hold_count; /* page hold count (P) */ uint8_t order; /* index of the buddy queue */ uint8_t pool; - u_short cow; /* page cow mapping count (P) */ - u_int wire_count; /* wired down maps refs (P) */ - uint8_t aflags; /* access is atomic */ - uint8_t oflags; /* page VPO_* flags (O) */ - uint16_t flags; /* page PG_* flags (P) */ u_char act_count; /* page usage count (P) */ - u_char __pad0; /* unused padding */ /* NOTE that these must support one bit per DEV_BSIZE in a page */ /* so, on normal X86 kernels, they must be at least 8 bits wide */ vm_page_bits_t valid; /* map of valid DEV_BSIZE chunks (O) */ vm_page_bits_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ - volatile u_int busy_lock; /* busy owners lock */ }; /* @@ -482,9 +480,6 @@ vm_page_bits_t vm_page_bits(int base, in void vm_page_zero_invalid(vm_page_t m, boolean_t setvalid); void vm_page_free_toq(vm_page_t m); void vm_page_zero_idle_wakeup(void); -void vm_page_cowfault (vm_page_t); -int vm_page_cowsetup(vm_page_t); -void vm_page_cowclear (vm_page_t); void vm_page_dirty_KBI(vm_page_t m); void vm_page_lock_KBI(vm_page_t m, const char *file, int line); From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 10:34:44 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C61ACC87; Mon, 16 Sep 2013 10:34:44 +0000 (UTC) (envelope-from zbb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B33E22E40; Mon, 16 Sep 2013 10:34:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GAYiN2078473; Mon, 16 Sep 2013 10:34:44 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GAYiuY078472; Mon, 16 Sep 2013 10:34:44 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201309161034.r8GAYiuY078472@svn.freebsd.org> From: Zbigniew Bodek Date: Mon, 16 Sep 2013 10:34:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255611 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 10:34:44 -0000 Author: zbb Date: Mon Sep 16 10:34:44 2013 New Revision: 255611 URL: http://svnweb.freebsd.org/changeset/base/255611 Log: Write protect base page after superpage demotion so that it may repromote When clearing the modification status of the superpage, one of the base pages produced during demotion should be marked as write disabled. The intention is that subsequent write access may repromote. In the current implementation this was done wrong as write permission was granted instead of forbidden. Approved by: cognet (mentor) Approved by: re Modified: head/sys/arm/arm/pmap-v6.c Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Mon Sep 16 10:06:40 2013 (r255610) +++ head/sys/arm/arm/pmap-v6.c Mon Sep 16 10:34:44 2013 (r255611) @@ -987,7 +987,7 @@ pmap_clearbit(struct vm_page *m, u_int m ("pmap_clearbit: no PV " "entry for managed mapping")); pve->pv_flags &= ~PVF_WRITE; - *ptep &= ~L2_APX; + *ptep |= L2_APX; PTE_SYNC(ptep); } } From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 10:39:36 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0FEEF1000; Mon, 16 Sep 2013 10:39:36 +0000 (UTC) (envelope-from zbb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0FB72EE3; Mon, 16 Sep 2013 10:39:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GAdZZ1079546; Mon, 16 Sep 2013 10:39:35 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GAdZEn079545; Mon, 16 Sep 2013 10:39:35 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201309161039.r8GAdZEn079545@svn.freebsd.org> From: Zbigniew Bodek Date: Mon, 16 Sep 2013 10:39:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255612 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 10:39:36 -0000 Author: zbb Date: Mon Sep 16 10:39:35 2013 New Revision: 255612 URL: http://svnweb.freebsd.org/changeset/base/255612 Log: Implement pmap_advise() for ARMv6/v7 pmap module Apply the given advice to the specified range of addresses within the given pmap. Depending on the advice, clear the referenced and/or modified flags in each mapping. Superpage within the given range will be demoted or destroyed. Reviewed by: alc Approved by: cognet (mentor) Approved by: re Modified: head/sys/arm/arm/pmap-v6.c Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Mon Sep 16 10:34:44 2013 (r255611) +++ head/sys/arm/arm/pmap-v6.c Mon Sep 16 10:39:35 2013 (r255612) @@ -4767,11 +4767,116 @@ pmap_is_modified(vm_page_t m) } /* - * This function is advisory. + * Apply the given advice to the specified range of addresses within the + * given pmap. Depending on the advice, clear the referenced and/or + * modified flags in each mapping. */ void pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice) { + struct l2_bucket *l2b; + struct pv_entry *pve; + pd_entry_t *pl1pd, l1pd; + pt_entry_t *ptep, opte, pte; + vm_offset_t next_bucket; + vm_page_t m; + + if (advice != MADV_DONTNEED && advice != MADV_FREE) + return; + rw_wlock(&pvh_global_lock); + PMAP_LOCK(pmap); + for (; sva < eva; sva = next_bucket) { + next_bucket = L2_NEXT_BUCKET(sva); + if (next_bucket < sva) + next_bucket = eva; + pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(sva)]; + l1pd = *pl1pd; + if ((l1pd & L1_TYPE_MASK) == L1_S_PROTO) { + if (pmap == pmap_kernel()) + continue; + if (!pmap_demote_section(pmap, sva)) { + /* + * The large page mapping was destroyed. + */ + continue; + } + /* + * Unless the page mappings are wired, remove the + * mapping to a single page so that a subsequent + * access may repromote. Since the underlying + * l2_bucket is fully populated, this removal + * never frees an entire l2_bucket. + */ + l2b = pmap_get_l2_bucket(pmap, sva); + KASSERT(l2b != NULL, + ("pmap_advise: no l2 bucket for " + "va 0x%#x, pmap 0x%p", sva, pmap)); + ptep = &l2b->l2b_kva[l2pte_index(sva)]; + opte = *ptep; + m = PHYS_TO_VM_PAGE(l2pte_pa(*ptep)); + KASSERT(m != NULL, + ("pmap_advise: no vm_page for demoted superpage")); + pve = pmap_find_pv(&m->md, pmap, sva); + KASSERT(pve != NULL, + ("pmap_advise: no PV entry for managed mapping")); + if ((pve->pv_flags & PVF_WIRED) == 0) { + pmap_free_l2_bucket(pmap, l2b, 1); + pve = pmap_remove_pv(m, pmap, sva); + pmap_free_pv_entry(pmap, pve); + *ptep = 0; + PTE_SYNC(ptep); + if (pmap_is_current(pmap)) { + if (PTE_BEEN_EXECD(opte)) + cpu_tlb_flushID_SE(sva); + else if (PTE_BEEN_REFD(opte)) + cpu_tlb_flushD_SE(sva); + } + } + } + if (next_bucket > eva) + next_bucket = eva; + l2b = pmap_get_l2_bucket(pmap, sva); + if (l2b == NULL) + continue; + for (ptep = &l2b->l2b_kva[l2pte_index(sva)]; + sva != next_bucket; ptep++, sva += PAGE_SIZE) { + opte = pte = *ptep; + if ((opte & L2_S_PROTO) == 0) + continue; + m = PHYS_TO_VM_PAGE(l2pte_pa(opte)); + if (m == NULL || (m->oflags & VPO_UNMANAGED) != 0) + continue; + else if (L2_S_WRITABLE(opte)) { + if (advice == MADV_DONTNEED) { + /* + * Don't need to mark the page + * dirty as it was already marked as + * such in pmap_fault_fixup() or + * pmap_enter_locked(). + * Just clear the state. + */ + } else + pte |= L2_APX; + + pte &= ~L2_S_REF; + *ptep = pte; + PTE_SYNC(ptep); + } else if (L2_S_REFERENCED(opte)) { + pte &= ~L2_S_REF; + *ptep = pte; + PTE_SYNC(ptep); + } else + continue; + if (pmap_is_current(pmap)) { + if (PTE_BEEN_EXECD(opte)) + cpu_tlb_flushID_SE(sva); + else if (PTE_BEEN_REFD(opte)) + cpu_tlb_flushD_SE(sva); + } + } + } + rw_wunlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); } /* From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 10:46:59 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 651004A8; Mon, 16 Sep 2013 10:46:59 +0000 (UTC) (envelope-from zbb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C5992F73; Mon, 16 Sep 2013 10:46:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GAkxnQ084657; Mon, 16 Sep 2013 10:46:59 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GAkxEM084656; Mon, 16 Sep 2013 10:46:59 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201309161046.r8GAkxEM084656@svn.freebsd.org> From: Zbigniew Bodek Date: Mon, 16 Sep 2013 10:46:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255613 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 10:46:59 -0000 Author: zbb Date: Mon Sep 16 10:46:58 2013 New Revision: 255613 URL: http://svnweb.freebsd.org/changeset/base/255613 Log: Fix GCC build error when building for ARMv6 Apply theravens's idea to move __strong_reference macros into the proper ifdef section. Approved by: cognet (mentor) Approved by: re Modified: head/sys/arm/arm/stdatomic.c Modified: head/sys/arm/arm/stdatomic.c ============================================================================== --- head/sys/arm/arm/stdatomic.c Mon Sep 16 10:39:35 2013 (r255612) +++ head/sys/arm/arm/stdatomic.c Mon Sep 16 10:46:58 2013 (r255613) @@ -834,6 +834,10 @@ EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh") EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq") +#endif /* _KERNEL */ + +#endif + #ifndef __clang__ __strong_reference(__sync_lock_test_and_set_1_c, __sync_lock_test_and_set_1); __strong_reference(__sync_lock_test_and_set_2_c, __sync_lock_test_and_set_2); @@ -858,8 +862,4 @@ __strong_reference(__sync_fetch_and_xor_ __strong_reference(__sync_fetch_and_xor_4_c, __sync_fetch_and_xor_4); #endif -#endif /* _KERNEL */ - -#endif - #endif /* __SYNC_ATOMICS */ From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 11:27:21 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A38BBEEA for ; Mon, 16 Sep 2013 11:27:21 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 15FF624CC for ; Mon, 16 Sep 2013 11:27:20 +0000 (UTC) Received: (qmail 8715 invoked from network); 16 Sep 2013 12:05:37 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 16 Sep 2013 12:05:37 -0000 Message-ID: <5236EB0D.4050303@freebsd.org> Date: Mon, 16 Sep 2013 13:27:09 +0200 From: Andre Oppermann User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Konstantin Belousov Subject: Re: svn commit: r255608 - in head/sys: conf kern modules/cxgb/cxgb modules/sfxge modules/ti sys vm References: <201309160625.r8G6PtZs044888@svn.freebsd.org> In-Reply-To: <201309160625.r8G6PtZs044888@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 11:27:21 -0000 On 16.09.2013 08:25, Konstantin Belousov wrote: > Author: kib > Date: Mon Sep 16 06:25:54 2013 > New Revision: 255608 > URL: http://svnweb.freebsd.org/changeset/base/255608 > > Log: > Remove zero-copy sockets code. It only worked for anonymous memory, > and the equivalent functionality is now provided by sendfile(2) over > posix shared memory filedescriptor. > > Remove the cow member of struct vm_page, and rearrange the remaining > members. While there, make hold_count unsigned. Thanks, it's good to see it gone. :) -- Andre From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 14:32:57 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 27E684B4; Mon, 16 Sep 2013 14:32:57 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1485B2203; Mon, 16 Sep 2013 14:32:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GEWugx006276; Mon, 16 Sep 2013 14:32:56 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GEWuBx006275; Mon, 16 Sep 2013 14:32:56 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309161432.r8GEWuBx006275@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 16 Sep 2013 14:32:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255614 - head/sys/powerpc/powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 14:32:57 -0000 Author: nwhitehorn Date: Mon Sep 16 14:32:56 2013 New Revision: 255614 URL: http://svnweb.freebsd.org/changeset/base/255614 Log: Fix bug in busdma: if segs is a preexisting buffer, we memcpy it into the DMA map. The length of the buffer had not yet been initialized, however, so this would copy gibberish unless it happened to be right by chance. This bug mostly only affected systems with IOMMUs. Approved by: re (gjb) MFC after: 3 days Modified: head/sys/powerpc/powerpc/busdma_machdep.c Modified: head/sys/powerpc/powerpc/busdma_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/busdma_machdep.c Mon Sep 16 10:46:58 2013 (r255613) +++ head/sys/powerpc/powerpc/busdma_machdep.c Mon Sep 16 14:32:56 2013 (r255614) @@ -844,11 +844,11 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dma_segment_t *segs, int nsegs, int error) { + map->nsegs = nsegs; if (segs != NULL) memcpy(map->segments, segs, map->nsegs*sizeof(segs[0])); else segs = map->segments; - map->nsegs = nsegs; if (dmat->iommu != NULL) IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs, dmat->lowaddr, dmat->highaddr, dmat->alignment, From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 15:10:12 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3C475E56; Mon, 16 Sep 2013 15:10:12 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 29A95249B; Mon, 16 Sep 2013 15:10:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GFABDK024781; Mon, 16 Sep 2013 15:10:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GFABav024780; Mon, 16 Sep 2013 15:10:11 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309161510.r8GFABav024780@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 16 Sep 2013 15:10:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255615 - head/sys/powerpc/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 15:10:12 -0000 Author: nwhitehorn Date: Mon Sep 16 15:10:11 2013 New Revision: 255615 URL: http://svnweb.freebsd.org/changeset/base/255615 Log: Add a loader tunable to use only device tree-provided PCI devices. This is needed on some more fragile systems to avoid machine checks when blindly probing the PCI bus. Also reduce ofw_pcibus's priority slightly so that it can be overridden. Approved by: re (gjb) Modified: head/sys/powerpc/ofw/ofw_pcibus.c Modified: head/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- head/sys/powerpc/ofw/ofw_pcibus.c Mon Sep 16 14:32:56 2013 (r255614) +++ head/sys/powerpc/ofw/ofw_pcibus.c Mon Sep 16 15:10:11 2013 (r255615) @@ -101,6 +101,9 @@ DRIVER_MODULE(ofw_pcibus, pcib, ofw_pcib MODULE_VERSION(ofw_pcibus, 1); MODULE_DEPEND(ofw_pcibus, pci, 1, 1, 1); +static int ofw_devices_only = 0; +TUNABLE_INT("hw.pci.ofw_devices_only", &ofw_devices_only); + static int ofw_pcibus_probe(device_t dev) { @@ -109,7 +112,7 @@ ofw_pcibus_probe(device_t dev) return (ENXIO); device_set_desc(dev, "OFW PCI bus"); - return (0); + return (BUS_PROBE_DEFAULT); } static int @@ -137,7 +140,8 @@ ofw_pcibus_attach(device_t dev) * functions on multi-function cards. */ - ofw_pcibus_enum_bus(dev, domain, busno); + if (!ofw_devices_only) + ofw_pcibus_enum_bus(dev, domain, busno); return (bus_generic_attach(dev)); } From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 19:29:19 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 77A33CDE; Mon, 16 Sep 2013 19:29:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 65ED02755; Mon, 16 Sep 2013 19:29:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GJTJm7065631; Mon, 16 Sep 2013 19:29:19 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GJTJXh065630; Mon, 16 Sep 2013 19:29:19 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309161929.r8GJTJXh065630@svn.freebsd.org> From: Glen Barber Date: Mon, 16 Sep 2013 19:29:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255619 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 19:29:19 -0000 Author: gjb Date: Mon Sep 16 19:29:18 2013 New Revision: 255619 URL: http://svnweb.freebsd.org/changeset/base/255619 Log: Update head/ to -ALPHA2 status. Approved by: re (implicit) Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Mon Sep 16 17:32:02 2013 (r255618) +++ head/sys/conf/newvers.sh Mon Sep 16 19:29:18 2013 (r255619) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.0" -BRANCH="ALPHA1" +BRANCH="ALPHA2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 19:37:49 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E982ECC; Mon, 16 Sep 2013 19:37:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6817427DA; Mon, 16 Sep 2013 19:37:49 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 69618B9B3; Mon, 16 Sep 2013 15:37:48 -0400 (EDT) From: John Baldwin To: "Jean-Sebastien Pedron" Subject: Re: svn commit: r255573 - head/sys/dev/drm2/radeon Date: Mon, 16 Sep 2013 12:28:46 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <201309141724.r8EHOgj8060898@svn.freebsd.org> In-Reply-To: <201309141724.r8EHOgj8060898@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201309161228.46123.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 16 Sep 2013 15:37:48 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 19:37:49 -0000 On Saturday, September 14, 2013 1:24:42 pm Jean-Sebastien Pedron wrote: > Author: dumbbell > Date: Sat Sep 14 17:24:41 2013 > New Revision: 255573 > URL: http://svnweb.freebsd.org/changeset/base/255573 > > Log: > drm/radeon: Fix usage of pci_save_state() and pci_restore_state() > > Calling those functions with the drmn device as argument causes a panic, > because it's not a direct child of pci$N. They must be called with the > vgapci device instead. > > This fix is not enough to make suspend/resume work reliably. > > Approved by: re (blanket) Note that the PCI bus layer already does pci_save_state() during suspend and pci_restore_state() during resume, so it is redundant for a driver to do so. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 19:58:37 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B082D6DE; Mon, 16 Sep 2013 19:58:37 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E3182932; Mon, 16 Sep 2013 19:58:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GJwbcB080941; Mon, 16 Sep 2013 19:58:37 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GJwbcg080940; Mon, 16 Sep 2013 19:58:37 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201309161958.r8GJwbcg080940@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 16 Sep 2013 19:58:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255620 - head/sys/i386/i386 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 19:58:37 -0000 Author: kib Date: Mon Sep 16 19:58:37 2013 New Revision: 255620 URL: http://svnweb.freebsd.org/changeset/base/255620 Log: Merge the change r255607 from amd64 to i386. Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Approved by: re (gjb) Modified: head/sys/i386/i386/pmap.c Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Mon Sep 16 19:29:18 2013 (r255619) +++ head/sys/i386/i386/pmap.c Mon Sep 16 19:58:37 2013 (r255620) @@ -4062,6 +4062,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm continue; if (srcptepaddr & PG_PS) { + if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr) + continue; if (dst_pmap->pm_pdir[ptepindex] == 0 && ((srcptepaddr & PG_MANAGED) == 0 || pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr & From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 20:14:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 05355AD2; Mon, 16 Sep 2013 20:14:16 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from mail.made4.biz (unknown [IPv6:2001:41d0:1:7018::1:3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC6982A4C; Mon, 16 Sep 2013 20:14:15 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=magellan.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VLfBU-0004bS-Cu; Mon, 16 Sep 2013 22:14:12 +0200 Message-ID: <5237668D.4060108@FreeBSD.org> Date: Mon, 16 Sep 2013 22:14:05 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130913 Thunderbird/17.0.8 MIME-Version: 1.0 To: John Baldwin Subject: Re: svn commit: r255573 - head/sys/dev/drm2/radeon References: <201309141724.r8EHOgj8060898@svn.freebsd.org> <201309161228.46123.jhb@freebsd.org> In-Reply-To: <201309161228.46123.jhb@freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2WLNVRNTIROTDLKALPJPG" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 20:14:16 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2WLNVRNTIROTDLKALPJPG Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 16.09.2013 18:28, John Baldwin wrote: > Note that the PCI bus layer already does pci_save_state() during suspen= d > and pci_restore_state() during resume, so it is redundant for a driver = to > do so. Yes. I mostly wanted to fix the calls for now because it triggers a panic. They'll probably go away, but I'm working on fixing suspend/resume and I was curious if the card state could change between pci_save_state() in pci.c and the same call later in the driver itself. --=20 Jean-S=C3=A9bastien P=C3=A9dron ------enig2WLNVRNTIROTDLKALPJPG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlI3ZpMACgkQa+xGJsFYOlMDOQCfaKZ2F9b4uhJSC+ow947wOU4M E4kAnjnPdftbqCJijB+Gn9Jsm4Xviprx =j76f -----END PGP SIGNATURE----- ------enig2WLNVRNTIROTDLKALPJPG-- From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 20:44:41 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D99001B5; Mon, 16 Sep 2013 20:44:41 +0000 (UTC) (envelope-from edschouten@gmail.com) Received: from mail-vc0-x236.google.com (mail-vc0-x236.google.com [IPv6:2607:f8b0:400c:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 623232C0B; Mon, 16 Sep 2013 20:44:41 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id hf12so3411396vcb.13 for ; Mon, 16 Sep 2013 13:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=EXXJJpZR9Xgi+ijWH2BhY/+Ul7aSp6QU8vwAOaQv2Ko=; b=yt6qh3Oi/IAulvyh8Ey8RB/jxTFNnfBilEzzeReJ99ZvGbc4RLG2WLpHKLMNWPeSB7 01CHpZhJeNQf/7Xq8dvwpaSH/tjYB++0vUgXRDxwScLoBsR9I0Y6Q55M6bPJ0yXf26Tc g0RkXwHSUicDmlggAmpqPOOfIiWW2kZGNV/ZXKhR1ndZ1TE0qWDFQa48wRFIGR7sVgQK DkOCTodjtT5LLPZPXZ91wn5rn9m2zwdf9a+f0ONGLsChgAQuDh15i0APPb4pc4nwBXqm 3KYeadIj0ox9y9vQzRCctv0jfMDh+RJZjgjfpwFT28lm6k6nV8jovi1sOBGyCxjhP5MJ mLaA== MIME-Version: 1.0 X-Received: by 10.52.116.74 with SMTP id ju10mr24003908vdb.20.1379364280485; Mon, 16 Sep 2013 13:44:40 -0700 (PDT) Sender: edschouten@gmail.com Received: by 10.220.115.206 with HTTP; Mon, 16 Sep 2013 13:44:40 -0700 (PDT) In-Reply-To: <201309161046.r8GAkxEM084656@svn.freebsd.org> References: <201309161046.r8GAkxEM084656@svn.freebsd.org> Date: Mon, 16 Sep 2013 22:44:40 +0200 X-Google-Sender-Auth: QCDYdoITH8cUBnH2vP6AWxfmooo Message-ID: Subject: Re: svn commit: r255613 - head/sys/arm/arm From: Ed Schouten To: Zbigniew Bodek Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 20:44:41 -0000 2013/9/16 Zbigniew Bodek : > Log: > Fix GCC build error when building for ARMv6 > > Apply theravens's idea to move __strong_reference > macros into the proper ifdef section. > > Approved by: cognet (mentor) > Approved by: re > > Modified: > head/sys/arm/arm/stdatomic.c For some reason, this still breaks the build of the AVILA kernel: /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:842: error: '__sync_lock_test_and_set_1_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:842: warning: type defaults to 'int' in declaration of '__sync_lock_test_and_set_1' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:842: error: '__sync_lock_test_and_set_1' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:843: error: '__sync_lock_test_and_set_2_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:843: warning: type defaults to 'int' in declaration of '__sync_lock_test_and_set_2' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:843: error: '__sync_lock_test_and_set_2' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:844: error: '__sync_lock_test_and_set_4_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:844: warning: type defaults to 'int' in declaration of '__sync_lock_test_and_set_4' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:844: error: '__sync_lock_test_and_set_4' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:845: error: '__sync_val_compare_and_swap_1_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:845: warning: type defaults to 'int' in declaration of '__sync_val_compare_and_swap_1' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:845: error: '__sync_val_compare_and_swap_1' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:846: error: '__sync_val_compare_and_swap_2_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:846: warning: type defaults to 'int' in declaration of '__sync_val_compare_and_swap_2' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:846: error: '__sync_val_compare_and_swap_2' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:847: error: '__sync_val_compare_and_swap_4_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:847: warning: type defaults to 'int' in declaration of '__sync_val_compare_and_swap_4' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:847: error: '__sync_val_compare_and_swap_4' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:848: error: '__sync_fetch_and_add_1_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:848: warning: type defaults to 'int' in declaration of '__sync_fetch_and_add_1' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:848: error: '__sync_fetch_and_add_1' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:849: error: '__sync_fetch_and_add_2_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:849: warning: type defaults to 'int' in declaration of '__sync_fetch_and_add_2' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:849: error: '__sync_fetch_and_add_2' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:850: error: '__sync_fetch_and_add_4_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:850: warning: type defaults to 'int' in declaration of '__sync_fetch_and_add_4' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:850: error: '__sync_fetch_and_add_4' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:851: error: '__sync_fetch_and_and_1_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:851: warning: type defaults to 'int' in declaration of '__sync_fetch_and_and_1' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:851: error: '__sync_fetch_and_and_1' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:852: error: '__sync_fetch_and_and_2_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:852: warning: type defaults to 'int' in declaration of '__sync_fetch_and_and_2' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:852: error: '__sync_fetch_and_and_2' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:853: error: '__sync_fetch_and_and_4_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:853: warning: type defaults to 'int' in declaration of '__sync_fetch_and_and_4' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:853: error: '__sync_fetch_and_and_4' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:854: error: '__sync_fetch_and_sub_1_c' undeclared here (not in a function) /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:854: warning: type defaults to 'int' in declaration of '__sync_fetch_and_sub_1' /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:854: error: '__sync_fetch_and_sub_1' redeclared as different kind of symbol /usr/edje/projects/freebsd-head-4/sys/arm/arm/stdatomic.c:855: error: '__sync_fetch_and_sub_2_c' undeclared here (not in a function) etc. -- Ed Schouten From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 00:13:42 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CD40A92C; Tue, 17 Sep 2013 00:13:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA6492ACF; Tue, 17 Sep 2013 00:13:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H0DgNl020552; Tue, 17 Sep 2013 00:13:42 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H0DgTC020551; Tue, 17 Sep 2013 00:13:42 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309170013.r8H0DgTC020551@svn.freebsd.org> From: Glen Barber Date: Tue, 17 Sep 2013 00:13:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255622 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 00:13:42 -0000 Author: gjb Date: Tue Sep 17 00:13:42 2013 New Revision: 255622 URL: http://svnweb.freebsd.org/changeset/base/255622 Log: Document that the 'unbound' user is required for installworld since the import of ldns/unbound. Approved by: re (delphij) Sponsored by: The FreeBSD Foundation Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Sep 16 23:09:20 2013 (r255621) +++ head/UPDATING Tue Sep 17 00:13:42 2013 (r255622) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130916: + With the addition of unbound(8), a new unbound user is now + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. + 20130911: OpenSSH is now built with DNSSEC support, and will by default silently trust signed SSHFP records. This can be controlled with From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 01:54:14 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0BE1115F; Tue, 17 Sep 2013 01:54:14 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE44D20F1; Tue, 17 Sep 2013 01:54:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H1sD1X073946; Tue, 17 Sep 2013 01:54:13 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H1sDho073944; Tue, 17 Sep 2013 01:54:13 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201309170154.r8H1sDho073944@svn.freebsd.org> From: Bryan Venteicher Date: Tue, 17 Sep 2013 01:54:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255623 - in head/sys: amd64/conf i386/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 01:54:14 -0000 Author: bryanv Date: Tue Sep 17 01:54:13 2013 New Revision: 255623 URL: http://svnweb.freebsd.org/changeset/base/255623 Log: Add vmx(4) to i386 and amd64 GENERIC Approved by: re (gjb) Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Tue Sep 17 00:13:42 2013 (r255622) +++ head/sys/amd64/conf/GENERIC Tue Sep 17 01:54:13 2013 (r255623) @@ -341,3 +341,5 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device +# VMware support +device vmx # VMware VMXNET3 Ethernet Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Tue Sep 17 00:13:42 2013 (r255622) +++ head/sys/i386/conf/GENERIC Tue Sep 17 01:54:13 2013 (r255623) @@ -354,3 +354,6 @@ device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device + +# VMware support +device vmx # VMware VMXNET3 Ethernet From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 04:24:35 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2CCA8690; Tue, 17 Sep 2013 04:24:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1A88A28AD; Tue, 17 Sep 2013 04:24:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H4OYo5054584; Tue, 17 Sep 2013 04:24:34 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H4OYDQ054583; Tue, 17 Sep 2013 04:24:34 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201309170424.r8H4OYDQ054583@svn.freebsd.org> From: Glen Barber Date: Tue, 17 Sep 2013 04:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255624 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 04:24:35 -0000 Author: gjb Date: Tue Sep 17 04:24:34 2013 New Revision: 255624 URL: http://svnweb.freebsd.org/changeset/base/255624 Log: - Reword the 20121201 entry. - Clean up minor whitespace nit. Approved by: re (hrs) Sponsored by: The FreeBSD Foundation Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Sep 17 01:54:13 2013 (r255623) +++ head/UPDATING Tue Sep 17 04:24:34 2013 (r255624) @@ -63,9 +63,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 kdump, procstat, rwho, rwhod, uniq. 20130903: - AES-NI intrinsic support has been added to gcc. The AES-NI module - has been updated to use this support. A new gcc is required to build - the aesni module on both i386 and amd64. + AES-NI intrinsic support has been added to gcc. The AES-NI module + has been updated to use this support. A new gcc is required to build + the aesni module on both i386 and amd64. 20130827: Thomas Dickey (vendor author thereof) reports that dialog(1) since @@ -307,8 +307,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20121201: With the addition of auditdistd(8), a new auditdistd user is now - depended on during installworld. "mergemaster -p" can be used to add - the user prior to installworld, as documented in the handbook. + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. 20121117: The sin6_scope_id member variable in struct sockaddr_in6 is now From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 06:37:22 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5187AD08; Tue, 17 Sep 2013 06:37:22 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3EE6C2E26; Tue, 17 Sep 2013 06:37:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H6bMML024420; Tue, 17 Sep 2013 06:37:22 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H6bMUV024417; Tue, 17 Sep 2013 06:37:22 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201309170637.r8H6bMUV024417@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 17 Sep 2013 06:37:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255625 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 06:37:22 -0000 Author: glebius Date: Tue Sep 17 06:37:21 2013 New Revision: 255625 URL: http://svnweb.freebsd.org/changeset/base/255625 Log: Fix assertion in sendfile_readpage() to assert only the validity of requested amount of data in a page. Move assertion down below object unlock. Approved by: re (kib) Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: head/sys/kern/uipc_syscalls.c Modified: head/sys/kern/uipc_syscalls.c ============================================================================== --- head/sys/kern/uipc_syscalls.c Tue Sep 17 04:24:34 2013 (r255624) +++ head/sys/kern/uipc_syscalls.c Tue Sep 17 06:37:21 2013 (r255625) @@ -2076,10 +2076,10 @@ free_page: vm_page_free(m); vm_page_unlock(m); } - VM_OBJECT_WUNLOCK(obj); - KASSERT(error != 0 || (m->wire_count > 0 && m->valid == - VM_PAGE_BITS_ALL), + KASSERT(error != 0 || (m->wire_count > 0 && + vm_page_is_valid(m, off & PAGE_MASK, xfsize)), ("wrong page state m %p", m)); + VM_OBJECT_WUNLOCK(obj); return (error); } From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 07:35:28 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3E692932; Tue, 17 Sep 2013 07:35:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B8122112; Tue, 17 Sep 2013 07:35:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H7ZRag056972; Tue, 17 Sep 2013 07:35:27 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H7ZRDD056968; Tue, 17 Sep 2013 07:35:27 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201309170735.r8H7ZRDD056968@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 17 Sep 2013 07:35:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255626 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 07:35:28 -0000 Author: kib Date: Tue Sep 17 07:35:26 2013 New Revision: 255626 URL: http://svnweb.freebsd.org/changeset/base/255626 Log: PG_SLAB no longer serves a useful purpose, since m->object is no longer abused to store pointer to slab. Remove it. Reviewed by: alc Sponsored by: The FreeBSD Foundation Approved by: re (hrs) Modified: head/sys/vm/uma_int.h head/sys/vm/vm_page.c head/sys/vm/vm_page.h head/sys/vm/vm_reserv.c Modified: head/sys/vm/uma_int.h ============================================================================== --- head/sys/vm/uma_int.h Tue Sep 17 06:37:21 2013 (r255625) +++ head/sys/vm/uma_int.h Tue Sep 17 07:35:26 2013 (r255626) @@ -404,15 +404,9 @@ static __inline uma_slab_t vtoslab(vm_offset_t va) { vm_page_t p; - uma_slab_t slab; p = PHYS_TO_VM_PAGE(pmap_kextract(va)); - slab = (uma_slab_t )p->plinks.s.pv; - - if (p->flags & PG_SLAB) - return (slab); - else - return (NULL); + return ((uma_slab_t)p->plinks.s.pv); } static __inline void @@ -422,7 +416,6 @@ vsetslab(vm_offset_t va, uma_slab_t slab p = PHYS_TO_VM_PAGE(pmap_kextract(va)); p->plinks.s.pv = slab; - p->flags |= PG_SLAB; } /* Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Tue Sep 17 06:37:21 2013 (r255625) +++ head/sys/vm/vm_page.c Tue Sep 17 07:35:26 2013 (r255626) @@ -968,8 +968,7 @@ vm_page_insert_after(vm_page_t m, vm_obj KASSERT(m->object == NULL, ("vm_page_insert_after: page already inserted")); if (mpred != NULL) { - KASSERT(mpred->object == object || - (mpred->flags & PG_SLAB) != 0, + KASSERT(mpred->object == object, ("vm_page_insert_after: object doesn't contain mpred")); KASSERT(mpred->pindex < pindex, ("vm_page_insert_after: mpred doesn't precede pindex")); @@ -1019,8 +1018,7 @@ vm_page_insert_radixdone(vm_page_t m, vm KASSERT(object != NULL && m->object == object, ("vm_page_insert_radixdone: page %p has inconsistent object", m)); if (mpred != NULL) { - KASSERT(mpred->object == object || - (mpred->flags & PG_SLAB) != 0, + KASSERT(mpred->object == object, ("vm_page_insert_after: object doesn't contain mpred")); KASSERT(mpred->pindex < m->pindex, ("vm_page_insert_after: mpred doesn't precede pindex")); Modified: head/sys/vm/vm_page.h ============================================================================== --- head/sys/vm/vm_page.h Tue Sep 17 06:37:21 2013 (r255625) +++ head/sys/vm/vm_page.h Tue Sep 17 07:35:26 2013 (r255626) @@ -325,7 +325,6 @@ extern struct mtx_padalign pa_lock[]; #define PG_FICTITIOUS 0x0004 /* physical page doesn't exist */ #define PG_ZERO 0x0008 /* page is zeroed */ #define PG_MARKER 0x0010 /* special queue marker page */ -#define PG_SLAB 0x0020 /* object pointer is actually a slab */ #define PG_WINATCFLS 0x0040 /* flush dirty page on inactive q */ #define PG_NODUMP 0x0080 /* don't include this page in a dump */ #define PG_UNHOLDFREE 0x0100 /* delayed free of a held page */ Modified: head/sys/vm/vm_reserv.c ============================================================================== --- head/sys/vm/vm_reserv.c Tue Sep 17 06:37:21 2013 (r255625) +++ head/sys/vm/vm_reserv.c Tue Sep 17 07:35:26 2013 (r255626) @@ -502,8 +502,7 @@ vm_reserv_alloc_page(vm_object_t object, * Look for an existing reservation. */ if (mpred != NULL) { - KASSERT(mpred->object == object || - (mpred->flags & PG_SLAB) != 0, + KASSERT(mpred->object == object, ("vm_reserv_alloc_page: object doesn't contain mpred")); KASSERT(mpred->pindex < pindex, ("vm_reserv_alloc_page: mpred doesn't precede pindex")); From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 07:41:09 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 43E69BE8; Tue, 17 Sep 2013 07:41:09 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 321C02185; Tue, 17 Sep 2013 07:41:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8H7f9pw060237; Tue, 17 Sep 2013 07:41:09 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8H7f9r7060236; Tue, 17 Sep 2013 07:41:09 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309170741.r8H7f9r7060236@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Tue, 17 Sep 2013 07:41:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255627 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 07:41:09 -0000 Author: des Date: Tue Sep 17 07:41:08 2013 New Revision: 255627 URL: http://svnweb.freebsd.org/changeset/base/255627 Log: Set the correct path for LIBUNBOUND. Approved by: re (blanket) Modified: head/share/mk/bsd.libnames.mk Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Tue Sep 17 07:35:26 2013 (r255626) +++ head/share/mk/bsd.libnames.mk Tue Sep 17 07:41:08 2013 (r255627) @@ -165,7 +165,7 @@ LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a .if ${MK_UNBOUND} != "no" -LIBUNBOUND?= ${DESTDIR}${LIBDIR}/libunbound.a +LIBUNBOUND?= ${DESTDIR}${LIBPRIVATEDIR}/libunbound.a .endif LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 09:29:27 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AF3E647B; Tue, 17 Sep 2013 09:29:27 +0000 (UTC) (envelope-from zbodek@gmail.com) Received: from mail-wi0-x22f.google.com (mail-wi0-x22f.google.com [IPv6:2a00:1450:400c:c05::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 02BB32899; Tue, 17 Sep 2013 09:29:26 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id ez12so4639974wid.14 for ; Tue, 17 Sep 2013 02:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=dQLSJzS/iKbdrm3vQwqcDLwFbHcassUOMXov+Ho7CsM=; b=M//QOdN2e65fdJp2uBk8z4C/EbvLmrn5T+8VBV0pCE4P57nD65AWMn76HMZiAbAF+p Ynw4D3sgopcczThiOIeNsFokUYuciHmJPdbWeaAaKttHT6K4vivVKXt3Er+Ez7Fp6b3t vt1FlJvbSGEn4uKHduZPycLNwqZpEnWYaqpsndl64W4U1c99/sKu2+q0t+mYlbVjkTpG nekQe8Il0McZkX6+gPq83ztow0xlZmO0iybafkVArY6e9aLRbTS6spfKCaol0iV40izE QdQA/wUIPkLcx1xM7eCwduHxbAlC37n3xjQCf/d4ApeHtMOvghhDacQaPsxuNCfCh8qc K5qQ== MIME-Version: 1.0 X-Received: by 10.194.22.97 with SMTP id c1mr1010778wjf.43.1379410165415; Tue, 17 Sep 2013 02:29:25 -0700 (PDT) Sender: zbodek@gmail.com Received: by 10.217.38.69 with HTTP; Tue, 17 Sep 2013 02:29:25 -0700 (PDT) In-Reply-To: References: <201309161046.r8GAkxEM084656@svn.freebsd.org> Date: Tue, 17 Sep 2013 11:29:25 +0200 X-Google-Sender-Auth: KtFwg32P6g7Kjvi5xDHj-CK8s_8 Message-ID: Subject: Re: svn commit: r255613 - head/sys/arm/arm From: Zbigniew Bodek To: Ed Schouten Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 09:29:27 -0000 2013/9/16 Ed Schouten > 2013/9/16 Zbigniew Bodek : > > Log: > > Fix GCC build error when building for ARMv6 > > > > Apply theravens's idea to move __strong_reference > > macros into the proper ifdef section. > > > > Approved by: cognet (mentor) > > Approved by: re > > > > Modified: > > head/sys/arm/arm/stdatomic.c > > For some reason, this still breaks the build of the AVILA kernel: > > Hello Ed, You mean that this doesn't help for AVILA? To be precise the patch is for ARMv6/v7 issues and AVILA is ARMv5te? Nevertheless if the problem occurs for ARMs < v6 then another patch for that needs to be done. Best regards Zbyszek From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 10:36:25 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 20B1A63D; Tue, 17 Sep 2013 10:36:25 +0000 (UTC) (envelope-from zbodek@gmail.com) Received: from mail-wi0-x229.google.com (mail-wi0-x229.google.com [IPv6:2a00:1450:400c:c05::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 647182C4D; Tue, 17 Sep 2013 10:36:24 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id hj3so4778056wib.4 for ; Tue, 17 Sep 2013 03:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=Boi4WjCyd5B9RiPH5Z1vfYjNsjyuOx3OrVy3+hyggHA=; b=JUXSNIifoskPnXAlBcz+pQObHYVXiVorAbkbi3gdustzXdqGLiU0Yu6dUXu7WiK1xV 6QZmdvsouWBhAhPruVe9csfEy8wNbbaYvBqgs4z8Cw564siXXqlSMkzwHYZx6MSzQSET REv0ySTQBcY6yLQzLqyHrfDF6ObAgnRv8/57pjMkmt91ljBZ4+AYLKjSKMuI7HFLXWda 4nJfrU3rbZXddBHFA3/JI/OFRlnWjpkhLe7og7RUCA6s9NPcaySW5UMEB2B1KgUkLOT8 kkDtCV6bqoOnYZbbKJcjp8HGpC7JLzAQknngGJQVWhxr68+RCMurvdetDmREdozhAiM6 mK9Q== MIME-Version: 1.0 X-Received: by 10.180.82.36 with SMTP id f4mr1802032wiy.63.1379414182570; Tue, 17 Sep 2013 03:36:22 -0700 (PDT) Sender: zbodek@gmail.com Received: by 10.217.38.69 with HTTP; Tue, 17 Sep 2013 03:36:22 -0700 (PDT) In-Reply-To: References: <201309161046.r8GAkxEM084656@svn.freebsd.org> Date: Tue, 17 Sep 2013 12:36:22 +0200 X-Google-Sender-Auth: 9Ak3ACekrYm4FHc4-e1twVmI-J4 Message-ID: Subject: Re: svn commit: r255613 - head/sys/arm/arm From: Zbigniew Bodek To: Ed Schouten Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 10:36:25 -0000 2013/9/17 Zbigniew Bodek > 2013/9/16 Ed Schouten > >> 2013/9/16 Zbigniew Bodek : >> > Log: >> > Fix GCC build error when building for ARMv6 >> > >> > Apply theravens's idea to move __strong_reference >> > macros into the proper ifdef section. >> > >> > Approved by: cognet (mentor) >> > Approved by: re >> > >> > Modified: >> > head/sys/arm/arm/stdatomic.c >> >> For some reason, this still breaks the build of the AVILA kernel: >> >> Hello Ed, > > You mean that this doesn't help for AVILA? > To be precise the patch is for ARMv6/v7 issues and AVILA is ARMv5te? > > Nevertheless if the problem occurs for ARMs < v6 then another patch for > that needs to be done. > > Best regards > Zbyszek > > Hello again Ed, Can you test this one: http://people.freebsd.org/~zbb/arm/other/stdatomic_fix_vol2.diff Best regards Zbyszek From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 11:48:48 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5DB6AF1C; Tue, 17 Sep 2013 11:48:48 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB662F92; Tue, 17 Sep 2013 11:48:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HBmmpD091601; Tue, 17 Sep 2013 11:48:48 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HBmlbB091598; Tue, 17 Sep 2013 11:48:47 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201309171148.r8HBmlbB091598@svn.freebsd.org> From: Sean Bruno Date: Tue, 17 Sep 2013 11:48:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255629 - in head: include usr.sbin/gpioctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 11:48:48 -0000 Author: sbruno Date: Tue Sep 17 11:48:47 2013 New Revision: 255629 URL: http://svnweb.freebsd.org/changeset/base/255629 Log: Assume that the -f argument is /dev/gpioc0 if it is not passed. hrs@ provided this verison of the patch and showed me where all the needed changes were to be made outside of gpioctl.c Approved by: re (hrs) MFC after: 2 weeks Modified: head/include/paths.h head/usr.sbin/gpioctl/gpioctl.8 head/usr.sbin/gpioctl/gpioctl.c Modified: head/include/paths.h ============================================================================== --- head/include/paths.h Tue Sep 17 08:43:12 2013 (r255628) +++ head/include/paths.h Tue Sep 17 11:48:47 2013 (r255629) @@ -50,6 +50,7 @@ #define _PATH_CSHELL "/bin/csh" #define _PATH_CSMAPPER "/usr/share/i18n/csmapper" #define _PATH_DEFTAPE "/dev/sa0" +#define _PATH_DEVGPIOC "/dev/gpioc" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVZERO "/dev/zero" #define _PATH_DRUM "/dev/drum" Modified: head/usr.sbin/gpioctl/gpioctl.8 ============================================================================== --- head/usr.sbin/gpioctl/gpioctl.8 Tue Sep 17 08:43:12 2013 (r255628) +++ head/usr.sbin/gpioctl/gpioctl.8 Tue Sep 17 11:48:47 2013 (r255629) @@ -36,20 +36,20 @@ .Sh SYNOPSIS .Nm .Cm -l -.Fl f Ar ctldev +.Op Fl f Ar ctldev .Op Fl v .Nm .Cm -t -.Fl f Ar ctldev +.Op Fl f Ar ctldev .Ar pin .Nm .Cm -c -.Fl f Ar ctldev +.Op Fl f Ar ctldev .Ar pin .Ar flag .Op flag ... .Nm -.Cm -f Ar ctldev +.Op Cm -f Ar ctldev .Ar pin .Ar [0|1] .Sh DESCRIPTION @@ -83,6 +83,8 @@ Inverted output pin .El .It Fl f Ar ctldev GPIO controller device to use +If not specified, defaults to +.Pa /dev/gpioc0 .It Fl l list available pins .It Fl t Ar pin Modified: head/usr.sbin/gpioctl/gpioctl.c ============================================================================== --- head/usr.sbin/gpioctl/gpioctl.c Tue Sep 17 08:43:12 2013 (r255628) +++ head/usr.sbin/gpioctl/gpioctl.c Tue Sep 17 11:48:47 2013 (r255629) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -63,10 +64,10 @@ static void usage(void) { fprintf(stderr, "Usage:\n"); - fprintf(stderr, "\tgpioctl -f ctldev -l [-v]\n"); - fprintf(stderr, "\tgpioctl -f ctldev -t pin\n"); - fprintf(stderr, "\tgpioctl -f ctldev -c pin flag ...\n"); - fprintf(stderr, "\tgpioctl -f ctldev pin [0|1]\n"); + fprintf(stderr, "\tgpioctl [-f ctldev] -l [-v]\n"); + fprintf(stderr, "\tgpioctl [-f ctldev] -t pin\n"); + fprintf(stderr, "\tgpioctl [-f ctldev] -c pin flag ...\n"); + fprintf(stderr, "\tgpioctl [-f ctldev] pin [0|1]\n"); exit(1); } @@ -185,6 +186,7 @@ main(int argc, char **argv) int i; struct gpio_pin pin; struct gpio_req req; + char defctlfile[] = _PATH_DEVGPIOC "0"; char *ctlfile = NULL; int pinn, pinv, fd, ch; int flags, flag, ok; @@ -226,7 +228,7 @@ main(int argc, char **argv) printf("%d/%s\n", i, argv[i]); if (ctlfile == NULL) - fail("No gpioctl device provided\n"); + ctlfile = defctlfile; fd = open(ctlfile, O_RDONLY); if (fd < 0) { From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 12:59:37 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CD267A69; Tue, 17 Sep 2013 12:59:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB25323F9; Tue, 17 Sep 2013 12:59:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HCxbdp032698; Tue, 17 Sep 2013 12:59:37 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HCxb3o032697; Tue, 17 Sep 2013 12:59:37 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309171259.r8HCxb3o032697@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Tue, 17 Sep 2013 12:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255634 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 12:59:37 -0000 Author: des Date: Tue Sep 17 12:59:37 2013 New Revision: 255634 URL: http://svnweb.freebsd.org/changeset/base/255634 Log: Add unbound to the list of UIDs / GIDs to check fore before installing. Approved by: re (blanket) Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Sep 17 12:58:17 2013 (r255633) +++ head/Makefile.inc1 Tue Sep 17 12:59:37 2013 (r255634) @@ -709,6 +709,10 @@ CHECK_GIDS+= smmsp CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif +.if ${MK_UNBOUND} != "no" +CHECK_UIDS+= unbound +CHECK_GIDS+= unbound +.endif installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 13:09:40 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5F519F94 for ; Tue, 17 Sep 2013 13:09:40 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43BB024C7 for ; Tue, 17 Sep 2013 13:09:40 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HD9e4d085568 for ; Tue, 17 Sep 2013 13:09:40 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8HD9eC0085563 for svn-src-head@freebsd.org; Tue, 17 Sep 2013 13:09:40 GMT (envelope-from bdrewery) Received: (qmail 93195 invoked from network); 17 Sep 2013 08:09:38 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 17 Sep 2013 08:09:38 -0500 Message-ID: <5238548D.9080503@FreeBSD.org> Date: Tue, 17 Sep 2013 08:09:33 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: =?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?= Subject: Re: svn commit: r255634 - head References: <201309171259.r8HCxb3o032697@svn.freebsd.org> In-Reply-To: <201309171259.r8HCxb3o032697@svn.freebsd.org> X-Enigmail-Version: 1.5.2 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OGHSt9MGpH1SLtuTijPWQxigeKMQLQIxH" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 13:09:40 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OGHSt9MGpH1SLtuTijPWQxigeKMQLQIxH Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 9/17/2013 7:59 AM, Dag-Erling Sm=F8rgrav wrote: > Author: des > Date: Tue Sep 17 12:59:37 2013 > New Revision: 255634 > URL: http://svnweb.freebsd.org/changeset/base/255634 >=20 > Log: > Add unbound to the list of UIDs / GIDs to check fore before installin= g. > =20 > Approved by: re (blanket) >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Makefile.inc1 Tue Sep 17 12:58:17 2013 (r255633) > +++ head/Makefile.inc1 Tue Sep 17 12:59:37 2013 (r255634) > @@ -709,6 +709,10 @@ CHECK_GIDS+=3D smmsp > CHECK_UIDS+=3D proxy > CHECK_GIDS+=3D proxy authpf > .endif > +.if ${MK_UNBOUND} !=3D "no" Hm, I know you noticed this, but by making this conditional, it will not check if building WITHOUT_UNBOUND, but the passwd and mtree files are still using it and will blow up. All of these conditions should probably be removed until a better mechanism for passwd/mtree can be thought up. > +CHECK_UIDS+=3D unbound > +CHECK_GIDS+=3D unbound > +.endif > installcheck_UGID: > .for uid in ${CHECK_UIDS} > @if ! `id -u ${uid} >/dev/null 2>&1`; then \ > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" >=20 --=20 Regards, Bryan Drewery --OGHSt9MGpH1SLtuTijPWQxigeKMQLQIxH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSOFSNAAoJEG54KsA8mwz5b5YQAJPUh0u+6HjSZ39EmF3OlEt5 GFnLNWfuItj8Vg/wNiyU0F3pg0XIXCh4gkYYS+pAsehz9ioiNvYdDSP6zyhKoO7+ rWxYKA5Of0nDcT8URvsVKoO3YNnk69wd7jmU3Q5g4Rm89HBY0M+9rh39V3jGCnfV +BLg9dreAm2msJWvcEPrX0HrVVF6LQBgp9rKyqoAQytAZFyTHWDko4luTaMZGp8W 41IjB0xUHjkiWo/6SQ7OpfJU1vx3jCMA9sN6gS7LauV5Ih5PRRrNWx3K9i/MUt0o p4Z1Yn/o4JmFtyyOik2OtcOLR1kb/UBeWna+kVStKp9ac4RqoJlnRqfXOwOFEu+c RYg0m7NUzggl1K8rSIsp8NyRFJfJsAD6pT8WUUOfRBHscry+R2y3kgZfJHPdwaOs XJYPuFTdodUM1bDWEUJDn6ydynZ3K3ii9PiNoJglTnGX3D3yXUaXmQTKW4GgGmZN 1lDYixdSvMv8QlqOYliYSLPZGvdlqunf50hO0oXDeh0yUVtDkrLQy0YdT6zIa9Y/ CScEVG3wXYqfJ4dM0/nRKVwhbR6MiIUuaYq2gaBd0NgWPiWwsbBF7TBRIKZy37Ll vZ1+mxxFMMiE5pbi4BspKmRLB11qHnGgpUJkAVDyuAqpIYdoVPsiPfH5KhwhfgOa hRftxpDp8bfNY9liPran =jUhK -----END PGP SIGNATURE----- --OGHSt9MGpH1SLtuTijPWQxigeKMQLQIxH-- From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 13:37:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2E0FD66F for ; Tue, 17 Sep 2013 13:37:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0A52C263D for ; Tue, 17 Sep 2013 13:37:31 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HDbUhg091745 for ; Tue, 17 Sep 2013 13:37:30 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8HDbUxc091738 for svn-src-head@freebsd.org; Tue, 17 Sep 2013 13:37:30 GMT (envelope-from bdrewery) Received: (qmail 76059 invoked from network); 17 Sep 2013 08:37:27 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 17 Sep 2013 08:37:27 -0500 Message-ID: <52385B12.9030402@FreeBSD.org> Date: Tue, 17 Sep 2013 08:37:22 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Bruce Evans , Hiroki Sato Subject: Re: svn commit: r255486 - in head/lib/libc: gen sys References: <201309120053.r8C0rc7H082015@svn.freebsd.org> <20130912.203612.1272738297998644471.hrs@allbsd.org> <5231A85E.5050802@FreeBSD.org> <20130912222312.K1155@besplex.bde.org> In-Reply-To: <20130912222312.K1155@besplex.bde.org> X-Enigmail-Version: 1.5.2 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xABcW2KhB6G2WN7Oi0uxLsW7QMKiWm4Ie" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 13:37:31 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xABcW2KhB6G2WN7Oi0uxLsW7QMKiWm4Ie Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 9/12/2013 8:15 AM, Bruce Evans wrote: > On Thu, 12 Sep 2013, Bryan Drewery wrote: >=20 >> On 9/12/2013 6:36 AM, Hiroki Sato wrote: >>> Bryan Drewery wrote >>> in <201309120053.r8C0rc7H082015@svn.freebsd.org>: >>> >>> bd> Author: bdrewery (ports committer) >>> bd> Date: Thu Sep 12 00:53:38 2013 >>> bd> New Revision: 255486 >>> bd> URL: http://svnweb.freebsd.org/changeset/base/255486 >>> bd> >>> bd> Log: >>> bd> Consistently reference file descriptors as "fd". 55 other manpa= ges >=20 > Inconsistently... >=20 >>> bd> used "fd", while these used "d" and "filedes". >=20 > ... About 57 man pages (counting links multiply) in /usr/share/man[23] > still use the POSIX spelling "fildes". Yes I see I did miss a few. >=20 > POSIX never uses the spelling "filedes", at least in the old 2001 > draft7.txt. But it is inconsistent between "fildes" and "fd". In the > old draft, it uses "int fildes" on 67 lines (including for most of the > functions changed in this commit). It uses "int fd" on 40 lines. But > most of the latter are not for prototypes. The only exceptions are > for posix_fadvise() and posix_fallocate(). >=20 > Anyway, this change mainly improves "d" to "fd". "filedes" -> "fd" is = not > so clearly an improvement, but "filedes" was only used in a couple of > files and thus rarely changed. >=20 > I think chroot.2 still has the grammar error "filedescriptors" in > descriptions. Normal English grammar "file descriptors" is used in > about 872 man pages (counting links multiply) in /usr/share/man[23]. I am mostly interested at the moment in updating the variable names, and not the descriptions. >=20 >>> bd> >>> bd> MFC after: 1 week >>> bd> Approved by: gjb >>> bd> Approved by: re (delphij) >>> >>> I think this kind of changes need a consensus because several POSIX >>> functions use "filedes" in the specification document. r254484 by >>> pjd was a similar change (s/type/af/ in gethostbyaddr()). >>> >>> In SUSv4, fdopen() uses "filedes" and openat() uses "fd", for >>> example. Consistency throughout our manual pages is generally good.= >>> However, I also see the benefit of using the same expression as the >>> specification even if it is inconsistent. What do you think? >=20 > Does it really use "filedes"? POSIX still never uses this in the 2007 > draft (austin-d2r.pdf). It uses "fildes" for fdopen(), but "fd" for > fdopendir() and openat(). It still uses "fd" for posix_fadvise() and > posix_fallocate(). I now think that the "fd"s in POSIX are just > style bugs. The normal "fildes" had only rotted to "fd" in 2 places > in 2001, but rotted much further in 2007. >=20 > If we ever copied the POSIX spec to improve FreeBSD man pages, then > it would be painful to make any changes to the text (other than > deshallify, and I wouldn't trust that either). FreeBSD now copies the > POSIX inconsistencies for "fildes" vs "fd" for at least fdopen() and > fdopendir(), although it doesn't copy whole sections of POSIX for these= > functions (or any at all?). >=20 >> I did notice that 'filedes' was referenced in some specs, but it's ver= y >> weird to open multiple manpages and expect 'fd' and find 'd' and rewor= k >> my brain to understand that 'd' or 'filedes' is just a 'fd'. Takes a >> second of thinking. >> >> It was "surprising" to me when I noticed it, especially given how many= >> used 'fd'. >=20 > "fd" is a good abbreviation, but "fildes" is more formal. I actually > prefer "fd" throughout. "fildes" is not such a good abbreviation, sinc= e > it is half-way. Using both is just a style bug that is not quite as > confusing as using "d" and "fd". Using "d", "fd", "fildes" and "filede= s" > was a larger style bug. >=20 > Bruce Should I revert until we can have more discussion on this and what impact it has on maintaining the manpages? --=20 Regards, Bryan Drewery --xABcW2KhB6G2WN7Oi0uxLsW7QMKiWm4Ie Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSOFsSAAoJEG54KsA8mwz5owsQAIN6hsWNG0m/SKYDaRz/9X/D Byu4GrEf4pb1wQp/Y0WWrPc49uKgsnegGk4cUhOKvMDcl2cG0BFMoGylBfQMKnG1 vanXwkRdwYyA5UJyZhOOWoFUaG17oevdqpRBgZfub2OOMkqvK5f4hoHbLzSMeKDH okQPgT8BitbZfT8O7WA2LnXs6DO9UJIQbvkY1JKVKpoUacl81zY34mF3JhspJTqb yV0zHBzpQZpPc1Cgfrmi0ydqdmjzxgX7RRVrdAFf5t5f/h43QUqbPxiHTm4uDzqe yp09zjGl+WfT616Ctrkx96m/bHVi4apqKyLMCuEVkrTPChJ/GL0T4SOreDLJWT4J fmDVl5rwmnUMNObPF7ls4LvcoQ9vD045JJkzs0J/UqgjuNQXni+bu4Otoyq96gkG APHMfIEqdAIVkeiqBFt4930xWq39eJOeFaIkyx3uopT86RfiIF8ejyRjw1hx50+u +PHsF+Zhp3uUrx+wF0k7KM3vr7ZJV0L34hYYUdiV5GWYZaW3YqKLqj6XVOmEGET+ HIx32naDyh9hOeYSMkKcF4ZcvYfKfkrgTiTl/feob/alN2SLhNGnLZbhEzRxEy4+ klYl7llPRVz2BEGnBqUy6lQ2mBJDE070cflINxbLOEXZ7Dx7+bteoAEXBBsHj+Gm 3gfh6dgyWmbE7pZQUcSL =E3mG -----END PGP SIGNATURE----- --xABcW2KhB6G2WN7Oi0uxLsW7QMKiWm4Ie-- From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 14:19:05 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B5CF1B43; Tue, 17 Sep 2013 14:19:05 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A3BA8284F; Tue, 17 Sep 2013 14:19:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HEJ5eV075281; Tue, 17 Sep 2013 14:19:05 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HEJ546075280; Tue, 17 Sep 2013 14:19:05 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201309171419.r8HEJ546075280@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 17 Sep 2013 14:19:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255635 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 14:19:05 -0000 Author: trasz Date: Tue Sep 17 14:19:05 2013 New Revision: 255635 URL: http://svnweb.freebsd.org/changeset/base/255635 Log: Explicitly require Security Officer's approval for kernel PRNG bits. Note that there is ongoing discussion about approval requirement for userland PRNG bits. Reviewed by: so (des) Approved by: core (jhb) Approved by: re (gjb) Modified: head/LOCKS Modified: head/LOCKS ============================================================================== --- head/LOCKS Tue Sep 17 12:59:37 2013 (r255634) +++ head/LOCKS Tue Sep 17 14:19:05 2013 (r255635) @@ -12,3 +12,7 @@ releng/5.* Requires Security Officer app releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 14:23:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B500DBA; Tue, 17 Sep 2013 14:23:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 278F928A2; Tue, 17 Sep 2013 14:23:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HENGvU078303; Tue, 17 Sep 2013 14:23:16 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HENGNp078302; Tue, 17 Sep 2013 14:23:16 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201309171423.r8HENGNp078302@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 17 Sep 2013 14:23:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255636 - head/usr.sbin/iscsid X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 14:23:16 -0000 Author: trasz Date: Tue Sep 17 14:23:15 2013 New Revision: 255636 URL: http://svnweb.freebsd.org/changeset/base/255636 Log: Improve iSCSI address resolution, fixing "InitiatorAddress" handling, and error reporting. Approved by: re (kib) Modified: head/usr.sbin/iscsid/iscsid.c Modified: head/usr.sbin/iscsid/iscsid.c ============================================================================== --- head/usr.sbin/iscsid/iscsid.c Tue Sep 17 14:19:05 2013 (r255635) +++ head/usr.sbin/iscsid/iscsid.c Tue Sep 17 14:23:15 2013 (r255636) @@ -76,8 +76,9 @@ checked_strdup(const char *s) return (c); } -static int -resolve_addr(const char *address, struct addrinfo **ai) +static void +resolve_addr(const struct connection *conn, const char *address, + struct addrinfo **ai, bool initiator_side) { struct addrinfo hints; char *arg, *addr, *ch; @@ -87,8 +88,8 @@ resolve_addr(const char *address, struct arg = checked_strdup(address); if (arg[0] == '\0') { - log_warnx("empty address"); - return (1); + fail(conn, "empty address"); + log_errx(1, "empty address"); } if (arg[0] == '[') { /* @@ -97,16 +98,16 @@ resolve_addr(const char *address, struct arg++; addr = strsep(&arg, "]"); if (arg == NULL) { - log_warnx("invalid address %s", address); - return (1); + fail(conn, "malformed address"); + log_errx(1, "malformed address %s", address); } if (arg[0] == '\0') { - port = "3260"; + port = NULL; } else if (arg[0] == ':') { port = arg + 1; } else { - log_warnx("invalid address %s", address); - return (1); + fail(conn, "malformed address"); + log_errx(1, "malformed address %s", address); } } else { /* @@ -119,29 +120,32 @@ resolve_addr(const char *address, struct } if (colons > 1) { addr = arg; - port = "3260"; + port = NULL; } else { addr = strsep(&arg, ":"); if (arg == NULL) - port = "3260"; + port = NULL; else port = arg; } } + if (port == NULL && !initiator_side) + port = "3260"; + memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_PASSIVE; + hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; + if (initiator_side) + hints.ai_flags |= AI_PASSIVE; error = getaddrinfo(addr, port, &hints, ai); if (error != 0) { - log_warnx("getaddrinfo for %s failed: %s", + fail(conn, gai_strerror(error)); + log_errx(1, "getaddrinfo for %s failed: %s", address, gai_strerror(error)); - return (1); } - - return (0); } static struct connection * @@ -172,6 +176,8 @@ connection_new(unsigned int session_id, conn->conn_first_burst_length = 65536; conn->conn_session_id = session_id; + conn->conn_iscsi_fd = iscsi_fd; + /* * XXX: Should we sanitize this somehow? */ @@ -180,20 +186,12 @@ connection_new(unsigned int session_id, from_addr = conn->conn_conf.isc_initiator_addr; to_addr = conn->conn_conf.isc_target_addr; - if (from_addr[0] != '\0') { - error = resolve_addr(from_addr, &from_ai); - if (error != 0) - log_errx(1, "failed to resolve initiator address %s", - from_addr); - } else { + if (from_addr[0] != '\0') + resolve_addr(conn, from_addr, &from_ai, true); + else from_ai = NULL; - } - error = resolve_addr(to_addr, &to_ai); - if (error != 0) - log_errx(1, "failed to resolve target address %s", to_addr); - - conn->conn_iscsi_fd = iscsi_fd; + resolve_addr(conn, to_addr, &to_ai, false); #ifdef ICL_KERNEL_PROXY @@ -224,19 +222,25 @@ connection_new(unsigned int session_id, #else /* !ICL_KERNEL_PROXY */ - if (conn->conn_conf.isc_iser) + if (conn->conn_conf.isc_iser) { + fail(conn, "iSER not supported"); log_errx(1, "iscsid(8) compiled without ICL_KERNEL_PROXY " "does not support iSER"); + } conn->conn_socket = socket(to_ai->ai_family, to_ai->ai_socktype, to_ai->ai_protocol); - if (conn->conn_socket < 0) + if (conn->conn_socket < 0) { + fail(conn, strerror(errno)); log_err(1, "failed to create socket for %s", from_addr); + } if (from_ai != NULL) { error = bind(conn->conn_socket, from_ai->ai_addr, from_ai->ai_addrlen); - if (error != 0) + if (error != 0) { + fail(conn, strerror(errno)); log_err(1, "failed to bind to %s", from_addr); + } } log_debugx("connecting to %s", to_addr); error = connect(conn->conn_socket, to_ai->ai_addr, to_ai->ai_addrlen); From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 15:19:27 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8CB9CC03; Tue, 17 Sep 2013 15:19:27 +0000 (UTC) (envelope-from phk@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A3D12BE7; Tue, 17 Sep 2013 15:19:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HFJR5r006691; Tue, 17 Sep 2013 15:19:27 GMT (envelope-from phk@svn.freebsd.org) Received: (from phk@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HFJRIO006690; Tue, 17 Sep 2013 15:19:27 GMT (envelope-from phk@svn.freebsd.org) Message-Id: <201309171519.r8HFJRIO006690@svn.freebsd.org> From: Poul-Henning Kamp Date: Tue, 17 Sep 2013 15:19:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255637 - head/tools/tools/sysbuild X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 15:19:27 -0000 Author: phk Date: Tue Sep 17 15:19:26 2013 New Revision: 255637 URL: http://svnweb.freebsd.org/changeset/base/255637 Log: Don't attempt to build ports with missing dependencies. Approved by: re (gjb) Modified: head/tools/tools/sysbuild/sysbuild.sh Modified: head/tools/tools/sysbuild/sysbuild.sh ============================================================================== --- head/tools/tools/sysbuild/sysbuild.sh Tue Sep 17 14:23:15 2013 (r255636) +++ head/tools/tools/sysbuild/sysbuild.sh Tue Sep 17 15:19:26 2013 (r255637) @@ -254,6 +254,13 @@ ports_build() ( fi fi + miss=`(cd $p ; make missing ${PORTS_OPTS}) || true` + + if [ "x${miss}" != "x" ] ; then + log_it "MISSING for $p:" $miss + continue + fi + log_it "build $pn ($p)" ( set +e From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 16:06:07 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 97FD6C1E; Tue, 17 Sep 2013 16:06:07 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 845602F04; Tue, 17 Sep 2013 16:06:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HG67VI032545; Tue, 17 Sep 2013 16:06:07 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HG67Ot032544; Tue, 17 Sep 2013 16:06:07 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201309171606.r8HG67Ot032544@svn.freebsd.org> From: Neel Natu Date: Tue, 17 Sep 2013 16:06:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255638 - head/sys/amd64/vmm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 16:06:07 -0000 Author: neel Date: Tue Sep 17 16:06:07 2013 New Revision: 255638 URL: http://svnweb.freebsd.org/changeset/base/255638 Log: Fix a bug in decoding an instruction that has an SIB byte as well as an immediate operand. The presence of an SIB byte in decoding the ModR/M field would cause 'imm_bytes' to not be set to the correct value. Fix this by initializing 'imm_bytes' independent of the ModR/M decoding. Reported by: grehan@ Approved by: re@ Modified: head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- head/sys/amd64/vmm/vmm_instruction_emul.c Tue Sep 17 15:19:26 2013 (r255637) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Tue Sep 17 16:06:07 2013 (r255638) @@ -701,12 +701,6 @@ decode_modrm(struct vie *vie) break; } - /* Figure out immediate operand size (if any) */ - if (vie->op.op_flags & VIE_OP_F_IMM) - vie->imm_bytes = 4; - else if (vie->op.op_flags & VIE_OP_F_IMM8) - vie->imm_bytes = 1; - done: vie_advance(vie); @@ -822,6 +816,12 @@ decode_immediate(struct vie *vie) int32_t signed32; } u; + /* Figure out immediate operand size (if any) */ + if (vie->op.op_flags & VIE_OP_F_IMM) + vie->imm_bytes = 4; + else if (vie->op.op_flags & VIE_OP_F_IMM8) + vie->imm_bytes = 1; + if ((n = vie->imm_bytes) == 0) return (0); From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 17:29:07 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E9FF2D99; Tue, 17 Sep 2013 17:29:07 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D5EFA2538; Tue, 17 Sep 2013 17:29:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHT7GA076414; Tue, 17 Sep 2013 17:29:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHT79t076413; Tue, 17 Sep 2013 17:29:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309171729.r8HHT79t076413@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 17 Sep 2013 17:29:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255639 - head/sys/powerpc/powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 17:29:08 -0000 Author: nwhitehorn Date: Tue Sep 17 17:29:07 2013 New Revision: 255639 URL: http://svnweb.freebsd.org/changeset/base/255639 Log: Make sure to copy segments back to the segs array if non-NULL. This is relied upon by bus_dmamap_load_mbuf_sg() (i.e. all network drivers). Approved by: re (kib) MFC after: 2 weeks Modified: head/sys/powerpc/powerpc/busdma_machdep.c Modified: head/sys/powerpc/powerpc/busdma_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/busdma_machdep.c Tue Sep 17 16:06:07 2013 (r255638) +++ head/sys/powerpc/powerpc/busdma_machdep.c Tue Sep 17 17:29:07 2013 (r255639) @@ -847,13 +847,16 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, map->nsegs = nsegs; if (segs != NULL) memcpy(map->segments, segs, map->nsegs*sizeof(segs[0])); - else - segs = map->segments; if (dmat->iommu != NULL) IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs, dmat->lowaddr, dmat->highaddr, dmat->alignment, dmat->boundary, dmat->iommu_cookie); + if (segs != NULL) + memcpy(segs, map->segments, map->nsegs*sizeof(segs[0])); + else + segs = map->segments; + return (segs); } From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 17:29:57 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 054C4EE5; Tue, 17 Sep 2013 17:29:57 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E489F2548; Tue, 17 Sep 2013 17:29:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHTuja076564; Tue, 17 Sep 2013 17:29:56 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHTutR076562; Tue, 17 Sep 2013 17:29:56 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309171729.r8HHTutR076562@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 17 Sep 2013 17:29:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255640 - in head/sys/powerpc: include powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 17:29:57 -0000 Author: nwhitehorn Date: Tue Sep 17 17:29:56 2013 New Revision: 255640 URL: http://svnweb.freebsd.org/changeset/base/255640 Log: Add POWER7+ and POWER8 to the CPU ID table. Approved by: re (kib) Modified: head/sys/powerpc/include/spr.h head/sys/powerpc/powerpc/cpu.c Modified: head/sys/powerpc/include/spr.h ============================================================================== --- head/sys/powerpc/include/spr.h Tue Sep 17 17:29:07 2013 (r255639) +++ head/sys/powerpc/include/spr.h Tue Sep 17 17:29:56 2013 (r255640) @@ -168,6 +168,8 @@ #define IBMPOWER3PLUS 0x0041 #define IBM970MP 0x0044 #define IBM970GX 0x0045 +#define IBMPOWER7PLUS 0x004a +#define IBMPOWER8 0x004b #define MPC860 0x0050 #define IBMCELLBE 0x0070 #define MPC8240 0x0081 Modified: head/sys/powerpc/powerpc/cpu.c ============================================================================== --- head/sys/powerpc/powerpc/cpu.c Tue Sep 17 17:29:07 2013 (r255639) +++ head/sys/powerpc/powerpc/cpu.c Tue Sep 17 17:29:56 2013 (r255640) @@ -141,6 +141,12 @@ static const struct cputab models[] = { { "IBM POWER7", IBMPOWER7, REVFMT_MAJMIN, PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, NULL }, + { "IBM POWER7+", IBMPOWER7PLUS, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, + NULL }, + { "IBM POWER8", IBMPOWER8, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, + NULL }, { "Motorola PowerPC 7400", MPC7400, REVFMT_MAJMIN, PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, cpu_6xx_setup }, { "Motorola PowerPC 7410", MPC7410, REVFMT_MAJMIN, From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 17:30:49 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BF4AECB; Tue, 17 Sep 2013 17:30:49 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ACEF82560; Tue, 17 Sep 2013 17:30:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHUnJ4078787; Tue, 17 Sep 2013 17:30:49 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHUnrh078785; Tue, 17 Sep 2013 17:30:49 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309171730.r8HHUnrh078785@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 17 Sep 2013 17:30:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255641 - head/release/powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 17:30:49 -0000 Author: nwhitehorn Date: Tue Sep 17 17:30:49 2013 New Revision: 255641 URL: http://svnweb.freebsd.org/changeset/base/255641 Log: CDs are not partitioned, so this is not correct syntax for loading from ISO 9660. Omit the partition ID. Approved by: re (kib) MFC after: 2 weeks Modified: head/release/powerpc/mkisoimages.sh Modified: head/release/powerpc/mkisoimages.sh ============================================================================== --- head/release/powerpc/mkisoimages.sh Tue Sep 17 17:29:56 2013 (r255640) +++ head/release/powerpc/mkisoimages.sh Tue Sep 17 17:30:49 2013 (r255641) @@ -40,7 +40,7 @@ if [ "x$1" = "x-b" ]; then FreeBSD Install FreeBSD -boot &device;:&partition;,\ppc\chrp\loader +boot &device;:,\ppc\chrp\loader EOF bootable="$bootable -o chrp-boot" From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 17:31:53 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 966D6230; Tue, 17 Sep 2013 17:31:53 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82BDA259E; Tue, 17 Sep 2013 17:31:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHVr8f078997; Tue, 17 Sep 2013 17:31:53 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHVrRW078996; Tue, 17 Sep 2013 17:31:53 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309171731.r8HHVrRW078996@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 17 Sep 2013 17:31:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255642 - head/sys/powerpc/ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 17:31:53 -0000 Author: nwhitehorn Date: Tue Sep 17 17:31:53 2013 New Revision: 255642 URL: http://svnweb.freebsd.org/changeset/base/255642 Log: Only attach if properties we need (address, in particular) are present. This is the correct version of r255420. Approved by: re (kib) Modified: head/sys/powerpc/ofw/ofw_syscons.c Modified: head/sys/powerpc/ofw/ofw_syscons.c ============================================================================== --- head/sys/powerpc/ofw/ofw_syscons.c Tue Sep 17 17:30:49 2013 (r255641) +++ head/sys/powerpc/ofw/ofw_syscons.c Tue Sep 17 17:31:53 2013 (r255642) @@ -264,6 +264,10 @@ ofwfb_configure(int flags) } else return (0); + if (OF_getproplen(node, "height") != sizeof(sc->sc_height) || + OF_getproplen(node, "width") != sizeof(sc->sc_width)) + return (0); + sc->sc_depth = depth; sc->sc_node = node; sc->sc_console = 1; @@ -278,6 +282,8 @@ ofwfb_configure(int flags) * * XXX We assume #address-cells is 1 at this point. */ + if (OF_getproplen(node, "address") != sizeof(fb_phys)) + return (0); OF_getprop(node, "address", &fb_phys, sizeof(fb_phys)); bus_space_map(&bs_be_tag, fb_phys, sc->sc_height * sc->sc_stride, From owner-svn-src-head@FreeBSD.ORG Tue Sep 17 17:37:06 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 37A3F52B; Tue, 17 Sep 2013 17:37:06 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2355225FE; Tue, 17 Sep 2013 17:37:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHb6Pq080551; Tue, 17 Sep 2013 17:37:06 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHb4mX080538; Tue, 17 Sep 2013 17:37:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309171737.r8HHb4mX080538@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 17 Sep 2013 17:37:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255643 - in head/sys: conf powerpc/conf powerpc/pseries X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 17:37:06 -0000 Author: nwhitehorn Date: Tue Sep 17 17:37:04 2013 New Revision: 255643 URL: http://svnweb.freebsd.org/changeset/base/255643 Log: Merge in support for PAPR-compliant (Power Architecture Platform Requirements) systems from the projects/pseries branch. This in principle includes all IBM POWER hardware released in the last 15 years with the exception of POWER3-based systems when run in 64-bit mode. The main development target, however, has been the PAPR logical partition support that is the default target in KVM on POWER and QEMU -- mileage may vary on actual hardware at present. Much of the heavy lifting here was done by Andreas Tobler. Approved by: re (kib) Added: head/sys/powerpc/pseries/ head/sys/powerpc/pseries/mmu_phyp.c (contents, props changed) head/sys/powerpc/pseries/phyp-hvcall.S (contents, props changed) head/sys/powerpc/pseries/phyp-hvcall.h (contents, props changed) head/sys/powerpc/pseries/phyp_console.c (contents, props changed) head/sys/powerpc/pseries/platform_chrp.c (contents, props changed) head/sys/powerpc/pseries/plpar_iommu.c (contents, props changed) head/sys/powerpc/pseries/plpar_iommu.h (contents, props changed) head/sys/powerpc/pseries/rtas_dev.c (contents, props changed) head/sys/powerpc/pseries/rtas_pci.c (contents, props changed) head/sys/powerpc/pseries/vdevice.c (contents, props changed) head/sys/powerpc/pseries/xics.c (contents, props changed) Modified: head/sys/conf/files.powerpc head/sys/conf/options.powerpc head/sys/powerpc/conf/DEFAULTS head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC64 Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Tue Sep 17 17:31:53 2013 (r255642) +++ head/sys/conf/files.powerpc Tue Sep 17 17:37:04 2013 (r255643) @@ -225,6 +225,15 @@ powerpc/ps3/ps3disk.c optional ps3 powerpc/ps3/ps3pic.c optional ps3 powerpc/ps3/ps3_syscons.c optional ps3 sc powerpc/ps3/ps3-hvcall.S optional ps3 sc +powerpc/pseries/phyp-hvcall.S optional pseries powerpc64 +powerpc/pseries/mmu_phyp.c optional pseries powerpc64 +powerpc/pseries/phyp_console.c optional pseries powerpc64 +powerpc/pseries/platform_chrp.c optional pseries +powerpc/pseries/plpar_iommu.c optional pseries powerpc64 +powerpc/pseries/rtas_dev.c optional pseries +powerpc/pseries/rtas_pci.c optional pseries pci +powerpc/pseries/vdevice.c optional pseries powerpc64 +powerpc/pseries/xics.c optional pseries powerpc64 powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim Modified: head/sys/conf/options.powerpc ============================================================================== --- head/sys/conf/options.powerpc Tue Sep 17 17:31:53 2013 (r255642) +++ head/sys/conf/options.powerpc Tue Sep 17 17:37:04 2013 (r255643) @@ -22,6 +22,7 @@ MPC85XX opt_platform.h POWERMAC opt_platform.h PS3 opt_platform.h MAMBO +PSERIES PSIM WII opt_platform.h Modified: head/sys/powerpc/conf/DEFAULTS ============================================================================== --- head/sys/powerpc/conf/DEFAULTS Tue Sep 17 17:31:53 2013 (r255642) +++ head/sys/powerpc/conf/DEFAULTS Tue Sep 17 17:37:04 2013 (r255643) @@ -9,6 +9,7 @@ device mem # Memory and kernel memory # UART chips on this platform device uart_ns8250 +options GEOM_PART_BSD options GEOM_PART_MBR options NEW_PCIB Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Tue Sep 17 17:31:53 2013 (r255642) +++ head/sys/powerpc/conf/GENERIC Tue Sep 17 17:37:04 2013 (r255643) @@ -30,6 +30,7 @@ makeoptions WITH_CTF=1 options POWERMAC #NewWorld Apple PowerMacs options PSIM #GDB PSIM ppc simulator options MAMBO #IBM Mambo Full System Simulator +options PSERIES #PAPR-compliant systems options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption Modified: head/sys/powerpc/conf/GENERIC64 ============================================================================== --- head/sys/powerpc/conf/GENERIC64 Tue Sep 17 17:31:53 2013 (r255642) +++ head/sys/powerpc/conf/GENERIC64 Tue Sep 17 17:37:04 2013 (r255643) @@ -30,6 +30,7 @@ makeoptions WITH_CTF=1 options POWERMAC #NewWorld Apple PowerMacs options PS3 #Sony Playstation 3 options MAMBO #IBM Mambo Full System Simulator +options PSERIES #PAPR-compliant systems (e.g. IBM p) options SCHED_ULE #ULE scheduler options PREEMPTION #Enable kernel thread preemption @@ -131,6 +132,9 @@ device uart device uart_z8530 # Ethernet hardware +device em # Intel PRO/1000 Gigabit Ethernet Family +device igb # Intel PRO/1000 PCIE Server Gigabit Family +device ixgbe # Intel PRO/10GbE PCIE Ethernet Family device glc # Sony Playstation 3 Ethernet # PCI Ethernet NICs that use the common MII bus controller code. @@ -139,6 +143,8 @@ device bge # Broadcom BCM570xx Gigabit device gem # Sun GEM/Sun ERI/Apple GMAC device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device re # RealTek 8139C+/8169/8169S/8110S +device rl # RealTek 8129/8139 # Pseudo devices. device loop # Network loopback Added: head/sys/powerpc/pseries/mmu_phyp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/powerpc/pseries/mmu_phyp.c Tue Sep 17 17:37:04 2013 (r255643) @@ -0,0 +1,420 @@ +/* + * Copyright (C) 2010 Andreas Tobler + * All rights reserved. + * + * 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 ``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 TOOLS GMBH 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$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "mmu_if.h" +#include "moea64_if.h" + +#include "phyp-hvcall.h" + +extern int n_slbs; + +/* + * Kernel MMU interface + */ + +static void mphyp_bootstrap(mmu_t mmup, vm_offset_t kernelstart, + vm_offset_t kernelend); +static void mphyp_cpu_bootstrap(mmu_t mmup, int ap); +static void mphyp_pte_synch(mmu_t, uintptr_t pt, struct lpte *pvo_pt); +static void mphyp_pte_clear(mmu_t, uintptr_t pt, struct lpte *pvo_pt, + uint64_t vpn, u_int64_t ptebit); +static void mphyp_pte_unset(mmu_t, uintptr_t pt, struct lpte *pvo_pt, + uint64_t vpn); +static void mphyp_pte_change(mmu_t, uintptr_t pt, struct lpte *pvo_pt, + uint64_t vpn); +static int mphyp_pte_insert(mmu_t, u_int ptegidx, struct lpte *pvo_pt); +static uintptr_t mphyp_pvo_to_pte(mmu_t, const struct pvo_entry *pvo); + +#define VSID_HASH_MASK 0x0000007fffffffffULL + + +static mmu_method_t mphyp_methods[] = { + MMUMETHOD(mmu_bootstrap, mphyp_bootstrap), + MMUMETHOD(mmu_cpu_bootstrap, mphyp_cpu_bootstrap), + + MMUMETHOD(moea64_pte_synch, mphyp_pte_synch), + MMUMETHOD(moea64_pte_clear, mphyp_pte_clear), + MMUMETHOD(moea64_pte_unset, mphyp_pte_unset), + MMUMETHOD(moea64_pte_change, mphyp_pte_change), + MMUMETHOD(moea64_pte_insert, mphyp_pte_insert), + MMUMETHOD(moea64_pvo_to_pte, mphyp_pvo_to_pte), + + { 0, 0 } +}; + +MMU_DEF_INHERIT(pseries_mmu, "mmu_phyp", mphyp_methods, 0, oea64_mmu); + +static void +mphyp_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend) +{ + uint64_t final_pteg_count = 0; + char buf[8]; + uint32_t prop[2]; + uint32_t nptlp, shift = 0, slb_encoding = 0; + phandle_t dev, node, root; + int idx, len, res; + + moea64_early_bootstrap(mmup, kernelstart, kernelend); + + root = OF_peer(0); + + dev = OF_child(root); + while (dev != 0) { + res = OF_getprop(dev, "name", buf, sizeof(buf)); + if (res > 0 && strcmp(buf, "cpus") == 0) + break; + dev = OF_peer(dev); + } + + node = OF_child(dev); + + while (node != 0) { + res = OF_getprop(node, "device_type", buf, sizeof(buf)); + if (res > 0 && strcmp(buf, "cpu") == 0) + break; + node = OF_peer(node); + } + + res = OF_getprop(node, "ibm,pft-size", prop, sizeof(prop)); + if (res <= 0) + panic("mmu_phyp: unknown PFT size"); + final_pteg_count = 1 << prop[1]; + res = OF_getprop(node, "ibm,slb-size", prop, sizeof(prop[0])); + if (res > 0) + n_slbs = prop[0]; + + moea64_pteg_count = final_pteg_count / sizeof(struct lpteg); + + /* + * Scan the large page size property for PAPR compatible machines. + * See PAPR D.5 Changes to Section 5.1.4, 'CPU Node Properties' + * for the encoding of the property. + */ + + len = OF_getproplen(node, "ibm,segment-page-sizes"); + if (len > 0) { + /* + * We have to use a variable length array on the stack + * since we have very limited stack space. + */ + cell_t arr[len/sizeof(cell_t)]; + res = OF_getprop(node, "ibm,segment-page-sizes", &arr, + sizeof(arr)); + len /= 4; + idx = 0; + while (len > 0) { + shift = arr[idx]; + slb_encoding = arr[idx + 1]; + nptlp = arr[idx + 2]; + idx += 3; + len -= 3; + while (len > 0 && nptlp) { + idx += 2; + len -= 2; + nptlp--; + } + } + moea64_large_page_shift = shift; + moea64_large_page_size = 1 << shift; + } + + moea64_mid_bootstrap(mmup, kernelstart, kernelend); + moea64_late_bootstrap(mmup, kernelstart, kernelend); +} + +static void +mphyp_cpu_bootstrap(mmu_t mmup, int ap) +{ + struct slb *slb = PCPU_GET(slb); + register_t seg0; + int i; + + /* + * Install kernel SLB entries + */ + + __asm __volatile ("slbia"); + __asm __volatile ("slbmfee %0,%1; slbie %0;" : "=r"(seg0) : "r"(0)); + for (i = 0; i < 64; i++) { + if (!(slb[i].slbe & SLBE_VALID)) + continue; + + __asm __volatile ("slbmte %0, %1" :: + "r"(slb[i].slbv), "r"(slb[i].slbe)); + } +} + +static void +mphyp_pte_synch(mmu_t mmu, uintptr_t slot, struct lpte *pvo_pt) +{ + struct lpte pte; + uint64_t junk; + + phyp_pft_hcall(H_READ, 0, slot, 0, 0, &pte.pte_hi, &pte.pte_lo, + &junk); + + pvo_pt->pte_lo |= pte.pte_lo & (LPTE_CHG | LPTE_REF); +} + +static void +mphyp_pte_clear(mmu_t mmu, uintptr_t slot, struct lpte *pvo_pt, uint64_t vpn, + u_int64_t ptebit) +{ + + if (ptebit & LPTE_CHG) + phyp_hcall(H_CLEAR_MOD, 0, slot); + if (ptebit & LPTE_REF) + phyp_hcall(H_CLEAR_REF, 0, slot); +} + +static void +mphyp_pte_unset(mmu_t mmu, uintptr_t slot, struct lpte *pvo_pt, uint64_t vpn) +{ + + /* XXX: last argument can check the VPN -- set flag to enable */ + phyp_hcall(H_REMOVE, 0, slot, vpn); +} + +static void +mphyp_pte_change(mmu_t mmu, uintptr_t slot, struct lpte *pvo_pt, uint64_t vpn) +{ + struct lpte evicted; + uint64_t index, junk; + int64_t result; + + /* + * NB: this is protected by the global table lock, so this two-step + * is safe, except for the scratch-page case. No CPUs on which we run + * this code should be using scratch pages. + */ + KASSERT(!(pvo_pt->pte_hi & LPTE_LOCKED), + ("Locked pages not supported on PHYP")); + + /* XXX: optimization using H_PROTECT for common case? */ + result = phyp_hcall(H_REMOVE, 0, slot, vpn); + if (result != H_SUCCESS) + panic("mphyp_pte_change() invalidation failure: %ld\n", result); + result = phyp_pft_hcall(H_ENTER, H_EXACT, slot, pvo_pt->pte_hi, + pvo_pt->pte_lo, &index, &evicted.pte_lo, &junk); + if (result != H_SUCCESS) + panic("mphyp_pte_change() insertion failure: %ld\n", result); +} + +static __inline int +mphyp_pte_spillable_ident(u_int ptegidx, struct lpte *to_evict) +{ + uint64_t slot, junk, k; + struct lpte pt; + int i, j; + + /* St