Date: Mon, 5 Apr 2004 18:54:49 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50443 for review Message-ID: <200404060154.i361snjq074525@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50443 Change 50443 by marcel@marcel_nfs on 2004/04/05 18:54:15 IFC @50441 Affected files ... .. //depot/projects/gdb/bin/ps/ps.c#8 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#7 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#7 integrate .. //depot/projects/gdb/etc/rc.d/ipfw#3 integrate .. //depot/projects/gdb/etc/rc.d/natd#1 branch .. //depot/projects/gdb/etc/rc.d/sendmail#3 integrate .. //depot/projects/gdb/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#4 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_open_fd.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_fd.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/table.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/utf2.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/wcrtomb.c#2 integrate .. //depot/projects/gdb/lib/libc/net/name6.c#4 integrate .. //depot/projects/gdb/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/gdb/libexec/rshd/rshd.c#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/gdb/sbin/gconcat/gconcat.c#4 integrate .. //depot/projects/gdb/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/gdb/share/colldef/Makefile#4 integrate .. //depot/projects/gdb/share/man/man4/polling.4#4 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/gdb/share/monetdef/Makefile#5 integrate .. //depot/projects/gdb/share/msgdef/Makefile#4 integrate .. //depot/projects/gdb/share/numericdef/Makefile#4 integrate .. //depot/projects/gdb/share/timedef/Makefile#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/gdb/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/endian.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/float.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/limits.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/param.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/gdb/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/gdb/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/gdb/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/gdb/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/asm.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/gdb/sys/amd64/include/endian.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/exec.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/float.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/frame.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/limits.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/gdb/sys/amd64/include/proc.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/profile.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/psl.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/reg.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/segments.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/signal.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/trap.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/tss.h#2 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/gdb/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/gdb/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/gdb/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/gdb/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/gdb/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/gdb/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/gdb/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/gdb/sys/arm/include/_limits.h#2 integrate .. //depot/projects/gdb/sys/arm/include/limits.h#2 integrate .. //depot/projects/gdb/sys/arm/include/signal.h#2 integrate .. //depot/projects/gdb/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/gdb/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/gdb/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/gdb/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/gdb/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/gdb/sys/dev/fb/creator.c#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/gdb/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/gdb/sys/geom/geom_io.c#3 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#6 integrate .. //depot/projects/gdb/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/gdb/sys/i386/include/pmap.h#3 integrate .. //depot/projects/gdb/sys/i386/isa/cy.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/gdb/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/gdb/sys/isa/psm.c#4 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_clock.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_mib.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_proc.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_prot.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_resource.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_subr.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_time.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#7 integrate .. //depot/projects/gdb/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/gdb/sys/kern/subr_clock.c#2 integrate .. //depot/projects/gdb/sys/kern/subr_log.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/gdb/sys/kern/subr_param.c#5 integrate .. //depot/projects/gdb/sys/kern/subr_prf.c#4 integrate .. //depot/projects/gdb/sys/kern/subr_prof.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/gdb/sys/kern/sys_generic.c#5 integrate .. //depot/projects/gdb/sys/kern/sys_socket.c#3 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#5 integrate .. //depot/projects/gdb/sys/kern/syscalls.master#5 integrate .. //depot/projects/gdb/sys/kern/tty_compat.c#2 integrate .. //depot/projects/gdb/sys/kern/tty_conf.c#2 integrate .. //depot/projects/gdb/sys/kern/tty_cons.c#5 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#4 integrate .. //depot/projects/gdb/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#5 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/gdb/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/gdb/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/gdb/sys/kern/vfs_default.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_export.c#2 integrate .. //depot/projects/gdb/sys/kern/vfs_init.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/gdb/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/gdb/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/gdb/sys/kern/vnode_if.src#2 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_gif.c#3 integrate .. //depot/projects/gdb/sys/net/if_gif.h#2 integrate .. //depot/projects/gdb/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/gdb/sys/net/if_var.h#4 integrate .. //depot/projects/gdb/sys/net/route.h#2 integrate .. //depot/projects/gdb/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/gdb/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/gdb/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/gdb/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/gdb/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/gdb/sys/netinet/if_ether.c#4 integrate .. //depot/projects/gdb/sys/netinet/if_ether.h#2 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/gdb/sys/pci/agpreg.h#2 integrate .. //depot/projects/gdb/sys/pci/cy_pci.c#2 integrate .. //depot/projects/gdb/sys/pci/if_vr.c#3 integrate .. //depot/projects/gdb/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/gdb/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#5 integrate .. //depot/projects/gdb/sys/sparc64/creator/creator_upa.c#3 integrate .. //depot/projects/gdb/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/gdb/sys/sys/mount.h#4 integrate .. //depot/projects/gdb/sys/sys/syscall.h#5 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#5 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#5 integrate .. //depot/projects/gdb/sys/vm/pmap.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_init.c#2 integrate .. //depot/projects/gdb/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#4 integrate .. //depot/projects/gdb/sys/vm/vm_page.h#3 integrate .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/gdb/usr.bin/make/main.c#2 integrate .. //depot/projects/gdb/usr.bin/su/su.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/Makefile#1 branch .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#1 branch .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#1 branch .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#1 branch .. //depot/projects/gdb/usr.bin/tar/bsdtar_platform.h#1 branch .. //depot/projects/gdb/usr.bin/tar/matching.c#1 branch .. //depot/projects/gdb/usr.bin/tar/read.c#1 branch .. //depot/projects/gdb/usr.bin/tar/util.c#1 branch .. //depot/projects/gdb/usr.bin/tar/write.c#1 branch .. //depot/projects/gdb/usr.bin/window/lcmd2.c#2 integrate .. //depot/projects/gdb/usr.bin/ypwhich/ypwhich.c#2 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/diskinfo.c#3 integrate .. //depot/projects/gdb/usr.sbin/inetd/inetd.c#3 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/gdb/usr.sbin/raycontrol/raycontrol.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.statd/statd.c#2 integrate Differences ... ==== //depot/projects/gdb/bin/ps/ps.c#8 (text+ko) ==== @@ -51,7 +51,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.85 2004/04/04 04:41:51 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.87 2004/04/04 17:43:48 gad Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -70,7 +70,6 @@ #include <locale.h> #include <paths.h> #include <pwd.h> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -157,7 +156,7 @@ "%cpu,%mem,command"; static char Zfmt[] = "label"; -#define PS_ARGS "AaCc" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ" +#define PS_ARGS "AaCce" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ" int main(int argc, char *argv[]) ==== //depot/projects/gdb/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 (text+ko) ==== @@ -257,10 +257,15 @@ bio=BIO_new(BIO_s_null()); else { - ASN1_OCTET_STRING *os; - os = PKCS7_get_octet_string(p7->d.sign->contents); - if (os && os->length > 0) - bio = BIO_new_mem_buf(os->data, os->length); + if (PKCS7_type_is_signed(p7)) + { + ASN1_OCTET_STRING *os; + os = PKCS7_get_octet_string( + p7->d.sign->contents); + if (os && os->length > 0) + bio = BIO_new_mem_buf(os->data, + os->length); + } if(bio == NULL) { bio=BIO_new(BIO_s_mem()); ==== //depot/projects/gdb/etc/defaults/rc.conf#7 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.203 2004/04/02 19:25:27 mlaier Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.204 2004/04/05 16:22:14 fjoe Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -391,8 +391,10 @@ mta_start_script="/etc/rc.sendmail" # Script to start your chosen MTA, called by /etc/rc. -# Settings for /etc/rc.sendmail: +# Settings for /etc/rc.sendmail and /etc/rc.d/sendmail: sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO). +sendmail_pidfile="/var/run/sendmail.pid" # sendmail pid file +sendmail_procname="/usr/sbin/sendmail" # sendmail process name sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost" ==== //depot/projects/gdb/etc/rc.d/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.38 2004/04/02 19:25:27 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.39 2004/04/05 16:29:45 fjoe Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -21,7 +21,7 @@ ldconfig local localpkg lomac lpd \ mixer motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ - named netif netoptions \ + named natd netif netoptions \ network_ipv6 nfsclient nfsd \ nfslocking nfsserver nisdomain ntpd ntpdate \ othermta \ ==== //depot/projects/gdb/etc/rc.d/ipfw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.7 2004/04/05 16:29:45 fjoe Exp $ # # PROVIDE: ipfw @@ -37,31 +37,7 @@ if [ -r "${firewall_script}" ]; then . "${firewall_script}" echo -n 'Firewall rules loaded, starting divert daemons:' - - # Network Address Translation daemon - # - if checkyesno natd_enable; then - dhcp_list="`list_net_interfaces dhcp`" - for ifn in ${dhcp_list}; do - case ${natd_interface} in - ${ifn}) - natd_flags="$natd_flags -dynamic" - ;; - *) - ;; - esac - done - if [ -n "${natd_interface}" ]; then - if echo ${natd_interface} | \ - grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then - natd_flags="$natd_flags -a ${natd_interface}" - else - natd_flags="$natd_flags -n ${natd_interface}" - fi - fi - echo -n ' natd' - ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} - fi + /etc/rc.d/natd start elif [ "`ipfw l 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ' firewall rules are not enabled.' @@ -86,8 +62,7 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 - killall natd; - sleep 2; + /etc/rc.d/natd stop } load_rc_config $name ==== //depot/projects/gdb/etc/rc.d/sendmail#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sendmail,v 1.9 2004/01/17 10:59:43 mtm Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.10 2004/04/05 16:26:22 fjoe Exp $ # # PROVIDE: mail @@ -18,11 +18,12 @@ name="sendmail" rcvar=`set_rcvar` required_files="/etc/mail/${name}.cf" + +load_rc_config $name command=${sendmail_program:-/usr/sbin/sendmail} pidfile=${sendmail_pidfile:-/var/run/sendmail.pid} +procname=${sendmail_procname:-/usr/sbin/sendmail} -load_rc_config $name - case ${sendmail_enable} in [Nn][Oo][Nn][Ee]) sendmail_enable="NO" @@ -73,7 +74,7 @@ required_files= -if ! checkyesno sendmail_enable; then +if ! checkyesno sendmail_submit_enable; then name="sendmail_submit" rcvar=`set_rcvar` start_cmd="${command} ${sendmail_submit_flags}" ==== //depot/projects/gdb/gnu/usr.bin/send-pr/categories#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.15 2003/06/20 10:48:26 des Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.16 2004/04/05 23:06:16 ceri Exp $ advocacy alpha amd64 @@ -15,4 +15,5 @@ powerpc sparc64 standards +threads www ==== //depot/projects/gdb/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,13 +1,13 @@ # Makefile for libarchive. # -# $FreeBSD: src/lib/libarchive/Makefile,v 1.4 2004/03/19 22:37:06 kientzle Exp $ - +# $FreeBSD: src/lib/libarchive/Makefile,v 1.5 2004/04/05 21:12:29 kientzle Exp $ +DEBUG_FLAGS=-g LIB= archive SHLIB_MAJOR= 1 # I'm not yet ready for a shared version of this library, as -# there are still a couple of API changes still in the works. -NOSHLIBS= 1 +# there are a couple of API changes still in the works. +NOPIC= 1 SRCS= archive_check_magic.c \ archive_entry.c \ @@ -15,6 +15,7 @@ archive_read_data_into_buffer.c \ archive_read_data_into_fd.c \ archive_read_extract.c \ + archive_read_open_fd.c \ archive_read_open_file.c \ archive_read_support_compression_all.c \ archive_read_support_compression_bzip2.c \ @@ -28,6 +29,7 @@ archive_string_sprintf.c \ archive_util.c \ archive_write.c \ + archive_write_open_fd.c \ archive_write_open_file.c \ archive_write_set_compression_bzip2.c \ archive_write_set_compression_gzip.c \ @@ -80,8 +82,8 @@ MLINKS += archive_read.3 archive_read_new.3 MLINKS += archive_read.3 archive_read_next_header.3 MLINKS += archive_read.3 archive_read_open.3 +MLINKS += archive_read.3 archive_read_open_fd.3 MLINKS += archive_read.3 archive_read_open_file.3 -MLINKS += archive_read.3 archive_read_open_tar.3 MLINKS += archive_read.3 archive_read_set_bytes_per_block.3 MLINKS += archive_read.3 archive_read_support_compression_all.3 MLINKS += archive_read.3 archive_read_support_compression_bzip2.3 @@ -102,6 +104,7 @@ MLINKS += archive_write.3 archive_write_header.3 MLINKS += archive_write.3 archive_write_new.3 MLINKS += archive_write.3 archive_write_open.3 +MLINKS += archive_write.3 archive_write_open_fd.3 MLINKS += archive_write.3 archive_write_open_file.3 MLINKS += archive_write.3 archive_write_prepare.3 MLINKS += archive_write.3 archive_write_set_bytes_per_block.3 @@ -120,7 +123,7 @@ CFLAGS+= -DHAVE_DMALLOC -I/usr/local/include LDFLAGS+= -L/usr/local/lib -ldmalloc .endif -CFLAGS+= -O3 +#CFLAGS+= -O3 WARNS?= 6 ==== //depot/projects/gdb/lib/libarchive/archive.h#5 (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/lib/libarchive/archive.h,v 1.5 2004/03/19 22:37:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.6 2004/04/05 21:12:29 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -149,6 +149,8 @@ */ int archive_read_open_file(struct archive *, const char *_file, size_t _block_size); +int archive_read_open_fd(struct archive *, int _fd, + size_t _block_size); /* Parses and returns next entry header. */ int archive_read_next_header(struct archive *, @@ -239,10 +241,8 @@ int archive_write_open(struct archive *, void *, archive_open_callback *, archive_write_callback *, archive_close_callback *); +int archive_write_open_fd(struct archive *, int _fd); int archive_write_open_file(struct archive *, const char *_file); -int archive_write_open_file_position(struct archive *, - const char *_filename, int64_t offset); -int archive_write_open_tar(struct archive *, const char *_file); /* * Note that the library will truncate writes beyond the size provided ==== //depot/projects/gdb/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -25,19 +25,25 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.3 2004/03/19 22:37:06 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.4 2004/04/05 21:12:29 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> #ifdef HAVE_DMALLOC #include <dmalloc.h> #endif +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <wchar.h> +#include "archive.h" #include "archive_entry.h" +#include "archive_private.h" + +#undef max +#define max(a, b) ((a)>(b)?(a):(b)) /* * Handle wide character (i.e., Unicode) and non-wide character @@ -52,20 +58,44 @@ wchar_t *aes_wcs_alloc; }; -void aes_clean(struct aes *); -void aes_copy(struct aes *dest, struct aes *src); -const char * aes_get_mbs(struct aes *); -const wchar_t * aes_get_wcs(struct aes *); -void aes_set_mbs(struct aes *, const char *mbs); -void aes_set_wcs(struct aes *, const wchar_t *wcs); -void aes_copy_wcs(struct aes *, const wchar_t *wcs); +struct ae_acl { + struct ae_acl *next; + int type; /* E.g., access or default */ + int tag; /* E.g., user/group/other/mask */ + int permset; /* r/w/x bits */ + int id; /* uid/gid for user/group */ + struct aes name; /* uname/gname */ +}; + +static void aes_clean(struct aes *); +static void aes_copy(struct aes *dest, struct aes *src); +static const char * aes_get_mbs(struct aes *); +static const wchar_t * aes_get_wcs(struct aes *); +static void aes_set_mbs(struct aes *, const char *mbs); +static void aes_copy_mbs(struct aes *, const char *mbs); +/* static void aes_set_wcs(struct aes *, const wchar_t *wcs); */ +static void aes_copy_wcs(struct aes *, const wchar_t *wcs); + +static void append_entry_w(wchar_t **wp, const wchar_t *prefix, int tag, + const wchar_t *wname, int perm, int id); +static void append_id_w(wchar_t **wp, int id); + +static int acl_special(struct archive_entry *entry, + int type, int permset, int tag); +static struct ae_acl *acl_new_entry(struct archive_entry *entry, + int type, int permset, int tag, int id); +static void next_field_w(const wchar_t **wp, const wchar_t **start, + const wchar_t **end, wchar_t *sep); +static int prefix_w(const wchar_t *start, const wchar_t *end, + const wchar_t *test); + /* * Description of an archive entry. * * Basically, this is a "struct stat" with a few text fields added in. * - * TODO: Add "comment", "charset", "acl", and possibly other entries + * TODO: Add "comment", "charset", and possibly other entries * that are supported by "pax interchange" format. However, GNU, ustar, * cpio, and other variants don't support these features, so they're not an * excruciatingly high priority right now. @@ -95,14 +125,17 @@ /* * Use aes here so that we get transparent mbs<->wcs conversions. */ - struct aes ae_acl; /* ACL text */ - struct aes ae_acl_default; /* default ACL */ struct aes ae_fflags; /* Text fflags per fflagstostr(3) */ struct aes ae_gname; /* Name of owning group */ struct aes ae_hardlink; /* Name of target for hardlink */ struct aes ae_pathname; /* Name of entry */ struct aes ae_symlink; /* symlink contents */ struct aes ae_uname; /* Name of owner */ + + struct ae_acl *acl_head; + struct ae_acl *acl_p; + int acl_state; /* See acl_next for details. */ + wchar_t *acl_text_w; }; void @@ -189,6 +222,24 @@ } void +aes_copy_mbs(struct aes *aes, const char *mbs) +{ + if (aes->aes_mbs_alloc) { + free(aes->aes_mbs_alloc); + aes->aes_mbs_alloc = NULL; + } + if (aes->aes_wcs_alloc) { + free(aes->aes_wcs_alloc); + aes->aes_wcs_alloc = NULL; + } + aes->aes_mbs_alloc = malloc((strlen(mbs) + 1) * sizeof(char)); + strcpy(aes->aes_mbs_alloc, mbs); + aes->aes_mbs = aes->aes_mbs_alloc; + aes->aes_wcs = NULL; +} + +#if 0 +void aes_set_wcs(struct aes *aes, const wchar_t *wcs) { if (aes->aes_mbs_alloc) { @@ -202,6 +253,7 @@ aes->aes_mbs = NULL; aes->aes_wcs = wcs; } +#endif void aes_copy_wcs(struct aes *aes, const wchar_t *wcs) @@ -223,14 +275,13 @@ struct archive_entry * archive_entry_clear(struct archive_entry *entry) { - aes_clean(&entry->ae_acl); - aes_clean(&entry->ae_acl_default); aes_clean(&entry->ae_fflags); aes_clean(&entry->ae_gname); aes_clean(&entry->ae_hardlink); aes_clean(&entry->ae_pathname); aes_clean(&entry->ae_symlink); aes_clean(&entry->ae_uname); + archive_entry_acl_clear(entry); memset(entry, 0, sizeof(*entry)); entry->ae_tartype = -1; return entry; @@ -243,11 +294,12 @@ /* Allocate new structure and copy over all of the fields. */ entry2 = malloc(sizeof(*entry2)); + if(entry2 == NULL) + return (NULL); + memset(entry2, 0, sizeof(*entry2)); entry2->ae_stat = entry->ae_stat; entry2->ae_tartype = entry->ae_tartype; - aes_copy(&entry2->ae_acl ,&entry->ae_acl); - aes_copy(&entry2->ae_acl_default ,&entry->ae_acl_default); aes_copy(&entry2->ae_fflags ,&entry->ae_fflags); aes_copy(&entry2->ae_gname ,&entry->ae_gname); aes_copy(&entry2->ae_hardlink ,&entry->ae_hardlink); @@ -282,19 +334,6 @@ * Functions for reading fields from an archive_entry. */ -const char * -archive_entry_acl(struct archive_entry *entry) -{ - return (aes_get_mbs(&entry->ae_acl)); -} - - -const char * -archive_entry_acl_default(struct archive_entry *entry) -{ - return (aes_get_mbs(&entry->ae_acl_default)); -} - dev_t archive_entry_devmajor(struct archive_entry *entry) { @@ -332,6 +371,20 @@ return (entry->ae_stat.st_mode); } + +time_t +archive_entry_mtime(struct archive_entry *entry) +{ + return (entry->ae_stat.st_mtime); +} + + +long +archive_entry_mtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.st_mtimespec.tv_nsec); +} + const char * archive_entry_pathname(struct archive_entry *entry) { @@ -389,30 +442,6 @@ } void -archive_entry_set_acl(struct archive_entry *entry, const char *acl) -{ - aes_set_mbs(&entry->ae_acl, acl); -} - -void -archive_entry_copy_acl_w(struct archive_entry *entry, const wchar_t *acl) -{ - aes_copy_wcs(&entry->ae_acl, acl); -} - -void -archive_entry_set_acl_default(struct archive_entry *entry, const char *acl) -{ - aes_set_mbs(&entry->ae_acl_default, acl); -} - -void -archive_entry_copy_acl_default_w(struct archive_entry *entry, const wchar_t *acl) -{ - aes_copy_wcs(&entry->ae_acl_default, acl); -} - -void archive_entry_set_devmajor(struct archive_entry *entry, dev_t m) { dev_t d; @@ -532,6 +561,622 @@ aes_copy_wcs(&entry->ae_uname, name); } +/* + * ACL management. The following would, of course, be a lot simpler + * if: 1) the last draft of POSIX.1e were a really thorough and + * complete standard that addressed the needs of ACL archiving and 2) + * everyone followed it faithfully. Alas, neither is true, so the + * following is a lot more complex than might seem necessary to the + * uninitiated. + */ + +void +archive_entry_acl_clear(struct archive_entry *entry) +{ + struct ae_acl *ap; + + while (entry->acl_head != NULL) { + ap = entry->acl_head->next; + aes_clean(&entry->acl_head->name); + free(entry->acl_head); + entry->acl_head = ap; + } + if (entry->acl_text_w != NULL) { + free(entry->acl_text_w); + entry->acl_text_w = NULL; + } + entry->acl_p = NULL; + entry->acl_state = 0; /* Not counting. */ +} + +/* + * Add a single ACL entry to the internal list of ACL data. + */ +void +archive_entry_acl_add_entry(struct archive_entry *entry, + int type, int permset, int tag, int id, const char *name) +{ + struct ae_acl *ap; + + if (acl_special(entry, type, permset, tag) == 0) + return; + ap = acl_new_entry(entry, type, permset, tag, id); + if (ap == NULL) { + /* XXX Error XXX */ + return; + } + if (name != NULL && *name != '\0') + aes_copy_mbs(&ap->name, name); + else + aes_clean(&ap->name); +} + +/* + * As above, but with a wide-character name. + */ +void +archive_entry_acl_add_entry_w(struct archive_entry *entry, + int type, int permset, int tag, int id, const wchar_t *name) +{ + struct ae_acl *ap; + + if (acl_special(entry, type, permset, tag) == 0) + return; + ap = acl_new_entry(entry, type, permset, tag, id); + if (ap == NULL) { + /* XXX Error XXX */ + return; + } + if (name != NULL && *name != L'\0') + aes_copy_wcs(&ap->name, name); + else + aes_clean(&ap->name); +} + +/* + * If this ACL entry is part of the standard POSIX permissions set, + * store the permissions in the stat structure and return zero. + */ +static int +acl_special(struct archive_entry *entry, int type, int permset, int tag) +{ + if (type == ARCHIVE_ENTRY_ACL_TYPE_ACCESS) { + switch (tag) { + case ARCHIVE_ENTRY_ACL_USER_OBJ: + entry->ae_stat.st_mode &= 0077; + entry->ae_stat.st_mode |= (permset & 7) << 6; + return (0); + case ARCHIVE_ENTRY_ACL_GROUP_OBJ: + entry->ae_stat.st_mode &= 0707; + entry->ae_stat.st_mode |= (permset & 7) << 3; + return (0); + case ARCHIVE_ENTRY_ACL_OTHER: + entry->ae_stat.st_mode &= 0770; + entry->ae_stat.st_mode |= permset & 7; + return (0); + } + } + return (1); +} + +/* + * Allocate and populate a new ACL entry with everything but the + * name. + */ +static struct ae_acl * +acl_new_entry(struct archive_entry *entry, + int type, int permset, int tag, int id) +{ + struct ae_acl *ap; + + if (type != ARCHIVE_ENTRY_ACL_TYPE_ACCESS && + type != ARCHIVE_ENTRY_ACL_TYPE_DEFAULT) + return (NULL); + if (entry->acl_text_w != NULL) { + free(entry->acl_text_w); + entry->acl_text_w = NULL; + } + + /* XXX TODO: More sanity-checks on the arguments XXX */ + + /* If there's a matching entry already in the list, overwrite it. */ + for (ap = entry->acl_head; ap != NULL; ap = ap->next) { + if (ap->type == type && ap->tag == tag && ap->id == id) { + ap->permset = permset; + return (ap); + } + } + + /* Add a new entry to the list. */ + ap = malloc(sizeof(*ap)); + memset(ap, 0, sizeof(*ap)); + ap->next = entry->acl_head; + entry->acl_head = ap; + ap->type = type; + ap->tag = tag; + ap->id = id; + ap->permset = permset; + return (ap); +} + +/* + * Return a count of entries matching "want_type". + */ +int +archive_entry_acl_count(struct archive_entry *entry, int want_type) +{ + int count; + struct ae_acl *ap; + + count = 0; + ap = entry->acl_head; + while (ap != NULL) { + if ((ap->type & want_type) != 0) + count++; + ap = ap->next; + } + + if (count > 0 && ((want_type & ARCHIVE_ENTRY_ACL_TYPE_ACCESS) != 0)) + count += 3; + return (count); +} + +/* + * Prepare for reading entries from the ACL data. Returns a count + * of entries matching "want_type", or zero if there are no + * non-extended ACL entries of that type. + */ +int +archive_entry_acl_reset(struct archive_entry *entry, int want_type) +{ + int count, cutoff; + + count = archive_entry_acl_count(entry, want_type); + + /* + * If the only entries are the three standard ones, + * then don't return any ACL data. (In this case, + * client can just use chmod(2) to set permissions.) + */ + if ((want_type & ARCHIVE_ENTRY_ACL_TYPE_ACCESS) != 0) + cutoff = 3; + else + cutoff = 0; + + if (count > cutoff) + entry->acl_state = ARCHIVE_ENTRY_ACL_USER_OBJ; + else + entry->acl_state = 0; + entry->acl_p = NULL; + return (count); +} + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404060154.i361snjq074525>