- update libtirpc workaround for new soname.

This commit is contained in:
Ian Kent 2015-11-02 08:34:13 +08:00
parent 880ff8c4fc
commit 490a09d05e
3 changed files with 71 additions and 1 deletions

View File

@ -0,0 +1,23 @@
autofs-5.1.1 - fix fix gcc5 complaints
From: Ian Kent <raven@themaw.net>
Remove a stray declare of dump_core().
Signed-off-by: Ian Kent <raven@themaw.net>
---
lib/rpc_subs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 846c40e..84fae9e 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -77,7 +77,6 @@ static const rpcvers_t mount_vers[] = {
};
static int connect_nb(int, struct sockaddr *, socklen_t, struct timeval *);
-inline void dump_core(void);
/*
* Perform a non-blocking connect on the socket fd.

View File

@ -0,0 +1,36 @@
autofs-5.1.1 - update libtirpc workaround for new soname
From: Ian Kent <ikent@redhat.com>
When pre-opening the libtirpc shared library also check for revision
3 of the library.
---
CHANGELOG | 4 ++++
daemon/automount.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index dbfbe48..688d485 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+??/??/2015 autofs-5.1.2
+=======================
+- update libtirpc workaround for new soname.
+
21/04/2015 autofs-5.1.1
=======================
- fix compile error in defaults.c.
diff --git a/daemon/automount.c b/daemon/automount.c
index 229cb1a..c81b4af 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -2393,6 +2393,8 @@ int main(int argc, char *argv[])
void *dh_tirpc = dlopen("libtirpc.so", RTLD_NOW);
if (!dh_tirpc)
dh_tirpc = dlopen("libtirpc.so.1", RTLD_NOW);
+ if (!dh_tirpc)
+ dh_tirpc = dlopen("libtirpc.so.3", RTLD_NOW);
#endif
if (!master_read_master(master_list, age, 0)) {

View File

@ -8,12 +8,16 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.1.1
Release: 4%{?dist}
Release: 5%{?dist}
Epoch: 1
License: GPLv2+
Group: System Environment/Daemons
Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: autofs-5.1.1-fix-fix-gcc5-complaints.patch
Patch2: autofs-5.1.1-update-libtirpc-workaround-for-new-soname.patch
%if %{with_systemd}
BuildRequires: systemd-units
%endif
@ -72,6 +76,9 @@ echo %{version}-%{release} > .version
%define systemd_configure_arg --with-systemd
%endif
%patch1 -p1
%patch2 -p1
%build
LDFLAGS=-Wl,-z,now
%configure --disable-mount-locking --enable-ignore-busy --with-libtirpc %{?systemd_configure_arg:}
@ -164,6 +171,10 @@ fi
%dir /etc/auto.master.d
%changelog
* Mon Nov 02 2015 Kalev Lember <klember@redhat.com> - 1:5.1.1-5
- fix fix gcc5 complaints.
- update libtirpc workaround for new soname.
* Sun Nov 01 2015 Kalev Lember <klember@redhat.com> - 1:5.1.1-4
- Rebuilt for libtirpc soname bump