Date: Thu, 10 Jan 2013 05:36:43 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245247 - in projects/diffused_head: . bin/ln bin/ls cddl/contrib/opensolaris/cmd/zpool contrib/dialog contrib/dialog/package contrib/dialog/package/debian contrib/dialog/po contrib/dia... Message-ID: <201301100536.r0A5aheZ069670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Thu Jan 10 05:36:42 2013 New Revision: 245247 URL: http://svnweb.freebsd.org/changeset/base/245247 Log: Merge revs 244763:245246 from head. Added: projects/diffused_head/contrib/dialog/samples/dselect - copied unchanged from r245246, head/contrib/dialog/samples/dselect projects/diffused_head/contrib/dialog/samples/valgrind.log - copied unchanged from r245246, head/contrib/dialog/samples/valgrind.log projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c - copied unchanged from r245246, head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c projects/diffused_head/sys/dev/ath/if_ath_spectral.c - copied unchanged from r245246, head/sys/dev/ath/if_ath_spectral.c projects/diffused_head/sys/dev/ath/if_ath_spectral.h - copied unchanged from r245246, head/sys/dev/ath/if_ath_spectral.h projects/diffused_head/tools/build/options/WITHOUT_LZMA_SUPPORT - copied unchanged from r245246, head/tools/build/options/WITHOUT_LZMA_SUPPORT projects/diffused_head/tools/build/options/WITH_NMTREE - copied unchanged from r245246, head/tools/build/options/WITH_NMTREE projects/diffused_head/tools/tools/ath/athspectral/ - copied from r245246, head/tools/tools/ath/athspectral/ projects/diffused_head/usr.sbin/bsdconfig/share/script.subr - copied unchanged from r245246, head/usr.sbin/bsdconfig/share/script.subr projects/diffused_head/usr.sbin/bsdconfig/share/variable.subr - copied unchanged from r245246, head/usr.sbin/bsdconfig/share/variable.subr projects/diffused_head/usr.sbin/bsdinstall/partedit/sade.8 - copied unchanged from r245246, head/usr.sbin/bsdinstall/partedit/sade.8 Deleted: projects/diffused_head/contrib/dialog/samples/dft-cancel projects/diffused_head/contrib/dialog/samples/dft-extra projects/diffused_head/contrib/dialog/samples/dft-help projects/diffused_head/contrib/dialog/samples/dft-no projects/diffused_head/contrib/dialog/samples/fselect0 projects/diffused_head/contrib/dialog/samples/with-dquotes projects/diffused_head/contrib/dialog/samples/with-squotes projects/diffused_head/lib/libdisk/ projects/diffused_head/share/examples/cvsup/gnats-supfile projects/diffused_head/sys/dev/xen/evtchn/ projects/diffused_head/sys/dev/xen/xenpci/machine_reboot.c projects/diffused_head/usr.sbin/sade/ Modified: projects/diffused_head/COPYRIGHT projects/diffused_head/LOCKS projects/diffused_head/ObsoleteFiles.inc projects/diffused_head/bin/ln/ln.1 projects/diffused_head/bin/ls/util.c projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/diffused_head/contrib/dialog/CHANGES projects/diffused_head/contrib/dialog/VERSION projects/diffused_head/contrib/dialog/aclocal.m4 projects/diffused_head/contrib/dialog/arrows.c projects/diffused_head/contrib/dialog/buttons.c projects/diffused_head/contrib/dialog/calendar.c projects/diffused_head/contrib/dialog/checklist.c projects/diffused_head/contrib/dialog/columns.c projects/diffused_head/contrib/dialog/configure projects/diffused_head/contrib/dialog/configure.in projects/diffused_head/contrib/dialog/dialog.1 projects/diffused_head/contrib/dialog/dialog.3 projects/diffused_head/contrib/dialog/dialog.c projects/diffused_head/contrib/dialog/dialog.h projects/diffused_head/contrib/dialog/dlg_colors.h projects/diffused_head/contrib/dialog/dlg_keys.c projects/diffused_head/contrib/dialog/dlg_keys.h projects/diffused_head/contrib/dialog/editbox.c projects/diffused_head/contrib/dialog/formbox.c projects/diffused_head/contrib/dialog/fselect.c projects/diffused_head/contrib/dialog/guage.c projects/diffused_head/contrib/dialog/headers-sh.in projects/diffused_head/contrib/dialog/inputbox.c projects/diffused_head/contrib/dialog/inputstr.c projects/diffused_head/contrib/dialog/makefile.in projects/diffused_head/contrib/dialog/menubox.c projects/diffused_head/contrib/dialog/mixedform.c projects/diffused_head/contrib/dialog/mixedgauge.c projects/diffused_head/contrib/dialog/msgbox.c projects/diffused_head/contrib/dialog/package/debian/changelog projects/diffused_head/contrib/dialog/package/dialog.spec projects/diffused_head/contrib/dialog/pause.c projects/diffused_head/contrib/dialog/po/cs.po projects/diffused_head/contrib/dialog/po/el.po projects/diffused_head/contrib/dialog/po/hr.po projects/diffused_head/contrib/dialog/po/sr.po projects/diffused_head/contrib/dialog/prgbox.c projects/diffused_head/contrib/dialog/progressbox.c projects/diffused_head/contrib/dialog/rc.c projects/diffused_head/contrib/dialog/samples/copifuncs/admin.funcs projects/diffused_head/contrib/dialog/samples/copifuncs/common.funcs projects/diffused_head/contrib/dialog/samples/copifuncs/copi.funcs projects/diffused_head/contrib/dialog/samples/copifuncs/copi.ifman2 projects/diffused_head/contrib/dialog/samples/copifuncs/copi.ifpoll2 projects/diffused_head/contrib/dialog/samples/copifuncs/copi.ifreq2 projects/diffused_head/contrib/dialog/samples/copifuncs/copi.sendifm1 projects/diffused_head/contrib/dialog/samples/copifuncs/copi.wheel projects/diffused_head/contrib/dialog/samples/copismall projects/diffused_head/contrib/dialog/samples/debian.rc projects/diffused_head/contrib/dialog/samples/dialog.py projects/diffused_head/contrib/dialog/samples/form1 projects/diffused_head/contrib/dialog/samples/inputmenu projects/diffused_head/contrib/dialog/samples/inputmenu-stdout projects/diffused_head/contrib/dialog/samples/inputmenu1 projects/diffused_head/contrib/dialog/samples/inputmenu2 projects/diffused_head/contrib/dialog/samples/inputmenu3 projects/diffused_head/contrib/dialog/samples/inputmenu4 projects/diffused_head/contrib/dialog/samples/killall projects/diffused_head/contrib/dialog/samples/prgbox projects/diffused_head/contrib/dialog/samples/prgbox2 projects/diffused_head/contrib/dialog/samples/report-button projects/diffused_head/contrib/dialog/samples/report-edit projects/diffused_head/contrib/dialog/samples/report-string projects/diffused_head/contrib/dialog/samples/report-tempfile projects/diffused_head/contrib/dialog/samples/report-yesno projects/diffused_head/contrib/dialog/samples/setup-edit projects/diffused_head/contrib/dialog/samples/setup-tempfile projects/diffused_head/contrib/dialog/samples/setup-utf8 projects/diffused_head/contrib/dialog/samples/setup-vars projects/diffused_head/contrib/dialog/samples/slackware.rc projects/diffused_head/contrib/dialog/samples/sourcemage.rc projects/diffused_head/contrib/dialog/samples/suse.rc projects/diffused_head/contrib/dialog/samples/tailboxbg projects/diffused_head/contrib/dialog/samples/tailboxbg1 projects/diffused_head/contrib/dialog/samples/tailboxbg2 projects/diffused_head/contrib/dialog/samples/testdata-8bit projects/diffused_head/contrib/dialog/samples/wheel projects/diffused_head/contrib/dialog/samples/whiptail.rc projects/diffused_head/contrib/dialog/tailbox.c projects/diffused_head/contrib/dialog/textbox.c projects/diffused_head/contrib/dialog/timebox.c projects/diffused_head/contrib/dialog/trace.c projects/diffused_head/contrib/dialog/ui_getc.c projects/diffused_head/contrib/dialog/util.c projects/diffused_head/contrib/dialog/yesno.c projects/diffused_head/contrib/gcc/dwarf2out.c projects/diffused_head/contrib/one-true-awk/FIXES projects/diffused_head/contrib/one-true-awk/main.c projects/diffused_head/contrib/one-true-awk/makefile projects/diffused_head/contrib/one-true-awk/proto.h projects/diffused_head/contrib/one-true-awk/run.c projects/diffused_head/contrib/one-true-awk/tran.c projects/diffused_head/contrib/sendmail/FREEBSD-upgrade projects/diffused_head/contrib/sendmail/LICENSE projects/diffused_head/contrib/sendmail/PGPKEYS projects/diffused_head/contrib/sendmail/RELEASE_NOTES projects/diffused_head/contrib/sendmail/cf/README projects/diffused_head/contrib/sendmail/cf/cf/submit.cf projects/diffused_head/contrib/sendmail/cf/feature/ldap_routing.m4 projects/diffused_head/contrib/sendmail/cf/m4/proto.m4 projects/diffused_head/contrib/sendmail/cf/m4/version.m4 projects/diffused_head/contrib/sendmail/doc/op/op.me projects/diffused_head/contrib/sendmail/include/libmilter/mfapi.h projects/diffused_head/contrib/sendmail/include/sm/clock.h projects/diffused_head/contrib/sendmail/include/sm/tailq.h projects/diffused_head/contrib/sendmail/libmilter/Makefile.m4 projects/diffused_head/contrib/sendmail/libmilter/docs/api.html projects/diffused_head/contrib/sendmail/libmilter/docs/smfi_setsymlist.html projects/diffused_head/contrib/sendmail/libmilter/docs/smfi_settimeout.html projects/diffused_head/contrib/sendmail/libmilter/worker.c projects/diffused_head/contrib/sendmail/src/Makefile.m4 projects/diffused_head/contrib/sendmail/src/TRACEFLAGS projects/diffused_head/contrib/sendmail/src/collect.c projects/diffused_head/contrib/sendmail/src/conf.c projects/diffused_head/contrib/sendmail/src/daemon.c projects/diffused_head/contrib/sendmail/src/deliver.c projects/diffused_head/contrib/sendmail/src/headers.c projects/diffused_head/contrib/sendmail/src/main.c projects/diffused_head/contrib/sendmail/src/map.c projects/diffused_head/contrib/sendmail/src/milter.c projects/diffused_head/contrib/sendmail/src/parseaddr.c projects/diffused_head/contrib/sendmail/src/queue.c projects/diffused_head/contrib/sendmail/src/sasl.c projects/diffused_head/contrib/sendmail/src/savemail.c projects/diffused_head/contrib/sendmail/src/sendmail.h projects/diffused_head/contrib/sendmail/src/srvrsmtp.c projects/diffused_head/contrib/sendmail/src/stab.c projects/diffused_head/contrib/sendmail/src/util.c projects/diffused_head/contrib/sendmail/src/version.c projects/diffused_head/crypto/openssl/crypto/bn/bn_word.c projects/diffused_head/crypto/openssl/crypto/opensslv.h projects/diffused_head/etc/mtree/BSD.var.dist projects/diffused_head/etc/namedb/named.root projects/diffused_head/etc/sendmail/freebsd.mc projects/diffused_head/etc/sendmail/freebsd.submit.mc projects/diffused_head/etc/sendmail/freefall.mc projects/diffused_head/gnu/lib/libdialog/dlg_config.h projects/diffused_head/gnu/usr.bin/binutils/ld/armelf_fbsd.sh projects/diffused_head/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh projects/diffused_head/gnu/usr.bin/dialog/Makefile projects/diffused_head/lib/Makefile projects/diffused_head/lib/csu/amd64/crt1.c projects/diffused_head/lib/csu/arm/crt1.c projects/diffused_head/lib/csu/common/ignore_init.c projects/diffused_head/lib/csu/i386-elf/crt1_c.c projects/diffused_head/lib/csu/mips/crt1.c projects/diffused_head/lib/csu/powerpc/crt1.c projects/diffused_head/lib/csu/powerpc64/crt1.c projects/diffused_head/lib/csu/sparc64/crt1.c projects/diffused_head/lib/libbsnmp/libbsnmp/Makefile projects/diffused_head/lib/libc/arm/softfloat/arm-gcc.h projects/diffused_head/lib/libc/net/name6.c projects/diffused_head/lib/libedit/map.c projects/diffused_head/lib/libradius/libradius.3 projects/diffused_head/lib/libutil/gr_util.c projects/diffused_head/release/amd64/mkisoimages.sh projects/diffused_head/release/i386/mkisoimages.sh projects/diffused_head/release/ia64/mkisoimages.sh projects/diffused_head/release/pc98/mkisoimages.sh projects/diffused_head/release/powerpc/mkisoimages.sh projects/diffused_head/release/sparc64/mkisoimages.sh projects/diffused_head/sbin/geom/class/journal/geom_journal_ufs.c projects/diffused_head/sbin/geom/class/part/gpart.8 projects/diffused_head/sbin/ifconfig/af_inet6.c projects/diffused_head/sbin/ifconfig/af_nd6.c projects/diffused_head/sbin/ifconfig/ifconfig.8 projects/diffused_head/sbin/mount_nullfs/mount_nullfs.c projects/diffused_head/sbin/pflogd/Makefile projects/diffused_head/sbin/route/route.c projects/diffused_head/share/examples/Makefile projects/diffused_head/share/examples/cvsup/README projects/diffused_head/share/examples/cvsup/cvs-supfile projects/diffused_head/share/examples/cvsup/ports-supfile projects/diffused_head/share/examples/cvsup/stable-supfile projects/diffused_head/share/examples/cvsup/standard-supfile projects/diffused_head/share/man/man4/mps.4 projects/diffused_head/share/man/man4/wbwd.4 projects/diffused_head/share/man/man5/src.conf.5 projects/diffused_head/share/man/man9/sleep.9 projects/diffused_head/share/misc/committers-ports.dot projects/diffused_head/share/mk/bsd.cpu.mk projects/diffused_head/share/mk/bsd.lib.mk projects/diffused_head/share/mk/bsd.libnames.mk projects/diffused_head/share/mk/bsd.own.mk projects/diffused_head/share/mk/bsd.prog.mk projects/diffused_head/sys/amd64/amd64/vm_machdep.c projects/diffused_head/sys/amd64/conf/GENERIC projects/diffused_head/sys/arm/arm/busdma_machdep-v6.c projects/diffused_head/sys/arm/arm/machdep.c projects/diffused_head/sys/arm/arm/pl310.c projects/diffused_head/sys/arm/arm/pmap-v6.c projects/diffused_head/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/diffused_head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/diffused_head/sys/arm/conf/BEAGLEBONE projects/diffused_head/sys/arm/include/atomic.h projects/diffused_head/sys/arm/include/machdep.h projects/diffused_head/sys/arm/include/pcpu.h projects/diffused_head/sys/arm/include/pl310.h projects/diffused_head/sys/arm/include/pmap.h projects/diffused_head/sys/arm/ti/cpsw/if_cpsw.c projects/diffused_head/sys/arm/ti/cpsw/if_cpswreg.h projects/diffused_head/sys/arm/ti/cpsw/if_cpswvar.h projects/diffused_head/sys/arm/ti/omap4/omap4_l2cache.c projects/diffused_head/sys/arm/ti/omap4/omap4_smc.h projects/diffused_head/sys/arm/ti/omap4/std.omap4 projects/diffused_head/sys/arm/ti/ti_cpuid.c projects/diffused_head/sys/arm/ti/ti_cpuid.h projects/diffused_head/sys/arm/versatile/versatile_clcd.c projects/diffused_head/sys/boot/common/interp_forth.c projects/diffused_head/sys/boot/fdt/dts/pandaboard.dts projects/diffused_head/sys/boot/userboot/userboot/Makefile projects/diffused_head/sys/boot/userboot/userboot/main.c projects/diffused_head/sys/cam/ctl/ctl.c projects/diffused_head/sys/cam/ctl/scsi_ctl.c projects/diffused_head/sys/conf/files projects/diffused_head/sys/conf/options.mips projects/diffused_head/sys/contrib/octeon-sdk/cvmx-app-init.h projects/diffused_head/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/diffused_head/sys/dev/agp/agp_ali.c projects/diffused_head/sys/dev/agp/agp_amd.c projects/diffused_head/sys/dev/agp/agp_amd64.c projects/diffused_head/sys/dev/agp/agp_ati.c projects/diffused_head/sys/dev/agp/agp_intel.c projects/diffused_head/sys/dev/agp/agp_sis.c projects/diffused_head/sys/dev/agp/agp_via.c projects/diffused_head/sys/dev/ahci/ahci.c projects/diffused_head/sys/dev/ata/ata-pci.h projects/diffused_head/sys/dev/ata/chipsets/ata-intel.c projects/diffused_head/sys/dev/ath/ath_dfs/null/dfs_null.c projects/diffused_head/sys/dev/ath/ath_hal/ah.c projects/diffused_head/sys/dev/ath/ath_hal/ah.h projects/diffused_head/sys/dev/ath/ath_hal/ah_internal.h projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416phy.h projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/diffused_head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/diffused_head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/diffused_head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/diffused_head/sys/dev/ath/if_ath.c projects/diffused_head/sys/dev/ath/if_ath_rx.c projects/diffused_head/sys/dev/ath/if_athdfs.h projects/diffused_head/sys/dev/ath/if_athioctl.h projects/diffused_head/sys/dev/ath/if_athvar.h projects/diffused_head/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/diffused_head/sys/dev/fdt/fdtbus.c projects/diffused_head/sys/dev/ichsmb/ichsmb_pci.c projects/diffused_head/sys/dev/ichwd/ichwd.c projects/diffused_head/sys/dev/ichwd/ichwd.h projects/diffused_head/sys/dev/nvme/nvme_test.c projects/diffused_head/sys/dev/pci/pci.c projects/diffused_head/sys/dev/sound/pci/hda/hdac.c projects/diffused_head/sys/dev/sound/pci/hda/hdac.h projects/diffused_head/sys/dev/usb/controller/xhci.c projects/diffused_head/sys/dev/usb/serial/u3g.c projects/diffused_head/sys/dev/usb/usbdevs projects/diffused_head/sys/dev/usb/wlan/if_run.c projects/diffused_head/sys/dev/wbwd/wbwd.c projects/diffused_head/sys/dev/xen/control/control.c projects/diffused_head/sys/dev/xen/netfront/netfront.c projects/diffused_head/sys/fs/ext2fs/ext2_dinode.h projects/diffused_head/sys/fs/fuse/fuse_io.c projects/diffused_head/sys/fs/nandfs/nandfs_segment.c projects/diffused_head/sys/fs/nullfs/null.h projects/diffused_head/sys/fs/nullfs/null_subr.c projects/diffused_head/sys/fs/nullfs/null_vfsops.c projects/diffused_head/sys/fs/nullfs/null_vnops.c projects/diffused_head/sys/fs/tmpfs/tmpfs.h projects/diffused_head/sys/fs/tmpfs/tmpfs_subr.c projects/diffused_head/sys/fs/tmpfs/tmpfs_vfsops.c projects/diffused_head/sys/fs/tmpfs/tmpfs_vnops.c projects/diffused_head/sys/i386/conf/GENERIC projects/diffused_head/sys/i386/xen/xen_machdep.c projects/diffused_head/sys/ia64/conf/GENERIC projects/diffused_head/sys/kern/kern_exit.c projects/diffused_head/sys/kern/kern_lock.c projects/diffused_head/sys/kern/kern_synch.c projects/diffused_head/sys/kern/subr_param.c projects/diffused_head/sys/kern/subr_syscall.c projects/diffused_head/sys/kern/vfs_mount.c projects/diffused_head/sys/kern/vfs_vnops.c projects/diffused_head/sys/mips/atheros/ar71xx_pci.c projects/diffused_head/sys/mips/beri/beri_machdep.c projects/diffused_head/sys/mips/conf/OCTEON1 projects/diffused_head/sys/modules/ath/Makefile projects/diffused_head/sys/net/if_pfsync.h projects/diffused_head/sys/net/zlib.c projects/diffused_head/sys/net/zlib.h projects/diffused_head/sys/net80211/ieee80211_hostap.c projects/diffused_head/sys/net80211/ieee80211_hwmp.c projects/diffused_head/sys/net80211/ieee80211_radiotap.h projects/diffused_head/sys/netinet/in.c projects/diffused_head/sys/netinet/tcp_timer.c projects/diffused_head/sys/netinet6/in6.c projects/diffused_head/sys/netinet6/in6_src.c projects/diffused_head/sys/netinet6/nd6.h projects/diffused_head/sys/netinet6/scope6.c projects/diffused_head/sys/netpfil/pf/if_pflog.c projects/diffused_head/sys/netpfil/pf/if_pfsync.c projects/diffused_head/sys/netpfil/pf/pf.c projects/diffused_head/sys/netpfil/pf/pf_if.c projects/diffused_head/sys/netpfil/pf/pf_ioctl.c projects/diffused_head/sys/netpfil/pf/pf_lb.c projects/diffused_head/sys/netpfil/pf/pf_norm.c projects/diffused_head/sys/netpfil/pf/pf_osfp.c projects/diffused_head/sys/netpfil/pf/pf_ruleset.c projects/diffused_head/sys/netpfil/pf/pf_table.c projects/diffused_head/sys/pc98/conf/GENERIC projects/diffused_head/sys/powerpc/conf/GENERIC projects/diffused_head/sys/powerpc/conf/GENERIC64 projects/diffused_head/sys/sparc64/conf/GENERIC projects/diffused_head/sys/sparc64/sparc64/interrupt.S projects/diffused_head/sys/sys/buf_ring.h projects/diffused_head/sys/sys/copyright.h projects/diffused_head/sys/sys/mbuf.h projects/diffused_head/sys/sys/mount.h projects/diffused_head/sys/sys/param.h projects/diffused_head/sys/sys/vnode.h projects/diffused_head/sys/tools/vnode_if.awk projects/diffused_head/sys/ufs/ffs/ffs_snapshot.c projects/diffused_head/sys/vm/device_pager.c projects/diffused_head/sys/vm/vm_object.h projects/diffused_head/sys/x86/include/specialreg.h projects/diffused_head/tools/build/make_check/Makefile projects/diffused_head/tools/tools/ath/Makefile projects/diffused_head/tools/tools/ath/arcode/arcode.c projects/diffused_head/tools/tools/ath/ath_prom_read/ath_prom_read.c projects/diffused_head/tools/tools/ath/athdebug/athdebug.c projects/diffused_head/tools/tools/ath/athdecode/main.c projects/diffused_head/tools/tools/ath/athkey/athkey.c projects/diffused_head/tools/tools/ath/athprom/athprom.c projects/diffused_head/tools/tools/ath/athratestats/main.c projects/diffused_head/tools/tools/ath/athstats/Makefile projects/diffused_head/tools/tools/ath/athstats/athstats.c projects/diffused_head/tools/tools/ath/athsurvey/athsurvey.c projects/diffused_head/usr.bin/apply/apply.c projects/diffused_head/usr.bin/dc/bcode.c projects/diffused_head/usr.bin/dc/bcode.h projects/diffused_head/usr.bin/dc/inout.c projects/diffused_head/usr.bin/grep/Makefile projects/diffused_head/usr.bin/grep/file.c projects/diffused_head/usr.bin/grep/grep.c projects/diffused_head/usr.bin/grep/regex/tre-fastmatch.c projects/diffused_head/usr.bin/m4/Makefile projects/diffused_head/usr.bin/tail/read.c projects/diffused_head/usr.bin/ul/ul.c projects/diffused_head/usr.bin/xargs/strnsubst.c projects/diffused_head/usr.sbin/Makefile.amd64 projects/diffused_head/usr.sbin/Makefile.i386 projects/diffused_head/usr.sbin/Makefile.sparc64 projects/diffused_head/usr.sbin/bsdconfig/USAGE projects/diffused_head/usr.sbin/bsdconfig/bsdconfig projects/diffused_head/usr.sbin/bsdconfig/bsdconfig.8 projects/diffused_head/usr.sbin/bsdconfig/include/messages.subr projects/diffused_head/usr.sbin/bsdconfig/networking/share/hostname.subr projects/diffused_head/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/diffused_head/usr.sbin/bsdconfig/share/Makefile projects/diffused_head/usr.sbin/bsdconfig/share/common.subr projects/diffused_head/usr.sbin/bsdconfig/share/dialog.subr projects/diffused_head/usr.sbin/bsdinstall/partedit/Makefile projects/diffused_head/usr.sbin/bsdinstall/partedit/partedit.c projects/diffused_head/usr.sbin/daemon/daemon.c projects/diffused_head/usr.sbin/gssd/Makefile projects/diffused_head/usr.sbin/gssd/gssd.8 projects/diffused_head/usr.sbin/gssd/gssd.c projects/diffused_head/usr.sbin/ifmcstat/ifmcstat.c projects/diffused_head/usr.sbin/mtree/Makefile projects/diffused_head/usr.sbin/ndp/ndp.8 projects/diffused_head/usr.sbin/ndp/ndp.c projects/diffused_head/usr.sbin/newsyslog/newsyslog.8 projects/diffused_head/usr.sbin/newsyslog/newsyslog.c projects/diffused_head/usr.sbin/nmtree/Makefile projects/diffused_head/usr.sbin/pw/pw_user.c Directory Properties: projects/diffused_head/ (props changed) projects/diffused_head/cddl/contrib/opensolaris/ (props changed) projects/diffused_head/contrib/dialog/ (props changed) projects/diffused_head/contrib/gcc/ (props changed) projects/diffused_head/contrib/one-true-awk/ (props changed) projects/diffused_head/contrib/sendmail/ (props changed) projects/diffused_head/crypto/openssl/ (props changed) projects/diffused_head/gnu/lib/ (props changed) projects/diffused_head/gnu/usr.bin/binutils/ (props changed) projects/diffused_head/lib/libc/ (props changed) projects/diffused_head/lib/libutil/ (props changed) projects/diffused_head/sbin/ (props changed) projects/diffused_head/share/man/man4/ (props changed) projects/diffused_head/sys/ (props changed) projects/diffused_head/sys/boot/ (props changed) projects/diffused_head/sys/conf/ (props changed) projects/diffused_head/sys/contrib/octeon-sdk/ (props changed) projects/diffused_head/tools/regression/bin/sh/errors/write-error1.0 (props changed) Modified: projects/diffused_head/COPYRIGHT ============================================================================== --- projects/diffused_head/COPYRIGHT Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/COPYRIGHT Thu Jan 10 05:36:42 2013 (r245247) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2013 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/diffused_head/LOCKS ============================================================================== --- projects/diffused_head/LOCKS Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/LOCKS Thu Jan 10 05:36:42 2013 (r245247) @@ -11,3 +11,4 @@ releng/4.* Requires Security Officer app releng/5.* Requires Security Officer approval. releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. +releng/8.* Requires Security Officer approval. Modified: projects/diffused_head/ObsoleteFiles.inc ============================================================================== --- projects/diffused_head/ObsoleteFiles.inc Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/ObsoleteFiles.inc Thu Jan 10 05:36:42 2013 (r245247) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20121230: libdisk removed +OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h +OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a +# 20121230: remove wrongly created directories for auditdistd +OLD_DIRS+=var/dist +OLD_DIRS+=var/remote # 20121114: zpool-features manual page moved from section 5 to 7 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: remove harp, hfa and idt man page Modified: projects/diffused_head/bin/ln/ln.1 ============================================================================== --- projects/diffused_head/bin/ln/ln.1 Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/bin/ln/ln.1 Thu Jan 10 05:36:42 2013 (r245247) @@ -291,7 +291,7 @@ implementations. .Pp The .Fl F -option is +option is a .Fx extension and should not be used in portable scripts. .Sh SEE ALSO Modified: projects/diffused_head/bin/ls/util.c ============================================================================== --- projects/diffused_head/bin/ls/util.c Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/bin/ls/util.c Thu Jan 10 05:36:42 2013 (r245247) @@ -184,7 +184,10 @@ prn_octal(const char *s) for (i = 0; i < (int)clen; i++) putchar((unsigned char)s[i]); len += wcwidth(wc); - } else if (goodchar && f_octal_escape && wc >= 0 && + } else if (goodchar && f_octal_escape && +#if WCHAR_MIN < 0 + wc >= 0 && +#endif wc <= (wchar_t)UCHAR_MAX && (p = strchr(esc, (char)wc)) != NULL) { putchar('\\'); Modified: projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu Jan 10 05:36:42 2013 (r245247) @@ -906,10 +906,11 @@ zpool_do_create(int argc, char **argv) /* * Check the validity of the mountpoint and direct the user to use the * '-m' mountpoint option if it looks like its in use. + * Ignore the checks if the '-f' option is given. */ - if (mountpoint == NULL || + if (!force && (mountpoint == NULL || (strcmp(mountpoint, ZFS_MOUNTPOINT_LEGACY) != 0 && - strcmp(mountpoint, ZFS_MOUNTPOINT_NONE) != 0)) { + strcmp(mountpoint, ZFS_MOUNTPOINT_NONE) != 0))) { char buf[MAXPATHLEN]; DIR *dirp; Modified: projects/diffused_head/contrib/dialog/CHANGES ============================================================================== --- projects/diffused_head/contrib/dialog/CHANGES Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/CHANGES Thu Jan 10 05:36:42 2013 (r245247) @@ -1,172 +1,9 @@ --- $Id: CHANGES,v 1.419 2012/07/06 18:18:48 tom Exp $ +-- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 tom Exp $ -- Thomas E. Dickey <dickey@invisible-island.net> This version of dialog was originally from a Debian snapshot. I've done this to it: -2012/07/06 - + modify samples/setup-tempfile to work with Tru64's shell. - + modify inputmenu sample scripts to make them more portable: - + use "id" rather than "$GROUPS", use sed to work with Solaris. - + use sed to split-up the rename results to work with HPUX. - + fix regression in msgbox (ArchLinux #30574) - -2012/07/03 - + modify prgbox widget to work with --extra-button, etc. - + add case values to several widgets to allow for mouse-clicks with - "--extra-button" and "--help-button" additions. - + correct timebox widget's exit code for "--extra-button" when handing - the "enter" key. - + modify msgbox widget to honor "--extra-button". - + corrected processing of "--trace" option, which did not update the - index into command-line to point past its value. - + add a check in dialog program for valid characters used in option, - e.g., to generate an error if a script attempts to add option value - using "=" rather than with whitespace. - + add new command-line option --default-button and library function - dlg_default_button() to retrieve the value set by the option - to provide a way to set the default button directly rather than - by combining --nook, etc. (patch by Zoltan Kelemen). - + amend include of unctrl.h to apply only to the case where curses.h - is included, to avoid conflict of ncurses' unctrl.h with a system - implementation (report by Martin Roedlach) - + add limit-check to dlg_toupper() in non-wide curses mode to work - when non-character values such as arrow-key codes are passed to - it (patch by Zoltan Kelemen). - + override timeout value, e.g., as set via --timeout command-line - option in pause widget because that interferes with pause's behavior - (report by Jan Spitalnik). - + modify samples/inputmenu* to allow ":" in renamed text (report by - Andreas Stoewing). - + modify double-quoting to make it more consistent, i.e., checklist - output is quoted only when needed. This fixes the case where - single-quotes were used whether or not needed, but also modifies - older checklist behavior for double-quoting which always added those - (Debian #663664). - + correct exit-code used in inputmenu for "rename" button (Debian - #673041, forwarded from Ubuntu #333909, patch by Lebedev Vadim). - + update el.po and hr.po from - http://translationproject.org/latest/dialog/ - + use checkbashisms to clean up sample scripts. - -2012/02/15 - + modify menubox.c to use the same improvement as in checklist.c - + improve auto width computation for checklist widget by using - dlg_calc_list_width as in the non-auto case (Edho Arief). - + eliminate some bashisms in the sample scripts (Pedro Giffuni). - + makefile fixes from FreeBSD ports (Li-Wen Hsu): - + make --with-package option of configure script work. - + get LIBTOOL_VERSION from configure script, needed by - ${LIBTOOL_VERSION} in LIBTOOL_CREATE (LIB_CREATE in configure and - aclocal.m4) - + update cs.po and sr.po from - http://translationproject.org/latest/dialog/ - + updated configure script macros, improving CF_XOPEN_SOURCE among - other fixes. - -2011/10/20 - + fix --analyze warnings for clang versions 2.8, 2.9. - + add configure check for lint program. - + add check in dlg_getc() in case its window is freed as a side effect - of removing callbacks. - + fix logic in freeing subwindows (report by xDog Walker). - + fix a regression in logic distinguishing between inputmenu and menu - widgets (report by xDog Walker). - + minor fixes to library manpage. - -2011/10/18 - + modify header-sh.in to work around limit on sed script length on - HPUX. - + add a special case of parameter parsing for "--trace" to the - initialization done before calling init_dialog(), to allow users to - capture the initial state of the parameter list before any options - are processed and removed. This is only done if "--trace" is the - first option, otherwise it is handled in the common options as before - (report by xDog Walker). - + modify samples/testdata-8bit, discarding $1 from the parameter list - if it was used, so that the source'ing scripts can consistently use - "$@" to insert parameters before the widget, e.g., as an alternative - to using $DIALOGOPTS (report by xDog Walker). - + modify treatment of function pointers in menubox.c, make - dlg_renamed_menutext() and dlg_dummy_menutext() visible to library - users (request by xDog Walker). - + add dlg_count_real_columns(), use to modify centering for "--hline" - text to account for "\Z"s (report by xDog Walker). - + improve check in dlg_draw_arrows2() for conflict between the window - title and up-arrow marker to take into account that the given window - may not be the top-level window of the widget. - + change width of page up/down mouse areas in fselect panes to use the - full width of the panes rather than only the portion from the left - margin to the up/down arrow. - + add/use dlg_draw_box2() and dlg_draw_bottom_box2() to use the - secondary borders. - + modify rc-file read/write to accept/generate color values that refer - to previously-processed items in the color table. This reduces the - number of distinct colors that must be specified to set up a color - scheme. - + add color table entries for secondary borders, i.e., the ones that - are normally drawn with the dialog's text-colors (Debian #641168). - + modify fselect.c to scan the current directory if the input field - happens to be empty (Debian #640905). - + repeated the discussion of environment variables that can override - the exit-status values in the manpage's return-codes section - (Debian #642105). - + add an example to the manpage showing how to override the form - widget's keys used for field/button traversal (Debian #642108). - + modify call to dlg_register_window() in formbox.c so that the editing - bindings are attached to the form sub-window rather than the - top-level dialog window. Also change the name by which the editing - bindings are bound for editbox.c, fselect.c and inputbox.c, so that - the editing and navigation bindings can be different. - + correct logic in dlg_lookup_key() so that it matches the widget name - before using a binding from .dialogrc, allowing the inner/outer - windows of form and other editing widgets to have different bindings. - + modify dlg_register_window() to call dlg_dump_window_keys() after - its updates, via the --trace output, to supplement the manpage - description of key bindings (Debian #642108). - + add DLGK_FORM_PREV and DLGK_FORM_NEXT key-bindings to form.c, to - allow binding a single key to traverse both form-fields and buttons - (Debian #642108). - + modify dlg_parse_rc() to check for error return from - dlg_parse_bindkey(). - + add function dlg_dump_window_keys(), to help with debugging widgets. - + add CR, LF, TAB, FF and ESC to table of curses names to help make - key bindings more readable. - + update table of dialog key-names so that helpfile and trace are - dumped properly. - + correct dlg_dump_keys(), which was showing only the first item in - the matched binding table. - + save/restore window current position in dlg_update_mixedgauge(). - + pass return-code from pause_for_ok() from dlg_progressbox() when - pauseopt is set, rather than only DLG_OK. - + call setlocale() in init_dialog() rather than relying on on-demand - use within inputstr.c, since there are paths in textbox widget which - do not exercise the latter (report by xDog Walker). - + fix some places where checks for "\Z" were done without also checking - dialog_vars.colors (report by Moray Henderson). - + correct logic for DIALOGOPTS parsing so that the parse happens only - once unless memory leak checking is enabled (report by xDog Walker). - + remove an incorrect free() call in dlg_free_gauge() (report by xDog - Walker). - + modify dlg_trace_win() to log wide-characters (report by xDog Walker). - + make traces shorter by skipping repeated ERR's, but showing the - number skipped (report by xDog Walker). - + improve description in manpage to distinguish program box and - progress box from tailboxes (adapted from email by xDog Walker). - + modify dlg_trace_win() so that it looks for the topmost window in a - dialog. Because subwindows share space with the top window, tracing - the latter shows the whole widget (report by xDog Walker). - + expand tracing so that each window is traced before soliciting input, - making the ^T feature to print a window on demand partly redundant - (suggested by xDog Walker). - + cosmetic change in dialog.h to avoid "*/*" strings from comments next - to "*" (report by xDog Walker). - + ensure result from dlg_align_columns() has trailing null on each - string. Analysis was hindered by libc6's continuance of libc5's - early-1990s misfeature of clearing the result from malloc, noting - that libc6's documentation incorrectly claims that it does not do - this (report by xDog Walker). - 2011/07/07 + modify util.c to work better with old versions of ncurses: + suppress use of wchgat() before fix in 20060715 which is needed @@ -250,7 +87,7 @@ to it: + CF_XOPEN_SOURCE, workaround for cygwin to get ncurses' configure script to define _XOPEN_SOURCE_EXTENDED (cygwin's features.h doesn't do anything, so it needs a crutch). - + update config.guess, config.sub + + updated config.guess, config.sub 2011/03/02 + add --prgbox and --programbox (adapted from patch by David Boyd). @@ -318,7 +155,7 @@ to it: CF_ADD_LIBDIR for the curses-directory here, from CF_NCURSES_CPPFLAGS and CF_NCURSES_LDFLAGS, so it will work even with the default checking, e.g., no --with-ncurses, etc. - + update config.guess, config.sub + + updated config.guess, config.sub 2010/04/28 + several improvements to configure script: @@ -413,7 +250,7 @@ to it: libutf8 and libiconv. + update da.po, ru.po from http://translationproject.org/latest/dialog/ - + update config.guess, config.sub + + updated config.guess, config.sub 2008/08/19 + amend changes to quoting; by default, the checklist widget quotes its @@ -496,7 +333,7 @@ to it: ESC to be returned, quitting dialog (report by Reiner Huober). + add extern "C" declarations to dlg_keys.h so the corresponding function declarations are exported to C++ as C symbols. - + update config.guess, config.sub + + updated config.guess, config.sub 2007/06/04 + fix a memory leak in editbox.c @@ -599,7 +436,7 @@ to it: CF_CURSES_LIBS, CF_INCLUDE_DIRS, CF_LARGEFILE, CF_MAKEFLAGS, CF_PATH_SYNTAX, CF_SUBDIR_PATH, CF_SUBST, CF_WITH_DBMALLOC, CF_WITH_DMALLOC, CF_WITH_LIBTOOL and CF_XOPEN_SOURCE. - + update config.guess, config.sub + + updated config.guess, config.sub > adapted fixes from SuSE package (Werner Fink): + add some limit-checks in dlg_draw_shadow(). + make shadows resizable, using new dlg_move_window() in msgbox.c Modified: projects/diffused_head/contrib/dialog/VERSION ============================================================================== --- projects/diffused_head/contrib/dialog/VERSION Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/VERSION Thu Jan 10 05:36:42 2013 (r245247) @@ -1 +1 @@ -10:4:0 1.1 20120706 +10:0:0 1.1 20110707 Modified: projects/diffused_head/contrib/dialog/aclocal.m4 ============================================================================== --- projects/diffused_head/contrib/dialog/aclocal.m4 Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/aclocal.m4 Thu Jan 10 05:36:42 2013 (r245247) @@ -1,7 +1,7 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.87 2012/02/16 02:11:26 tom Exp $ +dnl $Id: aclocal.m4,v 1.82 2011/06/28 22:48:31 tom Exp $ dnl --------------------------------------------------------------------------- -dnl Copyright 1999-2011,2012 -- Thomas E. Dickey +dnl Copyright 1999-2010,2011 -- Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -592,31 +592,6 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 -dnl ------------------ -dnl Conditionally generate script according to whether we're using a given autoconf. -dnl -dnl $1 = version to compare against -dnl $2 = code to use if AC_ACVERSION is at least as high as $1. -dnl $3 = code to use if AC_ACVERSION is older than $1. -define(CF_ACVERSION_CHECK, -[ -ifdef([m4_version_compare], -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], -[CF_ACVERSION_COMPARE( -AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), -AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 -dnl -------------------- -dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, -dnl MAJOR2, MINOR2, TERNARY2, -dnl PRINTABLE2, not FOUND, FOUND) -define(CF_ACVERSION_COMPARE, -[ifelse(builtin([eval], [$2 < $5]), 1, -[ifelse([$8], , ,[$8])], -[ifelse([$9], , ,[$9])])])dnl -dnl --------------------------------------------------------------------------- dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56 dnl ------------ dnl Conditionally generate script according to whether we're using the release @@ -1252,7 +1227,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37 +dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1332,7 +1307,7 @@ if test ".$ac_cv_func_initscr" != .yes ; # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list otermcap termcap termlib unknown + for cf_term_lib in $cf_check_list termcap termlib unknown do AC_CHECK_LIB($cf_term_lib,tgoto,[break]) done @@ -1558,30 +1533,6 @@ fi test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_WGETPARENT version: 2 updated: 2011/10/17 20:12:04 -dnl -------------------- -dnl Check for curses support for directly determining the parent of a given -dnl window. Some implementations make this difficult, so we provide for -dnl defining an application-specific function that gives this functionality. -dnl -dnl $1 = name of function to use if the feature is missing -AC_DEFUN([CF_CURSES_WGETPARENT],[ -CF_CURSES_FUNCS(wgetparent) -if test "x$cf_cv_func_wgetparent" != xyes -then - AC_MSG_CHECKING(if WINDOW has _parent member) - AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>], - [WINDOW *p = stdscr->_parent], - [cf_window__parent=yes], - [cf_window__parent=no]) - AC_MSG_RESULT($cf_window__parent) - if test "$cf_window__parent" = yes - then - AC_DEFINE(HAVE_WINDOW__PARENT) - fi -fi -])dnl -dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. @@ -2386,7 +2337,7 @@ ifdef([AC_FUNC_FSEEKO],[ ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 +dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -2410,7 +2361,7 @@ linux*|gnu*|k*bsd*-gnu) #(vi openbsd[[2-9]].*|mirbsd*) #(vi LD_RPATH_OPT="-Wl,-rpath," ;; -dragonfly*|freebsd*) #(vi +freebsd*) #(vi LD_RPATH_OPT="-rpath " ;; netbsd*) #(vi @@ -2469,11 +2420,11 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 +dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 dnl ------------- dnl Compute the library-prefix for the given host system dnl $1 = variable to set -define([CF_LIB_PREFIX], +AC_DEFUN([CF_LIB_PREFIX], [ case $cf_cv_system_name in #(vi OS/2*|os2*) #(vi @@ -2694,7 +2645,7 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05 +dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 dnl ----------------- dnl Tie together the configure-script macros for ncurses. dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. @@ -2706,10 +2657,7 @@ AC_DEFUN([CF_NCURSES_CONFIG], cf_ncuconfig_root=ifelse($1,,ncurses,$1) echo "Looking for ${cf_ncuconfig_root}-config" - -CF_ACVERSION_CHECK(2.52, - [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], - [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) +AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) if test "$NCURSES_CONFIG" != none ; then @@ -3223,14 +3171,6 @@ AC_SUBST(PROG_EXT) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14 -dnl ------------ -AC_DEFUN([CF_PROG_LINT], -[ -AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint) -AC_SUBST(LINT_OPTS) -])dnl -dnl --------------------------------------------------------------------------- dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 dnl ---------------- dnl Remove all -U and -D options that refer to the given symbol from a list @@ -3478,45 +3418,6 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 -dnl ------------------- -dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we -dnl can define it successfully. -AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ -AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" - ]) -]) - -if test "$cf_cv_xopen_source" != no ; then - CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) - CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) -fi -]) -dnl --------------------------------------------------------------------------- dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44 dnl ------------- dnl Check to see if the BSD-style union wait is declared. Some platforms may @@ -3779,7 +3680,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32 +dnl CF_WITH_LIBTOOL version: 27 updated: 2011/06/28 18:45:38 dnl --------------- dnl Provide a configure option to incorporate libtool. Define several useful dnl symbols for the makefile rules. @@ -3880,7 +3781,7 @@ ifdef([AC_PROG_LIBTOOL],[ # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi + cygwin*|mingw32*|uwin*|aix[[456]]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -4049,7 +3950,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 +dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -4065,7 +3966,7 @@ cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[ cf_xopen_source= case $host_os in #(vi -aix[[4-7]]*) #(vi +aix[[456]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; cygwin) #(vi @@ -4076,7 +3977,6 @@ darwin[[0-8]].*) #(vi ;; darwin*) #(vi cf_xopen_source="-D_DARWIN_C_SOURCE" - cf_XOPEN_SOURCE= ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -4094,23 +3994,15 @@ hpux*) #(vi ;; irix[[56]].*) #(vi cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE ;; mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types - cf_XOPEN_SOURCE= - CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> ;; netbsd*) #(vi - cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw - ;; -openbsd[[4-9]]*) #(vi - # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw - cf_xopen_source="-D_BSD_SOURCE" - cf_XOPEN_SOURCE=600 + # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -4124,46 +4016,42 @@ nto-qnx*) #(vi sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.*) #(vi +solaris2.1[[0-9]]) #(vi + cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +solaris2.[[1-9]]) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - CF_TRY_XOPEN_SOURCE - CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) - ;; -esac - -if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source) -fi - -dnl In anything but the default case, we may have system-specific setting -dnl which is still not guaranteed to provide all of the entrypoints that -dnl _XOPEN_SOURCE would yield. -if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) - AC_TRY_COMPILE([#include <stdlib.h>],[ + AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ + AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _XOPEN_SOURCE make an error #endif], - [cf_XOPEN_SOURCE_set=yes], - [cf_XOPEN_SOURCE_set=no]) - AC_MSG_RESULT($cf_XOPEN_SOURCE_set) - if test $cf_XOPEN_SOURCE_set = yes - then - AC_TRY_COMPILE([#include <stdlib.h>],[ -#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE + [cf_cv_xopen_source=no], + [cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + AC_TRY_COMPILE([#include <sys/types.h>],[ +#ifdef _XOPEN_SOURCE make an error #endif], - [cf_XOPEN_SOURCE_set_ok=yes], - [cf_XOPEN_SOURCE_set_ok=no]) - if test $cf_XOPEN_SOURCE_set_ok = no - then - AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) - fi - else - CF_TRY_XOPEN_SOURCE + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" + ]) +]) + if test "$cf_cv_xopen_source" != no ; then + CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + CF_ADD_CFLAGS($cf_temp_xopen_source) fi + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; +esac + +if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) fi ]) dnl --------------------------------------------------------------------------- Modified: projects/diffused_head/contrib/dialog/arrows.c ============================================================================== --- projects/diffused_head/contrib/dialog/arrows.c Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/arrows.c Thu Jan 10 05:36:42 2013 (r245247) @@ -1,5 +1,5 @@ /* - * $Id: arrows.c,v 1.41 2011/10/20 23:37:17 tom Exp $ + * $Id: arrows.c,v 1.36 2011/06/27 09:13:56 tom Exp $ * * arrows.c -- draw arrows to indicate end-of-range for lists * @@ -79,9 +79,9 @@ dlg_draw_helpline(WINDOW *win, bool deco const int *cols = dlg_index_columns(dialog_vars.help_line); int other = decorations ? (ON_LEFT + ON_RIGHT) : 0; int avail = (getmaxx(win) - other - 2); - int limit = dlg_count_real_columns(dialog_vars.help_line) + 2; + int limit = dlg_limit_columns(dialog_vars.help_line, avail, 0); - if (limit < avail) { + if (limit > 0) { getyx(win, cur_y, cur_x); other = decorations ? ON_LEFT : 0; (void) wmove(win, bottom, other + (avail - limit) / 2); @@ -107,14 +107,13 @@ dlg_draw_arrows2(WINDOW *win, int cur_x, cur_y; int limit_x = getmaxx(win); bool draw_top = TRUE; - bool is_toplevel = (wgetparent(win) == stdscr); getyx(win, cur_y, cur_x); /* * If we're drawing a centered title, do not overwrite with the arrows. */ - if (dialog_vars.title && is_toplevel && (top - getbegy(win)) < MARGIN) { + if (dialog_vars.title) { int have = (limit_x - dlg_count_columns(dialog_vars.title)) / 2; int need = x + 5; if (need > have) @@ -124,11 +123,11 @@ dlg_draw_arrows2(WINDOW *win, if (draw_top) { (void) wmove(win, top, x); if (top_arrow) { - (void) wattrset(win, merge_colors(uarrow_attr, attr)); + wattrset(win, merge_colors(uarrow_attr, attr)); (void) add_acs(win, ACS_UARROW); (void) waddstr(win, "(-)"); } else { - (void) wattrset(win, attr); + wattrset(win, attr); (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } } @@ -136,11 +135,11 @@ dlg_draw_arrows2(WINDOW *win, (void) wmove(win, bottom, x); if (bottom_arrow) { - (void) wattrset(win, merge_colors(darrow_attr, attr)); + wattrset(win, merge_colors(darrow_attr, attr)); (void) add_acs(win, ACS_DARROW); (void) waddstr(win, "(+)"); } else { - (void) wattrset(win, borderattr); + wattrset(win, borderattr); (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE); @@ -148,7 +147,7 @@ dlg_draw_arrows2(WINDOW *win, (void) wmove(win, cur_y, cur_x); wrefresh(win); - (void) wattrset(win, save); + wattrset(win, save); } void @@ -167,13 +166,14 @@ dlg_draw_scrollbar(WINDOW *win, char buffer[80]; int percent; int len; - int oldy, oldx; + int oldy, oldx, maxy, maxx; chtype save = dlg_get_attrs(win); int top_arrow = (first_data != 0); int bottom_arrow = (next_data < total_data); getyx(win, oldy, oldx); + getmaxyx(win, maxy, maxx); dlg_draw_helpline(win, TRUE); if (bottom_arrow || top_arrow || dialog_state.use_scrollbar) { @@ -187,12 +187,12 @@ dlg_draw_scrollbar(WINDOW *win, else if (percent > 100) percent = 100; - (void) wattrset(win, position_indicator_attr); + wattrset(win, position_indicator_attr); (void) sprintf(buffer, "%d%%", percent); (void) wmove(win, bottom, right - 7); (void) waddstr(win, buffer); if ((len = dlg_count_columns(buffer)) < 4) { - (void) wattrset(win, border_attr); + wattrset(win, border_attr); whline(win, dlg_boxchar(ACS_HLINE), 4 - len); } } @@ -212,7 +212,7 @@ dlg_draw_scrollbar(WINDOW *win, if (bar_high < all_high) { wmove(win, top + 1, right); - (void) wattrset(win, save); + wattrset(win, save); wvline(win, ACS_VLINE | A_REVERSE, all_high); bar_y = BARSIZE(this_data); @@ -221,7 +221,7 @@ dlg_draw_scrollbar(WINDOW *win, wmove(win, top + 1 + bar_y, right); - (void) wattrset(win, position_indicator_attr); + wattrset(win, position_indicator_attr); wattron(win, A_REVERSE); wvline(win, ACS_BLOCK, bar_high); } @@ -236,7 +236,7 @@ dlg_draw_scrollbar(WINDOW *win, attr, borderattr); - (void) wattrset(win, save); + wattrset(win, save); wmove(win, oldy, oldx); } @@ -255,6 +255,6 @@ dlg_draw_arrows(WINDOW *win, x, top, bottom, - menubox_border2_attr, + menubox_attr, menubox_border_attr); } Modified: projects/diffused_head/contrib/dialog/buttons.c ============================================================================== --- projects/diffused_head/contrib/dialog/buttons.c Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/buttons.c Thu Jan 10 05:36:42 2013 (r245247) @@ -1,9 +1,9 @@ /* - * $Id: buttons.c,v 1.90 2012/07/01 20:42:05 tom Exp $ + * $Id: buttons.c,v 1.86 2011/06/28 10:46:46 tom Exp $ * * buttons.c -- draw buttons, e.g., OK/Cancel * - * Copyright 2000-2011,2012 Thomas E. Dickey + * Copyright 2000-2010,2011 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -104,11 +104,11 @@ print_button(WINDOW *win, char *label, i : button_label_inactive_attr); (void) wmove(win, y, x); - (void) wattrset(win, selected - ? button_active_attr - : button_inactive_attr); + wattrset(win, selected + ? button_active_attr + : button_inactive_attr); (void) waddstr(win, "<"); - (void) wattrset(win, label_attr); + wattrset(win, label_attr); for (i = 0; i < limit; ++i) { int first = indx[i]; int last = indx[i + 1]; @@ -120,14 +120,14 @@ print_button(WINDOW *win, char *label, i const char *temp = (label + first); int cmp = string_to_char(&temp); if (dlg_isupper(cmp)) { - (void) wattrset(win, key_attr); + wattrset(win, key_attr); state = 1; } break; } #endif if (dlg_isupper(UCH(label[first]))) { - (void) wattrset(win, key_attr); + wattrset(win, key_attr); state = 1; } break; @@ -138,9 +138,9 @@ print_button(WINDOW *win, char *label, i } waddnstr(win, label + first, last - first); } - (void) wattrset(win, selected - ? button_active_attr - : button_inactive_attr); + wattrset(win, selected + ? button_active_attr + : button_inactive_attr); (void) waddstr(win, ">"); (void) wmove(win, y, x + ((int) strspn(label, " ")) + 1); } @@ -310,7 +310,7 @@ dlg_draw_buttons(WINDOW *win, (void) wmove(win, final_y, final_x); wrefresh(win); free(buffer); - (void) wattrset(win, save); + wattrset(win, save); } /* @@ -488,12 +488,10 @@ dlg_exit_buttoncode(int button) const char ** dlg_ok_label(void) { - static const char *labels[4]; + static const char *labels[3]; int n = 0; labels[n++] = my_ok_label(); - if (dialog_vars.extra_button) - labels[n++] = my_extra_label(); if (dialog_vars.help_button) labels[n++] = my_help_label(); labels[n] = 0; @@ -539,7 +537,6 @@ dlg_ok_buttoncode(int button) } else if (dialog_vars.help_button && (button == n)) { result = DLG_EXIT_HELP; } - dlg_trace_msg("# dlg_ok_buttoncode(%d) = %d\n", button, result); return result; } @@ -578,7 +575,7 @@ dlg_prev_ok_buttonindex(int current, int /* * Find the button-index for the "OK" or "Cancel" button, according to * whether --defaultno is given. If --nocancel was given, we always return - * the index for the first button (usually "OK" unless --nook was used). + * the index for "OK". */ int dlg_defaultno_button(void) @@ -589,30 +586,6 @@ dlg_defaultno_button(void) while (dlg_ok_buttoncode(result) != DLG_EXIT_CANCEL) ++result; } - dlg_trace_msg("# dlg_defaultno_button() = %d\n", result); - return result; -} - -/* - * Find the button-index for a button named with --default-button. If the - * option was not specified, or if the selected button does not exist, return - * the index of the first button (usually "OK" unless --nook was used). - */ -int -dlg_default_button(void) -{ - int i, n; - int result = 0; - - if (dialog_vars.default_button >= 0) { - for (i = 0; (n = dlg_ok_buttoncode(i)) >= 0; i++) { - if (n == dialog_vars.default_button) { - result = i; - break; - } - } - } - dlg_trace_msg("# dlg_default_button() = %d\n", result); return result; } Modified: projects/diffused_head/contrib/dialog/calendar.c ============================================================================== --- projects/diffused_head/contrib/dialog/calendar.c Thu Jan 10 04:51:07 2013 (r245246) +++ projects/diffused_head/contrib/dialog/calendar.c Thu Jan 10 05:36:42 2013 (r245247) @@ -1,9 +1,9 @@ /* - * $Id: calendar.c,v 1.66 2012/07/01 18:13:07 Zoltan.Kelemen Exp $ + * $Id: calendar.c,v 1.62 2011/06/29 09:47:06 tom Exp $ * * calendar.c -- implements the calendar box * - * Copyright 2001-2011,2012 Thomas E. Dickey + * Copyright 2001-2010,2011 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -225,14 +225,12 @@ draw_day(BOX * data, struct tm *current) int prev = days_in_month(current, -1); werase(data->window); - dlg_draw_box2(data->parent, - data->y - MARGIN, data->x - MARGIN, - data->height + (2 * MARGIN), data->width + (2 * MARGIN), - menubox_attr, - menubox_border_attr, - menubox_border2_attr); + dlg_draw_box(data->parent, + data->y - MARGIN, data->x - MARGIN, + data->height + (2 * MARGIN), data->width + (2 * MARGIN), + menubox_border_attr, menubox_attr); /* border of daybox */ - (void) wattrset(data->window, menubox_attr); /* daynames headline */ + wattrset(data->window, menubox_attr); /* daynames headline */ for (x = 0; x < 7; x++) { mvwprintw(data->window, 0, (x + 1) * cell_wide, "%*.*s ", @@ -248,7 +246,7 @@ draw_day(BOX * data, struct tm *current) week = (current->tm_yday + 6 + mday - current->tm_mday) / 7; for (y = 1; mday < last; y++) { - (void) wattrset(data->window, menubox_attr); /* weeknumbers headline */ + wattrset(data->window, menubox_attr); /* weeknumbers headline */ mvwprintw(data->window, y, 0, "%*d ", @@ -259,9 +257,9 @@ draw_day(BOX * data, struct tm *current) ++mday; if (wmove(data->window, y, this_x) == ERR) continue; - (void) wattrset(data->window, item_attr); /* not selected days */ + wattrset(data->window, item_attr); /* not selected days */ if (mday == day) { - (void) wattrset(data->window, item_selected_attr); /* selected day */ + wattrset(data->window, item_selected_attr); /* selected day */ save_y = y; save_x = this_x; } @@ -296,15 +294,13 @@ draw_month(BOX * data, struct tm *curren month = current->tm_mon + 1; - (void) wattrset(data->parent, dialog_attr); /* Headline "Month" */ + wattrset(data->parent, dialog_attr); /* Headline "Month" */ (void) mvwprintw(data->parent, data->y - 2, data->x - 1, _("Month")); - dlg_draw_box2(data->parent, - data->y - 1, data->x - 1, - data->height + 2, data->width + 2, - menubox_attr, - menubox_border_attr, - menubox_border2_attr); - (void) wattrset(data->window, item_attr); /* color the month selection */ + dlg_draw_box(data->parent, + data->y - 1, data->x - 1, + data->height + 2, data->width + 2, + menubox_border_attr, menubox_attr); /* borders of monthbox */ + wattrset(data->window, item_attr); /* color the month selection */ mvwprintw(data->window, 0, 0, "%s", nameOfMonth(month - 1)); wmove(data->window, 0, 0); return 0; @@ -318,15 +314,13 @@ draw_year(BOX * data, struct tm *current *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301100536.r0A5aheZ069670>