From patchwork Fri Mar 30 11:08:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 149631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D3D94B6F98 for ; Fri, 30 Mar 2012 22:50:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B252B10166D; Fri, 30 Mar 2012 11:50:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aCBPrYQmNkoH; Fri, 30 Mar 2012 11:50:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BCF1C101CF5; Fri, 30 Mar 2012 11:50:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 80DBD8F753 for ; Fri, 30 Mar 2012 11:50:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7D85AA0313 for ; Fri, 30 Mar 2012 11:50:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VqlK5NqZHXuR for ; Fri, 30 Mar 2012 11:50:42 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D999A017A for ; Fri, 30 Mar 2012 11:50:42 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 63F55969B8; Fri, 30 Mar 2012 11:50:42 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Fri, 30 Mar 2012 13:08:11 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 4bff1dde4b753e986c36858dd9e6afd04eb054ac X-Git-Newrev: 20b76e7c3588938e5e6dc71e7f96607f0207f5c2 X-Patchwork-Hint: ignore Message-Id: <20120330115042.63F55969B8@busybox.osuosl.org> Subject: [Buildroot] [git commit] sudo: add fix for non-utmpx toolchains X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=20b76e7c3588938e5e6dc71e7f96607f0207f5c2 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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 Signed-off-by: Peter Korsgaard --- package/sudo/sudo-1.8.4p4-utmpx.patch | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) 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 + +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