From 5002bde0d52e917ab7d2a891be98d15d8f6be7dbba3d6b4ea7436c61bdeb437c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 22 Feb 2016 18:12:23 +0000 Subject: [PATCH] - Update to cifs-utils 6.5. + mount.cifs: ignore x- mount options + minor build fixes + minor manpage fix OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=137 --- cifs-utils-6.4.tar.bz2 | 3 --- cifs-utils-6.4.tar.bz2.asc | 11 ----------- cifs-utils-6.5.tar.bz2 | 3 +++ cifs-utils-6.5.tar.bz2.asc | 11 +++++++++++ cifs-utils.changes | 8 ++++++++ cifs-utils.spec | 6 ++---- include_paths.h_for__PATH_MOUNTED.patch | 20 -------------------- 7 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 cifs-utils-6.4.tar.bz2 delete mode 100644 cifs-utils-6.4.tar.bz2.asc create mode 100644 cifs-utils-6.5.tar.bz2 create mode 100644 cifs-utils-6.5.tar.bz2.asc delete mode 100644 include_paths.h_for__PATH_MOUNTED.patch diff --git a/cifs-utils-6.4.tar.bz2 b/cifs-utils-6.4.tar.bz2 deleted file mode 100644 index 2283bc9..0000000 --- a/cifs-utils-6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 -size 392809 diff --git a/cifs-utils-6.4.tar.bz2.asc b/cifs-utils-6.4.tar.bz2.asc deleted file mode 100644 index d68e69e..0000000 --- a/cifs-utils-6.4.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABAgAGBQJTwAEMAAoJEFr9v7Jw87mBJW8IALAjyESnOB8N3bm+yP12yJd/ -9PIOfQsP1/6kJjjiMCOO35VytwcNRcvcMMaBmCPim+blaZB553cXvZAxl1RpGe2i -wXowmZK/cp1ozPNCJHbdSXi8ES7y1pbXfDhfSY+icL0NhQxsw50U4LtC/YIdc5eE -yw8RkRzZVJj3a5inFJHAw+zIa1/hj1pNWytSLoKmFYiSAPjY+/DPkpMrNsd7OUEk -s01F6QQf5RtU4xDzyZsKTDY2hd3V7cO5+/ofN1coqeZUmbLFwShWEKlFQVnl6z24 -q2Qpk22ayrfcOdg/hIpPxca5G9Oz4AKFBxoUt7CiUUxU6BMxnGwbd+Hrq2h/fQo= -=jec5 ------END PGP SIGNATURE----- diff --git a/cifs-utils-6.5.tar.bz2 b/cifs-utils-6.5.tar.bz2 new file mode 100644 index 0000000..bc53a87 --- /dev/null +++ b/cifs-utils-6.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 +size 402158 diff --git a/cifs-utils-6.5.tar.bz2.asc b/cifs-utils-6.5.tar.bz2.asc new file mode 100644 index 0000000..e526637 --- /dev/null +++ b/cifs-utils-6.5.tar.bz2.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJWyzHeAAoJEFr9v7Jw87mBzCUIALAjddIyPDJ+zUP8GEPkCL5M +esOLPP0J9jf4t5QOqKq/druS/PmC9bs6GrZ/5gsYl3uXWtztIW61L3IIX9oGEErg +lt6lpNWl5EkUzdKZQrNKzrekyI5uoGPpPL9k1ZMn8IlSQP769CIGW5zFL0cL63YB +4wUkM7TtoCsD7LVJDtxe9ikprZ/OmbPNeavBhY4+7YuqYOjPXTgm4fl9Cqh92zO7 +ShC9IUqT/st1LZXPcDpPcncG+0hvM0cfBKcyv8WnOoqxNPyyCLrLywD8jnOcjiEC +1IoH9d4+psmmTqxkrC/JypfccWBnuTWBJ9uDGy0HfQ3NG58Hwv60fJazKYKraxE= +=RVqu +-----END PGP SIGNATURE----- diff --git a/cifs-utils.changes b/cifs-utils.changes index 5de51d9..e73f74b 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 22 18:05:33 UTC 2016 - lmuelle@suse.com + +- Update to cifs-utils 6.5. + + mount.cifs: ignore x- mount options + + minor build fixes + + minor manpage fix + ------------------------------------------------------------------- Thu Sep 10 17:19:31 UTC 2015 - lmuelle@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index ba1f5cb..a32dc5a 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package cifs-utils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: cifs-utils -Version: 6.4 +Version: 6.5 Release: 0 Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem License: GPL-3.0+ @@ -28,7 +28,6 @@ Source5: http://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.t # 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 @@ -113,7 +112,6 @@ provide these credentials to the kernel automatically at login. %prep %setup -q -%patch -p1 cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration . %build diff --git a/include_paths.h_for__PATH_MOUNTED.patch b/include_paths.h_for__PATH_MOUNTED.patch deleted file mode 100644 index 4872579..0000000 --- a/include_paths.h_for__PATH_MOUNTED.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 6603cef0f06c450196a1bca06bb143d8fcda5651 -Author: Felix Janda -Date: Fri Dec 5 23:19:29 2014 +0100 - - mtab.c: include for _PATH_MOUNTED - - Signed-off-by: Felix Janda - -diff --git a/mtab.c b/mtab.c -index 7b365b3..a662a3c 100644 ---- a/mtab.c -+++ b/mtab.c -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include "mount.h" - #include "config.h" -