PERFORCE change 130929 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Dec 14 19:20:30 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130929
Change 130929 by marcel at marcel_cluster on 2007/12/15 03:20:09
IFC @130911
Affected files ...
.. //depot/projects/powerpc/Makefile#5 integrate
.. //depot/projects/powerpc/contrib/amd/FREEBSD-Xlist#2 integrate
.. //depot/projects/powerpc/contrib/amd/FREEBSD-upgrade#2 integrate
.. //depot/projects/powerpc/contrib/gcc/fold-const.c#4 integrate
.. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.c#4 delete
.. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.h#4 delete
.. //depot/projects/powerpc/etc/rc.d/ldconfig#4 integrate
.. //depot/projects/powerpc/games/fortune/datfiles/fortunes#9 integrate
.. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#6 integrate
.. //depot/projects/powerpc/include/complex.h#2 integrate
.. //depot/projects/powerpc/include/nsswitch.h#2 integrate
.. //depot/projects/powerpc/include/pthread_np.h#3 integrate
.. //depot/projects/powerpc/lib/Makefile#7 integrate
.. //depot/projects/powerpc/lib/libc/Versions.def#3 integrate
.. //depot/projects/powerpc/lib/libc/gen/getgrent.c#2 integrate
.. //depot/projects/powerpc/lib/libc/gen/getgrouplist.c#3 integrate
.. //depot/projects/powerpc/lib/libc/locale/localeconv.c#2 integrate
.. //depot/projects/powerpc/lib/libc/net/nsdispatch.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdlib/grantpt.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdlib/rand.c#3 integrate
.. //depot/projects/powerpc/lib/libc/string/strtok.3#2 integrate
.. //depot/projects/powerpc/lib/libc/string/strtok.c#2 integrate
.. //depot/projects/powerpc/lib/libc/string/wcstok.c#2 integrate
.. //depot/projects/powerpc/lib/libfetch/Makefile#3 integrate
.. //depot/projects/powerpc/lib/libfetch/common.c#2 integrate
.. //depot/projects/powerpc/lib/libfetch/common.h#2 integrate
.. //depot/projects/powerpc/lib/libfetch/fetch.c#2 integrate
.. //depot/projects/powerpc/lib/libfetch/file.c#2 integrate
.. //depot/projects/powerpc/lib/libfetch/ftp.c#3 integrate
.. //depot/projects/powerpc/lib/libfetch/http.c#3 integrate
.. //depot/projects/powerpc/lib/libthr/pthread.map#4 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#7 integrate
.. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#6 integrate
.. //depot/projects/powerpc/lib/msun/Makefile#5 integrate
.. //depot/projects/powerpc/lib/msun/Symbol.map#4 integrate
.. //depot/projects/powerpc/lib/msun/man/atan2.3#3 integrate
.. //depot/projects/powerpc/lib/msun/man/hypot.3#3 integrate
.. //depot/projects/powerpc/lib/msun/man/sqrt.3#3 integrate
.. //depot/projects/powerpc/lib/msun/src/s_carg.c#1 branch
.. //depot/projects/powerpc/lib/msun/src/s_cargf.c#1 branch
.. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#12 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifconfig.c#7 integrate
.. //depot/projects/powerpc/sbin/natd/natd.8#2 integrate
.. //depot/projects/powerpc/share/man/man4/nve.4#4 integrate
.. //depot/projects/powerpc/share/man/man5/src.conf.5#9 integrate
.. //depot/projects/powerpc/share/man/man7/build.7#3 integrate
.. //depot/projects/powerpc/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#10 integrate
.. //depot/projects/powerpc/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#10 integrate
.. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/powerpc/sys/conf/files#18 integrate
.. //depot/projects/powerpc/sys/conf/files.powerpc#11 integrate
.. //depot/projects/powerpc/sys/dev/amr/amr.c#6 integrate
.. //depot/projects/powerpc/sys/dev/amr/amr_cam.c#7 integrate
.. //depot/projects/powerpc/sys/dev/amr/amr_pci.c#7 integrate
.. //depot/projects/powerpc/sys/dev/amr/amrvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-all.h#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#14 integrate
.. //depot/projects/powerpc/sys/dev/sound/pci/ich.c#11 integrate
.. //depot/projects/powerpc/sys/dev/sound/pci/maestro.c#8 integrate
.. //depot/projects/powerpc/sys/dev/usb/umass.c#8 integrate
.. //depot/projects/powerpc/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/powerpc/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/powerpc/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/powerpc/sys/kern/Makefile#6 integrate
.. //depot/projects/powerpc/sys/kern/kern_resource.c#12 integrate
.. //depot/projects/powerpc/sys/kern/sched_4bsd.c#9 integrate
.. //depot/projects/powerpc/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/powerpc/sys/net/if.h#7 integrate
.. //depot/projects/powerpc/sys/net/route.c#8 integrate
.. //depot/projects/powerpc/sys/net/route.h#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_radiotap.h#4 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_l2tp.c#4 integrate
.. //depot/projects/powerpc/sys/netinet/if_ether.c#11 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_ofld.c#1 branch
.. //depot/projects/powerpc/sys/netinet/tcp_ofld.h#1 branch
.. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#14 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_syncache.h#2 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_var.h#15 integrate
.. //depot/projects/powerpc/sys/netinet/toedev.h#1 branch
.. //depot/projects/powerpc/sys/netinet6/dest6.c#5 integrate
.. //depot/projects/powerpc/sys/netinet6/frag6.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/icmp6.c#10 integrate
.. //depot/projects/powerpc/sys/netinet6/in6.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/in6.h#7 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_cksum.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_gif.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_gif.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_ifattach.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_pcb.h#6 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_proto.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_rmx.c#5 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_src.c#9 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_var.h#7 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_ecn.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_forward.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_id.c#3 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_ipsec.c#3 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_ipsec.h#3 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_mroute.c#8 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_mroute.h#6 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_output.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6_var.h#7 integrate
.. //depot/projects/powerpc/sys/netinet6/ip6protosw.h#5 integrate
.. //depot/projects/powerpc/sys/netinet6/mld6.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/mld6_var.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/nd6.c#10 integrate
.. //depot/projects/powerpc/sys/netinet6/nd6.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/nd6_nbr.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/nd6_rtr.c#7 integrate
.. //depot/projects/powerpc/sys/netinet6/pim6.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/pim6_var.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#8 integrate
.. //depot/projects/powerpc/sys/netinet6/raw_ip6.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/route6.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/scope6.c#6 integrate
.. //depot/projects/powerpc/sys/netinet6/scope6_var.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#14 integrate
.. //depot/projects/powerpc/sys/netinet6/sctp6_var.h#7 integrate
.. //depot/projects/powerpc/sys/netinet6/tcp6_var.h#4 integrate
.. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#10 integrate
.. //depot/projects/powerpc/sys/netinet6/udp6_var.h#6 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/clock.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/copyinout.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/interrupt.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/locore.S#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/nexus.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/ofw_machdep.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/ofwmagic.S#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/trap.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/uio_machdep.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/uma_machdep.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#1 branch
.. //depot/projects/powerpc/sys/powerpc/powerpc/clock.c#7 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/copyinout.c#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/db_memrw.c#2 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/interrupt.c#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/locore.S#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#13 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/mmu_oea.c#4 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/nexus.c#6 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#9 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/ofwmagic.S#2 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/swtch.S#4 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/trap.c#10 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/trap_subr.S#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/uio_machdep.c#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/uma_machdep.c#3 delete
.. //depot/projects/powerpc/sys/powerpc/powerpc/vm_machdep.c#10 delete
.. //depot/projects/powerpc/sys/sys/kerneldump.h#3 integrate
.. //depot/projects/powerpc/sys/sys/pcpu.h#9 integrate
.. //depot/projects/powerpc/sys/sys/socket.h#8 integrate
.. //depot/projects/powerpc/sys/vm/vm_page.c#13 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_BZIP2#2 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_GNU#2 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_GSSAPI#1 branch
.. //depot/projects/powerpc/tools/build/options/WITHOUT_KERBEROS#2 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_KVM#2 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_PAM#2 integrate
.. //depot/projects/powerpc/tools/build/options/WITHOUT_TOOLCHAIN#3 integrate
.. //depot/projects/powerpc/tools/build/options/makeman#3 integrate
.. //depot/projects/powerpc/tools/tools/ath/athdebug/athdebug.c#3 integrate
.. //depot/projects/powerpc/tools/tools/ath/athstats/Makefile#3 integrate
.. //depot/projects/powerpc/tools/tools/ath/athstats/athstats.c#3 integrate
.. //depot/projects/powerpc/tools/tools/ath/athstats/main.c#3 integrate
.. //depot/projects/powerpc/tools/tools/ath/athstats/statfoo.c#3 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat_args.c#2 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat_bin.c#2 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat_cred.c#2 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat_files.c#2 integrate
.. //depot/projects/powerpc/usr.bin/vmstat/Makefile#2 integrate
.. //depot/projects/powerpc/usr.bin/vmstat/vmstat.8#2 integrate
.. //depot/projects/powerpc/usr.bin/vmstat/vmstat.c#3 integrate
.. //depot/projects/powerpc/usr.bin/xinstall/xinstall.c#2 integrate
.. //depot/projects/powerpc/usr.sbin/syslogd/syslogd.c#3 integrate
Differences ...
==== //depot/projects/powerpc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
+# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $
#
# The user-driven targets are:
#
@@ -234,17 +234,18 @@
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
- (cd ${.CURDIR} && make make); \
+ (cd ${.CURDIR} && ${MAKE} make); \
fi
#
# Upgrade make(1) to the current version using the installed
-# headers, libraries and tools.
+# headers, libraries and tools. Also, allow the location of
+# the system bsdmake-like utility to be overridden.
#
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-MMAKE= ${MMAKEENV} make \
+MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
==== //depot/projects/powerpc/contrib/amd/FREEBSD-Xlist#2 (text+ko) ====
@@ -1,7 +1,8 @@
-$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $
*LSM.am-utils
*Makefile.*
*README.autofs
+*README.osx
*ac*.m4
*.old
*acconfig.h
@@ -15,6 +16,7 @@
*missing
*mkinstalldirs
*stamp-h.in
+*amd/test1.sh
*amd/Makefile.*
*amq/Makefile.*
*commit
@@ -38,10 +40,13 @@
*conf/fh_dref/fh_dref_sunos3.h
*conf/fh_dref/fh_dref_sunos4.h
*conf/fh_dref/fh_dref_svr4.h
+*conf/hn_dref/hn_dref_default.h,
*conf/hn_dref/hn_dref_isc3.h
*conf/hn_dref/hn_dref_linux.h
*conf/mount/mount_aix.c
+*conf/mount/mount_aix3.c
*conf/mount/mount_bsdi3.c
+*conf/mount/mount_default.c
*conf/mount/mount_freebsd3.c
*conf/mount/mount_hpux.c
*conf/mount/mount_irix5.c
@@ -54,6 +59,7 @@
*conf/mtab/mtab_aix.c
*conf/mtab/mtab_file.c
*conf/mtab/mtab_isc3.c
+*conf/mtab/mtab_linux.c
*conf/mtab/mtab_mach3.c
*conf/mtab/mtab_osf.c
*conf/mtab/mtab_svr4.c
@@ -63,6 +69,7 @@
*conf/nfs_prot/nfs_prot_aix4_2.h
*conf/nfs_prot/nfs_prot_aix4_3.h
*conf/nfs_prot/nfs_prot_aix5_1.h
+*conf/nfs_prot/nfs_prot_aix5_2.h
*conf/nfs_prot/nfs_prot_bsdi2.h
*conf/nfs_prot/nfs_prot_bsdi3.h
*conf/nfs_prot/nfs_prot_darwin.h
@@ -92,6 +99,12 @@
*conf/nfs_prot/nfs_prot_sunos5_8.h
*conf/nfs_prot/nfs_prot_svr4.h
*conf/nfs_prot/nfs_prot_ultrix.h
+*conf/autofs/autofs_linux.h
+*conf/autofs/autofs_linux.c
+*conf/autofs/autofs_solaris_v1.h
+*conf/autofs/autofs_solaris_v1.c
+*conf/autofs/autofs_solaris_v2_v3.h
+*conf/autofs/autofs_solaris_v2_v3.c
*conf/sa_dref/sa_dref_386bsd.h
*conf/sa_dref/sa_dref_aix3.h
*conf/sa_dref/sa_dref_aoi.h
@@ -103,6 +116,7 @@
*conf/trap/trap_aix3.h
*conf/trap/trap_aux.h
*conf/trap/trap_dgux.h
+*conf/trap/trap_freebsd3.h
*conf/trap/trap_hcx.h
*conf/trap/trap_hpux.h
*conf/trap/trap_hpux11.h
@@ -115,7 +129,9 @@
*conf/trap/trap_stellix.h
*conf/trap/trap_svr4.h
*conf/trap/trap_ultrix.h
+*conf/umount/umount_aix.c
*conf/umount/umount_default.c
+*conf/umount/umount_linux.c
*conf/umount/umount_osf.c
*doc/Makefile.am
*doc/Makefile.in
@@ -135,11 +151,118 @@
*fsinfo/Makefile.*
*hlfsd/Makefile.*
*libamu/Makefile.*
+*libamu/alloca.c
*libamu/clnt_sperrno.c
*libamu/memcmp.c
*libamu/strcasecmp.c
*libamu/strdup.c
*libamu/strstr.c
+*libamu/strlcat.c
+*libamu/strlcpy.c
*libamu/ualarm.c
*mk-amd-map/Makefile.*
*wire-test/Makefile.*
+*m4/GNUmakefile
+*m4/amdgrep*
+*m4/amindent*
+*m4/autopat*
+*m4/chop-aclocal.pl*
+*m4/copy-if-newbig*
+*m4/mk-aclocal*
+*m4/mkconf*
+*m4/rmtspc*
+*m4/update_build_version*
+*m4/macros/HEADER
+*m4/macros/TRAILER
+*m4/macros/c_void_p.m4
+*m4/macros/cache_check_dynamic.m4
+*m4/macros/check_amu_fs.m4
+*m4/macros/check_checkmount_style.m4
+*m4/macros/check_extern.m4
+*m4/macros/check_fhandle.m4
+*m4/macros/check_field.m4
+*m4/macros/check_fs_headers.m4
+*m4/macros/check_fs_mntent.m4
+*m4/macros/check_gnu_getopt.m4
+*m4/macros/check_hide_mount_type.m4
+*m4/macros/check_lib2.m4
+*m4/macros/check_map_funcs.m4
+*m4/macros/check_mnt2_cdfs_opt.m4
+*m4/macros/check_mnt2_gen_opt.m4
+*m4/macros/check_mnt2_nfs_opt.m4
+*m4/macros/check_mnttab_file_name.m4
+*m4/macros/check_mnttab_location.m4
+*m4/macros/check_mnttab_opt.m4
+*m4/macros/check_mnttab_style.m4
+*m4/macros/check_mnttab_type.m4
+*m4/macros/check_mount_style.m4
+*m4/macros/check_mount_trap.m4
+*m4/macros/check_mount_type.m4
+*m4/macros/check_mtype_printf_type.m4
+*m4/macros/check_mtype_type.m4
+*m4/macros/check_network_transport_type.m4
+*m4/macros/check_nfs_fh_dref.m4
+*m4/macros/check_nfs_hn_dref.m4
+*m4/macros/check_nfs_prot_headers.m4
+*m4/macros/check_nfs_sa_dref.m4
+*m4/macros/check_nfs_socket_connection.m4
+*m4/macros/check_os_libs.m4
+*m4/macros/check_restartable_signal_handler.m4
+*m4/macros/check_umount_style.m4
+*m4/macros/check_unmount_args.m4
+*m4/macros/check_unmount_call.m4
+*m4/macros/expand_cpp_hex.m4
+*m4/macros/expand_cpp_int.m4
+*m4/macros/expand_cpp_string.m4
+*m4/macros/expand_run_string.m4
+*m4/macros/extern_optarg.m4
+*m4/macros/extern_sys_errlist.m4
+*m4/macros/field_mntent_t_mnt_time_string.m4
+*m4/macros/func_bad_memcmp.m4
+*m4/macros/func_bad_yp_all.m4
+*m4/macros/header_templates.m4
+*m4/macros/host_macros.m4
+*m4/macros/linux_headers.m4
+*m4/macros/localconfig.m4
+*m4/macros/mount_headers.m4
+*m4/macros/name_package.m4
+*m4/macros/name_version.m4
+*m4/macros/opt_amu_cflags.m4
+*m4/macros/opt_cppflags.m4
+*m4/macros/opt_debug.m4
+*m4/macros/opt_ldflags.m4
+*m4/macros/opt_libs.m4
+*m4/macros/os_cflags.m4
+*m4/macros/os_cppflags.m4
+*m4/macros/os_ldflags.m4
+*m4/macros/package_bugreport.m4
+*m4/macros/package_name.m4
+*m4/macros/package_version.m4
+*m4/macros/save_state.m4
+*m4/macros/struct_field_nfs_fh.m4
+*m4/macros/struct_mntent.m4
+*m4/macros/struct_mnttab.m4
+*m4/macros/struct_nfs_args.m4
+*m4/macros/struct_nfs_fh.m4
+*m4/macros/struct_nfs_fh3.m4
+*m4/macros/struct_nfs_gfs_mount.m4
+*m4/macros/try_compile_anyfs.m4
+*m4/macros/try_compile_nfs.m4
+*m4/macros/try_compile_rpc.m4
+*m4/macros/type_auth_create_gidlist.m4
+*m4/macros/type_cachefs_args.m4
+*m4/macros/type_cdfs_args.m4
+*m4/macros/type_efs_args.m4
+*m4/macros/type_lofs_args.m4
+*m4/macros/type_mfs_args.m4
+*m4/macros/type_pcfs_args.m4
+*m4/macros/type_recvfrom_fromlen.m4
+*m4/macros/type_rfs_args.m4
+*m4/macros/type_svc_in_arg.m4
+*m4/macros/type_time_t.m4
+*m4/macros/type_tmpfs_args.m4
+*m4/macros/type_ufs_args.m4
+*m4/macros/type_xdrproc_t.m4
+*m4/macros/type_xfs_args.m4
+*m4/macros/type_yp_order_outorder.m4
+*m4/macros/with_addon.m4
==== //depot/projects/powerpc/contrib/amd/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,21 +1,19 @@
# ex:ts=8
-$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $
-AMD (am-utils) 6.0.9
- originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
- (http://www.cs.columbia.edu/~ezk/am-utils/index.html)
-
+AMD (am-utils) 6.1.5
+ originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/
For the import of AMD many files were pruned by:
- tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz
+ tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz
and `find . -name '.cvsignore' -delete`
Then imported by:
- cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \
- src/contrib/amd COLUMBIA amd_6_0_9
+ cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \
+ src/contrib/amd COLUMBIA amd_6_1_5
After the import, a separate extraction of am-utils was GNU configured in
the "normal" way. The resulting config.h file should be compared with
@@ -25,8 +23,11 @@
To make local changes to amd, simply patch and commit to the main
branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch.
-All local changes should be submitted to "amd-dev at majordomo.cs.columbia.edu"
-for inclusion in the next vendor release.
+Note, we don't trim anything in scripts/ as sysadmins may find the bits
+as a useful reference.
+
+All local changes should be submitted to "am-utils at am-utils.org" or
+https://bugzilla.am-utils.org for inclusion in the next vendor release.
Local changes:
==== //depot/projects/powerpc/contrib/gcc/fold-const.c#4 (text+ko) ====
@@ -5661,6 +5661,9 @@
}
break;
}
+ /* If the constant is negative, we cannot simplify this. */
+ if (tree_int_cst_sgn (c) == -1)
+ break;
/* FALLTHROUGH */
case NEGATE_EXPR:
if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p))
==== //depot/projects/powerpc/etc/rc.d/ldconfig#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $
#
# PROVIDE: ldconfig
@@ -49,8 +49,14 @@
fi
fi
done
- echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
- ${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
+ _LDC=""
+ for i in ${ldconfig32_paths}; do
+ if [ -r "${i}" ]; then
+ _LDC="${_LDC} ${i}"
+ fi
+ done
+ echo '32-bit compatibility ldconfig path:' ${_LDC}
+ ${ldconfig} -32 -m ${_ins} ${_LDC}
;;
esac
==== //depot/projects/powerpc/games/fortune/datfiles/fortunes#9 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.250 2007/12/14 01:47:11 wes Exp $
%
=======================================================================
|| ||
@@ -56259,6 +56259,9 @@
%
Where am I? Who am I? Am I? I
%
+Where am I, and what am I doing in this handbasket?
+ -- Mark A. Matthews, to Wes Peters, circa 1996
+%
Where are the calculations that go with a calculated risk?
%
WHERE CAN THE MATTER BE
==== //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#6 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $
%
PLAYGIRL, Inc.
Philadelphia, Pa. 19369
@@ -755,7 +755,7 @@
"What is amiss, my friend?" asked the king.
"My lord," gasped Lancelot, "you have given me the wrong key!"
%
- "Before we get married," said the young woman to her fiancee,
+ "Before we get married," said the young woman to her fiance,
"I want to confess some affairs that I've had in the past."
"But you told me all about those a few weeks ago," her young man
replied.
==== //depot/projects/powerpc/include/complex.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $
+ * $FreeBSD: src/include/complex.h,v 1.7 2007/12/12 23:43:51 das Exp $
*/
#ifndef _COMPLEX_H
@@ -45,6 +45,8 @@
double cabs(double complex);
float cabsf(float complex);
+double carg(double complex);
+float cargf(float complex);
double cimag(double complex);
float cimagf(float complex);
long double cimagl(long double complex);
==== //depot/projects/powerpc/include/nsswitch.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */
-/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */
+/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -68,7 +68,8 @@
#define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */
#define NSSRC_NIS "nis" /* YP/NIS */
#define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */
-#define NSSRC_CACHE "cache" /* cache daemon */
+#define NSSRC_CACHE "cache" /* nscd daemon */
+#define NSSRC_FALLBACK "__fallback" /* internal fallback source */
/*
* currently implemented databases
@@ -132,6 +133,7 @@
*/
#define NS_FILES_CB(F,C) { NSSRC_FILES, F, C },
#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C },
+#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL },
#ifdef HESIOD
# define NS_DNS_CB(F,C) { NSSRC_DNS, F, C },
==== //depot/projects/powerpc/include/pthread_np.h#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $
+ * $FreeBSD: src/include/pthread_np.h,v 1.18 2007/12/14 06:25:56 davidxu Exp $
*/
#ifndef _PTHREAD_NP_H_
#define _PTHREAD_NP_H_
@@ -49,6 +49,10 @@
void pthread_resume_all_np(void);
int pthread_resume_np(pthread_t);
void pthread_set_name_np(pthread_t, const char *);
+int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count);
+int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count);
+int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count);
+int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count);
int pthread_single_np(void);
void pthread_suspend_all_np(void);
int pthread_suspend_np(pthread_t);
==== //depot/projects/powerpc/lib/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $
+# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@
libbegemot ${_libbluetooth} libbsnmp libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libexpat libfetch libftpio libgeom ${_libgpib} \
- libgssapi libipsec \
+ ${_libgssapi} libipsec \
${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
${_libncp} ${_libngatm} libopie libpam libpcap \
libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -62,6 +62,10 @@
_libsdp= libsdp
.endif
+.if ${MK_GSSAPI} != "no"
+_libgssapi= libgssapi
+.endif
+
.if ${MK_IPX} != "no"
_libipx= libipx
.endif
==== //depot/projects/powerpc/lib/libc/Versions.def#3 (text) ====
@@ -1,9 +1,14 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.4 2007/12/14 20:49:06 deischen Exp $
# This is our first version; it depends on no other.
+# This version was first added to 7.0-current.
FBSD_1.0 {
};
+# This version was first added to 8.0-current.
+FBSD_1.1 {
+} FBSD_1.0;
+
# This is our private namespace. Any global interfaces that are
# strictly for use only by other FreeBSD applications and libraries
# are listed here. We use a separate namespace so we can write
==== //depot/projects/powerpc/lib/libc/gen/getgrent.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -40,6 +40,7 @@
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
#endif
+#include <assert.h>
#include <ctype.h>
#include <errno.h>
#ifdef HESIOD
@@ -143,6 +144,9 @@
static int compat_setgrent(void *, void *, va_list);
static int compat_group(void *, void *, va_list);
+static int gr_addgid(gid_t, gid_t *, int, int *);
+static int getgroupmembership_fallback(void *, void *, va_list);
+
#ifdef NS_CACHING
static int grp_id_func(char *, size_t *, va_list, void *);
static int grp_marshal_func(char *, size_t *, void *, va_list, void *);
@@ -361,89 +365,195 @@
NSS_MP_CACHE_HANDLING(group);
#endif /* NS_CACHING */
-
-/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
-int
-setgrent(void)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ NULL, NULL);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
+static const ns_dtab setgrent_dtab[] = {
+ { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
+ { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
+ { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
+ { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&setgrent_cache_info)
#endif
- { NULL, NULL, NULL }
- };
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
- return (1);
-}
-
+ { NULL, NULL, NULL }
+};
-int
-setgroupent(int stayopen)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ NULL, NULL);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
+static const ns_dtab endgrent_dtab[] = {
+ { NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
+ { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
+ { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
+ { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&endgrent_cache_info)
#endif
- { NULL, NULL, NULL }
- };
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc,
- stayopen);
- return (1);
-}
-
+ { NULL, NULL, NULL }
+};
-void
-endgrent(void)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ grp_marshal_func, grp_unmarshal_func);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
+static const ns_dtab getgrent_r_dtab[] = {
+ { NSSRC_FILES, files_group, (void *)nss_lt_all },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
+ { NSSRC_DNS, dns_group, (void *)nss_lt_all },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
+ { NSSRC_NIS, nis_group, (void *)nss_lt_all },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
+ { NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&getgrent_r_cache_info)
#endif
- { NULL, NULL, NULL }
+ { NULL, NULL, NULL }
+};
+
+static int
+gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt)
+{
+ int ret, dupc;
+
+ for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) {
+ if (groups[dupc] == gid)
+ return 1;
+ }
+
+ ret = 1;
+ if (*grpcnt < maxgrp)
+ groups[*grpcnt] = gid;
+ else
+ ret = 0;
+
+ (*grpcnt)++;
+
+ return ret;
+}
+
+static int
+getgroupmembership_fallback(void *retval, void *mdata, va_list ap)
+{
+ const ns_src src[] = {
+ { mdata, NS_SUCCESS },
+ { NULL, 0}
};
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc);
+ struct group grp;
+ struct group *grp_p;
+ char *buf;
+ size_t bufsize;
+ const char *uname;
+ gid_t *groups;
+ gid_t agroup;
+ int maxgrp, *grpcnt;
+ int i, rv, ret_errno;
+
+ /*
+ * As this is a fallback method, only provided src
+ * list will be respected during methods search.
+ */
+ assert(src[0].name != NULL);
+
+ uname = va_arg(ap, const char *);
+ agroup = va_arg(ap, gid_t);
+ groups = va_arg(ap, gid_t *);
+ maxgrp = va_arg(ap, int);
+ grpcnt = va_arg(ap, int *);
+
+ rv = NS_UNAVAIL;
+
+ buf = malloc(GRP_STORAGE_INITIAL);
+ if (buf == NULL)
+ goto out;
+
+ bufsize = GRP_STORAGE_INITIAL;
+
+ gr_addgid(agroup, groups, maxgrp, grpcnt);
+
+ _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0);
+ for (;;) {
+ do {
+ ret_errno = 0;
+ grp_p = NULL;
+ rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP,
+ "getgrent_r", src, &grp, buf, bufsize, &ret_errno);
+
+ if (grp_p == NULL && ret_errno == ERANGE) {
+ free(buf);
+ if ((bufsize << 1) > GRP_STORAGE_MAX) {
+ buf = NULL;
+ errno = ERANGE;
+ goto out;
+ }
+
+ bufsize <<= 1;
+ buf = malloc(bufsize);
+ if (buf == NULL) {
+ goto out;
+ }
+ }
+ } while (grp_p == NULL && ret_errno == ERANGE);
+
+ if (ret_errno != 0) {
+ errno = ret_errno;
+ goto out;
+ }
+
+ if (grp_p == NULL)
+ break;
+
+ for (i = 0; grp.gr_mem[i]; i++) {
+ if (strcmp(grp.gr_mem[i], uname) == 0)
+ gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt);
+ }
+ }
+
+ _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src);
+out:
+ free(buf);
+ return (rv);
+}
+
+/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
+int
+setgrent(void)
+{
+ (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
+ return (1);
+}
+
+
+int
+setgroupent(int stayopen)
+{
+ (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc,
+ stayopen);
+ return (1);
+}
+
+
+void
+endgrent(void)
+{
+ (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc);
}
@@ -451,31 +561,11 @@
getgrent_r(struct group *grp, char *buffer, size_t bufsize,
struct group **result)
{
-#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- grp_marshal_func, grp_unmarshal_func);
-#endif
-
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_group, (void *)nss_lt_all },
-#ifdef HESIOD
- { NSSRC_DNS, dns_group, (void *)nss_lt_all },
-#endif
-#ifdef YP
- { NSSRC_NIS, nis_group, (void *)nss_lt_all },
-#endif
- { NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
-#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
-#endif
- { NULL, NULL, NULL }
- };
int rv, ret_errno;
ret_errno = 0;
*result = NULL;
- rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
+ rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
grp, buffer, bufsize, &ret_errno);
if (rv == NS_SUCCESS)
return (0);
@@ -560,6 +650,30 @@
}
+
+int
+__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups,
+ int maxgrp, int *grpcnt)
+{
+ static const ns_dtab dtab[] = {
+ NS_FALLBACK_CB(getgroupmembership_fallback)
+ { NULL, NULL, NULL }
+ };
+ int rv;
+
+ assert(uname != NULL);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list