PERFORCE change 110252 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue Nov 21 17:18:17 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=110252
Change 110252 by marcel at marcel_nfs on 2006/11/19 20:25:24
IFC @110251
Affected files ...
.. //depot/projects/ia64/share/man/man9/Makefile#64 integrate
.. //depot/projects/ia64/share/man/man9/cr_cansee.9#1 branch
.. //depot/projects/ia64/share/man/man9/p_candebug.9#4 integrate
.. //depot/projects/ia64/share/man/man9/p_cansee.9#1 branch
.. //depot/projects/ia64/share/mk/bsd.own.mk#17 integrate
.. //depot/projects/ia64/share/mk/bsd.port.mk#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/copy.c#5 integrate
.. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#4 integrate
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#1 branch
.. //depot/projects/ia64/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#1 branch
.. //depot/projects/ia64/usr.sbin/mountd/mountd.c#20 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/index.c#14 integrate
Differences ...
==== //depot/projects/ia64/share/man/man9/Makefile#64 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.284 2006/11/11 08:59:34 ru Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.285 2006/11/19 13:35:03 ceri Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -41,6 +41,7 @@
config_intrhook.9 \
contigmalloc.9 \
copy.9 \
+ cr_cansee.9 \
critical_enter.9 \
cr_seeothergids.9 \
cr_seeotheruids.9 \
@@ -157,6 +158,7 @@
panic.9 \
pbuf.9 \
p_candebug.9 \
+ p_cansee.9 \
pci.9 \
pfil.9 \
pfind.9 \
==== //depot/projects/ia64/share/man/man9/p_candebug.9#4 (text+ko) ====
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.4 2006/11/18 17:56:59 ceri Exp $
+.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.5 2006/11/19 13:36:04 ceri Exp $
.\"
-.Dd November 18, 2006
+.Dd November 19, 2006
.Os
.Dt P_CANDEBUG 9
.Sh NAME
@@ -129,10 +129,10 @@
The MAC subsystem denied debuggability.
.El
.Sh SEE ALSO
-.Xr intro 2 ,
.Xr jail 2 ,
.Xr sysctl 8 ,
.Xr cr_seeothergids 9 ,
.Xr cr_seeotheruids 9 ,
.Xr mac 9 ,
+.Xr p_cansee 9 ,
.Xr prison_check 9
==== //depot/projects/ia64/share/mk/bsd.own.mk#17 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.58 2006/11/01 09:02:10 jb Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.59 2006/11/19 16:28:52 ru Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -104,10 +104,12 @@
.if !target(__<bsd.own.mk>__)
__<bsd.own.mk>__:
+.if !defined(_WITHOUT_SRCCONF)
SRCCONF?= /etc/src.conf
.if exists(${SRCCONF})
.include "${SRCCONF}"
.endif
+.endif
# Binaries
BINOWN?= root
@@ -170,6 +172,7 @@
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
+.if !defined(_WITHOUT_SRCCONF)
#
# Define MK_* variables (which are either "yes" or "no") for users
# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
@@ -448,5 +451,6 @@
MK_${var}_SUPPORT:= yes
.endif
.endfor
+.endif # !_WITHOUT_SRCCONF
.endif # !target(__<bsd.own.mk>__)
==== //depot/projects/ia64/share/mk/bsd.port.mk#5 (text+ko) ====
@@ -1,10 +1,11 @@
-# $FreeBSD: src/share/mk/bsd.port.mk,v 1.308 2006/08/24 18:04:49 obrien Exp $
+# $FreeBSD: src/share/mk/bsd.port.mk,v 1.309 2006/11/19 16:28:52 ru Exp $
PORTSDIR?= /usr/ports
BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
-# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports.
-SRCCONF= /dev/null
+# Needed to keep bsd.own.mk from reading in /etc/src.conf
+# and setting MK_* variables when building ports.
+_WITHOUT_SRCCONF=
.include <bsd.own.mk>
.include "${BSDPORTMK}"
==== //depot/projects/ia64/sys/boot/ia64/common/copy.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ia64/common/copy.c,v 1.8 2006/11/05 22:03:03 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/copy.c,v 1.9 2006/11/19 20:04:11 marcel Exp $");
#include <stand.h>
#include <ia64/include/vmparam.h>
==== //depot/projects/ia64/sys/boot/ia64/common/libia64.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.1 2006/11/05 22:03:03 marcel Exp $
+ * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.2 2006/11/19 20:04:11 marcel Exp $
*/
#ifndef _LIBIA64_H_
@@ -45,9 +45,6 @@
* and shared by all loader implementations.
*/
-extern uint64_t *ia64_pgtbl;
-extern uint32_t ia64_pgtblsz;
-
extern int ia64_autoload(void);
extern ssize_t ia64_copyin(const void *, vm_offset_t, size_t);
==== //depot/projects/ia64/usr.sbin/mountd/mountd.c#20 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.90 2006/10/19 19:46:49 rink Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.91 2006/11/18 22:43:20 rodrigc Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -343,6 +343,7 @@
}
signal(SIGHUP, huphandler);
signal(SIGTERM, terminate);
+ signal(SIGPIPE, SIG_IGN);
pidfile_write(pfh);
==== //depot/projects/ia64/usr.sbin/sysinstall/index.c#14 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.107 2006/02/28 21:49:32 jhb Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.108 2006/11/19 08:12:54 kensmith Exp $
*/
#include <fcntl.h>
@@ -692,25 +692,6 @@
if (id->installed == 1)
return DITEM_SUCCESS;
- /*
- * Prompt user if the package is not available on the current volume.
- */
-
- if(mediaDevice->type == DEVICE_TYPE_CDROM) {
- while (id->volume != dev->volume) {
- if (!msgYesNo("This is disc #%d. Package %s is on disc #%d\n"
- "Would you like to switch discs now?\n", dev->volume,
- id->name, id->volume)) {
- DEVICE_SHUTDOWN(mediaDevice);
- msgConfirm("Please remove disc #%d from your drive, and add disc #%d\n",
- dev->volume, id->volume);
- DEVICE_INIT(mediaDevice);
- } else {
- return DITEM_FAILURE;
- }
- }
- }
-
if (id && id->deps && strlen(id->deps)) {
char t[2048 * 8], *cp, *cp2;
@@ -742,6 +723,21 @@
}
/* Done with the deps? Load the real m'coy */
if (DITEM_STATUS(status) == DITEM_SUCCESS) {
+ /* Prompt user if the package is not available on the current volume. */
+ if(mediaDevice->type == DEVICE_TYPE_CDROM) {
+ while (id->volume != dev->volume) {
+ if (!msgYesNo("This is disc #%d. Package %s is on disc #%d\n"
+ "Would you like to switch discs now?\n", dev->volume,
+ id->name, id->volume)) {
+ DEVICE_SHUTDOWN(mediaDevice);
+ msgConfirm("Please remove disc #%d from your drive, and add disc #%d\n",
+ dev->volume, id->volume);
+ DEVICE_INIT(mediaDevice);
+ } else {
+ return DITEM_FAILURE;
+ }
+ }
+ }
status = package_extract(dev, who->name, depended);
if (DITEM_STATUS(status) == DITEM_SUCCESS)
id->installed = 1;
More information about the p4-projects
mailing list