diff mbox

[v7,1/1] package/unscd: new package

Message ID 1449068177-24100-1-git-send-email-rdkehn@yahoo.com
State Accepted
Headers show

Commit Message

Doug Kehn Dec. 2, 2015, 2:56 p.m. UTC
A daemon which handles passwd, group and host lookups for running
programs and caches the results for the next query. This package is
intended to replace glibc nscd. Presently, glibc nscd is not installed
by Buildroot.

unscd depends on glibc because it relies on glibc function
__nss_disable_nscd.

nscd.conf is taken from glibc with unused configurations removed.

Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
---
Changes v6 -> v7
  - Re-add package/Config.in (Arnout).
  - Reword config help test (Arnout).
  - Remove commented params in nscd.conf (Arnout).
  - Rework BUILD_CMDS (Arnout/Thomas).
  - Reword commit log (Arnout).
Changes v5 -> v6
  - Remove toolchain patch/BR2_GLIBC_NSCD (Thomas).
  - Change source site from Debian to upstream (Thomas).
  - Update to version 0.52 (Thomas).
Changes v4 -> v5
  - Reincorporate $(APPLY_PATCHES) suggestion after update by Arnout.
Changes v3 -> v4
  - Incorporate feedback/suggestions by Yann and Maxime.
Changes v2 -> v3
  - Remove trailing '/' from UNSCD_SITE.
  - Whitespace cleanup.
Changes v1 -> v2
  - Incorporate feedback/suggestions by Yann (from nss-pam-ldapd patch).
---
 package/Config.in        |  1 +
 package/unscd/Config.in  | 25 +++++++++++++++++++++++++
 package/unscd/S46unscd   | 24 ++++++++++++++++++++++++
 package/unscd/nscd.conf  | 33 +++++++++++++++++++++++++++++++++
 package/unscd/unscd.hash |  2 ++
 package/unscd/unscd.mk   | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 121 insertions(+)
 create mode 100644 package/unscd/Config.in
 create mode 100644 package/unscd/S46unscd
 create mode 100644 package/unscd/nscd.conf
 create mode 100644 package/unscd/unscd.hash
 create mode 100644 package/unscd/unscd.mk

Comments

Arnout Vandecappelle Dec. 2, 2015, 9:54 p.m. UTC | #1
On 02-12-15 15:56, Doug Kehn wrote:
> A daemon which handles passwd, group and host lookups for running
> programs and caches the results for the next query. This package is
> intended to replace glibc nscd. Presently, glibc nscd is not installed
> by Buildroot.
> 
> unscd depends on glibc because it relies on glibc function
> __nss_disable_nscd.
> 
> nscd.conf is taken from glibc with unused configurations removed.
> 
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Doug Kehn <rdkehn@yahoo.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout


[snip]
Thomas Petazzoni Dec. 22, 2015, 7:58 p.m. UTC | #2
Dear Doug Kehn,

On Wed,  2 Dec 2015 08:56:17 -0600, Doug Kehn wrote:
> A daemon which handles passwd, group and host lookups for running
> programs and caches the results for the next query. This package is
> intended to replace glibc nscd. Presently, glibc nscd is not installed
> by Buildroot.
> 
> unscd depends on glibc because it relies on glibc function
> __nss_disable_nscd.
> 
> nscd.conf is taken from glibc with unused configurations removed.
> 
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
> ---
> Changes v6 -> v7
>   - Re-add package/Config.in (Arnout).
>   - Reword config help test (Arnout).
>   - Remove commented params in nscd.conf (Arnout).
>   - Rework BUILD_CMDS (Arnout/Thomas).
>   - Reword commit log (Arnout).
> Changes v5 -> v6
>   - Remove toolchain patch/BR2_GLIBC_NSCD (Thomas).
>   - Change source site from Debian to upstream (Thomas).
>   - Update to version 0.52 (Thomas).
> Changes v4 -> v5
>   - Reincorporate $(APPLY_PATCHES) suggestion after update by Arnout.
> Changes v3 -> v4
>   - Incorporate feedback/suggestions by Yann and Maxime.
> Changes v2 -> v3
>   - Remove trailing '/' from UNSCD_SITE.
>   - Whitespace cleanup.
> Changes v1 -> v2
>   - Incorporate feedback/suggestions by Yann (from nss-pam-ldapd patch).
> ---
>  package/Config.in        |  1 +
>  package/unscd/Config.in  | 25 +++++++++++++++++++++++++
>  package/unscd/S46unscd   | 24 ++++++++++++++++++++++++
>  package/unscd/nscd.conf  | 33 +++++++++++++++++++++++++++++++++
>  package/unscd/unscd.hash |  2 ++
>  package/unscd/unscd.mk   | 36 ++++++++++++++++++++++++++++++++++++
>  6 files changed, 121 insertions(+)
>  create mode 100644 package/unscd/Config.in
>  create mode 100644 package/unscd/S46unscd
>  create mode 100644 package/unscd/nscd.conf
>  create mode 100644 package/unscd/unscd.hash
>  create mode 100644 package/unscd/unscd.mk

I've applied your patch. However, I think a follow-up patch would be
good to add the use of a PID file in the init script. See for example
S50dropbear for an example where a PID file is used.

Thanks!

Thomas
Doug Kehn Dec. 23, 2015, 12:59 p.m. UTC | #3
Hi Thomas,

On Tue, Dec 22, 2015 at 08:58:08PM +0100, Thomas Petazzoni wrote:
> Dear Doug Kehn,
> 
> On Wed,  2 Dec 2015 08:56:17 -0600, Doug Kehn wrote:
> > A daemon which handles passwd, group and host lookups for running
> > programs and caches the results for the next query. This package is
> > intended to replace glibc nscd. Presently, glibc nscd is not installed
> > by Buildroot.
> > 
> > unscd depends on glibc because it relies on glibc function
> > __nss_disable_nscd.
> > 
> > nscd.conf is taken from glibc with unused configurations removed.
> > 
> > Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: Arnout Vandecappelle <arnout@mind.be>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
> > ---
> > Changes v6 -> v7
> >   - Re-add package/Config.in (Arnout).
> >   - Reword config help test (Arnout).
> >   - Remove commented params in nscd.conf (Arnout).
> >   - Rework BUILD_CMDS (Arnout/Thomas).
> >   - Reword commit log (Arnout).
> > Changes v5 -> v6
> >   - Remove toolchain patch/BR2_GLIBC_NSCD (Thomas).
> >   - Change source site from Debian to upstream (Thomas).
> >   - Update to version 0.52 (Thomas).
> > Changes v4 -> v5
> >   - Reincorporate $(APPLY_PATCHES) suggestion after update by Arnout.
> > Changes v3 -> v4
> >   - Incorporate feedback/suggestions by Yann and Maxime.
> > Changes v2 -> v3
> >   - Remove trailing '/' from UNSCD_SITE.
> >   - Whitespace cleanup.
> > Changes v1 -> v2
> >   - Incorporate feedback/suggestions by Yann (from nss-pam-ldapd patch).
> > ---
> >  package/Config.in        |  1 +
> >  package/unscd/Config.in  | 25 +++++++++++++++++++++++++
> >  package/unscd/S46unscd   | 24 ++++++++++++++++++++++++
> >  package/unscd/nscd.conf  | 33 +++++++++++++++++++++++++++++++++
> >  package/unscd/unscd.hash |  2 ++
> >  package/unscd/unscd.mk   | 36 ++++++++++++++++++++++++++++++++++++
> >  6 files changed, 121 insertions(+)
> >  create mode 100644 package/unscd/Config.in
> >  create mode 100644 package/unscd/S46unscd
> >  create mode 100644 package/unscd/nscd.conf
> >  create mode 100644 package/unscd/unscd.hash
> >  create mode 100644 package/unscd/unscd.mk
> 
> I've applied your patch. However, I think a follow-up patch would be
> good to add the use of a PID file in the init script. See for example
> S50dropbear for an example where a PID file is used.
> 

A PID file is created by unscd in /var/run/nscd/ when it is started.
The PID file is deleted when unscd is stopped; however, the
/var/run/nscd/ directory remains.

unscd can be started in debug mode (a.k.a foreground, -d option). In
doing so, PID file creation could be done in the init script as
requested. The problem I see here is that unscd logs to stderr when
started in debug mode.

Do you still prefer a patch for PID file creation in the init
script?

Thanks,
...doug
Thomas Petazzoni Dec. 23, 2015, 1:13 p.m. UTC | #4
Hello,

On Wed, 23 Dec 2015 06:59:29 -0600, rdkehn@yahoo.com wrote:

> A PID file is created by unscd in /var/run/nscd/ when it is started.
> The PID file is deleted when unscd is stopped; however, the
> /var/run/nscd/ directory remains.
> 
> unscd can be started in debug mode (a.k.a foreground, -d option). In
> doing so, PID file creation could be done in the init script as
> requested. The problem I see here is that unscd logs to stderr when
> started in debug mode.
> 
> Do you still prefer a patch for PID file creation in the init
> script?

You can tell start-stop-daemon that the PID file is created by the
daemon itself. Basically, pass just the -p <pid-file> option when
starting and stopping the daemon. As long as you don't pass -m when
starting the daemon, start-stop-daemon does not create the pid file.

See man start-stop-daemon(8) for all the details.

Best regards,

Thomas
Doug Kehn Dec. 23, 2015, 1:29 p.m. UTC | #5
Hi Thomas,

On Wed, Dec 23, 2015 at 02:13:40PM +0100, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 23 Dec 2015 06:59:29 -0600, rdkehn@yahoo.com wrote:
> 
> > A PID file is created by unscd in /var/run/nscd/ when it is started.
> > The PID file is deleted when unscd is stopped; however, the
> > /var/run/nscd/ directory remains.
> > 
> > unscd can be started in debug mode (a.k.a foreground, -d option). In
> > doing so, PID file creation could be done in the init script as
> > requested. The problem I see here is that unscd logs to stderr when
> > started in debug mode.
> > 
> > Do you still prefer a patch for PID file creation in the init
> > script?
> 
> You can tell start-stop-daemon that the PID file is created by the
> daemon itself. Basically, pass just the -p <pid-file> option when
> starting and stopping the daemon. As long as you don't pass -m when
> starting the daemon, start-stop-daemon does not create the pid file.
> 
> See man start-stop-daemon(8) for all the details.
> 

Ah, you're not saying that you want stat-stop-daemon to create the
PID file. (It's early, coffee starting to kick in...)

Regards,
...doug
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 2bdad01..e56a318 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1542,6 +1542,7 @@  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/sysvinit/Config.in"
 	source "package/tar/Config.in"
 endif
+	source "package/unscd/Config.in"
 	source "package/util-linux/Config.in"
 endmenu
 
diff --git a/package/unscd/Config.in b/package/unscd/Config.in
new file mode 100644
index 0000000..e979c30
--- /dev/null
+++ b/package/unscd/Config.in
@@ -0,0 +1,25 @@ 
+config BR2_PACKAGE_UNSCD
+	bool "unscd"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	help
+	  Micro Name Service Caching Daemon
+
+	  A daemon which handles passwd, group and host lookups for
+	  running programs and caches the results for the next query.
+	  You only need this package if you are using slow Name Services
+	  like LDAP, NIS or NIS+.
+
+	  This particular NSCD is a complete rewrite of the GNU glibc
+	  nscd which is a single threaded server process which offloads
+	  all NSS lookups to worker children; cache hits are handled by
+	  the parent, and only cache misses start worker children,
+	  making the parent immune to resource leaks, hangs, and crashes
+	  in NSS libraries.
+
+	  It should mostly be a drop-in replacement for existing
+	  installs using nscd.
+
+	  http://busybox.net/~vda/unscd
+
+comment "unscd needs an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/unscd/S46unscd b/package/unscd/S46unscd
new file mode 100644
index 0000000..7d18f94
--- /dev/null
+++ b/package/unscd/S46unscd
@@ -0,0 +1,24 @@ 
+#!/bin/sh
+
+NAME="nscd"
+DAEMON="/usr/sbin/${NAME}"
+
+case "$1" in
+start)
+        printf "Starting ${NAME}: "
+        start-stop-daemon -S -x ${DAEMON}
+        [ $? -eq 0 ] && echo "OK" || echo "FAIL"
+        ;;
+stop)
+        printf "Stopping ${NAME}: "
+        start-stop-daemon -K -x ${DAEMON}
+        [ $? -eq 0 ] && echo "OK" || echo "FAIL"
+        ;;
+restart|reload)
+        $0 stop
+        $0 start
+        ;;
+*)
+        echo "Usage: $0 {start|stop|restart|reload}"
+        exit 1
+esac
diff --git a/package/unscd/nscd.conf b/package/unscd/nscd.conf
new file mode 100644
index 0000000..3eb08ab
--- /dev/null
+++ b/package/unscd/nscd.conf
@@ -0,0 +1,33 @@ 
+# /etc/nscd.conf
+#
+# An example Name Service Cache config file.  This file is needed by nscd.
+#
+server-user unscd
+debug-level 0
+
+enable-cache            passwd  yes
+positive-time-to-live   passwd  600
+negative-time-to-live   passwd  20
+suggested-size          passwd  1001
+check-files             passwd  yes
+
+enable-cache            group   yes
+positive-time-to-live   group   3600
+negative-time-to-live   group   60
+suggested-size          group   1001
+check-files             group   yes
+
+# hosts caching is broken with gethostby* calls, hence is now disabled
+# by default. Specifically, the caching does not obey DNS TTLs, and
+# thus could lead to problems if the positive-time-to-live is
+# significantly larger than the actual TTL.
+#
+# You should really use a caching nameserver instead of nscd for this
+# sort of request. However, you can easily re-enable this by default.
+enable-cache            hosts   no
+positive-time-to-live   hosts   3600
+negative-time-to-live   hosts   20
+suggested-size          hosts   1001
+check-files             hosts   yes
+
+# unscd does not support services caching
diff --git a/package/unscd/unscd.hash b/package/unscd/unscd.hash
new file mode 100644
index 0000000..ab8ffdc
--- /dev/null
+++ b/package/unscd/unscd.hash
@@ -0,0 +1,2 @@ 
+# Locally computed:
+sha256	4c1f83dcd120469fceef749050cb29fa666fa4666bd308dfe92e933a4c200d55	nscd-0.52.c
diff --git a/package/unscd/unscd.mk b/package/unscd/unscd.mk
new file mode 100644
index 0000000..54caeb1
--- /dev/null
+++ b/package/unscd/unscd.mk
@@ -0,0 +1,36 @@ 
+################################################################################
+#
+# unscd
+#
+################################################################################
+
+UNSCD_VERSION = 0.52
+UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c
+UNSCD_SITE = http://busybox.net/~vda/unscd
+UNSCD_LICENSE = GPLv2
+UNSCD_LICENSE_FILES = $(UNSCD_SOURCE)
+
+define UNSCD_EXTRACT_CMDS
+	cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
+endef
+
+define UNSCD_BUILD_CMDS
+	cd $(@D); \
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o nscd $(UNSCD_SOURCE)
+endef
+
+define UNSCD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/nscd $(TARGET_DIR)/usr/sbin/nscd
+	$(INSTALL) -m 600 -D package/unscd/nscd.conf $(TARGET_DIR)/etc/nscd.conf
+endef
+
+define UNSCD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D package/unscd/S46unscd \
+		$(TARGET_DIR)/etc/init.d/S46unscd
+endef
+
+define UNSCD_USERS
+	unscd -1 unscd -1 * - - - unscd user
+endef
+
+$(eval $(generic-package))