Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5b9c48a854a9cd36af82c92d7f63b19208ef687

commit f5b9c48a854a9cd36af82c92d7f63b19208ef687
Author: crazy <cr...@frugalware.org>
Date:   Wed Aug 9 20:17:15 2017 +0200

multipath-tools-0.7.2-1-x86_64
* forgot to remove old patches

diff --git a/source/base/multipath-tools/fixes.patch 
b/source/base/multipath-tools/fixes.patch
deleted file mode 100644
index c7185f8..0000000
--- a/source/base/multipath-tools/fixes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur a/libmultipath/blacklist.c b/libmultipath/blacklist.c
---- a/libmultipath/blacklist.c 2014-02-14 08:36:00.561065505 -0600
-+++ b/libmultipath/blacklist.c 2014-02-14 09:21:53.541963148 -0600
-@@ -182,6 +182,13 @@
-       if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT))
-               return 1;
-
-+      str = STRDUP("^cciss!c[0-9]d[0-9]*");
-+              if (!str)
-+                      return 1;
-+              if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
-+                      return 1;
-+
-+
-       vector_foreach_slot (conf->hwtable, hwe, i) {
-               if (hwe->bl_product) {
-                       if (_blacklist_device(conf->blist_device, hwe->vendor,
-diff -ur a/libmultipath/prioritizers/hds.c b/libmultipath/prioritizers/hds.c
---- a/libmultipath/prioritizers/hds.c  2014-02-14 08:36:00.563065505 -0600
-+++ b/libmultipath/prioritizers/hds.c  2014-02-14 09:21:44.228963495 -0600
-@@ -125,7 +125,7 @@
-               return -1;
-       }
-
--      snprintf (vendor, 9, "%.8s", inqBuffp + 8);
-+      snprintf (vendor, 8, "%.8s", inqBuffp + 8);
-       snprintf (product, 17, "%.16s", inqBuffp + 16);
-       snprintf (serial, 5, "%.4s", inqBuffp + 40);
-       snprintf (ldev, 5, "%.4s", inqBuffp + 44);
diff --git a/source/base/multipath-tools/paths.patch 
b/source/base/multipath-tools/paths.patch
deleted file mode 100644
index 2f886a5..0000000
--- a/source/base/multipath-tools/paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur a/kpartx/Makefile b/kpartx/Makefile
---- a/kpartx/Makefile  2014-02-14 08:36:00.560065505 -0600
-+++ b/kpartx/Makefile  2014-02-15 05:48:25.746014932 -0600
-@@ -28,8 +28,8 @@
-       $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
-       $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
-       $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
--      $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--      $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+      $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d
-+      $(INSTALL_PROGRAM) -m 644 kpartx.rules 
$(DESTDIR)/lib/udev/rules.d/66-kpartx.rules
-       $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
-       $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-
-diff -ur a/libmpathpersist/Makefile b/libmpathpersist/Makefile
---- a/libmpathpersist/Makefile 2014-02-14 08:36:00.558065506 -0600
-+++ b/libmpathpersist/Makefile 2014-02-15 05:48:06.435015650 -0600
-@@ -31,8 +31,7 @@
-       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
-       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
-       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
--      $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
--      ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-+      ln -sf $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-       install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
-       install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-       install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-diff -ur a/libmultipath/Makefile b/libmultipath/Makefile
---- a/libmultipath/Makefile    2014-02-14 08:36:00.562065505 -0600
-+++ b/libmultipath/Makefile    2014-02-15 05:48:06.435015650 -0600
-@@ -52,6 +52,7 @@
-       $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-       $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
-       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
-+      ln -sf $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
-
- uninstall:
-       rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
-diff -ur a/Makefile.inc b/Makefile.inc
---- a/Makefile.inc     2014-02-14 08:36:00.563065505 -0600
-+++ b/Makefile.inc     2014-02-15 05:48:06.435015650 -0600
-@@ -14,11 +14,7 @@
- endif
-
- ifndef LIB
--      ifeq ($(shell test -d /lib64 && echo 1),1)
--              LIB=lib64
--      else
--              LIB=lib
--      endif
-+      LIB=lib
- endif
-
- ifndef SYSTEMD
-@@ -38,7 +34,7 @@
- rcdir     = $(prefix)/etc/init.d
- syslibdir   = $(prefix)/$(LIB)
- libdir            = $(prefix)/$(LIB)/multipath
--unitdir     = $(prefix)/usr/lib/systemd/system
-+unitdir     = $(prefix)/lib/systemd/system
- mpathpersistdir = $(TOPDIR)/libmpathpersist
-
- GZIP        = gzip -9 -c
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to