From 3c05058870a7e25250b4035e03e09d5a145a53c244d1d872f163a4bcc8efcd3f Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 10 Jul 2013 11:58:09 +0000
Subject: [PATCH] Accepting request 182674 from
 home:deadpoint:branches:Base:System

- Added patch to resolve packaging error. Patch has been sent
  upstream.
  * E: sudo 64bit-portability-issue ./sssd.c:829

- Enable SSSD as a sudoers data source

OBS-URL: https://build.opensuse.org/request/show/182674
OBS-URL: https://build.opensuse.org/package/show/Base:System/sudo?expand=0&rev=59
---
 sudo-plugins-sudoers-sssd.patch | 11 +++++++++++
 sudo.changes                    | 12 ++++++++++++
 sudo.spec                       |  7 ++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 sudo-plugins-sudoers-sssd.patch

diff --git a/sudo-plugins-sudoers-sssd.patch b/sudo-plugins-sudoers-sssd.patch
new file mode 100644
index 0000000..28b9938
--- /dev/null
+++ b/sudo-plugins-sudoers-sssd.patch
@@ -0,0 +1,11 @@
+--- sudo-1.8.7.orig/plugins/sudoers/sssd.c	2013-06-04 05:48:30.000000000 -0400
++++ sudo-1.8.7/plugins/sudoers/sssd.c	2013-07-09 11:08:37.159369867 -0400
+@@ -826,7 +826,7 @@
+ 	}
+ 
+         /* check for sha-2 digest */
+-	allowed_digest = sudo_ldap_extract_digest(&val, &digest);
++	allowed_digest = sudo_sss_extract_digest(&val, &digest);
+ 
+ 	/* check for !command */
+ 	if (*val == '!') {
diff --git a/sudo.changes b/sudo.changes
index 17106d8..f8d9004 100644
--- a/sudo.changes
+++ b/sudo.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jul  9 15:46:19 UTC 2013 - darin@darins.net
+
+- Added patch to resolve packaging error. Patch has been sent
+  upstream.
+  * E: sudo 64bit-portability-issue ./sssd.c:829
+
+-------------------------------------------------------------------
+Tue Jul  9 12:34:16 UTC 2013 - darin@darins.net
+
+- Enable SSSD as a sudoers data source 
+
 -------------------------------------------------------------------
 Tue Jul  2 16:30:19 UTC 2013 - dmueller@suse.com
 
diff --git a/sudo.spec b/sudo.spec
index 58d3b25..ba06a78 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -29,9 +29,12 @@ Source2:        README.SUSE
 Patch0:         sudoers2ldif-env.patch
 # PATCH-OPENSUSE: the "SUSE" branding of the default sudo config
 Patch1:         sudo-sudoers.patch
+# PATCH-FIX-UPSTREAM: fixes 64bit-portability-issue ./sssd.c:829; sent upstream
+Patch2:         sudo-plugins-sudoers-sssd.patch
 BuildRequires:  audit-devel
 BuildRequires:  groff
 BuildRequires:  libselinux-devel
+BuildRequires:  libsss_sudo
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 Requires(pre):  coreutils
@@ -58,6 +61,7 @@ These header files are needed for building of sudo plugins.
 %setup -q
 %patch0 -p1 
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifarch s390 s390x %sparc
@@ -87,7 +91,8 @@ export LDFLAGS="-pie"
     --with-env-editor \
     --without-secure-path \
     --with-passprompt='%%p\x27s password:' \
-    --with-timedir=%{_localstatedir}/lib/sudo
+    --with-timedir=%{_localstatedir}/lib/sudo \
+    --with-sssd
 make %{?_smp_mflags}
 
 %install