Accepting request 242750 from network:samba:STABLE

- Update to cifs-utils 6.4.
  + allow PAM directory to be configurable
    - Make_the_PAM_security_directory_configurable_at_compile_time.patch
  + better determination of default keytab file
  + better cifscreds error handling
  + uppercase devicename when retrying mount

OBS-URL: https://build.opensuse.org/request/show/242750
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2014-07-29 19:21:42 +00:00 committed by Git OBS Bridge
commit 3570ba00c9
7 changed files with 25 additions and 52 deletions

View File

@ -1,35 +0,0 @@
Author: Lars Mueller <lmuelle@suse.com>
Subject: Make PAM security install directory configurable at compile time
Reported-upstream: yes
Bugzilla: bso#10513
Index: cifs-utils-6.3/configure.ac
===================================================================
--- cifs-utils-6.3.orig/configure.ac
+++ cifs-utils-6.3/configure.ac
@@ -58,6 +58,12 @@ AC_ARG_WITH(idmap-plugin,
AC_DEFINE_UNQUOTED(IDMAP_PLUGIN_PATH, "$pluginpath", [Location of plugin that ID mapping infrastructure should use. (usually a symlink to real plugin)])
AC_SUBST([pluginpath])
+AC_ARG_WITH(pamdir,
+ [AC_HELP_STRING([--with-pamdir=DIR],[Where to install the PAM module [[$(libdir)/security]]])],
+ pamdir=$withval,
+ pamdir="\$(libdir)/security")
+AC_SUBST([pamdir])
+
# check for ROOTSBINDIR environment var
if test -z $ROOTSBINDIR; then
ROOTSBINDIR="/sbin"
Index: cifs-utils-6.3/Makefile.am
===================================================================
--- cifs-utils-6.3.orig/Makefile.am
+++ cifs-utils-6.3/Makefile.am
@@ -92,8 +92,6 @@ idmapwb.8: idmapwb.8.in
endif
if CONFIG_PAM
-pamdir = $(libdir)/security
-
pam_PROGRAMS = pam_cifscreds.so
pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQEcBAABAgAGBQJSzsyiAAoJEFr9v7Jw87mBQ1IH+wWOvX/ccSnSEBetPQupThww
3lCwyrC1PJhwHJvCOTR7axVVu4F/fVVaoBu8Hl6inqvnE/Ds2a4vnWYulSrR9Mii
uUArW/DLqM2bFpkXSV6HjhJ4FOU9Ps2HKl6sSTdCbXqzfg6vUobdoog9NBx5LlyC
CSI4ncWRdigyI6/lSMAWyzRaI1pfVlNBLMgrsN9EZwpqtly/Knt/Z9UJBXIC6Hrs
sKBg+mbtGymq2pRkfLbaepIcyfyF1shV7Hem0A3Wpm/yt6AmVkEpAMqSYG9sIgWz
3G3JxQKl6I58LNQI5TH/IZ1dMawhJcaxz7HqkI9DcBv2KGpWqsLxrHciNuvDf30=
=JWC6
-----END PGP SIGNATURE-----

3
cifs-utils-6.4.tar.bz2 Normal file
View File

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

View File

@ -0,0 +1,11 @@
-----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-----

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jul 28 11:27:12 UTC 2014 - lmuelle@suse.com
- Update to cifs-utils 6.4.
+ allow PAM directory to be configurable
- Make_the_PAM_security_directory_configurable_at_compile_time.patch
+ better determination of default keytab file
+ better cifscreds error handling
+ uppercase devicename when retrying mount
-------------------------------------------------------------------
Wed Jun 18 19:49:50 UTC 2014 - lmuelle@suse.com

View File

@ -17,7 +17,7 @@
Name: cifs-utils
Version: 6.3
Version: 6.4
Release: 0
Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste
License: GPL-3.0+
@ -35,7 +35,6 @@ Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh
Source4: cifstab
Patch: Make_the_PAM_security_directory_configurable_at_compile_time.patch
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd
%else
@ -117,7 +116,6 @@ provide these credentials to the kernel automatically at login.
%prep
%{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}}
%setup -q
%patch -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"