Date: Thu, 29 Sep 2005 00:27:04 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 84456 for review Message-ID: <200509290027.j8T0R4ur062831@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=84456 Change 84456 by soc-andrew@soc-andrew_serv on 2005/09/29 00:26:25 Catchup with Current Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#15 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#7 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.889 2005/09/07 04:34:11 marcel Exp $ +# $FreeBSD: src/release/Makefile,v 1.890 2005/09/28 12:39:00 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -655,8 +655,10 @@ -czf ${RD}/dists/ports/ports.tgz -C /usr ports @cp ${.CURDIR}/scripts/ports-install.sh ${RD}/dists/ports/install.sh @(cd ${RD}/dists/ports; \ - rm -f CHECKSUM.MD5; \ - md5 * > CHECKSUM.MD5) + rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + md5 * > .CHECKSUM.MD5; \ + sha256 * > CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5) @echo "ports distribution is finished." .endif touch ${.TARGET} @@ -687,7 +689,11 @@ fi && shift && shift ; \ done .endif - (cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5) + (cd ${RD}/dists/src; \ + rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + md5 * > .CHECKSUM.MD5; \ + sha256 * > CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5) @echo "src distribution is finished." .endif touch ${.TARGET} @@ -898,8 +904,10 @@ @cp ${RND}/${RELNOTES_LANG}/installation/${TARGET}/article.txt \ ${RD}/floppies/README.TXT @(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5) + @(cd ${RD}/floppies; sha256 README.TXT *.flp > CHECKSUM.SHA256) .else @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5) + @(cd ${RD}/floppies; sha256 *.flp > CHECKSUM.SHA256) .endif touch ${.TARGET} @@ -1078,8 +1086,9 @@ FreeBSD_LiveFS \ ${CD}/${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} .endif - @echo "Generating MD5 sums..." + @echo "Generating MD5 and SHA256 sums..." @(cd ${CD} && md5 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) + @(cd ${CD} && sha256 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256) touch ${.TARGET} .else @echo "Do not know how to create an ISO for ${TARGET_ARCH}." @@ -1147,8 +1156,10 @@ true; \ fi; \ ( cd ${RD}/dists/${TD}; \ - rm -f CHECKSUM.MD5; \ - md5 * > CHECKSUM.MD5 ) \ + rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + md5 * > .CHECKSUM.MD5; \ + sha256 * > CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5) \ ) doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \ ==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.59 2004/10/01 07:54:37 ru Exp $ +# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.60 2005/09/27 13:10:23 nyan Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -34,10 +34,8 @@ ln minigzip gunzip ln minigzip zcat -srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard +srcdirs /usr/src/usr.sbin progs arp -progs pccardc -progs pccardd progs ppp progs sysinstall ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/PICOBSD#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.17 2004/11/16 21:23:11 jhb Exp $ +# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.18 2005/09/27 18:10:43 mlaier Exp $ # # Line starting with #PicoBSD contains PicoBSD build parameters #marker def_sz init MFS_inodes floppy_inodes @@ -39,7 +39,7 @@ # Support for bridging and bandwidth limiting options DUMMYNET -options BRIDGE +device if_bridge options HZ=1000 #options NMBCLUSTERS=4096 ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/ns/ns.c#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/release/picobsd/tinyware/ns/ns.c,v 1.16 2002/03/27 20:10:53 abial Exp $ + * $FreeBSD: src/release/picobsd/tinyware/ns/ns.c,v 1.17 2005/09/27 18:10:43 mlaier Exp $ */ @@ -52,12 +52,6 @@ #include <netinet/udp.h> #include <netinet/udp_var.h> -#ifdef BRIDGING -#include <net/if_types.h> /* IFT_ETHER */ -#include <net/ethernet.h> -#include <net/bridge.h> -#endif - #include <err.h> #include <errno.h> #include <osreldate.h> @@ -80,11 +74,7 @@ usage() { fprintf(stderr, "\n%s [-nrsil] [-p proto] [-w wait]\n", progname); -#ifdef BRIDGING - fprintf(stderr, " proto: {ip|tcp|udp|icmp|bdg}\n\n"); -#else fprintf(stderr, " proto: {ip|tcp|udp|icmp}\n\n"); -#endif } @@ -720,19 +710,12 @@ print_udp_stats(); if (strcmp(proto, "tcp") == 0) print_tcp_stats(); -#ifdef BRIDGING - if (strcmp(proto, "bdg") == 0) - print_bdg_stats(); -#endif return (0); } print_ip_stats(); print_icmp_stats(); print_udp_stats(); print_tcp_stats(); -#ifdef BRIDGING - print_bdg_stats(); -#endif return (0); } @@ -844,42 +827,3 @@ X(0), X(1), X(2), X(3), X(4) ); bcopy(new_cp_time, cp_time, sizeof(cp_time)); } - -#ifdef BRIDGING -/* print bridge statistics */ -int -print_bdg_stats() -{ - int i; - int mib[4]; - int slen; - struct bdg_stats s; - - slen = sizeof(s); - - mib[0] = CTL_NET; - mib[1] = PF_LINK; - mib[2] = IFT_ETHER; - mib[3] = PF_BDG; - if (sysctl(mib, 4, &s, &slen, NULL, 0) == -1) { - return 0; /* no bridging */ - } - printf("-- Bridging statistics --\n"); - printf( - "Name In Out Forward Drop Bcast" - "Mcast Local Unknown\n"); - for (i = 0; i < 16; i++) { - if (s.s[i].name[0]) - printf("%-6s %9d%9d%9d%9d%9d%9d%9d%9d\n", - s.s[i].name, - s.s[i].p_in[(int)BDG_IN], - s.s[i].p_in[(int)BDG_OUT], - s.s[i].p_in[(int)BDG_FORWARD], - s.s[i].p_in[(int)BDG_DROP], - s.s[i].p_in[(int)BDG_BCAST], - s.s[i].p_in[(int)BDG_MCAST], - s.s[i].p_in[(int)BDG_LOCAL], - s.s[i].p_in[(int)BDG_UNKNOWN]); - } -} -#endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.336 2005/09/19 08:13:43 imura Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.337 2005/09/28 07:20:46 ru Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -92,9 +92,9 @@ mtest \ mtree \ ${_named} \ - ${_named.reload} \ ${_named-checkconf} \ ${_named-checkzone} \ + ${_named.reload} \ ${_ndiscvt} \ ndp \ newsyslog \ @@ -177,8 +177,8 @@ watch \ watchdogd \ wicontrol \ + ${_wlconfig} \ wpa \ - ${_wlconfig} \ ${_ypbind} \ ${_yp_mkdb} \ ${_yppoll} \ @@ -203,9 +203,9 @@ .endif .if !defined(NO_BIND_NAMED) _named= named -_named.reload= named.reload _named-checkconf= named-checkconf _named-checkzone= named-checkzone +_named.reload= named.reload _rndc= rndc _rndc-confgen= rndc-confgen .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509290027.j8T0R4ur062831>