Date: Thu, 6 Dec 2012 13:03:57 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243950 - in projects/calloutng: contrib/binutils contrib/binutils/libiberty contrib/cvs/diff contrib/cvs/lib contrib/dtc contrib/gcc contrib/gcclibs/libcpp contrib/gcclibs/libdecnumber... Message-ID: <201212061303.qB6D3wjs048868@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Dec 6 13:03:57 2012 New Revision: 243950 URL: http://svnweb.freebsd.org/changeset/base/243950 Log: MFC @ r243949 Added: projects/calloutng/share/syscons/keymaps/us.dvorakp.kbd - copied unchanged from r243949, head/share/syscons/keymaps/us.dvorakp.kbd Modified: projects/calloutng/contrib/binutils/Makefile.in projects/calloutng/contrib/binutils/Makefile.tpl projects/calloutng/contrib/binutils/libiberty/Makefile.in projects/calloutng/contrib/cvs/diff/Makefile.in projects/calloutng/contrib/cvs/lib/Makefile.in projects/calloutng/contrib/dtc/Makefile projects/calloutng/contrib/gcc/Makefile.in projects/calloutng/contrib/gcclibs/libcpp/Makefile.in projects/calloutng/contrib/gcclibs/libdecnumber/Makefile.in projects/calloutng/contrib/gcclibs/libiberty/Makefile.in projects/calloutng/contrib/gdtoa/makefile projects/calloutng/contrib/gperf/lib/Makefile.in projects/calloutng/contrib/ntp/arlib/Makefile.in projects/calloutng/contrib/ntp/libntp/Makefile.in projects/calloutng/contrib/ntp/libparse/Makefile.in projects/calloutng/contrib/ntp/ntpd/Makefile.in projects/calloutng/contrib/opie/libmissing/Makefile.in projects/calloutng/contrib/opie/libopie/Makefile.in projects/calloutng/contrib/tcp_wrappers/Makefile projects/calloutng/contrib/tcpdump/Makefile.in projects/calloutng/crypto/heimdal/appl/ftp/common/Makefile.in projects/calloutng/crypto/heimdal/appl/telnet/libtelnet/Makefile.in projects/calloutng/crypto/openssl/Makefile.org projects/calloutng/crypto/openssl/crypto/Makefile projects/calloutng/gnu/lib/libgcc/Makefile projects/calloutng/gnu/usr.bin/cc/cc_tools/Makefile projects/calloutng/lib/libipsec/policy_parse.y projects/calloutng/sbin/devd/devd.cc projects/calloutng/sbin/devd/devd.hh projects/calloutng/sbin/route/route.c projects/calloutng/share/mk/bsd.lib.mk projects/calloutng/share/mk/sys.mk projects/calloutng/share/syscons/keymaps/INDEX.keymaps projects/calloutng/share/syscons/keymaps/Makefile projects/calloutng/sys/arm/arm/busdma_machdep-v6.c projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm_gram.y projects/calloutng/sys/dev/isci/isci_io_request.c projects/calloutng/sys/kern/subr_uio.c projects/calloutng/sys/net/rtsock.c projects/calloutng/sys/netinet6/in6.c projects/calloutng/sys/netinet6/scope6.c projects/calloutng/sys/netinet6/scope6_var.h projects/calloutng/sys/netpfil/pf/if_pfsync.c projects/calloutng/sys/netpfil/pf/pf.c projects/calloutng/usr.sbin/ndiscvt/inf-parse.y projects/calloutng/usr.sbin/ndp/ndp.c Directory Properties: projects/calloutng/ (props changed) projects/calloutng/contrib/binutils/ (props changed) projects/calloutng/contrib/dtc/ (props changed) projects/calloutng/contrib/gcc/ (props changed) projects/calloutng/contrib/gdtoa/ (props changed) projects/calloutng/contrib/ntp/ (props changed) projects/calloutng/contrib/tcpdump/ (props changed) projects/calloutng/crypto/heimdal/ (props changed) projects/calloutng/crypto/openssl/ (props changed) projects/calloutng/gnu/lib/ (props changed) projects/calloutng/gnu/usr.bin/cc/cc_tools/ (props changed) projects/calloutng/sbin/ (props changed) projects/calloutng/sys/ (props changed) projects/calloutng/usr.sbin/ndiscvt/ (props changed) Modified: projects/calloutng/contrib/binutils/Makefile.in ============================================================================== --- projects/calloutng/contrib/binutils/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/binutils/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -284,7 +284,7 @@ MAKEINFOFLAGS = --split-size=5000000 AS = @AS@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ @@ -474,7 +474,7 @@ BASE_FLAGS_TO_PASS = \ "SHELL=$(SHELL)" \ "YACC=$(YACC)" \ "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "BOOT_CFLAGS=$(BOOT_CFLAGS)" \ "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \ Modified: projects/calloutng/contrib/binutils/Makefile.tpl ============================================================================== --- projects/calloutng/contrib/binutils/Makefile.tpl Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/binutils/Makefile.tpl Thu Dec 6 13:03:57 2012 (r243950) @@ -287,7 +287,7 @@ MAKEINFOFLAGS = --split-size=5000000 AS = @AS@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ Modified: projects/calloutng/contrib/binutils/libiberty/Makefile.in ============================================================================== --- projects/calloutng/contrib/binutils/libiberty/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/binutils/libiberty/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(libiberty_top OUTPUT_OPTION = @OUTPUT_OPTION@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -81,7 +81,7 @@ EXTRA_OFILES = # Flags to pass to a recursive make. FLAGS_TO_PASS = \ "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ @@ -224,12 +224,12 @@ INSTALLED_HEADERS = $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" != x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) Modified: projects/calloutng/contrib/cvs/diff/Makefile.in ============================================================================== --- projects/calloutng/contrib/cvs/diff/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/cvs/diff/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -41,8 +41,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libdiff_a_AR = $(AR) $(ARFLAGS) libdiff_a_LIBADD = am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) \ Modified: projects/calloutng/contrib/cvs/lib/Makefile.in ============================================================================== --- projects/calloutng/contrib/cvs/lib/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/cvs/lib/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -63,8 +63,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = fnmatch.h LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libcvs_a_AR = $(AR) $(ARFLAGS) libcvs_a_DEPENDENCIES = @LIBOBJS@ am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) getdate.$(OBJEXT) \ Modified: projects/calloutng/contrib/dtc/Makefile ============================================================================== --- projects/calloutng/contrib/dtc/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/dtc/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -48,7 +48,7 @@ ifdef V VECHO = : else VECHO = echo " " -ARFLAGS = rc +ARFLAGS ?= rc .SILENT: endif Modified: projects/calloutng/contrib/gcc/Makefile.in ============================================================================== --- projects/calloutng/contrib/gcc/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gcc/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -238,7 +238,7 @@ BISONFLAGS = FLEX = @FLEX@ FLEXFLAGS = AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ NM = @NM@ RANLIB = @RANLIB@ RANLIB_FLAGS = @ranlib_flags@ @@ -1303,7 +1303,7 @@ compilations: $(BACKEND) # This archive is strictly for the host. libbackend.a: $(OBJS@onestep@) -rm -rf libbackend.a - $(AR) $(AR_FLAGS) libbackend.a $(OBJS@onestep@) + $(AR) $(ARFLAGS) libbackend.a $(OBJS@onestep@) -$(RANLIB) $(RANLIB_FLAGS) libbackend.a # We call this executable `xgcc' rather than `gcc' Modified: projects/calloutng/contrib/gcclibs/libcpp/Makefile.in ============================================================================== --- projects/calloutng/contrib/gcclibs/libcpp/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gcclibs/libcpp/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ Modified: projects/calloutng/contrib/gcclibs/libdecnumber/Makefile.in ============================================================================== --- projects/calloutng/contrib/gcclibs/libdecnumber/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gcclibs/libdecnumber/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ Modified: projects/calloutng/contrib/gcclibs/libiberty/Makefile.in ============================================================================== --- projects/calloutng/contrib/gcclibs/libiberty/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gcclibs/libiberty/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(libiberty_top OUTPUT_OPTION = @OUTPUT_OPTION@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -81,7 +81,7 @@ EXTRA_OFILES = # Flags to pass to a recursive make. FLAGS_TO_PASS = \ "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ @@ -224,12 +224,12 @@ INSTALLED_HEADERS = $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" != x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) Modified: projects/calloutng/contrib/gdtoa/makefile ============================================================================== --- projects/calloutng/contrib/gdtoa/makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gdtoa/makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -26,6 +26,8 @@ .SUFFIXES: .c .o CC = cc CFLAGS = -g +AR ?= ar +ARFLAGS ?= ruv .c.o: $(CC) -c $(CFLAGS) $*.c @@ -52,12 +54,12 @@ gdtoa.a: dmisc.c dtoa.c g_Qfmt.c g__fmt strtopx.c strtopxL.c strtorQ.c strtord.c strtordd.c strtorf.c\ strtorx.c strtorxL.c sum.c ulp.c $(CC) -c $(CFLAGS) $? - x=`echo $? | sed 's/\.c/.o/g'` && ar ruv gdtoa.a $$x && rm $$x + x=`echo $? | sed 's/\.c/.o/g'` && $(AR) $(ARFLAGS) gdtoa.a $$x && rm $$x ranlib gdtoa.a || true Printf: all printf.c $(CC) -c $(CFLAGS) printf.c - ar ruv gdtoa.a printf.o + $(AR) $(ARFLAGS) gdtoa.a printf.o rm printf.o touch Printf Modified: projects/calloutng/contrib/gperf/lib/Makefile.in ============================================================================== --- projects/calloutng/contrib/gperf/lib/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/gperf/lib/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -43,8 +43,8 @@ CXXCPP = @CXXCPP@ # Both C and C++ compiler OBJEXT = @OBJEXT@ # Other -AR = ar -AR_FLAGS = rc +AR = @AR@ +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ MV = mv LN = ln @@ -71,7 +71,7 @@ all : $(TARGETLIB) $(TARGETLIB): $(OBJECTS) $(RM) $@ - $(AR) $(AR_FLAGS) $@ $(OBJECTS) + $(AR) $(ARFLAGS) $@ $(OBJECTS) $(RANLIB) $@ # Don't use implicit rules, since AIX "make" and OSF/1 "make" don't always Modified: projects/calloutng/contrib/ntp/arlib/Makefile.in ============================================================================== --- projects/calloutng/contrib/ntp/arlib/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/ntp/arlib/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -50,8 +50,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libares_a_AR = $(AR) $(ARFLAGS) libares_a_LIBADD = am_libares_a_OBJECTS = arlib.$(OBJEXT) Modified: projects/calloutng/contrib/ntp/libntp/Makefile.in ============================================================================== --- projects/calloutng/contrib/ntp/libntp/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/ntp/libntp/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -52,7 +52,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS = @ARFLAGS@ libntp_a_AR = $(AR) $(ARFLAGS) libntp_a_LIBADD = am__objects_1 = a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \ Modified: projects/calloutng/contrib/ntp/libparse/Makefile.in ============================================================================== --- projects/calloutng/contrib/ntp/libparse/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/ntp/libparse/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -52,7 +52,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libparse_a_AR = $(AR) $(ARFLAGS) libparse_a_LIBADD = am_libparse_a_OBJECTS = parse$U.$(OBJEXT) parse_conf$U.$(OBJEXT) \ Modified: projects/calloutng/contrib/ntp/ntpd/Makefile.in ============================================================================== --- projects/calloutng/contrib/ntp/ntpd/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/ntp/ntpd/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -58,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS = @ARFLAGS@ libntpd_a_AR = $(AR) $(ARFLAGS) libntpd_a_LIBADD = am_libntpd_a_OBJECTS = ntp_control$U.$(OBJEXT) ntp_crypto$U.$(OBJEXT) \ Modified: projects/calloutng/contrib/opie/libmissing/Makefile.in ============================================================================== --- projects/calloutng/contrib/opie/libmissing/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/opie/libmissing/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -22,7 +22,7 @@ TARGET=libmissing.a all: $(TARGET) $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) clean: Modified: projects/calloutng/contrib/opie/libopie/Makefile.in ============================================================================== --- projects/calloutng/contrib/opie/libopie/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/opie/libopie/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -23,7 +23,7 @@ TARGET=libopie.a all: $(TARGET) $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) clean: Modified: projects/calloutng/contrib/tcp_wrappers/Makefile ============================================================================== --- projects/calloutng/contrib/tcp_wrappers/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/tcp_wrappers/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -139,7 +139,7 @@ epix: freebsd: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ - RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP=-DNETGROUP TLI= \ + RANLIB=ranlib ARFLAGS=$(ARFLAGS) AUX_OBJ= NETGROUP=-DNETGROUP TLI= \ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -DUSE_GETIPNODEBY" \ VSYSLOG= all @@ -401,7 +401,7 @@ machten: RANLIB = ranlib # have ranlib (BSD-ish UNIX) #RANLIB = echo # no ranlib (SYSV-ish UNIX) -ARFLAGS = rv # most systems +ARFLAGS ?= rv # most systems #ARFLAGS= rvs # IRIX 4.0.x AR = ar Modified: projects/calloutng/contrib/tcpdump/Makefile.in ============================================================================== --- projects/calloutng/contrib/tcpdump/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/contrib/tcpdump/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -366,7 +366,7 @@ $(PROG): $(OBJ) @V_PCAPDEP@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ - $(AR) cr $@ $(LIBNETDISSECT_OBJ) + $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) $(RANLIB) $@ datalinks.o: $(srcdir)/missing/datalinks.c Modified: projects/calloutng/crypto/heimdal/appl/ftp/common/Makefile.in ============================================================================== --- projects/calloutng/crypto/heimdal/appl/ftp/common/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/crypto/heimdal/appl/ftp/common/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libcommon_a_AR = $(AR) $(ARFLAGS) libcommon_a_LIBADD = am_libcommon_a_OBJECTS = sockbuf.$(OBJEXT) buffer.$(OBJEXT) Modified: projects/calloutng/crypto/heimdal/appl/telnet/libtelnet/Makefile.in ============================================================================== --- projects/calloutng/crypto/heimdal/appl/telnet/libtelnet/Makefile.in Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/crypto/heimdal/appl/telnet/libtelnet/Makefile.in Thu Dec 6 13:03:57 2012 (r243950) @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libtelnet_a_AR = $(AR) $(ARFLAGS) libtelnet_a_LIBADD = am_libtelnet_a_OBJECTS = auth.$(OBJEXT) enc_des.$(OBJEXT) \ Modified: projects/calloutng/crypto/openssl/Makefile.org ============================================================================== --- projects/calloutng/crypto/openssl/Makefile.org Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/crypto/openssl/Makefile.org Thu Dec 6 13:03:57 2012 (r243950) @@ -63,8 +63,8 @@ DEPFLAG= PEX_LIBS= EX_LIBS= EXE_EXT= -ARFLAGS= -AR=ar $(ARFLAGS) r +ARFLAGS?= r +AR=ar $(ARFLAGS) RANLIB= ranlib NM= nm PERL= perl Modified: projects/calloutng/crypto/openssl/crypto/Makefile ============================================================================== --- projects/calloutng/crypto/openssl/crypto/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/crypto/openssl/crypto/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -13,7 +13,8 @@ MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile RM= rm -f -AR= ar r +ARFLAGS?= r +AR= ar ${ARFLAGS} RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ Modified: projects/calloutng/gnu/lib/libgcc/Makefile ============================================================================== --- projects/calloutng/gnu/lib/libgcc/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/gnu/lib/libgcc/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -341,7 +341,7 @@ CLEANFILES += libgcc.map libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${.TARGET} all: libgcc_eh.a @@ -350,7 +350,7 @@ all: libgcc_eh.a libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${.TARGET} all: libgcc_eh_p.a .endif Modified: projects/calloutng/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- projects/calloutng/gnu/usr.bin/cc/cc_tools/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/gnu/usr.bin/cc/cc_tools/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -512,7 +512,7 @@ ${_src:R:S/$/.o/}: ${_src} ${LIBIBERTY}: ${LIBIBERTY_OBJS} @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` ${RANLIB} ${.TARGET} CLEANFILES+= ${LIBIBERTY} ${LIBIBERTY_OBJS} Modified: projects/calloutng/lib/libipsec/policy_parse.y ============================================================================== --- projects/calloutng/lib/libipsec/policy_parse.y Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/lib/libipsec/policy_parse.y Thu Dec 6 13:03:57 2012 (r243950) @@ -88,7 +88,6 @@ static caddr_t policy_parse(char *msg, i extern void __policy__strbuffer__init__(char *msg); extern void __policy__strbuffer__free__(void); -extern int yyparse(void); extern int yylex(void); extern char *__libipsecyytext; /*XXX*/ Modified: projects/calloutng/sbin/devd/devd.cc ============================================================================== --- projects/calloutng/sbin/devd/devd.cc Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sbin/devd/devd.cc Thu Dec 6 13:03:57 2012 (r243950) @@ -127,7 +127,7 @@ delete_and_clear(vector<T *> &v) { typename vector<T *>::const_iterator i; - for (i = v.begin(); i != v.end(); i++) + for (i = v.begin(); i != v.end(); ++i) delete *i; v.clear(); } @@ -151,22 +151,22 @@ event_proc::add(eps *eps) } bool -event_proc::matches(config &c) +event_proc::matches(config &c) const { vector<eps *>::const_iterator i; - for (i = _epsvec.begin(); i != _epsvec.end(); i++) + for (i = _epsvec.begin(); i != _epsvec.end(); ++i) if (!(*i)->do_match(c)) return (false); return (true); } bool -event_proc::run(config &c) +event_proc::run(config &c) const { vector<eps *>::const_iterator i; - for (i = _epsvec.begin(); i != _epsvec.end(); i++) + for (i = _epsvec.begin(); i != _epsvec.end(); ++i) if (!(*i)->do_action(c)) return (false); return (true); @@ -248,9 +248,8 @@ action::do_action(config &c) } match::match(config &c, const char *var, const char *re) - : _var(var) + : _var(var), _re("^") { - _re = "^"; if (!c.expand_string(string(re)).empty() && c.expand_string(string(re)).at(0) == '!') { _re.append(c.expand_string(string(re)).substr(1)); @@ -301,7 +300,7 @@ media::media(config &, const char *var, { -1, "unknown" }, { 0, NULL }, }; - for (int i = 0; media_types[i].ifmt_string != NULL; i++) + for (int i = 0; media_types[i].ifmt_string != NULL; ++i) if (strcasecmp(type, media_types[i].ifmt_string) == 0) { _type = media_types[i].ifmt_word; break; @@ -436,7 +435,7 @@ config::parse_files_in_dir(const char *d class epv_greater { public: - int operator()(event_proc *const&l1, event_proc *const&l2) + int operator()(event_proc *const&l1, event_proc *const&l2) const { return (l1->get_priority() > l2->get_priority()); } @@ -445,7 +444,7 @@ public: void config::sort_vector(vector<event_proc *> &v) { - sort(v.begin(), v.end(), epv_greater()); + stable_sort(v.begin(), v.end(), epv_greater()); } void @@ -454,7 +453,7 @@ config::parse(void) vector<string>::const_iterator i; parse_one_file(configfile); - for (i = _dir_list.begin(); i != _dir_list.end(); i++) + for (i = _dir_list.begin(); i != _dir_list.end(); ++i) parse_files_in_dir((*i).c_str()); sort_vector(_attach_list); sort_vector(_detach_list); @@ -569,7 +568,7 @@ config::get_variable(const string &var) { vector<var_list *>::reverse_iterator i; - for (i = _var_list_table.rbegin(); i != _var_list_table.rend(); i++) { + for (i = _var_list_table.rbegin(); i != _var_list_table.rend(); ++i) { if ((*i)->is_set(var)) return ((*i)->get_variable(var)); } @@ -577,7 +576,7 @@ config::get_variable(const string &var) } bool -config::is_id_char(char ch) +config::is_id_char(char ch) const { return (ch != '\0' && (isalpha(ch) || isdigit(ch) || ch == '_' || ch == '-')); @@ -726,7 +725,7 @@ config::find_and_execute(char type) } if (Dflag) fprintf(stderr, "Processing %s event\n", s); - for (i = l->begin(); i != l->end(); i++) { + for (i = l->begin(); i != l->end(); ++i) { if ((*i)->matches(*this)) { (*i)->run(*this); break; @@ -823,14 +822,14 @@ notify_clients(const char *data, int len list<int> bad; list<int>::const_iterator i; - for (i = clients.begin(); i != clients.end(); i++) { + for (i = clients.begin(); i != clients.end(); ++i) { if (write(*i, data, len) <= 0) { bad.push_back(*i); close(*i); } } - for (i = bad.begin(); i != bad.end(); i++) + for (i = bad.begin(); i != bad.end(); ++i) clients.erase(find(clients.begin(), clients.end(), *i)); } Modified: projects/calloutng/sbin/devd/devd.hh ============================================================================== --- projects/calloutng/sbin/devd/devd.hh Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sbin/devd/devd.hh Thu Dec 6 13:03:57 2012 (r243950) @@ -134,8 +134,8 @@ public: int get_priority() const { return (_prio); } void set_priority(int prio) { _prio = prio; } void add(eps *); - bool matches(config &); - bool run(config &); + bool matches(config &) const; + bool run(config &) const; private: int _prio; std::vector<eps *> _epsvec; @@ -144,7 +144,7 @@ private: class config { public: - config() { _pidfile = ""; push_var_table(); } + config() : _pidfile("") { push_var_table(); } virtual ~config() { reset(); } void add_attach(int, event_proc *); void add_detach(int, event_proc *); @@ -170,7 +170,7 @@ protected: void parse_one_file(const char *fn); void parse_files_in_dir(const char *dirname); void expand_one(const char *&src, std::string &dst); - bool is_id_char(char); + bool is_id_char(char) const; bool chop_var(char *&buffer, char *&lhs, char *&rhs); private: std::vector<std::string> _dir_list; Modified: projects/calloutng/sbin/route/route.c ============================================================================== --- projects/calloutng/sbin/route/route.c Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sbin/route/route.c Thu Dec 6 13:03:57 2012 (r243950) @@ -1215,16 +1215,6 @@ getaddr(int which, char *str, struct hos exit(1); } memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6)); -#ifdef __KAME__ - if ((IN6_IS_ADDR_LINKLOCAL(&su->sin6.sin6_addr) || - IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr) || - IN6_IS_ADDR_MC_NODELOCAL(&su->sin6.sin6_addr)) && - su->sin6.sin6_scope_id) { - *(u_int16_t *)&su->sin6.sin6_addr.s6_addr[2] = - htons(su->sin6.sin6_scope_id); - su->sin6.sin6_scope_id = 0; - } -#endif freeaddrinfo(res); if (q != NULL) *q++ = '/'; Modified: projects/calloutng/share/mk/bsd.lib.mk ============================================================================== --- projects/calloutng/share/mk/bsd.lib.mk Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/share/mk/bsd.lib.mk Thu Dec 6 13:03:57 2012 (r243950) @@ -135,9 +135,9 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -152,9 +152,9 @@ lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} .else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -202,7 +202,7 @@ _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} ${SOBJS} ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif Modified: projects/calloutng/share/mk/sys.mk ============================================================================== --- projects/calloutng/share/mk/sys.mk Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/share/mk/sys.mk Thu Dec 6 13:03:57 2012 (r243950) @@ -39,7 +39,7 @@ AR ?= ar .if defined(%POSIX) ARFLAGS ?= -rv .else -ARFLAGS ?= rl +ARFLAGS ?= cru .endif RANLIB ?= ranlib Modified: projects/calloutng/share/syscons/keymaps/INDEX.keymaps ============================================================================== --- projects/calloutng/share/syscons/keymaps/INDEX.keymaps Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/share/syscons/keymaps/INDEX.keymaps Thu Dec 6 13:03:57 2012 (r243950) @@ -520,6 +520,8 @@ us.dvorakl.kbd:fr:États Unis d'Amérique us.dvorakl.kbd:pt:Estados Unidos da América dvorakl us.dvorakl.kbd:es:Estadounidense dvorak zurdo +us.dvorakp.kbd:en:United States of America Programmer Dvorak + us.dvorakx.kbd:en:United States of America dvorakx us.dvorakx.kbd:de:US-amerikanisch dvorakx us.dvorakx.kbd:fr:États Unis d'Amérique dvorakx Modified: projects/calloutng/share/syscons/keymaps/Makefile ============================================================================== --- projects/calloutng/share/syscons/keymaps/Makefile Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/share/syscons/keymaps/Makefile Thu Dec 6 13:03:57 2012 (r243950) @@ -47,8 +47,8 @@ FILES= INDEX.keymaps \ ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \ uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \ uk.dvorak.kbd \ - us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakx.kbd \ - us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd + us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakp.kbd \ + us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd FILESDIR= ${SHAREDIR}/syscons/keymaps Copied: projects/calloutng/share/syscons/keymaps/us.dvorakp.kbd (from r243949, head/share/syscons/keymaps/us.dvorakp.kbd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/calloutng/share/syscons/keymaps/us.dvorakp.kbd Thu Dec 6 13:03:57 2012 (r243950, copy of r243949, head/share/syscons/keymaps/us.dvorakp.kbd) @@ -0,0 +1,117 @@ +# A Programmer Dvorak keyboard for US English +# +# $FreeBSD$ +# alt +# scan cntrl alt alt cntrl lock +# code base shift cntrl shift alt shift cntrl shift state +# ------------------------------------------------------------------ + 000 nop nop nop nop nop nop nop nop O + 001 esc esc esc esc esc esc debug esc O + 002 '&' '%' nop nop '&' '%' nop nop O + 003 '[' '7' nul nul '[' '7' nul nul O + 004 '{' '5' nop nop '{' '5' nop nop O + 005 '}' '3' nop nop '}' '3' nop nop O + 006 '(' '1' nop nop '(' '1' nop nop O + 007 '=' '9' rs rs '=' '9' rs rs O + 008 '*' '0' nop nop '*' '0' nop nop O + 009 ')' '2' nop nop ')' '2' nop nop O + 010 '+' '4' nop nop '+' '4' nop nop O + 011 ']' '6' nop nop ']' ')' nop nop O + 012 '!' '8' esc esc '!' '8' esc esc O + 013 '#' '`' gs gs '#' '`' gs gs O + 014 bs bs del del bs bs del del O + 015 ht btab nop nop ht btab nop nop O + 016 ';' ':' nop nop ';' ':' nop nop O + 017 ',' '<' nop nop ',' '<' nop nop O + 018 '.' '>' nop nop '.' '>' nop nop O + 019 'p' 'P' dle dle 'p' 'P' dle dle C + 020 'y' 'Y' em em 'y' 'Y' em em C + 021 'f' 'F' ack ack 'f' 'F' ack ack C + 022 'g' 'G' bel bel 'g' 'G' bel bel C + 023 'c' 'C' etx etx 'c' 'C' etx etx C + 024 'r' 'R' dc2 dc2 'r' 'R' dc2 dc2 C + 025 'l' 'L' ff ff 'l' 'L' ff ff C + 026 '/' '?' nop nop '/' '?' nop nop O + 027 '@' '^' nop nop '@' '^' nop nop O + 028 cr cr nl nl cr cr nl nl O + 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O + 030 'a' 'A' soh soh 'a' 'A' soh soh C + 031 'o' 'O' si si 'o' 'O' si si C + 032 'e' 'E' enq enq 'e' 'E' enq enq C + 033 'u' 'U' nak nak 'u' 'U' nak nak C + 034 'i' 'I' ht ht 'i' 'I' ht ht C + 035 'd' 'D' eot eot 'd' 'D' eot eot C + 036 'h' 'H' bs bs 'h' 'H' bs bs C + 037 't' 'T' dc4 dc4 't' 'T' dc4 dc4 C + 038 'n' 'N' so so 'n' 'N' so so C + 039 's' 'S' dc3 dc3 's' 'S' dc3 dc3 C + 040 '-' '_' us us '-' '_' us us O + 041 '$' '~' nop nop '$' '~' nop nop O + 042 lshift lshift lshift lshift lshift lshift lshift lshift O + 043 '\' '|' fs fs '\' '|' fs fs O + 044 ''' '"' nop nop ''' '"' nop nop O + 045 'q' 'Q' dc1 dc1 'q' 'Q' dc1 dc1 C + 046 'j' 'J' nl nl 'j' 'J' nl nl C + 047 'k' 'K' vt vt 'k' 'K' vt vt C + 048 'x' 'X' can can 'x' 'X' can can C + 049 'b' 'B' stx stx 'b' 'B' stx stx C + 050 'm' 'M' cr cr 'm' 'M' cr cr C + 051 'w' 'W' etb etb 'w' 'W' etb etb C + 052 'v' 'V' syn syn 'v' 'V' syn syn C + 053 'z' 'Z' sub sub 'z' 'Z' sub sub C + 054 rshift rshift rshift rshift rshift rshift rshift rshift O + 055 '*' '*' '*' '*' '*' '*' '*' '*' O + 056 lalt lalt lalt lalt lalt lalt lalt lalt O + 057 ' ' ' ' nul ' ' ' ' ' ' susp ' ' O + 058 clock clock clock clock clock clock clock clock O + 059 fkey01 fkey13 fkey25 fkey37 scr01 scr11 scr01 scr11 O + 060 fkey02 fkey14 fkey26 fkey38 scr02 scr12 scr02 scr12 O + 061 fkey03 fkey15 fkey27 fkey39 scr03 scr13 scr03 scr13 O + 062 fkey04 fkey16 fkey28 fkey40 scr04 scr14 scr04 scr14 O + 063 fkey05 fkey17 fkey29 fkey41 scr05 scr15 scr05 scr15 O + 064 fkey06 fkey18 fkey30 fkey42 scr06 scr16 scr06 scr16 O + 065 fkey07 fkey19 fkey31 fkey43 scr07 scr07 scr07 scr07 O + 066 fkey08 fkey20 fkey32 fkey44 scr08 scr08 scr08 scr08 O + 067 fkey09 fkey21 fkey33 fkey45 scr09 scr09 scr09 scr09 O + 068 fkey10 fkey22 fkey34 fkey46 scr10 scr10 scr10 scr10 O + 069 nlock nlock nlock nlock nlock nlock nlock nlock O + 070 slock slock slock slock slock slock slock slock O + 071 fkey49 '7' '7' '7' '7' '7' '7' '7' N + 072 fkey50 '8' '8' '8' '8' '8' '8' '8' N + 073 fkey51 '9' '9' '9' '9' '9' '9' '9' N + 074 fkey52 '-' '-' '-' '-' '-' '-' '-' N + 075 fkey53 '4' '4' '4' '4' '4' '4' '4' N + 076 fkey54 '5' '5' '5' '5' '5' '5' '5' N + 077 fkey55 '6' '6' '6' '6' '6' '6' '6' N + 078 fkey56 '+' '+' '+' '+' '+' '+' '+' N + 079 fkey57 '1' '1' '1' '1' '1' '1' '1' N + 080 fkey58 '2' '2' '2' '2' '2' '2' '2' N + 081 fkey59 '3' '3' '3' '3' '3' '3' '3' N + 082 fkey60 '0' '0' '0' '0' '0' '0' '0' N + 083 del '.' '.' '.' '.' '.' boot boot N + 084 nop nop nop nop nop nop nop nop O + 085 nop nop nop nop nop nop nop nop O + 086 nop nop nop nop nop nop nop nop O + 087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O + 088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O + 089 cr cr nl nl cr cr nl nl O + 090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O + 091 '/' '/' '/' '/' '/' '/' '/' '/' N + 092 nscr pscr debug debug nop nop nop nop O + 093 ralt ralt ralt ralt ralt ralt ralt ralt O + 094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O + 095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O + 096 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 O + 097 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 O + 098 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 O + 099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O + 100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O + 101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O + 102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O + 103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O + 104 slock saver slock saver susp nop susp nop O + 105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O + 106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O + 107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O + 108 nop nop nop nop nop nop nop nop + Modified: projects/calloutng/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- projects/calloutng/sys/arm/arm/busdma_machdep-v6.c Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sys/arm/arm/busdma_machdep-v6.c Thu Dec 6 13:03:57 2012 (r243950) @@ -1095,7 +1095,7 @@ _bus_dmamap_fix_user(vm_offset_t buf, bu #else #define l2cache_wb_range(va, pa, size) cpu_l2cache_wb_range(va, size) #define l2cache_wbinv_range(va, pa, size) cpu_l2cache_wbinv_range(va, size) -#define l2cache_inv_range(va, pa, size) cpu_l2cache_wbinv_range(va, size) +#define l2cache_inv_range(va, pa, size) cpu_l2cache_inv_range(va, size) #endif void Modified: projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm_gram.y ============================================================================== --- projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm_gram.y Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm_gram.y Thu Dec 6 13:03:57 2012 (r243950) @@ -103,7 +103,6 @@ static void add_version(const char *vers static int is_download_const(expression_t *immed); extern int yylex (void); -extern int yyparse (void); #define SRAM_SYMNAME "SRAM_BASE" #define SCB_SYMNAME "SCB_BASE" Modified: projects/calloutng/sys/dev/isci/isci_io_request.c ============================================================================== --- projects/calloutng/sys/dev/isci/isci_io_request.c Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sys/dev/isci/isci_io_request.c Thu Dec 6 13:03:57 2012 (r243950) @@ -670,8 +670,7 @@ isci_io_request_construct(void *arg, bus io_request->sge = seg; ccb = io_request->ccb; - /* XXX More cleanup is needed here */ - if ((nseg == 0) || (error != 0)) { + if (error != 0) { ccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(ccb); return; @@ -757,18 +756,21 @@ isci_io_request_execute_scsi_io(union cc panic("Unexpected CAM_DATA_PHYS flag! flags = 0x%x\n", ccb->ccb_h.flags); - error = bus_dmamap_load(io_request->parent.dma_tag, - io_request->parent.dma_map, csio->data_ptr, csio->dxfer_len, - isci_io_request_construct, io_request, 0x0); - - /* A resource shortage from BUSDMA will be automatically - * continued at a later point, pushing the CCB processing - * forward, which will in turn unfreeze the simq. - */ - if (error == EINPROGRESS) { - xpt_freeze_simq(controller->sim, 1); - ccb->ccb_h.flags |= CAM_RELEASE_SIMQ; - } + if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { + error = bus_dmamap_load(io_request->parent.dma_tag, + io_request->parent.dma_map, csio->data_ptr, csio->dxfer_len, + isci_io_request_construct, io_request, 0x0); + + /* A resource shortage from BUSDMA will be automatically + * continued at a later point, pushing the CCB processing + * forward, which will in turn unfreeze the simq. + */ + if (error == EINPROGRESS) { + xpt_freeze_simq(controller->sim, 1); + ccb->ccb_h.flags |= CAM_RELEASE_SIMQ; + } + } else + isci_io_request_construct(io_request, NULL, 0, 0); } void Modified: projects/calloutng/sys/kern/subr_uio.c ============================================================================== --- projects/calloutng/sys/kern/subr_uio.c Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sys/kern/subr_uio.c Thu Dec 6 13:03:57 2012 (r243950) @@ -389,7 +389,6 @@ again: case UIO_SYSSPACE: iov_base = iov->iov_base; *iov_base = c; - iov->iov_base = iov_base; break; case UIO_NOCOPY: Modified: projects/calloutng/sys/net/rtsock.c ============================================================================== --- projects/calloutng/sys/net/rtsock.c Thu Dec 6 12:59:06 2012 (r243949) +++ projects/calloutng/sys/net/rtsock.c Thu Dec 6 13:03:57 2012 (r243950) @@ -65,6 +65,7 @@ #include <netinet/if_ether.h> #include <netinet/ip_carp.h> #ifdef INET6 +#include <netinet6/ip6_var.h> #include <netinet6/scope6_var.h> #endif @@ -175,14 +176,6 @@ MTX_SYSINIT(rtsock, &rtsock_mtx, "rtsock #define RTSOCK_LOCK_ASSERT() mtx_assert(&rtsock_mtx, MA_OWNED) static SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RD, 0, ""); -#ifdef INET6 -static VNET_DEFINE(int, deembed_scopeid) = 1; -#define V_deembed_scopeid VNET(deembed_scopeid) -SYSCTL_DECL(_net_inet6_ip6); -SYSCTL_VNET_INT(_net_inet6_ip6, OID_AUTO, deembed_scopeid, CTLFLAG_RW, - &VNET_NAME(deembed_scopeid), 0, - "Extract embedded zone ID and set it to sin6_scope_id in sockaddr_in6."); -#endif struct walkarg { int w_tmemsize; @@ -572,9 +565,9 @@ route_output(struct mbuf *m, struct sock struct radix_node_head *rnh; struct rt_addrinfo info; #ifdef INET6 - struct sockaddr_storage ss_dst; - struct sockaddr_storage ss_gw; + struct sockaddr_storage ss; struct sockaddr_in6 *sin6; + int i, rti_need_deembed = 0; #endif int len, error = 0; struct ifnet *ifp = NULL; @@ -606,6 +599,11 @@ route_output(struct mbuf *m, struct sock rtm->rtm_pid = curproc->p_pid; bzero(&info, sizeof(info)); info.rti_addrs = rtm->rtm_addrs; + /* + * rt_xaddrs() performs s6_addr[2] := sin6_scope_id for AF_INET6 + * link-local address because rtrequest requires addresses with + * embedded scope id. + */ if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) { info.rti_info[RTAX_DST] = NULL; senderr(EINVAL); @@ -672,11 +670,18 @@ route_output(struct mbuf *m, struct sock if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK && (rtm->rtm_flags & RTF_LLDATA) != 0) { error = lla_rt_output(rtm, &info); +#ifdef INET6 + if (error == 0) + rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; +#endif break; } error = rtrequest1_fib(RTM_ADD, &info, &saved_nrt, so->so_fibnum); if (error == 0 && saved_nrt) { +#ifdef INET6 + rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; +#endif RT_LOCK(saved_nrt); rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx, &saved_nrt->rt_rmx); @@ -693,6 +698,10 @@ route_output(struct mbuf *m, struct sock (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK) && (rtm->rtm_flags & RTF_LLDATA) != 0) { error = lla_rt_output(rtm, &info); +#ifdef INET6 + if (error == 0) + rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; +#endif break; } error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, @@ -702,6 +711,10 @@ route_output(struct mbuf *m, struct sock rt = saved_nrt; goto report; } +#ifdef INET6 + /* rt_msg2() will not be used when RTM_DELETE fails. */ + rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; +#endif break; case RTM_GET: @@ -803,34 +816,7 @@ route_output(struct mbuf *m, struct sock senderr(ESRCH); } info.rti_info[RTAX_DST] = rt_key(rt); -#ifdef INET6 - if (V_deembed_scopeid) { - switch (rt_key(rt)->sa_family) { - case AF_INET6: - sin6 = (struct sockaddr_in6 *)&ss_dst; - bcopy(rt_key(rt), sin6, sizeof(*sin6)); - if (sa6_recoverscope(sin6) == 0) - info.rti_info[RTAX_DST] = - (struct sockaddr *)sin6; - break; - } - } -#endif info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; -#ifdef INET6 - if (V_deembed_scopeid) { - switch (rt->rt_gateway->sa_family) { - case AF_INET6: - sin6 = (struct sockaddr_in6 *)&ss_gw; - bcopy(rt->rt_gateway, sin6, - sizeof(*sin6)); - if (sa6_recoverscope(sin6) == 0) - info.rti_info[RTAX_GATEWAY] = *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212061303.qB6D3wjs048868>