Module Name: src
Committed By: yamt
Date: Thu May 22 15:41:06 UTC 2014
Modified Files:
src/external/bsd/am-utils [yamt-pagecache]: Makefile.inc
src/external/bsd/am-utils/bin [yamt-pagecache]: Makefile.inc
src/external/bsd/am-utils/bin/amd [yamt-pagecache]: Makefile
src/external/bsd/am-utils/bin/amq [yamt-pagecache]: Makefile
src/external/bsd/am-utils/bin/fixmount [yamt-pagecache]: Makefile
src/external/bsd/am-utils/bin/hlfsd [yamt-pagecache]: Makefile
src/external/bsd/am-utils/bin/pawd [yamt-pagecache]: Makefile
src/external/bsd/am-utils/bin/wire-test [yamt-pagecache]: Makefile
src/external/bsd/am-utils/dist/hlfsd [yamt-pagecache]: hlfsd.c
src/external/bsd/am-utils/dist/libamu [yamt-pagecache]: mount_fs.c
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/bsd/am-utils/Makefile.inc
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/am-utils/bin/Makefile.inc
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/bsd/am-utils/bin/amq/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/am-utils/bin/fixmount/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/am-utils/bin/hlfsd/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/bsd/am-utils/bin/pawd/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/bsd/am-utils/bin/wire-test/Makefile
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/bsd/am-utils/dist/hlfsd/hlfsd.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/bsd/am-utils/dist/libamu/mount_fs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/Makefile.inc
diff -u src/external/bsd/am-utils/Makefile.inc:1.2 src/external/bsd/am-utils/Makefile.inc:1.2.2.1
--- src/external/bsd/am-utils/Makefile.inc:1.2 Sat Sep 20 10:45:48 2008
+++ src/external/bsd/am-utils/Makefile.inc Thu May 22 15:41:06 2014
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.2 2008/09/20 10:45:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2.2.1 2014/05/22 15:41:06 yamt Exp $
+.ifndef AMU_MAKEFILE_INC
+AMU_MAKEFILE_INC=
WARNS?= 1
.include <bsd.own.mk>
@@ -8,10 +10,14 @@ BINDIR?= /usr/sbin
USE_FORT?=yes
-IDIST= ${NETBSDSRCDIR}/external/bsd/am-utils/dist
+AMUTILS= ${NETBSDSRCDIR}/external/bsd/am-utils
+IDIST= ${AMUTILS}/dist
CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include -I${IDIST}/libamu \
- -I${IDIST}/include -I${LIBAMUOBJDIR}
+ -I${IDIST}/include
+
+LIBAMUOBJDIR!= cd ${AMUTILS}/lib/libamu && ${PRINTOBJDIR}
+CPPFLAGS+= -I${LIBAMUOBJDIR}
.if (${USE_HESIOD} != "no")
CPPFLAGS+=-DHAVE_MAP_HESIOD=1
@@ -27,10 +33,6 @@ CPPFLAGS+=-DHAVE_MAP_NIS=1
.endif
.if !defined(LIB) || empty(LIB)
-LDADD+= -L${LIBAMUOBJDIR} -lamu
-.if ${MKPICLIB} == "no"
-DPADD+= ${LIBAMUOBJDIR}/libamu.a
-.else
-DPADD+= ${LIBAMUOBJDIR}/libamu_pic.a
+PROGDPLIBS+= amu ${AMUTILS}/lib/libamu
.endif
.endif
Index: src/external/bsd/am-utils/bin/Makefile.inc
diff -u src/external/bsd/am-utils/bin/Makefile.inc:1.1 src/external/bsd/am-utils/bin/Makefile.inc:1.1.2.1
--- src/external/bsd/am-utils/bin/Makefile.inc:1.1 Fri Sep 19 21:41:28 2008
+++ src/external/bsd/am-utils/bin/Makefile.inc Thu May 22 15:41:06 2014
@@ -1,7 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.1 2008/09/19 21:41:28 christos Exp $
-
-.include <bsd.own.mk>
-
-LIBAMUOBJDIR!=cd ${.CURDIR}/../../lib/libamu && ${PRINTOBJDIR}
+# $NetBSD: Makefile.inc,v 1.1.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../../Makefile.inc"
Index: src/external/bsd/am-utils/bin/amd/Makefile
diff -u src/external/bsd/am-utils/bin/amd/Makefile:1.9 src/external/bsd/am-utils/bin/amd/Makefile:1.9.2.1
--- src/external/bsd/am-utils/bin/amd/Makefile:1.9 Wed Aug 17 09:03:47 2011
+++ src/external/bsd/am-utils/bin/amd/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/17 09:03:47 christos Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -51,7 +51,7 @@ MAN+= amd.8
AMDOBJDIR!=cd ${.CURDIR} && ${PRINTOBJDIR}
CPPFLAGS+= -I${DIST} -I${AMDOBJDIR}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
YHEADER= 1
Index: src/external/bsd/am-utils/bin/amq/Makefile
diff -u src/external/bsd/am-utils/bin/amq/Makefile:1.4 src/external/bsd/am-utils/bin/amq/Makefile:1.4.2.1
--- src/external/bsd/am-utils/bin/amq/Makefile:1.4 Wed Aug 17 09:03:47 2011
+++ src/external/bsd/am-utils/bin/amq/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/17 09:03:47 christos Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,6 +11,5 @@ SRCS= amq_xdr.c amq_clnt.c amq.c
MAN+= amq.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/fixmount/Makefile
diff -u src/external/bsd/am-utils/bin/fixmount/Makefile:1.1 src/external/bsd/am-utils/bin/fixmount/Makefile:1.1.2.1
--- src/external/bsd/am-utils/bin/fixmount/Makefile:1.1 Fri Sep 19 21:38:40 2008
+++ src/external/bsd/am-utils/bin/fixmount/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/19 21:38:40 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,7 +11,7 @@ SRCS= fixmount.c checkmount_bsd44.c
MAN+= fixmount.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/hlfsd/Makefile
diff -u src/external/bsd/am-utils/bin/hlfsd/Makefile:1.3 src/external/bsd/am-utils/bin/hlfsd/Makefile:1.3.2.1
--- src/external/bsd/am-utils/bin/hlfsd/Makefile:1.3 Wed Aug 17 09:03:47 2011
+++ src/external/bsd/am-utils/bin/hlfsd/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/17 09:03:47 christos Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,6 +11,7 @@ SRCS= hlfsd.c homedir.c nfs_prot_svc.c s
MAN+= hlfsd.8
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU} -lrpcsvc
+LDADD+= -lrpcsvc
+DPADD+= ${LIBRPCSVC}
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/bin/pawd/Makefile
diff -u src/external/bsd/am-utils/bin/pawd/Makefile:1.4 src/external/bsd/am-utils/bin/pawd/Makefile:1.4.2.1
--- src/external/bsd/am-utils/bin/pawd/Makefile:1.4 Mon Jun 20 07:43:57 2011
+++ src/external/bsd/am-utils/bin/pawd/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:57 mrg Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2014/05/22 15:41:06 yamt Exp $
BINDIR= /usr/bin
@@ -13,7 +13,6 @@ SRCS= amq_clnt.c amq_xdr.c pawd.c
MAN+= pawd.1
CPPFLAGS+= -I${DIST}
-LDADD+= ${LIBAMU}
.if defined(HAVE_GCC)
COPTS.amq_xdr.c+= -fno-strict-aliasing
Index: src/external/bsd/am-utils/bin/wire-test/Makefile
diff -u src/external/bsd/am-utils/bin/wire-test/Makefile:1.1 src/external/bsd/am-utils/bin/wire-test/Makefile:1.1.2.1
--- src/external/bsd/am-utils/bin/wire-test/Makefile:1.1 Fri Sep 19 21:38:41 2008
+++ src/external/bsd/am-utils/bin/wire-test/Makefile Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/09/19 21:38:41 christos Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/05/22 15:41:06 yamt Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -10,6 +10,4 @@ DIST= ${IDIST}/wire-test
SRCS= wire-test.c
MAN+= wire-test.8
-LDADD+= ${LIBAMU}
-
.include <bsd.prog.mk>
Index: src/external/bsd/am-utils/dist/hlfsd/hlfsd.c
diff -u src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.1.1.2 src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.1.1.2.6.1
--- src/external/bsd/am-utils/dist/hlfsd/hlfsd.c:1.1.1.2 Fri Mar 20 20:26:55 2009
+++ src/external/bsd/am-utils/dist/hlfsd/hlfsd.c Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hlfsd.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */
+/* $NetBSD: hlfsd.c,v 1.1.1.2.6.1 2014/05/22 15:41:06 yamt Exp $ */
/*
* Copyright (c) 1997-2009 Erez Zadok
@@ -150,7 +150,6 @@ main(int argc, char *argv[])
int opterrs = 0;
int retry;
int soNFS; /* NFS socket */
- int s = -99;
mntent_t mnt;
nfs_args_t nfs_args;
am_nfs_handle_t anh;
@@ -454,17 +453,16 @@ main(int argc, char *argv[])
* set this signal handler.
*/
if (amuDebug(D_DAEMON)) {
- s = -99;
while (stoplight != SIGUSR2) {
plog(XLOG_INFO, "parent waits for child to setup (stoplight=%d)", stoplight);
#ifdef HAVE_SIGSUSPEND
{
sigset_t mask;
sigemptyset(&mask);
- s = sigsuspend(&mask); /* wait for child to set up */
+ (void)sigsuspend(&mask); /* wait for child to set up */
}
#else /* not HAVE_SIGSUSPEND */
- s = sigpause(0); /* wait for child to set up */
+ (void)sigpause(0); /* wait for child to set up */
#endif /* not HAVE_SIGSUSPEND */
sleep(1);
}
Index: src/external/bsd/am-utils/dist/libamu/mount_fs.c
diff -u src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.1.1.2 src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.1.1.2.6.1
--- src/external/bsd/am-utils/dist/libamu/mount_fs.c:1.1.1.2 Fri Mar 20 20:26:55 2009
+++ src/external/bsd/am-utils/dist/libamu/mount_fs.c Thu May 22 15:41:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_fs.c,v 1.1.1.2 2009/03/20 20:26:55 christos Exp $ */
+/* $NetBSD: mount_fs.c,v 1.1.1.2.6.1 2014/05/22 15:41:06 yamt Exp $ */
/*
* Copyright (c) 1997-2009 Erez Zadok
@@ -466,6 +466,7 @@ compute_nfs_attrcache_flags(nfs_args_t *
if (amu_hasmntopt(mntp, MNTTAB_OPT_NOAC) != NULL)
nap->flags |= MNT2_NFS_OPT_NOAC;
#endif /* defined(MNTTAB_OPT_NOAC) && defined(MNT2_NFS_OPT_NOAC) */
+ (void)err_acval;
}
