r832 - lvm2/trunk/debian/patches
Bastian Blank
waldi at alioth.debian.org
Thu Aug 19 12:46:05 UTC 2010
Author: waldi
Date: Thu Aug 19 12:46:04 2010
New Revision: 832
Log:
debian/patches/upstream-2.02.72.patch: Fix fuzz.
Modified:
lvm2/trunk/debian/patches/upstream-2.02.72.patch
Modified: lvm2/trunk/debian/patches/upstream-2.02.72.patch
==============================================================================
--- lvm2/trunk/debian/patches/upstream-2.02.72.patch Thu Aug 19 12:44:25 2010 (r831)
+++ lvm2/trunk/debian/patches/upstream-2.02.72.patch Thu Aug 19 12:46:04 2010 (r832)
@@ -1,8 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index 5c1f837..dc31604 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -84,6 +84,7 @@ install_system_dirs:
+@@ -84,6 +84,7 @@
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_BACKUP_DIR)
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_CACHE_DIR)
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_LOCK_DIR)
@@ -10,12 +8,10 @@
$(INSTALL_ROOT_DATA) /dev/null $(DESTDIR)$(DEFAULT_CACHE_DIR)/.cache
install_initscripts:
-diff --git a/configure.in b/configure.in
-index 2b1987b..bd56136 100644
--- a/configure.in
+++ b/configure.in
-@@ -1127,6 +1127,13 @@ if test "$BUILD_DMEVENTD" = yes; then
- [Path to dmeventd binary.])
+@@ -1019,6 +1019,13 @@
+ [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$dmeventd_prefix/sbin/dmeventd") ])
fi
+AH_TEMPLATE(DEFAULT_RUN_DIR, [Name of default run directory.])
@@ -27,9 +23,7 @@
+
################################################################################
dnl -- various defaults
- AC_ARG_WITH(default-system-dir,
-diff --git a/daemons/clvmd/clvm.h b/daemons/clvmd/clvm.h
-index 92f807f..c9ea10c 100644
+ AH_TEMPLATE(DEFAULT_SYS_DIR, [Path to LVM system directory.])
--- a/daemons/clvmd/clvm.h
+++ b/daemons/clvmd/clvm.h
@@ -22,6 +22,8 @@
@@ -41,7 +35,7 @@
struct clvm_header {
uint8_t cmd; /* See below */
uint8_t flags; /* See below */
-@@ -45,9 +47,8 @@ struct clvm_header {
+@@ -45,9 +47,8 @@
#define CLVMD_FLAG_SYSTEMLV 2 /* Data in system LV under my node name */
#define CLVMD_FLAG_NODEERRS 4 /* Reply has errors in node-specific portion */
@@ -53,13 +47,11 @@
/* Internal commands & replies */
#define CLVMD_CMD_REPLY 1
-diff --git a/daemons/clvmd/clvmd-singlenode.c b/daemons/clvmd/clvmd-singlenode.c
-index ec98f2c..4393a2e 100644
--- a/daemons/clvmd/clvmd-singlenode.c
+++ b/daemons/clvmd/clvmd-singlenode.c
-@@ -26,17 +26,29 @@
- #include <sys/socket.h>
- #include <fcntl.h>
+@@ -32,17 +32,29 @@
+ #include "lvm-functions.h"
+ #include "clvmd.h"
-static const char SINGLENODE_CLVMD_SOCKNAME[] = "\0singlenode_clvmd";
+static const char SINGLENODE_CLVMD_SOCKNAME[] = DEFAULT_RUN_DIR "/clvmd_singlenode.sock";
@@ -89,7 +81,7 @@
}
/* Set Close-on-exec */
fcntl(listen_fd, F_SETFD, 1);
-@@ -48,16 +60,19 @@ static int init_comms()
+@@ -54,16 +66,19 @@
if (bind(listen_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
DEBUGLOG("Can't bind local socket: %s\n", strerror(errno));
@@ -113,7 +105,7 @@
}
static int _init_cluster(void)
-@@ -74,7 +89,7 @@ static int _init_cluster(void)
+@@ -80,7 +95,7 @@
static void _cluster_closedown(void)
{
@@ -122,11 +114,9 @@
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
-diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
-index 4f5ed97..9554eea 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
-@@ -123,6 +123,7 @@ static void process_remote_command(struct clvm_header *msg, int msglen, int fd,
+@@ -139,6 +139,7 @@
static int process_reply(const struct clvm_header *msg, int msglen,
const char *csid);
static int open_local_sock(void);
@@ -134,8 +124,8 @@
static int check_local_clvmd(void);
static struct local_client *find_client(int clientid);
static void main_loop(int local_sock, int cmd_timeout);
-@@ -276,6 +277,23 @@ static void remove_lockfile(void)
- unlink(CLVMD_PIDFILE);
+@@ -287,6 +288,23 @@
+ return buf;
}
+/*
@@ -158,7 +148,7 @@
int main(int argc, char *argv[])
{
int local_sock;
-@@ -305,9 +323,11 @@ int main(int argc, char *argv[])
+@@ -316,9 +334,11 @@
exit(0);
case 'R':
@@ -170,7 +160,7 @@
return restart_clvmd(clusterwide_opt)==1?0:1;
case 'C':
-@@ -353,6 +373,8 @@ int main(int argc, char *argv[])
+@@ -364,6 +384,8 @@
}
}
@@ -179,7 +169,7 @@
/* Setting debug options on an existing clvmd */
if (debug_opt && !check_local_clvmd()) {
-@@ -457,7 +479,7 @@ int main(int argc, char *argv[])
+@@ -460,7 +482,7 @@
#endif
#ifdef USE_SINGLENODE
if (!clops)
@@ -188,7 +178,7 @@
max_csid_len = SINGLENODE_CSID_LEN;
max_cluster_message = SINGLENODE_MAX_CLUSTER_MESSAGE;
max_cluster_member_name_len = MAX_CLUSTER_MEMBER_NAME_LEN;
-@@ -521,6 +543,7 @@ int main(int argc, char *argv[])
+@@ -524,6 +546,7 @@
/* Do some work */
main_loop(local_sock, cmd_timeout);
@@ -196,7 +186,7 @@
destroy_lvm();
return 0;
-@@ -864,7 +887,6 @@ static void main_loop(int local_sock, int cmd_timeout)
+@@ -867,7 +890,6 @@
closedown:
clops->cluster_closedown();
@@ -204,7 +194,7 @@
}
static __attribute__ ((noreturn)) void wait_for_child(int c_pipe, int timeout)
-@@ -1963,20 +1985,30 @@ static int check_local_clvmd(void)
+@@ -1966,20 +1988,30 @@
return ret;
}
@@ -239,7 +229,7 @@
}
/* Set Close-on-exec & non-blocking */
-@@ -1989,18 +2021,19 @@ static int open_local_sock()
+@@ -1992,18 +2024,19 @@
sockaddr.sun_family = AF_UNIX;
if (bind(local_socket, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) {
log_error("can't bind local socket: %m");
@@ -265,8 +255,6 @@
}
void process_message(struct local_client *client, const char *buf, int len,
-diff --git a/daemons/clvmd/clvmd.h b/daemons/clvmd/clvmd.h
-index aec31b2..ccc79cc 100644
--- a/daemons/clvmd/clvmd.h
+++ b/daemons/clvmd/clvmd.h
@@ -20,9 +20,6 @@
@@ -279,11 +267,9 @@
/* Default time (in seconds) we will wait for all remote commands to execute
before declaring them dead */
#define DEFAULT_CMD_TIMEOUT 60
-diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in
-index 01f668c..3a37678 100644
--- a/lib/misc/configure.h.in
+++ b/lib/misc/configure.h.in
-@@ -35,6 +35,9 @@
+@@ -29,6 +29,9 @@
/* Name of default locking directory. */
#undef DEFAULT_LOCK_DIR
More information about the pkg-lvm-commits
mailing list