musl-nscd: upgrade 1.0.2 -> 1.1.0

License-Update: Copyright year updated to 2021.

0001-Fix-build-under-GCC-fno-common.patch
0001-configure-Check-for-flex-if-lex-is-not-found.patch
removed since they're included in 1.1.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
wangmy 2022-06-13 17:00:19 +08:00 committed by Khem Raj
parent e16e743d4a
commit 58d18fcd47
3 changed files with 3 additions and 77 deletions

View File

@ -1,43 +0,0 @@
From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sat, 14 Nov 2020 22:55:30 -0700
Subject: [PATCH] Fix build under GCC -fno-common.
Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/modules.h | 4 ++--
src/main.c | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/modules.h b/include/modules.h
index 70c1960..e77ec58 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -28,7 +28,7 @@ struct mod_passwd {
link_t link;
};
-list_t passwd_mods;
-list_t group_mods;
+extern list_t passwd_mods;
+extern list_t group_mods;
#endif
diff --git a/src/main.c b/src/main.c
index c1a78bb..808ef74 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,9 @@
#include "parse.h"
#include "util.h"
+list_t passwd_mods;
+list_t group_mods;
+
static void *get_dll(const char *service)
{
char *path;
--
2.29.2

View File

@ -1,29 +0,0 @@
From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 22 Nov 2020 12:32:01 -0800
Subject: [PATCH] configure: Check for flex if lex is not found
lex is already checked by this time, therefore check should be to find
flex
Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 256824a..4c94568 100755
--- a/configure
+++ b/configure
@@ -249,7 +249,7 @@ printf "checking for lex... "
trylex ${CROSS_COMPILE}lex
trylex lex
trylex ${CROSS_COMPILE}flex
-trylex lex
+trylex flex
printf "%s\n" "$LEX"
test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source."
--
2.29.2

View File

@ -4,17 +4,15 @@
DESCRIPTION = "Musl-nscd is an implementation of the NSCD protocol, suitable for use with musl and with standard NSS modules"
HOMEPAGE = "https://github.com/pikhq/musl-nscd"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fff9baeb9a392879d7fb25ba3a2696e4"
SECTION = "utils"
DEPENDS += "flex-native bison-native flex bison"
PV = "1.0.2"
PV = "1.1.0"
SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4"
SRCREV = "cddd6be6c629ca96f2d2e74ee52daf12bbef1f83"
SRC_URI = "git://github.com/pikhq/musl-nscd;branch=master;protocol=https \
file://0001-Fix-build-under-GCC-fno-common.patch \
file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \
file://0001-nsswitch.y-Replace-empty-bison-extension.patch \
"