sudo-selinux 1.8.14.p3-2 update

4 files changed, 12 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4002c25cec11..11b6ab0376f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sudo-selinux
 	pkgdesc = Give certain users the ability to run some commands as root - SELinux support
-	pkgver = 1.8.13
-	pkgrel = 1
+	pkgver = 1.8.14.p3
+	pkgrel = 2
 	url = http://www.sudo.ws/sudo/
 	install = sudo.install
 	arch = i686
@@ -12,19 +12,17 @@ pkgbase = sudo-selinux
 	depends = pam-selinux
 	depends = libldap
 	depends = libselinux
-	provides = sudo=1.8.13-1
-	provides = selinux-sudo=1.8.13-1
+	provides = sudo=1.8.14.p3-2
+	provides = selinux-sudo=1.8.14.p3-2
 	conflicts = sudo
 	conflicts = selinux-sudo
 	backup = etc/sudoers
 	backup = etc/pam.d/sudo
-	source = http://www.sudo.ws/sudo/dist/sudo-1.8.13.tar.gz
-	source = http://www.sudo.ws/sudo/dist/sudo-1.8.13.tar.gz.sig
-	source = sudo.tmpfiles.conf
+	source = http://www.sudo.ws/sudo/dist/sudo-1.8.14p3.tar.gz
+	source = http://www.sudo.ws/sudo/dist/sudo-1.8.14p3.tar.gz.sig
 	source = sudo.pam
-	sha256sums = e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25
+	sha256sums = a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237
 	sha256sums = SKIP
-	sha256sums = c1de59f1895373ecb39451372abf9a852518ed6eb3401da864e76a1baf2f20ce
 	sha256sums = d1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2
 
 pkgname = sudo-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 53f03c49f381..6723969075f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
 # SELinux Contributor: Nicky726 <Nicky726@gmail.com>
 
 pkgname=sudo-selinux
-_sudover=1.8.13
+_sudover=1.8.14p3
 pkgver=${_sudover/p/.p}
-pkgrel=1
+pkgrel=2
 pkgdesc="Give certain users the ability to run some commands as root - SELinux support"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
@@ -22,11 +22,9 @@ provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 install=${pkgname/-selinux}.install
 source=(http://www.sudo.ws/sudo/dist/${pkgname/-selinux}-$_sudover.tar.gz{,.sig}
-        sudo.tmpfiles.conf
         sudo.pam)
-sha256sums=('e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25'
+sha256sums=('a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237'
             'SKIP'
-            'c1de59f1895373ecb39451372abf9a852518ed6eb3401da864e76a1baf2f20ce'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
 
@@ -40,7 +38,9 @@ build() {
     --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 \
@@ -63,10 +63,6 @@ package() {
   rmdir "$pkgdir/run/sudo"
   rmdir "$pkgdir/run"
 
-  # http://bugzilla.sudo.ws/show_bug.cgi?id=689
-  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-selinux/LICENSE"
diff --git a/sudo-1.8.12-move-example-dir-under-the-doc-dir.patch b/sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
deleted file mode 100644
index a39953dc64a9..000000000000
--- a/sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@courtesan.com>
-# Date 1423587009 25200
-#      Tue Feb 10 09:50:09 2015 -0700
-# Node ID 494d9a0484b66ab9c559d5efe2ee7bdf0803e747
-# Parent  91859f613b88b1653e59ade2330fecd823b12491
-Move example dir under the doc dir to conform to Debian guidelines.
-Bug #682.
-
-diff -r 91859f613b88 -r 494d9a0484b6 Makefile.in
---- a/Makefile.in	Tue Feb 10 09:37:10 2015 -0700
-+++ b/Makefile.in	Tue Feb 10 09:50:09 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2010-2014 Todd C. Miller <Todd.Miller@courtesan.com>
-+# Copyright (c) 2010-2015 Todd C. Miller <Todd.Miller@courtesan.com>
- #
- # Permission to use, copy, modify, and distribute this software for any
- # purpose with or without fee is hereby granted, provided that the above
-@@ -32,7 +32,7 @@
- localedir = @localedir@
- localstatedir = @localstatedir@
- docdir = @docdir@
--exampledir = $(datarootdir)/examples/$(PACKAGE_TARNAME)
-+exampledir = $(docdir)/examples
- mandir = @mandir@
- rundir = @rundir@
- vardir = @vardir@
-diff -r 91859f613b88 -r 494d9a0484b6 examples/Makefile.in
---- a/examples/Makefile.in	Tue Feb 10 09:37:10 2015 -0700
-+++ b/examples/Makefile.in	Tue Feb 10 09:50:09 2015 -0700
-@@ -20,7 +20,8 @@
- #### Start of system configuration section. ####
- 
- srcdir = @srcdir@
--exampledir = $(datarootdir)/examples/$(PACKAGE_TARNAME)
-+docdir = @docdir@
-+exampledir = $(docdir)/examples
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
diff --git a/sudo.tmpfiles.conf b/sudo.tmpfiles.conf
deleted file mode 100644
index d95e17a6d721..000000000000
--- a/sudo.tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/sudo 0711 root root
-d /run/sudo/ts 0700 root root