Patchwork dbus: fix paths in startup script, use useradd.bbclass for user creation

login
mail settings
Submitter Phil Blundell
Date Sept. 9, 2011, 8:46 a.m.
Message ID <1315557976.2519.88.camel@phil-desktop>
Download mbox | patch
Permalink /patch/11253/
State New, archived
Headers show

Comments

Phil Blundell - Sept. 9, 2011, 8:46 a.m.
On Thu, 2011-09-08 at 08:44 -0700, Scott Garman wrote:
> In any case, please submit your patch and I will advocate for its 
> inclusion in our 1.1 release.

As requested.

p.
Richard Purdie - Sept. 9, 2011, 5:43 p.m.
On Fri, 2011-09-09 at 09:46 +0100, Phil Blundell wrote:
> On Thu, 2011-09-08 at 08:44 -0700, Scott Garman wrote:
> > In any case, please submit your patch and I will advocate for its 
> > inclusion in our 1.1 release.
> 
> As requested.

[The shadow patch] merged to master, thanks.

Cheers,

Richard

Patch

From 6ac00e3ced33a4b8eb43fd83d786a192e6f4f5c1 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Wed, 7 Sep 2011 13:02:10 +0100
Subject: [PATCH] shadow: add patch for useradd lossage

This fixes (or, at least, papers over) a failure in do_install for recipes which 
inherit useradd.bbclass.  Rewinding optind in this way is not entirely portable
but in practice it seems to work on GNU-ish build hosts at least.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-extended/shadow/files/useradd.patch   |   17 +++++++++++++++++
 .../shadow/shadow-native_4.1.4.3.bb                |    5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/shadow/files/useradd.patch

diff --git a/meta/recipes-extended/shadow/files/useradd.patch b/meta/recipes-extended/shadow/files/useradd.patch
new file mode 100644
index 0000000..ff5016c
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/useradd.patch
@@ -0,0 +1,17 @@ 
+Work around a bug introduced with the --root option which was causing
+all other arguments to be ignored.
+
+Upstream-Status: inappropriate
+Signed-off-by: Phil Blundell <philb@gnu.org>
+
+--- a/src/useradd.c~	2011-09-01 15:36:40.398234861 +0100
++++ b/src/useradd.c	2011-09-01 17:29:00.782004133 +0100
+@@ -1957,6 +1957,8 @@
+ 
+ 	get_defaults ();
+ 
++	optind = 1;
++
+ 	process_flags (argc, argv);
+ 
+ #ifdef ACCT_TOOLS_SETUID
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 485495e..c29e4c1 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -7,13 +7,14 @@  LICENSE = "BSD | Artistic"
 LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
                     file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://shadow.automake-1.11.patch \
            file://shadow-4.1.3-dots-in-usernames.patch \
            file://shadow-4.1.4.2-env-reset-keep-locale.patch \
-           file://add_root_cmd_options.patch"
+           file://add_root_cmd_options.patch \
+	   file://useradd.patch"
 
 SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
 SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" 
-- 
1.7.4.1