Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2014-10-01 11:23:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "multipath-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2014-09-19 13:56:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2014-10-01 11:23:28.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 22 11:02:53 CEST 2014 - hare@suse.de + +- Really fix segfault in recv_packet (bnc#896678) +- Allow empty revision during discovery (bnc#896864) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools-0.5.0-sles12.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.5ePfCA/_old 2014-10-01 11:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.5ePfCA/_new 2014-10-01 11:23:29.000000000 +0200 @@ -2231,7 +2231,7 @@ __deprecated install_keyword("default_path_grouping_policy", &def_pgpolicy_handler, NULL); __deprecated install_keyword("default_uid_attribute", &def_uid_attribute_handler, NULL); diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c -index 228ffd3..ada2281 100644 +index 228ffd3..e032202 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -4,6 +4,7 @@ @@ -2791,6 +2791,15 @@ scsi_sysfs_pathinfo (struct path * pp) { struct udev_device *parent; +@@ -661,7 +996,7 @@ scsi_sysfs_pathinfo (struct path * pp) + + condlog(3, "%s: product = %s", pp->dev, pp->product_id); + +- if (sysfs_get_rev(parent, pp->rev, SCSI_REV_SIZE) <= 0) ++ if (sysfs_get_rev(parent, pp->rev, SCSI_REV_SIZE) < 0) + return 1; + + condlog(3, "%s: rev = %s", pp->dev, pp->rev); @@ -684,10 +1019,11 @@ scsi_sysfs_pathinfo (struct path * pp) /* * target node name @@ -6788,7 +6797,7 @@ -int uxclnt(char * inbuf); +int uxclnt(char * inbuf, unsigned int timeout); diff --git a/multipathd/uxlsnr.c b/multipathd/uxlsnr.c -index ed8e012..74bc29e 100644 +index ed8e012..61ba49a 100644 --- a/multipathd/uxlsnr.c +++ b/multipathd/uxlsnr.c @@ -20,6 +20,7 @@ @@ -6886,7 +6895,7 @@ void uxsock_cleanup(void *arg) { cli_exit(); -@@ -100,8 +121,7 @@ void uxsock_cleanup(void *arg) +@@ -100,20 +121,28 @@ void uxsock_cleanup(void *arg) /* * entry point */ @@ -6896,7 +6905,31 @@ { int ux_sock; size_t len; -@@ -122,19 +142,35 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), +- int rlen; ++ int rlen, timeout; + char *inbuf; + char *reply; + sigset_t mask; + + ux_sock = ux_socket_listen(DEFAULT_SOCKET); + +- if (ux_sock == -1) +- exit(1); ++ if (ux_sock == -1) { ++ condlog(1, "could not create uxsock: %d", errno); ++ return NULL; ++ } ++ ++ if (!conf) { ++ condlog(1, "configuration changed"); ++ return NULL; ++ } ++ ++ timeout = conf->uxsock_timeout; + + pthread_cleanup_push(uxsock_cleanup, NULL); + +@@ -122,19 +151,35 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), sigdelset(&mask, SIGHUP); sigdelset(&mask, SIGUSR1); while (1) { @@ -6904,14 +6937,14 @@ - int i, poll_count; + struct client *c, *tmp; + int i, poll_count, num_clients; -+ unsigned int timeout; + + /* + * Store configuration timeout; + * configuration might change during + * the call to 'reconfigure'. + */ -+ timeout = conf->uxsock_timeout; ++ if (conf) ++ timeout = conf->uxsock_timeout; /* setup for a poll */ + pthread_mutex_lock(&client_lock); @@ -6935,7 +6968,7 @@ /* most of our life is spent in this call */ poll_count = ppoll(polls, i, &sleep_time, &mask); -@@ -154,11 +190,29 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), +@@ -154,11 +199,29 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), continue; /* see if a client wants to speak to us */ @@ -6969,7 +7002,7 @@ dead_client(c); } else { inbuf[len - 1] = 0; -@@ -175,10 +229,11 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), +@@ -175,10 +238,11 @@ void * uxsock_listen(int (*uxsock_trigger)(char *, char **, int *, void *), FREE(reply); reply = NULL; } @@ -7179,10 +7212,16 @@ +fi diff --git a/rpm/multipath-tools.changes b/rpm/multipath-tools.changes new file mode 100644 -index 0000000..5ae497b +index 0000000..c96cd41 --- /dev/null +++ b/rpm/multipath-tools.changes -@@ -0,0 +1,1318 @@ +@@ -0,0 +1,1324 @@ ++------------------------------------------------------------------- ++Mon Sep 22 11:02:53 CEST 2014 - hare@suse.de ++ ++- Really fix segfault in recv_packet (bnc#896678) ++- Allow empty revision during discovery (bnc#896864) ++ +------------------------------------------------------------------- +Wed Sep 17 14:04:47 CEST 2014 - hare@suse.de + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org