Skip to contentSkip to conversation

sudo: bump to version 1.8.10p3

PATCH New Gustavo Zacarias 3 participants 3 messages Sep 18, 2014 – Sep 19, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sudo: bump to version 1.8.10p3

Also add hashes, kill some whitespace and correct the license type (ICS->ISC).
Enable $EDITOR to point to the right editor for visudo since it normally expects /usr/bin/vi which in busybox-world is /bin/vi (and some people might want to use other editors like the operating system sized one).

---
 package/sudo/sudo-0001-no-netgroup.patch | 29 +++++++++++++++++++++++++++++
 package/sudo/sudo.hash                   |  3 +++
 package/sudo/sudo.mk                     | 11 +++++++----
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 package/sudo/sudo-0001-no-netgroup.patch
 create mode 100644 package/sudo/sudo.hash
package/sudo/sudo-0001-no-netgroup.patch new file +29 -0
new file mode 100644
index 0000000..64b870c
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Todd C. Miller <[email protected]>
+# Date 1406550172 21600
+# Node ID 57deb66ef8ffc0f551d460e15a34f7df78f54d2a
+# Parent  f547bf80c436c07ddb1c7385d22db96862ae7e4f
+Fix compilation on systems w/o netgroups.
+
+Status: upstream
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -r f547bf80c436 -r 57deb66ef8ff plugins/sudoers/match.c
+--- a/plugins/sudoers/match.c	Sat Jul 26 06:07:34 2014 -0600
++++ b/plugins/sudoers/match.c	Mon Jul 28 06:22:52 2014 -0600
+@@ -972,12 +972,12 @@
+ 	rc = true;
+     else if (lhost != shost && innetgr(netgr, shost, user, domain))
+ 	rc = true;
+-#endif /* HAVE_INNETGR */
+ 
+     sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO,
+ 	"netgroup %s matches (%s|%s, %s, %s): %s", netgr, lhost ? lhost : "",
+ 	shost ? shost : "", user ? user : "", domain ? domain : "",
+ 	rc ? "true" : "false");
++#endif /* HAVE_INNETGR */
+ 
+     debug_return_bool(rc);
+ }
+
package/sudo/sudo.hash new file +3 -0
new file mode 100644
index 0000000..ba65773
@@ -0,0 +1,3 @@
+# From announcement http://www.sudo.ws/pipermail/sudo-announce/2014-May/000132.html
+md5	fcd8d0d9f9f0397d076ee901e242ed39	sudo-1.8.10p3.tar.gz
+sha256	6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400	sudo-1.8.10p3.tar.gz
package/sudo/sudo.mk +7 -4
index e0db465..c958bec 100644
@@ -4,17 +4,20 @@
 #
 ################################################################################
 
-SUDO_VERSION = 1.8.8
-SUDO_SITE    = http://www.sudo.ws/sudo/dist
-SUDO_LICENSE = ICS BSD-3c
+SUDO_VERSION = 1.8.10p3
+SUDO_SITE = http://www.sudo.ws/sudo/dist
+SUDO_LICENSE = ISC BSD-3c
 SUDO_LICENSE_FILES = doc/LICENSE
+# Ships a non-release libtool that isn't patch-friendly
+SUDO_AUTORECONF = YES
 SUDO_CONF_OPT = \
 		--without-lecture \
 		--without-sendmail \
 		--without-umask \
 		--with-logging=syslog \
 		--without-interfaces \
-		--without-pam
+		--without-pam \
+		--with-env-editor
 
 # mksigname/mksiglist needs to run on build host to generate source files
 define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
Signature · 1 line
1.8.5.5
#1 lore raw

PATCH 1/1 sudo: bump to version 1.8.10p3

Gustavo, All,

On 2014-09-18 18:09 -0300, Gustavo Zacarias spake thusly:

Quoted 7 lines

Also add hashes, kill some whitespace and correct the license type (ICS->ISC).
Enable $EDITOR to point to the right editor for visudo since it normally expects /usr/bin/vi which in busybox-world is /bin/vi (and some people might want to use other editors like the operating system sized one).

Build-tested on x86_64.

Hashes verified against he ones published by upstream, and against a download.

Regards,
Yann E. MORIN.

Quoted 88 lines
---
 package/sudo/sudo-0001-no-netgroup.patch | 29 +++++++++++++++++++++++++++++
 package/sudo/sudo.hash                   |  3 +++
 package/sudo/sudo.mk                     | 11 +++++++----
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 package/sudo/sudo-0001-no-netgroup.patch
 create mode 100644 package/sudo/sudo.hash
package/sudo/sudo-0001-no-netgroup.patch new file +29 -0
new file mode 100644
index 0000000..64b870c
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Todd C. Miller <[email protected]>
+# Date 1406550172 21600
+# Node ID 57deb66ef8ffc0f551d460e15a34f7df78f54d2a
+# Parent  f547bf80c436c07ddb1c7385d22db96862ae7e4f
+Fix compilation on systems w/o netgroups.
+
+Status: upstream
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -r f547bf80c436 -r 57deb66ef8ff plugins/sudoers/match.c
+--- a/plugins/sudoers/match.c	Sat Jul 26 06:07:34 2014 -0600
++++ b/plugins/sudoers/match.c	Mon Jul 28 06:22:52 2014 -0600
+@@ -972,12 +972,12 @@
+ 	rc = true;
+     else if (lhost != shost && innetgr(netgr, shost, user, domain))
+ 	rc = true;
+-#endif /* HAVE_INNETGR */
+ 
+     sudo_debug_printf(SUDO_DEBUG_DEBUG|SUDO_DEBUG_LINENO,
+ 	"netgroup %s matches (%s|%s, %s, %s): %s", netgr, lhost ? lhost : "",
+ 	shost ? shost : "", user ? user : "", domain ? domain : "",
+ 	rc ? "true" : "false");
++#endif /* HAVE_INNETGR */
+ 
+     debug_return_bool(rc);
+ }
+
package/sudo/sudo.hash new file +3 -0
new file mode 100644
index 0000000..ba65773
@@ -0,0 +1,3 @@
+# From announcement http://www.sudo.ws/pipermail/sudo-announce/2014-May/000132.html
+md5	fcd8d0d9f9f0397d076ee901e242ed39	sudo-1.8.10p3.tar.gz
+sha256	6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400	sudo-1.8.10p3.tar.gz
package/sudo/sudo.mk +7 -4
index e0db465..c958bec 100644
@@ -4,17 +4,20 @@
 #
 ################################################################################
 
-SUDO_VERSION = 1.8.8
-SUDO_SITE    = http://www.sudo.ws/sudo/dist
-SUDO_LICENSE = ICS BSD-3c
+SUDO_VERSION = 1.8.10p3
+SUDO_SITE = http://www.sudo.ws/sudo/dist
+SUDO_LICENSE = ISC BSD-3c
 SUDO_LICENSE_FILES = doc/LICENSE
+# Ships a non-release libtool that isn't patch-friendly
+SUDO_AUTORECONF = YES
 SUDO_CONF_OPT = \
 		--without-lecture \
 		--without-sendmail \
 		--without-umask \
 		--with-logging=syslog \
 		--without-interfaces \
-		--without-pam
+		--without-pam \
+		--with-env-editor
 
 # mksigname/mksiglist needs to run on build host to generate source files
 define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
Signature · 6 lines
1.8.5.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 13 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140918/274afd1c/attachment.asc>
#2 lore raw

PATCH 1/1 sudo: bump to version 1.8.10p3

In reply to Gustavo Zacarias
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Also add hashes, kill some whitespace and correct the license type (ICS->ISC).
Enable $EDITOR to point to the right editor for visudo since it normally expects /usr/bin/vi which in busybox-world is /bin/vi (and some people might want to use other editors like the operating system sized one).

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard