From 8875dbe9faa67ed8cb8d8d470810f09c6013349e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 1 Mar 2018 16:01:01 +0000
Subject: sudo: update to 1.8.22

---
 abs/core/sudo/PKGBUILD     | 26 +++++++++++++++++---------
 abs/core/sudo/sudo.install | 10 ----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/abs/core/sudo/PKGBUILD b/abs/core/sudo/PKGBUILD
index 14f21ec..cf0753b 100644
--- a/abs/core/sudo/PKGBUILD
+++ b/abs/core/sudo/PKGBUILD
@@ -4,23 +4,27 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.14p3
+_sudover=1.8.22
 pkgver=${_sudover/p/.p}
-pkgrel=2
+pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
+arch=('x86_64')
+url="https://www.sudo.ws/sudo/"
 license=('custom')
 groups=('base-devel')
-depends=('glibc' 'pam' 'libldap')
+depends=('glibc' 'libgcrypt' 'pam' 'libldap')
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 install=$pkgname.install
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
+source=(https://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
         sudo.pam)
-sha256sums=('a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237'
+sha256sums=('7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02'
             'SKIP'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
-validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
+validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_sudover"
+}
 
 build() {
   cd "$srcdir/$pkgname-$_sudover"
@@ -32,6 +36,7 @@ build() {
     --with-rundir=/run/sudo \
     --with-vardir=/var/db/sudo \
     --with-logfac=auth \
+    --enable-gcrypt \
     --enable-tmpfiles.d \
     --with-pam \
     --with-sssd \
@@ -52,7 +57,10 @@ package() {
   cd "$srcdir/$pkgname-$_sudover"
   make DESTDIR="$pkgdir" install
 
-  # Remove /run/sudo directory from the package; we create it using tmpfiles.d
+  # Remove sudoers.dist; not needed since pacman manages updates to sudoers
+  rm "$pkgdir/etc/sudoers.dist"
+
+  # Remove /run/sudo directory; we create it using systemd-tmpfiles
   rmdir "$pkgdir/run/sudo"
   rmdir "$pkgdir/run"
 
diff --git a/abs/core/sudo/sudo.install b/abs/core/sudo/sudo.install
index 1369cc1..abf58e3 100644
--- a/abs/core/sudo/sudo.install
+++ b/abs/core/sudo/sudo.install
@@ -1,9 +1,3 @@
-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
@@ -12,8 +6,4 @@ pre_upgrade() {
   fi
 }
 
-post_upgrade() {
-  post_install
-}
-
 # vim:set ts=2 sw=2 et:
-- 
cgit v0.12

