[arch-commits] Commit in sudo/trunk (2 files)
Date: Tuesday, February 10, 2015 @ 17:59:07 Author: foutrelis Revision: 231227 Replace sed line with upstream patch Added: sudo/trunk/sudo-1.8.12-move-example-dir-under-the-doc-dir.patch Modified: sudo/trunk/PKGBUILD --+ PKGBUILD |4 + sudo-1.8.12-move-example-dir-under-the-doc-dir.patch | 41 + 2 files changed, 44 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-02-10 16:53:22 UTC (rev 231226) +++ PKGBUILD2015-02-10 16:59:07 UTC (rev 231227) @@ -16,10 +16,12 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') install=$pkgname.install source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} +sudo-1.8.12-move-example-dir-under-the-doc-dir.patch sudo.tmpfiles.conf sudo.pam) sha256sums=('163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0' 'SKIP' +'a6b3a6066df7fec1bd31cdff33770640bccedb3d57461f61a8b238abea8799b0' '080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe' 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') @@ -28,7 +30,7 @@ cd "$srcdir/$pkgname-$_sudover" # http://bugzilla.sudo.ws/show_bug.cgi?id=682 - sed -i 's|\(exampledir = \).*|\1@docdir@/examples|' {examples/,}Makefile.in + patch -Np1 -i ../sudo-1.8.12-move-example-dir-under-the-doc-dir.patch } build() { Added: sudo-1.8.12-move-example-dir-under-the-doc-dir.patch === --- sudo-1.8.12-move-example-dir-under-the-doc-dir.patch (rev 0) +++ sudo-1.8.12-move-example-dir-under-the-doc-dir.patch2015-02-10 16:59:07 UTC (rev 231227) @@ -0,0 +1,41 @@ +# HG changeset patch +# User Todd C. Miller +# 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 ++# Copyright (c) 2010-2015 Todd C. Miller + # + # 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@ +
[arch-commits] Commit in sudo/trunk (2 files)
Date: Wednesday, January 15, 2014 @ 02:52:57 Author: foutrelis Revision: 204056 upgpkg: sudo 1.8.9.p3-2 Fix FS#38511: [sudo] consumes entire CPU core while waiting on child process Added: sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch Modified: sudo/trunk/PKGBUILD ---+ PKGBUILD | 10 +++ sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch | 35 2 files changed, 44 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-01-15 00:06:33 UTC (rev 204055) +++ PKGBUILD2014-01-15 01:52:57 UTC (rev 204056) @@ -6,7 +6,7 @@ pkgname=sudo _sudover=1.8.9p3 pkgver=${_sudover/p/.p} -pkgrel=1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64') url="http://www.sudo.ws/sudo/"; @@ -15,11 +15,19 @@ depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} +sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch sudo.pam) sha256sums=('a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7' 'SKIP' +'79d86c92723519fed1fa3db60ebc66b400435237d82e9bfdc899db4550c259b5' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') +prepare() { + cd "$srcdir/$pkgname-$_sudover" + + patch -Np1 -i "$srcdir/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch" +} + build() { cd "$srcdir/$pkgname-$_sudover" Added: sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch === --- sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch (rev 0) +++ sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch 2014-01-15 01:52:57 UTC (rev 204056) @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Todd C. Miller +# Date 1389722096 25200 +# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33 +# Parent 987087ce465828da121b9d67412f42feaea06d56 +If not logging I/O we may get EOF when the command is executed and +the other end of the backchannel is closed. Just remove the +backchannel event in this case or we will continue to receive +the event. Bug #631 + +diff -r 987087ce4658 -r a204b69d91f7 src/exec.c +--- a/src/exec.c Tue Jan 14 09:26:14 2014 -0700 b/src/exec.c Tue Jan 14 10:54:56 2014 -0700 +@@ -230,11 +230,14 @@ + /* Short read or EOF. */ + sudo_debug_printf(SUDO_DEBUG_ERROR, + "failed to read child status: %s", n ? "short read" : "EOF"); +- /* +- * If not logging I/O we may get EOF when the command is +- * executed and sv is closed. It is safe to ignore this. +- */ +- if (ec->log_io || n != 0) { ++ if (!ec->log_io && n == 0) { ++ /* ++ * If not logging I/O we may get EOF when the command is ++ * executed and the other end of the backchannel is closed. ++ * Just remove the event in this case. ++ */ ++ (void)sudo_ev_del(ec->evbase, backchannel_event); ++ } else { + /* XXX - need new CMD_ type for monitor errors. */ + errno = n ? EIO : ECONNRESET; + ec->cstat->type = CMD_ERRNO; +
[arch-commits] Commit in sudo/trunk (2 files)
Date: Wednesday, January 15, 2014 @ 22:16:44 Author: foutrelis Revision: 204260 upgpkg: sudo 1.8.9.p4-1 New upstream release. Modified: sudo/trunk/PKGBUILD Deleted: sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch ---+ PKGBUILD | 14 +--- sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch | 35 2 files changed, 3 insertions(+), 46 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-15 20:56:02 UTC (rev 204259) +++ PKGBUILD2014-01-15 21:16:44 UTC (rev 204260) @@ -4,9 +4,9 @@ # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.9p3 +_sudover=1.8.9p4 pkgver=${_sudover/p/.p} -pkgrel=2 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64') url="http://www.sudo.ws/sudo/"; @@ -15,19 +15,11 @@ depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} -sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch sudo.pam) -sha256sums=('a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7' +sha256sums=('1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7' 'SKIP' -'79d86c92723519fed1fa3db60ebc66b400435237d82e9bfdc899db4550c259b5' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') -prepare() { - cd "$srcdir/$pkgname-$_sudover" - - patch -Np1 -i "$srcdir/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch" -} - build() { cd "$srcdir/$pkgname-$_sudover" Deleted: sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch === --- sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch 2014-01-15 20:56:02 UTC (rev 204259) +++ sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch 2014-01-15 21:16:44 UTC (rev 204260) @@ -1,35 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller -# Date 1389722096 25200 -# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33 -# Parent 987087ce465828da121b9d67412f42feaea06d56 -If not logging I/O we may get EOF when the command is executed and -the other end of the backchannel is closed. Just remove the -backchannel event in this case or we will continue to receive -the event. Bug #631 - -diff -r 987087ce4658 -r a204b69d91f7 src/exec.c a/src/exec.c Tue Jan 14 09:26:14 2014 -0700 -+++ b/src/exec.c Tue Jan 14 10:54:56 2014 -0700 -@@ -230,11 +230,14 @@ - /* Short read or EOF. */ - sudo_debug_printf(SUDO_DEBUG_ERROR, - "failed to read child status: %s", n ? "short read" : "EOF"); -- /* -- * If not logging I/O we may get EOF when the command is -- * executed and sv is closed. It is safe to ignore this. -- */ -- if (ec->log_io || n != 0) { -+ if (!ec->log_io && n == 0) { -+ /* -+ * If not logging I/O we may get EOF when the command is -+ * executed and the other end of the backchannel is closed. -+ * Just remove the event in this case. -+ */ -+ (void)sudo_ev_del(ec->evbase, backchannel_event); -+ } else { - /* XXX - need new CMD_ type for monitor errors. */ - errno = n ? EIO : ECONNRESET; - ec->cstat->type = CMD_ERRNO; -
[arch-commits] Commit in sudo/trunk (2 files)
Date: Sunday, January 13, 2019 @ 12:50:34 Author: foutrelis Revision: 343951 upgpkg: sudo 1.8.27-1 New upstream release. Modified: sudo/trunk/PKGBUILD Deleted: sudo/trunk/bug861-update-fixmdoc-for-bsd-changes.patch -+ PKGBUILD| 11 -- bug861-update-fixmdoc-for-bsd-changes.patch | 131 -- 2 files changed, 3 insertions(+), 139 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-13 12:49:10 UTC (rev 343950) +++ PKGBUILD2019-01-13 12:50:34 UTC (rev 343951) @@ -3,9 +3,9 @@ # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.26 +_sudover=1.8.27 pkgver=${_sudover/p/.p} -pkgrel=2 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" arch=('x86_64') url="https://www.sudo.ws/sudo/"; @@ -15,19 +15,14 @@ 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' +sha256sums=('7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0' '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() { Deleted: bug861-update-fixmdoc-for-bsd-changes.patch === --- bug861-update-fixmdoc-for-bsd-changes.patch 2019-01-13 12:49:10 UTC (rev 343950) +++ bug861-update-fixmdoc-for-bsd-changes.patch 2019-01-13 12:50:34 UTC (rev 343951) @@ -1,131 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller -# 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
[arch-commits] Commit in sudo/trunk (2 files)
Date: Friday, November 23, 2018 @ 16:08:06 Author: foutrelis Revision: 340347 upgpkg: sudo 1.8.26-2 Fix FS#60874: sudo man page is truncated Added: sudo/trunk/bug861-update-fixmdoc-for-bsd-changes.patch Modified: sudo/trunk/PKGBUILD -+ PKGBUILD|7 + bug861-update-fixmdoc-for-bsd-changes.patch | 131 ++ 2 files changed, 137 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-11-23 15:14:08 UTC (rev 340346) +++ PKGBUILD2018-11-23 16:08:06 UTC (rev 340347) @@ -5,7 +5,7 @@ pkgname=sudo _sudover=1.8.26 pkgver=${_sudover/p/.p} -pkgrel=1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" arch=('x86_64') url="https://www.sudo.ws/sudo/"; @@ -15,14 +15,19 @@ 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() { Added: bug861-update-fixmdoc-for-bsd-changes.patch === --- bug861-update-fixmdoc-for-bsd-changes.patch (rev 0) +++ bug861-update-fixmdoc-for-bsd-changes.patch 2018-11-23 16:08:06 UTC (rev 340347) @@ -0,0 +1,131 @@ + +# HG changeset patch +# User Todd C. Miller +# 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. +@@ -6