head 1.19; access; symbols OPENPKG_E1_MP_HEAD:1.16 OPENPKG_E1_MP:1.16 OPENPKG_E1_MP_2_STABLE:1.16 OPENPKG_E1_FP:1.16 OPENPKG_2_STABLE_MP:1.16 OPENPKG_2_STABLE_20061018:1.16 OPENPKG_2_STABLE_20060622:1.16 OPENPKG_2_STABLE:1.16.0.4 OPENPKG_2_STABLE_BP:1.16 OPENPKG_2_5_RELEASE:1.16 OPENPKG_2_5_SOLID:1.16.0.2 OPENPKG_2_5_SOLID_BP:1.16 OPENPKG_2_4_RELEASE:1.13 OPENPKG_2_4_SOLID:1.13.0.2 OPENPKG_2_4_SOLID_BP:1.13 OPENPKG_CW_FP:1.13 OPENPKG_2_3_RELEASE:1.12 OPENPKG_2_3_SOLID:1.12.0.2 OPENPKG_2_3_SOLID_BP:1.12 OPENPKG_2_2_RELEASE:1.9 OPENPKG_2_2_SOLID:1.9.0.4 OPENPKG_2_2_SOLID_BP:1.9 OPENPKG_2_1_RELEASE:1.9 OPENPKG_2_1_SOLID:1.9.0.2 OPENPKG_2_1_SOLID_BP:1.9 OPENPKG_2_0_RELEASE:1.8 OPENPKG_2_0_SOLID:1.8.0.2 OPENPKG_2_0_SOLID_BP:1.8 OPENPKG_1_3_RELEASE:1.3.2.1 OPENPKG_1_3_SOLID:1.3.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.3.2.1 OPENPKG_1_STABLE_MP:1.5 OPENPKG_1_2_RELEASE:1.3 OPENPKG_1_2_SOLID:1.3.0.4 OPENPKG_1_2_SOLID_BP:1.3 OPENPKG_1_STABLE:1.3.0.2 OPENPKG_1_STABLE_BP:1.3 OPENPKG_1_1_RELEASE:1.1 OPENPKG_1_1_SOLID:1.1.0.2 OPENPKG_1_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.19 date 2009.04.18.17.46.19; author rse; state Exp; branches; next 1.18; commitid yqvhZMnEEn2IzwKt; 1.18 date 2009.04.18.11.00.47; author rse; state Exp; branches; next 1.17; commitid kJd7nI4TtabAkuKt; 1.17 date 2007.12.22.15.37.07; author rse; state Exp; branches; next 1.16; commitid aQqMid9qwWpXnrKs; 1.16 date 2005.10.11.06.39.34; author rse; state Exp; branches; next 1.15; 1.15 date 2005.09.28.14.37.50; author rse; state Exp; branches; next 1.14; 1.14 date 2005.09.22.13.40.00; author thl; state Exp; branches; next 1.13; 1.13 date 2005.03.19.12.47.15; author rse; state Exp; branches; next 1.12; 1.12 date 2005.02.04.22.42.06; author ms; state Exp; branches; next 1.11; 1.11 date 2005.02.04.22.29.49; author ms; state Exp; branches; next 1.10; 1.10 date 2004.12.21.10.27.40; author ms; state Exp; branches; next 1.9; 1.9 date 2004.06.03.12.25.32; author thl; state Exp; branches; next 1.8; 1.8 date 2004.02.02.21.32.34; author thl; state Exp; branches; next 1.7; 1.7 date 2004.01.13.14.59.34; author ms; state Exp; branches; next 1.6; 1.6 date 2003.10.29.12.06.41; author rse; state Exp; branches; next 1.5; 1.5 date 2003.01.31.12.13.56; author ps; state Exp; branches; next 1.4; 1.4 date 2003.01.27.18.40.28; author ms; state Exp; branches; next 1.3; 1.3 date 2003.01.14.13.57.05; author thl; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2002.09.12.08.01.48; author rse; state Exp; branches; next 1.1; 1.1 date 2002.05.29.19.56.09; author rse; state Exp; branches; next ; 1.3.2.1 date 2003.07.24.20.43.49; author rse; state Exp; branches; next ; desc @@ 1.19 log @use the better fix for Linux from Debian package @ text @Index: amd/conf_tok.l --- amd/conf_tok.l.orig 2006-01-02 19:40:31 +0100 +++ amd/conf_tok.l 2007-12-22 16:24:15 +0100 @@@@ -109,9 +109,6 @@@@ /* no need to use yyunput() */ %option nounput -/* allocate more output slots so lex scanners don't run out of mem */ -%o 1024 - DIGIT [0-9] ALPHA [A-Za-z] ALPHANUM [A-Za-z0-9] Index: conf/mount/mount_linux.c --- conf/mount/mount_linux.c.orig 2005-10-06 20:37:49 +0200 +++ conf/mount/mount_linux.c 2005-10-11 08:34:46 +0200 @@@@ -49,7 +49,9 @@@@ #endif /* HAVE_CONFIG_H */ #include #include - +#ifndef NFS_MOUNT_VERSION +#define NFS_MOUNT_VERSION 4 +#endif /* NFS_MOUNT_VERSION */ #ifndef MOUNT_TYPE_UFS /* Index: config.h.in --- config.h.in.orig 2005-10-10 19:06:16 +0200 +++ config.h.in 2005-10-11 08:34:46 +0200 @@@@ -162,6 +162,9 @@@@ /* Define to 1 if you have the header file. */ #undef HAVE_DB1_NDBM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_GDBM_NDBM_H + /* Define to 1 if you have the `dbm_open' function. */ #undef HAVE_DBM_OPEN @@@@ -730,6 +733,9 @@@@ /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_H +/* Define if you have the header file. */ +#undef HAVE_NFSCLIENT_NFS_H + /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_MOUNT_H Index: configure --- configure.orig 2005-10-10 19:06:13 +0200 +++ configure 2005-10-11 08:36:26 +0200 @@@@ -20871,7 +20871,7 @@@@ ;; esac ;; - sunos[34]* | solaris1* | solaris2.[0-5] | sunos5.[0-5] | solaris2.5.* | sunos5.5.* ) + sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* ) ac_cv_os_cflags="" ;; solaris2* | sunos5* ) # turn on 64-bit file offset interface @@@@ -25004,6 +25004,7 @@@@ nfs/export.h \ nfs/mount.h \ nfs/nfs.h \ + nfsclient/nfs.h \ nfs/nfs_clnt.h \ nfs/nfs_gfs.h \ nfs/nfs_mount.h \ @@@@ -26383,7 +26384,7 @@@@ ac_cv_nfs_prot_headers=sunos3 ;; sunos4* | solaris1* ) ac_cv_nfs_prot_headers=sunos4 ;; - sunos5.[0-3] | solaris2.[0-3] ) + sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* ) ac_cv_nfs_prot_headers=sunos5_3 ;; sunos5.4* | solaris2.4* ) ac_cv_nfs_prot_headers=sunos5_4 ;; Index: hlfsd/stubs.c --- hlfsd/stubs.c.orig 2005-09-30 04:48:42 +0200 +++ hlfsd/stubs.c 2005-10-11 08:34:46 +0200 @@@@ -142,7 +142,7 @@@@ res.ns_u.ns_attr_u = rootfattr; } else if (eq_fh(argp, &slink)) { -#ifndef MNT2_NFS_OPT_SYMTTL +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) /* * This code is needed to defeat Solaris 2.4's (and newer) symlink * values cache. It forces the last-modified time of the symlink to be @@@@ -249,7 +249,7 @@@@ } if (STREQ(argp->da_name, slinkname)) { -#ifndef MNT2_NFS_OPT_SYMTTL +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) /* * This code is needed to defeat Solaris 2.4's (and newer) symlink * values cache. It forces the last-modified time of the symlink to be Index: fsinfo/fsi_lex.l --- fsinfo/fsi_lex.l.orig 2006-01-02 19:40:31 +0100 +++ fsinfo/fsi_lex.l 2007-12-22 16:30:14 +0100 @@@@ -163,9 +163,6 @@@@ /* no need to use yyunput() */ %option nounput -/* allocate more output slots so lex scanners don't run out of mem */ -%o 1024 - %start F Q %% Index: amd/amfs_toplvl.c --- amd/amfs_toplvl.c.orig 2006-03-28 18:16:43 +0200 +++ amd/amfs_toplvl.c 2009-04-18 12:41:10 +0200 @@@@ -227,6 +227,10 @@@@ xstrlcat(opts, toplvl_opts, sizeof(opts)); } +#ifdef MNTTAB_OPT_NOLOCK + xstrlcat(opts, ",", sizeof(opts)); + xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts)); +#endif /* MNTTAB_OPT_NOLOCK */ #ifdef MNTTAB_OPT_NOAC if (gopt.auto_attrcache == 0) { xstrlcat(opts, ",", sizeof(opts)); Index: configure --- configure +++ configure @@@@ -20960,7 +20960,14 @@@@ { if (argc > 1) +#ifdef UTS_RELEASE printf("%s", UTS_RELEASE); +#else +# define AMU_MA(a) ((a) >> 16) +# define AMU_MI(a) (((a) & 0xffff) >> 8) +# define AMU_PL(a) ((a) & 0xff) + printf("%d.%d.%d", AMU_MA(LINUX_VERSION_CODE), AMU_MI(LINUX_VERSION_CODE), AMU_PL(LINUX_VERSION_CODE)); +#endif exit(0); } Index: conf/mount/mount_linux.c --- conf/mount/mount_linux.c +++ conf/mount/mount_linux.c @@@@ -277,7 +277,11 @@@@ int errorcode; /* Fake some values for linux */ +#if NFS_MOUNT_VERSION > 4 + mnt_data->version = 4; +#else mnt_data->version = NFS_MOUNT_VERSION; +#endif /* NFS_MOUNT_VERSION > 4 */ if (!mnt_data->timeo) { #ifdef MNT2_NFS_OPT_TCP if (mnt_data->flags & MNT2_NFS_OPT_TCP) @ 1.18 log @fix building under newer Linux (e.g. Debian 5.0) and try to fix run-time under Linux >= 2.6.24 @ text @d129 3 a131 3 --- configure.orig 2009-04-18 12:48:36 +0200 +++ configure 2009-04-18 12:50:17 +0200 @@@@ -20952,8 +20952,13 @@@@ d135 1 a135 1 +#if defined(UTS_RELEASE) a136 3 - +#elif defined(LINUX_VERSION_CODE) + printf("%d", LINUX_VERSION_CODE); d138 4 a141 1 + printf("%d", 0); d143 1 d146 15 a160 1 _ACEOF @ 1.17 log @remove the requirement to flex-old @ text @d114 32 @ 1.16 log @upgrading package: amd 6.1.2.1 -> 6.1.3 @ text @d1 13 d101 13 @ 1.15 log @upgrading package: amd 6.0.10 -> 6.1.2.1 @ text @d2 2 a3 2 --- conf/mount/mount_linux.c.orig 2005-09-12 03:55:40 +0200 +++ conf/mount/mount_linux.c 2005-09-28 16:29:51 +0200 d16 3 a18 3 --- config.h.in.orig 2005-09-19 05:05:08 +0200 +++ config.h.in 2005-09-28 16:29:51 +0200 @@@@ -159,6 +159,9 @@@@ d28 1 a28 1 @@@@ -712,6 +715,9 @@@@ d39 3 a41 3 --- configure.orig 2005-09-19 05:05:07 +0200 +++ configure 2005-09-28 16:34:17 +0200 @@@@ -20836,7 +20836,7 @@@@ d50 1 a50 1 @@@@ -24960,6 +24960,7 @@@@ d54 1 a54 1 + nfsclient/nfs.h \ d58 1 a58 1 @@@@ -26337,7 +26338,7 @@@@ a66 57 @@@@ -50442,9 +50443,9 @@@@ if test -n "ufs" then ac_fs_name=ufs - ac_fs_as_name=" (from: ext2 ffs ufs 42 efs xfs jfs ultrix)" + ac_fs_as_name=" (from: ext3 ext2 ffs ufs 42 efs xfs jfs ultrix)" else - ac_fs_name=ext2 ffs ufs 42 efs xfs jfs ultrix + ac_fs_name=ext3 ext2 ffs ufs 42 efs xfs jfs ultrix ac_fs_as_name="" fi # store variable name of filesystem @@@@ -50461,7 +50462,7 @@@@ # assume not found eval "ac_cv_fs_$ac_fs_name=no" -for ac_fs_tmp in ext2 ffs ufs 42 efs xfs jfs ultrix +for ac_fs_tmp in ext3 ext2 ffs ufs 42 efs xfs jfs ultrix do ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@@@ -54306,7 +54307,7 @@@@ then ac_fs_name=ufs else - ac_fs_name=4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix + ac_fs_name=4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix fi # prepare upper-case name of filesystem ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@@@ -54323,7 +54324,7 @@@@ # undefine by default eval "ac_cv_mount_type_$ac_fs_name=notfound" # and look to see if it was found -for ac_fs_tmp in 4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix +for ac_fs_tmp in 4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix do ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'` @@@@ -59804,7 +59805,7 @@@@ then ac_fs_name=ufs else - ac_fs_name=ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs + ac_fs_name=ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs fi # store variable name of fs ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@@@ -59821,7 +59822,7 @@@@ # undefine by default eval "ac_cv_mnttab_type_$ac_fs_name=notfound" # and look to see if it was found -for ac_fs_tmp in ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs +for ac_fs_tmp in ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs do if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_fs_nfs3" = "yes" -a "$ac_cv_header_linux_nfs_h" = "yes" then d68 2 a69 2 --- hlfsd/stubs.c.orig 2005-08-03 02:35:36 +0200 +++ hlfsd/stubs.c 2005-09-28 16:29:51 +0200 @ 1.14 log @patch out mboxfile declaration to make gcc4 happy @ text @d2 3 a4 3 --- conf/mount/mount_linux.c.orig 2005-01-03 21:56:13 +0100 +++ conf/mount/mount_linux.c 2005-03-19 13:24:52 +0100 @@@@ -50,7 +50,9 @@@@ d13 2 a14 2 struct opt_map { const char *opt; /* option name */ d16 3 a18 3 --- config.h.in.orig 2005-03-19 04:07:28 +0100 +++ config.h.in 2005-03-19 13:24:52 +0100 @@@@ -164,6 +164,9 @@@@ d28 1 a28 1 @@@@ -663,6 +666,9 @@@@ d39 3 a41 3 --- configure.orig 2005-03-19 04:07:26 +0100 +++ configure 2005-03-19 13:24:52 +0100 @@@@ -20980,7 +20980,7 @@@@ d50 1 a50 1 @@@@ -25025,6 +25025,7 @@@@ d58 1 a58 1 @@@@ -25918,7 +25919,7 @@@@ d67 57 d125 3 a127 3 --- hlfsd/stubs.c.orig 2005-01-03 21:56:14 +0100 +++ hlfsd/stubs.c 2005-03-19 13:24:52 +0100 @@@@ -133,7 +133,7 @@@@ d136 1 a136 1 @@@@ -232,7 +232,7 @@@@ a144 28 Index: libamu/mount_fs.c --- libamu/mount_fs.c.orig 2005-03-19 04:06:28 +0100 +++ libamu/mount_fs.c 2005-03-19 13:24:52 +0100 @@@@ -611,8 +611,10 @@@@ nap->flags |= MNT2_NFS_OPT_BIODS; #endif /* MNT2_NFS_OPT_BIODS */ +#ifdef MNT2_NFS_OPT_SOFT if (hasmntopt(mntp, MNTTAB_OPT_SOFT) != NULL) nap->flags |= MNT2_NFS_OPT_SOFT; +#endif /* MNT2_NFS_OPT_SOFT */ #ifdef MNT2_NFS_OPT_SPONGY if (hasmntopt(mntp, MNTTAB_OPT_SPONGY) != NULL) { taken from FedoraCore4 am-utils-6.0.9-12.src.rpm/am-utils-6.0.9.gcc4.patch --- hlfsd/hlfsd.h.orig 2002-12-28 15:49:22.000000000 +0100 +++ hlfsd/hlfsd.h 2005-03-25 17:15:55.753207705 +0100 @@@@ -142,7 +142,7 @@@@ extern char *mailbox(int, char *); extern char *passwdfile; extern char *slinkname; -extern char mboxfile[]; +/* extern char mboxfile[]; */ extern gid_t hlfs_gid; extern int cache_interval; extern int noverify; @ 1.13 log @upgrading package: amd 6.0.9 -> 6.0.10 @ text @d102 14 @ 1.12 log @reduce recent GROUP_OBJ patch addition to one line @ text @d1 11 a11 39 Index: conf/nfs_prot/nfs_prot_freebsd3.h --- conf/nfs_prot/nfs_prot_freebsd3.h.orig 2002-12-28 15:49:11.000000000 +0100 +++ conf/nfs_prot/nfs_prot_freebsd3.h 2003-10-29 12:15:56.000000000 +0100 @@@@ -54,6 +54,9 @@@@ #ifdef HAVE_NFS_NFS_H # include #endif /* HAVE_NFS_NFS_H */ +#ifdef HAVE_NFSCLIENT_NFS_H +# include +#endif /* HAVE_NFSCLIENT_NFS_H */ #ifdef HAVE_UFS_UFS_UFSMOUNT_H # include #endif /* HAVE_UFS_UFS_UFSMOUNT_H */ Index: include/am_defs.h --- include/am_defs.h.orig 2002-12-28 15:49:23.000000000 +0100 +++ include/am_defs.h 2003-10-29 12:15:56.000000000 +0100 @@@@ -276,7 +276,7 @@@@ /* * Actions to take if exists. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !(defined(__FreeBSD__) || defined(__NetBSD__)) # include #endif /* HAVE_MALLOC_H */ @@@@ -338,6 +338,14 @@@@ /* ensure that struct datum is not included again from */ # define DATUM # endif /* not DATUM */ +# else /* not HAVE_DB1_NDBM_H */ +# ifdef HAVE_GDBM_NDBM_H +# include +# ifndef DATUM +/* ensure that struct datum is not included again from */ +# define DATUM +# endif /* not DATUM */ +# endif /* HAVE_GDBM_NDBM_H */ # endif /* HAVE_DB1_NDBM_H */ #endif /* HAVE_NDBM_H */ d13 2 a14 21 Index: hlfsd/stubs.c --- hlfsd/stubs.c.orig 2002-12-28 15:49:22.000000000 +0100 +++ hlfsd/stubs.c 2003-10-29 12:15:56.000000000 +0100 @@@@ -133,7 +133,7 @@@@ res.ns_u.ns_attr_u = rootfattr; } else if (eq_fh(argp, &slink)) { -#ifndef MNT2_NFS_OPT_SYMTTL +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) /* * This code is needed to defeat Solaris 2.4's (and newer) symlink * values cache. It forces the last-modified time of the symlink to be @@@@ -232,7 +232,7 @@@@ } if (STREQ(argp->da_name, slinkname)) { -#ifndef MNT2_NFS_OPT_SYMTTL +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__)) /* * This code is needed to defeat Solaris 2.4's (and newer) symlink * values cache. It forces the last-modified time of the symlink to be d16 2 a17 2 --- config.h.in.orig 2003-01-25 16:10:26.000000000 +0100 +++ config.h.in 2003-10-29 12:15:56.000000000 +0100 d28 1 a28 1 @@@@ -657,6 +660,9 @@@@ d39 3 a41 3 --- configure.orig 2003-01-25 16:10:25.000000000 +0100 +++ configure 2003-10-29 12:24:29.000000000 +0100 @@@@ -9247,7 +9247,7 @@@@ d45 2 a46 2 - sunos[34]* | solaris1* | solaris2.[0-5]* | sunos5.[0-5]* ) + sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* ) d48 1 a48 1 solaris* | sunos* ) d50 1 a50 9 @@@@ -13020,6 +13020,7 @@@@ cdfs/cdfsmount.h \ cdfs/cdfs_mount.h \ db1/ndbm.h \ + gdbm/ndbm.h \ hsfs/hsfs.h \ isofs/cd9660/cd9660_mount.h \ linux/auto_fs.h \ @@@@ -13042,6 +13043,7 @@@@ d58 1 a58 1 @@@@ -13553,7 +13555,7 @@@@ d62 2 a63 2 - sunos5.[0-3]* | solaris2.[0-3]* ) + sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* ) d67 21 a87 14 Index: conf/nfs_prot/nfs_prot_freebsd3.h --- conf/nfs_prot/nfs_prot_freebsd3.h.orig Tue Jan 13 15:49:30 2004 +++ conf/nfs_prot/nfs_prot_freebsd3.h Tue Jan 13 15:49:02 2004 @@@@ -54,6 +54,10 @@@@ #ifdef HAVE_NFS_NFS_H # include #endif /* HAVE_NFS_NFS_H */ +#ifndef NFSX_V4STATEID +/* specific to NFS Version 4 */ +#define NFSX_V4STATEID 16 +#endif #ifdef HAVE_NFSCLIENT_NFS_H # include #endif /* HAVE_NFSCLIENT_NFS_H */ d89 3 a91 3 --- libamu/mount_fs.c.orig 2003-01-23 23:13:02.000000000 +0100 +++ libamu/mount_fs.c 2004-02-02 16:15:59.986753646 +0100 @@@@ -624,8 +624,10 @@@@ a101 25 Index: conf/mount/mount_linux.c --- conf/mount/mount_linux.c.orig 2002-12-28 15:49:09.000000000 +0100 +++ conf/mount/mount_linux.c 2004-02-02 20:07:31.668824640 +0100 @@@@ -50,7 +50,9 @@@@ #endif /* HAVE_CONFIG_H */ #include #include - +#ifndef NFS_MOUNT_VERSION +#define NFS_MOUNT_VERSION 4 +#endif /* NFS_MOUNT_VERSION */ struct opt_map { const char *opt; /* option name */ Index: include/am_defs.h --- include/am_defs.h.orig 2005-02-04 23:22:22 +0100 +++ include/am_defs.h 2005-02-04 23:22:23 +0100 @@@@ -908,6 +908,7 @@@@ * Actions to take if exists. */ #ifdef HAVE_RPCSVC_NIS_H +#undef GROUP_OBJ # include #endif /* HAVE_RPCSVC_NIS_H */ @ 1.11 log @port to Solaris10 by hacking out the GROUP_OBJ conflicting definition @ text @d167 1 a167 1 @@@@ -908,6 +908,9 @@@@ a170 1 +#ifdef GROUP_OBJ a171 1 +#endif /* GROUP_OBJ */ @ 1.10 log @first phase amd repairs which unfortunately may break backward compatability to some flex package dependecies < flex-2.5.31-20041031 @ text @d164 13 @ 1.9 log @fix amd on NetBSD @ text @d136 1 d150 1 a163 1 @ 1.8 log @modifying package: amd-6.0.9 20040113 -> 20040202 @ text @d22 1 a22 1 +#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__) d49 1 a49 1 +#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */ d58 1 a58 1 +#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */ @ 1.7 log @amd coders insist on using their own nfs_prot header (which is missing NFSX_V4STATEID), so hack in NFSX_V4STATEID just before it is potentially used @ text @d136 27 @ 1.6 log @cleanup patch and especially port to Solaris 10 @ text @d122 14 @ 1.5 log @Patch for Red Hat 8.0 @ text @d1 3 a3 3 diff -Naur am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h --- am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h Sat Dec 28 15:49:11 2002 +++ am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h Mon Jan 27 19:26:55 2003 d14 11 a24 6 diff -Naur am-utils-6.0.9.orig/config.h.in am-utils-6.0.9/config.h.in --- am-utils-6.0.9.orig/config.h.in Sat Jan 25 16:10:26 2003 +++ am-utils-6.0.9/config.h.in Mon Jan 27 19:25:36 2003 @@@@ -657,6 +657,9 @@@@ /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_H d26 14 a39 5 +/* Define if you have the header file. */ +#undef HAVE_NFSCLIENT_NFS_H + /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_MOUNT_H d41 3 a43 14 diff -Naur am-utils-6.0.9.orig/configure am-utils-6.0.9/configure --- am-utils-6.0.9.orig/configure Sat Jan 25 16:10:25 2003 +++ am-utils-6.0.9/configure Mon Jan 27 19:23:46 2003 @@@@ -13042,6 +13042,7 @@@@ nfs/export.h \ nfs/mount.h \ nfs/nfs.h \ + nfsclient/nfs.h \ nfs/nfs_clnt.h \ nfs/nfs_gfs.h \ nfs/nfs_mount.h \ diff -Naur am-utils-6.0.9.orig/hlfsd/stubs.c am-utils-6.0.9/hlfsd/stubs.c --- am-utils-6.0.9.orig/hlfsd/stubs.c Sat Dec 28 15:49:22 2002 +++ am-utils-6.0.9/hlfsd/stubs.c Mon Jan 27 19:35:01 2003 d62 3 a64 34 diff -Naur am-utils-6.0.9.orig/include/am_defs.h am-utils-6.0.9/include/am_defs.h --- am-utils-6.0.9.orig/include/am_defs.h Sat Dec 28 15:49:23 2002 +++ am-utils-6.0.9/include/am_defs.h Mon Jan 27 09:57:05 2003 @@@@ -276,7 +276,7 @@@@ /* * Actions to take if exists. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__) # include #endif /* HAVE_MALLOC_H */ --- am-utils-6.0.9/configure.orig Fri Jan 31 12:21:41 2003 +++ am-utils-6.0.9/configure Fri Jan 31 12:23:07 2003 @@@@ -13020,6 +13020,7 @@@@ cdfs/cdfsmount.h \ cdfs/cdfs_mount.h \ db1/ndbm.h \ + gdbm/ndbm.h \ hsfs/hsfs.h \ isofs/cd9660/cd9660_mount.h \ linux/auto_fs.h \ --- am-utils-6.0.9/configure.in.orig Fri Jan 31 12:21:56 2003 +++ am-utils-6.0.9/configure.in Fri Jan 31 12:23:29 2003 @@@@ -409,6 +409,7 @@@@ cdfs/cdfsmount.h \ cdfs/cdfs_mount.h \ db1/ndbm.h \ + gdbm/ndbm.h \ hsfs/hsfs.h \ isofs/cd9660/cd9660_mount.h \ linux/auto_fs.h \ --- am-utils-6.0.9/config.h.in.orig Fri Jan 31 12:22:12 2003 +++ am-utils-6.0.9/config.h.in Fri Jan 31 12:25:59 2003 d75 9 a83 16 --- am-utils-6.0.9/include/am_defs.h.orig Fri Jan 31 12:22:29 2003 +++ am-utils-6.0.9/include/am_defs.h Fri Jan 31 12:24:45 2003 @@@@ -338,6 +338,14 @@@@ /* ensure that struct datum is not included again from */ # define DATUM # endif /* not DATUM */ +# else /* not HAVE_DB1_NDBM_H */ +# ifdef HAVE_GDBM_NDBM_H +# include +# ifndef DATUM +/* ensure that struct datum is not included again from */ +# define DATUM +# endif /* not DATUM */ +# endif /* HAVE_GDBM_NDBM_H */ # endif /* HAVE_DB1_NDBM_H */ #endif /* HAVE_NDBM_H */ d85 37 @ 1.4 log @upgrading package: amd 6.0.8 -> 6.0.9 @ text @d71 49 @ 1.3 log @port to FreeBSD 5.0 where nfsclient/nfs.h is required for struct nfs_args stuff @ text @d1 25 a25 34 --- amq/amq.c.orig Fri Jan 12 23:52:00 2001 +++ amq/amq.c Thu Jul 5 10:09:10 2001 @@@@ -251,7 +251,9 @@@@ mi->mi_up > 0 ? "up" : mi->mi_up < 0 ? "starting" : "down"); if (mi->mi_error > 0) { +#if !defined(__FreeBSD__) extern int sys_nerr; +#endif if (mi->mi_error < sys_nerr) #ifdef HAVE_STRERROR printf(" (%s)", strerror(mi->mi_error)); --- hlfsd/hlfsd.h.orig Fri Jan 12 23:52:03 2001 +++ hlfsd/hlfsd.h Thu Jul 5 10:09:37 2001 @@@@ -147,7 +147,9 @@@@ extern int cache_interval; extern int noverify; extern int serverpid; +#if !defined(__FreeBSD__) extern int sys_nerr; +#endif extern int untab_index(char *username); extern am_nfs_fh *root_fhp; extern am_nfs_fh root; --- include/am_defs.h.orig Tue Feb 12 03:44:22 2002 +++ include/am_defs.h Thu Sep 12 08:48:47 2002 @@@@ -276,7 +276,7 @@@@ /* * Actions to take if exists. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__) # include #endif /* HAVE_MALLOC_H */ d27 14 a40 2 --- hlfsd/stubs.c.orig Tue Feb 12 01:15:17 2002 +++ hlfsd/stubs.c Thu Sep 12 09:51:03 2002 d59 11 a69 15 --- configure.orig Tue Jun 25 02:32:23 2002 +++ configure Tue Jan 14 14:16:27 2003 @@@@ -11846,6 +11846,7 @@@@ nfs/export.h \ nfs/mount.h \ nfs/nfs.h \ + nfsclient/nfs.h \ nfs/nfs_clnt.h \ nfs/nfs_gfs.h \ nfs/nfs_mount.h \ --- config.h.in.orig Tue Jun 25 02:32:24 2002 +++ config.h.in Tue Jan 14 14:15:19 2003 @@@@ -652,6 +652,9 @@@@ /* Define if you have the header file. */ #undef HAVE_NFS_NFS_H a70 18 +/* Define if you have the header file. */ +#undef HAVE_NFSCLIENT_NFS_H + /* Define if you have the header file. */ #undef HAVE_NFS_NFS_MOUNT_H --- conf/nfs_prot/nfs_prot_freebsd3.h.orig Wed Jan 30 01:28:49 2002 +++ conf/nfs_prot/nfs_prot_freebsd3.h Tue Jan 14 14:34:46 2003 @@@@ -54,6 +54,9 @@@@ #ifdef HAVE_NFS_NFS_H # include #endif /* HAVE_NFS_NFS_H */ +#ifdef HAVE_NFSCLIENT_NFS_H +# include +#endif /* HAVE_NFSCLIENT_NFS_H */ #ifdef HAVE_UFS_UFS_UFSMOUNT_H # include #endif /* HAVE_UFS_UFS_UFSMOUNT_H */ @ 1.3.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @d1 34 a34 19 diff -Naur am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h --- am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h Sat Dec 28 15:49:11 2002 +++ am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h Mon Jan 27 19:26:55 2003 @@@@ -54,6 +54,9 @@@@ #ifdef HAVE_NFS_NFS_H # include #endif /* HAVE_NFS_NFS_H */ +#ifdef HAVE_NFSCLIENT_NFS_H +# include +#endif /* HAVE_NFSCLIENT_NFS_H */ #ifdef HAVE_UFS_UFS_UFSMOUNT_H # include #endif /* HAVE_UFS_UFS_UFSMOUNT_H */ diff -Naur am-utils-6.0.9.orig/config.h.in am-utils-6.0.9/config.h.in --- am-utils-6.0.9.orig/config.h.in Sat Jan 25 16:10:26 2003 +++ am-utils-6.0.9/config.h.in Mon Jan 27 19:25:36 2003 @@@@ -657,6 +657,9 @@@@ /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_H d36 2 a37 20 +/* Define if you have the header file. */ +#undef HAVE_NFSCLIENT_NFS_H + /* Define to 1 if you have the header file. */ #undef HAVE_NFS_NFS_MOUNT_H diff -Naur am-utils-6.0.9.orig/configure am-utils-6.0.9/configure --- am-utils-6.0.9.orig/configure Sat Jan 25 16:10:25 2003 +++ am-utils-6.0.9/configure Mon Jan 27 19:23:46 2003 @@@@ -13042,6 +13042,7 @@@@ nfs/export.h \ nfs/mount.h \ nfs/nfs.h \ + nfsclient/nfs.h \ nfs/nfs_clnt.h \ nfs/nfs_gfs.h \ nfs/nfs_mount.h \ diff -Naur am-utils-6.0.9.orig/hlfsd/stubs.c am-utils-6.0.9/hlfsd/stubs.c --- am-utils-6.0.9.orig/hlfsd/stubs.c Sat Dec 28 15:49:22 2002 +++ am-utils-6.0.9/hlfsd/stubs.c Mon Jan 27 19:35:01 2003 d56 15 a70 11 diff -Naur am-utils-6.0.9.orig/include/am_defs.h am-utils-6.0.9/include/am_defs.h --- am-utils-6.0.9.orig/include/am_defs.h Sat Dec 28 15:49:23 2002 +++ am-utils-6.0.9/include/am_defs.h Mon Jan 27 09:57:05 2003 @@@@ -276,7 +276,7 @@@@ /* * Actions to take if exists. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__) # include #endif /* HAVE_MALLOC_H */ d72 2 a73 28 --- am-utils-6.0.9/configure.orig Fri Jan 31 12:21:41 2003 +++ am-utils-6.0.9/configure Fri Jan 31 12:23:07 2003 @@@@ -13020,6 +13020,7 @@@@ cdfs/cdfsmount.h \ cdfs/cdfs_mount.h \ db1/ndbm.h \ + gdbm/ndbm.h \ hsfs/hsfs.h \ isofs/cd9660/cd9660_mount.h \ linux/auto_fs.h \ --- am-utils-6.0.9/configure.in.orig Fri Jan 31 12:21:56 2003 +++ am-utils-6.0.9/configure.in Fri Jan 31 12:23:29 2003 @@@@ -409,6 +409,7 @@@@ cdfs/cdfsmount.h \ cdfs/cdfs_mount.h \ db1/ndbm.h \ + gdbm/ndbm.h \ hsfs/hsfs.h \ isofs/cd9660/cd9660_mount.h \ linux/auto_fs.h \ --- am-utils-6.0.9/config.h.in.orig Fri Jan 31 12:22:12 2003 +++ am-utils-6.0.9/config.h.in Fri Jan 31 12:25:59 2003 @@@@ -164,6 +164,9 @@@@ /* Define to 1 if you have the header file. */ #undef HAVE_DB1_NDBM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_GDBM_NDBM_H d75 2 a76 19 /* Define to 1 if you have the `dbm_open' function. */ #undef HAVE_DBM_OPEN --- am-utils-6.0.9/include/am_defs.h.orig Fri Jan 31 12:22:29 2003 +++ am-utils-6.0.9/include/am_defs.h Fri Jan 31 12:24:45 2003 @@@@ -338,6 +338,14 @@@@ /* ensure that struct datum is not included again from */ # define DATUM # endif /* not DATUM */ +# else /* not HAVE_DB1_NDBM_H */ +# ifdef HAVE_GDBM_NDBM_H +# include +# ifndef DATUM +/* ensure that struct datum is not included again from */ +# define DATUM +# endif /* not DATUM */ +# endif /* HAVE_GDBM_NDBM_H */ # endif /* HAVE_DB1_NDBM_H */ #endif /* HAVE_NDBM_H */ d78 12 @ 1.2 log @upgrading package: amd 6.0.7 -> 6.0.8 @ text @d56 34 @ 1.1 log @Finally rename all foo-X.Y.patch files to foo.patch in order to allow us to preserve history in CVS for patch files. @ text @d1 2 a2 3 diff -ru3 am-utils-6.0.7.orig/amq/amq.c am-utils-6.0.7/amq/amq.c --- am-utils-6.0.7.orig/amq/amq.c Fri Jan 12 23:52:00 2001 +++ am-utils-6.0.7/amq/amq.c Thu Jul 5 10:09:10 2001 d13 2 a14 3 diff -ru3 am-utils-6.0.7.orig/hlfsd/hlfsd.h am-utils-6.0.7/hlfsd/hlfsd.h --- am-utils-6.0.7.orig/hlfsd/hlfsd.h Fri Jan 12 23:52:03 2001 +++ am-utils-6.0.7/hlfsd/hlfsd.h Thu Jul 5 10:09:37 2001 d25 31 @