Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2016-09-23 11:23:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-17 14:33:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2016-09-23 11:23:52.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 19 10:55:20 CEST 2016 - [email protected] + +- libmultipath: Do not crash on empty features (bsc#994812) +- multipathd: Set CLI timeout correctly (bsc#999061) +- Moved multipath-tools repository to + github.com:/openSUSE/multipath-tools.git + +------------------------------------------------------------------- Old: ---- multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz New: ---- multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.NTNYQD/_old 2016-09-23 11:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.NTNYQD/_new 2016-09-23 11:23:53.000000000 +0200 @@ -16,7 +16,7 @@ # -%define version_unconverted 0.6.2+suse20160908.d93a87f +%define version_unconverted 0.6.2+suse20160919.a385ea7 Name: multipath-tools BuildRequires: device-mapper-devel @@ -31,15 +31,13 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.6.2+suse20160908.d93a87f +Version: 0.6.2+suse20160919.a385ea7 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 Group: System/Base %{?systemd_requires} %define has_systemd 1 -#FIXME: https://github.com/hreinecke/multipath-tools.git needs to -#be moved to SUSE namespace Source: multipath-tools-%{version}.tar.xz Source1: multipath.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NTNYQD/_old 2016-09-23 11:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.NTNYQD/_new 2016-09-23 11:23:53.000000000 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> - <param name="url">https://github.com/hreinecke/multipath-tools.git</param> + <param name="url">https://github.com/openSUSE/multipath-tools.git</param> <param name="subdir"></param> <param name="filename">multipath-tools</param> <param name="versionformat">0.6.2+suse%cd.%h</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.NTNYQD/_old 2016-09-23 11:23:53.000000000 +0200 +++ /var/tmp/diff_new_pack.NTNYQD/_new 2016-09-23 11:23:53.000000000 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/hreinecke/multipath-tools.git</param> - <param name="changesrevision">d93a87fc646ea7a1d6871672f2b59cccfccafdf3</param> + <param name="url">https://github.com/openSUSE/multipath-tools.git</param> + <param name="changesrevision">a385ea71b55a1ecb01afc121c372b1b9964b0744</param> </service> </servicedata> ++++++ multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz -> multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160908.d93a87f/libmpathcmd/mpath_cmd.h new/multipath-tools-0.6.2+suse20160919.a385ea7/libmpathcmd/mpath_cmd.h --- old/multipath-tools-0.6.2+suse20160908.d93a87f/libmpathcmd/mpath_cmd.h 2016-09-08 14:20:03.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160919.a385ea7/libmpathcmd/mpath_cmd.h 2016-09-19 15:24:12.000000000 +0200 @@ -25,7 +25,7 @@ #endif #define DEFAULT_SOCKET "/org/kernel/linux/storage/multipathd" -#define DEFAULT_REPLY_TIMEOUT 1000 +#define DEFAULT_REPLY_TIMEOUT 4000 #define MAX_REPLY_LEN 65536 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/structs.c new/multipath-tools-0.6.2+suse20160919.a385ea7/libmultipath/structs.c --- old/multipath-tools-0.6.2+suse20160908.d93a87f/libmultipath/structs.c 2016-09-08 14:20:03.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160919.a385ea7/libmultipath/structs.c 2016-09-19 15:24:12.000000000 +0200 @@ -510,7 +510,7 @@ extern int add_feature (char **f, char *n) { - int c = 0, d, l; + int c = 0, d, l = 0; char *e, *p, *t; if (!f) @@ -521,18 +521,19 @@ return 0; /* Check if feature is already present */ - if (strstr(*f, n)) - return 0; - - /* Get feature count */ - c = strtoul(*f, &e, 10); - if (*f == e) - /* parse error */ - return 1; - - /* Check if we need to increase feature count space */ - l = strlen(*f) + strlen(n) + 1; + if (*f) { + if (strstr(*f, n)) + return 0; + + /* Get feature count */ + c = strtoul(*f, &e, 10); + if (*f == e) + /* parse error */ + return 1; + /* Check if we need to increase feature count space */ + l = strlen(*f) + strlen(n) + 1; + } /* Count new features */ if ((c % 10) == 9) l++; @@ -564,7 +565,10 @@ snprintf(p, l + 2, "%0d ", c); /* Copy the feature string */ - p = strchr(*f, ' '); + p = NULL; + if (*f) + p = strchr(*f, ' '); + if (p) { while (*p == ' ') p++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160908.d93a87f/multipathd/main.c new/multipath-tools-0.6.2+suse20160919.a385ea7/multipathd/main.c --- old/multipath-tools-0.6.2+suse20160908.d93a87f/multipathd/main.c 2016-09-08 14:20:03.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160919.a385ea7/multipathd/main.c 2016-09-19 15:24:12.000000000 +0200 @@ -2592,7 +2592,7 @@ optind++; } c += snprintf(c, s + CMDSIZE - c, "\n"); - uxclnt(s, uxsock_timeout + 100); + uxclnt(s, conf->uxsock_timeout + 100); exit(0); }
