kernel: Update to 4.20

[ipfire-3.x.git] / bash / bash.nm

diff --git a/bash/bash.nm b/bash/bash.nm
index e6c0ff56b28fd9cf264ef223c929624945e6eead..0ca9d15607df77075d840c32a626589e500c1d9e 100644 (file)
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = bash
-version    = 4.2
-release    = 5
+version    = 4.4
+release    = 1
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -13,9 +13,9 @@ license    = GPLv2+
 summary    = Bash is short for born again shell.
 
 description
-       Bash is the shell, or command language interpreter, that will appear in \
-       the GNU operating system. Bash is an sh-compatible shell that incorporates \
-       useful features from the Korn shell (ksh) and C shell (csh). It is intended \
+       Bash is the shell, or command language interpreter, that will appear in
+       the GNU operating system. Bash is an sh-compatible shell that incorporates
+       useful features from the Korn shell (ksh) and C shell (csh). It is intended
        to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
 end
 
@@ -26,34 +26,57 @@ build
                autoconf
                automake
                bison
+               filesystem >= 002
                ncurses-devel
-               readline-devel
+               readline-devel >= 7.0
+               texinfo
        end
 
+       # Disable parallel build
+       MAKETUNING =
+
        prepare_cmds
                # Bash uses the RTLD_LAZY option when loading libraries. We want to use
                # RTLD_NOW (it is defined from <dlfcn.h>:
                sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                        -i builtins/enable.def
-
-               sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/%{thisapp}|" \
-                       Makefile.in
        end
 
+       CPPFLAGS += -D_GNU_SOURCE %(getconf LFS_CFLAGS)
+
+       CPPFLAGS += -DNON_INTERACTIVE_LOGIN_SHELLS
+       CPPFLAGS += -DSSH_SOURCE_BASHRC
+
+       # Recycles pids is neccessary. When bash's last fork's pid was X
+       # and new fork's pid is also X, bash has to wait for this same pid.
+       # Without Recycles pids bash will not wait.
+       CPPFLAGS += -DRECYCLES_PIDS
+
+       CPPFLAGS += \
+               -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' \
+               -DSTANDARD_UTILS_PATH='\"/bin:/usr/bin:/sbin:/usr/sbin\"' \
+               -DSYS_BASH_LOGOUT='\"/etc/bash.bash_logout\"'
+
        configure_options += \
-               --bindir=/bin \
-               --without-bash-malloc \
-               --with-installed-readline
+               --with-installed-readline \
+               --with-afs \
+               --with-bash-malloc=no
+
+       make_build_targets += CPPFLAGS="%{CPPFLAGS}"
 
-       # Test hangs forever
-       #def test
-       #       make tests
-       #end
+       test
+               make tests
+       end
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/{bin,etc/profile.d,root}
+               mkdir -pv %{BUILDROOT}%{sysconfdir}/{profile.d,skel}
+               mkdir -pv %{BUILDROOT}/root
 
                # Bash startup files
+               cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}%{sysconfdir}/skel/.bash_logout
+               cp -vf %{DIR_SOURCE}/dot_bash_profile %{BUILDROOT}%{sysconfdir}/skel/.bash_profile
+               cp -vf %{DIR_SOURCE}/dot_bashrc %{BUILDROOT}%{sysconfdir}/skel/.bashrc
+
                cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}/root/.bash_logout
                cp -vf %{DIR_SOURCE}/dot_bash_profile %{BUILDROOT}/root/.bash_profile
                cp -vf %{DIR_SOURCE}/dot_bashrc %{BUILDROOT}/root/.bashrc
@@ -61,7 +84,17 @@ build
                # /etc/profile.d
                cp -vf %{DIR_SOURCE}/profile.d/* %{BUILDROOT}/etc/profile.d
 
-               ln -svf bash %{BUILDROOT}/bin/sh
+               ln -svf bash %{BUILDROOT}%{bindir}/sh
+
+               # https://bugzilla.redhat.com/show_bug.cgi?id=820192
+               # bug #820192, need to add execable alternatives for regular built-ins
+               for f in alias bg cd command fc fg getopts jobs read umask unalias wait; do
+                       (
+                               echo "#!/bin/sh"
+                               echo "builtin \"${f}\" \"\$@\""
+                       ) > "%{BUILDROOT}/%{bindir}/${f}"
+                       chmod +x "%{BUILDROOT}%{bindir}/${f}"
+               done
        end
 end
 
@@ -69,10 +102,22 @@ packages
        package %{name}
                groups += Base Build
 
-               prerequires = coreutils
-               requires = /etc/bashrc /etc/profile
+               requires
+                       coreutils
+                       /etc/bashrc
+                       /etc/profile
+               end
+
+               provides
+                       /bin/bash
+                       /bin/sh
+               end
+
+               conflicts
+                       filesystem < 002
+               end
 
-               script postin
+               script posttransin
                        # Create /etc/shells, if it does not exist.
                        [ -f "/etc/shells" ] || touch /etc/shells