[arch-commits] Commit in sudo/trunk (PKGBUILD sudo.install sudo.tmpfiles.conf)

[Evangelos Foutras]

    Date: Tuesday, March 11, 2014 @ 16:54:07
  Author: foutrelis
Revision: 207504

upgpkg: sudo 1.8.10-1

New upstream release.

Added:
  sudo/trunk/sudo.install
  sudo/trunk/sudo.tmpfiles.conf
Modified:
  sudo/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   15 +++++++++++++--
 sudo.install       |   17 +++++++++++++++++
 sudo.tmpfiles.conf |    1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-11 15:49:00 UTC (rev 207503)
+++ PKGBUILD	2014-03-11 15:54:07 UTC (rev 207504)
@@ -4,7 +4,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.9p5
+_sudover=1.8.10
 pkgver=${_sudover/p/.p}
 pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
@@ -14,10 +14,13 @@
 groups=('base-devel')
 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.tmpfiles.conf
         sudo.pam)
-sha256sums=('bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21'
+sha256sums=('781296ec571e2595cfaa13846902ea03684ef826f261d61e6705da90a4f904aa'
             'SKIP'
+            '080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 
 build() {
@@ -27,6 +30,7 @@
     --prefix=/usr \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
+    --with-rundir=/run/sudo \
     --with-logfac=auth \
     --with-pam \
     --with-ldap \
@@ -46,6 +50,13 @@
   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.tmpfiles.conf" \
+    "$pkgdir/usr/lib/tmpfiles.d/sudo.conf"
+
   install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
 
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"

Added: sudo.install
===================================================================
--- sudo.install	                        (rev 0)
+++ sudo.install	2014-03-11 15:54:07 UTC (rev 207504)
@@ -0,0 +1,17 @@
+post_install() {
+  type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create sudo.conf
+}
+
+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:

Added: sudo.tmpfiles.conf
===================================================================
--- sudo.tmpfiles.conf	                        (rev 0)
+++ sudo.tmpfiles.conf	2014-03-11 15:54:07 UTC (rev 207504)
@@ -0,0 +1 @@
+d /run/sudo 0711 root root -