From 433ee43545f6b6288fb2f5c22c1cc6c004882edb Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Mar 23 2015 13:07:50 +0000
Subject: - Drop ancient 2.6 kernel patches from docs and fix gcc5 complaints (bz1204685).


---

diff --git a/autofs-5.1.0-fix-gcc5-complaints.patch b/autofs-5.1.0-fix-gcc5-complaints.patch
new file mode 100644
index 0000000..b16a19b
--- /dev/null
+++ b/autofs-5.1.0-fix-gcc5-complaints.patch
@@ -0,0 +1,68 @@
+autofs-5.1.0 - fix gcc5 complaints
+
+From: Ian Kent <raven@themaw.net>
+
+gcc5 is not happy with the way dump_core() and master_get_logopt()
+are declared inline, remove the inline and let the compiler decide.
+---
+ CHANGELOG           |    1 +
+ daemon/spawn.c      |    2 +-
+ include/automount.h |    2 +-
+ include/master.h    |    2 +-
+ lib/master.c        |    2 +-
+ 5 files changed, 5 insertions(+), 4 deletions(-)
+
+--- autofs-5.1.0.orig/CHANGELOG
++++ autofs-5.1.0/CHANGELOG
+@@ -26,6 +26,7 @@
+ - cleanup options in amd_parse.c
+ - allow empty value for some map options.
+ - allow empty value in macro selectors.
++- fix gcc5 complaints.
+ 
+ 28/03/2014 autofs-5.0.9
+ =======================
+--- autofs-5.1.0.orig/daemon/spawn.c
++++ autofs-5.1.0/daemon/spawn.c
+@@ -36,7 +36,7 @@ static pthread_mutex_t spawn_mutex = PTH
+ 
+ #define MTAB_LOCK_RETRIES	3
+ 
+-inline void dump_core(void)
++void dump_core(void)
+ {
+ 	sigset_t segv;
+ 
+--- autofs-5.1.0.orig/include/automount.h
++++ autofs-5.1.0/include/automount.h
+@@ -241,7 +241,7 @@ const char **copy_argv(int argc, const c
+ int compare_argv(int argc1, const char **argv1, int argc2, const char **argv2);
+ int free_argv(int argc, const char **argv);
+ 
+-inline void dump_core(void);
++void dump_core(void);
+ int aquire_lock(void);
+ void release_lock(void);
+ int spawnl(unsigned logopt, const char *prog, ...);
+--- autofs-5.1.0.orig/include/master.h
++++ autofs-5.1.0/include/master.h
+@@ -120,7 +120,7 @@ void master_notify_state_change(struct m
+ int master_mount_mounts(struct master *, time_t, int);
+ int dump_map(struct master *, const char *, const char *);
+ int master_show_mounts(struct master *);
+-extern inline unsigned int master_get_logopt(void);
++unsigned int master_get_logopt(void);
+ int master_list_empty(struct master *);
+ int master_done(struct master *);
+ int master_kill(struct master *);
+--- autofs-5.1.0.orig/lib/master.c
++++ autofs-5.1.0/lib/master.c
+@@ -1712,7 +1712,7 @@ int master_done(struct master *master)
+ 	return res;
+ }
+ 
+-inline unsigned int master_get_logopt(void)
++unsigned int master_get_logopt(void)
+ {
+ 	return master_list ? master_list->logopt : LOGOPT_NONE;
+ }
diff --git a/autofs.spec b/autofs.spec
index ded982d..f72ad4c 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -8,11 +8,12 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.1.0
-Release: 10%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz
+
 Patch1: autofs-5.1.0-fix-compile-error-in-defaults_c.patch
 Patch2: autofs-5.1.0-add-serialization-to-sasl-init.patch
 Patch3: autofs-5.1.0-dont-allocate-dev_ctl_ops-too-early.patch
@@ -54,6 +55,7 @@ Patch38: autofs-5.1.0-make-negative-cache-update-consistent-for-all-lookup-modul
 Patch39: autofs-5.1.0-ensure-negative-cache-isnt-updated-on-remount.patch
 Patch40: autofs-5.1.0-dont-add-wildcard-to-negative-cache.patch
 Patch41: autofs-5.1.0-make-service-want-network-online.patch
+Patch42: autofs-5.1.0-fix-gcc5-complaints.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -151,6 +153,7 @@ echo %{version}-%{release} > .version
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 
 %build
 LDFLAGS=-Wl,-z,now
@@ -229,7 +232,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS INSTALL COPY* README* patches/* samples/ldap* samples/autofs.schema
+%doc CREDITS INSTALL COPY* README* samples/ldap* samples/autofs.schema
 %config %{init_file_name}
 %config(noreplace,missingok) /etc/auto.master
 %config(noreplace) /etc/autofs.conf
@@ -244,6 +247,10 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Mon Mar 23 2015 Ian Kent <ikent@redhat.com> - 1:5.1.0-12
+- Drop ancient 2.6 kernel patches from docs (pbrobinson@fedoraproject.org).
+- fix gcc5 complaints (bz1204685).
+
 * Wed Jan 21 2015 Ian Kent <ikent@redhat.com> - 1:5.1.0-10
 - make negative cache update consistent for all lookup modules.
 - ensure negative cache isn't updated on remount.