From b2d582217bf4ef47d546a812cf72a5e38512ea19 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Nov 04 2014 20:33:14 +0000 Subject: Reverted a symbol map patch (bz 1159943) Signed-off-by: Steve Dickson --- diff --git a/libnfsidmap-0.26-revert-vers-map.patch b/libnfsidmap-0.26-revert-vers-map.patch new file mode 100644 index 0000000..f9a7a79 --- /dev/null +++ b/libnfsidmap-0.26-revert-vers-map.patch @@ -0,0 +1,68 @@ +commit f3b2a87693187e29979ab0256f10901a11519448 +Author: Steve Dickson +Date: Tue Nov 4 11:15:00 2014 -0500 + + build: Revert using a symbol version map + + Commit 045d2e46 cause a number of systems to be + undefined during run time in rpc.idmapd. + + Having this type of version-ing is not necessary in + this type of a library so the patch was reverted. + + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1159943 + + Signed-off-by: Steve Dickson + +diff --git a/Makefile.am b/Makefile.am +index 69bbcbc..85f19c8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,9 +26,8 @@ pkglib_LTLIBRARIES = nsswitch.la static.la $(UMICH_LDAP_LIB) $(GUMS_MAPPING_LIB) + # by this library. + + libnfsidmap_la_SOURCES = libnfsidmap.c cfg.c strlcpy.c cfg.h nfsidmap_internal.h queue.h +-libnfsidmap_la_LDFLAGS = -version-info 3:0:3 -Wl,--version-script=$(srcdir)/nfsidmap.map ++libnfsidmap_la_LDFLAGS = -version-info 3:0:3 + libnfsidmap_la_LIBADD = -ldl +-libnfsidmap_la_DEPENDENCIES = nfsidmap.map + + nsswitch_la_SOURCES = nss.c + nsswitch_la_LDFLAGS = -module -avoid-version +diff --git a/nfsidmap.map b/nfsidmap.map +deleted file mode 100644 +index 1e7cf7e..0000000 +--- a/nfsidmap.map ++++ /dev/null +@@ -1,31 +0,0 @@ +-V_0.26 { +-global: +- nfs4_init_name_mapping; +- nfs4_get_default_domain; +- nfs4_uid_to_name; +- nfs4_gid_to_name; +- nfs4_uid_to_owner; +- nfs4_gid_to_group_owner; +- nfs4_name_to_uid; +- nfs4_name_to_gid; +- nfs4_owner_to_uid; +- nfs4_owner_to_gid; +- nfs4_group_owner_to_gid; +- nfs4_gss_princ_to_ids; +- nfs4_gss_princ_to_grouplist; +- nfs4_gss_princ_to_ids_ex; +- nfs4_gss_princ_to_grouplist_ex; +- nfs4_set_debug; +- idmap_verbosity; +- idmap_log_func; +- get_default_domain; +- get_local_realms; +-local: +- *; +-}; +-/* +-V_0.27 { +-global: +- ... +-} V_0.26; +-*/ diff --git a/libnfsidmap.spec b/libnfsidmap.spec index af3a365..2e579f6 100644 --- a/libnfsidmap.spec +++ b/libnfsidmap.spec @@ -3,7 +3,7 @@ Summary: NFSv4 User and Group ID Mapping Library Name: libnfsidmap Version: 0.26 -Release: 2.0%{?dist} +Release: 2.1%{?dist} Provides: nfs-utils-lib Obsoletes: nfs-utils-lib URL: http://linux-nfs.org/wiki/index.php/Main_Page @@ -29,6 +29,7 @@ Requires: %{name} = %{version}-%{release} Requires: pkgconfig Patch001: libnfsidmap-0.27-rc2.patch +Patch002: libnfsidmap-0.26-revert-vers-map.patch %description devel This package includes header files and libraries necessary for @@ -38,6 +39,7 @@ developing programs which use the libnfsidmap library. %setup -q %patch001 -p1 +%patch002 -p1 rm configure.in %build @@ -82,6 +84,9 @@ rm -rf %{buildroot} %{_root_libdir}/*.so %changelog +* Tue Nov 4 2014 Steve Dickson 0.26.2.1 +- Reverted a symbol map patch (bz 1159943) + * Tue Oct 28 2014 Steve Dickson 0.26.2.0 - Updated to latest rc release: libnfsidmap-0-27-rc2 (bz 1156484)