From dddc77b44edb6db476b6e2cda1dda4fa5827bd93 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 21 Sep 2015 13:54:18 +0000
Subject: sudo: update to 1.8.14.p3

---
 abs/core/sudo/PKGBUILD     | 24 ++++++++++++++++++------
 abs/core/sudo/sudo.install | 19 +++++++++++++++++++
 abs/core/sudo/sudo.pam     |  5 +++--
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 abs/core/sudo/sudo.install

diff --git a/abs/core/sudo/PKGBUILD b/abs/core/sudo/PKGBUILD
index 8adcf75..14f21ec 100644
--- a/abs/core/sudo/PKGBUILD
+++ b/abs/core/sudo/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $
+# $Id$
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.8
+_sudover=1.8.14p3
 pkgver=${_sudover/p/.p}
-pkgrel=1
+pkgrel=2
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
 license=('custom')
 groups=('base-devel')
-depends=('glibc' 'pam')
+depends=('glibc' 'pam' 'libldap')
 backup=('etc/sudoers' 'etc/pam.d/sudo')
+install=$pkgname.install
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
         sudo.pam)
-sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9'
+sha256sums=('a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237'
             'SKIP'
-            'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
+            'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
+validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
 
 build() {
   cd "$srcdir/$pkgname-$_sudover"
@@ -27,8 +29,14 @@ build() {
     --prefix=/usr \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
+    --with-rundir=/run/sudo \
+    --with-vardir=/var/db/sudo \
     --with-logfac=auth \
+    --enable-tmpfiles.d \
     --with-pam \
+    --with-sssd \
+    --with-ldap \
+    --with-ldap-conf-file=/etc/openldap/ldap.conf \
     --with-env-editor \
     --with-passprompt="[sudo] password for %p: " \
     --with-all-insults
@@ -44,6 +52,10 @@ package() {
   cd "$srcdir/$pkgname-$_sudover"
   make DESTDIR="$pkgdir" install
 
+  # Remove /run/sudo directory from the package; we create it using tmpfiles.d
+  rmdir "$pkgdir/run/sudo"
+  rmdir "$pkgdir/run"
+
   install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
 
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
diff --git a/abs/core/sudo/sudo.install b/abs/core/sudo/sudo.install
new file mode 100644
index 0000000..1369cc1
--- /dev/null
+++ b/abs/core/sudo/sudo.install
@@ -0,0 +1,19 @@
+post_install() {
+  if type -P systemd-tmpfiles >/dev/null; then
+    systemd-tmpfiles --create sudo.conf
+  fi
+}
+
+pre_upgrade() {
+  # Permissions of /var/db/sudo were changed from 0700 to 0711 in sudo 1.8.10
+  # http://www.sudo.ws/repos/sudo/rev/5c38d77a2d0c
+  if (($(vercmp $2 1.8.10-1) < 0)); then
+    chmod 0711 var/db/sudo
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/sudo/sudo.pam b/abs/core/sudo/sudo.pam
index 4e586cd..ab053c5 100644
--- a/abs/core/sudo/sudo.pam
+++ b/abs/core/sudo/sudo.pam
@@ -1,3 +1,4 @@
 #%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
+auth		include		system-auth
+account		include		system-auth
+session		include		system-auth
-- 
cgit v0.12

