From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Lorenz To: development@lists.ipfire.org Subject: Re: [PATCH] util-linux: update to 2.28.2 Date: Thu, 08 Jun 2017 21:37:48 +0200 Message-ID: <2c8ee75125374299de309a1ed4469267@ipfire.org> In-Reply-To: <1496937259.21214.21.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2811488617196718403==" List-Id: --===============2811488617196718403== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, the new nologin binary com from the shadow 4.5 package. I can make a patch shadow 4.5 or or a new util-linux v2 patch. http://www.linuxfromscratch.org/blfs/view/svn/postlfs/shadow.html and http://www.linuxfromscratch.org/lfs/view/development/chapter06/util-linux.html The util-linux 2.30 version had issues with IPfire. Best worked i have=20 tested is 2.28.2 Best, Marcel Am 2017-06-08 17:54, schrieb Michael Tremer: > Hello, >=20 > this patch is not OK. >=20 > It disables /sbin/nologin which we use for quite a few system user=20 > accounts so > that they cannot log in. >=20 > -Michael >=20 > On Thu, 2017-06-08 at 08:19 +0200, Stefan Schantl wrote: >> Hello Marcel, >>=20 >> I did a review of your patch and it looks good, but sadly I'm also not >> able to do the missing rootfile for arm. >>=20 >> @Michael: Please merge this patch and could you add the missing >> rootfile. >>=20 >> Thanks in advance, >>=20 >> -Stefan >>=20 >> Reviewed-by: Stefan Schantl >>=20 >> > Signed-off-by: Marcel Lorenz >> > --- >> > =C2=A0config/rootfiles/common/i586/util-linux=C2=A0=C2=A0=C2=A0| 77 ++++= ++++++++++------- >> > ---------- >> > =C2=A0config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++-----= -- >> > ------- >> > =C2=A0lfs/util-linux=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 31 ++++++++++--- >> > =C2=A03 files changed, 95 insertions(+), 83 deletions(-) >> > >> > diff --git a/config/rootfiles/common/i586/util-linux >> > b/config/rootfiles/common/i586/util-linux >> > index 9b8d484..d445a7f 100644 >> > --- a/config/rootfiles/common/i586/util-linux >> > +++ b/config/rootfiles/common/i586/util-linux >> > @@ -8,8 +8,12 @@ bin/wdctl >> > =C2=A0#etc/fcron.daily >> > =C2=A0etc/fcron.daily/trim >> > =C2=A0lib/libblkid.so.1.1.0 >> > +lib/libfdisk.so.1 >> > +lib/libfdisk.so.1.1.0 >> > =C2=A0lib/libmount.so.1 >> > =C2=A0lib/libmount.so.1.1.0 >> > +lib/libsmartcols.so.1 >> > +lib/libsmartcols.so.1.1.0 >> > =C2=A0lib/libuuid.so.1.3.0 >> > =C2=A0sbin/agetty >> > =C2=A0sbin/blkdiscard >> > @@ -29,7 +33,6 @@ sbin/mkfs >> > =C2=A0#sbin/mkfs.cramfs >> > =C2=A0sbin/mkfs.minix >> > =C2=A0sbin/mkswap >> > -sbin/nologin >> > =C2=A0#sbin/pivot_root >> > =C2=A0sbin/raw >> > =C2=A0sbin/sfdisk >> > @@ -38,13 +41,13 @@ sbin/swapoff >> > =C2=A0sbin/swapon >> > =C2=A0sbin/switch_root >> > =C2=A0sbin/wipefs >> > +sbin/zramctl >> > =C2=A0#usr/bin/cal >> > =C2=A0#usr/bin/chrt >> > =C2=A0#usr/bin/col >> > =C2=A0#usr/bin/colcrt >> > =C2=A0#usr/bin/colrm >> > =C2=A0#usr/bin/column >> > -#usr/bin/cytune >> > =C2=A0usr/bin/eject >> > =C2=A0usr/bin/fallocate >> > =C2=A0usr/bin/flock >> > @@ -61,7 +64,10 @@ usr/bin/ionice >> > =C2=A0usr/bin/logger >> > =C2=A0#usr/bin/look >> > =C2=A0usr/bin/lscpu >> > +usr/bin/lsipc >> > =C2=A0usr/bin/lslocks >> > +usr/bin/lslogins >> > +usr/bin/lsns >> > =C2=A0#usr/bin/mcookie >> > =C2=A0#usr/bin/namei >> > =C2=A0#usr/bin/nsenter >> > @@ -78,16 +84,26 @@ usr/bin/setsid >> > =C2=A0usr/bin/tailf >> > =C2=A0#usr/bin/taskset >> > =C2=A0#usr/bin/ul >> > +#usr/bin/uname26 >> > =C2=A0#usr/bin/unshare >> > =C2=A0#usr/bin/whereis >> > +#usr/include/libfdisk >> > +#usr/include/libfdisk/libfdisk.h >> > =C2=A0#usr/include/libmount >> > =C2=A0#usr/include/libmount/libmount.h >> > +#usr/include/libsmartcols >> > +#usr/include/libsmartcols/libsmartcols.h >> > =C2=A0#usr/lib/libblkid.la >> > -#usr/lib/libmount.a >> > +#usr/lib/libfdisk.la >> > +#usr/lib/libfdisk.so >> > =C2=A0#usr/lib/libmount.la >> > =C2=A0#usr/lib/libmount.so >> > +#usr/lib/libsmartcols.la >> > +#usr/lib/libsmartcols.so >> > =C2=A0#usr/lib/libuuid.la >> > +#usr/lib/pkgconfig/fdisk.pc >> > =C2=A0#usr/lib/pkgconfig/mount.pc >> > +#usr/lib/pkgconfig/smartcols.pc >> > =C2=A0usr/sbin/addpart >> > =C2=A0usr/sbin/delpart >> > =C2=A0usr/sbin/fdformat >> > @@ -96,8 +112,6 @@ usr/sbin/partx >> > =C2=A0#usr/sbin/readprofile >> > =C2=A0usr/sbin/resizepart >> > =C2=A0usr/sbin/rtcwake >> > -usr/share/bash-completion >> > -#usr/share/bash-completion/completions >> > =C2=A0#usr/share/bash-completion/completions/addpart >> > =C2=A0#usr/share/bash-completion/completions/blkdiscard >> > =C2=A0#usr/share/bash-completion/completions/blkid >> > @@ -111,7 +125,6 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/colrm >> > =C2=A0#usr/share/bash-completion/completions/column >> > =C2=A0#usr/share/bash-completion/completions/ctrlaltdel >> > -#usr/share/bash-completion/completions/cytune >> > =C2=A0#usr/share/bash-completion/completions/delpart >> > =C2=A0#usr/share/bash-completion/completions/dmesg >> > =C2=A0#usr/share/bash-completion/completions/eject >> > @@ -129,16 +142,21 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/hexdump >> > =C2=A0#usr/share/bash-completion/completions/hwclock >> > =C2=A0#usr/share/bash-completion/completions/ionice >> > +#usr/share/bash-completion/completions/ipcmk >> > =C2=A0#usr/share/bash-completion/completions/ipcrm >> > =C2=A0#usr/share/bash-completion/completions/ipcs >> > =C2=A0#usr/share/bash-completion/completions/isosize >> > +#usr/share/bash-completion/completions/last >> > =C2=A0#usr/share/bash-completion/completions/ldattach >> > =C2=A0#usr/share/bash-completion/completions/logger >> > =C2=A0#usr/share/bash-completion/completions/look >> > =C2=A0#usr/share/bash-completion/completions/losetup >> > =C2=A0#usr/share/bash-completion/completions/lsblk >> > =C2=A0#usr/share/bash-completion/completions/lscpu >> > +#usr/share/bash-completion/completions/lsipc >> > =C2=A0#usr/share/bash-completion/completions/lslocks >> > +#usr/share/bash-completion/completions/lslogins >> > +#usr/share/bash-completion/completions/lsns >> > =C2=A0#usr/share/bash-completion/completions/mcookie >> > =C2=A0#usr/share/bash-completion/completions/mesg >> > =C2=A0#usr/share/bash-completion/completions/mkfs >> > @@ -147,6 +165,7 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/mkfs.minix >> > =C2=A0#usr/share/bash-completion/completions/mkswap >> > =C2=A0#usr/share/bash-completion/completions/more >> > +#usr/share/bash-completion/completions/mount >> > =C2=A0#usr/share/bash-completion/completions/mountpoint >> > =C2=A0#usr/share/bash-completion/completions/namei >> > =C2=A0#usr/share/bash-completion/completions/nsenter >> > @@ -168,10 +187,12 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/setterm >> > =C2=A0#usr/share/bash-completion/completions/sfdisk >> > =C2=A0#usr/share/bash-completion/completions/swaplabel >> > +#usr/share/bash-completion/completions/swapoff >> > =C2=A0#usr/share/bash-completion/completions/swapon >> > =C2=A0#usr/share/bash-completion/completions/tailf >> > =C2=A0#usr/share/bash-completion/completions/taskset >> > =C2=A0#usr/share/bash-completion/completions/ul >> > +#usr/share/bash-completion/completions/umount >> > =C2=A0#usr/share/bash-completion/completions/unshare >> > =C2=A0#usr/share/bash-completion/completions/utmpdump >> > =C2=A0#usr/share/bash-completion/completions/uuidd >> > @@ -180,44 +201,11 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/wdctl >> > =C2=A0#usr/share/bash-completion/completions/whereis >> > =C2=A0#usr/share/bash-completion/completions/wipefs >> > +#usr/share/bash-completion/completions/zramctl >> > =C2=A0#usr/share/doc/util-linux >> > =C2=A0#usr/share/doc/util-linux/getopt >> > =C2=A0#usr/share/doc/util-linux/getopt/getopt-parse.bash >> > =C2=A0#usr/share/doc/util-linux/getopt/getopt-parse.tcsh >> > -#usr/share/locale/ca/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/cs/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/da/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/de/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/es/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/et >> > -#usr/share/locale/et/LC_MESSAGES >> > -#usr/share/locale/et/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/eu >> > -#usr/share/locale/eu/LC_MESSAGES >> > -#usr/share/locale/eu/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/fi/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/fr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/gl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/hr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/hu/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/id/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/it/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/ja/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/nl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/pl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/ru/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/sl >> > -#usr/share/locale/sl/LC_MESSAGES >> > -#usr/share/locale/sl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/sv/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/tr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/uk >> > -#usr/share/locale/uk/LC_MESSAGES >> > -#usr/share/locale/uk/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/vi/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo >> > =C2=A0#usr/share/man/man1/cal.1 >> > =C2=A0#usr/share/man/man1/chrt.1 >> > =C2=A0#usr/share/man/man1/col.1 >> > @@ -237,6 +225,8 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man1/logger.1 >> > =C2=A0#usr/share/man/man1/look.1 >> > =C2=A0#usr/share/man/man1/lscpu.1 >> > +#usr/share/man/man1/lsipc.1 >> > +#usr/share/man/man1/lslogins.1 >> > =C2=A0#usr/share/man/man1/mcookie.1 >> > =C2=A0#usr/share/man/man1/more.1 >> > =C2=A0#usr/share/man/man1/namei.1 >> > @@ -257,6 +247,7 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man1/whereis.1 >> > =C2=A0#usr/share/man/man3/uuid_generate_time_safe.3 >> > =C2=A0#usr/share/man/man5/fstab.5 >> > +#usr/share/man/man5/terminal-colors.d.5 >> > =C2=A0#usr/share/man/man8/addpart.8 >> > =C2=A0#usr/share/man/man8/agetty.8 >> > =C2=A0#usr/share/man/man8/blkdiscard.8 >> > @@ -264,7 +255,6 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/cfdisk.8 >> > =C2=A0#usr/share/man/man8/chcpu.8 >> > =C2=A0#usr/share/man/man8/ctrlaltdel.8 >> > -#usr/share/man/man8/cytune.8 >> > =C2=A0#usr/share/man/man8/delpart.8 >> > =C2=A0#usr/share/man/man8/fdformat.8 >> > =C2=A0#usr/share/man/man8/fdisk.8 >> > @@ -282,13 +272,13 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/losetup.8 >> > =C2=A0#usr/share/man/man8/lsblk.8 >> > =C2=A0#usr/share/man/man8/lslocks.8 >> > +#usr/share/man/man8/lsns.8 >> > =C2=A0#usr/share/man/man8/mkfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.bfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.cramfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.minix.8 >> > =C2=A0#usr/share/man/man8/mkswap.8 >> > =C2=A0#usr/share/man/man8/mount.8 >> > -#usr/share/man/man8/nologin.8 >> > =C2=A0#usr/share/man/man8/partx.8 >> > =C2=A0#usr/share/man/man8/pivot_root.8 >> > =C2=A0#usr/share/man/man8/raw.8 >> > @@ -302,5 +292,8 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/swapon.8 >> > =C2=A0#usr/share/man/man8/switch_root.8 >> > =C2=A0#usr/share/man/man8/umount.8 >> > +#usr/share/man/man8/uname26.8 >> > =C2=A0#usr/share/man/man8/wdctl.8 >> > =C2=A0#usr/share/man/man8/wipefs.8 >> > +#usr/share/man/man8/x86_64.8 >> > +#usr/share/man/man8/zramctl.8 >> > diff --git a/config/rootfiles/common/x86_64/util-linux >> > b/config/rootfiles/common/x86_64/util-linux >> > index 28a5699..039f871 100644 >> > --- a/config/rootfiles/common/x86_64/util-linux >> > +++ b/config/rootfiles/common/x86_64/util-linux >> > @@ -8,8 +8,12 @@ bin/wdctl >> > =C2=A0#etc/fcron.daily >> > =C2=A0etc/fcron.daily/trim >> > =C2=A0lib/libblkid.so.1.1.0 >> > +lib/libfdisk.so.1 >> > +lib/libfdisk.so.1.1.0 >> > =C2=A0lib/libmount.so.1 >> > =C2=A0lib/libmount.so.1.1.0 >> > +lib/libsmartcols.so.1 >> > +lib/libsmartcols.so.1.1.0 >> > =C2=A0lib/libuuid.so.1.3.0 >> > =C2=A0sbin/agetty >> > =C2=A0sbin/blkdiscard >> > @@ -29,7 +33,6 @@ sbin/mkfs >> > =C2=A0#sbin/mkfs.cramfs >> > =C2=A0sbin/mkfs.minix >> > =C2=A0sbin/mkswap >> > -sbin/nologin >> > =C2=A0#sbin/pivot_root >> > =C2=A0sbin/raw >> > =C2=A0sbin/sfdisk >> > @@ -38,13 +41,13 @@ sbin/swapoff >> > =C2=A0sbin/swapon >> > =C2=A0sbin/switch_root >> > =C2=A0sbin/wipefs >> > +sbin/zramctl >> > =C2=A0#usr/bin/cal >> > =C2=A0#usr/bin/chrt >> > =C2=A0#usr/bin/col >> > =C2=A0#usr/bin/colcrt >> > =C2=A0#usr/bin/colrm >> > =C2=A0#usr/bin/column >> > -#usr/bin/cytune >> > =C2=A0usr/bin/eject >> > =C2=A0usr/bin/fallocate >> > =C2=A0usr/bin/flock >> > @@ -61,7 +64,10 @@ usr/bin/ionice >> > =C2=A0usr/bin/logger >> > =C2=A0#usr/bin/look >> > =C2=A0usr/bin/lscpu >> > +usr/bin/lsipc >> > =C2=A0usr/bin/lslocks >> > +usr/bin/lslogins >> > +usr/bin/lsns >> > =C2=A0#usr/bin/mcookie >> > =C2=A0#usr/bin/namei >> > =C2=A0#usr/bin/nsenter >> > @@ -78,17 +84,27 @@ usr/bin/setsid >> > =C2=A0usr/bin/tailf >> > =C2=A0#usr/bin/taskset >> > =C2=A0#usr/bin/ul >> > +#usr/bin/uname26 >> > =C2=A0#usr/bin/unshare >> > =C2=A0#usr/bin/whereis >> > -#usr/bin/x86_64 >> > +usr/bin/x86_64 >> > +#usr/include/libfdisk >> > +#usr/include/libfdisk/libfdisk.h >> > =C2=A0#usr/include/libmount >> > =C2=A0#usr/include/libmount/libmount.h >> > +#usr/include/libsmartcols >> > +#usr/include/libsmartcols/libsmartcols.h >> > =C2=A0#usr/lib/libblkid.la >> > -#usr/lib/libmount.a >> > +#usr/lib/libfdisk.la >> > +#usr/lib/libfdisk.so >> > =C2=A0#usr/lib/libmount.la >> > =C2=A0#usr/lib/libmount.so >> > +#usr/lib/libsmartcols.la >> > +#usr/lib/libsmartcols.so >> > =C2=A0#usr/lib/libuuid.la >> > +#usr/lib/pkgconfig/fdisk.pc >> > =C2=A0#usr/lib/pkgconfig/mount.pc >> > +#usr/lib/pkgconfig/smartcols.pc >> > =C2=A0usr/sbin/addpart >> > =C2=A0usr/sbin/delpart >> > =C2=A0usr/sbin/fdformat >> > @@ -97,8 +113,6 @@ usr/sbin/partx >> > =C2=A0#usr/sbin/readprofile >> > =C2=A0usr/sbin/resizepart >> > =C2=A0usr/sbin/rtcwake >> > -usr/share/bash-completion >> > -#usr/share/bash-completion/completions >> > =C2=A0#usr/share/bash-completion/completions/addpart >> > =C2=A0#usr/share/bash-completion/completions/blkdiscard >> > =C2=A0#usr/share/bash-completion/completions/blkid >> > @@ -112,7 +126,6 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/colrm >> > =C2=A0#usr/share/bash-completion/completions/column >> > =C2=A0#usr/share/bash-completion/completions/ctrlaltdel >> > -#usr/share/bash-completion/completions/cytune >> > =C2=A0#usr/share/bash-completion/completions/delpart >> > =C2=A0#usr/share/bash-completion/completions/dmesg >> > =C2=A0#usr/share/bash-completion/completions/eject >> > @@ -130,16 +143,21 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/hexdump >> > =C2=A0#usr/share/bash-completion/completions/hwclock >> > =C2=A0#usr/share/bash-completion/completions/ionice >> > +#usr/share/bash-completion/completions/ipcmk >> > =C2=A0#usr/share/bash-completion/completions/ipcrm >> > =C2=A0#usr/share/bash-completion/completions/ipcs >> > =C2=A0#usr/share/bash-completion/completions/isosize >> > +#usr/share/bash-completion/completions/last >> > =C2=A0#usr/share/bash-completion/completions/ldattach >> > =C2=A0#usr/share/bash-completion/completions/logger >> > =C2=A0#usr/share/bash-completion/completions/look >> > =C2=A0#usr/share/bash-completion/completions/losetup >> > =C2=A0#usr/share/bash-completion/completions/lsblk >> > =C2=A0#usr/share/bash-completion/completions/lscpu >> > +#usr/share/bash-completion/completions/lsipc >> > =C2=A0#usr/share/bash-completion/completions/lslocks >> > +#usr/share/bash-completion/completions/lslogins >> > +#usr/share/bash-completion/completions/lsns >> > =C2=A0#usr/share/bash-completion/completions/mcookie >> > =C2=A0#usr/share/bash-completion/completions/mesg >> > =C2=A0#usr/share/bash-completion/completions/mkfs >> > @@ -148,6 +166,7 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/mkfs.minix >> > =C2=A0#usr/share/bash-completion/completions/mkswap >> > =C2=A0#usr/share/bash-completion/completions/more >> > +#usr/share/bash-completion/completions/mount >> > =C2=A0#usr/share/bash-completion/completions/mountpoint >> > =C2=A0#usr/share/bash-completion/completions/namei >> > =C2=A0#usr/share/bash-completion/completions/nsenter >> > @@ -169,10 +188,12 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/setterm >> > =C2=A0#usr/share/bash-completion/completions/sfdisk >> > =C2=A0#usr/share/bash-completion/completions/swaplabel >> > +#usr/share/bash-completion/completions/swapoff >> > =C2=A0#usr/share/bash-completion/completions/swapon >> > =C2=A0#usr/share/bash-completion/completions/tailf >> > =C2=A0#usr/share/bash-completion/completions/taskset >> > =C2=A0#usr/share/bash-completion/completions/ul >> > +#usr/share/bash-completion/completions/umount >> > =C2=A0#usr/share/bash-completion/completions/unshare >> > =C2=A0#usr/share/bash-completion/completions/utmpdump >> > =C2=A0#usr/share/bash-completion/completions/uuidd >> > @@ -181,36 +202,11 @@ usr/share/bash-completion >> > =C2=A0#usr/share/bash-completion/completions/wdctl >> > =C2=A0#usr/share/bash-completion/completions/whereis >> > =C2=A0#usr/share/bash-completion/completions/wipefs >> > +#usr/share/bash-completion/completions/zramctl >> > =C2=A0#usr/share/doc/util-linux >> > =C2=A0#usr/share/doc/util-linux/getopt >> > =C2=A0#usr/share/doc/util-linux/getopt/getopt-parse.bash >> > =C2=A0#usr/share/doc/util-linux/getopt/getopt-parse.tcsh >> > -#usr/share/locale/ca/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/cs/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/da/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/de/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/es/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/et/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/eu/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/fi/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/fr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/gl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/hr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/hu/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/id/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/it/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/ja/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/nl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/pl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/ru/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/sl/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/sv/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/tr/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/uk/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/vi/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo >> > -#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo >> > =C2=A0#usr/share/man/man1/cal.1 >> > =C2=A0#usr/share/man/man1/chrt.1 >> > =C2=A0#usr/share/man/man1/col.1 >> > @@ -230,6 +226,8 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man1/logger.1 >> > =C2=A0#usr/share/man/man1/look.1 >> > =C2=A0#usr/share/man/man1/lscpu.1 >> > +#usr/share/man/man1/lsipc.1 >> > +#usr/share/man/man1/lslogins.1 >> > =C2=A0#usr/share/man/man1/mcookie.1 >> > =C2=A0#usr/share/man/man1/more.1 >> > =C2=A0#usr/share/man/man1/namei.1 >> > @@ -250,6 +248,7 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man1/whereis.1 >> > =C2=A0#usr/share/man/man3/uuid_generate_time_safe.3 >> > =C2=A0#usr/share/man/man5/fstab.5 >> > +#usr/share/man/man5/terminal-colors.d.5 >> > =C2=A0#usr/share/man/man8/addpart.8 >> > =C2=A0#usr/share/man/man8/agetty.8 >> > =C2=A0#usr/share/man/man8/blkdiscard.8 >> > @@ -257,7 +256,6 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/cfdisk.8 >> > =C2=A0#usr/share/man/man8/chcpu.8 >> > =C2=A0#usr/share/man/man8/ctrlaltdel.8 >> > -#usr/share/man/man8/cytune.8 >> > =C2=A0#usr/share/man/man8/delpart.8 >> > =C2=A0#usr/share/man/man8/fdformat.8 >> > =C2=A0#usr/share/man/man8/fdisk.8 >> > @@ -275,13 +273,13 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/losetup.8 >> > =C2=A0#usr/share/man/man8/lsblk.8 >> > =C2=A0#usr/share/man/man8/lslocks.8 >> > +#usr/share/man/man8/lsns.8 >> > =C2=A0#usr/share/man/man8/mkfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.bfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.cramfs.8 >> > =C2=A0#usr/share/man/man8/mkfs.minix.8 >> > =C2=A0#usr/share/man/man8/mkswap.8 >> > =C2=A0#usr/share/man/man8/mount.8 >> > -#usr/share/man/man8/nologin.8 >> > =C2=A0#usr/share/man/man8/partx.8 >> > =C2=A0#usr/share/man/man8/pivot_root.8 >> > =C2=A0#usr/share/man/man8/raw.8 >> > @@ -295,6 +293,8 @@ usr/share/bash-completion >> > =C2=A0#usr/share/man/man8/swapon.8 >> > =C2=A0#usr/share/man/man8/switch_root.8 >> > =C2=A0#usr/share/man/man8/umount.8 >> > +#usr/share/man/man8/uname26.8 >> > =C2=A0#usr/share/man/man8/wdctl.8 >> > =C2=A0#usr/share/man/man8/wipefs.8 >> > =C2=A0#usr/share/man/man8/x86_64.8 >> > +#usr/share/man/man8/zramctl.8 >> > diff --git a/lfs/util-linux b/lfs/util-linux >> > index 7f69e67..5321c33 100644 >> > --- a/lfs/util-linux >> > +++ b/lfs/util-linux >> > @@ -1,7 +1,7 @@ >> > =C2=A0##################################################################= ## >> > ########### >> > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > =C2=A0# IPFire.org - A linux based >> > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > -# Copyright (C) 2007-2013=C2=A0=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > +# Copyright (C) 2007-2017=C2=A0=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > =C2=A0# This program is free software: you can redistribute it and/or >> > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > =C2=A0# it under the terms of the GNU General Public License as published >> > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> > @@ -24,13 +24,15 @@ >> > =C2=A0 >> > =C2=A0include Config >> > =C2=A0 >> > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.24 >> > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.28.2 >> > =C2=A0 >> > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D util-linux-$(VER) >> > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz >> > =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) >> > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) >> > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) >> > +PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D util-linux >> > + >> > =C2=A0 >> > =C2=A0##################################################################= ## >> > ########### >> > =C2=A0# Top-level Rules >> > @@ -40,7 +42,7 @@ objects =3D $(DL_FILE) >> > =C2=A0 >> > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> > =C2=A0 >> > -$(DL_FILE)_MD5 =3D 4fac6443427f575fc5f3531a4ad2ca01 >> > +$(DL_FILE)_MD5 =3D 46a232a37bce45371a86d19300edc47a >> > =C2=A0 >> > =C2=A0install : $(TARGET) >> > =C2=A0 >> > @@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> > =C2=A0 >> > =C2=A0md5 : $(subst %,%_MD5,$(objects)) >> > =C2=A0 >> > +dist:=C2=A0 >> > + @$(PAK) >> > + >> > =C2=A0##################################################################= ## >> > ########### >> > =C2=A0# Downloading, checking, md5sum >> > =C2=A0##################################################################= ## >> > ########### >> > @@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) : >> > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> > =C2=A0 @$(PREBUILD) >> > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf >> > $(DIR_DL)/$(DL_FILE) >> > - cd $(DIR_APP) && ./configure >> > - cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=3Dyes >> > HAVE_SLN=3Dyes >> > - cd $(DIR_APP) && make HAVE_KILL=3Dyes HAVE_SLN=3Dyes install >> > + cd $(DIR_APP) && ./configure \ >> > + --docdir=3D/usr/share/doc/util-linux \ >> > + --disable-static \ >> > + --disable-nls \ >> > + --disable-static \ >> > + --disable-chfn-chsh \ >> > + --disable-nologin \ >> > + --disable-su \ >> > + --disable-setpriv \ >> > + --disable-pylibmount \ >> > + --disable-runuser \ >> > + --enable-pg \ >> > + --without-python \ >> > + --without-systemd \ >> > + --without-systemdsystemunitdir >> > + cd $(DIR_APP) && make $(MAKETUNING) >> > + cd $(DIR_APP) && make install >> > =C2=A0 # Install fstrim cronjob >> > =C2=A0 mkdir -p /etc/fcron.daily >> > =C2=A0 install -m 0755 $(DIR_SRC)/config/fstrim/trim >> > /etc/fcron.daily/trim --===============2811488617196718403==--