Hello community,
here is the log from the commit of package autofs for openSUSE:Factory checked
in at 2015-05-10 10:54:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autofs (Old)
and /work/SRC/openSUSE:Factory/.autofs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2015-03-05
18:15:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2015-05-10
10:54:10.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 6 11:27:45 UTC 2015 - dmuel...@suse.com
+
+- add autofs-5.1.0-gcc5-fixes.patch: Fix build against gcc 5.x
+
+-------------------------------------------------------------------
New:
----
autofs-5.1.0-gcc5-fixes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.joe6MW/_old 2015-05-10 10:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.joe6MW/_new 2015-05-10 10:54:10.000000000 +0200
@@ -87,6 +87,7 @@
# PATCH-EXTEND-OPENSUSE autofs-5.0.8-dbus-udisks-monitor.patch
Patch102: autofs-5.1.0-dbus-udisks-monitor.patch
Patch200: autofs-debuginfo-fix.patch
+Patch201: autofs-5.1.0-gcc5-fixes.patch
Requires(pre): %fillup_prereq
Requires(pre): aaa_base
%if %{with_systemd}
@@ -115,6 +116,7 @@
%patch100 -p1
%patch102 -p0 -b .udisks
%patch200 -p1
+%patch201 -p1
%build
++++++ autofs-5.1.0-dbus-udisks-monitor.patch ++++++
--- /var/tmp/diff_new_pack.joe6MW/_old 2015-05-10 10:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.joe6MW/_new 2015-05-10 10:54:11.000000000 +0200
@@ -38,7 +38,7 @@
#include "defaults.h"
#include "state.h"
-@@ -71,9 +72,15 @@ int load_autofs4_module(void);
+@@ -72,9 +73,15 @@ int load_autofs4_module(void);
#define SLOPPY
#endif
@@ -444,7 +444,7 @@
===================================================================
--- lib/master_tok.l.orig
+++ lib/master_tok.l
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+)
INTMAP (-hosts|-null)
MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS}))
MULTISEP ([\-]{2}[[:blank:]]+)
@@ -457,7 +457,7 @@
===================================================================
--- lib/parse_subs.c.orig
+++ lib/parse_subs.c
-@@ -98,6 +98,8 @@
+@@ -98,6 +98,8 @@ static struct types map_type[] = {
{ "yp", 2 },
{ "nis", 3 },
{ "nisplus", 7 },
@@ -596,7 +596,7 @@
===================================================================
--- modules/Makefile.orig
+++ modules/Makefile
-@@ -60,6 +60,14 @@ ifeq ($(SSSD), 1)
+@@ -62,6 +62,14 @@ ifeq ($(SSSD), 1)
MODS += lookup_sss.so
endif
@@ -611,7 +611,7 @@
CFLAGS += -I../include -I../lib -fPIC -D_GNU_SOURCE
CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\"
-@@ -116,6 +124,10 @@ lookup_ldap.so: lookup_ldap.c dclist.o b
+@@ -133,6 +141,10 @@ lookup_ldap.so: lookup_ldap.c dclist.o b
$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) $(LIBS)
$(STRIP) lookup_ldap.so
@@ -3138,7 +3138,7 @@
===================================================================
--- daemon/lookup.c.orig
+++ daemon/lookup.c
-@@ -200,6 +200,10 @@ int lookup_nss_read_master(struct master
+@@ -239,6 +239,10 @@ int lookup_nss_read_master(struct master
(name[3] == ',' || name[3] == ':')) ||
(!strncmp(name, "nisplus", 7) &&
(name[7] == ',' || name[7] == ':')) ||
++++++ autofs-5.1.0-gcc5-fixes.patch ++++++
autofs-5.1.0 - fix gcc5 complaints
From: Ian Kent <ra...@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(-)
Index: autofs-5.1.0/daemon/spawn.c
===================================================================
--- 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;
Index: autofs-5.1.0/include/automount.h
===================================================================
--- autofs-5.1.0.orig/include/automount.h
+++ autofs-5.1.0/include/automount.h
@@ -248,7 +248,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, ...);
Index: autofs-5.1.0/include/master.h
===================================================================
--- 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 *);
Index: autofs-5.1.0/lib/master.c
===================================================================
--- 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;
}
++++++ autofs-debuginfo-fix.patch ++++++
--- /var/tmp/diff_new_pack.joe6MW/_old 2015-05-10 10:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.joe6MW/_new 2015-05-10 10:54:11.000000000 +0200
@@ -2,8 +2,10 @@
Makefile.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/Makefile.rules
-+++ b/Makefile.rules
+Index: autofs-5.1.0/Makefile.rules
+===================================================================
+--- autofs-5.1.0.orig/Makefile.rules
++++ autofs-5.1.0/Makefile.rules
@@ -27,7 +27,7 @@ CFLAGS ?= -g -Wall -DDEBUG
LDFLAGS ?= -g
else
