From df1cc4e53a6f0c6ef685dd2947edc8f94b7444ff Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Tue, 11 Dec 2007 19:16:51 +0000 Subject: [PATCH] Update for the 6.1.5 import. --- contrib/amd/FREEBSD-Xlist | 123 ++++++++++++++++++++++++++++++++++++ contrib/amd/FREEBSD-upgrade | 19 +++--- 2 files changed, 133 insertions(+), 9 deletions(-) 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 @@ -2,6 +2,7 @@ $FreeBSD$ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ $FreeBSD$ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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 @@ $FreeBSD$ *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,21 +1,19 @@ # 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 @@ -25,8 +23,11 @@ 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: