Patchwork sudo: add fix for non-utmpx toolchains

login
register
mail settings
Submitter Gustavo Zacarias
Date March 30, 2012, 10:35 a.m.
Message ID <1333103753-29248-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/149606/
State Accepted
Headers show

Comments

Gustavo Zacarias - March 30, 2012, 10:35 a.m.
The utmpx defines for when the target systems lacks utmpx is incomplete,
resulting in a build failure, so fix it.
This can be triggered by a uClibc toolchain that lacks UTMPX in the
configuration, or an older (<= 0.9.31) uClibc which lacks the
functionality.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/sudo/sudo-1.8.4p4-utmpx.patch |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 package/sudo/sudo-1.8.4p4-utmpx.patch
Peter Korsgaard - March 30, 2012, 11:50 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> The utmpx defines for when the target systems lacks utmpx is incomplete,
 Gustavo> resulting in a build failure, so fix it.
 Gustavo> This can be triggered by a uClibc toolchain that lacks UTMPX in the
 Gustavo> configuration, or an older (<= 0.9.31) uClibc which lacks the
 Gustavo> functionality.

Committed, thanks.

Don't forget to send it upsteam as well.
Gustavo Zacarias - March 30, 2012, 11:56 a.m.
On 2012-03-30 08:50, Peter Korsgaard wrote:

> Committed, thanks.
>
> Don't forget to send it upsteam as well.

Already did before submitting it here, check inside the patch :)
I tend to stick the upstream status inside to make it better for 
tracking.
Regards.
Thomas Petazzoni - March 30, 2012, 12:52 p.m.
Le Fri, 30 Mar 2012 07:35:53 -0300,
Gustavo Zacarias <gustavo@zacarias.com.ar> a écrit :

> The utmpx defines for when the target systems lacks utmpx is incomplete,
> resulting in a build failure, so fix it.
> This can be triggered by a uClibc toolchain that lacks UTMPX in the
> configuration, or an older (<= 0.9.31) uClibc which lacks the
> functionality.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Thanks for having fixed this!

Thomas

Patch

diff --git a/package/sudo/sudo-1.8.4p4-utmpx.patch b/package/sudo/sudo-1.8.4p4-utmpx.patch
new file mode 100644
index 0000000..4e97406
--- /dev/null
+++ b/package/sudo/sudo-1.8.4p4-utmpx.patch
@@ -0,0 +1,19 @@ 
+Fix incomplete setutxent/endutxent defines for when there's no utmpx
+Upstream bug #551
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura sudo-1.8.4p4.orig/src/utmp.c sudo-1.8.4p4/src/utmp.c
+--- sudo-1.8.4p4.orig/src/utmp.c	2012-03-30 07:10:38.381706315 -0300
++++ sudo-1.8.4p4/src/utmp.c	2012-03-30 07:10:52.605802501 -0300
+@@ -63,8 +63,8 @@
+ #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID)
+ # define getutxline(u)	getutline(u)
+ # define pututxline(u)	pututline(u)
+-# define setutxent	setutent(u)
+-# define endutxent	endutent(u)
++# define setutxent(u)	setutent(u)
++# define endutxent(u)	endutent(u)
+ #endif /* !HAVE_GETUTXID && HAVE_GETUTID */
+ 
+ #ifdef HAVE_GETUTXID