Date: Thursday, May 11, 2017 @ 11:36:31 Author: foutrelis Revision: 295810
upgpkg: sudo 1.8.20-1 New upstream release. Added: sudo/trunk/fix-digest-test.patch Modified: sudo/trunk/PKGBUILD -----------------------+ PKGBUILD | 17 ++++++++++++++--- fix-digest-test.patch | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-05-11 11:28:01 UTC (rev 295809) +++ PKGBUILD 2017-05-11 11:36:31 UTC (rev 295810) @@ -4,7 +4,7 @@ # Contributor: Tom Newsom <jeeps...@gmx.co.uk> pkgname=sudo -_sudover=1.8.19p2 +_sudover=1.8.20 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -12,16 +12,23 @@ 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=(https://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} + fix-digest-test.patch sudo.pam) -sha256sums=('237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0' +sha256sums=('9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0' 'SKIP' + 'e22cb4ea8afb7d019406e7ee31f6790772a933745d6f1592e203e4f526289e61' 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') +prepare() { + cd "$srcdir/$pkgname-$_sudover" + patch -Np1 -i ../fix-digest-test.patch +} + build() { cd "$srcdir/$pkgname-$_sudover" @@ -32,6 +39,7 @@ --with-rundir=/run/sudo \ --with-vardir=/var/db/sudo \ --with-logfac=auth \ + --enable-gcrypt \ --enable-tmpfiles.d \ --with-pam \ --with-sssd \ @@ -52,6 +60,9 @@ cd "$srcdir/$pkgname-$_sudover" make DESTDIR="$pkgdir" install + # 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" Added: fix-digest-test.patch =================================================================== --- fix-digest-test.patch (rev 0) +++ fix-digest-test.patch 2017-05-11 11:36:31 UTC (rev 295810) @@ -0,0 +1,21 @@ + +# HG changeset patch +# User Todd C. Miller <todd.mil...@courtesan.com> +# Date 1494502099 21600 +# Node ID 7968686742e232fd20804df8da44e3a18c39bace +# Parent 24244a02c93f7aa1307e3ec7b0df2cad75d85e08 +Fix "make check" when openssl or gcrypt is used. Bug #787 + +diff -r 24244a02c93f -r 7968686742e2 plugins/sudoers/Makefile.in +--- a/plugins/sudoers/Makefile.in Wed May 10 09:22:07 2017 -0600 ++++ b/plugins/sudoers/Makefile.in Thu May 11 05:28:19 2017 -0600 +@@ -175,7 +175,7 @@ + + CHECK_BASE64_OBJS = check_base64.o base64.o sudoers_debug.o + +-CHECK_DIGEST_OBJS = check_digest.o filedigest.o digestname.o sudoers_debug.o ++CHECK_DIGEST_OBJS = check_digest.o @FILEDIGEST@ digestname.o sudoers_debug.o + + CHECK_FILL_OBJS = check_fill.o hexchar.o toke_util.o sudoers_debug.o + +