diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist index 474cf53b7d69..2b2484ed0da4 100644 --- a/contrib/amd/FREEBSD-Xlist +++ b/contrib/amd/FREEBSD-Xlist @@ -1,145 +1,268 @@ $FreeBSD$ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h *aux *autom4te.cache* *buildall *config* *depcomp *install-sh *lt* *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit *cvs-server.txt *conf/checkmount/checkmount_aix.c *conf/checkmount/checkmount_default.c *conf/checkmount/checkmount_osf.c *conf/checkmount/checkmount_svr4.c *conf/checkmount/checkmount_ultrix.c *conf/fh_dref/fh_dref_aix3.h *conf/fh_dref/fh_dref_aix42.h *conf/fh_dref/fh_dref_bsd44.h *conf/fh_dref/fh_dref_default.h *conf/fh_dref/fh_dref_hpux.h *conf/fh_dref/fh_dref_irix.h *conf/fh_dref/fh_dref_isc3.h *conf/fh_dref/fh_dref_linux.h *conf/fh_dref/fh_dref_nextstep.h *conf/fh_dref/fh_dref_osf2.h *conf/fh_dref/fh_dref_osf4.h *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 *conf/mount/mount_irix6.c *conf/mount/mount_isc3.c *conf/mount/mount_linux.c *conf/mount/mount_mach3.c *conf/mount/mount_stellix.c *conf/mount/mount_svr4.c *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 *conf/mtab/mtab_ultrix.c *conf/nfs_prot/nfs_prot_aix3.h *conf/nfs_prot/nfs_prot_aix4.h *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 *conf/nfs_prot/nfs_prot_default.h *conf/nfs_prot/nfs_prot_hpux.h *conf/nfs_prot/nfs_prot_hpux11.h *conf/nfs_prot/nfs_prot_irix5.h *conf/nfs_prot/nfs_prot_irix6.h *conf/nfs_prot/nfs_prot_linux.h *conf/nfs_prot/nfs_prot_ncr2.h *conf/nfs_prot/nfs_prot_netbsd.h *conf/nfs_prot/nfs_prot_netbsd1_3.h *conf/nfs_prot/nfs_prot_netbsd1_4.h *conf/nfs_prot/nfs_prot_nextstep.h *conf/nfs_prot/nfs_prot_openbsd.h *conf/nfs_prot/nfs_prot_osf2.h *conf/nfs_prot/nfs_prot_osf4.h *conf/nfs_prot/nfs_prot_osf5.h *conf/nfs_prot/nfs_prot_osf5_1.h *conf/nfs_prot/nfs_prot_sunos3.h *conf/nfs_prot/nfs_prot_sunos4.h *conf/nfs_prot/nfs_prot_sunos5_3.h *conf/nfs_prot/nfs_prot_sunos5_4.h *conf/nfs_prot/nfs_prot_sunos5_5.h *conf/nfs_prot/nfs_prot_sunos5_6.h *conf/nfs_prot/nfs_prot_sunos5_7.h *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 *conf/sa_dref/sa_dref_default.h *conf/sa_dref/sa_dref_isc3.h *conf/sa_dref/sa_dref_linux.h *conf/sa_dref/sa_dref_svr4.h *conf/transp/transp_tli.c *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 *conf/trap/trap_irix.h *conf/trap/trap_isc3.h *conf/trap/trap_linux.h *conf/trap/trap_mach3.h *conf/trap/trap_news4.h *conf/trap/trap_rtu6.h *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 *doc/am-utils.dvi *doc/am-utils.info *doc/am-utils.info-1 *doc/am-utils.info-2 *doc/am-utils.info-3 *doc/am-utils.info-4 *doc/am-utils.info-5 *doc/am-utils.info-6 *doc/am-utils.info-7 *doc/am-utils.ps *doc/hlfsd.ps *doc/mdate-sh *fixmount/Makefile.* *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 diff --git a/contrib/amd/FREEBSD-upgrade b/contrib/amd/FREEBSD-upgrade index a8e6d531c7ae..701f0cf6ffb8 100644 --- a/contrib/amd/FREEBSD-upgrade +++ b/contrib/amd/FREEBSD-upgrade @@ -1,99 +1,100 @@ # ex:ts=8 $FreeBSD$ -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 src/usr.sbin/amd/include/config.h, and src/usr.sbin/amd/include/config.h updated as needed. 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@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@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: amd/amd.8 r1.17 Uniformly refer to a file system as "file system" r1.16 Add the am-utils homepage to SEE ALSO r1.15 s/BSD/.Bx/ where appropriate r1.14 Avoid using parenthesis enclosure macros r1.13 split punctuation characters + misc fixes r1.12 mdoc(7)NG r1.11 Catch a left over reference to "/a" r1.10 Document change to the default mount dir. r1.9 Mention "amd -H" in the synopsis r1.8 Fix miscellaneous mdoc macro argument limit infringements r1.7 Don't refer to non-existent automount(8) r1.6 Fix errors in .Xr usage r1.3 un-mandocafied, un4.4BSD'ed r1.2 sort cross references amd/amd.c r1.7 use /.amd_mnt as default for -a amq/amq.8 r1.9 Uniformly refer to a file system as "file system". r1.8 s/BSD/.Bx/ where appropriate. r1.6 mdoc(7)NG. r1.5 Remove reference to non-existent manpage r1.4 Fix typos r1.3 un-mandocafied, un4.4BSD'ed amq/pawd.1 r1.3 un-mandocafied, un4.4BSD'ed r1.2 sorting of references conf/nfs_prot/nfs_prot_freebsd3.h r1.11 Userland part of nfs client/server split and cleanup r1.6 restore the standard name nfs_fh3 r1.3 Fully use our own generated files for NFSv3 r1.2 rpcgen our own files for NFSv3 support fixmount/fixmount.8 r1.8 Uniformly refer to a file system as "file system" r1.6 split punctuation characters + misc fixes. r1.5 mdoc(7)NG. r1.4 ".Mn mountd" -> ".Nm mountd" r1.3 un-mandocafied, un4.4BSD'ed r1.2 More sorting of references. fsinfo/fsinfo.8 r1.9 add section number to .Xr directive r1.7 Uniformly refer to a file system as "file system" r1.6 split punctuation characters + misc fixes r1.5 mdoc(7)NG r1.3 describe all of the command line options r1.2 un-mandocafied, un4.4BSD'ed mk-amd-map/mk-amd-map.8 r1.4 removed HISTORY info from the .Os call. r1.2 un-mandocafied, un4.4BSD'ed scripts/amd.conf.5 r1.15 Bring man page back in shape r1.13 Uniformly refer to a file system as "file system" r1.12 Avoid using parenthesis enclosure macros r1.11 mdoc(7)NG r1.10 Fix miscellaneous mdoc macro argument limit infringements r1.8 Fix a bunch of broken cross-references r1.7 Bad reference of uname(2) -> uname(3) r1.6 Grammer fix and style nits. r1.5 xfer typo r1.4 un-mandocafied, un4.4BSD'ed r1.3 More sorting of references. wire-test/wire-test.8 r1.2 un-mandocafied, un4.4BSD'ed mbr@FreeBSD.org obrien@NUXI.com 05-November-1999