From 7041286c651704172bf8a5bc4d318eba1839f960 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Wed, 2 Sep 2015 13:09:22 +0200 Subject: [PATCH] Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106) --- ...tate-dm_task_get_info-at-base-export.patch | 37 +++++++++++++++++++ lvm2.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 lvm2-2_02_130-libdm-reinstate-dm_task_get_info-at-base-export.patch diff --git a/lvm2-2_02_130-libdm-reinstate-dm_task_get_info-at-base-export.patch b/lvm2-2_02_130-libdm-reinstate-dm_task_get_info-at-base-export.patch new file mode 100644 index 0000000..e0c8127 --- /dev/null +++ b/lvm2-2_02_130-libdm-reinstate-dm_task_get_info-at-base-export.patch @@ -0,0 +1,37 @@ + WHATS_NEW_DM | 4 ++++ + make.tmpl.in | 7 ++++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM +index 8dc5076..ba89a9d 100644 +--- a/WHATS_NEW_DM ++++ b/WHATS_NEW_DM +@@ -1,3 +1,7 @@ ++Version 1.02.107 - ++=================================== ++ Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106) ++ + Version 1.02.106 - 26th August 2015 + =================================== + Add 'precise' column to statistics reports. +diff --git a/make.tmpl.in b/make.tmpl.in +index 2ce2faf..5ae4c42 100644 +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -502,12 +502,13 @@ else + set -e;\ + R=$$(sort $^ | uniq -u);\ + test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\ +- for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | sort -rnt_ -k5 ); do\ ++ ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | sort -rnt_ -k5 ); do\ + echo "$${i##*.} {"; echo " global:";\ + $(SED) "s/^/ /;s/$$/;/" $$i;\ +- test "$${i##*.}" = Base && { echo " local:"; echo " *;"; };\ + echo "};";\ +- done > $@ ++ done;\ ++ echo "Local {"; echo " local:"; echo " *;"; echo "};";\ ++ ) > $@ + endif + + ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ diff --git a/lvm2.spec b/lvm2.spec index 16cf6b0..772a425 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -47,7 +47,7 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.129 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -55,6 +55,7 @@ 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 +Patch3: lvm2-2_02_130-libdm-reinstate-dm_task_get_info-at-base-export.patch BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libblkid-devel >= %{util_linux_version} @@ -105,6 +106,7 @@ or more physical volumes and creating one or more logical volumes %patch0 -p1 -b .preferred_names %patch1 -p1 -b .udev_no_mpath %patch2 -p1 -b .pkgconfig +%patch3 -p1 -b .libdm_exports %build %define _default_pid_dir /run @@ -792,6 +794,9 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Wed Sep 02 2015 Peter Rajnoha - 2.02.129-2 +- Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106) + * 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)