Date: Sun, 2 Feb 2003 02:10:26 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24559 for review Message-ID: <200302021010.h12AAQit002320@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24559 Change 24559 by marcel@marcel_nfs on 2003/02/02 02:10:06 IFC @24557 Affected files ... .. //depot/projects/ia64/contrib/gcc/gcc.1#4 integrate .. //depot/projects/ia64/etc/MAKEDEV#16 delete .. //depot/projects/ia64/etc/MAKEDEV.local#3 delete .. //depot/projects/ia64/etc/Makefile#21 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#12 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#8 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#13 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#23 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#13 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#19 integrate .. //depot/projects/ia64/sbin/newfs/newfs.h#10 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#13 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#11 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#3 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#3 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#4 integrate .. //depot/projects/ia64/share/man/man4/mac.4#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#19 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#16 integrate .. //depot/projects/ia64/sys/boot/ia64/Makefile.inc#4 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#6 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/libski.h#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.s#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#2 integrate .. //depot/projects/ia64/sys/conf/files.ia64#32 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#13 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#13 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#22 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#22 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#30 integrate .. //depot/projects/ia64/sys/dev/zs/zs_macio.c#1 branch .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#14 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#30 integrate .. //depot/projects/ia64/sys/i386/i386/critical.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#8 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#8 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#24 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/autoconf.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#26 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#60 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pal.s#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/pal_stub.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#53 integrate .. //depot/projects/ia64/sys/ia64/ia64/sal.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/ski.c#5 delete .. //depot/projects/ia64/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/swtch.s#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#40 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/ia64/sys/ia64/include/sal.h#3 integrate .. //depot/projects/ia64/sys/kern/init_main.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#9 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#27 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#22 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#26 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#6 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#14 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#6 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/ia64/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/openpic.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#20 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#17 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#28 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#18 integrate .. //depot/projects/ia64/sys/sys/buf.h#14 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#4 integrate .. //depot/projects/ia64/sys/sys/lockmgr.h#8 integrate .. //depot/projects/ia64/sys/sys/proc.h#46 integrate .. //depot/projects/ia64/sys/sys/resourcevar.h#8 integrate .. //depot/projects/ia64/sys/sys/systm.h#23 integrate .. //depot/projects/ia64/sys/sys/vmmeter.h#3 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#37 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#28 integrate .. //depot/projects/ia64/tools/tools/README#9 integrate .. //depot/projects/ia64/tools/tools/backout_commit/backout_commit.rb#1 branch .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#6 integrate .. //depot/projects/ia64/usr.sbin/config/SMM.doc/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/pkg_install/sign/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#4 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/gcc.1#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.17 2002/11/27 03:36:49 obrien Exp $ +.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.18 2003/02/01 18:39:32 imp Exp $ .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" @@ -543,11 +543,6 @@ .BI "\-pthread" Link a user-threaded process against libc_r instead of libc. Objects linked into user-threaded processes should be compiled with -D_THREAD_SAFE. -.TP -.BI "\-kthread" -Link a kernel-threaded process against libpthread in addition to libc. -Objects linked into kernel-threaded processes should be compiled with --D_THREAD_SAFE. .SH OVERALL OPTIONS .TP .BI "\-x " "language" ==== //depot/projects/ia64/etc/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.302 2003/01/09 04:05:05 imp Exp $ +# $FreeBSD: src/etc/Makefile,v 1.303 2003/02/01 22:22:06 phk Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -95,13 +95,6 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif -.if defined(MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \ - MAKEDEV.local MAKEDEV ${DESTDIR}/dev -.if defined(MAKEDEV_RUN) - cd ${DESTDIR}/dev; sh MAKEDEV all -.endif -.endif cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ==== //depot/projects/ia64/lib/libfetch/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.38 2003/01/28 23:02:28 markm Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.39 2003/01/31 23:26:55 markm Exp $ LIB= fetch CFLAGS+= -I. @@ -10,7 +10,7 @@ CLEANFILES= ftperr.h httperr.h .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -CFLAGS+= -DWITH_SSL -DOPENSSL_NO_KRB5 +CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto WARNS?= 2 ==== //depot/projects/ia64/release/scripts/doFS.sh#8 (text+ko) ==== @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.42 2002/11/04 00:50:01 marcel Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.43 2003/02/01 22:12:50 phk Exp $ # -set -e +set -ex export BLOCKSIZE=512 @@ -26,16 +26,16 @@ # so we have to specifically specify -r when we don't have -B. # disklabel fails otherwise. # -if [ -f "${RD}/trees/base/boot/boot1" ]; then +if [ -f "${RD}/trees/base/boot/boot" ]; then + BOOT1="-B -b ${RD}/trees/base/boot/boot" +elif [ -f "${RD}/trees/base/boot/boot1" ]; then BOOT1="-B -b ${RD}/trees/base/boot/boot1" + if [ -f "${RD}/trees/base/boot/boot2" ]; then + BOOT2="-s ${RD}/trees/base/boot/boot2" + fi else BOOT1="-r" fi -if [ -f "${RD}/trees/base/boot/boot2" ]; then - BOOT2="-s ${RD}/trees/base/boot/boot2" -else - BOOT2="" -fi deadlock=20 @@ -107,12 +107,8 @@ MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}` if [ ! -c /dev/${MDDEVICE} ] ; then - if [ -f /dev/MAKEDEV ] ; then - ( cd /dev && sh MAKEDEV ${MDDEVICE} ) - else - echo "No /dev/$MDDEVICE and no MAKEDEV" 1>&2 - exit 1 - fi + echo "No /dev/$MDDEVICE" 1>&2 + exit 1 fi disklabel -w ${BOOT1} ${BOOT2} ${MDDEVICE} ${FSLABEL} newfs -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c ==== //depot/projects/ia64/sbin/dumpfs/dumpfs.c#13 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.34 2003/01/24 00:07:40 njl Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.35 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -237,6 +237,9 @@ if (fsflags != 0) printf("unknown flags (%#x)", fsflags); putchar('\n'); + printf("fsmnt\t%s\n", afs.fs_fsmnt); + printf("volname\t%s\tswuid\t%qu\n", + afs.fs_volname, afs.fs_swuid); printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t"); afs.fs_csp = calloc(1, afs.fs_cssize); if (bread(&disk, fsbtodb(&afs, afs.fs_csaddr), afs.fs_csp, afs.fs_cssize) == -1) ==== //depot/projects/ia64/sbin/newfs/mkfs.c#23 (text+ko) ==== @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.69 2003/01/29 22:52:27 jmallett Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.70 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ #include <err.h> @@ -140,6 +140,8 @@ sblock.fs_flags = 0; if (Uflag) sblock.fs_flags |= FS_DOSOFTDEP; + if (Lflag) + strlcpy(sblock.fs_volname, volumelabel, MAXVOLLEN); /* * Validate the given file system size. * Verify that its last block can actually be accessed. ==== //depot/projects/ia64/sbin/newfs/newfs.8#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 -.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.56 2002/08/27 00:49:23 trhodes Exp $ +.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.57 2003/02/01 04:17:09 gordon Exp $ .\" .Dd May 18, 2002 .Dt NEWFS 8 @@ -40,6 +40,7 @@ .Nd construct a new file system .Sh SYNOPSIS .Nm +.Op Fl L Ar volname .Op Fl NU .Op Fl O Ar filesystem-type .Op Fl S Ar sector-size @@ -82,6 +83,8 @@ .Bl -tag -width indent .It Fl T Ar disktype For backward compatibility. +.It Fl L Ar volname +Add a volume label to the new file system. .It Fl N Cause the file system parameters to be printed out without really creating the file system. ==== //depot/projects/ia64/sbin/newfs/newfs.c#19 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/newfs.c,v 1.68 2003/01/29 22:52:27 jmallett Exp $"; + "$FreeBSD: src/sbin/newfs/newfs.c,v 1.69 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ /* @@ -117,6 +117,7 @@ */ #define NFPI 4 +int Lflag; /* add a volume label */ int Nflag; /* run without writing file system */ int Oflag = 1; /* file system format (1 => UFS1, 2 => UFS2) */ int Rflag; /* regression test */ @@ -136,6 +137,7 @@ int avgfilesize = AVFILESIZ;/* expected average file size */ int avgfilesperdir = AFPDIR;/* expected number of files per directory */ int fso; /* filedescriptor to device */ +u_char *volumelabel = NULL; /* volume label for filesystem */ static char device[MAXPATHLEN]; static char *disktype; @@ -153,12 +155,25 @@ struct partition oldpartition; struct stat st; char *cp, *special; - int ch; + int ch, i; off_t mediasize; while ((ch = getopt(argc, argv, - "NO:RS:T:Ua:b:c:d:e:f:g:h:i:m:o:s:")) != -1) + "L:NO:RS:T:Ua:b:c:d:e:f:g:h:i:m:o:s:")) != -1) switch (ch) { + case 'L': + volumelabel = optarg; + i = -1; + while (isalnum(volumelabel[++i])); + if (volumelabel[i] != '\0') { + errx(1, "bad volume label. Valid characters are alphanumerics."); + } + if (strlen(volumelabel) >= MAXVOLLEN) { + errx(1, "bad volume label. Length is longer than %d.", + MAXVOLLEN); + } + Lflag = 1; + break; case 'N': Nflag = 1; break; @@ -390,6 +405,7 @@ getprogname(), " [device-type]"); fprintf(stderr, "where fsoptions are:\n"); + fprintf(stderr, "\t-L volume label to add to superblock\n"); fprintf(stderr, "\t-N do not create file system, just print out parameters\n"); fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n"); ==== //depot/projects/ia64/sbin/newfs/newfs.h#10 (text+ko) ==== @@ -42,13 +42,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/newfs/newfs.h,v 1.10 2003/01/29 22:52:27 jmallett Exp $ + * $FreeBSD: src/sbin/newfs/newfs.h,v 1.11 2003/02/01 04:17:09 gordon Exp $ */ /* * variables set up by front end. */ +extern int Lflag; /* add a volume label */ extern int Nflag; /* run mkfs without writing file system */ extern int Oflag; /* build UFS1 format file system */ extern int Rflag; /* regression test */ @@ -68,5 +69,6 @@ extern int avgfilesize; /* expected average file size */ extern int avgfilesperdir; /* expected number of files per directory */ extern int fso; /* filedescriptor to device */ +extern u_char *volumelabel; /* volume label for filesystem */ void mkfs (struct partition *, char *); ==== //depot/projects/ia64/sbin/tunefs/tunefs.8#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.29 2002/10/15 15:30:55 rwatson Exp $ +.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.30 2003/02/01 04:17:10 gordon Exp $ .\" .Dd May 18, 2002 .Dt TUNEFS 8 @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl A +.Op Fl L Ar volname .Op Fl a Cm enable | disable .Op Fl e Ar maxbpg .Op Fl f Ar avgfilesize @@ -71,6 +72,8 @@ this option will cause all backups to be modified as well as the primary super-block. This is potentially dangerous - use with caution. +.It Fl L Ar volname +Add/modify an optional file system volume label. .It Fl a Cm enable | disable Turn on/off the administrative ACL enable flag. .It Fl e Ar maxbpg ==== //depot/projects/ia64/sbin/tunefs/tunefs.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.36 2003/01/28 02:42:01 jmallett Exp $"; + "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.37 2003/02/01 04:17:10 gordon Exp $"; #endif /* not lint */ /* @@ -57,6 +57,7 @@ #include <ufs/ufs/dinode.h> #include <ufs/ffs/fs.h> +#include <ctype.h> #include <err.h> #include <fcntl.h> #include <fstab.h> @@ -81,26 +82,42 @@ { const char *special, *on; const char *name; - int Aflag = 0, active = 0, aflag = 0; + int Aflag = 0, Lflag = 0, active = 0, aflag = 0; int eflag = 0, fflag = 0, lflag = 0, mflag = 0; int nflag = 0, oflag = 0, pflag = 0, sflag = 0; int evalue = 0, fvalue = 0; int mvalue = 0, ovalue = 0, svalue = 0; - char *avalue = NULL, *lvalue = NULL, *nvalue = NULL; + char *Lvalue = NULL, *avalue = NULL, *lvalue = NULL, *nvalue = NULL; const char *chg[2]; struct ufs_args args; struct statfs stfs; - int found_arg, ch; + int found_arg, ch, i; if (argc < 3) usage(); found_arg = 0; /* at least one arg is required */ - while ((ch = getopt(argc, argv, "Aa:e:f:l:m:n:o:ps:")) != -1) + while ((ch = getopt(argc, argv, "AL:a:e:f:l:m:n:o:ps:")) != -1) switch (ch) { case 'A': found_arg = 1; Aflag++; break; + case 'L': + found_arg = 1; + name = "volume label"; + Lvalue = optarg; + i = -1; + while (isalnum(Lvalue[++i])); + if (Lvalue[i] != '\0') { + errx(10, "bad %s. Valid characters are alphanumerics.", + name); + } + if (strlen(Lvalue) >= MAXVOLLEN) { + errx(10, "bad %s. Length is longer than %d.", + name, MAXVOLLEN - 1); + } + Lflag = 1; + break; case 'a': found_arg = 1; name = "ACLs"; @@ -204,6 +221,10 @@ printfs(); exit(0); } + if (Lflag) { + name = "volume label"; + strlcpy(sblock.fs_volname, Lvalue, MAXVOLLEN); + } if (aflag) { name = "ACLs"; if (strcmp(avalue, "enable") == 0) { @@ -354,10 +375,11 @@ void usage(void) { - fprintf(stderr, "%s\n%s\n%s\n", -"usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize]", -" [-l enable | disable] [-m minfree] [-n enable | disable]", -" [-o space | time] [-p] [-s avgfpdir] special | filesystem"); + fprintf(stderr, "%s\n%s\n%s\n%s\n", +"usage: tunefs [-A] [-L volname] [-a enable | disable] [-e maxbpg]", +" [-f avgfilesize] [-l enable | disable] [-m minfree]", +" [-n enable | disable] [-o space | time] [-p]", +" [-s avgfpdir] special | filesystem"); exit(2); } @@ -386,4 +408,6 @@ if (sblock.fs_minfree < MINFREE && sblock.fs_optim == FS_OPTTIME) warnx(OPTWARN, "space", "<", MINFREE); + warnx("volume label: (-L) %s", + sblock.fs_volname); } ==== //depot/projects/ia64/share/examples/cvsup/cvs-supfile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.34 2002/07/30 14:08:16 blackend Exp $ +# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.35 2003/02/01 17:16:59 schweikh Exp $ # # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. @@ -100,11 +100,15 @@ ports-all # These are the individual collections that make up "ports-all". If you -# use these, be sure to comment out "ports-all" above. +# use these, be sure to comment out "ports-all" above and always include +# "ports-base" if you use any of the other individual collections below. +# Your ports may not build correctly without an up-to-date "ports-base". +# +#ports-base +# #ports-archivers #ports-astro #ports-audio -#ports-base #ports-benchmarks #ports-biology #ports-cad @@ -116,12 +120,14 @@ #ports-devel #ports-editors #ports-emulators +#ports-finance #ports-french #ports-ftp #ports-games #ports-german #ports-graphics #ports-hebrew +#ports-hungarian #ports-irc #ports-japanese #ports-java @@ -131,10 +137,12 @@ #ports-math #ports-mbone #ports-misc +#ports-multimedia #ports-net #ports-news #ports-palm #ports-picobsd +#ports-portuguese #ports-print #ports-russian #ports-science ==== //depot/projects/ia64/share/examples/cvsup/refuse#3 (text+ko) ==== @@ -16,8 +16,10 @@ ports/french ports/german ports/hebrew +ports/hungarian ports/japanese ports/korean +ports/portuguese ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/examples/cvsup/refuse.README#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.6 2003/01/06 21:56:10 trhodes Exp $ +$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.7 2003/02/01 17:01:45 schweikh Exp $ This describes the "refuse" file found in this directory. The explanation cannot be put inside the file itself because: @@ -42,8 +42,10 @@ ports/french ports/german ports/hebrew + ports/hungarian ports/japanese ports/korean + ports/portuguese ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/man/man4/mac.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.3 2003/01/20 21:07:11 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.6 2003/02/01 23:11:57 chris Exp $ .Dd JANUARY 8, 2003 .Os .Dt MAC 4 @@ -48,8 +48,8 @@ .Pp Currently, the following MAC policy modules are shipped with .Fx : -.Bl -column ".Xr mac_seeotheruids 4" "low-watermark mac policy" ".Em Labeling" "boot only" -.It Em Name Ta Em Description Ta Em Labeling Ta Em "Load time" +.Bl -column ".Xr mac_seeotheruids 4" "low-watermark mac policy " ".Em Labeling" "boot only" +.It Sy Name Ta Sy Description Ta Sy Labeling Ta Sy "Load time" .It Xr mac_biba 4 Ta "Biba integrity policy" Ta yes Ta boot only .It Xr mac_bsdextended 4 Ta "File system firewall" Ta no Ta any time .It Xr mac_ifoff 4 Ta "Interface silencing" Ta no Ta any time @@ -72,11 +72,64 @@ More information on the format for MAC labels can be found in the .Xr maclabel 7 man page. -.Ss Setting MAC labels +.Ss Policy Enforcement +MAC can be configured to enforce only specific portions of +policies +(see +.Sx "Runtime Configuration" ) . +Policy enforcement is divided into the following areas of the system: +.Bl -ohang +.It Sy File System +File system mounts, modifying directories, modifying files, etc. +.It Sy KLD +Loading, unloading, and retrieving statistics on loaded kernel modules +.It Sy Network +Network interfaces, +.Xr bpf 4 +.It Sy Pipes +Creation of and operation on +.Xr pipe 2 +objects +.It Sy Processes +Debugging +(e.g. +.Xr ktrace 2 ) , +process visibility +.Xr ( ps 1 ) , +process execution +.Xr ( execve 2 ) , +signalling +.Xr ( kill 2 ) +.It Sy Sockets +Creation and operation on +.Xr socket 2 +objects +.It Sy System +Kernel environment +.Xr ( kenv 1 ) , +system accounting +.Xr ( acct 2 ) , +.Xr reboot 2 , +.Xr settimeofday 2 , +.Xr swapon 2 , +.Xr sysctl 3 , +.Sm off +.Xr nfsd 8 - +related +.Sm on +operations +.It Sy VM +.Sm off +.Xr mmap 2 - +ed +.Sm on +files +.El +.Ss Setting MAC Labels From the command line, each type of system object has its own means for setting and modifying its MAC policy label. -.Bl -column "user login process" "Xr login.conf 5" -offset indent -.It Em "Subject/Object" Ta Em "Utility" +.Bl -column "user (by login class)" "Xr login.conf 5" -offset indent +.It Sy "Subject/Object" Ta Sy "Utility" .It "File system object" Ta Xr setfmac 8 .It "Network interface" Ta Xr ifconfig 8 .It "TTY (by login class)" Ta Xr login.conf 5 @@ -98,6 +151,53 @@ is documented in the .Xr mac 3 man page. +.Ss Runtime Configuration +The following +.Xr sysctl 8 +MIBs are available for fine-tuning the enforcement of MAC policies. +Unless specifically noted, all MIBs default to +.Li 1 +(that is, all areas are enforced by default): +.Bl -tag -width "security.mac.mmap_revocation" +.It Va security.mac.enforce_fs +Enforce MAC policies for file system accesses +.It Va security.mac.enforce_kld +Enforce MAC policies on +.Xr kld 4 +.It Va security.mac.enforce_network +Enforce MAC policies on network interfaces +.It Va security.mac.enforce_pipe +Enforce MAC policies on pipes +.It Va security.mac.enforce_process +Enforce MAC policies between system processes +(e.g. +.Xr ps 1 , +.Xr ktrace 2 ) +.It Va security.mac.enforce_socket +Enforce MAC policies on sockets +.It Va security.mac.enforce_system +Enforce MAC policies on system-related items +(e.g. +.Xr kenv 1 , +.Xr acct 2 , +.Xr reboot 2 ) +.It Va security.mac.enforce_vm +Enforce MAC policies on +.Xr mmap 2 +and +.Xr mprotect 2 +.It Va security.mac.mmap_revocation +Revoke +.Xr mmap 2 +access to files on subject relabel +.It Va security.mac.mmap_revocation_via_cow +Revoke +.Xr mmap 2 +access to files via copy-on-write semantics; +mapped regions will still appear writable, but will no longer +effect a change on the underlying vnode +(Default: 0) +.El .Sh SEE ALSO .Xr mac 3 , .Xr mac_biba 4 , ==== //depot/projects/ia64/sys/alpha/alpha/interrupt.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.70 2003/01/27 00:00:06 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.71 2003/02/01 12:17:05 julian Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -479,7 +479,7 @@ mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) - statclock_process(curthread, TRAPF_PC(framep), + statclock_process(curkse, TRAPF_PC(framep), TRAPF_USERMODE(framep)); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/ia64/sys/alpha/alpha/trap.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.103 2003/01/26 11:41:32 davidxu Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.104 2003/02/01 12:17:05 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -296,7 +296,7 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + sticks = td->td_kse->ke_sticks; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -666,7 +666,7 @@ cnt.v_syscall++; td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + sticks = td->td_kse->ke_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_KSES) ==== //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.80 2003/01/26 11:41:33 davidxu Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.81 2003/02/01 12:17:05 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -309,7 +309,7 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, struct kse *ke) { /* XXX */ ==== //depot/projects/ia64/sys/boot/ia64/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.1 2002/04/06 04:33:53 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.2 2003/02/01 22:50:08 marcel Exp $ # Options used when building standalone components -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -fshort-wchar -Wformat ==== //depot/projects/ia64/sys/boot/ia64/libski/Makefile#7 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.8 2002/05/13 11:09:06 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.9 2003/02/01 22:50:08 marcel Exp $ LIB= ski INTERNALLIB= true SRCS= skiconsole.c time.c copy.c devicename.c module.c exit.c SRCS+= delay.c skifs.c elf_freebsd.c bootinfo.c ssc.c +SRCS+= acpi_stub.c efi_stub.c pal_stub.s sal_stub.c CFLAGS+= -ffreestanding -fpic -g CFLAGS+= -I${.CURDIR}/../include ==== //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.7 2003/02/01 22:50:08 marcel Exp $ */ #include <stand.h> @@ -34,8 +34,6 @@ #include <machine/elf.h> #include <machine/bootinfo.h> -#include <efi.h> - #include "bootstrap.h" /* @@ -60,6 +58,7 @@ }; extern char *ski_fmtdev(void *vdev); +extern int ski_init_stubs(struct bootinfo *); int bi_getboothowto(char *kargs) @@ -250,7 +249,6 @@ char *kernelname; vm_offset_t ssym, esym; struct file_metadata *md; - EFI_MEMORY_DESCRIPTOR *memp; /* * Version 1 bootinfo. @@ -320,25 +318,5 @@ /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - /* Describe the SKI memory map. */ - bi->bi_memmap = (u_int64_t)(bi + 1); - bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR); - bi->bi_memdesc_size = sizeof(EFI_MEMORY_DESCRIPTOR); - bi->bi_memdesc_version = 1; - - memp = (EFI_MEMORY_DESCRIPTOR *) bi->bi_memmap; - - memp[0].Type = EfiConventionalMemory; - memp[0].PhysicalStart = 2L*1024*1024; - memp[0].VirtualStart = 0; - memp[0].NumberOfPages = (64L*1024*1024)>>12; - memp[0].Attribute = EFI_MEMORY_WB; - - memp[1].Type = EfiMemoryMappedIOPortSpace; - memp[1].PhysicalStart = 0xffffc000000; - memp[1].VirtualStart = 0; - memp[1].NumberOfPages = (64L*1024*1024)>>12; - memp[1].Attribute = EFI_MEMORY_UC; - - return(0); + return (ski_init_stubs(bi)); } ==== //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.6 2002/05/19 04:42:18 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.7 2003/02/01 22:50:08 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -130,6 +130,8 @@ u_int64_t pte_ig :11; /* bits 53..63 */ }; +static struct bootinfo bootinfo; + void enter_kernel(const char* filename, u_int64_t start, struct bootinfo *bi) { @@ -167,7 +169,7 @@ * Ugly hack, similar to linux. Dump the bootinfo into a * special page reserved in the link map. */ - bi = (struct bootinfo *) 0x508000; + bi = &bootinfo; bzero(bi, sizeof(struct bootinfo)); bi_load(bi, fp); ==== //depot/projects/ia64/sys/boot/ia64/libski/libski.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/libski.h,v 1.3 2001/09/20 08:22:56 dfr Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/libski.h,v 1.4 2003/02/01 22:50:08 marcel Exp $ */ /* @@ -90,6 +90,7 @@ #define SSC_GET_RTC 65 #define SSC_EXIT 66 #define SSC_LOAD_SYMBOLS 69 +#define SSC_SAL_SET_VECTORS 120 u_int64_t ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which); ==== //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#2 (text+ko) ==== @@ -23,20 +23,30 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.1 2001/09/12 08:34:27 dfr Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.3 2003/02/01 22:50:08 marcel Exp $ */ #include <stand.h> #include "libski.h" +/* + * Ugh... Work around a bug in the Linux version of ski for SSC_GET_RTC. The + * PSR.dt register is not preserved properly and causes further memory + * references to be done without translation. All we need to do is preserve + * PSR.dt across the SSC call. We do this by saving and restoring psr.l >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302021010.h12AAQit002320>