Accepting request 202677 from network:samba:STABLE

- Update to cifs-utils 6.2.
  + setcifsacl can now work without a plugin
  + systemd-ask-password is found using $PATH now
  + cifs.upcall now works with KEYRING: credcaches
- Update to cifs-utils 6.1.
  + minor bugfixes
  + allow cifs.upcall to use dedicated keytab
- Update to cifs-utils 6.0.
  + minor bugfixes and documentation updates
  + support for NFS-style device names removed

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

1a01f7c4b90695211d12291d7a24bec05b1f2922.diff

@@ -1,29 +0,0 @@
-commit 1a01f7c4b90695211d12291d7a24bec05b1f2922
-Author: Jeff Layton <jlayton@samba.org>
-Date:   Sat Jan 12 22:02:01 2013 -0500
-
-    mount.cifs: set parsed_info->got_user when a cred file supplies a username
-    
-    commit 85d18a1ed introduced a regression when using a credentials file.
-    It set the username in the parsed mount info properly, but didn't set
-    the "got_user" flag in it.
-    
-    Also, fix an incorrect strlcpy length specifier in open_cred_file.
-    
-    Reported-by: "Mantas M." <grawity@gmail.com>
-    Signed-off-by: Jeff Layton <jlayton@samba.org>
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index c7c3055..40b77e9 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
- 		switch (parse_cred_line(line_buf + i, &temp_val)) {
- 		case CRED_USER:
- 			strlcpy(parsed_info->username, temp_val,
--				sizeof(parsed_info->domain));
-+				sizeof(parsed_info->username));
-+			parsed_info->got_user = 1;
- 			break;
- 		case CRED_PASS:
- 			i = set_password(parsed_info, temp_val);

cifs-utils-5.9.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2
-size 388403

cifs-utils-6.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34676e374ee139ce1b6566ed1802c55f92b5d74cc58417a4989df7438ff2cd33
+size 392856

cifs-utils-6.2.tar.bz2.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAABAgAGBQJSTqdBAAoJEFr9v7Jw87mBkuEIAJYLgPt4IJW/9o5CSAD3FJCR
+yVixXU0xevx6Y0+A/35juOUxas0BR4QQGeNu5DHs/EEYfQcB/7quv6zoDSbPAtbi
+wVOFYlLXPOyC7H4t9n7pWhkYcIUuH5Jkth8QFoA9BwzFHwIOPEeneL0TSf6m6jzM
+An54JwG2Cq9NWTmpNbTFS/8IfpzgmiDm0QQlaAgYpc8v4rxxkboIwK8Fvn9dtFLC
+mCD3f2XnVzV5/6Bi53qnaK30ha4tGJ4EoN1OTCTi8jEkAD7cgjzI0wC43iDsX04W
+VYba+hu+PGcftriw1pgccIgeU2kMSrrK8k3Ttb1O6V/60Ic3nl+qAGPYcH+L2zo=
+=1AK2
+-----END PGP SIGNATURE-----

cifs-utils-pubkey_70F3B981.asc

@@ -0,0 +1,32 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+mQENBEuqp6ABCADf+tS1rZDdQaUfp7yUWTW+H8OqOXCjuCohHUZFoYF6K/pxhtsY
+YUXt5NcXNTioOgJ18S9AL80KS2LTEyr8Z0mfGw1Rld4MClGnnIVNjKUKFaSeEOZG
+eSIgjY/gYSP361mwo4PCcieeEO5V0g0agIrYOjkEUSSWb503Ma/NSLwlc3HjvL7i
+woosfBpdGyr8dUjb9Tz0HtVw+2wqWl4zMNMYilgoZV0sGO0HssrU40yR/DjuXX5u
+Yj+JpffKltKD9iKQ2c29yDXcVoYgAmKu7lNTEGafJHqSWWf2Cvuc+VGTLKrCKxCB
+jlN4FKZO3pKFMLX3a0pMEn/ee645wH4mccMJABEBAAG0P2NpZnMtdXRpbHMgRGlz
+dHJpYnV0aW9uIFZlcmlmaWNhdGlvbiBLZXkgPGNpZnMtdXRpbHNAc2FtYmEub3Jn
+PokBOAQTAQIAIgUCS6qnoAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+Wv2/snDzuYFT3wgAo3mjI7HpDd6oywObMF+NDJC55lmMOZE3r0YuLg59aPeOI+PG
+hhjx1UcCMWtx4Bu2j3I96bgwwoe+/ZxYjJZIqa8ClF6JulMDksI06eITSLOXaJVV
+1OP8Rtq5aUyN9DsBrLhnpC1QkyBtiIKWDr9H/HSm8uYd3xOjcbhg3hYSBzCSEcTA
+lVnk575rZRZ7kgwm6R5aCy/QNtmfbLWvI7ZA50q+zrE3/cDQ2ZLjktueOXufCQLg
+cTivreji4aiU3p3dxRvZ+GFWnRyFu6o88DYZlT8M2mHdro5EW7S31ccs0tKdFrcw
+vpkPi0TdWPp072UOeDogxuGdozpWuDB62n9TX4hGBBARAgAGBQJLqq6pAAoJEMj9
+IMUDHcyA1wkAnj4i4n33+JHh42fMDJojYGPxpnFnAJ9SXLONLJoFwQkaOjLNGYtQ
+YH67ALkBDQRLqqegAQgA9Hco9TDoYOu3s7FePHqXxKClrHMswjfmD6WQ0k26j3lq
+RS1KpSbGSiF8zXrKGKC0yO/INQ+WJGqDuVTwELE8hYcJeY0M5scSY6qAc+iCcTRn
+B4Mf6Esnz/a6J0YebiojFrAgChGGUk/cZdwu8UOV//MbFSKCC49PcjNEjv2OXp5F
+h/5gl/dSElHzSI9HykqhCECvcWSBdUXsIogIXJoQ0XX7WyPNKt0FeD0hGdYtDlzg
+ZGjqhj/l8XHbFtNdJ/YOue8gBJ//4c2q7yrFMWf7lsJv/qaBDJECR1pV/O2juFZn
+CxJ05WWnyqMbS30dVGM+VDf6HAfownc6NLX6KgANkQARAQABiQEfBBgBAgAJBQJL
+qqegAhsMAAoJEFr9v7Jw87mBEZ8H/jxs/oyggM4VE0LSrZ3mmCJeNpAkk+rQlCRv
+lqkIpn8xwllSCFVm7yET+Eo6G07J1vsGX7+hrtxC1UxB7UYwU3OMMciWpQyz32Zi
+DO+eZwrWLg74Jy0Y6rvBlqhTQoRBeWhMzeMxfjtsBkBX3d3RWtuLGiA14pIw73+h
+6NE0EbxIuXC5elEWdzm1A9LDH1B6XU9O5e/h5M/7KeKVW+wfydy0PGN/cQ7CLG/x
+Rznvy631YcU03NN0PTO9aimbu67H27UIbj+ONoteeqklxmzVkriuYhJoSYkZloIz
+ZuM2e2o9RtZwfOLOVR2fMspSGyvKq9NqOSOfz/2VFJI/7LYuJRM=
+=hbsp
+-----END PGP PUBLIC KEY BLOCK-----

cifs-utils.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Oct  8 15:02:44 UTC 2013 - lmuelle@suse.com
+
+- Update to cifs-utils 6.2.
+  + setcifsacl can now work without a plugin
+  + systemd-ask-password is found using $PATH now
+  + cifs.upcall now works with KEYRING: credcaches
+- Update to cifs-utils 6.1.
+  + minor bugfixes
+  + allow cifs.upcall to use dedicated keytab
+- Update to cifs-utils 6.0.
+  + minor bugfixes and documentation updates
+  + support for NFS-style device names removed
+
 -------------------------------------------------------------------
 Thu Mar 21 10:46:51 UTC 2013 - mmeister@suse.com
 
@@ -7,7 +21,8 @@ Thu Mar 21 10:46:51 UTC 2013 - mmeister@suse.com
 -------------------------------------------------------------------
 Tue Feb 26 12:07:11 UTC 2013 - lmuelle@suse.com
 
-- Add cifstab named configuration file to post-12.2 systems; (bnc#804822).
+- Add cifstab named configuration file to post-12.2 systems; (bnc#804822);
+  (bnc#821889).
 - Really use of the existing cifs init script; (bnc#697218).
 
 -------------------------------------------------------------------

cifs-utils.spec

@@ -17,13 +17,15 @@
 
 
 Name:           cifs-utils
-Version:        5.9
+Version:        6.2
 Release:        0
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesyste
 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
+Source6         ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.asc
 %if "%{_vendor}" == "suse"
 %define  NET_CFGDIR network
 %else
@@ -33,7 +35,6 @@ Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
 Source4:        cifstab
-Patch:          1a01f7c4b90695211d12291d7a24bec05b1f2922.diff
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -89,7 +90,6 @@ necessary for building ID mapping plugins for cifs-utils.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"