diff --git a/.gitignore b/.gitignore index 6ef107f..06076c6 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /LVM2.2.02.126.tgz /LVM2.2.02.127.tgz /LVM2.2.02.128.tgz +/LVM2.2.02.129.tgz diff --git a/LVM2.2.02.128.tgz.asc b/LVM2.2.02.128.tgz.asc deleted file mode 100644 index ef0e88a..0000000 --- a/LVM2.2.02.128.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAlXSCuoACgkQIoGRwVZ+LBdk6gCfd6FkHF15s6OAZBAv/umhdQ44 -l8MAnihzCGfIjWL4jLllDog0vKifPDXT -=kwIs ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.129.tgz.asc b/LVM2.2.02.129.tgz.asc new file mode 100644 index 0000000..9d9b512 --- /dev/null +++ b/LVM2.2.02.129.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAlXeOmMACgkQIoGRwVZ+LBd5mACfcxjrUHGV8zKyqn+oR1KpoOCt +J+QAoLs0Hxq02E6wfLUOQuN9JTHl5wmB +=1kzu +-----END PGP SIGNATURE----- diff --git a/lvm2-fix-libdm-pkgconfig-file.patch b/lvm2-fix-libdm-pkgconfig-file.patch new file mode 100644 index 0000000..3224109 --- /dev/null +++ b/lvm2-fix-libdm-pkgconfig-file.patch @@ -0,0 +1,14 @@ + libdm/libdevmapper.pc.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libdm/libdevmapper.pc.in b/libdm/libdevmapper.pc.in +index 63c0720..540d0db 100644 +--- a/libdm/libdevmapper.pc.in ++++ b/libdm/libdevmapper.pc.in +@@ -8,4 +8,5 @@ Description: device-mapper library + Version: @DM_LIB_PATCHLEVEL@ + Cflags: -I${includedir} + Libs: -L${libdir} -ldevmapper +-Requires.private: @SELINUX_PC@ @UDEV_PC@ @RT_PC@ ++Requires.private: @SELINUX_PC@ @UDEV_PC@ ++Libs.private: -lrt diff --git a/lvm2-set-default-preferred_names.patch b/lvm2-set-default-preferred_names.patch index f8fe0c1..1c44605 100644 --- a/lvm2-set-default-preferred_names.patch +++ b/lvm2-set-default-preferred_names.patch @@ -3,28 +3,28 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in -index a26066a..6e99d66 100644 +index c0afcb7..ec12918 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in -@@ -102,7 +102,7 @@ devices { - # Rule 4 prefers the path with least value in lexicographical order. - # Example: +@@ -106,7 +106,7 @@ devices { + # Example # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] + # - # This configuration option does not have a default value defined. + preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] # Configuration option devices/filter. # Limit the block devices that are used by LVM commands. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h -index 68f593d..74c614a 100644 +index 9017043..c06b6f0 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h -@@ -203,7 +203,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi - "udev - Reuse existing udev database records. Applicable\n" - "only if LVM is compiled with udev support.\n") +@@ -205,7 +205,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi + " compiled with udev support.\n" + "#\n") -cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED , CFG_TYPE_STRING, NULL, vsn(1, 2, 19), NULL, 0, NULL, +cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, "#S^/dev/mpath/#S^/dev/mapper/mpath#S^/dev/[hs]d", vsn(1, 2, 19), NULL, 0, NULL, "Select which path name to display for a block device.\n" - "If multiple path names exist for a block device,\n" - "and LVM needs to display a name for the device,\n" + "If multiple path names exist for a block device, and LVM needs to\n" + "display a name for the device, the path names are matched against\n" diff --git a/lvm2.spec b/lvm2.spec index 0fe4a89..16cf6b0 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%define device_mapper_version 1.02.105 +%define device_mapper_version 1.02.106 %define enable_cache 1 %define enable_cluster 1 @@ -18,7 +18,7 @@ %define resource_agents_version 3.9.5-12 %define dlm_version 3.99.1-1 %define libselinux_version 1.30.19-4 -%define persistent_data_version 0.3.2-1 +%define persistent_data_version 0.5.5-1 %define sanlock_version 3.2.4-1 %define enable_lockd_sanlock %{enable_lvmlockd} @@ -46,7 +46,7 @@ Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.128 +Version: 2.02.129 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -54,6 +54,7 @@ URL: http://sources.redhat.com/lvm2 Source0: ftp://sources.redhat.com/pub/lvm2/releases/LVM2.%{version}.tgz Patch0: lvm2-set-default-preferred_names.patch Patch1: lvm2-remove-mpath-device-handling-from-udev-rules.patch +Patch2: lvm2-fix-libdm-pkgconfig-file.patch BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libblkid-devel >= %{util_linux_version} @@ -103,6 +104,7 @@ or more physical volumes and creating one or more logical volumes %setup -q -n LVM2.%{version} %patch0 -p1 -b .preferred_names %patch1 -p1 -b .udev_no_mpath +%patch2 -p1 -b .pkgconfig %build %define _default_pid_dir /run @@ -790,6 +792,21 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Thu Aug 27 2015 Peter Rajnoha - 2.02.129-1 +- Drop error message when vgdisplay encounters an exported VG. (2.02.27) +- Fix shared library generation to stop exporting internal functions.(2.02.120) +- Accept --cachemode with lvconvert. +- Fix and improve reporting properties of cache-pool. +- Enable usage of --cachepolicy and --cachesetting with lvconvert. +- Don't allow to reduce size of thin-pool metadata. +- Fix debug buffer overflows in cmirrord logging. +- Add --foreground and --help to cmirrord. +- Add 'precise' column to statistics reports. +- Add --precise switch to 'dmstats create' to request nanosecond counters. +- Add precise argument to dm_stats_create_region(). +- Add support to libdm-stats for precise_timestamps +- Fix devmapper.pc pkgconfig file to declare -lrt dependency properly. + * Tue Aug 18 2015 Peter Rajnoha - 2.02.128-1 - Allocation setting cache_pool_cachemode is replaced by cache_mode. - Don't attempt to close config file that couldn't be opened. diff --git a/sources b/sources index 29ae582..b67400e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3f4c273a30b316678755cec2a129718 LVM2.2.02.128.tgz +7ddcbf6eee4970068a0ca598fc775a75 LVM2.2.02.129.tgz diff --git a/upstream b/upstream index 0f83a8b..b029141 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.128.tgz +LVM2.2.02.129.tgz