Accepting request 316469 from network:samba:STABLE

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/316469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=46

cifs-utils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  6 14:23:59 UTC 2015 - lmuelle@suse.com
+
+- Add include_paths.h_for__PATH_MOUNTED.patch
+
 -------------------------------------------------------------------
 Wed Dec  3 13:37:48 UTC 2014 - bwiedemann@suse.com
 

cifs-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cifs-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,16 @@
 Name:           cifs-utils
 Version:        6.4
 Release:        0
-Summary:        Utilities for doing and managing mounts of the Linux CIFS filesyste
+Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
 License:        GPL-3.0+
 Group:          System/Filesystems
 Url:            http://www.samba.org/linux-cifs/cifs-utils/
-Source:         ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2
-Source5:        ftp://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2.asc
-# ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc
+Source:         http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2
+Source5:        http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2.asc
+# http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc
 Source6:        cifs-utils.keyring
 Source100:      README.cifstab.migration
+Patch:          include_paths.h_for__PATH_MOUNTED.patch
 %if "%{_vendor}" == "suse"
 %define  NET_CFGDIR network
 %else
@@ -111,6 +112,7 @@ provide these credentials to the kernel automatically at login.
 
 %prep
 %setup -q
+%patch -p1
 cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 
 %build
@@ -156,17 +158,17 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap
-%doc %{_mandir}/man1/getcifsacl.1.*
-%doc %{_mandir}/man1/setcifsacl.1.*
-%doc %{_mandir}/man8/cifs.idmap.8.*
+%{_mandir}/man1/getcifsacl.1.*
+%{_mandir}/man1/setcifsacl.1.*
+%{_mandir}/man8/cifs.idmap.8.*
 %endif
 %if 0%{?centos_version} > 499 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 499 || 0%{?suse_version} > 1020
 %{_bindir}/cifscreds
 %{_sbindir}/cifs.upcall
-%doc %{_mandir}/man1/cifscreds.1.*
-%doc %{_mandir}/man8/cifs.upcall.8.*
+%{_mandir}/man1/cifscreds.1.*
+%{_mandir}/man8/cifs.upcall.8.*
 %endif
-%doc %{_mandir}/man8/mount.cifs.8.*
+%{_mandir}/man8/mount.cifs.8.*
 %dir %{_sysconfdir}/request-key.d
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
@@ -175,7 +177,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %dir %{_sysconfdir}/cifs-utils
 %config(noreplace) %{_sysconfdir}/cifs-utils/idmap-plugin
 %{_libdir}/%{name}/idmapwb.so
-%doc %{_mandir}/man8/idmapwb.8.*
+%{_mandir}/man8/idmapwb.8.*
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
 %attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs

include_paths.h_for__PATH_MOUNTED.patch

@@ -0,0 +1,20 @@
+commit 6603cef0f06c450196a1bca06bb143d8fcda5651
+Author: Felix Janda <felix.janda@posteo.de>
+Date:   Fri Dec 5 23:19:29 2014 +0100
+
+    mtab.c: include <paths.h> for _PATH_MOUNTED
+    
+    Signed-off-by: Felix Janda <felix.janda@posteo.de>
+
+diff --git a/mtab.c b/mtab.c
+index 7b365b3..a662a3c 100644
+--- a/mtab.c
++++ b/mtab.c
+@@ -38,6 +38,7 @@
+ #include <mntent.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <paths.h>
+ #include "mount.h"
+ #include "config.h"
+