From owner-p4-projects@FreeBSD.ORG Sun Jul 25 07:16:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32D8D16A4D0; Sun, 25 Jul 2004 07:16:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01CF116A4CE for ; Sun, 25 Jul 2004 07:16:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA0FD43D1D for ; Sun, 25 Jul 2004 07:16:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6P7GjRQ024982 for ; Sun, 25 Jul 2004 07:16:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6P7GjM4024979 for perforce@freebsd.org; Sun, 25 Jul 2004 07:16:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 25 Jul 2004 07:16:45 GMT Message-Id: <200407250716.i6P7GjM4024979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 58109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2004 07:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=58109 Change 58109 by marcel@marcel_nfs on 2004/07/25 07:16:27 IFC @58107 Affected files ... .. //depot/projects/gdb/Makefile#9 integrate .. //depot/projects/gdb/UPDATING#23 integrate .. //depot/projects/gdb/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/gdb/etc/rc#5 integrate .. //depot/projects/gdb/etc/rc.d/localpkg#2 integrate .. //depot/projects/gdb/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/gdb/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#10 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/gdb/include/string.h#2 integrate .. //depot/projects/gdb/include/strings.h#3 integrate .. //depot/projects/gdb/include/wchar.h#6 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#11 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#13 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#18 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#23 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#16 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/gdb/lib/libc/gen/ftw.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/wcsnrtombs.c#2 integrate .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#7 integrate .. //depot/projects/gdb/sbin/init/init.8#6 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/gdb/sbin/vinum/commands.c#5 integrate .. //depot/projects/gdb/share/dict/freebsd#4 integrate .. //depot/projects/gdb/share/man/man4/Makefile#15 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/snc.4#1 branch .. //depot/projects/gdb/share/man/man4/pccbb.4#2 integrate .. //depot/projects/gdb/share/man/man4/snc.4#2 delete .. //depot/projects/gdb/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/gdb/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/gdb/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/gdb/sys/arm/include/pcb.h#3 integrate .. //depot/projects/gdb/sys/arm/include/pmap.h#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#37 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#12 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#22 integrate .. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/gdb/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_panasonic.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_event.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_lock.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_prot.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_switch.c#8 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#21 integrate .. //depot/projects/gdb/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/gdb/sys/kern/sys_socket.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/gdb/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/gdb/sys/net/bpf.c#9 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#11 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/gdb/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#19 integrate .. //depot/projects/gdb/sys/powerpc/include/db_machdep.h#4 integrate .. //depot/projects/gdb/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/locore.S#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#8 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/trap_subr.S#4 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/gdb/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/gdb/sys/sys/cdefs.h#4 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#16 integrate .. //depot/projects/gdb/sys/sys/param.h#21 integrate .. //depot/projects/gdb/sys/sys/proc.h#23 integrate .. //depot/projects/gdb/sys/vm/swap_pager.c#9 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#13 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#14 integrate .. //depot/projects/gdb/sys/vm/vm_map.h#7 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_object.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#14 integrate .. //depot/projects/gdb/tools/regression/pipe/pipe-reverse.c#1 branch .. //depot/projects/gdb/tools/regression/pipe/pipe-wraparound.c#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/gdb/usr.bin/hexdump/Makefile#4 integrate .. //depot/projects/gdb/usr.bin/hexdump/display.c#3 integrate .. //depot/projects/gdb/usr.bin/hexdump/odsyntax.c#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/parse.c#2 integrate .. //depot/projects/gdb/usr.bin/locate/locate/locate.1#4 integrate .. //depot/projects/gdb/usr.bin/make/parse.c#6 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#12 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#25 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#13 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/gdb/usr.bin/tar/fts.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/matching.c#7 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#12 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#7 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#14 integrate .. //depot/projects/gdb/usr.bin/tr/tr.1#5 integrate .. //depot/projects/gdb/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/gdb/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/arlib/Makefile#2 delete .. //depot/projects/gdb/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ntp/ntpq/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pwd_mkdb/pwd_mkdb.8#3 integrate .. //depot/projects/gdb/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#5 integrate Differences ... ==== //depot/projects/gdb/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.304 2004/07/18 18:55:31 markm Exp $ +# $FreeBSD: src/Makefile,v 1.305 2004/07/23 21:21:34 kensmith Exp $ # # The user-driven targets are: # @@ -186,7 +186,7 @@ @echo "WARNING: make world will overwrite your existing FreeBSD" @echo "installation without also building and installing a new" @echo "kernel. This can be dangerous. Please read the handbook," - @echo "'Using make world', for how to upgrade your system." + @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." @echo "You may get the historical 'make world' behavior by defining" ==== //depot/projects/gdb/UPDATING#23 (text+ko) ==== @@ -17,6 +17,19 @@ developers choose to disable these features on build machines to maximize performance. +20040724: + The rc.d/loclpkg script now "does the right thing" with respect + to ports rc.d scripts. The most disruptive change is that scripts + ending in *.sh are sourced in the same shell as rc.d/localpkg (as + opposed to a subshell) and may cause the script to end prematurely + if a script calls exit. Some broken scripts may not recognize the + 'fast' prefix to a command. The first problem can be fixed by simply + renaming the script so that it doesn't have a '.sh' ending. Another + temporary work-arround is to completely remove the 'PROVIDE' line + from the script. If you notice a broken ports rc.d script please + notify the maintainer. Legacy scripts should not be affected. + __FreeBSD_version bumped to 502124. + 20040716: The sound device drivers are renamed. `sound' is always required, while `snd_*' should be configured accordingly to your hardware. @@ -44,7 +57,7 @@ been renamed to WITNESS_KDB, KDB_TRACE and KDB_UNATTENDED respectively. This is in line with the first bullet. o The remote GDB support has been untangled from DDB and needs - to be enabled seperately now. Use the GDB option for this. + to be enabled separately now. Use the GDB option for this. o The GDB_REMOTE_CHAT option has been removed. Support for this homegrown feature is discontinued. The GDB remote protocol supports console output and it makes sense to use that. @@ -58,9 +71,9 @@ 20040702: The native preemption has been added to the kernel scheduler. - There is some report that ULE scheduler was broken in some - machines and we encourage users using ULE scheduler either - stick with an known good kernel, or temporary switch to 4BSD + There is some report that the ULE scheduler was broken in some + machines and we encourage users using the ULE scheduler either + stick with a known good kernel, or temporarily switch to the 4BSD scheduler as a workaround. 20040630: @@ -77,14 +90,14 @@ 20040630: ACPI has been updated to disable known-bad BIOS revisions. A message - will be printed on console indicating that ACPI has been disabled + will be printed on the console indicating that ACPI has been disabled automatically and that the user should use a newer BIOS, if possible. If you think ACPI does work on your system and want to override this (i.e., for testing), set hint.acpi.0.disabled="0" at the loader prompt. 20040623: - pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge + pf was updated to OpenBSD-stable 3.5 and pflogd(8) is privilege separated now. It uses the newly created "_pflogd" user/group combination. If you plan to use pflogd(8) make sure to run mergemaster -p or install the "_pflogd" user and group manually. @@ -225,7 +238,7 @@ 20040224: The tcpcb structure has changed and makes a recompile of libkvm - and related userland network utilities neccessary. + and related userland network utilities necessary. 20040222: The cdevsw structure has changed in two externally visible ways. @@ -335,7 +348,7 @@ 20030928: Changes to the cdevsw default functions have been made to remove the need to specify nullopen() and nullclose() explicitly. - __FreeBSD_version bumpted to 501110. + __FreeBSD_version bumped to 501110. 20030926: kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and @@ -686,7 +699,7 @@ sys/i4b/driver/i4b_ispppsubr.c has been retired. This file started out its life in the ISDN4BSD project as an offspring from sys/net/if_spppsubr.c, which eventually got a life of its - own. All the accumulated features and bugfixes of the i4b + own. All the accumulated features and bug fixes of the i4b version have now been merged back into the base system's version now. The only user-visible change resulting from this is that i4b's sppp(4) interfaces are to be managed with @@ -1719,4 +1732,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.326 2004/07/16 04:04:29 tanimura Exp $ +$FreeBSD: src/UPDATING,v 1.328 2004/07/24 14:56:20 mtm Exp $ ==== //depot/projects/gdb/contrib/ntp/util/ntp-keygen.c#2 (text+ko) ==== @@ -159,7 +159,9 @@ extern char *optarg; /* command line argument */ int debug = 0; /* debug, not de bug */ int rval; /* return status */ +#ifdef OPENSSL u_int modulus = PLEN; /* prime modulus size (bits) */ +#endif int nkeys = 0; /* MV keys */ time_t epoch; /* Unix epoch (seconds) since 1970 */ char *hostname; /* host name (subject name) */ @@ -221,7 +223,9 @@ EVP_PKEY *pkey_iff = NULL; /* IFF parameters */ EVP_PKEY *pkey_gq = NULL; /* GQ parameters */ EVP_PKEY *pkey_mv = NULL; /* MV parameters */ +#endif int md5key = 0; /* generate MD5 keys */ +#ifdef OPENSSL int hostkey = 0; /* generate RSA keys */ int iffkey = 0; /* generate IFF parameters */ int gqpar = 0; /* generate GQ parameters */ @@ -231,7 +235,6 @@ char *sign = NULL; /* sign key */ EVP_PKEY *pkey = NULL; /* temp key */ const EVP_MD *ectx; /* EVP digest */ - char hostbuf[MAXHOSTNAME + 1]; char pathbuf[MAXFILENAME + 1]; const char *scheme = NULL; /* digest/signature scheme */ char *exten = NULL; /* private extension */ @@ -240,6 +243,7 @@ FILE *fstr = NULL; /* file handle */ int iffsw = 0; /* IFF key switch */ #endif /* OPENSSL */ + char hostbuf[MAXHOSTNAME + 1]; u_int temp; #ifdef SYS_WINNT @@ -267,8 +271,10 @@ */ gethostname(hostbuf, MAXHOSTNAME); hostname = hostbuf; +#ifdef OPENSSL trustname = hostbuf; passwd1 = hostbuf; +#endif #ifndef SYS_WINNT gettimeofday(&tv, 0); #else @@ -277,15 +283,22 @@ epoch = tv.tv_sec; rval = 0; while ((temp = getopt(argc, argv, - "c:deGgHIi:Mm:nPp:q:S:s:TV:v:")) != -1) { +#ifdef OPENSSL + "c:deGgHIi:Mm:nPp:q:S:s:TV:v:" +#else + "dM" +#endif + )) != -1) { switch(temp) { +#ifdef OPENSSL /* * -c select public certificate type */ case 'c': scheme = optarg; continue; +#endif /* * -d debug @@ -294,47 +307,59 @@ debug++; continue; +#ifdef OPENSSL /* * -e write identity keys */ case 'e': iffsw++; continue; +#endif +#ifdef OPENSSL /* * -G generate GQ parameters and keys */ case 'G': gqpar++; continue; +#endif +#ifdef OPENSSL /* * -g update GQ keys */ case 'g': gqkey++; continue; +#endif +#ifdef OPENSSL /* * -H generate host key (RSA) */ case 'H': hostkey++; continue; +#endif +#ifdef OPENSSL /* * -I generate IFF parameters */ case 'I': iffkey++; continue; +#endif +#ifdef OPENSSL /* * -i set issuer name */ case 'i': trustname = optarg; continue; +#endif /* * -M generate MD5 keys @@ -343,7 +368,7 @@ md5key++; continue; - +#ifdef OPENSSL /* * -m select modulus (256-2048) */ @@ -352,49 +377,63 @@ fprintf(stderr, "invalid option -m %s\n", optarg); continue; - +#endif + +#ifdef OPENSSL /* * -P generate PC private certificate */ case 'P': exten = EXT_KEY_PRIVATE; continue; +#endif +#ifdef OPENSSL /* * -p output private key password */ case 'p': passwd2 = optarg; continue; +#endif +#ifdef OPENSSL /* * -q input private key password */ case 'q': passwd1 = optarg; continue; +#endif +#ifdef OPENSSL /* * -S generate sign key (RSA or DSA) */ case 'S': sign = optarg; continue; +#endif +#ifdef OPENSSL /* * -s set subject name */ case 's': hostname = optarg; continue; - +#endif + +#ifdef OPENSSL /* * -T trusted certificate (TC scheme) */ case 'T': exten = EXT_KEY_TRUST; continue; +#endif +#ifdef OPENSSL /* * -V generate MV parameters */ @@ -404,7 +443,9 @@ fprintf(stderr, "invalid option -V %s\n", optarg); continue; +#endif +#ifdef OPENSSL /* * -v update MV keys */ @@ -414,6 +455,7 @@ fprintf(stderr, "invalid option -v %s\n", optarg); continue; +#endif /* * None of the above. @@ -446,6 +488,7 @@ fprintf(stderr, "Random seed file %s %u bytes\n", pathbuf, temp); RAND_add(&epoch, sizeof(epoch), 4.0); +#endif /* * Generate new parameters and keys as requested. These replace @@ -453,6 +496,7 @@ */ if (md5key) gen_md5("MD5"); +#ifdef OPENSSL if (hostkey) pkey_host = genkey("RSA", "host"); if (sign != NULL) @@ -714,7 +758,7 @@ } md5key[j] = (u_char)temp; } - md5key[16] = '\0'; + md5key[15] = '\0'; fprintf(str, "%2d MD5 %16s # MD5 key\n", i, md5key); } @@ -1245,7 +1289,7 @@ char *id /* file name id */ ) { - EVP_PKEY *pkey; /* private key */ + EVP_PKEY *pkey, *pkey1; /* private key */ DSA *dsa; /* DSA parameters */ DSA *sdsa; /* DSA parameters */ BN_CTX *ctx; /* BN working space */ @@ -1284,7 +1328,7 @@ modulus / n); ctx = BN_CTX_new(); u = BN_new(); v = BN_new(); w = BN_new(); b = BN_new(); b1 = BN_new(); - dsa = malloc(sizeof(DSA)); + dsa = DSA_new(); dsa->p = BN_new(); dsa->q = BN_new(); dsa->g = BN_new(); @@ -1589,7 +1633,7 @@ * the designated recipient(s) who pay a suitably outrageous fee * for its use. */ - sdsa = malloc(sizeof(DSA)); + sdsa = DSA_new(); sdsa->p = BN_dup(dsa->p); sdsa->q = BN_dup(BN_value_one()); sdsa->g = BN_dup(BN_value_one()); @@ -1622,15 +1666,16 @@ */ sprintf(ident, "MVkey%d", j); str = fheader(ident, trustname); - pkey = EVP_PKEY_new(); - EVP_PKEY_assign_DSA(pkey, sdsa); - PEM_write_PrivateKey(str, pkey, passwd2 ? + pkey1 = EVP_PKEY_new(); + EVP_PKEY_set1_DSA(pkey1, sdsa); + PEM_write_PrivateKey(str, pkey1, passwd2 ? EVP_des_cbc() : NULL, NULL, 0, NULL, passwd2); fclose(str); fprintf(stderr, "ntpkey_%s_%s.%lu\n", ident, trustname, epoch + JAN_1970); if (debug) DSA_print_fp(stdout, sdsa, 0); + EVP_PKEY_free(pkey1); } /* @@ -1643,7 +1688,7 @@ BN_free(u); BN_free(v); BN_free(w); BN_CTX_free(ctx); BN_free(b); BN_free(b1); BN_free(biga); BN_free(bige); BN_free(ss); BN_free(gbar); BN_free(ghat); - DSA_free(dsa); DSA_free(sdsa); + DSA_free(sdsa); /* * Free the world. @@ -1883,7 +1928,6 @@ break; } } -#endif /* OPENSSL */ /* @@ -1907,6 +1951,7 @@ rval = -1; return (NULL); } +#endif /* OPENSSL */ /* ==== //depot/projects/gdb/etc/rc#5 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.332 2004/06/06 18:06:09 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.333 2004/07/24 16:30:31 mtm Exp $ # # System startup script run by init on autoboot @@ -53,7 +53,7 @@ . /etc/rc.subr # Note: the system configuration files are loaded as part of -# the RCNG system (rc.d/rccond). Do not load them here as it may +# the RCNG system (rc.d/rcconf.sh). Do not load them here as it may # interfere with diskless booting. # if [ "$1" = autoboot ]; then ==== //depot/projects/gdb/etc/rc.d/localpkg#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.1 2003/08/06 00:35:13 mtm Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.2 2004/07/24 14:56:20 mtm Exp $ # # PROVIDE: localpkg @@ -11,31 +11,120 @@ . /etc/rc.subr name="localpkg" -start_cmd="pkg_start" -stop_cmd="pkg_stop" +_arg1="$1" + +# script_is_rcd script +# Checks that script is an rc.d style script. +# Returns 0 if it is, otherwise, it returns 1. +# +script_is_rcd() +{ + local _s match + _s="$1" + + [ -z "$_s" ] && return 1 + match=`grep -c -m1 '^# PROVIDE:' "$_s" 2> /dev/null` + [ "$match" = "1" ] && return 0 + return 1 +} + +# cooked_scriptlist type +# Uses values from rc.conf(5) to prepare a list of scripts to +# execute. It assumes the global variable script_name_sep and IFS are set +# properly. If type is set to the string "rcd" the list will contain only +# rc.d style scripts and they will be ordered according to thier +# dependencies. If it is set to "rcOG" then it will contain +# only old style ports startup scripts. The list is echoed on stdout. +# +cooked_scriptlist() +{ + local _type slist fpattern skip + + slist="" + _type="$1" + case "$_type" in + rcd) + fpattern="*" + ;; + rcOG) + fpattern="*.sh" + ;; + *) + return + ;; + esac + for dir in ${local_startup}; do + if [ -d "${dir}" ]; then + for script in ${dir}/${fpattern}; do + + # Weed out scripts that don't belong in the + # category that we are preparing. + # + if [ "$_type" = "rcd" ]; then + case "$script" in + *.sample|*-dist) + continue;; + esac + script_is_rcd "$script" || continue + else + script_is_rcd "$script" && continue + fi + + slist="${slist}${script_name_sep}${script}" + done + fi + done + + # If this is an rc.d list put the scripts in the right order. + # + if [ "$_type" = "rcd" ]; then + skip="-s nostart" + [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && \ + skip="$skip -s nojail" + + # Some scripts do not define a FreeBSD keyword, so we can't + # specify it in a keep list. + slist=`/sbin/rcorder ${skip} ${slist} 2>/dev/null` + + # Substitute the newlines used by rcorder(8) with the + # script separator. + slist=`echo $slist | /usr/bin/tr "\n" "$script_name_sep"` + fi + + echo -n $slist +} pkg_start() { - # For each dir in $local_startup, search for init scripts matching *.sh - # + local slist + case ${local_startup} in [Nn][Oo] | '') ;; *) - echo -n 'Local package initialization:' slist="" if [ -z "${script_name_sep}" ]; then script_name_sep=" " fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi + + # Do rc.d style scripts. + # + script_save_sep="$IFS" + IFS="${script_name_sep}" + slist=`cooked_scriptlist rcd` + debug "localpkg rc.d scripts: $slist" + for script in ${slist}; do + run_rc_script "$script" "$_arg1" done + IFS="${script_save_sep}" + + # Do old-style ports startup scripts. + # + echo -n 'Local package initialization:' script_save_sep="$IFS" IFS="${script_name_sep}" + slist=`cooked_scriptlist rcOG` + debug "localpkg rcOG scripts: $slist" for script in ${slist}; do if [ -x "${script}" ]; then (set -T @@ -53,26 +142,24 @@ pkg_stop() { - echo -n 'Shutting down daemon processes:' + local slist # For each dir in $local_startup, search for init scripts matching *.sh case ${local_startup} in [Nn][Oo] | '') ;; *) - slist="" if [ -z "${script_name_sep}" ]; then script_name_sep=" " fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done + + # Do old-style scripts + # script_save_sep="$IFS" IFS="${script_name_sep}" + slist=`cooked_scriptlist rcOG` + debug "localpkg rcOG scripts: $slist" + echo -n 'Shutting down local packages:' for script in `reverse_list ${slist}`; do if [ -x "${script}" ]; then (set -T @@ -82,9 +169,35 @@ done IFS="${script_save_sep}" echo '.' + + # Do rc.d style scripts + # + script_save_sep="$IFS" + IFS="${script_name_sep}" + slist=`cooked_scriptlist rcd` + debug "localpkg rc.d scripts: $slist" + for script in `reverse_list ${slist}`; do + run_rc_script "$script" $_arg1 + done ;; esac } load_rc_config $name -run_rc_command "$1" + +# We can't use the normal rc.subr(8) start/stop plumbing +# because we call run_rc_script(), which unsets all the +# global variables that said plumbing needs. +# +case "$1" in +start|faststart) + pkg_start + ;; +stop|faststop) + pkg_stop + ;; +restart|fastrestart) + pkg_stop + pkg_start + ;; +esac ==== //depot/projects/gdb/games/fortune/strfile/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.5 2003/12/07 17:34:52 des Exp $ +# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.6 2004/07/23 11:36:35 le Exp $ PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 -WARNS?= 2 +WARNS?= 3 .include ==== //depot/projects/gdb/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.25 2003/12/07 17:35:41 des Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.26 2004/07/23 11:36:35 le Exp $"); # include # include @@ -146,13 +146,12 @@ * CHUNKSIZE blocks; if the latter, we just write each pointer, * and then seek back to the beginning to write in the table. */ -int main(ac, av) -int ac; -char **av; +int main(int ac, char *av[]) { char *sp, dc; FILE *inf, *outf; - long last_off, length, pos, *p; + long last_off, pos, *p; + unsigned long length; int first, cnt; char *nsp; STR *fp; ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.8 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.9 2004/07/25 05:32:50 marcel Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/Makefile#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 (text+ko) ==== ==== //depot/projects/gdb/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ + * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ */ #ifndef _STRING_H_ @@ -58,21 +58,21 @@ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif -void *memchr(const void *, int, size_t); -int memcmp(const void *, const void *, size_t); +void *memchr(const void *, int, size_t) __pure; +int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); void *memmove(void *, const void *, size_t); void *memset(void *, int, size_t); #if __BSD_VISIBLE char *stpcpy(char *, const char *); -char *strcasestr(const char *, const char *); +char *strcasestr(const char *, const char *) __pure; #endif char *strcat(char * __restrict, const char * __restrict); -char *strchr(const char *, int); -int strcmp(const char *, const char *); +char *strchr(const char *, int) __pure; +int strcmp(const char *, const char *) __pure; int strcoll(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); -size_t strcspn(const char *, const char *); +size_t strcspn(const char *, const char *) __pure; #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE char *strdup(const char *); #endif @@ -84,24 +84,24 @@ size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); #endif -size_t strlen(const char *); +size_t strlen(const char *) __pure; #if __BSD_VISIBLE void strmode(int, char *); #endif char *strncat(char * __restrict, const char * __restrict, size_t); -int strncmp(const char *, const char *, size_t); +int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -char *strnstr(const char *, const char *, size_t); +char *strnstr(const char *, const char *, size_t) __pure; #endif -char *strpbrk(const char *, const char *); -char *strrchr(const char *, int); +char *strpbrk(const char *, const char *) __pure; +char *strrchr(const char *, int) __pure; #if __BSD_VISIBLE char *strsep(char **, const char *); char *strsignal(int); #endif -size_t strspn(const char *, const char *); -char *strstr(const char *, const char *); +size_t strspn(const char *, const char *) __pure; +char *strstr(const char *, const char *) __pure; char *strtok(char * __restrict, const char * __restrict); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 char *strtok_r(char *, const char *, char **); ==== //depot/projects/gdb/include/strings.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/strings.h,v 1.5 2004/07/09 13:52:42 des Exp $ + * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $ */ #ifndef _STRINGS_H_ @@ -38,19 +38,19 @@ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<<