Update stage1 shadow for new install dir option

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index 875030f..520921b 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -57,7 +57,7 @@ PKG_CONFIG=true \
         --disable-sulogin \
         --disable-su \
         --disable-makeinstall-chown"
-ipkg ${SHADOW} "\
+ipkg -i ${LFS} ${SHADOW} "\
     --sysconfdir=/etc \
     --cache-file=config.cache"
 LDFLAGS="-Wl,-lpthread,-ldl" \

diff --git a/stage1/patches/common/shadow-4.1.5.1-no-groups.patch b/stage1/patches/common/shadow-4.1.5.1-no-groups.patch
new file mode 100644 (file)
index 0000000..a567c83
--- /dev/null
+++ b/stage1/patches/common/shadow-4.1.5.1-no-groups.patch
@@ -0,0 +1,168 @@
+diff -Naur shadow-4.1.5.1.orig/man/Makefile.in shadow-4.1.5.1.new/man/Makefile.in
+--- shadow-4.1.5.1.orig/man/Makefile.in        2012-05-25 07:56:46.000000000 -0400
++++ shadow-4.1.5.1.new/man/Makefile.in 2014-12-27 11:22:20.776625413 -0500
+@@ -303,7 +303,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/man/cs/Makefile.in shadow-4.1.5.1.new/man/cs/Makefile.in
+--- shadow-4.1.5.1.orig/man/cs/Makefile.in     2012-05-25 07:56:46.000000000 -0400
++++ shadow-4.1.5.1.new/man/cs/Makefile.in      2014-12-27 11:22:20.746625411 -0500
+@@ -259,7 +259,7 @@
+       man8/groupadd.8 \
+       man8/groupdel.8 \
+       man8/groupmod.8 \
+-      man1/groups.1 \
++      man1/ \
+       man8/grpck.8 \
+       man5/gshadow.5 \
+       man8/lastlog.8 \
+diff -Naur shadow-4.1.5.1.orig/man/da/Makefile.in shadow-4.1.5.1.new/man/da/Makefile.in
+--- shadow-4.1.5.1.orig/man/da/Makefile.in     2012-05-25 07:56:46.000000000 -0400
++++ shadow-4.1.5.1.new/man/da/Makefile.in      2014-12-27 11:22:20.781625413 -0500
+@@ -257,7 +257,7 @@
+ top_srcdir = @top_srcdir@
+ 
+ # 2012.01.28 - activate manpages with more than 50% translated messages
+-man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
++man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
+       man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
+       man8/vigr.8 man8/vipw.8 $(am__append_1)
+ man_nopam = 
+diff -Naur shadow-4.1.5.1.orig/man/de/Makefile.in shadow-4.1.5.1.new/man/de/Makefile.in
+--- shadow-4.1.5.1.orig/man/de/Makefile.in     2012-05-25 07:56:47.000000000 -0400
++++ shadow-4.1.5.1.new/man/de/Makefile.in      2014-12-27 11:22:20.769625412 -0500
+@@ -259,7 +259,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/man/fr/Makefile.in shadow-4.1.5.1.new/man/fr/Makefile.in
+--- shadow-4.1.5.1.orig/man/fr/Makefile.in     2012-05-25 07:56:47.000000000 -0400
++++ shadow-4.1.5.1.new/man/fr/Makefile.in      2014-12-27 11:22:20.786625414 -0500
+@@ -259,7 +259,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/man/hu/Makefile.in shadow-4.1.5.1.new/man/hu/Makefile.in
+--- shadow-4.1.5.1.orig/man/hu/Makefile.in     2012-05-25 07:56:48.000000000 -0400
++++ shadow-4.1.5.1.new/man/hu/Makefile.in      2014-12-27 11:22:20.771625413 -0500
+@@ -254,7 +254,7 @@
+ man_MANS = \
+       man1/chsh.1 \
+       man1/gpasswd.1 \
+-      man1/groups.1 \
++      man1/ \
+       man8/lastlog.8 \
+       man1/login.1 \
+       man1/newgrp.1 \
+diff -Naur shadow-4.1.5.1.orig/man/it/Makefile.in shadow-4.1.5.1.new/man/it/Makefile.in
+--- shadow-4.1.5.1.orig/man/it/Makefile.in     2012-05-25 07:56:48.000000000 -0400
++++ shadow-4.1.5.1.new/man/it/Makefile.in      2014-12-27 11:22:20.783625413 -0500
+@@ -259,7 +259,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/man/ja/Makefile.in shadow-4.1.5.1.new/man/ja/Makefile.in
+--- shadow-4.1.5.1.orig/man/ja/Makefile.in     2012-05-25 07:56:48.000000000 -0400
++++ shadow-4.1.5.1.new/man/ja/Makefile.in      2014-12-27 11:22:20.762625412 -0500
+@@ -255,7 +255,7 @@
+ top_srcdir = @top_srcdir@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
+       man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
+-      man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
++      man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
+       man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+diff -Naur shadow-4.1.5.1.orig/man/ko/Makefile.in shadow-4.1.5.1.new/man/ko/Makefile.in
+--- shadow-4.1.5.1.orig/man/ko/Makefile.in     2012-05-25 07:56:48.000000000 -0400
++++ shadow-4.1.5.1.new/man/ko/Makefile.in      2014-12-27 11:22:20.757625411 -0500
+@@ -254,7 +254,7 @@
+ man_MANS = \
+       man1/chfn.1 \
+       man1/chsh.1 \
+-      man1/groups.1 \
++      man1/ \
+       man1/login.1 \
+       man5/passwd.5 \
+       man1/su.1 \
+diff -Naur shadow-4.1.5.1.orig/man/pl/Makefile.in shadow-4.1.5.1.new/man/pl/Makefile.in
+--- shadow-4.1.5.1.orig/man/pl/Makefile.in     2012-05-25 07:56:49.000000000 -0400
++++ shadow-4.1.5.1.new/man/pl/Makefile.in      2014-12-27 11:22:20.773625413 -0500
+@@ -260,7 +260,7 @@
+ # 2012.01.28 - activate manpages with more than 50% translated messages
+ man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+       man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
+       man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+       man8/vipw.8 $(am__append_1)
+diff -Naur shadow-4.1.5.1.orig/man/ru/Makefile.in shadow-4.1.5.1.new/man/ru/Makefile.in
+--- shadow-4.1.5.1.orig/man/ru/Makefile.in     2012-05-25 07:56:49.000000000 -0400
++++ shadow-4.1.5.1.new/man/ru/Makefile.in      2014-12-27 11:22:20.755625411 -0500
+@@ -259,7 +259,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/man/sv/Makefile.in shadow-4.1.5.1.new/man/sv/Makefile.in
+--- shadow-4.1.5.1.orig/man/sv/Makefile.in     2012-05-25 07:56:50.000000000 -0400
++++ shadow-4.1.5.1.new/man/sv/Makefile.in      2014-12-27 11:22:20.779625413 -0500
+@@ -260,7 +260,7 @@
+ # 2012.01.28 - activate manpages with more than 50% translated messages
+ man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+       man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
+       man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+       man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
+diff -Naur shadow-4.1.5.1.orig/man/zh_CN/Makefile.in shadow-4.1.5.1.new/man/zh_CN/Makefile.in
+--- shadow-4.1.5.1.orig/man/zh_CN/Makefile.in  2012-05-25 07:56:50.000000000 -0400
++++ shadow-4.1.5.1.new/man/zh_CN/Makefile.in   2014-12-27 11:22:20.750625411 -0500
+@@ -259,7 +259,7 @@
+ man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+       man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+       man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+-      man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
++      man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+       man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+       man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+       man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+diff -Naur shadow-4.1.5.1.orig/src/Makefile.in shadow-4.1.5.1.new/src/Makefile.in
+--- shadow-4.1.5.1.orig/src/Makefile.in        2012-05-25 07:56:51.000000000 -0400
++++ shadow-4.1.5.1.new/src/Makefile.in 2014-12-27 11:22:12.570624788 -0500
+@@ -51,7 +51,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT)
++bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT)
+ sbin_PROGRAMS = nologin$(EXEEXT)
+ ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
+       chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \

diff --git a/stage1/pkg/shadow b/stage1/pkg/shadow
deleted file mode 100644 (file)
index 7678874..0000000
--- a/stage1/pkg/shadow
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-
-    # Disable the installation of the groups program and its man page, as
-    # Coreutils provides a better version.
-    sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-    find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;
-}
-
-hvbuild()
-{
-    ${HVMAKE}
-    ${HVMAKE} DESTDIR=${CLFS} install
-}