Date: Thursday, May 11, 2017 @ 11:36:42 Author: foutrelis Revision: 295811
archrelease: copy trunk to testing-i686, testing-x86_64 Added: sudo/repos/testing-i686/ sudo/repos/testing-i686/PKGBUILD (from rev 295810, sudo/trunk/PKGBUILD) sudo/repos/testing-i686/fix-digest-test.patch (from rev 295810, sudo/trunk/fix-digest-test.patch) sudo/repos/testing-i686/sudo.install (from rev 295810, sudo/trunk/sudo.install) sudo/repos/testing-i686/sudo.pam (from rev 295810, sudo/trunk/sudo.pam) sudo/repos/testing-x86_64/ sudo/repos/testing-x86_64/PKGBUILD (from rev 295810, sudo/trunk/PKGBUILD) sudo/repos/testing-x86_64/fix-digest-test.patch (from rev 295810, sudo/trunk/fix-digest-test.patch) sudo/repos/testing-x86_64/sudo.install (from rev 295810, sudo/trunk/sudo.install) sudo/repos/testing-x86_64/sudo.pam (from rev 295810, sudo/trunk/sudo.pam) --------------------------------------+ testing-i686/PKGBUILD | 75 +++++++++++++++++++++++++++++++++ testing-i686/fix-digest-test.patch | 21 +++++++++ testing-i686/sudo.install | 9 +++ testing-i686/sudo.pam | 4 + testing-x86_64/PKGBUILD | 75 +++++++++++++++++++++++++++++++++ testing-x86_64/fix-digest-test.patch | 21 +++++++++ testing-x86_64/sudo.install | 9 +++ testing-x86_64/sudo.pam | 4 + 8 files changed, 218 insertions(+) Copied: sudo/repos/testing-i686/PKGBUILD (from rev 295810, sudo/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=sudo +_sudover=1.8.20 +pkgver=${_sudover/p/.p} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="https://www.sudo.ws/sudo/" +license=('custom') +groups=('base-devel') +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=('9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0' + 'SKIP' + 'e22cb4ea8afb7d019406e7ee31f6790772a933745d6f1592e203e4f526289e61' + 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') +validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') + +prepare() { + cd "$srcdir/$pkgname-$_sudover" + patch -Np1 -i ../fix-digest-test.patch +} + +build() { + cd "$srcdir/$pkgname-$_sudover" + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --with-rundir=/run/sudo \ + --with-vardir=/var/db/sudo \ + --with-logfac=auth \ + --enable-gcrypt \ + --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 + make +} + +check() { + cd "$srcdir/$pkgname-$_sudover" + make check +} + +package() { + 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" + + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" + + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: sudo/repos/testing-i686/fix-digest-test.patch (from rev 295810, sudo/trunk/fix-digest-test.patch) =================================================================== --- testing-i686/fix-digest-test.patch (rev 0) +++ testing-i686/fix-digest-test.patch 2017-05-11 11:36:42 UTC (rev 295811) @@ -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 + + Copied: sudo/repos/testing-i686/sudo.install (from rev 295810, sudo/trunk/sudo.install) =================================================================== --- testing-i686/sudo.install (rev 0) +++ testing-i686/sudo.install 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,9 @@ +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 +} + +# vim:set ts=2 sw=2 et: Copied: sudo/repos/testing-i686/sudo.pam (from rev 295810, sudo/trunk/sudo.pam) =================================================================== --- testing-i686/sudo.pam (rev 0) +++ testing-i686/sudo.pam 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +session include system-auth Copied: sudo/repos/testing-x86_64/PKGBUILD (from rev 295810, sudo/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=sudo +_sudover=1.8.20 +pkgver=${_sudover/p/.p} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="https://www.sudo.ws/sudo/" +license=('custom') +groups=('base-devel') +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=('9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0' + 'SKIP' + 'e22cb4ea8afb7d019406e7ee31f6790772a933745d6f1592e203e4f526289e61' + 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') +validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') + +prepare() { + cd "$srcdir/$pkgname-$_sudover" + patch -Np1 -i ../fix-digest-test.patch +} + +build() { + cd "$srcdir/$pkgname-$_sudover" + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --with-rundir=/run/sudo \ + --with-vardir=/var/db/sudo \ + --with-logfac=auth \ + --enable-gcrypt \ + --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 + make +} + +check() { + cd "$srcdir/$pkgname-$_sudover" + make check +} + +package() { + 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" + + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" + + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: sudo/repos/testing-x86_64/fix-digest-test.patch (from rev 295810, sudo/trunk/fix-digest-test.patch) =================================================================== --- testing-x86_64/fix-digest-test.patch (rev 0) +++ testing-x86_64/fix-digest-test.patch 2017-05-11 11:36:42 UTC (rev 295811) @@ -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 + + Copied: sudo/repos/testing-x86_64/sudo.install (from rev 295810, sudo/trunk/sudo.install) =================================================================== --- testing-x86_64/sudo.install (rev 0) +++ testing-x86_64/sudo.install 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,9 @@ +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 +} + +# vim:set ts=2 sw=2 et: Copied: sudo/repos/testing-x86_64/sudo.pam (from rev 295810, sudo/trunk/sudo.pam) =================================================================== --- testing-x86_64/sudo.pam (rev 0) +++ testing-x86_64/sudo.pam 2017-05-11 11:36:42 UTC (rev 295811) @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +session include system-auth