Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Jan 2015 05:46:26 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r277689 - in projects/building-blocks: . etc/rc.d lib/libproc lib/libproc/tests lib/libutil sbin share/man/man5 share/man/man9 sys/conf sys/modules
Message-ID:  <201501250546.t0P5kQqO048841@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Jan 25 05:46:25 2015
New Revision: 277689
URL: https://svnweb.freebsd.org/changeset/base/277689

Log:
  MFhead @ r277688

Deleted:
  projects/building-blocks/share/man/man9/spl.9
Modified:
  projects/building-blocks/ObsoleteFiles.inc
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/lib/libproc/proc_sym.c
  projects/building-blocks/lib/libproc/tests/proc_test.c
  projects/building-blocks/lib/libutil/gr_util.c
  projects/building-blocks/sbin/Makefile
  projects/building-blocks/share/man/man5/src.conf.5
  projects/building-blocks/share/man/man9/Makefile
  projects/building-blocks/share/man/man9/SYSCALL_MODULE.9
  projects/building-blocks/sys/conf/kern.opts.mk
  projects/building-blocks/sys/modules/Makefile
Directory Properties:
  projects/building-blocks/   (props changed)
  projects/building-blocks/etc/   (props changed)
  projects/building-blocks/include/   (props changed)
  projects/building-blocks/lib/libutil/   (props changed)
  projects/building-blocks/sbin/   (props changed)
  projects/building-blocks/share/   (props changed)
  projects/building-blocks/share/man/man4/   (props changed)
  projects/building-blocks/sys/   (props changed)
  projects/building-blocks/sys/conf/   (props changed)

Modified: projects/building-blocks/ObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/ObsoleteFiles.inc	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/ObsoleteFiles.inc	Sun Jan 25 05:46:25 2015	(r277689)
@@ -38,6 +38,20 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150124: spl.9 and friends
+OLD_FILES+=usr/share/man/man9/spl.9
+OLD_FILES+=usr/share/man/man9/spl0.9
+OLD_FILES+=usr/share/man/man9/splbio.9
+OLD_FILES+=usr/share/man/man9/splclock.9
+OLD_FILES+=usr/share/man/man9/splhigh.9
+OLD_FILES+=usr/share/man/man9/splimp.9
+OLD_FILES+=usr/share/man/man9/splnet.9
+OLD_FILES+=usr/share/man/man9/splsoftclock.9
+OLD_FILES+=usr/share/man/man9/splsofttty.9
+OLD_FILES+=usr/share/man/man9/splstatclock.9
+OLD_FILES+=usr/share/man/man9/spltty.9
+OLD_FILES+=usr/share/man/man9/splvm.9
+OLD_FILES+=usr/share/man/man9/splx.9
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/etc/rc.d/Makefile	Sun Jan 25 05:46:25 2015	(r277689)
@@ -17,7 +17,6 @@ FILES=	DAEMON \
 	bgfsck \
 	${_bluetooth} \
 	bridge \
-	${_bsnmpd} \
 	${_bthidd} \
 	${_casperd} \
 	cleanvar \
@@ -162,6 +161,10 @@ FILES+=		bootparams
 _bsnmpd=	bsnmpd
 .endif
 
+.if ${MK_BSNMP} != "no"
+FILES+=		bsnmpd
+.endif
+
 .if ${MK_CASPER} != "no"
 _casperd=	casperd
 .endif
@@ -208,8 +211,8 @@ FILES+=		ipfw
 .endif
 
 .if ${MK_ISCSI} != "no"
-FILES+=	iscsictl
-FILES+=	iscsid
+FILES+=		iscsictl
+FILES+=		iscsid
 .endif
 
 .if ${MK_JAIL} != "no"

Modified: projects/building-blocks/lib/libproc/proc_sym.c
==============================================================================
--- projects/building-blocks/lib/libproc/proc_sym.c	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/lib/libproc/proc_sym.c	Sun Jan 25 05:46:25 2015	(r277689)
@@ -335,8 +335,8 @@ proc_addr2sym(struct proc_handle *p, uin
 		goto out;
 
 	error = lookup_addr(e, symtabscn, symtabstridx, off, addr, &s, symcopy);
-	if (error == 0)
-		goto out;
+	if (error != 0)
+		goto err2;
 
 out:
 	demangle(s, name, namesz);

Modified: projects/building-blocks/lib/libproc/tests/proc_test.c
==============================================================================
--- projects/building-blocks/lib/libproc/tests/proc_test.c	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/lib/libproc/tests/proc_test.c	Sun Jan 25 05:46:25 2015	(r277689)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2014 Mark Johnston <markj@FreeBSD.org>
+ * Copyright (c) 2014, 2015 Mark Johnston <markj@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -295,6 +295,43 @@ ATF_TC_BODY(symbol_lookup, tc)
 	proc_free(phdl);
 }
 
+ATF_TC(symbol_lookup_fail);
+ATF_TC_HEAD(symbol_lookup_fail, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Verify that proc_addr2sym() returns an error when given an offset "
+	    "that it cannot resolve.");
+}
+ATF_TC_BODY(symbol_lookup_fail, tc)
+{
+	char symname[32];
+	GElf_Sym sym;
+	struct proc_handle *phdl;
+	prmap_t *map;
+	int error;
+
+	phdl = start_prog(tc, false);
+
+	/* Initialize the rtld_db handle. */
+	(void)proc_rdagent(phdl);
+
+	map = proc_obj2map(phdl, target_prog_file);
+	ATF_REQUIRE_MSG(map != NULL, "failed to look up map for '%s'",
+	    target_prog_file);
+
+	/*
+	 * We shouldn't be able to find symbols at the beginning of a mapped
+	 * file.
+	 */
+	error = proc_addr2sym(phdl, map->pr_vaddr, symname, sizeof(symname),
+	    &sym);
+	ATF_REQUIRE_MSG(error != 0, "unexpectedly found a symbol");
+
+	ATF_CHECK_EQ_MSG(proc_continue(phdl), 0, "failed to resume execution");
+
+	proc_free(phdl);
+}
+
 ATF_TC(signal_forward);
 ATF_TC_HEAD(signal_forward, tc)
 {
@@ -343,6 +380,7 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, map_alias_name2map);
 	ATF_TP_ADD_TC(tp, map_alias_name2sym);
 	ATF_TP_ADD_TC(tp, symbol_lookup);
+	ATF_TP_ADD_TC(tp, symbol_lookup_fail);
 	ATF_TP_ADD_TC(tp, signal_forward);
 
 	return (atf_no_error());

Modified: projects/building-blocks/lib/libutil/gr_util.c
==============================================================================
--- projects/building-blocks/lib/libutil/gr_util.c	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/lib/libutil/gr_util.c	Sun Jan 25 05:46:25 2015	(r277689)
@@ -351,8 +351,6 @@ gr_fini(void)
 int
 gr_equal(const struct group *gr1, const struct group *gr2)
 {
-	int gr1_ndx;
-	int gr2_ndx;
 
 	/* Check that the non-member information is the same. */
 	if (gr1->gr_name == NULL || gr2->gr_name == NULL) {
@@ -368,7 +366,8 @@ gr_equal(const struct group *gr1, const 
 	if (gr1->gr_gid != gr2->gr_gid)
 		return (false);
 
-	/* Check all members in both groups.
+	/*
+	 * Check all members in both groups.
 	 * getgrnam can return gr_mem with a pointer to NULL.
 	 * gr_dup and gr_add strip out this superfluous NULL, setting
 	 * gr_mem to NULL for no members.
@@ -376,22 +375,18 @@ gr_equal(const struct group *gr1, const 
 	if (gr1->gr_mem != NULL && gr2->gr_mem != NULL) {
 		int i;
 
-		for (i = 0; gr1->gr_mem[i] != NULL; i++) {
+		for (i = 0;
+		    gr1->gr_mem[i] != NULL && gr2->gr_mem[i] != NULL; i++) {
 			if (strcmp(gr1->gr_mem[i], gr2->gr_mem[i]) != 0)
 				return (false);
 		}
-	}
-	/* Count number of members in both structs */
-	gr2_ndx = 0;
-	if (gr2->gr_mem != NULL)
-		for(; gr2->gr_mem[gr2_ndx] != NULL; gr2_ndx++)
-			/* empty */;
-	gr1_ndx = 0;
-	if (gr1->gr_mem != NULL)
-		for(; gr1->gr_mem[gr1_ndx] != NULL; gr1_ndx++)
-			/* empty */;
-	if (gr1_ndx != gr2_ndx)
+		if (gr1->gr_mem[i] != NULL || gr2->gr_mem[i] != NULL)
+			return (false);
+	} else if (gr1->gr_mem != NULL && gr1->gr_mem[0] != NULL) {
 		return (false);
+	} else if (gr2->gr_mem != NULL && gr2->gr_mem[0] != NULL) {
+		return (false);
+	}
 
 	return (true);
 }

Modified: projects/building-blocks/sbin/Makefile
==============================================================================
--- projects/building-blocks/sbin/Makefile	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/sbin/Makefile	Sun Jan 25 05:46:25 2015	(r277689)
@@ -121,6 +121,10 @@ SUBDIR+=	spppcontrol
 SUBDIR+=	ping6
 SUBDIR+=	rtsol
 .endif
+	
+.if ${MK_ISCSI} != "no"
+SUBDIR+=	iscontrol
+.endif
 
 .if ${MK_QUOTAS} != "no"
 SUBDIR+=	quotacheck

Modified: projects/building-blocks/share/man/man5/src.conf.5
==============================================================================
--- projects/building-blocks/share/man/man5/src.conf.5	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/share/man/man5/src.conf.5	Sun Jan 25 05:46:25 2015	(r277689)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd January 7, 2015
+.Dd January 24, 2015
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -142,6 +142,12 @@ Set to not build Bluetooth related kerne
 .It Va WITHOUT_BOOT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru
 Set to not build the boot blocks and loader.
+.It Va WITHOUT_BSDINSTALL
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BSDINSTALL 277677 2015-01-25 04:43:13Z ngie
+Set to not build
+.Xr bsdinstall 8 ,
+.Xr sade 8 ,
+and related programs.
 .It Va WITHOUT_BSD_CPIO
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BSD_CPIO 179813 2008-06-16 05:48:15Z dougb
 Set to not build the BSD licensed version of cpio based on
@@ -179,6 +185,11 @@ Set to not build Capsicum support into s
 .It Va WITHOUT_CASPER
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CASPER 258838 2013-12-02 08:21:28Z pjd
 Set to not build Casper program and related libraries.
+.It Va WITHOUT_CCD
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CCD 277678 2015-01-25 04:52:48Z ngie
+Set to not build
+.Xr geom_ccd 4
+and related utilities.
 .It Va WITHOUT_CDDL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb
 Set to not build code licensed under Sun's CDDL.
@@ -218,13 +229,13 @@ unless an alternative compiler is provid
 XCC.
 .Pp
 It is a default setting on
-arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITH_CLANG_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to build the Clang C/C++ compiler during the bootstrap phase of the build.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
+amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
 .It Va WITH_CLANG_EXTRAS
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim
 Set to build additional clang and llvm tools, such as bugpoint.
@@ -380,6 +391,12 @@ dynamically.
 Set to build
 .Xr ed 1
 without support for encryption/decryption.
+.It Va WITHOUT_EE
+.\" from FreeBSD: head/tools/build/options/WITHOUT_EE 277663 2015-01-25 00:03:44Z ngie
+Set to not build and install
+.Xr edit 1 ,
+.Xr ee 1 ,
+and related programs.
 .It Va WITH_EISA
 .\" from FreeBSD: head/tools/build/options/WITH_EISA 264654 2014-04-18 16:53:06Z imp
 Set to build EISA kernel modules.
@@ -593,6 +610,11 @@ Set to not build IP Filter package.
 .It Va WITHOUT_IPFW
 .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFW 183242 2008-09-21 22:02:26Z sam
 Set to not build IPFW tools.
+.It Va WITHOUT_ISCSI
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ISCSI 277675 2015-01-25 04:20:11Z ngie
+Set to not build
+.Xr iscid 8
+and related utilities.
 .It Va WITHOUT_JAIL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_JAIL 249966 2013-04-27 04:09:09Z eadler
 Set to not build tools for the support of jails; e.g.,
@@ -1035,6 +1057,12 @@ support files such as keyboard maps, fon
 Set to not build
 .Xr sysinstall 8
 and related programs.
+.It Va WITHOUT_TALK
+.\" from FreeBSD: head/tools/build/options/WITHOUT_TALK 277676 2015-01-25 04:37:44Z ngie
+Set to not build or install
+.Xr talk 1
+and
+.Xr talkd 8 .
 .It Va WITHOUT_TCSH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru
 Set to not build and install

Modified: projects/building-blocks/share/man/man9/Makefile
==============================================================================
--- projects/building-blocks/share/man/man9/Makefile	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/share/man/man9/Makefile	Sun Jan 25 05:46:25 2015	(r277689)
@@ -254,7 +254,6 @@ MAN=	accept_filter.9 \
 	sleep.9 \
 	sleepqueue.9 \
 	socket.9 \
-	spl.9 \
 	stack.9 \
 	store.9 \
 	style.9 \
@@ -1448,18 +1447,6 @@ MLINKS+=socket.9 soabort.9 \
 	socket.9 soupcall_clear.9 \
 	socket.9 soupcall_set.9 \
 	socket.9 sowakeup.9
-MLINKS+=spl.9 spl0.9 \
-	spl.9 splbio.9 \
-	spl.9 splclock.9 \
-	spl.9 splhigh.9 \
-	spl.9 splimp.9 \
-	spl.9 splnet.9 \
-	spl.9 splsoftclock.9 \
-	spl.9 splsofttty.9 \
-	spl.9 splstatclock.9 \
-	spl.9 spltty.9 \
-	spl.9 splvm.9 \
-	spl.9 splx.9
 MLINKS+=stack.9 stack_copy.9 \
 	stack.9 stack_create.9 \
 	stack.9 stack_destroy.9 \

Modified: projects/building-blocks/share/man/man9/SYSCALL_MODULE.9
==============================================================================
--- projects/building-blocks/share/man/man9/SYSCALL_MODULE.9	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/share/man/man9/SYSCALL_MODULE.9	Sun Jan 25 05:46:25 2015	(r277689)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 7, 2005
+.Dd January 24, 2015
 .Dt SYSCALL_MODULE 9
 .Os
 .Sh NAME
@@ -46,8 +46,8 @@ The
 .Fn SYSCALL_MODULE
 macro declares a new syscall.
 .Fn SYSCALL_MODULE
-expands into a kernel module declaration named as
-.Fa name .
+expands into a kernel module declaration with name
+.Ql sys/ Ns Fa name .
 .Pp
 The rest of the arguments expected by this macro are:
 .Bl -tag -width ".Fa new_sysent"

Modified: projects/building-blocks/sys/conf/kern.opts.mk
==============================================================================
--- projects/building-blocks/sys/conf/kern.opts.mk	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/sys/conf/kern.opts.mk	Sun Jan 25 05:46:25 2015	(r277689)
@@ -29,12 +29,14 @@ __DEFAULT_YES_OPTIONS = \
     CCD \
     CDDL \
     CRYPT \
+    CUSE \
     FORMAT_EXTENSIONS \
     HYPERV \
     ISCSI \
     INET \
     INET6 \
     IPFILTER \
+    ISCSI \
     KERNEL_SYMBOLS \
     NETGRAPH \
     NFS_SERVER \

Modified: projects/building-blocks/sys/modules/Makefile
==============================================================================
--- projects/building-blocks/sys/modules/Makefile	Sun Jan 25 05:37:06 2015	(r277688)
+++ projects/building-blocks/sys/modules/Makefile	Sun Jan 25 05:46:25 2015	(r277689)
@@ -86,7 +86,6 @@ SUBDIR=	\
 	${_ct} \
 	${_ctau} \
 	ctl \
-	cuse \
 	${_cxgb} \
 	${_cxgbe} \
 	dc \
@@ -396,6 +395,10 @@ _random=	random
 .endif
 .endif
 
+.if ${MK_CUSE} != "no" || defined(ALL_MODULES)
+SUBDIR+=	cuse
+.endif
+
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501250546.t0P5kQqO048841>