Module Name: src
Committed By: yamt
Date: Thu May 22 14:01:29 UTC 2014
Modified Files:
src/external/gpl2/lvm2/dist/include [yamt-pagecache]: xlate.h
src/external/gpl2/lvm2/dist/lib/mm [yamt-pagecache]: xlate.h
src/external/gpl2/lvm2/lib/libdevmapper [yamt-pagecache]: Makefile
src/external/gpl2/lvm2/lib/liblvm [yamt-pagecache]: Makefile
src/external/gpl2/lvm2/sbin/lvm [yamt-pagecache]: Makefile
src/external/gpl2/xcvs/dist/src [yamt-pagecache]: acl.c error.c
exithandle.c lock.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.1.1.1 -r1.1.1.1.8.1 \
src/external/gpl2/lvm2/dist/include/xlate.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/external/gpl2/lvm2/dist/lib/mm/xlate.h
cvs rdiff -u -r1.8 -r1.8.4.1 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/external/gpl2/lvm2/lib/liblvm/Makefile
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/external/gpl2/lvm2/sbin/lvm/Makefile
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/external/gpl2/xcvs/dist/src/acl.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 src/external/gpl2/xcvs/dist/src/error.c \
src/external/gpl2/xcvs/dist/src/exithandle.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/gpl2/xcvs/dist/src/lock.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/gpl2/lvm2/dist/include/xlate.h
diff -u src/external/gpl2/lvm2/dist/include/xlate.h:1.1.1.1 src/external/gpl2/lvm2/dist/include/xlate.h:1.1.1.1.8.1
--- src/external/gpl2/lvm2/dist/include/xlate.h:1.1.1.1 Mon Dec 22 00:18:44 2008
+++ src/external/gpl2/lvm2/dist/include/xlate.h Thu May 22 14:01:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xlate.h,v 1.1.1.1 2008/12/22 00:18:44 haad Exp $ */
+/* $NetBSD: xlate.h,v 1.1.1.1.8.1 2014/05/22 14:01:29 yamt Exp $ */
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -21,6 +21,11 @@
#ifdef linux
# include <endian.h>
# include <byteswap.h>
+#elif defined(__NetBSD__)
+# include <sys/endian.h>
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)
#else
# include <machine/endian.h>
# define bswap_16(x) (((x) & 0x00ffU) << 8 | \
Index: src/external/gpl2/lvm2/dist/lib/mm/xlate.h
diff -u src/external/gpl2/lvm2/dist/lib/mm/xlate.h:1.1.1.1 src/external/gpl2/lvm2/dist/lib/mm/xlate.h:1.1.1.1.8.1
--- src/external/gpl2/lvm2/dist/lib/mm/xlate.h:1.1.1.1 Mon Dec 22 00:18:13 2008
+++ src/external/gpl2/lvm2/dist/lib/mm/xlate.h Thu May 22 14:01:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xlate.h,v 1.1.1.1 2008/12/22 00:18:13 haad Exp $ */
+/* $NetBSD: xlate.h,v 1.1.1.1.8.1 2014/05/22 14:01:29 yamt Exp $ */
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -21,6 +21,11 @@
#ifdef linux
# include <endian.h>
# include <byteswap.h>
+#elif defined(__NetBSD__)
+# include <sys/endian.h>
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)
#else
# include <machine/endian.h>
# define bswap_16(x) (((x) & 0x00ffU) << 8 | \
Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.8 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.8.4.1
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.8 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Thu May 22 14:01:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/05/26 12:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2014/05/22 14:01:29 yamt Exp $
USE_SHLIBDIR= yes
USE_FORT?= no
@@ -21,7 +21,7 @@ CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR} \
CPPFLAGS+= -D__LIB_DEVMAPPER__
-LIBDPLIBS+= prop ${NETBSDSRCDIR}/lib/libprop
+LIBDPLIBS+= dm ${NETBSDSRCDIR}/lib/libdm
SRCS+= bitset.c hash.c list.c libdm-common.c libdm-file.c \
libdm-deptree.c libdm-string.c libdm-report.c \
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5.4.1 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5.4.2
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5.4.1 Wed May 23 10:07:27 2012
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Thu May 22 14:01:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.4.1 2012/05/23 10:07:27 yamt Exp $
+# $NetBSD: Makefile,v 1.5.4.2 2014/05/22 14:01:29 yamt Exp $
LIBISPRIVATE= yes
@@ -15,7 +15,6 @@ CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM
-I.
.include <bsd.own.mk>
-.include <bsd.sys.mk> # for USE_SSP
# Some parts of liblvm can't be protected because if its
# alloca() usage.
Index: src/external/gpl2/lvm2/sbin/lvm/Makefile
diff -u src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10.4.1 src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10.4.2
--- src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10.4.1 Wed May 23 10:07:27 2012
+++ src/external/gpl2/lvm2/sbin/lvm/Makefile Thu May 22 14:01:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.4.1 2012/05/23 10:07:27 yamt Exp $
+# $NetBSD: Makefile,v 1.10.4.2 2014/05/22 14:01:29 yamt Exp $
USE_FORT?= no
NOLINT= #defined
@@ -31,7 +31,6 @@ CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM
CPPFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\"
.include <bsd.own.mk>
-.include <bsd.sys.mk> # for USE_SSP
# Some parts of the code can't be protected because if its
# alloca() usage.
Index: src/external/gpl2/xcvs/dist/src/acl.c
diff -u src/external/gpl2/xcvs/dist/src/acl.c:1.3.2.3 src/external/gpl2/xcvs/dist/src/acl.c:1.3.2.4
--- src/external/gpl2/xcvs/dist/src/acl.c:1.3.2.3 Tue Oct 30 18:56:38 2012
+++ src/external/gpl2/xcvs/dist/src/acl.c Thu May 22 14:01:29 2014
@@ -30,6 +30,7 @@
*/
#include "cvs.h"
#include "getline.h"
+#include <pwd.h>
#include <grp.h>
static int acl_fileproc (void *callerdat, struct file_info *finfo);
@@ -556,18 +557,24 @@ check_default:
if (debug) fprintf (stderr, "usesystemgroups=%d\n", use_system_groups);
if (use_system_groups) {
struct group *griter;
+ struct passwd *pwd;
+ gid_t gid = (pwd = getpwnam(username)) != NULL ? pwd->pw_gid : -1;
setgrent ();
while (griter = getgrent ())
{
- char **users=griter->gr_mem;
- int index = 0;
- char *userchk = users [index++];
- while(userchk != NULL) {
- if(strcmp (userchk, username) == 0)
- break;
- userchk = users[index++];
+ char *userchk;
+ if (gid == griter->gr_gid) {
+ userchk = username;
+ } else {
+ char **users = griter->gr_mem;
+ int index = 0;
+ userchk = users [index++];
+ while(userchk != NULL) {
+ if(strcmp (userchk, username) == 0)
+ break;
+ userchk = users[index++];
+ }
}
- if (debug) fprintf (stderr, "usercheck=%s\n", userchk);
if (userchk != NULL) {
char *grp;
if ((grp = findusername (part_perms, griter->gr_name)))
Index: src/external/gpl2/xcvs/dist/src/error.c
diff -u src/external/gpl2/xcvs/dist/src/error.c:1.1.1.1 src/external/gpl2/xcvs/dist/src/error.c:1.1.1.1.8.1
--- src/external/gpl2/xcvs/dist/src/error.c:1.1.1.1 Tue Apr 7 22:10:26 2009
+++ src/external/gpl2/xcvs/dist/src/error.c Thu May 22 14:01:29 2014
@@ -208,7 +208,7 @@ memerror:
* with the message here.
*/
#if HAVE_SYSLOG_H
- syslog (LOG_DAEMON | LOG_EMERG, "Memory exhausted. Aborting.");
+ syslog (LOG_DAEMON | LOG_ERR, "Memory exhausted. Aborting.");
#endif /* HAVE_SYSLOG_H */
goto sidestep_done;
@@ -219,18 +219,18 @@ recursion_error:
* error while attempting to send the last error message to the client.
*/
- syslog (LOG_DAEMON | LOG_EMERG,
+ syslog (LOG_DAEMON | LOG_ERR,
"error (%d, %d) called recursively. Original message was:",
last_status, last_errnum);
- syslog (LOG_DAEMON | LOG_EMERG, "%s", last_message);
+ syslog (LOG_DAEMON | LOG_ERR, "%s", last_message);
- syslog (LOG_DAEMON | LOG_EMERG,
+ syslog (LOG_DAEMON | LOG_ERR,
"error (%d, %d) called recursively. Second message was:",
status, errnum);
- syslog (LOG_DAEMON | LOG_EMERG, "%s", buf2);
+ syslog (LOG_DAEMON | LOG_ERR, "%s", buf2);
- syslog (LOG_DAEMON | LOG_EMERG, "Aborting.");
+ syslog (LOG_DAEMON | LOG_ERR, "Aborting.");
#endif /* HAVE_SYSLOG_H */
sidestep_done:
Index: src/external/gpl2/xcvs/dist/src/exithandle.c
diff -u src/external/gpl2/xcvs/dist/src/exithandle.c:1.1.1.1 src/external/gpl2/xcvs/dist/src/exithandle.c:1.1.1.1.8.1
--- src/external/gpl2/xcvs/dist/src/exithandle.c:1.1.1.1 Tue Apr 7 22:10:26 2009
+++ src/external/gpl2/xcvs/dist/src/exithandle.c Thu May 22 14:01:29 2014
@@ -30,7 +30,7 @@ signals_register (RETSIGTYPE (*handler)(
(void) SIG_register (SIGQUIT, handler);
#endif
#ifdef SIGPIPE
- (void) SIG_register (SIGPIPE, handler);
+ (void) signal (SIGPIPE, SIG_IGN);
#endif
#ifdef SIGTERM
(void) SIG_register (SIGTERM, handler);
Index: src/external/gpl2/xcvs/dist/src/lock.c
diff -u src/external/gpl2/xcvs/dist/src/lock.c:1.2 src/external/gpl2/xcvs/dist/src/lock.c:1.2.8.1
--- src/external/gpl2/xcvs/dist/src/lock.c:1.2 Wed Apr 8 16:27:51 2009
+++ src/external/gpl2/xcvs/dist/src/lock.c Thu May 22 14:01:29 2014
@@ -230,7 +230,9 @@ lock_name (const char *repository, const
* might have symlinks present
*/
len = find_root(repository, current_parsed_root->directory);
- assert(len != -1);
+ if (len == -1)
+ error (1, 0, "%s not found in %s",
+ repository, current_parsed_root->directory);
short_repos = repository + len + 1;
if (strcmp (repository, current_parsed_root->directory) == 0)
