Patch review
cover Patch review
Please review and provide feedback by Tuesday.
The following changes since commit e855ecc6d35677e79780adc57b2552213c995731:
ruli: Fix install step and build samples too (2020-01-05 14:44:11 -0800)
are available in the Git repository at:
git://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
Gianfranco Costamagna (3):
cpprest: fix cmake installation directory
websocketpp: add various upstream accepted and proposed patches to fix
various issues, including:
websocketpp: refresh clang patch
Kai Kang (1):
adduser: set default shell with /sbin/nologin
Khem Raj (3):
nodejs: libatomic patch should be target specific
websocketapp: Fix multilib build
websocketpp: Fix clang specific flags in cmake files
Zhixiong Chi (1):
dnsmasq: CVE-2019-14834
...-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 +++++++ .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + .../recipes-devtools/nodejs/nodejs_10.16.3.bb | 2 +- .../cpprest/cpprest_2.10.14.bb | 2 +- .../0001-Correct-clang-compiler-flags.patch | 32 +++++ .../0001-cmake-Use-GNUInstallDirs.patch | 35 +++++ .../websocketpp/websocketpp-0.8.1/771.patch | 22 +++ .../websocketpp/websocketpp-0.8.1/842.patch | 30 ++++ .../websocketpp/websocketpp-0.8.1/855.patch | 23 +++ .../websocketpp/websocketpp-0.8.1/857.patch | 132 ++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 17 ++- .../recipes-perl/adduser/adduser_3.118.bb | 1 + ...-set-default-shell-with-sbin-nologin.patch | 34 +++++ 13 files changed, 377 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch create mode 100644 meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
Signature · 1 line
2.17.1
PATCH 1/8 nodejs: libatomic patch should be target specific
From: Khem Raj <[email protected]>
host usually are using gcc/x86_64/aarch64 and all of them have gcc which can support atomic intrinsics, but not all of them install libatomic by default e.g. centos-7, so asking for libatomic unconditionally may not work always
--- meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb +1 -1
@@ -19,10 +19,10 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ file://0006-Use-target-ldflags.patch \ " SRC_URI_append_class-target = " \ + file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ "
Signature · 1 line
2.17.1
PATCH 2/8 dnsmasq: CVE-2019-14834
In reply to Armin KusterFrom: Zhixiong Chi <[email protected]>
Backport the CVE patch from the upstream to fix the memory leak.
--- ...-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 +++++++++++++++++++ .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch
meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <[email protected]> +Date: Wed, 14 Aug 2019 20:44:50 +0100 +Subject: [PATCH] Fix memory leak in helper.c + +Thanks to Xu Mingjie <[email protected]> for spotting this. + +CVE: CVE-2019-14834 +Upstream-Status: Backport +Signed-off-by: Zhixiong Chi <[email protected]> +--- + src/helper.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/helper.c b/src/helper.c +index 33ba120..c392eec 100644 +--- a/src/helper.c ++++ b/src/helper.c +@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + pid_t pid; + int i, pipefd[2]; + struct sigaction sigact; +- ++ unsigned char *alloc_buff = NULL; ++ + /* create the pipe through which the main program sends us commands, + then fork our process. */ + if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) +@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + struct script_data data; + char *p, *action_str, *hostname = NULL, *domain = NULL; + unsigned char *buf = (unsigned char *)daemon->namebuff; +- unsigned char *end, *extradata, *alloc_buff = NULL; ++ unsigned char *end, *extradata; + int is6, err = 0; + int pipeout[2]; + +- free(alloc_buff); ++ /* Free rarely-allocated memory from previous iteration. */ ++ if (alloc_buff) ++ { ++ free(alloc_buff); ++ alloc_buff = NULL; ++ } + + /* we read zero bytes when pipe closed: this is our signal to exit */ + if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) +-- +1.7.10.4
meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +1 -0
@@ -5,5 +5,6 @@ SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d35 SRC_URI += "\ file://lua.patch \ file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ + file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \ "
Signature · 1 line
2.17.1
PATCH 3/8 cpprest: fix cmake installation directory
In reply to Armin KusterFrom: Gianfranco Costamagna <[email protected]>
This should help reverse-dependencies find the cmake files also in multiarch locations
--- meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" DEPENDS = "openssl websocketpp zlib boost brotli" -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ file://disable-float-tests.patch \
Signature · 1 line
2.17.1
PATCH 4/8 websocketapp: Fix multilib build
In reply to Armin KusterFrom: Khem Raj <[email protected]>
Fixes
ERROR: websocketpp-0.8.1-r0 do_package: QA Issue: websocketpp: Files/directories were installed but not shipped in any package:/usr/lib/usr/lib/cmake/usr/lib/cmake/websocketpp/usr/lib/cmake/websocketpp/websocketpp-configVersion.cmake /usr/lib/cmake/websocketpp/websocketpp-config.cmake
--- .../0001-cmake-Use-GNUInstallDirs.patch | 35 +++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 20:07:11 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..080be3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,13 @@ endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++include(GNUInstallDirs) ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + if (WIN32 AND NOT CYGWIN) + set (DEF_INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) + endif () + set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + +-- +2.24.1 +
meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +1 -0
@@ -8,6 +8,7 @@ DEPENDS = "openssl boost zlib" SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://0001-Replace-make_shared-with-new-in-some-cases.patch \ file://0002-Fix-missed-entries-fix-testing.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " # tag 0.8.1
Signature · 1 line
2.17.1
PATCH 5/8 websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
In reply to Armin KusterFrom: Gianfranco Costamagna <[email protected]>
- build failure with boost 1.71
- bad installation of header files correct version on some OSes.
- fix version minor number
- fix Scons script not being Python3 ready
- build examples and tests only if ptest is enabled in DISTRO_FEATURES
- do not depend on websocketpp from -dev package, because this is an header only dev package for now
--- .../websocketpp/websocketpp-0.8.1/771.patch | 22 +++ .../websocketpp/websocketpp-0.8.1/842.patch | 30 ++++ .../websocketpp/websocketpp-0.8.1/855.patch | 23 +++ .../websocketpp/websocketpp-0.8.1/857.patch | 132 ++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 15 +- 5 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch new file +22 -0
@@ -0,0 +1,22 @@ +From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <[email protected]> +Date: Thu, 1 Nov 2018 20:58:10 +0100 +Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba9..2d13117b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ endif () + ############ Project name and version + set (WEBSOCKETPP_MAJOR_VERSION 0) + set (WEBSOCKETPP_MINOR_VERSION 8) +-set (WEBSOCKETPP_PATCH_VERSION 0) ++set (WEBSOCKETPP_PATCH_VERSION 1) + set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION}) + + if(POLICY CMP0048)
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc <[email protected]> +Date: Wed, 18 Sep 2019 11:35:43 +0200 +Subject: [PATCH] Fix "include" directory installation. the variable + INSTALL_INCLUDE_DIR already exists, and defaults to include if not + specificied otherwise. Using it allows people to customize the installation + from outside, fixing issues with other OS like Haiku + +Signed-off-by: Gianfranco Costamagna <[email protected]> +Signed-off-by: Gianfranco Costamagna <[email protected]> +--- + cmake/CMakeHelpers.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake +index 1478f4b..f603632 100644 +--- a/cmake/CMakeHelpers.cmake ++++ b/cmake/CMakeHelpers.cmake +@@ -80,7 +80,7 @@ macro (final_target) + endif () + + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME} +- DESTINATION include/ ++ DESTINATION ${INSTALL_INCLUDE_DIR}/ + FILES_MATCHING PATTERN "*.hpp*") + endmacro () + +-- +2.17.1 +
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch new file +23 -0
@@ -0,0 +1,23 @@ +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <[email protected]> +Date: Wed, 8 Jan 2020 17:59:48 +0100 +Subject: [PATCH] Fix cmake find boost with version >= 1.71 + +For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117b..9a46bc10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,7 +213,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency.
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch new file +132 -0
132 lines not on this page · raw message
meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +14 -1
@@ -3,14 +3,27 @@ SECTION = "libs/network" HOMEPAGE = "https://github.com/zaphoyd/websocketpp" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" -DEPENDS = "openssl boost zlib" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://0001-Replace-make_shared-with-new-in-some-cases.patch \ file://0002-Fix-missed-entries-fix-testing.patch \ file://0001-cmake-Use-GNUInstallDirs.patch \ + file://842.patch \ + file://771.patch \ + file://855.patch \ + file://857.patch \ " +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " + +# this is an header only library, do not depend on the main package +RDEPENDS_${PN}-dev = "" + +# to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: +# TOOLCHAIN_TARGET_TASK_append = " websocketpp-dev" + # tag 0.8.1 SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7"
Signature · 1 line
2.17.1
PATCH 6/8 websocketpp: Fix clang specific flags in cmake files
In reply to Armin KusterFrom: Khem Raj <[email protected]>
--- .../0001-Correct-clang-compiler-flags.patch | 32 +++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 Jan 2020 21:54:39 -0800 +Subject: [PATCH] Correct clang compiler flags + +Fix misplaced quotes, this was leading to spurious ; in compiler cmdline +Remove demanding libc++, clang can link with both libc++ and libstdc++ +and platforms have their own defaults, user can demand non defaults via +adding it to cmake flags + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d13117..c17354a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,7 +148,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif() + set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) + set (WEBSOCKETPP_BOOST_LIBS system thread) +- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + if (NOT APPLE) + add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? + endif () +-- +2.24.1 +
meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +1 -0
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://771.patch \ file://855.patch \ file://857.patch \ + file://0001-Correct-clang-compiler-flags.patch \ " EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} "
Signature · 1 line
2.17.1
PATCH 7/8 websocketpp: refresh clang patch
In reply to Armin KusterFrom: Gianfranco Costamagna <[email protected]>
--- .../websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch +1 -1
@@ -18,7 +18,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d13117..c17354a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -148,7 +148,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) +@@ -150,7 +150,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) endif() set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) set (WEBSOCKETPP_BOOST_LIBS system thread)
Signature · 1 line
2.17.1
PATCH 8/8 adduser: set default shell with /sbin/nologin
In reply to Armin KusterFrom: Kai Kang <[email protected]>
Shell nologin whether provided by shadow or util-linux is installed to /sbin/nologin in oe-core. But the default shell of adduser is /usr/sbin/nologin and will fail to create a new user.
Set the default shell with /sbin/nologin to fix the issue.
--- .../recipes-perl/adduser/adduser_3.118.bb | 1 + ...-set-default-shell-with-sbin-nologin.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
meta-perl/recipes-perl/adduser/adduser_3.118.bb +1 -0
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef SRC_URI = "https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${PV}/${BPN}_${PV}.tar.xz \ file://adduser-add-M-option-for-useradd.patch \ + file://0001-adduser-set-default-shell-with-sbin-nologin.patch \ " SRC_URI[md5sum] = "44ba2475ebdaafc9613236bdda321c97"
meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 75e949bf80bf5e3e5bd8f81b258095e662b705c4 Mon Sep 17 00:00:00 2001 +From: Kai Kang <[email protected]> +Date: Thu, 9 Jan 2020 13:51:28 +0800 +Subject: [PATCH] adduser: set default shell with /sbin/nologin + +Shell nologin whether provided by shadow or util-linux is installed to +/sbin/nologin in oe-core. But the default shell of adduser is +/usr/sbin/nologin and will fail to create a new user. + +Set the default shell with /sbin/nologin to fix the issue. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Kai Kang <[email protected]> +--- + adduser | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/adduser b/adduser +index 0f24cc9..ab554d0 100755 +--- a/adduser ++++ b/adduser +@@ -431,7 +431,7 @@ if ($action eq "addsysuser") { + printf gtx("Adding new user `%s' (UID %d) with group `%s' ...\n"),$new_name,$new_uid,$ingroup_name + if $verbose; + $home_dir = $special_home || &homedir($new_name, $ingroup_name); +- $shell = $special_shell || '/usr/sbin/nologin'; ++ $shell = $special_shell || '/sbin/nologin'; + $undouser = $new_name; + my $useradd = &which('useradd'); + &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s', +-- +2.17.1 +
Signature · 1 line
2.17.1