Hello community,
here is the log from the commit of package multipath-tools
checked in at Wed Apr 30 00:47:38 CEST 2008.
--------
--- multipath-tools/multipath-tools.changes 2007-09-19 15:28:59.000000000 +0200
+++ multipath-tools/multipath-tools.changes 2008-04-29 16:48:16.524932000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 29 17:05:19 CEST 2008 - hare@suse.de
+
+- Merge in fixes from upstream
+- Merge fixes from SLES10 SP2
+
+-------------------------------------------------------------------
Old:
----
multipath-tools-suse-update
New:
----
multipath.init.suse
multipath-tools-add-cciss-tur
multipath-tools-block-SIGPIPE
multipath-tools-crash-on-shutdown
multipath-tools-fixup-varargs-usage
multipath-tools-libdevmapper-garbage-on-shutdown
multipath-tools-quieten-callouts
multipath-tools-remove-DAEMON-defines
multipath-tools-retry-sg_read
multipath-tools-suse-build-fixes
multipath-tools-update-hwtable
multipath-tools-use-mpatha-user_friendly_names
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.J19202/_old 2008-04-30 00:42:55.000000000 +0200
+++ /var/tmp/diff_new_pack.J19202/_new 2008-04-30 00:42:55.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package multipath-tools (Version 0.4.7)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,22 +10,34 @@
# norootforbuild
+
Name: multipath-tools
BuildRequires: device-mapper-devel libaio-devel readline-devel
Url: http://christophe.varoqui.free.fr/
-License: BSD 3-Clause, GPL v2 or later
+License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware; X11/MIT
Group: System/Base
Requires: device-mapper kpartx
-PreReq: %insserv_prereq
+PreReq: %insserv_prereq %fillup_prereq coreutils grep diffutils
AutoReqProv: on
Version: 0.4.7
-Release: 77
+Release: 118
Summary: Tools to Manage Multipathed Devices with the device-mapper
Source: multipath-tools-%{version}.tar.bz2
+Source1: multipath.init.suse
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: %{name}-git-update.patch
-Patch10: %{name}-suse-update
-Patch11: %{name}-add-dm_linear
+Patch1: %{name}-block-SIGPIPE
+Patch2: %{name}-crash-on-shutdown
+Patch3: %{name}-use-mpatha-user_friendly_names
+Patch4: %{name}-fixup-varargs-usage
+Patch5: %{name}-libdevmapper-garbage-on-shutdown
+Patch6: %{name}-retry-sg_read
+Patch7: %{name}-quieten-callouts
+Patch8: %{name}-update-hwtable
+Patch9: %{name}-add-cciss-tur
+Patch10: %{name}-remove-DAEMON-defines
+Patch11: %{name}-suse-build-fixes
+Patch12: %{name}-add-dm_linear
%description
This package provides the tools to manage multipathed devices by
@@ -49,6 +61,7 @@
Christophe Varoqui
%package -n kpartx
+License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware; X11/MIT
Summary: Manages partition tables on device-mapper devices
Group: System/Base
Requires: device-mapper
@@ -66,8 +79,19 @@
%prep
%setup -n multipath-tools-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+cp %{S:1} multipath/multipath.init.suse
%build
make OPTFLAGS="$RPM_OPT_FLAGS" BUILD=glibc
@@ -103,23 +127,13 @@
%config /etc/init.d/multipathd
%config /etc/init.d/boot.multipath
%config /etc/udev/rules.d/71-multipath.rules
-/sbin/devmap_name
+/lib/multipath
/sbin/multipath
/sbin/multipathd
-/sbin/mpath_prio_netapp
-/sbin/mpath_prio_balance_units
-/sbin/mpath_prio_random
-/sbin/mpath_prio_alua
-/sbin/mpath_prio_emc
-/sbin/mpath_prio_rdac
-/sbin/mpath_prio_hds_modular
-/sbin/mpath_prio_hp_sw
%attr (0700, root, root) /var/cache/multipath
-%{_mandir}/man8/devmap_name.8*
%{_mandir}/man8/multipath.8*
%{_mandir}/man5/multipath.conf.5*
%{_mandir}/man8/multipathd.8*
-%{_mandir}/man8/mpath_prio_alua.8*
%files -n kpartx
%defattr(-,root,root)
@@ -132,65 +146,69 @@
/lib/udev/kpartx_id
/lib/udev/dm_linear
%{_mandir}/man8/kpartx.8*
+
%changelog
-* Wed Sep 19 2007 - hare@suse.de
+* Tue Apr 29 2008 hare@suse.de
+- Merge in fixes from upstream
+- Merge fixes from SLES10 SP2
+* Wed Sep 19 2007 hare@suse.de
- Fixup generated dm_linear udev rules (#218122)
-* Thu Aug 30 2007 - hare@suse.de
+* Thu Aug 30 2007 hare@suse.de
- Rework dm_linear; udev rules should only be
created if the feature was activated (#302422)
-* Fri Aug 10 2007 - hare@suse.de
+* Fri Aug 10 2007 hare@suse.de
- Implement dm_linear (#218122)
-* Thu Aug 02 2007 - hare@suse.de
+* Thu Aug 02 2007 hare@suse.de
- Merge in latest fixes from upstream
- Remove local patches; merge with upstream
- Fix kpartx handling of extended partitions
- Use underscores for partition names (#293792)
-* Mon May 21 2007 - hare@suse.de
+* Mon May 21 2007 hare@suse.de
- Rework udev handling
- Split off kpartx package
-* Mon May 14 2007 - hare@suse.de
+* Mon May 14 2007 hare@suse.de
- Merge in latest fixes from upstream
- Add all SuSE specific files to git repository.
-* Fri May 11 2007 - hare@suse.de
+* Fri May 11 2007 hare@suse.de
- Include latest changes from upstream
- Remove libsysfs (242766)
- Handle extended partitions for kpartx
-* Mon Dec 04 2006 - dmueller@suse.de
+* Mon Dec 04 2006 dmueller@suse.de
- don't build as root
-* Fri Nov 17 2006 - hare@suse.de
+* Fri Nov 17 2006 hare@suse.de
- integrate upstream fixes
- update udev rule for YaST2 dmraid support (217807])
-* Mon Nov 06 2006 - hare@suse.de
+* Mon Nov 06 2006 hare@suse.de
- Really fixup udev rule (216167).
-* Fri Oct 20 2006 - ro@suse.de
+* Fri Oct 20 2006 ro@suse.de
- make it build
-* Mon Sep 25 2006 - hare@suse.de
+* Mon Sep 25 2006 hare@suse.de
- update to latest fixes from git tree
- remove fixes integrated in upstream
- fixup udev rule (#203688)
-* Thu Sep 14 2006 - ro@suse.de
+* Thu Sep 14 2006 ro@suse.de
- use device-mapper-devel in BuildRequires
-* Thu Aug 31 2006 - hare@suse.de
+* Thu Aug 31 2006 hare@suse.de
- include latest fixes from git tree
- update kpartx_id and udev rules to work
with dmraid.
- Fix return value for multipath -l
-* Thu Aug 17 2006 - ro@suse.de
+* Thu Aug 17 2006 ro@suse.de
- workaround problem in git-patch
normal patch can't do a "rename", so copy file first
-* Tue Jul 11 2006 - hare@suse.de
+* Tue Jul 11 2006 hare@suse.de
- Update to official version 0.4.7
- Refactor git update to apply to 0.4.7
-* Wed Jun 28 2006 - hare@suse.de
+* Wed Jun 28 2006 hare@suse.de
- Remove blacklisting of dasd device node,
use product_blacklist instead (#188688)
-* Mon Jun 12 2006 - hare@suse.de
+* Mon Jun 12 2006 hare@suse.de
- Add 72-multipath-compat.rules to create 'by-name'
symlink again for compability (#183663)
-* Fri Jun 02 2006 - hare@suse.de
+* Fri Jun 02 2006 hare@suse.de
- Merge in fixed from upstream
- Set device-mapper name correctly (#181127)
-* Thu Jun 01 2006 - hare@suse.de
+* Thu Jun 01 2006 hare@suse.de
- Merge in fixes from upstream
- Fixup aliasing handling
- Fix string length in pp_alua
@@ -198,89 +216,89 @@
- Fixup 71-multipath.rules to work correctly with the
updated device-mapper online/offline events (#176516 - LTC23961)
- Add kpartx_id for the updated 71-multipath.rules
-* Mon May 22 2006 - schwab@suse.de
+* Mon May 22 2006 schwab@suse.de
- Don't strip binaries.
-* Tue May 02 2006 - hare@suse.de
+* Tue May 02 2006 hare@suse.de
- Merge in fixes from upstream
- Merged local patches
- Added hds_modular prioritizer
- Remove merged patches
- Allow for setting of maximum number of open files (#149979)
- Implement 'stop' for init scripts
-* Mon Apr 10 2006 - hare@suse.de
+* Mon Apr 10 2006 hare@suse.de
- Lowering priority for pp_tpc
- Split off DS6000 to fixup priority handler (#161347)
-* Wed Apr 05 2006 - hare@suse.de
+* Wed Apr 05 2006 hare@suse.de
- Disable debug messages in pp_tpc.
-* Wed Mar 29 2006 - hare@suse.de
+* Wed Mar 29 2006 hare@suse.de
- Explicitely create partitions at boot time (#159927)
-* Thu Mar 23 2006 - hare@suse.de
+* Thu Mar 23 2006 hare@suse.de
- Add hwtable entry for IBM 3526.
-* Tue Mar 14 2006 - hare@suse.de
+* Tue Mar 14 2006 hare@suse.de
- Fix another typo in mpath_id.
-* Tue Mar 14 2006 - hare@suse.de
+* Tue Mar 14 2006 hare@suse.de
- Fix typo in mpath_id.
-* Mon Mar 13 2006 - hare@suse.de
+* Mon Mar 13 2006 hare@suse.de
- Fix autobuild warnings.
- Include some minor fixed from upstream.
-* Thu Mar 09 2006 - hare@suse.de
+* Thu Mar 09 2006 hare@suse.de
- Add mpath_id program to call kpartx only on multipathed
devices (#149995 - LTC21557).
- Include latest fixes from upstream.
-* Wed Feb 08 2006 - hare@suse.de
+* Wed Feb 08 2006 hare@suse.de
- Add device blacklisting (#85778)
- Further manpage installation fixes (#146179, #147053, #147911)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Jan 19 2006 - hare@suse.de
+* Thu Jan 19 2006 hare@suse.de
- Fix manpage installation.
-* Tue Jan 17 2006 - hare@suse.de
+* Tue Jan 17 2006 hare@suse.de
- Include latest git fixes
- Remove old patches which are now upstream
- Add new hwtable entry for shark (#142176)
-* Fri Dec 16 2005 - hare@suse.de
+* Fri Dec 16 2005 hare@suse.de
- Fix dependencies for /etc/init.d/boot.multipath
- Fix kpartx rules to generate proper partition names.
-* Wed Dec 07 2005 - hare@suse.de
+* Wed Dec 07 2005 hare@suse.de
- Update to multipath-tools-0.4.6
- Include latest git fixes
- Port patches from SLES9 SP3
-* Mon Oct 31 2005 - dmueller@suse.de
+* Mon Oct 31 2005 dmueller@suse.de
- don't build as root
-* Mon Sep 05 2005 - matz@suse.de
+* Mon Sep 05 2005 matz@suse.de
- Fix broken usage of self-defined syscall [#114933].
-* Fri Aug 26 2005 - hare@suse.de
+* Fri Aug 26 2005 hare@suse.de
- Fix kpartx DASD partition support
-* Thu Aug 04 2005 - hare@suse.de
+* Thu Aug 04 2005 hare@suse.de
- Add 'directio' path checker
- Add support for S/390 DASD (PAV enablement).
- Update to package from SLES9
-* Thu Jun 23 2005 - lmb@suse.de
+* Thu Jun 23 2005 lmb@suse.de
- LUs with a WWN containing "fd" were blacklisted (#93562).
-* Thu Jun 16 2005 - lmb@suse.de
+* Thu Jun 16 2005 lmb@suse.de
- Remove stray newline character from /dev/disk/by-name/ entries
(#85798, #86763)
- Clear /dev/disk/by-name/ on boot. (#85978)
- scsi_id now handles EMC Symmetrix; remove work-around for #86760.
-* Wed Jun 15 2005 - meissner@suse.de
+* Wed Jun 15 2005 meissner@suse.de
- use RPM_OPT_FLAGS.
-* Mon Jun 13 2005 - ro@suse.de
+* Tue Jun 14 2005 ro@suse.de
- neededforbuild: udev -> sysfsutils
-* Tue Jun 07 2005 - lmb@suse.de
+* Tue Jun 07 2005 lmb@suse.de
- Import fixes from upstream.
- Hardware table updates for IBM ESS and EMC CX (#81688).
- Reinstate paths correctly after failure/restore cycle (#85781,
[#86444]).
- Create map names again and fix segfault in devmap_name (#85798).
-* Tue May 24 2005 - hare@suse.de
+* Tue May 24 2005 hare@suse.de
- Fix segmentation fault with EMC Symmetrix (#85614).
- Update EMC Symmetrix entry in hwtable.
-* Mon May 23 2005 - hare@suse.de
+* Mon May 23 2005 hare@suse.de
- Add hwtable entry for IBM DS6000. (#63903)
- Do a rescan for devices if multipath command line option is set.
-* Fri May 20 2005 - hare@suse.de
+* Fri May 20 2005 hare@suse.de
- Fix devmap_name to use mapname and return proper status (#84748).
-* Thu May 12 2005 - lmb@suse.de
+* Thu May 12 2005 lmb@suse.de
- Don't complain about default prio callout command (#81695).
- Reflect recent changes in boot.multipath as well as multipathd init
scripts.
@@ -288,72 +306,72 @@
(#81679).
- killproc/startproc/checkproc can't be used with multipathd because of
the way the daemon switches to its own namespace (#80443).
-* Mon May 09 2005 - hare@suse.de
+* Mon May 09 2005 hare@suse.de
- Use proper path checker for SGI TPC arrays.
- Update hwtable entries for SGI TP9400 and SGI TP9500.
- Write correct PID file (#80443).
-* Mon Apr 25 2005 - lmb@suse.de
+* Mon Apr 25 2005 lmb@suse.de
- Update to 0.4.4: pp_alua now licensed as GPL (#78628).
- multipath-tools-oom-adj.patch: oom_adj to a valid value.
-* Thu Apr 21 2005 - lmb@suse.de
+* Thu Apr 21 2005 lmb@suse.de
- Update to 0.4.4-pre18 which fixes the multipathd to initialize
correctly in the absence of a configuration file (79239).
-* Wed Apr 20 2005 - lmb@suse.de
+* Wed Apr 20 2005 lmb@suse.de
- Put multipath cache back into /dev because /var might not be mounted.
- Correct hwtable entry SGI TP9400, TP9500 and IBM 3542.
-* Wed Apr 20 2005 - lmb@suse.de
+* Wed Apr 20 2005 lmb@suse.de
- Update to 0.4.4-pre16
- Build against device-mapper.1.01.xx correctly.
-* Tue Apr 19 2005 - lmb@suse.de
+* Tue Apr 19 2005 lmb@suse.de
- Build w/o device-mapper update again.
-* Mon Apr 18 2005 - lmb@suse.de
+* Mon Apr 18 2005 lmb@suse.de
- Update to 0.4.4-pre14
- Build versus device-mapper-1.01.01 to prevent deadlocks in
kernel-space.
- Fix devmap_name to work with udev.
- Fix startup of multipathd w/o configuration file present.
-* Fri Apr 15 2005 - lmb@suse.de
+* Fri Apr 15 2005 lmb@suse.de
- Add path priority checker for EMC CLARiiON and make necessary
adjustments so that it gets called by default (#62491).
- Set the default udev dir to '/dev'
-* Fri Apr 15 2005 - hare@suse.de
+* Fri Apr 15 2005 hare@suse.de
- Fix to allocate default strings (#78056)
- Fix default entry for TPC9500.
-* Wed Apr 13 2005 - hare@suse.de
+* Wed Apr 13 2005 hare@suse.de
- Added pp_alua path priority checker.
- Update to multipath-tools-0.4.4-pre12.
-* Mon Apr 11 2005 - hare@suse.de
+* Mon Apr 11 2005 hare@suse.de
- Update to multipath-tools-0.4.4-pre10.
-* Fri Apr 08 2005 - hare@suse.de
+* Fri Apr 08 2005 hare@suse.de
- Update multipath to handle only true multipath devices (#62491).
- Update kpartx to use the device mapper target name if available.
- Add boot.multipath script for early set up of multipath targets.
-* Thu Mar 31 2005 - hare@suse.de
+* Thu Mar 31 2005 hare@suse.de
- Update devmap_name to select targets by table type (#62493).
-* Tue Jan 25 2005 - lmb@suse.de
+* Tue Jan 25 2005 lmb@suse.de
- Update to 0.4.2 and fix some bugs + add support for the extended DM
multipath kernel module. (#47491)
-* Thu Nov 11 2004 - hare@suse.de
+* Thu Nov 11 2004 hare@suse.de
- Fix bugs to make it work on S/390 (#47491).
-* Fri Nov 05 2004 - hare@suse.de
+* Fri Nov 05 2004 hare@suse.de
- Update to version 0.3.6 (#47491).
- Fix multipath init script
- Install configuration file example.
- Install multipathd in /sbin instead of /usr/bin.
-* Tue Jul 20 2004 - fehr@suse.de
+* Tue Jul 20 2004 fehr@suse.de
- updated README mp-tools-issues.pdf (see #40640)
-* Wed Jun 09 2004 - fehr@suse.de
+* Wed Jun 09 2004 fehr@suse.de
- added pdf with README to package (see #40640)
-* Thu Jun 03 2004 - fehr@suse.de
+* Thu Jun 03 2004 fehr@suse.de
- updated to version 0.2.1
- removed patches zero-currpath.patch and rm-newline-in-name.patch
already contained in 0.2.1
-* Thu Jun 03 2004 - fehr@suse.de
+* Thu Jun 03 2004 fehr@suse.de
- added patch zero-currpath.patch (see bugzilla #40640)
-* Wed May 26 2004 - uli@suse.de
+* Wed May 26 2004 uli@suse.de
- fixed to build on s390x
-* Wed May 26 2004 - fehr@suse.de
+* Wed May 26 2004 fehr@suse.de
- added patch rm-newline-in-name.patch (see bugzilla #40640)
-* Tue May 25 2004 - fehr@suse.de
+* Tue May 25 2004 fehr@suse.de
- created initial version of a SuSE package from version 0.2.0 of
multipath tools
++++++ multipath-tools-add-dm_linear ++++++
--- multipath-tools/multipath-tools-add-dm_linear 2007-09-19 15:27:19.000000000 +0200
+++ multipath-tools/multipath-tools-add-dm_linear 2008-04-29 16:46:55.871892000 +0200
@@ -3,16 +3,16 @@
--- a/kpartx/Makefile
+++ b/kpartx/Makefile
@@ -37,8 +37,10 @@ $(MULTIPATHLIB)-$(BUILD).a:
- install: $(EXEC) kpartx_id $(EXEC).8
- install -d $(DESTDIR)$(bindir)
+ install: $(EXEC) $(EXEC).8
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
-+ install -m 755 activate_dm_linear $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(libudevdir)
- install -m 755 kpartx_id $(DESTDIR)$(libudevdir)
-+ install -m 755 dm_linear $(DESTDIR)$(libudevdir)
- install -d $(DESTDIR)/etc/udev/rules.d
- install -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/70-kpartx.rules
- install -d $(DESTDIR)$(mandir)
++ $(INSTALL_PROGRAM) -m 755 activate_dm_linear $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
+ $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
++ $(INSTALL_PROGRAM) -m 755 dm_linear $(DESTDIR)$(libudevdir)
+ $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/70-kpartx.rules
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
@@ -46,6 +48,11 @@ install: $(EXEC) kpartx_id $(EXEC).8
uninstall:
@@ -158,7 +158,7 @@
@@ -30,6 +34,8 @@ ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \
- RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
+ RUN+="/sbin/kpartx -a -p -part /dev/$kernel"
+ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="linear-*", \
+ RUN+="/sbin/kpartx -a -p _part /dev/$kernel"
++++++ multipath-tools-git-update.patch ++++++
++++ 23147 lines (skipped)
++++ between multipath-tools/multipath-tools-git-update.patch
++++ and multipath-tools/multipath-tools-git-update.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org