[PATCH] Remove bash dependency for nscd init script

[PATCH] Remove bash dependency for nscd init script

[Khem Raj]

The nscd init script uses #! /bin/bash but only really uses one bashism
(translated strings), so remove them and switch the shell to #!/bin/sh.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 nscd/nscd.init | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nscd/nscd.init b/nscd/nscd.init
index a882da7d8b..b02986ec15 100644
--- a/nscd/nscd.init
+++ b/nscd/nscd.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # nscd:		Starts the Name Switch Cache Daemon
 #
@@ -49,7 +49,7 @@ prog=nscd
 start () {
     [ -d /var/run/nscd ] || mkdir /var/run/nscd
     [ -d /var/db/nscd ] || mkdir /var/db/nscd
-    echo -n $"Starting $prog: "
+    echo -n "Starting $prog: "
     daemon /usr/sbin/nscd
     RETVAL=$?
     echo
@@ -58,7 +58,7 @@ start () {
 }
 
 stop () {
-    echo -n $"Stopping $prog: "
+    echo -n "Stopping $prog: "
     /usr/sbin/nscd -K
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then
@@ -67,9 +67,9 @@ stop () {
 	# a non-privileged user
 	rm -f /var/run/nscd/nscd.pid
 	rm -f /var/run/nscd/socket
-       	success $"$prog shutdown"
+	success "$prog shutdown"
     else
-       	failure $"$prog shutdown"
+	failure "$prog shutdown"
     fi
     echo
     return $RETVAL
@@ -103,13 +103,13 @@ case "$1" in
 	RETVAL=$?
 	;;
     force-reload | reload)
-    	echo -n $"Reloading $prog: "
+	echo -n "Reloading $prog: "
 	killproc /usr/sbin/nscd -HUP
 	RETVAL=$?
 	echo
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
 	RETVAL=1
 	;;
 esac
-- 
2.34.1

[PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its empty

[Khem Raj]

This ensures that it can be set in build environment

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 sysdeps/gnu/configure    | 2 +-
 sysdeps/gnu/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index c15d1087e8..37cc983f2a 100644
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -32,6 +32,6 @@ case "$prefix" in
   else
     libc_cv_localstatedir=$localstatedir
    fi
-  libc_cv_rootsbindir=/sbin
+  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
   ;;
 esac
diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac
index 634fe4de2a..3db1697f4f 100644
--- a/sysdeps/gnu/configure.ac
+++ b/sysdeps/gnu/configure.ac
@@ -21,6 +21,6 @@ case "$prefix" in
   else
     libc_cv_localstatedir=$localstatedir
    fi
-  libc_cv_rootsbindir=/sbin
+  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
   ;;
 esac
-- 
2.34.1

Re: [PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its empty

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

On 01 Dec 2021 23:06, Khem Raj via Libc-alpha wrote:
> +  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin

: "${libc_cv_rootsbindir:=/sbin}"
-mike

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH] timezone: re-written tzselect as posix sh

[Khem Raj]

To avoid the bash dependency.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 timezone/tzselect.ksh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
index 18fce27e24..7705df83d7 100755
--- a/timezone/tzselect.ksh
+++ b/timezone/tzselect.ksh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
 
@@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org
 
 # Specify default values for environment variables if they are unset.
 : ${AWK=awk}
-: ${TZDIR=`pwd`}
+: ${TZDIR=$(pwd)}
 
 # Output one argument as-is to standard output.
 # Safer than 'echo', which can mishandle '\' or leading '-'.
-- 
2.34.1

Re: [PATCH] timezone: re-written tzselect as posix sh

[Florian Weimer]

* Khem Raj via Libc-alpha:

> To avoid the bash dependency.
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  timezone/tzselect.ksh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
> index 18fce27e24..7705df83d7 100755
> --- a/timezone/tzselect.ksh
> +++ b/timezone/tzselect.ksh
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>  # Ask the user about the time zone, and output the resulting TZ value to stdout.
>  # Interact with the user via stderr and stdin.
>  
> @@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org
>  
>  # Specify default values for environment variables if they are unset.
>  : ${AWK=awk}
> -: ${TZDIR=`pwd`}
> +: ${TZDIR=$(pwd)}
>  
>  # Output one argument as-is to standard output.
>  # Safer than 'echo', which can mishandle '\' or leading '-'.

Is this really a bashism?  I'm surprised.

Thanks,
Florian

Re: [PATCH] timezone: re-written tzselect as posix sh

[Khem Raj]

On Thu, Dec 2, 2021 at 7:38 AM Florian Weimer <fweimer@redhat.com> wrote:
>
> * Khem Raj via Libc-alpha:
>
> > To avoid the bash dependency.
> >
> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  timezone/tzselect.ksh | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
> > index 18fce27e24..7705df83d7 100755
> > --- a/timezone/tzselect.ksh
> > +++ b/timezone/tzselect.ksh
> > @@ -1,4 +1,4 @@
> > -#!/bin/bash
> > +#!/bin/sh
> >  # Ask the user about the time zone, and output the resulting TZ value to stdout.
> >  # Interact with the user via stderr and stdin.
> >
> > @@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org
> >
> >  # Specify default values for environment variables if they are unset.
> >  : ${AWK=awk}
> > -: ${TZDIR=`pwd`}
> > +: ${TZDIR=$(pwd)}
> >
> >  # Output one argument as-is to standard output.
> >  # Safer than 'echo', which can mishandle '\' or leading '-'.
>
> Is this really a bashism?  I'm surprised.

you are right. I tested it on bash/dash/zsh/ash it works as expected.
Let me find
the real reason for this patch and come back.

>
> Thanks,
> Florian
>

Re: [PATCH] timezone: re-written tzselect as posix sh

[Joseph Myers]

tzselect.ksh is supposed to be taken verbatim from upstream tzcode, not 
locally modified.  See timezone/README.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH] timezone: re-written tzselect as posix sh

[Paul Eggert]

On 12/1/21 23:06, Khem Raj via Libc-alpha wrote:
> To avoid the bash dependency.

A better way to avoid any Bash dependency would be to change 
timezone/Makefile's $(objpfx)tzselect rule to add a line like this:

    -e 's|#!/bin/bash|#!$(KSHELL)|g' \

where KSHELL is suitably defined for your platform. This is what the 
upstream (tzcode) Makefile does, and doing it this way would mean that 
tzselect.ksh could stay identical with upstream.

For KSHELL it's better to use Bash or some other Korn-compatible shell 
if available, since tzselect takes advantage of ksh-style 'select' 
commands (when the shell supports 'select') to have a somewhat better UI.


> -: ${TZDIR=`pwd`}
> +: ${TZDIR=$(pwd)}

This part of the patch is not relevant to any Bash dependency, since the 
form with `` should be supported by any POSIX shell.

That being said, nowadays tzselect.ksh could be streamlined a bit since 
we no longer need to worry about compatibility with Solaris 9 sh. I'll 
try to kick free some time to do that upstream.

Re: [PATCH] Remove bash dependency for nscd init script

[Florian Weimer]

* Khem Raj via Libc-alpha:

> The nscd init script uses #! /bin/bash but only really uses one bashism
> (translated strings), so remove them and switch the shell to #!/bin/sh.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  nscd/nscd.init | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/nscd/nscd.init b/nscd/nscd.init
> index a882da7d8b..b02986ec15 100644
> --- a/nscd/nscd.init
> +++ b/nscd/nscd.init
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>  #
>  # nscd:		Starts the Name Switch Cache Daemon
>  #
> @@ -49,7 +49,7 @@ prog=nscd
>  start () {
>      [ -d /var/run/nscd ] || mkdir /var/run/nscd
>      [ -d /var/db/nscd ] || mkdir /var/db/nscd
> -    echo -n $"Starting $prog: "
> +    echo -n "Starting $prog: "

I believe “echo -n” is still a bashim.  The current-POSIX portable
solution is to use printf.  But “echo -n” might actually be *more*
portable than printf in practice.

Thanks,
Florian

Re: [PATCH] Remove bash dependency for nscd init script

[Khem Raj]

On Thu, Dec 2, 2021 at 7:40 AM Florian Weimer <fweimer@redhat.com> wrote:
>
> * Khem Raj via Libc-alpha:
>
> > The nscd init script uses #! /bin/bash but only really uses one bashism
> > (translated strings), so remove them and switch the shell to #!/bin/sh.
> >
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  nscd/nscd.init | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/nscd/nscd.init b/nscd/nscd.init
> > index a882da7d8b..b02986ec15 100644
> > --- a/nscd/nscd.init
> > +++ b/nscd/nscd.init
> > @@ -1,4 +1,4 @@
> > -#!/bin/bash
> > +#!/bin/sh
> >  #
> >  # nscd:              Starts the Name Switch Cache Daemon
> >  #
> > @@ -49,7 +49,7 @@ prog=nscd
> >  start () {
> >      [ -d /var/run/nscd ] || mkdir /var/run/nscd
> >      [ -d /var/db/nscd ] || mkdir /var/db/nscd
> > -    echo -n $"Starting $prog: "
> > +    echo -n "Starting $prog: "
>
> I believe “echo -n” is still a bashim.  The current-POSIX portable
> solution is to use printf.  But “echo -n” might actually be *more*
> portable than printf in practice.

The fix is used to make it work with busybox shell and therefore not
tried to clean
full bash specific stuff.

>
> Thanks,
> Florian
>

Re: [PATCH] Remove bash dependency for nscd init script

[Florian Weimer]

* Khem Raj:

> On Thu, Dec 2, 2021 at 7:40 AM Florian Weimer <fweimer@redhat.com> wrote:
>>
>> * Khem Raj via Libc-alpha:
>>
>> > The nscd init script uses #! /bin/bash but only really uses one bashism
>> > (translated strings), so remove them and switch the shell to #!/bin/sh.
>> >
>> > Signed-off-by: Ross Burton <ross.burton@intel.com>
>> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ---
>> >  nscd/nscd.init | 14 +++++++-------
>> >  1 file changed, 7 insertions(+), 7 deletions(-)
>> >
>> > diff --git a/nscd/nscd.init b/nscd/nscd.init
>> > index a882da7d8b..b02986ec15 100644
>> > --- a/nscd/nscd.init
>> > +++ b/nscd/nscd.init
>> > @@ -1,4 +1,4 @@
>> > -#!/bin/bash
>> > +#!/bin/sh
>> >  #
>> >  # nscd:              Starts the Name Switch Cache Daemon
>> >  #
>> > @@ -49,7 +49,7 @@ prog=nscd
>> >  start () {
>> >      [ -d /var/run/nscd ] || mkdir /var/run/nscd
>> >      [ -d /var/db/nscd ] || mkdir /var/db/nscd
>> > -    echo -n $"Starting $prog: "
>> > +    echo -n "Starting $prog: "
>>
>> I believe “echo -n” is still a bashim.  The current-POSIX portable
>> solution is to use printf.  But “echo -n” might actually be *more*
>> portable than printf in practice.
>
> The fix is used to make it work with busybox shell and therefore not
> tried to clean full bash specific stuff.

Fair enough, incremental changes are welcome.  But please adjust the
commit message. 8-)

Thanks,
Florian

Re: [PATCH] Remove bash dependency for nscd init script

[Zack Weinberg]

On Thu, Dec 2, 2021, at 10:40 AM, Florian Weimer via Libc-alpha wrote:
> * Khem Raj via Libc-alpha:
>
>> The nscd init script uses #! /bin/bash but only really uses one bashism
>> (translated strings), so remove them and switch the shell to #!/bin/sh
>
> I believe “echo -n” is still a bashim.  The current-POSIX portable
> solution is to use printf.  But “echo -n” might actually be *more*
> portable than printf in practice.

printf(1) is reliable enough in practice that autoconf scripts now use it unconditionally (as of 2.70).

zw