[arch-commits] Commit in sudo/repos (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Fri Nov 23 16:08:12 UTC 2018
Date: Friday, November 23, 2018 @ 16:08:12
Author: foutrelis
Revision: 340348
archrelease: copy trunk to testing-x86_64
Added:
sudo/repos/testing-x86_64/
sudo/repos/testing-x86_64/PKGBUILD
(from rev 340347, sudo/trunk/PKGBUILD)
sudo/repos/testing-x86_64/bug861-update-fixmdoc-for-bsd-changes.patch
(from rev 340347, sudo/trunk/bug861-update-fixmdoc-for-bsd-changes.patch)
sudo/repos/testing-x86_64/sudo.install
(from rev 340347, sudo/trunk/sudo.install)
sudo/repos/testing-x86_64/sudo.pam
(from rev 340347, sudo/trunk/sudo.pam)
---------------------------------------------+
PKGBUILD | 76 +++++++++++++++
bug861-update-fixmdoc-for-bsd-changes.patch | 131 ++++++++++++++++++++++++++
sudo.install | 9 +
sudo.pam | 4
4 files changed, 220 insertions(+)
Copied: sudo/repos/testing-x86_64/PKGBUILD (from rev 340347, sudo/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-11-23 16:08:12 UTC (rev 340348)
@@ -0,0 +1,76 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=sudo
+_sudover=1.8.26
+pkgver=${_sudover/p/.p}
+pkgrel=2
+pkgdesc="Give certain users the ability to run some commands as root"
+arch=('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}
+ bug861-update-fixmdoc-for-bsd-changes.patch
+ sudo.pam)
+sha256sums=('40da219a6f0341ccb22d04a98988e27f09b831d2561b14c6154067a49ef3fee2'
+ 'SKIP'
+ '54c6c6667d7de4ec02d5e93e6d859d1069a3b76a0eeb4a6bea5d45472ce8ee26'
+ 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
+validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB')
+
+prepare() {
+ cd "$srcdir/$pkgname-$_sudover"
+
+ # https://bugzilla.sudo.ws/show_bug.cgi?id=861
+ patch -Np1 -i ../bug861-update-fixmdoc-for-bsd-changes.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/bug861-update-fixmdoc-for-bsd-changes.patch (from rev 340347, sudo/trunk/bug861-update-fixmdoc-for-bsd-changes.patch)
===================================================================
--- testing-x86_64/bug861-update-fixmdoc-for-bsd-changes.patch (rev 0)
+++ testing-x86_64/bug861-update-fixmdoc-for-bsd-changes.patch 2018-11-23 16:08:12 UTC (rev 340348)
@@ -0,0 +1,131 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller at sudo.ws>
+# Date 1542980543 25200
+# Node ID 7ddfb74781a152904ba61cf42f8ce030e5a29554
+# Parent f5531294813905cb6dca04082287c8ae0209da54
+Update fixmdoc.sh to match the BSD -> .Bx changes in the manuals.
+Bug #861
+
+diff -r f55312948139 -r 7ddfb74781a1 doc/fixmdoc.sh
+--- a/doc/fixmdoc.sh Sun Nov 18 07:45:43 2018 -0700
++++ b/doc/fixmdoc.sh Fri Nov 23 06:42:23 2018 -0700
+@@ -35,7 +35,7 @@
+ if [ X"$BAMAN" != X"1" ]; then
+ BA_FLAG='/^.*\n\.Op Fl a Ar type/{;N;/^.*\n\.Ek$/d;};'
+ cat >>"$OUTFILE" <<-'EOF'
+- /^\.It Fl a Ar type/,/BSD authentication\.$/d
++ /^\.It Fl a Ar type/,/\.Bx authentication \.$/d
+ EOF
+ fi
+
+@@ -44,11 +44,11 @@
+ if [ X"$LCMAN" != X"1" ]; then
+ LC_FLAG='/^.*\n\.Op Fl c Ar class/{;N;/^.*\n\.Ek$/d;};'
+ cat >>"$OUTFILE" <<-'EOF'
+- /^\.It Fl c Ar class/,/BSD login classes\.$/d
++ /^\.It Fl c Ar class/,/\.Bx login classes \.$/d
+ /^\.Xr login_cap 3 ,$/d
+- /^BSD login class$/ {
++ /^\.Bx login class$/ {
+ N
+- /^BSD login class\n\.It$/d
++ /^\.Bx login class\n\.It$/d
+ }
+ EOF
+ fi
+@@ -110,7 +110,7 @@
+ # BSD login class
+ if [ X"$LCMAN" != X"1" ]; then
+ cat >>"$OUTFILE" <<-'EOF'
+- /^On BSD systems/,/\.$/d
++ /^\.No On Bx systems/,/\.$/d
+ /^\.It use_loginclass$/,/^by default\./d
+ EOF
+ fi
+diff -r f55312948139 -r 7ddfb74781a1 doc/sudo.mdoc.in
+--- a/doc/sudo.mdoc.in Sun Nov 18 07:45:43 2018 -0700
++++ b/doc/sudo.mdoc.in Fri Nov 23 06:42:23 2018 -0700
+@@ -18,7 +18,7 @@
+ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
+ .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ .\"
+-.Dd October 27, 2018
++.Dd November 23, 2018
+ .Dt SUDO @mansectsu@
+ .Os Sudo @PACKAGE_VERSION@
+ .Sh NAME
+@@ -173,8 +173,7 @@
+ will exit with an error.
+ .It Fl a Ar type , Fl -auth-type Ns = Ns Ar type
+ Use the specified
+-.Bx
+-authentication
++.Bx authentication
+ .Ar type
+ when validating the user, if allowed by
+ .Pa /etc/login.conf .
+@@ -184,8 +183,7 @@
+ entry in
+ .Pa /etc/login.conf .
+ This option is only available on systems that support
+-.Bx
+-authentication.
++.Bx authentication .
+ .It Fl b , -background
+ Run the given command in the background.
+ Note that it is not possible to use shell job control to manipulate
+@@ -234,8 +232,7 @@
+ settings, such as the umask and environment variables, will
+ be applied, if present.
+ This option is only available on systems with
+-.Bx
+-login classes.
++.Bx login classes .
+ .It Fl E , -preserve-env
+ Indicates to the security policy that the user wishes to
+ preserve their existing environment variables.
+@@ -658,7 +655,7 @@
+ .It
+ Solaris privileges
+ .It
+-.Bx No login class
++.Bx login class
+ .It
+ scheduling priority (aka nice value)
+ .El
+diff -r f55312948139 -r 7ddfb74781a1 doc/sudoers.mdoc.in
+--- a/doc/sudoers.mdoc.in Sun Nov 18 07:45:43 2018 -0700
++++ b/doc/sudoers.mdoc.in Fri Nov 23 06:42:23 2018 -0700
+@@ -18,7 +18,7 @@
+ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
+ .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ .\"
+-.Dd October 27, 2018
++.Dd November 23, 2018
+ .Dt SUDOERS @mansectform@
+ .Os Sudo @PACKAGE_VERSION@
+ .Sh NAME
+@@ -282,9 +282,7 @@
+ contents of the
+ .Pa /etc/environment
+ file.
+-On
+-.Bx
+-systems, if the
++.No On Bx systems , if the
+ .Em use_loginclass
+ option is enabled, the environment is initialized
+ based on the
+@@ -472,9 +470,7 @@
+ .Pa /etc/environment
+ are also
+ included.
+-On
+-.Bx
+-systems, if the
++.No On Bx systems , if the
+ .Em use_loginclass
+ flag is
+ enabled, the
+
Copied: sudo/repos/testing-x86_64/sudo.install (from rev 340347, sudo/trunk/sudo.install)
===================================================================
--- testing-x86_64/sudo.install (rev 0)
+++ testing-x86_64/sudo.install 2018-11-23 16:08:12 UTC (rev 340348)
@@ -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 340347, sudo/trunk/sudo.pam)
===================================================================
--- testing-x86_64/sudo.pam (rev 0)
+++ testing-x86_64/sudo.pam 2018-11-23 16:08:12 UTC (rev 340348)
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+session include system-auth
More information about the arch-commits
mailing list