scm-commits November 2012

scm-commits@lists.fedoraproject.org

455 participants
15356 discussions

[gnustep-base] Fix incomplete changelog entry
by Jochen Schmitt 30 Nov '12

30 Nov '12

commit 22519f1a507fc9c3fb786cf67e0cef2d8da64d54 Author: Jochen Schmitt <Jochen(a)herr-schmitt.de> Date: Fri Nov 30 21:53:49 2012 +0100 Fix incomplete changelog entry gnustep-base.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) --- diff --git a/gnustep-base.spec b/gnustep-base.spec index f76b2df..33ee72f 100644 --- a/gnustep-base.spec +++ b/gnustep-base.spec @@ -168,6 +168,8 @@ fi %changelog * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.24.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +- Add patch to fix a issue with newer releases of libxml2 +- Romove obsoletes items from the SPEC file * Wed Feb 8 2012 Jochen Schmitt <Jochen herr-schmitt de> 1.24.0-1 - New upstream release

1 0

[gnustep-base] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
by Jochen Schmitt 30 Nov '12

30 Nov '12

commit a5335b89bf3dbe2bb06f5edbb6fdde614b0b7ac5 Author: Jochen Schmitt <Jochen(a)herr-schmitt.de> Date: Fri Nov 30 21:47:34 2012 +0100 Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild gnustep-base-1.24.0-xml.patch | 17 +++++++++++++++++ gnustep-base.spec | 9 +++------ 2 files changed, 20 insertions(+), 6 deletions(-) --- diff --git a/gnustep-base-1.24.0-xml.patch b/gnustep-base-1.24.0-xml.patch new file mode 100644 index 0000000..6f664a2 --- /dev/null +++ b/gnustep-base-1.24.0-xml.patch @@ -0,0 +1,17 @@ +diff -up gnustep-base-1.24.0/Source/Additions/GSXML.m.xmlbak gnustep-base-1.24.0/Source/Additions/GSXML.m +--- gnustep-base-1.24.0/Source/Additions/GSXML.m.xmlbak 2012-11-30 20:38:09.030094574 +0100 ++++ gnustep-base-1.24.0/Source/Additions/GSXML.m 2012-11-30 20:57:38.535312199 +0100 + #import "Foundation/NSRunLoop.h" + #import "Foundation/NSString.h" +@@ -984,7 +984,11 @@ static NSMapTable *nodeNames = 0; + 1, + "utf-8"); + xmlOutputBufferFlush(buf); ++#if LIBXML_VERSION < 20900 + string = UTF8StrLen(buf->buffer->content, buf->buffer->use); ++#else ++ string = UTF8StrLen(xmlBufContent(buf->buffer), xmlBufUse(buf->buffer)); ++#endif + xmlOutputBufferClose(buf); + } + return string; diff --git a/gnustep-base.spec b/gnustep-base.spec index 8f954c0..f76b2df 100644 --- a/gnustep-base.spec +++ b/gnustep-base.spec @@ -10,7 +10,8 @@ Summary: GNUstep Base library package URL: http://www.gnustep.org/ Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/-%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Patch was extracted from the nightly build 20121130 +Patch1: gnustep-base-1.24.0-xml.patch BuildRequires: gcc-objc BuildRequires: libffi-devel @@ -71,6 +72,7 @@ This package contains the documentation for %{name} %prep %setup -q +%patch1 -p1 -b .xmlbak iconv -f iso-8859-1 -t utf-8 ChangeLog.2 -o ChangeLog.2.utf8 mv ChangeLog.2.utf8 ChangeLog.2 @@ -83,8 +85,6 @@ ffi_include=$(pkg-config --cflags-only-I libffi | sed -e 's/^\-\I//') make %{?_smp_mflags} %install -rm -rf ${RPM_BUILD_ROOT} - # mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/GNUstep/DTDs/ make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM @@ -110,9 +110,6 @@ make -C Documentation make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -%clean -rm -rf ${RPM_BUILD_ROOT} - %post -p /sbin/ldconfig %post doc

1 0

[ktp-text-ui/f18] Rebuild against tp-logger.
by Brian Pepple 30 Nov '12

30 Nov '12

commit 837aa9d6e3c03f79d3ca674867957cfb0da68a22 Author: Brian Pepple <bpepple(a)fedoraproject.org> Date: Fri Nov 30 15:45:20 2012 -0500 Rebuild against tp-logger. ktp-text-ui.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/ktp-text-ui.spec b/ktp-text-ui.spec index 4c7b988..4fcfd0c 100644 --- a/ktp-text-ui.spec +++ b/ktp-text-ui.spec @@ -5,7 +5,7 @@ Name: ktp-text-ui Summary: Telepathy text chat handler Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} # GPLv2+: most code # (BSD or AFL): data/styles/renkoo.AdiumMessageStyle @@ -116,6 +116,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/ktp-log-vie %changelog +* Fri Nov 30 2012 Brian Pepple <bpepple(a)fedoraproject.org> - 0.5.1-2 +- Rebuild against tp-logger. + * Fri Oct 05 2012 Rex Dieter <rdieter(a)fedoraproject.org> - 0.5.1-1 - 0.5.1

1 0

[device-mapper-multipath] device-mapper-multipath-0.4.9-38
by Benjamin Marzinski 30 Nov '12

30 Nov '12

commit 775d7c1eb9d28063f143bb9ff31992538cf8d553 Author: Benjamin Marzinski <bmarzins(a)redhat.com> Date: Fri Nov 30 08:55:32 2012 -0600 device-mapper-multipath-0.4.9-38 Add 0026-RH-fix-mpathpersist-fns.patch Add 0027-RH-default-partition-delimiters.patch * Only use the -p delimiter when the device name ends in a number Add 0028-RH-storagetek-config.patch Add 0029-RH-kpartx-retry.patch * retry delete on busy loop devices Add 0030-RH-early-blacklist.patch * multipath will now blacklist devices by device type and wwid in store_pathinfo, so that it doesn't do a bunch of unnecessary work on paths that it would only be removing later on. 0026-RH-fix-mpathpersist-fns.patch | 62 +++ 0027-RH-default-partition-delimiters.patch | 15 + 0028-RH-storagetek-config.patch | 30 ++ 0029-RH-kpartx-retry.patch | 34 ++ 0030-RH-early-blacklist.patch | 569 ++++++++++++++++++++++++++++ device-mapper-multipath.spec | 24 ++- 6 files changed, 733 insertions(+), 1 deletions(-) --- diff --git a/0026-RH-fix-mpathpersist-fns.patch b/0026-RH-fix-mpathpersist-fns.patch new file mode 100644 index 0000000..bb01026 --- /dev/null +++ b/0026-RH-fix-mpathpersist-fns.patch @@ -0,0 +1,62 @@ +--- + libmultipath/dict.c | 25 +++++++++++++++++++++++-- + multipathd/cli_handlers.c | 2 +- + 2 files changed, 24 insertions(+), 3 deletions(-) + +Index: multipath-tools-120821/libmultipath/dict.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/dict.c ++++ multipath-tools-120821/libmultipath/dict.c +@@ -2073,8 +2073,19 @@ snprint_mp_prio_args(char * buff, int le + static int + snprint_mp_reservation_key (char * buff, int len, void * data) + { ++ int i; ++ unsigned char *keyp; ++ uint64_t prkey = 0; + struct mpentry * mpe = (struct mpentry *)data; +- return snprintf(buff, len, "%s" , mpe->reservation_key); ++ keyp = (unsigned char *)mpe->reservation_key; ++ for (i = 0; i < 8; i++) { ++ if (i > 0) ++ prkey <<= 8; ++ prkey |= *keyp; ++ keyp++; ++ } ++ ++ return snprintf(buff, len, "0x%" PRIx64, prkey); + } + + static int +@@ -2754,7 +2765,17 @@ snprint_def_wwids_file (char * buff, int + static int + snprint_def_reservation_key(char * buff, int len, void * data) + { +- return snprintf(buff, len, "%s", conf->reservation_key); ++ int i; ++ unsigned char *keyp; ++ uint64_t prkey = 0; ++ keyp = (unsigned char *)conf->reservation_key; ++ for (i = 0; i < 8; i++) { ++ if (i > 0) ++ prkey <<= 8; ++ prkey |= *keyp; ++ keyp++; ++ } ++ return snprintf(buff, len, "0x%" PRIx64, prkey); + } + + static int +Index: multipath-tools-120821/multipathd/cli_handlers.c +=================================================================== +--- multipath-tools-120821.orig/multipathd/cli_handlers.c ++++ multipath-tools-120821/multipathd/cli_handlers.c +@@ -947,7 +947,7 @@ cli_getprstatus (void * v, char ** reply + + + sprintf(*reply,"%d",mpp->prflag); +- *reply[1]='\0'; ++ (*reply)[1]='\0'; + + + condlog(3, "%s: reply = %s", param, *reply); diff --git a/0027-RH-default-partition-delimiters.patch b/0027-RH-default-partition-delimiters.patch new file mode 100644 index 0000000..395a139 --- /dev/null +++ b/0027-RH-default-partition-delimiters.patch @@ -0,0 +1,15 @@ +--- + multipath/multipath.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: multipath-tools-120821/multipath/multipath.rules +=================================================================== +--- multipath-tools-120821.orig/multipath/multipath.rules ++++ multipath-tools-120821/multipath/multipath.rules +@@ -20,5 +20,5 @@ ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath + ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" + ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" + ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" +-RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" ++RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode" + LABEL="end_mpath" diff --git a/0028-RH-storagetek-config.patch b/0028-RH-storagetek-config.patch new file mode 100644 index 0000000..adac5a7 --- /dev/null +++ b/0028-RH-storagetek-config.patch @@ -0,0 +1,30 @@ +--- + libmultipath/hwtable.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +Index: multipath-tools-120821/libmultipath/hwtable.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/hwtable.c ++++ multipath-tools-120821/libmultipath/hwtable.c +@@ -1120,6 +1120,21 @@ static struct hwentry default_hw[] = { + .prio_name = PRIO_RDAC, + .prio_args = NULL, + }, ++ /* StorageTek 6180 */ ++ { ++ .vendor = "SUN", ++ .product = "SUN_6180", ++ .features = DEFAULT_FEATURES, ++ .hwhandler = "1 rdac", ++ .pgpolicy = GROUP_BY_PRIO, ++ .pgfailback = -FAILBACK_IMMEDIATE, ++ .rr_weight = RR_WEIGHT_NONE, ++ .no_path_retry = NO_PATH_RETRY_QUEUE, ++ .minio = DEFAULT_MINIO, ++ .minio_rq = DEFAULT_MINIO_RQ, ++ .checker_name = RDAC, ++ .prio_name = PRIO_RDAC, ++ }, + /* LSI/Engenio/NetApp E-Series RDAC storage */ + { + .vendor = "(LSI|ENGENIO)", diff --git a/0029-RH-kpartx-retry.patch b/0029-RH-kpartx-retry.patch new file mode 100644 index 0000000..a6cf0bd --- /dev/null +++ b/0029-RH-kpartx-retry.patch @@ -0,0 +1,34 @@ +Index: multipath-tools-120821/kpartx/lopart.c +=================================================================== +--- multipath-tools-120821.orig/kpartx/lopart.c ++++ multipath-tools-120821/kpartx/lopart.c +@@ -286,6 +286,7 @@ set_loop (const char *device, const char + extern int + del_loop (const char *device) + { ++ int retries = 3; + int fd; + + if ((fd = open (device, O_RDONLY)) < 0) { +@@ -295,10 +296,17 @@ del_loop (const char *device) + return 1; + } + +- if (ioctl (fd, LOOP_CLR_FD, 0) < 0) { +- perror ("ioctl: LOOP_CLR_FD"); +- close (fd); +- return 1; ++ while (ioctl (fd, LOOP_CLR_FD, 0) < 0) { ++ if (errno != EBUSY || retries-- <= 0) { ++ perror ("ioctl: LOOP_CLR_FD"); ++ close (fd); ++ return 1; ++ } ++ fprintf(stderr, ++ "loop: device %s still in use, retrying delete\n", ++ device); ++ sleep(1); ++ continue; + } + + close (fd); diff --git a/0030-RH-early-blacklist.patch b/0030-RH-early-blacklist.patch new file mode 100644 index 0000000..42b70d1 --- /dev/null +++ b/0030-RH-early-blacklist.patch @@ -0,0 +1,569 @@ +--- + libmultipath/alias.c | 47 +++++++++++++++++------------- + libmultipath/alias.h | 2 - + libmultipath/configure.c | 70 ++++++++++++++++++++++++++++++---------------- + libmultipath/configure.h | 2 - + libmultipath/discovery.c | 47 +++++++++++++++++++++++------- + libmultipath/discovery.h | 11 ++++--- + libmultipath/util.c | 2 - + multipath/main.c | 14 ++++----- + multipathd/cli_handlers.c | 11 +++---- + multipathd/main.c | 22 ++++++-------- + 10 files changed, 140 insertions(+), 88 deletions(-) + +Index: multipath-tools-120821/libmultipath/discovery.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/discovery.c ++++ multipath-tools-120821/libmultipath/discovery.c +@@ -28,37 +28,45 @@ + #include "prio.h" + #include "defaults.h" + +-struct path * ++int + store_pathinfo (vector pathvec, vector hwtable, struct udev_device *udevice, +- int flag) ++ int flag, struct path **pp_ptr) + { ++ int err = 1; + struct path * pp; + const char * devname; + ++ if (pp_ptr) ++ *pp_ptr = NULL; ++ + devname = udev_device_get_sysname(udevice); + if (!devname) +- return NULL; ++ return 1; + + pp = alloc_path(); + + if (!pp) +- return NULL; ++ return 1; + + if(safe_sprintf(pp->dev, "%s", devname)) { + condlog(0, "pp->dev too small"); + goto out; + } + pp->udev = udev_device_ref(udevice); +- if (pathinfo(pp, hwtable, flag)) ++ err = pathinfo(pp, hwtable, flag | DI_BLACKLIST); ++ if (err) + goto out; + +- if (store_path(pathvec, pp)) ++ err = store_path(pathvec, pp); ++ if (err) + goto out; + +- return pp; + out: +- free_path(pp); +- return NULL; ++ if (err) ++ free_path(pp); ++ else if (pp_ptr) ++ *pp_ptr = pp; ++ return err; + } + + static int +@@ -78,9 +86,11 @@ path_discover (vector pathvec, struct co + + pp = find_path_by_dev(pathvec, (char *)devname); + if (!pp) { +- pp = store_pathinfo(pathvec, conf->hwtable, +- udevice, flag); +- return (pp ? 0 : 1); ++ if (store_pathinfo(pathvec, conf->hwtable, ++ udevice, flag, NULL) != 1) ++ return 0; ++ else ++ return 1; + } + return pathinfo(pp, conf->hwtable, flag); + } +@@ -853,6 +863,13 @@ pathinfo (struct path *pp, vector hwtabl + if (mask & DI_SYSFS && sysfs_pathinfo(pp)) + return 1; + ++ if (mask & DI_BLACKLIST && mask & DI_SYSFS) { ++ if (filter_device(conf->blist_device, conf->elist_device, ++ pp->vendor_id, pp->product_id) > 0) { ++ return 2; ++ } ++ } ++ + path_state = path_offline(pp); + + /* +@@ -906,6 +923,12 @@ pathinfo (struct path *pp, vector hwtabl + + if (path_state == PATH_UP && (mask & DI_WWID) && !strlen(pp->wwid)) + get_uid(pp); ++ if (mask & DI_BLACKLIST && mask & DI_WWID) { ++ if (filter_wwid(conf->blist_wwid, conf->elist_wwid, ++ pp->wwid) > 0) { ++ return 2; ++ } ++ } + + return 0; + +Index: multipath-tools-120821/libmultipath/discovery.h +=================================================================== +--- multipath-tools-120821.orig/libmultipath/discovery.h ++++ multipath-tools-120821/libmultipath/discovery.h +@@ -33,8 +33,9 @@ int do_tur (char *); + int path_offline (struct path *); + int get_state (struct path * pp, int daemon); + int pathinfo (struct path *, vector hwtable, int mask); +-struct path * store_pathinfo (vector pathvec, vector hwtable, +- struct udev_device *udevice, int flag); ++int store_pathinfo (vector pathvec, vector hwtable, ++ struct udev_device *udevice, int flag, ++ struct path **pp_ptr); + int sysfs_set_scsi_tmo (struct multipath *mpp); + int sysfs_get_timeout(struct path *pp, unsigned int *timeout); + +@@ -46,14 +47,16 @@ enum discovery_mode { + __DI_SERIAL, + __DI_CHECKER, + __DI_PRIO, +- __DI_WWID ++ __DI_WWID, ++ __DI_BLACKLIST, + }; + + #define DI_SYSFS (1 << __DI_SYSFS) + #define DI_SERIAL (1 << __DI_SERIAL) + #define DI_CHECKER (1 << __DI_CHECKER) + #define DI_PRIO (1 << __DI_PRIO) +-#define DI_WWID (1 << __DI_WWID) ++#define DI_WWID (1 << __DI_WWID) ++#define DI_BLACKLIST (1 << __DI_BLACKLIST) + + #define DI_ALL (DI_SYSFS | DI_SERIAL | DI_CHECKER | DI_PRIO | \ + DI_WWID) +Index: multipath-tools-120821/libmultipath/alias.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/alias.c ++++ multipath-tools-120821/libmultipath/alias.c +@@ -13,6 +13,9 @@ + #include "uxsock.h" + #include "alias.h" + #include "file.h" ++#include "vector.h" ++#include "checkers.h" ++#include "structs.h" + + + /* +@@ -121,23 +124,23 @@ lookup_binding(FILE *f, char *map_wwid, + } + + static int +-rlookup_binding(FILE *f, char **map_wwid, char *map_alias) ++rlookup_binding(FILE *f, char *buff, char *map_alias) + { +- char buf[LINE_MAX]; ++ char line[LINE_MAX]; + unsigned int line_nr = 0; + int id = 0; + +- *map_wwid = NULL; ++ buff[0] = '\0'; + +- while (fgets(buf, LINE_MAX, f)) { ++ while (fgets(line, LINE_MAX, f)) { + char *c, *alias, *wwid; + int curr_id; + + line_nr++; +- c = strpbrk(buf, "#\n\r"); ++ c = strpbrk(line, "#\n\r"); + if (c) + *c = '\0'; +- alias = strtok(buf, " \t"); ++ alias = strtok(line, " \t"); + if (!alias) /* blank line */ + continue; + curr_id = scan_devname(alias, NULL); /* TBD: Why this call? */ +@@ -150,13 +153,16 @@ rlookup_binding(FILE *f, char **map_wwid + line_nr); + continue; + } ++ if (strlen(wwid) > WWID_SIZE - 1) { ++ condlog(3, ++ "Ignoring too large wwid at %u in bindings file", line_nr); ++ continue; ++ } + if (strcmp(alias, map_alias) == 0){ + condlog(3, "Found matching alias [%s] in bindings file." + "\nSetting wwid to %s", alias, wwid); +- *map_wwid = strdup(wwid); +- if (*map_wwid == NULL) +- condlog(0, "Cannot copy alias from bindings " +- "file : %s", strerror(errno)); ++ strncpy(buff, wwid, WWID_SIZE); ++ buff[WWID_SIZE - 1] = '\0'; + return id; + } + } +@@ -255,36 +261,35 @@ get_user_friendly_alias(char *wwid, char + return alias; + } + +-char * +-get_user_friendly_wwid(char *alias, char *file) ++int ++get_user_friendly_wwid(char *alias, char *buff, char *file) + { +- char *wwid; +- int fd, id, unused; ++ int fd, unused; + FILE *f; + + if (!alias || *alias == '\0') { + condlog(3, "Cannot find binding for empty alias"); +- return NULL; ++ return -1; + } + + fd = open_file(file, &unused, BINDINGS_FILE_HEADER); + if (fd < 0) +- return NULL; ++ return -1; + + f = fdopen(fd, "r"); + if (!f) { + condlog(0, "cannot fdopen on bindings file descriptor : %s", + strerror(errno)); + close(fd); +- return NULL; ++ return -1; + } + +- id = rlookup_binding(f, &wwid, alias); +- if (id < 0) { ++ rlookup_binding(f, buff, alias); ++ if (!strlen(buff)) { + fclose(f); +- return NULL; ++ return -1; + } + + fclose(f); +- return wwid; ++ return 0; + } +Index: multipath-tools-120821/libmultipath/alias.h +=================================================================== +--- multipath-tools-120821.orig/libmultipath/alias.h ++++ multipath-tools-120821/libmultipath/alias.h +@@ -9,4 +9,4 @@ + + char *get_user_friendly_alias(char *wwid, char *file, char *prefix, + int bindings_readonly); +-char *get_user_friendly_wwid(char *alias, char *file); ++int get_user_friendly_wwid(char *alias, char *buff, char *file); +Index: multipath-tools-120821/libmultipath/configure.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/configure.c ++++ multipath-tools-120821/libmultipath/configure.c +@@ -687,21 +687,32 @@ coalesce_paths (struct vectors * vecs, v + return 0; + } + +-extern char * +-get_refwwid (char * dev, enum devtypes dev_type, vector pathvec) ++/* ++ * returns: ++ * 0 - success ++ * 1 - failure ++ * 2 - blacklist ++ */ ++extern int ++get_refwwid (char * dev, enum devtypes dev_type, vector pathvec, char **wwid) + { ++ int ret = 1; + struct path * pp; + char buff[FILE_NAME_SIZE]; + char * refwwid = NULL, tmpwwid[WWID_SIZE]; + ++ if (!wwid) ++ return 1; ++ *wwid = NULL; ++ + if (dev_type == DEV_NONE) +- return NULL; ++ return 1; + + if (dev_type == DEV_DEVNODE) { + if (basenamecpy(dev, buff, FILE_NAME_SIZE) == 0) { + condlog(1, "basename failed for '%s' (%s)", + dev, buff); +- return NULL; ++ return 1; + } + + pp = find_path_by_dev(pathvec, buff); +@@ -710,14 +721,16 @@ get_refwwid (char * dev, enum devtypes d + + if (!udevice) { + condlog(2, "%s: can't get udev device", buff); +- return NULL; ++ return 1; + } +- pp = store_pathinfo(pathvec, conf->hwtable, udevice, +- DI_SYSFS | DI_WWID); ++ ret = store_pathinfo(pathvec, conf->hwtable, udevice, ++ DI_SYSFS | DI_WWID, &pp); + udev_device_unref(udevice); + if (!pp) { +- condlog(0, "%s can't store path info", buff); +- return NULL; ++ if (ret == 1) ++ condlog(0, "%s can't store path info", ++ buff); ++ return ret; + } + } + refwwid = pp->wwid; +@@ -732,14 +745,16 @@ get_refwwid (char * dev, enum devtypes d + + if (!udevice) { + condlog(2, "%s: can't get udev device", dev); +- return NULL; ++ return 1; + } +- pp = store_pathinfo(pathvec, conf->hwtable, udevice, +- DI_SYSFS | DI_WWID); ++ ret = store_pathinfo(pathvec, conf->hwtable, udevice, ++ DI_SYSFS | DI_WWID, &pp); + udev_device_unref(udevice); + if (!pp) { +- condlog(0, "%s can't store path info", buff); +- return NULL; ++ if (ret == 1) ++ condlog(0, "%s can't store path info", ++ buff); ++ return ret; + } + } + refwwid = pp->wwid; +@@ -749,17 +764,17 @@ get_refwwid (char * dev, enum devtypes d + + if (((dm_get_uuid(dev, tmpwwid)) == 0) && (strlen(tmpwwid))) { + refwwid = tmpwwid; +- goto out; ++ goto check; + } + + /* + * may be a binding + */ +- refwwid = get_user_friendly_wwid(dev, +- conf->bindings_file); +- +- if (refwwid) +- return refwwid; ++ if (get_user_friendly_wwid(dev, tmpwwid, ++ conf->bindings_file) == 0) { ++ refwwid = tmpwwid; ++ goto check; ++ } + + /* + * or may be an alias +@@ -771,12 +786,21 @@ get_refwwid (char * dev, enum devtypes d + */ + if (!refwwid) + refwwid = dev; ++ ++check: ++ if (refwwid && strlen(refwwid)) { ++ if (filter_wwid(conf->blist_wwid, conf->elist_wwid, ++ refwwid) > 0) ++ return 2; ++ } + } + out: +- if (refwwid && strlen(refwwid)) +- return STRDUP(refwwid); ++ if (refwwid && strlen(refwwid)) { ++ *wwid = STRDUP(refwwid); ++ return 0; ++ } + +- return NULL; ++ return 1; + } + + extern int reload_map(struct vectors *vecs, struct multipath *mpp) +Index: multipath-tools-120821/libmultipath/configure.h +=================================================================== +--- multipath-tools-120821.orig/libmultipath/configure.h ++++ multipath-tools-120821/libmultipath/configure.h +@@ -27,6 +27,6 @@ int setup_map (struct multipath * mpp, c + int domap (struct multipath * mpp, char * params); + int reinstate_paths (struct multipath *mpp); + int coalesce_paths (struct vectors *vecs, vector curmp, char * refwwid, int force_reload); +-char * get_refwwid (char * dev, enum devtypes dev_type, vector pathvec); ++int get_refwwid (char * dev, enum devtypes dev_type, vector pathvec, char **wwid); + int reload_map(struct vectors *vecs, struct multipath *mpp); + +Index: multipath-tools-120821/libmultipath/util.c +=================================================================== +--- multipath-tools-120821.orig/libmultipath/util.c ++++ multipath-tools-120821/libmultipath/util.c +@@ -27,7 +27,7 @@ basenamecpy (const char * str1, char * s + if (!str1 || !strlen(str1)) + return 0; + +- if (strlen(str1) > str2len) ++ if (strlen(str1) >= str2len) + return 0; + + if (!str2) +Index: multipath-tools-120821/multipath/main.c +=================================================================== +--- multipath-tools-120821.orig/multipath/main.c ++++ multipath-tools-120821/multipath/main.c +@@ -262,7 +262,7 @@ configure (void) + /* + * if we have a blacklisted device parameter, exit early + */ +- if (dev && ++ if (dev && conf->dev_type == DEV_DEVNODE && + (filter_devnode(conf->blist_devnode, + conf->elist_devnode, dev) > 0)) { + if (conf->dry_run == 2) +@@ -275,16 +275,16 @@ configure (void) + * failing the translation is fatal (by policy) + */ + if (conf->dev) { +- refwwid = get_refwwid(conf->dev, conf->dev_type, pathvec); +- ++ int failed = get_refwwid(conf->dev, conf->dev_type, pathvec, ++ &refwwid); + if (!refwwid) { +- condlog(3, "scope is nul"); ++ if (failed == 2 && conf->dry_run == 2) ++ printf("%s is not a valid multipath device path\n", conf->dev); ++ else ++ condlog(3, "scope is nul"); + goto out; + } + condlog(3, "scope limited to %s", refwwid); +- if (filter_wwid(conf->blist_wwid, conf->elist_wwid, +- refwwid) > 0) +- goto out; + if (conf->dry_run == 2) { + if (check_wwids_file(refwwid, 0) == 0){ + printf("%s is a valid multipath device path\n", conf->dev); +Index: multipath-tools-120821/multipathd/cli_handlers.c +=================================================================== +--- multipath-tools-120821.orig/multipathd/cli_handlers.c ++++ multipath-tools-120821/multipathd/cli_handlers.c +@@ -433,19 +433,18 @@ cli_add_path (void * v, char ** reply, i + udevice = udev_device_new_from_subsystem_sysname(conf->udev, + "block", + param); +- pp = store_pathinfo(vecs->pathvec, conf->hwtable, +- udevice, DI_ALL); ++ r = store_pathinfo(vecs->pathvec, conf->hwtable, ++ udevice, DI_ALL, &pp); + udev_device_unref(udevice); + if (!pp) { ++ if (r == 2) ++ goto blacklisted; + condlog(0, "%s: failed to store path info", param); + return 1; + } + pp->checkint = conf->checkint; + } +- r = ev_add_path(pp, vecs); +- if (r == 2) +- goto blacklisted; +- return r; ++ return ev_add_path(pp, vecs); + blacklisted: + *reply = strdup("blacklisted\n"); + *len = strlen(*reply) + 1; +Index: multipath-tools-120821/multipathd/main.c +=================================================================== +--- multipath-tools-120821.orig/multipathd/main.c ++++ multipath-tools-120821/multipathd/main.c +@@ -300,7 +300,7 @@ ev_add_map (char * dev, char * alias, st + condlog(2, "%s: devmap %s registered", alias, dev); + return 0; + } +- refwwid = get_refwwid(dev, DEV_DEVMAP, vecs->pathvec); ++ r = get_refwwid(dev, DEV_DEVMAP, vecs->pathvec, &refwwid); + + if (refwwid) { + r = coalesce_paths(vecs, NULL, refwwid, 0); +@@ -309,6 +309,8 @@ ev_add_map (char * dev, char * alias, st + + if (!r) + condlog(2, "%s: devmap %s added", alias, dev); ++ else if (r == 2) ++ condlog(2, "%s: uev_add_map %s blacklisted", alias, dev); + else + condlog(0, "%s: uev_add_map %s failed", alias, dev); + +@@ -374,6 +376,7 @@ static int + uev_add_path (struct uevent *uev, struct vectors * vecs) + { + struct path *pp; ++ int ret; + + condlog(2, "%s: add path (uevent)", uev->kernel); + if (strstr(uev->kernel, "..") != NULL) { +@@ -394,8 +397,11 @@ uev_add_path (struct uevent *uev, struct + /* + * get path vital state + */ +- if (!(pp = store_pathinfo(vecs->pathvec, conf->hwtable, +- uev->udev, DI_ALL))) { ++ ret = store_pathinfo(vecs->pathvec, conf->hwtable, ++ uev->udev, DI_ALL, &pp); ++ if (!pp) { ++ if (ret == 2) ++ return 0; + condlog(0, "%s: failed to store path info", + uev->kernel); + return 1; +@@ -403,14 +409,13 @@ uev_add_path (struct uevent *uev, struct + pp->checkint = conf->checkint; + } + +- return (ev_add_path(pp, vecs) != 1)? 0 : 1; ++ return ev_add_path(pp, vecs); + } + + /* + * returns: + * 0: added + * 1: error +- * 2: blacklisted + */ + int + ev_add_path (struct path * pp, struct vectors * vecs) +@@ -428,13 +433,6 @@ ev_add_path (struct path * pp, struct ve + condlog(0, "%s: failed to get path uid", pp->dev); + goto fail; /* leave path added to pathvec */ + } +- if (filter_path(conf, pp) > 0){ +- int i = find_slot(vecs->pathvec, (void *)pp); +- if (i != -1) +- vector_del_slot(vecs->pathvec, i); +- free_path(pp); +- return 2; +- } + mpp = pp->mpp = find_mp_by_wwid(vecs->mpvec, pp->wwid); + rescan: + if (mpp) { diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 2b6693e..d16d98d 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.4.9 -Release: 37%{?dist} +Release: 38%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -33,6 +33,11 @@ Patch0022: 0022-RHBZ-864368-disable-libdm-failback.patch Patch0023: 0023-RHBZ-866291-update-documentation.patch Patch0024: 0024-RH-start-multipathd-service-before-lvm.patch Patch0025: 0025-RH-fix-systemd-start-order.patch +Patch0026: 0026-RH-fix-mpathpersist-fns.patch +Patch0027: 0027-RH-default-partition-delimiters.patch +Patch0028: 0028-RH-storagetek-config.patch +Patch0029: 0029-RH-kpartx-retry.patch +Patch0030: 0030-RH-early-blacklist.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -110,6 +115,11 @@ kpartx manages partition creation and removal for device-mapper devices. %patch0023 -p1 %patch0024 -p1 %patch0025 -p1 +%patch0026 -p1 +%patch0027 -p1 +%patch0028 -p1 +%patch0029 -p1 +%patch0030 -p1 cp %{SOURCE1} . %build @@ -201,6 +211,18 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||: %{_mandir}/man8/kpartx.8.gz %changelog +* Fri Nov 30 2012 Benjamin Marzinski <bmarizns(a)redhat.com> 0.4.9-38 +- Add 0026-RH-fix-mpathpersist-fns.patch +- Add 0027-RH-default-partition-delimiters.patch + * Only use the -p delimiter when the device name ends in a number +- Add 0028-RH-storagetek-config.patch +- Add 0029-RH-kpartx-retry.patch + * retry delete on busy loop devices +- Add 0030-RH-early-blacklist.patch + * multipath will now blacklist devices by device type and wwid in + store_pathinfo, so that it doesn't do a bunch of unnecessary work + on paths that it would only be removing later on. + * Sat Nov 03 2012 Peter Rajnoha <prajnoha(a)redhat.com> 0.4.9-37 - Install multipathd.service for sysinit.target instead of multi-user.target.

1 0

[drupal6-ctools/el5: 2/2] Merge branch 'master' into el5
by Peter Borsa 30 Nov '12

30 Nov '12

commit 14d1431cf1dbd97c11df8d7564cfd6c86184eb7a Merge: edacbbb 6f532b2 Author: Peter Borsa <peter.borsa(a)gmail.com> Date: Fri Nov 30 21:31:43 2012 +0100 Merge branch 'master' into el5 .gitignore | 1 + drupal6-ctools.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

[drupal6-ctools/el5] (2 commits) ...Merge branch 'master' into el5
by Peter Borsa 30 Nov '12

30 Nov '12

Summary of changes: 6f532b2... Fix BZ#881987 and BZ#881988 (*) 14d1431... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent

1 0

[gcc] rebuild for new ppl & cloog
by Tom Callaway 30 Nov '12

30 Nov '12

commit 88d23c2975b3e037dddde0e0198c9c9a88bf9a39 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Nov 30 15:21:50 2012 -0500 rebuild for new ppl & cloog gcc.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/gcc.spec b/gcc.spec index 222f3b1..03cbc00 100644 --- a/gcc.spec +++ b/gcc.spec @@ -3,7 +3,7 @@ %global gcc_version 4.7.2 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%global gcc_release 8 +%global gcc_release 9 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha @@ -2669,6 +2669,9 @@ fi %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %changelog +* Fri Nov 30 2012 Tom Callaway <spot(a)fedoraproject.org> 4.7.2-9 +- rebuild for new ppl/cloog + * Fri Nov 9 2012 Jakub Jelinek <jakub(a)redhat.com> 4.7.2-8 - update from the 4.7 branch - PRs fortran/54917, libstdc++/28811, libstdc++/54482, libstdc++/55028,

1 0

[mingw-gcc] rebuild for new ppl / cloog
by Tom Callaway 30 Nov '12

30 Nov '12

commit 464a4b4748489747db6dcd5676f471841277bf5a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Nov 30 15:20:50 2012 -0500 rebuild for new ppl / cloog mingw-gcc.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/mingw-gcc.spec b/mingw-gcc.spec index 1854e6d..89f87da 100644 --- a/mingw-gcc.spec +++ b/mingw-gcc.spec @@ -17,7 +17,7 @@ Name: mingw-gcc Version: 4.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions @@ -616,6 +616,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-%{mingw64_target}-* %changelog +* Fri Nov 30 2012 Tom Callaway <spot(a)fedoraproject.org> - 4.7.2-3 +- rebuild for new ppl/cloog + * Mon Oct 05 2012 Jon Ciesla <limbugher(a)gmail.com> - 4.7.2-2 - Provides: bundled(libiberty)

1 0

[drupal6-ctools/el6: 2/2] Merge branch 'master' into el6
by Peter Borsa 30 Nov '12

30 Nov '12

commit b9d0eee1e9e591342a7be3269b622f7d3b085723 Merge: ce6b91f 6f532b2 Author: Peter Borsa <peter.borsa(a)gmail.com> Date: Fri Nov 30 21:17:13 2012 +0100 Merge branch 'master' into el6 .gitignore | 1 + drupal6-ctools.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

[drupal6-ctools/el6] (2 commits) ...Merge branch 'master' into el6
by Peter Borsa 30 Nov '12

30 Nov '12

Summary of changes: 6f532b2... Fix BZ#881987 and BZ#881988 (*) b9d0eee... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2012