* [PATCH] util-linux update to 2.28.2
@ 2017-06-06 8:38 Marcel Lorenz
2017-06-06 8:38 ` [PATCH] util-linux: " Marcel Lorenz
0 siblings, 1 reply; 7+ messages in thread
From: Marcel Lorenz @ 2017-06-06 8:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 109 bytes --]
Hi,
please anyone update the arm rootfile.
I can't build and test for arm devices.
Best,
Marcel
--
2.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] util-linux: update to 2.28.2
2017-06-06 8:38 [PATCH] util-linux update to 2.28.2 Marcel Lorenz
@ 2017-06-06 8:38 ` Marcel Lorenz
2017-06-08 6:19 ` Stefan Schantl
0 siblings, 1 reply; 7+ messages in thread
From: Marcel Lorenz @ 2017-06-06 8:38 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 19324 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/i586/util-linux | 77 ++++++++++++++-----------------
config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++--------------
lfs/util-linux | 31 ++++++++++---
3 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
#etc/fcron.daily
etc/fcron.daily/trim
lib/libblkid.so.1.1.0
+lib/libfdisk.so.1
+lib/libfdisk.so.1.1.0
lib/libmount.so.1
lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
@@ -29,7 +33,6 @@ sbin/mkfs
#sbin/mkfs.cramfs
sbin/mkfs.minix
sbin/mkswap
-sbin/nologin
#sbin/pivot_root
sbin/raw
sbin/sfdisk
@@ -38,13 +41,13 @@ sbin/swapoff
sbin/swapon
sbin/switch_root
sbin/wipefs
+sbin/zramctl
#usr/bin/cal
#usr/bin/chrt
#usr/bin/col
#usr/bin/colcrt
#usr/bin/colrm
#usr/bin/column
-#usr/bin/cytune
usr/bin/eject
usr/bin/fallocate
usr/bin/flock
@@ -61,7 +64,10 @@ usr/bin/ionice
usr/bin/logger
#usr/bin/look
usr/bin/lscpu
+usr/bin/lsipc
usr/bin/lslocks
+usr/bin/lslogins
+usr/bin/lsns
#usr/bin/mcookie
#usr/bin/namei
#usr/bin/nsenter
@@ -78,16 +84,26 @@ usr/bin/setsid
usr/bin/tailf
#usr/bin/taskset
#usr/bin/ul
+#usr/bin/uname26
#usr/bin/unshare
#usr/bin/whereis
+#usr/include/libfdisk
+#usr/include/libfdisk/libfdisk.h
#usr/include/libmount
#usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
#usr/lib/libblkid.la
-#usr/lib/libmount.a
+#usr/lib/libfdisk.la
+#usr/lib/libfdisk.so
#usr/lib/libmount.la
#usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -96,8 +112,6 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
-usr/share/bash-completion
-#usr/share/bash-completion/completions
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -111,7 +125,6 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/colrm
#usr/share/bash-completion/completions/column
#usr/share/bash-completion/completions/ctrlaltdel
-#usr/share/bash-completion/completions/cytune
#usr/share/bash-completion/completions/delpart
#usr/share/bash-completion/completions/dmesg
#usr/share/bash-completion/completions/eject
@@ -129,16 +142,21 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/hexdump
#usr/share/bash-completion/completions/hwclock
#usr/share/bash-completion/completions/ionice
+#usr/share/bash-completion/completions/ipcmk
#usr/share/bash-completion/completions/ipcrm
#usr/share/bash-completion/completions/ipcs
#usr/share/bash-completion/completions/isosize
+#usr/share/bash-completion/completions/last
#usr/share/bash-completion/completions/ldattach
#usr/share/bash-completion/completions/logger
#usr/share/bash-completion/completions/look
#usr/share/bash-completion/completions/losetup
#usr/share/bash-completion/completions/lsblk
#usr/share/bash-completion/completions/lscpu
+#usr/share/bash-completion/completions/lsipc
#usr/share/bash-completion/completions/lslocks
+#usr/share/bash-completion/completions/lslogins
+#usr/share/bash-completion/completions/lsns
#usr/share/bash-completion/completions/mcookie
#usr/share/bash-completion/completions/mesg
#usr/share/bash-completion/completions/mkfs
@@ -147,6 +165,7 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/mkfs.minix
#usr/share/bash-completion/completions/mkswap
#usr/share/bash-completion/completions/more
+#usr/share/bash-completion/completions/mount
#usr/share/bash-completion/completions/mountpoint
#usr/share/bash-completion/completions/namei
#usr/share/bash-completion/completions/nsenter
@@ -168,10 +187,12 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/setterm
#usr/share/bash-completion/completions/sfdisk
#usr/share/bash-completion/completions/swaplabel
+#usr/share/bash-completion/completions/swapoff
#usr/share/bash-completion/completions/swapon
#usr/share/bash-completion/completions/tailf
#usr/share/bash-completion/completions/taskset
#usr/share/bash-completion/completions/ul
+#usr/share/bash-completion/completions/umount
#usr/share/bash-completion/completions/unshare
#usr/share/bash-completion/completions/utmpdump
#usr/share/bash-completion/completions/uuidd
@@ -180,44 +201,11 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/wdctl
#usr/share/bash-completion/completions/whereis
#usr/share/bash-completion/completions/wipefs
+#usr/share/bash-completion/completions/zramctl
#usr/share/doc/util-linux
#usr/share/doc/util-linux/getopt
#usr/share/doc/util-linux/getopt/getopt-parse.bash
#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
#usr/share/man/man1/cal.1
#usr/share/man/man1/chrt.1
#usr/share/man/man1/col.1
@@ -237,6 +225,8 @@ usr/share/bash-completion
#usr/share/man/man1/logger.1
#usr/share/man/man1/look.1
#usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lsipc.1
+#usr/share/man/man1/lslogins.1
#usr/share/man/man1/mcookie.1
#usr/share/man/man1/more.1
#usr/share/man/man1/namei.1
@@ -257,6 +247,7 @@ usr/share/bash-completion
#usr/share/man/man1/whereis.1
#usr/share/man/man3/uuid_generate_time_safe.3
#usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
@@ -264,7 +255,6 @@ usr/share/bash-completion
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
#usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
@@ -282,13 +272,13 @@ usr/share/bash-completion
#usr/share/man/man8/losetup.8
#usr/share/man/man8/lsblk.8
#usr/share/man/man8/lslocks.8
+#usr/share/man/man8/lsns.8
#usr/share/man/man8/mkfs.8
#usr/share/man/man8/mkfs.bfs.8
#usr/share/man/man8/mkfs.cramfs.8
#usr/share/man/man8/mkfs.minix.8
#usr/share/man/man8/mkswap.8
#usr/share/man/man8/mount.8
-#usr/share/man/man8/nologin.8
#usr/share/man/man8/partx.8
#usr/share/man/man8/pivot_root.8
#usr/share/man/man8/raw.8
@@ -302,5 +292,8 @@ usr/share/bash-completion
#usr/share/man/man8/swapon.8
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
#usr/share/man/man8/wdctl.8
#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
#etc/fcron.daily
etc/fcron.daily/trim
lib/libblkid.so.1.1.0
+lib/libfdisk.so.1
+lib/libfdisk.so.1.1.0
lib/libmount.so.1
lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
@@ -29,7 +33,6 @@ sbin/mkfs
#sbin/mkfs.cramfs
sbin/mkfs.minix
sbin/mkswap
-sbin/nologin
#sbin/pivot_root
sbin/raw
sbin/sfdisk
@@ -38,13 +41,13 @@ sbin/swapoff
sbin/swapon
sbin/switch_root
sbin/wipefs
+sbin/zramctl
#usr/bin/cal
#usr/bin/chrt
#usr/bin/col
#usr/bin/colcrt
#usr/bin/colrm
#usr/bin/column
-#usr/bin/cytune
usr/bin/eject
usr/bin/fallocate
usr/bin/flock
@@ -61,7 +64,10 @@ usr/bin/ionice
usr/bin/logger
#usr/bin/look
usr/bin/lscpu
+usr/bin/lsipc
usr/bin/lslocks
+usr/bin/lslogins
+usr/bin/lsns
#usr/bin/mcookie
#usr/bin/namei
#usr/bin/nsenter
@@ -78,17 +84,27 @@ usr/bin/setsid
usr/bin/tailf
#usr/bin/taskset
#usr/bin/ul
+#usr/bin/uname26
#usr/bin/unshare
#usr/bin/whereis
-#usr/bin/x86_64
+usr/bin/x86_64
+#usr/include/libfdisk
+#usr/include/libfdisk/libfdisk.h
#usr/include/libmount
#usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
#usr/lib/libblkid.la
-#usr/lib/libmount.a
+#usr/lib/libfdisk.la
+#usr/lib/libfdisk.so
#usr/lib/libmount.la
#usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -97,8 +113,6 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
-usr/share/bash-completion
-#usr/share/bash-completion/completions
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -112,7 +126,6 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/colrm
#usr/share/bash-completion/completions/column
#usr/share/bash-completion/completions/ctrlaltdel
-#usr/share/bash-completion/completions/cytune
#usr/share/bash-completion/completions/delpart
#usr/share/bash-completion/completions/dmesg
#usr/share/bash-completion/completions/eject
@@ -130,16 +143,21 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/hexdump
#usr/share/bash-completion/completions/hwclock
#usr/share/bash-completion/completions/ionice
+#usr/share/bash-completion/completions/ipcmk
#usr/share/bash-completion/completions/ipcrm
#usr/share/bash-completion/completions/ipcs
#usr/share/bash-completion/completions/isosize
+#usr/share/bash-completion/completions/last
#usr/share/bash-completion/completions/ldattach
#usr/share/bash-completion/completions/logger
#usr/share/bash-completion/completions/look
#usr/share/bash-completion/completions/losetup
#usr/share/bash-completion/completions/lsblk
#usr/share/bash-completion/completions/lscpu
+#usr/share/bash-completion/completions/lsipc
#usr/share/bash-completion/completions/lslocks
+#usr/share/bash-completion/completions/lslogins
+#usr/share/bash-completion/completions/lsns
#usr/share/bash-completion/completions/mcookie
#usr/share/bash-completion/completions/mesg
#usr/share/bash-completion/completions/mkfs
@@ -148,6 +166,7 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/mkfs.minix
#usr/share/bash-completion/completions/mkswap
#usr/share/bash-completion/completions/more
+#usr/share/bash-completion/completions/mount
#usr/share/bash-completion/completions/mountpoint
#usr/share/bash-completion/completions/namei
#usr/share/bash-completion/completions/nsenter
@@ -169,10 +188,12 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/setterm
#usr/share/bash-completion/completions/sfdisk
#usr/share/bash-completion/completions/swaplabel
+#usr/share/bash-completion/completions/swapoff
#usr/share/bash-completion/completions/swapon
#usr/share/bash-completion/completions/tailf
#usr/share/bash-completion/completions/taskset
#usr/share/bash-completion/completions/ul
+#usr/share/bash-completion/completions/umount
#usr/share/bash-completion/completions/unshare
#usr/share/bash-completion/completions/utmpdump
#usr/share/bash-completion/completions/uuidd
@@ -181,36 +202,11 @@ usr/share/bash-completion
#usr/share/bash-completion/completions/wdctl
#usr/share/bash-completion/completions/whereis
#usr/share/bash-completion/completions/wipefs
+#usr/share/bash-completion/completions/zramctl
#usr/share/doc/util-linux
#usr/share/doc/util-linux/getopt
#usr/share/doc/util-linux/getopt/getopt-parse.bash
#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
#usr/share/man/man1/cal.1
#usr/share/man/man1/chrt.1
#usr/share/man/man1/col.1
@@ -230,6 +226,8 @@ usr/share/bash-completion
#usr/share/man/man1/logger.1
#usr/share/man/man1/look.1
#usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lsipc.1
+#usr/share/man/man1/lslogins.1
#usr/share/man/man1/mcookie.1
#usr/share/man/man1/more.1
#usr/share/man/man1/namei.1
@@ -250,6 +248,7 @@ usr/share/bash-completion
#usr/share/man/man1/whereis.1
#usr/share/man/man3/uuid_generate_time_safe.3
#usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
@@ -257,7 +256,6 @@ usr/share/bash-completion
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
#usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
@@ -275,13 +273,13 @@ usr/share/bash-completion
#usr/share/man/man8/losetup.8
#usr/share/man/man8/lsblk.8
#usr/share/man/man8/lslocks.8
+#usr/share/man/man8/lsns.8
#usr/share/man/man8/mkfs.8
#usr/share/man/man8/mkfs.bfs.8
#usr/share/man/man8/mkfs.cramfs.8
#usr/share/man/man8/mkfs.minix.8
#usr/share/man/man8/mkswap.8
#usr/share/man/man8/mount.8
-#usr/share/man/man8/nologin.8
#usr/share/man/man8/partx.8
#usr/share/man/man8/pivot_root.8
#usr/share/man/man8/raw.8
@@ -295,6 +293,8 @@ usr/share/bash-completion
#usr/share/man/man8/swapon.8
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
#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 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,13 +24,15 @@
include Config
-VER = 2.24
+VER = 2.28.2
THISAPP = util-linux-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = util-linux
+
###############################################################################
# Top-level Rules
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
+$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
install : $(TARGET)
@@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
+dist:
+ @$(PAK)
+
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure
- cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes HAVE_SLN=yes
- cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
+ cd $(DIR_APP) && ./configure \
+ --docdir=/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
# Install fstrim cronjob
mkdir -p /etc/fcron.daily
install -m 0755 $(DIR_SRC)/config/fstrim/trim /etc/fcron.daily/trim
--
2.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] util-linux: update to 2.28.2
2017-06-06 8:38 ` [PATCH] util-linux: " Marcel Lorenz
@ 2017-06-08 6:19 ` Stefan Schantl
2017-06-08 15:54 ` Michael Tremer
0 siblings, 1 reply; 7+ messages in thread
From: Stefan Schantl @ 2017-06-08 6:19 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 21421 bytes --]
Hello Marcel,
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.
@Michael: Please merge this patch and could you add the missing
rootfile.
Thanks in advance,
-Stefan
Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> config/rootfiles/common/i586/util-linux | 77 ++++++++++++++-------
> ----------
> config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++-------
> -------
> lfs/util-linux | 31 ++++++++++---
> 3 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
> #etc/fcron.daily
> etc/fcron.daily/trim
> lib/libblkid.so.1.1.0
> +lib/libfdisk.so.1
> +lib/libfdisk.so.1.1.0
> lib/libmount.so.1
> lib/libmount.so.1.1.0
> +lib/libsmartcols.so.1
> +lib/libsmartcols.so.1.1.0
> lib/libuuid.so.1.3.0
> sbin/agetty
> sbin/blkdiscard
> @@ -29,7 +33,6 @@ sbin/mkfs
> #sbin/mkfs.cramfs
> sbin/mkfs.minix
> sbin/mkswap
> -sbin/nologin
> #sbin/pivot_root
> sbin/raw
> sbin/sfdisk
> @@ -38,13 +41,13 @@ sbin/swapoff
> sbin/swapon
> sbin/switch_root
> sbin/wipefs
> +sbin/zramctl
> #usr/bin/cal
> #usr/bin/chrt
> #usr/bin/col
> #usr/bin/colcrt
> #usr/bin/colrm
> #usr/bin/column
> -#usr/bin/cytune
> usr/bin/eject
> usr/bin/fallocate
> usr/bin/flock
> @@ -61,7 +64,10 @@ usr/bin/ionice
> usr/bin/logger
> #usr/bin/look
> usr/bin/lscpu
> +usr/bin/lsipc
> usr/bin/lslocks
> +usr/bin/lslogins
> +usr/bin/lsns
> #usr/bin/mcookie
> #usr/bin/namei
> #usr/bin/nsenter
> @@ -78,16 +84,26 @@ usr/bin/setsid
> usr/bin/tailf
> #usr/bin/taskset
> #usr/bin/ul
> +#usr/bin/uname26
> #usr/bin/unshare
> #usr/bin/whereis
> +#usr/include/libfdisk
> +#usr/include/libfdisk/libfdisk.h
> #usr/include/libmount
> #usr/include/libmount/libmount.h
> +#usr/include/libsmartcols
> +#usr/include/libsmartcols/libsmartcols.h
> #usr/lib/libblkid.la
> -#usr/lib/libmount.a
> +#usr/lib/libfdisk.la
> +#usr/lib/libfdisk.so
> #usr/lib/libmount.la
> #usr/lib/libmount.so
> +#usr/lib/libsmartcols.la
> +#usr/lib/libsmartcols.so
> #usr/lib/libuuid.la
> +#usr/lib/pkgconfig/fdisk.pc
> #usr/lib/pkgconfig/mount.pc
> +#usr/lib/pkgconfig/smartcols.pc
> usr/sbin/addpart
> usr/sbin/delpart
> usr/sbin/fdformat
> @@ -96,8 +112,6 @@ usr/sbin/partx
> #usr/sbin/readprofile
> usr/sbin/resizepart
> usr/sbin/rtcwake
> -usr/share/bash-completion
> -#usr/share/bash-completion/completions
> #usr/share/bash-completion/completions/addpart
> #usr/share/bash-completion/completions/blkdiscard
> #usr/share/bash-completion/completions/blkid
> @@ -111,7 +125,6 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/colrm
> #usr/share/bash-completion/completions/column
> #usr/share/bash-completion/completions/ctrlaltdel
> -#usr/share/bash-completion/completions/cytune
> #usr/share/bash-completion/completions/delpart
> #usr/share/bash-completion/completions/dmesg
> #usr/share/bash-completion/completions/eject
> @@ -129,16 +142,21 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/hexdump
> #usr/share/bash-completion/completions/hwclock
> #usr/share/bash-completion/completions/ionice
> +#usr/share/bash-completion/completions/ipcmk
> #usr/share/bash-completion/completions/ipcrm
> #usr/share/bash-completion/completions/ipcs
> #usr/share/bash-completion/completions/isosize
> +#usr/share/bash-completion/completions/last
> #usr/share/bash-completion/completions/ldattach
> #usr/share/bash-completion/completions/logger
> #usr/share/bash-completion/completions/look
> #usr/share/bash-completion/completions/losetup
> #usr/share/bash-completion/completions/lsblk
> #usr/share/bash-completion/completions/lscpu
> +#usr/share/bash-completion/completions/lsipc
> #usr/share/bash-completion/completions/lslocks
> +#usr/share/bash-completion/completions/lslogins
> +#usr/share/bash-completion/completions/lsns
> #usr/share/bash-completion/completions/mcookie
> #usr/share/bash-completion/completions/mesg
> #usr/share/bash-completion/completions/mkfs
> @@ -147,6 +165,7 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/mkfs.minix
> #usr/share/bash-completion/completions/mkswap
> #usr/share/bash-completion/completions/more
> +#usr/share/bash-completion/completions/mount
> #usr/share/bash-completion/completions/mountpoint
> #usr/share/bash-completion/completions/namei
> #usr/share/bash-completion/completions/nsenter
> @@ -168,10 +187,12 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/setterm
> #usr/share/bash-completion/completions/sfdisk
> #usr/share/bash-completion/completions/swaplabel
> +#usr/share/bash-completion/completions/swapoff
> #usr/share/bash-completion/completions/swapon
> #usr/share/bash-completion/completions/tailf
> #usr/share/bash-completion/completions/taskset
> #usr/share/bash-completion/completions/ul
> +#usr/share/bash-completion/completions/umount
> #usr/share/bash-completion/completions/unshare
> #usr/share/bash-completion/completions/utmpdump
> #usr/share/bash-completion/completions/uuidd
> @@ -180,44 +201,11 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/wdctl
> #usr/share/bash-completion/completions/whereis
> #usr/share/bash-completion/completions/wipefs
> +#usr/share/bash-completion/completions/zramctl
> #usr/share/doc/util-linux
> #usr/share/doc/util-linux/getopt
> #usr/share/doc/util-linux/getopt/getopt-parse.bash
> #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
> #usr/share/man/man1/cal.1
> #usr/share/man/man1/chrt.1
> #usr/share/man/man1/col.1
> @@ -237,6 +225,8 @@ usr/share/bash-completion
> #usr/share/man/man1/logger.1
> #usr/share/man/man1/look.1
> #usr/share/man/man1/lscpu.1
> +#usr/share/man/man1/lsipc.1
> +#usr/share/man/man1/lslogins.1
> #usr/share/man/man1/mcookie.1
> #usr/share/man/man1/more.1
> #usr/share/man/man1/namei.1
> @@ -257,6 +247,7 @@ usr/share/bash-completion
> #usr/share/man/man1/whereis.1
> #usr/share/man/man3/uuid_generate_time_safe.3
> #usr/share/man/man5/fstab.5
> +#usr/share/man/man5/terminal-colors.d.5
> #usr/share/man/man8/addpart.8
> #usr/share/man/man8/agetty.8
> #usr/share/man/man8/blkdiscard.8
> @@ -264,7 +255,6 @@ usr/share/bash-completion
> #usr/share/man/man8/cfdisk.8
> #usr/share/man/man8/chcpu.8
> #usr/share/man/man8/ctrlaltdel.8
> -#usr/share/man/man8/cytune.8
> #usr/share/man/man8/delpart.8
> #usr/share/man/man8/fdformat.8
> #usr/share/man/man8/fdisk.8
> @@ -282,13 +272,13 @@ usr/share/bash-completion
> #usr/share/man/man8/losetup.8
> #usr/share/man/man8/lsblk.8
> #usr/share/man/man8/lslocks.8
> +#usr/share/man/man8/lsns.8
> #usr/share/man/man8/mkfs.8
> #usr/share/man/man8/mkfs.bfs.8
> #usr/share/man/man8/mkfs.cramfs.8
> #usr/share/man/man8/mkfs.minix.8
> #usr/share/man/man8/mkswap.8
> #usr/share/man/man8/mount.8
> -#usr/share/man/man8/nologin.8
> #usr/share/man/man8/partx.8
> #usr/share/man/man8/pivot_root.8
> #usr/share/man/man8/raw.8
> @@ -302,5 +292,8 @@ usr/share/bash-completion
> #usr/share/man/man8/swapon.8
> #usr/share/man/man8/switch_root.8
> #usr/share/man/man8/umount.8
> +#usr/share/man/man8/uname26.8
> #usr/share/man/man8/wdctl.8
> #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
> #etc/fcron.daily
> etc/fcron.daily/trim
> lib/libblkid.so.1.1.0
> +lib/libfdisk.so.1
> +lib/libfdisk.so.1.1.0
> lib/libmount.so.1
> lib/libmount.so.1.1.0
> +lib/libsmartcols.so.1
> +lib/libsmartcols.so.1.1.0
> lib/libuuid.so.1.3.0
> sbin/agetty
> sbin/blkdiscard
> @@ -29,7 +33,6 @@ sbin/mkfs
> #sbin/mkfs.cramfs
> sbin/mkfs.minix
> sbin/mkswap
> -sbin/nologin
> #sbin/pivot_root
> sbin/raw
> sbin/sfdisk
> @@ -38,13 +41,13 @@ sbin/swapoff
> sbin/swapon
> sbin/switch_root
> sbin/wipefs
> +sbin/zramctl
> #usr/bin/cal
> #usr/bin/chrt
> #usr/bin/col
> #usr/bin/colcrt
> #usr/bin/colrm
> #usr/bin/column
> -#usr/bin/cytune
> usr/bin/eject
> usr/bin/fallocate
> usr/bin/flock
> @@ -61,7 +64,10 @@ usr/bin/ionice
> usr/bin/logger
> #usr/bin/look
> usr/bin/lscpu
> +usr/bin/lsipc
> usr/bin/lslocks
> +usr/bin/lslogins
> +usr/bin/lsns
> #usr/bin/mcookie
> #usr/bin/namei
> #usr/bin/nsenter
> @@ -78,17 +84,27 @@ usr/bin/setsid
> usr/bin/tailf
> #usr/bin/taskset
> #usr/bin/ul
> +#usr/bin/uname26
> #usr/bin/unshare
> #usr/bin/whereis
> -#usr/bin/x86_64
> +usr/bin/x86_64
> +#usr/include/libfdisk
> +#usr/include/libfdisk/libfdisk.h
> #usr/include/libmount
> #usr/include/libmount/libmount.h
> +#usr/include/libsmartcols
> +#usr/include/libsmartcols/libsmartcols.h
> #usr/lib/libblkid.la
> -#usr/lib/libmount.a
> +#usr/lib/libfdisk.la
> +#usr/lib/libfdisk.so
> #usr/lib/libmount.la
> #usr/lib/libmount.so
> +#usr/lib/libsmartcols.la
> +#usr/lib/libsmartcols.so
> #usr/lib/libuuid.la
> +#usr/lib/pkgconfig/fdisk.pc
> #usr/lib/pkgconfig/mount.pc
> +#usr/lib/pkgconfig/smartcols.pc
> usr/sbin/addpart
> usr/sbin/delpart
> usr/sbin/fdformat
> @@ -97,8 +113,6 @@ usr/sbin/partx
> #usr/sbin/readprofile
> usr/sbin/resizepart
> usr/sbin/rtcwake
> -usr/share/bash-completion
> -#usr/share/bash-completion/completions
> #usr/share/bash-completion/completions/addpart
> #usr/share/bash-completion/completions/blkdiscard
> #usr/share/bash-completion/completions/blkid
> @@ -112,7 +126,6 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/colrm
> #usr/share/bash-completion/completions/column
> #usr/share/bash-completion/completions/ctrlaltdel
> -#usr/share/bash-completion/completions/cytune
> #usr/share/bash-completion/completions/delpart
> #usr/share/bash-completion/completions/dmesg
> #usr/share/bash-completion/completions/eject
> @@ -130,16 +143,21 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/hexdump
> #usr/share/bash-completion/completions/hwclock
> #usr/share/bash-completion/completions/ionice
> +#usr/share/bash-completion/completions/ipcmk
> #usr/share/bash-completion/completions/ipcrm
> #usr/share/bash-completion/completions/ipcs
> #usr/share/bash-completion/completions/isosize
> +#usr/share/bash-completion/completions/last
> #usr/share/bash-completion/completions/ldattach
> #usr/share/bash-completion/completions/logger
> #usr/share/bash-completion/completions/look
> #usr/share/bash-completion/completions/losetup
> #usr/share/bash-completion/completions/lsblk
> #usr/share/bash-completion/completions/lscpu
> +#usr/share/bash-completion/completions/lsipc
> #usr/share/bash-completion/completions/lslocks
> +#usr/share/bash-completion/completions/lslogins
> +#usr/share/bash-completion/completions/lsns
> #usr/share/bash-completion/completions/mcookie
> #usr/share/bash-completion/completions/mesg
> #usr/share/bash-completion/completions/mkfs
> @@ -148,6 +166,7 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/mkfs.minix
> #usr/share/bash-completion/completions/mkswap
> #usr/share/bash-completion/completions/more
> +#usr/share/bash-completion/completions/mount
> #usr/share/bash-completion/completions/mountpoint
> #usr/share/bash-completion/completions/namei
> #usr/share/bash-completion/completions/nsenter
> @@ -169,10 +188,12 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/setterm
> #usr/share/bash-completion/completions/sfdisk
> #usr/share/bash-completion/completions/swaplabel
> +#usr/share/bash-completion/completions/swapoff
> #usr/share/bash-completion/completions/swapon
> #usr/share/bash-completion/completions/tailf
> #usr/share/bash-completion/completions/taskset
> #usr/share/bash-completion/completions/ul
> +#usr/share/bash-completion/completions/umount
> #usr/share/bash-completion/completions/unshare
> #usr/share/bash-completion/completions/utmpdump
> #usr/share/bash-completion/completions/uuidd
> @@ -181,36 +202,11 @@ usr/share/bash-completion
> #usr/share/bash-completion/completions/wdctl
> #usr/share/bash-completion/completions/whereis
> #usr/share/bash-completion/completions/wipefs
> +#usr/share/bash-completion/completions/zramctl
> #usr/share/doc/util-linux
> #usr/share/doc/util-linux/getopt
> #usr/share/doc/util-linux/getopt/getopt-parse.bash
> #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
> #usr/share/man/man1/cal.1
> #usr/share/man/man1/chrt.1
> #usr/share/man/man1/col.1
> @@ -230,6 +226,8 @@ usr/share/bash-completion
> #usr/share/man/man1/logger.1
> #usr/share/man/man1/look.1
> #usr/share/man/man1/lscpu.1
> +#usr/share/man/man1/lsipc.1
> +#usr/share/man/man1/lslogins.1
> #usr/share/man/man1/mcookie.1
> #usr/share/man/man1/more.1
> #usr/share/man/man1/namei.1
> @@ -250,6 +248,7 @@ usr/share/bash-completion
> #usr/share/man/man1/whereis.1
> #usr/share/man/man3/uuid_generate_time_safe.3
> #usr/share/man/man5/fstab.5
> +#usr/share/man/man5/terminal-colors.d.5
> #usr/share/man/man8/addpart.8
> #usr/share/man/man8/agetty.8
> #usr/share/man/man8/blkdiscard.8
> @@ -257,7 +256,6 @@ usr/share/bash-completion
> #usr/share/man/man8/cfdisk.8
> #usr/share/man/man8/chcpu.8
> #usr/share/man/man8/ctrlaltdel.8
> -#usr/share/man/man8/cytune.8
> #usr/share/man/man8/delpart.8
> #usr/share/man/man8/fdformat.8
> #usr/share/man/man8/fdisk.8
> @@ -275,13 +273,13 @@ usr/share/bash-completion
> #usr/share/man/man8/losetup.8
> #usr/share/man/man8/lsblk.8
> #usr/share/man/man8/lslocks.8
> +#usr/share/man/man8/lsns.8
> #usr/share/man/man8/mkfs.8
> #usr/share/man/man8/mkfs.bfs.8
> #usr/share/man/man8/mkfs.cramfs.8
> #usr/share/man/man8/mkfs.minix.8
> #usr/share/man/man8/mkswap.8
> #usr/share/man/man8/mount.8
> -#usr/share/man/man8/nologin.8
> #usr/share/man/man8/partx.8
> #usr/share/man/man8/pivot_root.8
> #usr/share/man/man8/raw.8
> @@ -295,6 +293,8 @@ usr/share/bash-completion
> #usr/share/man/man8/swapon.8
> #usr/share/man/man8/switch_root.8
> #usr/share/man/man8/umount.8
> +#usr/share/man/man8/uname26.8
> #usr/share/man/man8/wdctl.8
> #usr/share/man/man8/wipefs.8
> #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 @@
> ####################################################################
> ###########
> #
> #
> # IPFire.org - A linux based
> firewall #
> -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org>
> #
> +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org>
> #
> #
> #
> # This program is free software: you can redistribute it and/or
> modify #
> # it under the terms of the GNU General Public License as published
> by #
> @@ -24,13 +24,15 @@
>
> include Config
>
> -VER = 2.24
> +VER = 2.28.2
>
> THISAPP = util-linux-$(VER)
> DL_FILE = $(THISAPP).tar.xz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> +PROG = util-linux
> +
>
> ####################################################################
> ###########
> # Top-level Rules
> @@ -40,7 +42,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
> +$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
>
> install : $(TARGET)
>
> @@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>
> md5 : $(subst %,%_MD5,$(objects))
>
> +dist:
> + @$(PAK)
> +
> ####################################################################
> ###########
> # Downloading, checking, md5sum
> ####################################################################
> ###########
> @@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> $(DIR_DL)/$(DL_FILE)
> - cd $(DIR_APP) && ./configure
> - cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes
> HAVE_SLN=yes
> - cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
> + cd $(DIR_APP) && ./configure \
> + --docdir=/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
> # Install fstrim cronjob
> mkdir -p /etc/fcron.daily
> install -m 0755 $(DIR_SRC)/config/fstrim/trim
> /etc/fcron.daily/trim
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] util-linux: update to 2.28.2
2017-06-08 6:19 ` Stefan Schantl
@ 2017-06-08 15:54 ` Michael Tremer
2017-06-08 19:37 ` Marcel Lorenz
0 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2017-06-08 15:54 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 22788 bytes --]
Hello,
this patch is not OK.
It disables /sbin/nologin which we use for quite a few system user accounts so
that they cannot log in.
-Michael
On Thu, 2017-06-08 at 08:19 +0200, Stefan Schantl wrote:
> Hello Marcel,
>
> 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.
>
> @Michael: Please merge this patch and could you add the missing
> rootfile.
>
> Thanks in advance,
>
> -Stefan
>
> Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>
> > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> > ---
> > config/rootfiles/common/i586/util-linux | 77 ++++++++++++++-------
> > ----------
> > config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++-------
> > -------
> > lfs/util-linux | 31 ++++++++++---
> > 3 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
> > #etc/fcron.daily
> > etc/fcron.daily/trim
> > lib/libblkid.so.1.1.0
> > +lib/libfdisk.so.1
> > +lib/libfdisk.so.1.1.0
> > lib/libmount.so.1
> > lib/libmount.so.1.1.0
> > +lib/libsmartcols.so.1
> > +lib/libsmartcols.so.1.1.0
> > lib/libuuid.so.1.3.0
> > sbin/agetty
> > sbin/blkdiscard
> > @@ -29,7 +33,6 @@ sbin/mkfs
> > #sbin/mkfs.cramfs
> > sbin/mkfs.minix
> > sbin/mkswap
> > -sbin/nologin
> > #sbin/pivot_root
> > sbin/raw
> > sbin/sfdisk
> > @@ -38,13 +41,13 @@ sbin/swapoff
> > sbin/swapon
> > sbin/switch_root
> > sbin/wipefs
> > +sbin/zramctl
> > #usr/bin/cal
> > #usr/bin/chrt
> > #usr/bin/col
> > #usr/bin/colcrt
> > #usr/bin/colrm
> > #usr/bin/column
> > -#usr/bin/cytune
> > usr/bin/eject
> > usr/bin/fallocate
> > usr/bin/flock
> > @@ -61,7 +64,10 @@ usr/bin/ionice
> > usr/bin/logger
> > #usr/bin/look
> > usr/bin/lscpu
> > +usr/bin/lsipc
> > usr/bin/lslocks
> > +usr/bin/lslogins
> > +usr/bin/lsns
> > #usr/bin/mcookie
> > #usr/bin/namei
> > #usr/bin/nsenter
> > @@ -78,16 +84,26 @@ usr/bin/setsid
> > usr/bin/tailf
> > #usr/bin/taskset
> > #usr/bin/ul
> > +#usr/bin/uname26
> > #usr/bin/unshare
> > #usr/bin/whereis
> > +#usr/include/libfdisk
> > +#usr/include/libfdisk/libfdisk.h
> > #usr/include/libmount
> > #usr/include/libmount/libmount.h
> > +#usr/include/libsmartcols
> > +#usr/include/libsmartcols/libsmartcols.h
> > #usr/lib/libblkid.la
> > -#usr/lib/libmount.a
> > +#usr/lib/libfdisk.la
> > +#usr/lib/libfdisk.so
> > #usr/lib/libmount.la
> > #usr/lib/libmount.so
> > +#usr/lib/libsmartcols.la
> > +#usr/lib/libsmartcols.so
> > #usr/lib/libuuid.la
> > +#usr/lib/pkgconfig/fdisk.pc
> > #usr/lib/pkgconfig/mount.pc
> > +#usr/lib/pkgconfig/smartcols.pc
> > usr/sbin/addpart
> > usr/sbin/delpart
> > usr/sbin/fdformat
> > @@ -96,8 +112,6 @@ usr/sbin/partx
> > #usr/sbin/readprofile
> > usr/sbin/resizepart
> > usr/sbin/rtcwake
> > -usr/share/bash-completion
> > -#usr/share/bash-completion/completions
> > #usr/share/bash-completion/completions/addpart
> > #usr/share/bash-completion/completions/blkdiscard
> > #usr/share/bash-completion/completions/blkid
> > @@ -111,7 +125,6 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/colrm
> > #usr/share/bash-completion/completions/column
> > #usr/share/bash-completion/completions/ctrlaltdel
> > -#usr/share/bash-completion/completions/cytune
> > #usr/share/bash-completion/completions/delpart
> > #usr/share/bash-completion/completions/dmesg
> > #usr/share/bash-completion/completions/eject
> > @@ -129,16 +142,21 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/hexdump
> > #usr/share/bash-completion/completions/hwclock
> > #usr/share/bash-completion/completions/ionice
> > +#usr/share/bash-completion/completions/ipcmk
> > #usr/share/bash-completion/completions/ipcrm
> > #usr/share/bash-completion/completions/ipcs
> > #usr/share/bash-completion/completions/isosize
> > +#usr/share/bash-completion/completions/last
> > #usr/share/bash-completion/completions/ldattach
> > #usr/share/bash-completion/completions/logger
> > #usr/share/bash-completion/completions/look
> > #usr/share/bash-completion/completions/losetup
> > #usr/share/bash-completion/completions/lsblk
> > #usr/share/bash-completion/completions/lscpu
> > +#usr/share/bash-completion/completions/lsipc
> > #usr/share/bash-completion/completions/lslocks
> > +#usr/share/bash-completion/completions/lslogins
> > +#usr/share/bash-completion/completions/lsns
> > #usr/share/bash-completion/completions/mcookie
> > #usr/share/bash-completion/completions/mesg
> > #usr/share/bash-completion/completions/mkfs
> > @@ -147,6 +165,7 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/mkfs.minix
> > #usr/share/bash-completion/completions/mkswap
> > #usr/share/bash-completion/completions/more
> > +#usr/share/bash-completion/completions/mount
> > #usr/share/bash-completion/completions/mountpoint
> > #usr/share/bash-completion/completions/namei
> > #usr/share/bash-completion/completions/nsenter
> > @@ -168,10 +187,12 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/setterm
> > #usr/share/bash-completion/completions/sfdisk
> > #usr/share/bash-completion/completions/swaplabel
> > +#usr/share/bash-completion/completions/swapoff
> > #usr/share/bash-completion/completions/swapon
> > #usr/share/bash-completion/completions/tailf
> > #usr/share/bash-completion/completions/taskset
> > #usr/share/bash-completion/completions/ul
> > +#usr/share/bash-completion/completions/umount
> > #usr/share/bash-completion/completions/unshare
> > #usr/share/bash-completion/completions/utmpdump
> > #usr/share/bash-completion/completions/uuidd
> > @@ -180,44 +201,11 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/wdctl
> > #usr/share/bash-completion/completions/whereis
> > #usr/share/bash-completion/completions/wipefs
> > +#usr/share/bash-completion/completions/zramctl
> > #usr/share/doc/util-linux
> > #usr/share/doc/util-linux/getopt
> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
> > #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
> > #usr/share/man/man1/cal.1
> > #usr/share/man/man1/chrt.1
> > #usr/share/man/man1/col.1
> > @@ -237,6 +225,8 @@ usr/share/bash-completion
> > #usr/share/man/man1/logger.1
> > #usr/share/man/man1/look.1
> > #usr/share/man/man1/lscpu.1
> > +#usr/share/man/man1/lsipc.1
> > +#usr/share/man/man1/lslogins.1
> > #usr/share/man/man1/mcookie.1
> > #usr/share/man/man1/more.1
> > #usr/share/man/man1/namei.1
> > @@ -257,6 +247,7 @@ usr/share/bash-completion
> > #usr/share/man/man1/whereis.1
> > #usr/share/man/man3/uuid_generate_time_safe.3
> > #usr/share/man/man5/fstab.5
> > +#usr/share/man/man5/terminal-colors.d.5
> > #usr/share/man/man8/addpart.8
> > #usr/share/man/man8/agetty.8
> > #usr/share/man/man8/blkdiscard.8
> > @@ -264,7 +255,6 @@ usr/share/bash-completion
> > #usr/share/man/man8/cfdisk.8
> > #usr/share/man/man8/chcpu.8
> > #usr/share/man/man8/ctrlaltdel.8
> > -#usr/share/man/man8/cytune.8
> > #usr/share/man/man8/delpart.8
> > #usr/share/man/man8/fdformat.8
> > #usr/share/man/man8/fdisk.8
> > @@ -282,13 +272,13 @@ usr/share/bash-completion
> > #usr/share/man/man8/losetup.8
> > #usr/share/man/man8/lsblk.8
> > #usr/share/man/man8/lslocks.8
> > +#usr/share/man/man8/lsns.8
> > #usr/share/man/man8/mkfs.8
> > #usr/share/man/man8/mkfs.bfs.8
> > #usr/share/man/man8/mkfs.cramfs.8
> > #usr/share/man/man8/mkfs.minix.8
> > #usr/share/man/man8/mkswap.8
> > #usr/share/man/man8/mount.8
> > -#usr/share/man/man8/nologin.8
> > #usr/share/man/man8/partx.8
> > #usr/share/man/man8/pivot_root.8
> > #usr/share/man/man8/raw.8
> > @@ -302,5 +292,8 @@ usr/share/bash-completion
> > #usr/share/man/man8/swapon.8
> > #usr/share/man/man8/switch_root.8
> > #usr/share/man/man8/umount.8
> > +#usr/share/man/man8/uname26.8
> > #usr/share/man/man8/wdctl.8
> > #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
> > #etc/fcron.daily
> > etc/fcron.daily/trim
> > lib/libblkid.so.1.1.0
> > +lib/libfdisk.so.1
> > +lib/libfdisk.so.1.1.0
> > lib/libmount.so.1
> > lib/libmount.so.1.1.0
> > +lib/libsmartcols.so.1
> > +lib/libsmartcols.so.1.1.0
> > lib/libuuid.so.1.3.0
> > sbin/agetty
> > sbin/blkdiscard
> > @@ -29,7 +33,6 @@ sbin/mkfs
> > #sbin/mkfs.cramfs
> > sbin/mkfs.minix
> > sbin/mkswap
> > -sbin/nologin
> > #sbin/pivot_root
> > sbin/raw
> > sbin/sfdisk
> > @@ -38,13 +41,13 @@ sbin/swapoff
> > sbin/swapon
> > sbin/switch_root
> > sbin/wipefs
> > +sbin/zramctl
> > #usr/bin/cal
> > #usr/bin/chrt
> > #usr/bin/col
> > #usr/bin/colcrt
> > #usr/bin/colrm
> > #usr/bin/column
> > -#usr/bin/cytune
> > usr/bin/eject
> > usr/bin/fallocate
> > usr/bin/flock
> > @@ -61,7 +64,10 @@ usr/bin/ionice
> > usr/bin/logger
> > #usr/bin/look
> > usr/bin/lscpu
> > +usr/bin/lsipc
> > usr/bin/lslocks
> > +usr/bin/lslogins
> > +usr/bin/lsns
> > #usr/bin/mcookie
> > #usr/bin/namei
> > #usr/bin/nsenter
> > @@ -78,17 +84,27 @@ usr/bin/setsid
> > usr/bin/tailf
> > #usr/bin/taskset
> > #usr/bin/ul
> > +#usr/bin/uname26
> > #usr/bin/unshare
> > #usr/bin/whereis
> > -#usr/bin/x86_64
> > +usr/bin/x86_64
> > +#usr/include/libfdisk
> > +#usr/include/libfdisk/libfdisk.h
> > #usr/include/libmount
> > #usr/include/libmount/libmount.h
> > +#usr/include/libsmartcols
> > +#usr/include/libsmartcols/libsmartcols.h
> > #usr/lib/libblkid.la
> > -#usr/lib/libmount.a
> > +#usr/lib/libfdisk.la
> > +#usr/lib/libfdisk.so
> > #usr/lib/libmount.la
> > #usr/lib/libmount.so
> > +#usr/lib/libsmartcols.la
> > +#usr/lib/libsmartcols.so
> > #usr/lib/libuuid.la
> > +#usr/lib/pkgconfig/fdisk.pc
> > #usr/lib/pkgconfig/mount.pc
> > +#usr/lib/pkgconfig/smartcols.pc
> > usr/sbin/addpart
> > usr/sbin/delpart
> > usr/sbin/fdformat
> > @@ -97,8 +113,6 @@ usr/sbin/partx
> > #usr/sbin/readprofile
> > usr/sbin/resizepart
> > usr/sbin/rtcwake
> > -usr/share/bash-completion
> > -#usr/share/bash-completion/completions
> > #usr/share/bash-completion/completions/addpart
> > #usr/share/bash-completion/completions/blkdiscard
> > #usr/share/bash-completion/completions/blkid
> > @@ -112,7 +126,6 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/colrm
> > #usr/share/bash-completion/completions/column
> > #usr/share/bash-completion/completions/ctrlaltdel
> > -#usr/share/bash-completion/completions/cytune
> > #usr/share/bash-completion/completions/delpart
> > #usr/share/bash-completion/completions/dmesg
> > #usr/share/bash-completion/completions/eject
> > @@ -130,16 +143,21 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/hexdump
> > #usr/share/bash-completion/completions/hwclock
> > #usr/share/bash-completion/completions/ionice
> > +#usr/share/bash-completion/completions/ipcmk
> > #usr/share/bash-completion/completions/ipcrm
> > #usr/share/bash-completion/completions/ipcs
> > #usr/share/bash-completion/completions/isosize
> > +#usr/share/bash-completion/completions/last
> > #usr/share/bash-completion/completions/ldattach
> > #usr/share/bash-completion/completions/logger
> > #usr/share/bash-completion/completions/look
> > #usr/share/bash-completion/completions/losetup
> > #usr/share/bash-completion/completions/lsblk
> > #usr/share/bash-completion/completions/lscpu
> > +#usr/share/bash-completion/completions/lsipc
> > #usr/share/bash-completion/completions/lslocks
> > +#usr/share/bash-completion/completions/lslogins
> > +#usr/share/bash-completion/completions/lsns
> > #usr/share/bash-completion/completions/mcookie
> > #usr/share/bash-completion/completions/mesg
> > #usr/share/bash-completion/completions/mkfs
> > @@ -148,6 +166,7 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/mkfs.minix
> > #usr/share/bash-completion/completions/mkswap
> > #usr/share/bash-completion/completions/more
> > +#usr/share/bash-completion/completions/mount
> > #usr/share/bash-completion/completions/mountpoint
> > #usr/share/bash-completion/completions/namei
> > #usr/share/bash-completion/completions/nsenter
> > @@ -169,10 +188,12 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/setterm
> > #usr/share/bash-completion/completions/sfdisk
> > #usr/share/bash-completion/completions/swaplabel
> > +#usr/share/bash-completion/completions/swapoff
> > #usr/share/bash-completion/completions/swapon
> > #usr/share/bash-completion/completions/tailf
> > #usr/share/bash-completion/completions/taskset
> > #usr/share/bash-completion/completions/ul
> > +#usr/share/bash-completion/completions/umount
> > #usr/share/bash-completion/completions/unshare
> > #usr/share/bash-completion/completions/utmpdump
> > #usr/share/bash-completion/completions/uuidd
> > @@ -181,36 +202,11 @@ usr/share/bash-completion
> > #usr/share/bash-completion/completions/wdctl
> > #usr/share/bash-completion/completions/whereis
> > #usr/share/bash-completion/completions/wipefs
> > +#usr/share/bash-completion/completions/zramctl
> > #usr/share/doc/util-linux
> > #usr/share/doc/util-linux/getopt
> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
> > #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
> > #usr/share/man/man1/cal.1
> > #usr/share/man/man1/chrt.1
> > #usr/share/man/man1/col.1
> > @@ -230,6 +226,8 @@ usr/share/bash-completion
> > #usr/share/man/man1/logger.1
> > #usr/share/man/man1/look.1
> > #usr/share/man/man1/lscpu.1
> > +#usr/share/man/man1/lsipc.1
> > +#usr/share/man/man1/lslogins.1
> > #usr/share/man/man1/mcookie.1
> > #usr/share/man/man1/more.1
> > #usr/share/man/man1/namei.1
> > @@ -250,6 +248,7 @@ usr/share/bash-completion
> > #usr/share/man/man1/whereis.1
> > #usr/share/man/man3/uuid_generate_time_safe.3
> > #usr/share/man/man5/fstab.5
> > +#usr/share/man/man5/terminal-colors.d.5
> > #usr/share/man/man8/addpart.8
> > #usr/share/man/man8/agetty.8
> > #usr/share/man/man8/blkdiscard.8
> > @@ -257,7 +256,6 @@ usr/share/bash-completion
> > #usr/share/man/man8/cfdisk.8
> > #usr/share/man/man8/chcpu.8
> > #usr/share/man/man8/ctrlaltdel.8
> > -#usr/share/man/man8/cytune.8
> > #usr/share/man/man8/delpart.8
> > #usr/share/man/man8/fdformat.8
> > #usr/share/man/man8/fdisk.8
> > @@ -275,13 +273,13 @@ usr/share/bash-completion
> > #usr/share/man/man8/losetup.8
> > #usr/share/man/man8/lsblk.8
> > #usr/share/man/man8/lslocks.8
> > +#usr/share/man/man8/lsns.8
> > #usr/share/man/man8/mkfs.8
> > #usr/share/man/man8/mkfs.bfs.8
> > #usr/share/man/man8/mkfs.cramfs.8
> > #usr/share/man/man8/mkfs.minix.8
> > #usr/share/man/man8/mkswap.8
> > #usr/share/man/man8/mount.8
> > -#usr/share/man/man8/nologin.8
> > #usr/share/man/man8/partx.8
> > #usr/share/man/man8/pivot_root.8
> > #usr/share/man/man8/raw.8
> > @@ -295,6 +293,8 @@ usr/share/bash-completion
> > #usr/share/man/man8/swapon.8
> > #usr/share/man/man8/switch_root.8
> > #usr/share/man/man8/umount.8
> > +#usr/share/man/man8/uname26.8
> > #usr/share/man/man8/wdctl.8
> > #usr/share/man/man8/wipefs.8
> > #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 @@
> > ####################################################################
> > ###########
> > #
> > #
> > # IPFire.org - A linux based
> > firewall #
> > -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org>
> > #
> > +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org>
> > #
> > #
> > #
> > # This program is free software: you can redistribute it and/or
> > modify #
> > # it under the terms of the GNU General Public License as published
> > by #
> > @@ -24,13 +24,15 @@
> >
> > include Config
> >
> > -VER = 2.24
> > +VER = 2.28.2
> >
> > THISAPP = util-linux-$(VER)
> > DL_FILE = $(THISAPP).tar.xz
> > DL_FROM = $(URL_IPFIRE)
> > DIR_APP = $(DIR_SRC)/$(THISAPP)
> > TARGET = $(DIR_INFO)/$(THISAPP)
> > +PROG = util-linux
> > +
> >
> > ####################################################################
> > ###########
> > # Top-level Rules
> > @@ -40,7 +42,7 @@ objects = $(DL_FILE)
> >
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >
> > -$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
> > +$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
> >
> > install : $(TARGET)
> >
> > @@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
> >
> > md5 : $(subst %,%_MD5,$(objects))
> >
> > +dist:
> > + @$(PAK)
> > +
> > ####################################################################
> > ###########
> > # Downloading, checking, md5sum
> > ####################################################################
> > ###########
> > @@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) :
> > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > @$(PREBUILD)
> > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> > $(DIR_DL)/$(DL_FILE)
> > - cd $(DIR_APP) && ./configure
> > - cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes
> > HAVE_SLN=yes
> > - cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
> > + cd $(DIR_APP) && ./configure \
> > + --docdir=/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
> > # Install fstrim cronjob
> > mkdir -p /etc/fcron.daily
> > install -m 0755 $(DIR_SRC)/config/fstrim/trim
> > /etc/fcron.daily/trim
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] util-linux: update to 2.28.2
2017-06-08 15:54 ` Michael Tremer
@ 2017-06-08 19:37 ` Marcel Lorenz
2017-06-08 19:56 ` Marcel Lorenz
0 siblings, 1 reply; 7+ messages in thread
From: Marcel Lorenz @ 2017-06-08 19:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 23830 bytes --]
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
tested is 2.28.2
Best,
Marcel
Am 2017-06-08 17:54, schrieb Michael Tremer:
> Hello,
>
> this patch is not OK.
>
> It disables /sbin/nologin which we use for quite a few system user
> accounts so
> that they cannot log in.
>
> -Michael
>
> On Thu, 2017-06-08 at 08:19 +0200, Stefan Schantl wrote:
>> Hello Marcel,
>>
>> 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.
>>
>> @Michael: Please merge this patch and could you add the missing
>> rootfile.
>>
>> Thanks in advance,
>>
>> -Stefan
>>
>> Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>>
>> > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
>> > ---
>> > config/rootfiles/common/i586/util-linux | 77 ++++++++++++++-------
>> > ----------
>> > config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++-------
>> > -------
>> > lfs/util-linux | 31 ++++++++++---
>> > 3 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
>> > #etc/fcron.daily
>> > etc/fcron.daily/trim
>> > lib/libblkid.so.1.1.0
>> > +lib/libfdisk.so.1
>> > +lib/libfdisk.so.1.1.0
>> > lib/libmount.so.1
>> > lib/libmount.so.1.1.0
>> > +lib/libsmartcols.so.1
>> > +lib/libsmartcols.so.1.1.0
>> > lib/libuuid.so.1.3.0
>> > sbin/agetty
>> > sbin/blkdiscard
>> > @@ -29,7 +33,6 @@ sbin/mkfs
>> > #sbin/mkfs.cramfs
>> > sbin/mkfs.minix
>> > sbin/mkswap
>> > -sbin/nologin
>> > #sbin/pivot_root
>> > sbin/raw
>> > sbin/sfdisk
>> > @@ -38,13 +41,13 @@ sbin/swapoff
>> > sbin/swapon
>> > sbin/switch_root
>> > sbin/wipefs
>> > +sbin/zramctl
>> > #usr/bin/cal
>> > #usr/bin/chrt
>> > #usr/bin/col
>> > #usr/bin/colcrt
>> > #usr/bin/colrm
>> > #usr/bin/column
>> > -#usr/bin/cytune
>> > usr/bin/eject
>> > usr/bin/fallocate
>> > usr/bin/flock
>> > @@ -61,7 +64,10 @@ usr/bin/ionice
>> > usr/bin/logger
>> > #usr/bin/look
>> > usr/bin/lscpu
>> > +usr/bin/lsipc
>> > usr/bin/lslocks
>> > +usr/bin/lslogins
>> > +usr/bin/lsns
>> > #usr/bin/mcookie
>> > #usr/bin/namei
>> > #usr/bin/nsenter
>> > @@ -78,16 +84,26 @@ usr/bin/setsid
>> > usr/bin/tailf
>> > #usr/bin/taskset
>> > #usr/bin/ul
>> > +#usr/bin/uname26
>> > #usr/bin/unshare
>> > #usr/bin/whereis
>> > +#usr/include/libfdisk
>> > +#usr/include/libfdisk/libfdisk.h
>> > #usr/include/libmount
>> > #usr/include/libmount/libmount.h
>> > +#usr/include/libsmartcols
>> > +#usr/include/libsmartcols/libsmartcols.h
>> > #usr/lib/libblkid.la
>> > -#usr/lib/libmount.a
>> > +#usr/lib/libfdisk.la
>> > +#usr/lib/libfdisk.so
>> > #usr/lib/libmount.la
>> > #usr/lib/libmount.so
>> > +#usr/lib/libsmartcols.la
>> > +#usr/lib/libsmartcols.so
>> > #usr/lib/libuuid.la
>> > +#usr/lib/pkgconfig/fdisk.pc
>> > #usr/lib/pkgconfig/mount.pc
>> > +#usr/lib/pkgconfig/smartcols.pc
>> > usr/sbin/addpart
>> > usr/sbin/delpart
>> > usr/sbin/fdformat
>> > @@ -96,8 +112,6 @@ usr/sbin/partx
>> > #usr/sbin/readprofile
>> > usr/sbin/resizepart
>> > usr/sbin/rtcwake
>> > -usr/share/bash-completion
>> > -#usr/share/bash-completion/completions
>> > #usr/share/bash-completion/completions/addpart
>> > #usr/share/bash-completion/completions/blkdiscard
>> > #usr/share/bash-completion/completions/blkid
>> > @@ -111,7 +125,6 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/colrm
>> > #usr/share/bash-completion/completions/column
>> > #usr/share/bash-completion/completions/ctrlaltdel
>> > -#usr/share/bash-completion/completions/cytune
>> > #usr/share/bash-completion/completions/delpart
>> > #usr/share/bash-completion/completions/dmesg
>> > #usr/share/bash-completion/completions/eject
>> > @@ -129,16 +142,21 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/hexdump
>> > #usr/share/bash-completion/completions/hwclock
>> > #usr/share/bash-completion/completions/ionice
>> > +#usr/share/bash-completion/completions/ipcmk
>> > #usr/share/bash-completion/completions/ipcrm
>> > #usr/share/bash-completion/completions/ipcs
>> > #usr/share/bash-completion/completions/isosize
>> > +#usr/share/bash-completion/completions/last
>> > #usr/share/bash-completion/completions/ldattach
>> > #usr/share/bash-completion/completions/logger
>> > #usr/share/bash-completion/completions/look
>> > #usr/share/bash-completion/completions/losetup
>> > #usr/share/bash-completion/completions/lsblk
>> > #usr/share/bash-completion/completions/lscpu
>> > +#usr/share/bash-completion/completions/lsipc
>> > #usr/share/bash-completion/completions/lslocks
>> > +#usr/share/bash-completion/completions/lslogins
>> > +#usr/share/bash-completion/completions/lsns
>> > #usr/share/bash-completion/completions/mcookie
>> > #usr/share/bash-completion/completions/mesg
>> > #usr/share/bash-completion/completions/mkfs
>> > @@ -147,6 +165,7 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/mkfs.minix
>> > #usr/share/bash-completion/completions/mkswap
>> > #usr/share/bash-completion/completions/more
>> > +#usr/share/bash-completion/completions/mount
>> > #usr/share/bash-completion/completions/mountpoint
>> > #usr/share/bash-completion/completions/namei
>> > #usr/share/bash-completion/completions/nsenter
>> > @@ -168,10 +187,12 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/setterm
>> > #usr/share/bash-completion/completions/sfdisk
>> > #usr/share/bash-completion/completions/swaplabel
>> > +#usr/share/bash-completion/completions/swapoff
>> > #usr/share/bash-completion/completions/swapon
>> > #usr/share/bash-completion/completions/tailf
>> > #usr/share/bash-completion/completions/taskset
>> > #usr/share/bash-completion/completions/ul
>> > +#usr/share/bash-completion/completions/umount
>> > #usr/share/bash-completion/completions/unshare
>> > #usr/share/bash-completion/completions/utmpdump
>> > #usr/share/bash-completion/completions/uuidd
>> > @@ -180,44 +201,11 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/wdctl
>> > #usr/share/bash-completion/completions/whereis
>> > #usr/share/bash-completion/completions/wipefs
>> > +#usr/share/bash-completion/completions/zramctl
>> > #usr/share/doc/util-linux
>> > #usr/share/doc/util-linux/getopt
>> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
>> > #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
>> > #usr/share/man/man1/cal.1
>> > #usr/share/man/man1/chrt.1
>> > #usr/share/man/man1/col.1
>> > @@ -237,6 +225,8 @@ usr/share/bash-completion
>> > #usr/share/man/man1/logger.1
>> > #usr/share/man/man1/look.1
>> > #usr/share/man/man1/lscpu.1
>> > +#usr/share/man/man1/lsipc.1
>> > +#usr/share/man/man1/lslogins.1
>> > #usr/share/man/man1/mcookie.1
>> > #usr/share/man/man1/more.1
>> > #usr/share/man/man1/namei.1
>> > @@ -257,6 +247,7 @@ usr/share/bash-completion
>> > #usr/share/man/man1/whereis.1
>> > #usr/share/man/man3/uuid_generate_time_safe.3
>> > #usr/share/man/man5/fstab.5
>> > +#usr/share/man/man5/terminal-colors.d.5
>> > #usr/share/man/man8/addpart.8
>> > #usr/share/man/man8/agetty.8
>> > #usr/share/man/man8/blkdiscard.8
>> > @@ -264,7 +255,6 @@ usr/share/bash-completion
>> > #usr/share/man/man8/cfdisk.8
>> > #usr/share/man/man8/chcpu.8
>> > #usr/share/man/man8/ctrlaltdel.8
>> > -#usr/share/man/man8/cytune.8
>> > #usr/share/man/man8/delpart.8
>> > #usr/share/man/man8/fdformat.8
>> > #usr/share/man/man8/fdisk.8
>> > @@ -282,13 +272,13 @@ usr/share/bash-completion
>> > #usr/share/man/man8/losetup.8
>> > #usr/share/man/man8/lsblk.8
>> > #usr/share/man/man8/lslocks.8
>> > +#usr/share/man/man8/lsns.8
>> > #usr/share/man/man8/mkfs.8
>> > #usr/share/man/man8/mkfs.bfs.8
>> > #usr/share/man/man8/mkfs.cramfs.8
>> > #usr/share/man/man8/mkfs.minix.8
>> > #usr/share/man/man8/mkswap.8
>> > #usr/share/man/man8/mount.8
>> > -#usr/share/man/man8/nologin.8
>> > #usr/share/man/man8/partx.8
>> > #usr/share/man/man8/pivot_root.8
>> > #usr/share/man/man8/raw.8
>> > @@ -302,5 +292,8 @@ usr/share/bash-completion
>> > #usr/share/man/man8/swapon.8
>> > #usr/share/man/man8/switch_root.8
>> > #usr/share/man/man8/umount.8
>> > +#usr/share/man/man8/uname26.8
>> > #usr/share/man/man8/wdctl.8
>> > #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
>> > #etc/fcron.daily
>> > etc/fcron.daily/trim
>> > lib/libblkid.so.1.1.0
>> > +lib/libfdisk.so.1
>> > +lib/libfdisk.so.1.1.0
>> > lib/libmount.so.1
>> > lib/libmount.so.1.1.0
>> > +lib/libsmartcols.so.1
>> > +lib/libsmartcols.so.1.1.0
>> > lib/libuuid.so.1.3.0
>> > sbin/agetty
>> > sbin/blkdiscard
>> > @@ -29,7 +33,6 @@ sbin/mkfs
>> > #sbin/mkfs.cramfs
>> > sbin/mkfs.minix
>> > sbin/mkswap
>> > -sbin/nologin
>> > #sbin/pivot_root
>> > sbin/raw
>> > sbin/sfdisk
>> > @@ -38,13 +41,13 @@ sbin/swapoff
>> > sbin/swapon
>> > sbin/switch_root
>> > sbin/wipefs
>> > +sbin/zramctl
>> > #usr/bin/cal
>> > #usr/bin/chrt
>> > #usr/bin/col
>> > #usr/bin/colcrt
>> > #usr/bin/colrm
>> > #usr/bin/column
>> > -#usr/bin/cytune
>> > usr/bin/eject
>> > usr/bin/fallocate
>> > usr/bin/flock
>> > @@ -61,7 +64,10 @@ usr/bin/ionice
>> > usr/bin/logger
>> > #usr/bin/look
>> > usr/bin/lscpu
>> > +usr/bin/lsipc
>> > usr/bin/lslocks
>> > +usr/bin/lslogins
>> > +usr/bin/lsns
>> > #usr/bin/mcookie
>> > #usr/bin/namei
>> > #usr/bin/nsenter
>> > @@ -78,17 +84,27 @@ usr/bin/setsid
>> > usr/bin/tailf
>> > #usr/bin/taskset
>> > #usr/bin/ul
>> > +#usr/bin/uname26
>> > #usr/bin/unshare
>> > #usr/bin/whereis
>> > -#usr/bin/x86_64
>> > +usr/bin/x86_64
>> > +#usr/include/libfdisk
>> > +#usr/include/libfdisk/libfdisk.h
>> > #usr/include/libmount
>> > #usr/include/libmount/libmount.h
>> > +#usr/include/libsmartcols
>> > +#usr/include/libsmartcols/libsmartcols.h
>> > #usr/lib/libblkid.la
>> > -#usr/lib/libmount.a
>> > +#usr/lib/libfdisk.la
>> > +#usr/lib/libfdisk.so
>> > #usr/lib/libmount.la
>> > #usr/lib/libmount.so
>> > +#usr/lib/libsmartcols.la
>> > +#usr/lib/libsmartcols.so
>> > #usr/lib/libuuid.la
>> > +#usr/lib/pkgconfig/fdisk.pc
>> > #usr/lib/pkgconfig/mount.pc
>> > +#usr/lib/pkgconfig/smartcols.pc
>> > usr/sbin/addpart
>> > usr/sbin/delpart
>> > usr/sbin/fdformat
>> > @@ -97,8 +113,6 @@ usr/sbin/partx
>> > #usr/sbin/readprofile
>> > usr/sbin/resizepart
>> > usr/sbin/rtcwake
>> > -usr/share/bash-completion
>> > -#usr/share/bash-completion/completions
>> > #usr/share/bash-completion/completions/addpart
>> > #usr/share/bash-completion/completions/blkdiscard
>> > #usr/share/bash-completion/completions/blkid
>> > @@ -112,7 +126,6 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/colrm
>> > #usr/share/bash-completion/completions/column
>> > #usr/share/bash-completion/completions/ctrlaltdel
>> > -#usr/share/bash-completion/completions/cytune
>> > #usr/share/bash-completion/completions/delpart
>> > #usr/share/bash-completion/completions/dmesg
>> > #usr/share/bash-completion/completions/eject
>> > @@ -130,16 +143,21 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/hexdump
>> > #usr/share/bash-completion/completions/hwclock
>> > #usr/share/bash-completion/completions/ionice
>> > +#usr/share/bash-completion/completions/ipcmk
>> > #usr/share/bash-completion/completions/ipcrm
>> > #usr/share/bash-completion/completions/ipcs
>> > #usr/share/bash-completion/completions/isosize
>> > +#usr/share/bash-completion/completions/last
>> > #usr/share/bash-completion/completions/ldattach
>> > #usr/share/bash-completion/completions/logger
>> > #usr/share/bash-completion/completions/look
>> > #usr/share/bash-completion/completions/losetup
>> > #usr/share/bash-completion/completions/lsblk
>> > #usr/share/bash-completion/completions/lscpu
>> > +#usr/share/bash-completion/completions/lsipc
>> > #usr/share/bash-completion/completions/lslocks
>> > +#usr/share/bash-completion/completions/lslogins
>> > +#usr/share/bash-completion/completions/lsns
>> > #usr/share/bash-completion/completions/mcookie
>> > #usr/share/bash-completion/completions/mesg
>> > #usr/share/bash-completion/completions/mkfs
>> > @@ -148,6 +166,7 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/mkfs.minix
>> > #usr/share/bash-completion/completions/mkswap
>> > #usr/share/bash-completion/completions/more
>> > +#usr/share/bash-completion/completions/mount
>> > #usr/share/bash-completion/completions/mountpoint
>> > #usr/share/bash-completion/completions/namei
>> > #usr/share/bash-completion/completions/nsenter
>> > @@ -169,10 +188,12 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/setterm
>> > #usr/share/bash-completion/completions/sfdisk
>> > #usr/share/bash-completion/completions/swaplabel
>> > +#usr/share/bash-completion/completions/swapoff
>> > #usr/share/bash-completion/completions/swapon
>> > #usr/share/bash-completion/completions/tailf
>> > #usr/share/bash-completion/completions/taskset
>> > #usr/share/bash-completion/completions/ul
>> > +#usr/share/bash-completion/completions/umount
>> > #usr/share/bash-completion/completions/unshare
>> > #usr/share/bash-completion/completions/utmpdump
>> > #usr/share/bash-completion/completions/uuidd
>> > @@ -181,36 +202,11 @@ usr/share/bash-completion
>> > #usr/share/bash-completion/completions/wdctl
>> > #usr/share/bash-completion/completions/whereis
>> > #usr/share/bash-completion/completions/wipefs
>> > +#usr/share/bash-completion/completions/zramctl
>> > #usr/share/doc/util-linux
>> > #usr/share/doc/util-linux/getopt
>> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
>> > #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
>> > #usr/share/man/man1/cal.1
>> > #usr/share/man/man1/chrt.1
>> > #usr/share/man/man1/col.1
>> > @@ -230,6 +226,8 @@ usr/share/bash-completion
>> > #usr/share/man/man1/logger.1
>> > #usr/share/man/man1/look.1
>> > #usr/share/man/man1/lscpu.1
>> > +#usr/share/man/man1/lsipc.1
>> > +#usr/share/man/man1/lslogins.1
>> > #usr/share/man/man1/mcookie.1
>> > #usr/share/man/man1/more.1
>> > #usr/share/man/man1/namei.1
>> > @@ -250,6 +248,7 @@ usr/share/bash-completion
>> > #usr/share/man/man1/whereis.1
>> > #usr/share/man/man3/uuid_generate_time_safe.3
>> > #usr/share/man/man5/fstab.5
>> > +#usr/share/man/man5/terminal-colors.d.5
>> > #usr/share/man/man8/addpart.8
>> > #usr/share/man/man8/agetty.8
>> > #usr/share/man/man8/blkdiscard.8
>> > @@ -257,7 +256,6 @@ usr/share/bash-completion
>> > #usr/share/man/man8/cfdisk.8
>> > #usr/share/man/man8/chcpu.8
>> > #usr/share/man/man8/ctrlaltdel.8
>> > -#usr/share/man/man8/cytune.8
>> > #usr/share/man/man8/delpart.8
>> > #usr/share/man/man8/fdformat.8
>> > #usr/share/man/man8/fdisk.8
>> > @@ -275,13 +273,13 @@ usr/share/bash-completion
>> > #usr/share/man/man8/losetup.8
>> > #usr/share/man/man8/lsblk.8
>> > #usr/share/man/man8/lslocks.8
>> > +#usr/share/man/man8/lsns.8
>> > #usr/share/man/man8/mkfs.8
>> > #usr/share/man/man8/mkfs.bfs.8
>> > #usr/share/man/man8/mkfs.cramfs.8
>> > #usr/share/man/man8/mkfs.minix.8
>> > #usr/share/man/man8/mkswap.8
>> > #usr/share/man/man8/mount.8
>> > -#usr/share/man/man8/nologin.8
>> > #usr/share/man/man8/partx.8
>> > #usr/share/man/man8/pivot_root.8
>> > #usr/share/man/man8/raw.8
>> > @@ -295,6 +293,8 @@ usr/share/bash-completion
>> > #usr/share/man/man8/swapon.8
>> > #usr/share/man/man8/switch_root.8
>> > #usr/share/man/man8/umount.8
>> > +#usr/share/man/man8/uname26.8
>> > #usr/share/man/man8/wdctl.8
>> > #usr/share/man/man8/wipefs.8
>> > #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 @@
>> > ####################################################################
>> > ###########
>> > #
>> > #
>> > # IPFire.org - A linux based
>> > firewall #
>> > -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org>
>> > #
>> > +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org>
>> > #
>> > #
>> > #
>> > # This program is free software: you can redistribute it and/or
>> > modify #
>> > # it under the terms of the GNU General Public License as published
>> > by #
>> > @@ -24,13 +24,15 @@
>> >
>> > include Config
>> >
>> > -VER = 2.24
>> > +VER = 2.28.2
>> >
>> > THISAPP = util-linux-$(VER)
>> > DL_FILE = $(THISAPP).tar.xz
>> > DL_FROM = $(URL_IPFIRE)
>> > DIR_APP = $(DIR_SRC)/$(THISAPP)
>> > TARGET = $(DIR_INFO)/$(THISAPP)
>> > +PROG = util-linux
>> > +
>> >
>> > ####################################################################
>> > ###########
>> > # Top-level Rules
>> > @@ -40,7 +42,7 @@ objects = $(DL_FILE)
>> >
>> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> >
>> > -$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
>> > +$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
>> >
>> > install : $(TARGET)
>> >
>> > @@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>> >
>> > md5 : $(subst %,%_MD5,$(objects))
>> >
>> > +dist:
>> > + @$(PAK)
>> > +
>> > ####################################################################
>> > ###########
>> > # Downloading, checking, md5sum
>> > ####################################################################
>> > ###########
>> > @@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) :
>> > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> > @$(PREBUILD)
>> > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
>> > $(DIR_DL)/$(DL_FILE)
>> > - cd $(DIR_APP) && ./configure
>> > - cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes
>> > HAVE_SLN=yes
>> > - cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
>> > + cd $(DIR_APP) && ./configure \
>> > + --docdir=/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
>> > # Install fstrim cronjob
>> > mkdir -p /etc/fcron.daily
>> > install -m 0755 $(DIR_SRC)/config/fstrim/trim
>> > /etc/fcron.daily/trim
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] util-linux: update to 2.28.2
2017-06-08 19:37 ` Marcel Lorenz
@ 2017-06-08 19:56 ` Marcel Lorenz
0 siblings, 0 replies; 7+ messages in thread
From: Marcel Lorenz @ 2017-06-08 19:56 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 24627 bytes --]
Oh,
nologin even comes from current shadow i seen...
This is double build. The Shadow nologin is the newer.
Marcel
Am 2017-06-08 21:37, schrieb Marcel Lorenz:
> 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
> tested is 2.28.2
>
> Best,
> Marcel
>
> Am 2017-06-08 17:54, schrieb Michael Tremer:
>> Hello,
>>
>> this patch is not OK.
>>
>> It disables /sbin/nologin which we use for quite a few system user
>> accounts so
>> that they cannot log in.
>>
>> -Michael
>>
>> On Thu, 2017-06-08 at 08:19 +0200, Stefan Schantl wrote:
>>> Hello Marcel,
>>>
>>> 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.
>>>
>>> @Michael: Please merge this patch and could you add the missing
>>> rootfile.
>>>
>>> Thanks in advance,
>>>
>>> -Stefan
>>>
>>> Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>>>
>>> > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
>>> > ---
>>> > config/rootfiles/common/i586/util-linux | 77 ++++++++++++++-------
>>> > ----------
>>> > config/rootfiles/common/x86_64/util-linux | 70 ++++++++++++++-------
>>> > -------
>>> > lfs/util-linux | 31 ++++++++++---
>>> > 3 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
>>> > #etc/fcron.daily
>>> > etc/fcron.daily/trim
>>> > lib/libblkid.so.1.1.0
>>> > +lib/libfdisk.so.1
>>> > +lib/libfdisk.so.1.1.0
>>> > lib/libmount.so.1
>>> > lib/libmount.so.1.1.0
>>> > +lib/libsmartcols.so.1
>>> > +lib/libsmartcols.so.1.1.0
>>> > lib/libuuid.so.1.3.0
>>> > sbin/agetty
>>> > sbin/blkdiscard
>>> > @@ -29,7 +33,6 @@ sbin/mkfs
>>> > #sbin/mkfs.cramfs
>>> > sbin/mkfs.minix
>>> > sbin/mkswap
>>> > -sbin/nologin
>>> > #sbin/pivot_root
>>> > sbin/raw
>>> > sbin/sfdisk
>>> > @@ -38,13 +41,13 @@ sbin/swapoff
>>> > sbin/swapon
>>> > sbin/switch_root
>>> > sbin/wipefs
>>> > +sbin/zramctl
>>> > #usr/bin/cal
>>> > #usr/bin/chrt
>>> > #usr/bin/col
>>> > #usr/bin/colcrt
>>> > #usr/bin/colrm
>>> > #usr/bin/column
>>> > -#usr/bin/cytune
>>> > usr/bin/eject
>>> > usr/bin/fallocate
>>> > usr/bin/flock
>>> > @@ -61,7 +64,10 @@ usr/bin/ionice
>>> > usr/bin/logger
>>> > #usr/bin/look
>>> > usr/bin/lscpu
>>> > +usr/bin/lsipc
>>> > usr/bin/lslocks
>>> > +usr/bin/lslogins
>>> > +usr/bin/lsns
>>> > #usr/bin/mcookie
>>> > #usr/bin/namei
>>> > #usr/bin/nsenter
>>> > @@ -78,16 +84,26 @@ usr/bin/setsid
>>> > usr/bin/tailf
>>> > #usr/bin/taskset
>>> > #usr/bin/ul
>>> > +#usr/bin/uname26
>>> > #usr/bin/unshare
>>> > #usr/bin/whereis
>>> > +#usr/include/libfdisk
>>> > +#usr/include/libfdisk/libfdisk.h
>>> > #usr/include/libmount
>>> > #usr/include/libmount/libmount.h
>>> > +#usr/include/libsmartcols
>>> > +#usr/include/libsmartcols/libsmartcols.h
>>> > #usr/lib/libblkid.la
>>> > -#usr/lib/libmount.a
>>> > +#usr/lib/libfdisk.la
>>> > +#usr/lib/libfdisk.so
>>> > #usr/lib/libmount.la
>>> > #usr/lib/libmount.so
>>> > +#usr/lib/libsmartcols.la
>>> > +#usr/lib/libsmartcols.so
>>> > #usr/lib/libuuid.la
>>> > +#usr/lib/pkgconfig/fdisk.pc
>>> > #usr/lib/pkgconfig/mount.pc
>>> > +#usr/lib/pkgconfig/smartcols.pc
>>> > usr/sbin/addpart
>>> > usr/sbin/delpart
>>> > usr/sbin/fdformat
>>> > @@ -96,8 +112,6 @@ usr/sbin/partx
>>> > #usr/sbin/readprofile
>>> > usr/sbin/resizepart
>>> > usr/sbin/rtcwake
>>> > -usr/share/bash-completion
>>> > -#usr/share/bash-completion/completions
>>> > #usr/share/bash-completion/completions/addpart
>>> > #usr/share/bash-completion/completions/blkdiscard
>>> > #usr/share/bash-completion/completions/blkid
>>> > @@ -111,7 +125,6 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/colrm
>>> > #usr/share/bash-completion/completions/column
>>> > #usr/share/bash-completion/completions/ctrlaltdel
>>> > -#usr/share/bash-completion/completions/cytune
>>> > #usr/share/bash-completion/completions/delpart
>>> > #usr/share/bash-completion/completions/dmesg
>>> > #usr/share/bash-completion/completions/eject
>>> > @@ -129,16 +142,21 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/hexdump
>>> > #usr/share/bash-completion/completions/hwclock
>>> > #usr/share/bash-completion/completions/ionice
>>> > +#usr/share/bash-completion/completions/ipcmk
>>> > #usr/share/bash-completion/completions/ipcrm
>>> > #usr/share/bash-completion/completions/ipcs
>>> > #usr/share/bash-completion/completions/isosize
>>> > +#usr/share/bash-completion/completions/last
>>> > #usr/share/bash-completion/completions/ldattach
>>> > #usr/share/bash-completion/completions/logger
>>> > #usr/share/bash-completion/completions/look
>>> > #usr/share/bash-completion/completions/losetup
>>> > #usr/share/bash-completion/completions/lsblk
>>> > #usr/share/bash-completion/completions/lscpu
>>> > +#usr/share/bash-completion/completions/lsipc
>>> > #usr/share/bash-completion/completions/lslocks
>>> > +#usr/share/bash-completion/completions/lslogins
>>> > +#usr/share/bash-completion/completions/lsns
>>> > #usr/share/bash-completion/completions/mcookie
>>> > #usr/share/bash-completion/completions/mesg
>>> > #usr/share/bash-completion/completions/mkfs
>>> > @@ -147,6 +165,7 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/mkfs.minix
>>> > #usr/share/bash-completion/completions/mkswap
>>> > #usr/share/bash-completion/completions/more
>>> > +#usr/share/bash-completion/completions/mount
>>> > #usr/share/bash-completion/completions/mountpoint
>>> > #usr/share/bash-completion/completions/namei
>>> > #usr/share/bash-completion/completions/nsenter
>>> > @@ -168,10 +187,12 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/setterm
>>> > #usr/share/bash-completion/completions/sfdisk
>>> > #usr/share/bash-completion/completions/swaplabel
>>> > +#usr/share/bash-completion/completions/swapoff
>>> > #usr/share/bash-completion/completions/swapon
>>> > #usr/share/bash-completion/completions/tailf
>>> > #usr/share/bash-completion/completions/taskset
>>> > #usr/share/bash-completion/completions/ul
>>> > +#usr/share/bash-completion/completions/umount
>>> > #usr/share/bash-completion/completions/unshare
>>> > #usr/share/bash-completion/completions/utmpdump
>>> > #usr/share/bash-completion/completions/uuidd
>>> > @@ -180,44 +201,11 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/wdctl
>>> > #usr/share/bash-completion/completions/whereis
>>> > #usr/share/bash-completion/completions/wipefs
>>> > +#usr/share/bash-completion/completions/zramctl
>>> > #usr/share/doc/util-linux
>>> > #usr/share/doc/util-linux/getopt
>>> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
>>> > #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
>>> > #usr/share/man/man1/cal.1
>>> > #usr/share/man/man1/chrt.1
>>> > #usr/share/man/man1/col.1
>>> > @@ -237,6 +225,8 @@ usr/share/bash-completion
>>> > #usr/share/man/man1/logger.1
>>> > #usr/share/man/man1/look.1
>>> > #usr/share/man/man1/lscpu.1
>>> > +#usr/share/man/man1/lsipc.1
>>> > +#usr/share/man/man1/lslogins.1
>>> > #usr/share/man/man1/mcookie.1
>>> > #usr/share/man/man1/more.1
>>> > #usr/share/man/man1/namei.1
>>> > @@ -257,6 +247,7 @@ usr/share/bash-completion
>>> > #usr/share/man/man1/whereis.1
>>> > #usr/share/man/man3/uuid_generate_time_safe.3
>>> > #usr/share/man/man5/fstab.5
>>> > +#usr/share/man/man5/terminal-colors.d.5
>>> > #usr/share/man/man8/addpart.8
>>> > #usr/share/man/man8/agetty.8
>>> > #usr/share/man/man8/blkdiscard.8
>>> > @@ -264,7 +255,6 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/cfdisk.8
>>> > #usr/share/man/man8/chcpu.8
>>> > #usr/share/man/man8/ctrlaltdel.8
>>> > -#usr/share/man/man8/cytune.8
>>> > #usr/share/man/man8/delpart.8
>>> > #usr/share/man/man8/fdformat.8
>>> > #usr/share/man/man8/fdisk.8
>>> > @@ -282,13 +272,13 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/losetup.8
>>> > #usr/share/man/man8/lsblk.8
>>> > #usr/share/man/man8/lslocks.8
>>> > +#usr/share/man/man8/lsns.8
>>> > #usr/share/man/man8/mkfs.8
>>> > #usr/share/man/man8/mkfs.bfs.8
>>> > #usr/share/man/man8/mkfs.cramfs.8
>>> > #usr/share/man/man8/mkfs.minix.8
>>> > #usr/share/man/man8/mkswap.8
>>> > #usr/share/man/man8/mount.8
>>> > -#usr/share/man/man8/nologin.8
>>> > #usr/share/man/man8/partx.8
>>> > #usr/share/man/man8/pivot_root.8
>>> > #usr/share/man/man8/raw.8
>>> > @@ -302,5 +292,8 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/swapon.8
>>> > #usr/share/man/man8/switch_root.8
>>> > #usr/share/man/man8/umount.8
>>> > +#usr/share/man/man8/uname26.8
>>> > #usr/share/man/man8/wdctl.8
>>> > #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
>>> > #etc/fcron.daily
>>> > etc/fcron.daily/trim
>>> > lib/libblkid.so.1.1.0
>>> > +lib/libfdisk.so.1
>>> > +lib/libfdisk.so.1.1.0
>>> > lib/libmount.so.1
>>> > lib/libmount.so.1.1.0
>>> > +lib/libsmartcols.so.1
>>> > +lib/libsmartcols.so.1.1.0
>>> > lib/libuuid.so.1.3.0
>>> > sbin/agetty
>>> > sbin/blkdiscard
>>> > @@ -29,7 +33,6 @@ sbin/mkfs
>>> > #sbin/mkfs.cramfs
>>> > sbin/mkfs.minix
>>> > sbin/mkswap
>>> > -sbin/nologin
>>> > #sbin/pivot_root
>>> > sbin/raw
>>> > sbin/sfdisk
>>> > @@ -38,13 +41,13 @@ sbin/swapoff
>>> > sbin/swapon
>>> > sbin/switch_root
>>> > sbin/wipefs
>>> > +sbin/zramctl
>>> > #usr/bin/cal
>>> > #usr/bin/chrt
>>> > #usr/bin/col
>>> > #usr/bin/colcrt
>>> > #usr/bin/colrm
>>> > #usr/bin/column
>>> > -#usr/bin/cytune
>>> > usr/bin/eject
>>> > usr/bin/fallocate
>>> > usr/bin/flock
>>> > @@ -61,7 +64,10 @@ usr/bin/ionice
>>> > usr/bin/logger
>>> > #usr/bin/look
>>> > usr/bin/lscpu
>>> > +usr/bin/lsipc
>>> > usr/bin/lslocks
>>> > +usr/bin/lslogins
>>> > +usr/bin/lsns
>>> > #usr/bin/mcookie
>>> > #usr/bin/namei
>>> > #usr/bin/nsenter
>>> > @@ -78,17 +84,27 @@ usr/bin/setsid
>>> > usr/bin/tailf
>>> > #usr/bin/taskset
>>> > #usr/bin/ul
>>> > +#usr/bin/uname26
>>> > #usr/bin/unshare
>>> > #usr/bin/whereis
>>> > -#usr/bin/x86_64
>>> > +usr/bin/x86_64
>>> > +#usr/include/libfdisk
>>> > +#usr/include/libfdisk/libfdisk.h
>>> > #usr/include/libmount
>>> > #usr/include/libmount/libmount.h
>>> > +#usr/include/libsmartcols
>>> > +#usr/include/libsmartcols/libsmartcols.h
>>> > #usr/lib/libblkid.la
>>> > -#usr/lib/libmount.a
>>> > +#usr/lib/libfdisk.la
>>> > +#usr/lib/libfdisk.so
>>> > #usr/lib/libmount.la
>>> > #usr/lib/libmount.so
>>> > +#usr/lib/libsmartcols.la
>>> > +#usr/lib/libsmartcols.so
>>> > #usr/lib/libuuid.la
>>> > +#usr/lib/pkgconfig/fdisk.pc
>>> > #usr/lib/pkgconfig/mount.pc
>>> > +#usr/lib/pkgconfig/smartcols.pc
>>> > usr/sbin/addpart
>>> > usr/sbin/delpart
>>> > usr/sbin/fdformat
>>> > @@ -97,8 +113,6 @@ usr/sbin/partx
>>> > #usr/sbin/readprofile
>>> > usr/sbin/resizepart
>>> > usr/sbin/rtcwake
>>> > -usr/share/bash-completion
>>> > -#usr/share/bash-completion/completions
>>> > #usr/share/bash-completion/completions/addpart
>>> > #usr/share/bash-completion/completions/blkdiscard
>>> > #usr/share/bash-completion/completions/blkid
>>> > @@ -112,7 +126,6 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/colrm
>>> > #usr/share/bash-completion/completions/column
>>> > #usr/share/bash-completion/completions/ctrlaltdel
>>> > -#usr/share/bash-completion/completions/cytune
>>> > #usr/share/bash-completion/completions/delpart
>>> > #usr/share/bash-completion/completions/dmesg
>>> > #usr/share/bash-completion/completions/eject
>>> > @@ -130,16 +143,21 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/hexdump
>>> > #usr/share/bash-completion/completions/hwclock
>>> > #usr/share/bash-completion/completions/ionice
>>> > +#usr/share/bash-completion/completions/ipcmk
>>> > #usr/share/bash-completion/completions/ipcrm
>>> > #usr/share/bash-completion/completions/ipcs
>>> > #usr/share/bash-completion/completions/isosize
>>> > +#usr/share/bash-completion/completions/last
>>> > #usr/share/bash-completion/completions/ldattach
>>> > #usr/share/bash-completion/completions/logger
>>> > #usr/share/bash-completion/completions/look
>>> > #usr/share/bash-completion/completions/losetup
>>> > #usr/share/bash-completion/completions/lsblk
>>> > #usr/share/bash-completion/completions/lscpu
>>> > +#usr/share/bash-completion/completions/lsipc
>>> > #usr/share/bash-completion/completions/lslocks
>>> > +#usr/share/bash-completion/completions/lslogins
>>> > +#usr/share/bash-completion/completions/lsns
>>> > #usr/share/bash-completion/completions/mcookie
>>> > #usr/share/bash-completion/completions/mesg
>>> > #usr/share/bash-completion/completions/mkfs
>>> > @@ -148,6 +166,7 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/mkfs.minix
>>> > #usr/share/bash-completion/completions/mkswap
>>> > #usr/share/bash-completion/completions/more
>>> > +#usr/share/bash-completion/completions/mount
>>> > #usr/share/bash-completion/completions/mountpoint
>>> > #usr/share/bash-completion/completions/namei
>>> > #usr/share/bash-completion/completions/nsenter
>>> > @@ -169,10 +188,12 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/setterm
>>> > #usr/share/bash-completion/completions/sfdisk
>>> > #usr/share/bash-completion/completions/swaplabel
>>> > +#usr/share/bash-completion/completions/swapoff
>>> > #usr/share/bash-completion/completions/swapon
>>> > #usr/share/bash-completion/completions/tailf
>>> > #usr/share/bash-completion/completions/taskset
>>> > #usr/share/bash-completion/completions/ul
>>> > +#usr/share/bash-completion/completions/umount
>>> > #usr/share/bash-completion/completions/unshare
>>> > #usr/share/bash-completion/completions/utmpdump
>>> > #usr/share/bash-completion/completions/uuidd
>>> > @@ -181,36 +202,11 @@ usr/share/bash-completion
>>> > #usr/share/bash-completion/completions/wdctl
>>> > #usr/share/bash-completion/completions/whereis
>>> > #usr/share/bash-completion/completions/wipefs
>>> > +#usr/share/bash-completion/completions/zramctl
>>> > #usr/share/doc/util-linux
>>> > #usr/share/doc/util-linux/getopt
>>> > #usr/share/doc/util-linux/getopt/getopt-parse.bash
>>> > #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
>>> > #usr/share/man/man1/cal.1
>>> > #usr/share/man/man1/chrt.1
>>> > #usr/share/man/man1/col.1
>>> > @@ -230,6 +226,8 @@ usr/share/bash-completion
>>> > #usr/share/man/man1/logger.1
>>> > #usr/share/man/man1/look.1
>>> > #usr/share/man/man1/lscpu.1
>>> > +#usr/share/man/man1/lsipc.1
>>> > +#usr/share/man/man1/lslogins.1
>>> > #usr/share/man/man1/mcookie.1
>>> > #usr/share/man/man1/more.1
>>> > #usr/share/man/man1/namei.1
>>> > @@ -250,6 +248,7 @@ usr/share/bash-completion
>>> > #usr/share/man/man1/whereis.1
>>> > #usr/share/man/man3/uuid_generate_time_safe.3
>>> > #usr/share/man/man5/fstab.5
>>> > +#usr/share/man/man5/terminal-colors.d.5
>>> > #usr/share/man/man8/addpart.8
>>> > #usr/share/man/man8/agetty.8
>>> > #usr/share/man/man8/blkdiscard.8
>>> > @@ -257,7 +256,6 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/cfdisk.8
>>> > #usr/share/man/man8/chcpu.8
>>> > #usr/share/man/man8/ctrlaltdel.8
>>> > -#usr/share/man/man8/cytune.8
>>> > #usr/share/man/man8/delpart.8
>>> > #usr/share/man/man8/fdformat.8
>>> > #usr/share/man/man8/fdisk.8
>>> > @@ -275,13 +273,13 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/losetup.8
>>> > #usr/share/man/man8/lsblk.8
>>> > #usr/share/man/man8/lslocks.8
>>> > +#usr/share/man/man8/lsns.8
>>> > #usr/share/man/man8/mkfs.8
>>> > #usr/share/man/man8/mkfs.bfs.8
>>> > #usr/share/man/man8/mkfs.cramfs.8
>>> > #usr/share/man/man8/mkfs.minix.8
>>> > #usr/share/man/man8/mkswap.8
>>> > #usr/share/man/man8/mount.8
>>> > -#usr/share/man/man8/nologin.8
>>> > #usr/share/man/man8/partx.8
>>> > #usr/share/man/man8/pivot_root.8
>>> > #usr/share/man/man8/raw.8
>>> > @@ -295,6 +293,8 @@ usr/share/bash-completion
>>> > #usr/share/man/man8/swapon.8
>>> > #usr/share/man/man8/switch_root.8
>>> > #usr/share/man/man8/umount.8
>>> > +#usr/share/man/man8/uname26.8
>>> > #usr/share/man/man8/wdctl.8
>>> > #usr/share/man/man8/wipefs.8
>>> > #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 @@
>>> > ####################################################################
>>> > ###########
>>> > #
>>> > #
>>> > # IPFire.org - A linux based
>>> > firewall #
>>> > -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org>
>>> > #
>>> > +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org>
>>> > #
>>> > #
>>> > #
>>> > # This program is free software: you can redistribute it and/or
>>> > modify #
>>> > # it under the terms of the GNU General Public License as published
>>> > by #
>>> > @@ -24,13 +24,15 @@
>>> >
>>> > include Config
>>> >
>>> > -VER = 2.24
>>> > +VER = 2.28.2
>>> >
>>> > THISAPP = util-linux-$(VER)
>>> > DL_FILE = $(THISAPP).tar.xz
>>> > DL_FROM = $(URL_IPFIRE)
>>> > DIR_APP = $(DIR_SRC)/$(THISAPP)
>>> > TARGET = $(DIR_INFO)/$(THISAPP)
>>> > +PROG = util-linux
>>> > +
>>> >
>>> > ####################################################################
>>> > ###########
>>> > # Top-level Rules
>>> > @@ -40,7 +42,7 @@ objects = $(DL_FILE)
>>> >
>>> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> >
>>> > -$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
>>> > +$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
>>> >
>>> > install : $(TARGET)
>>> >
>>> > @@ -50,6 +52,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>> >
>>> > md5 : $(subst %,%_MD5,$(objects))
>>> >
>>> > +dist:
>>> > + @$(PAK)
>>> > +
>>> > ####################################################################
>>> > ###########
>>> > # Downloading, checking, md5sum
>>> > ####################################################################
>>> > ###########
>>> > @@ -70,9 +75,23 @@ $(subst %,%_MD5,$(objects)) :
>>> > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> > @$(PREBUILD)
>>> > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
>>> > $(DIR_DL)/$(DL_FILE)
>>> > - cd $(DIR_APP) && ./configure
>>> > - cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes
>>> > HAVE_SLN=yes
>>> > - cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
>>> > + cd $(DIR_APP) && ./configure \
>>> > + --docdir=/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
>>> > # Install fstrim cronjob
>>> > mkdir -p /etc/fcron.daily
>>> > install -m 0755 $(DIR_SRC)/config/fstrim/trim
>>> > /etc/fcron.daily/trim
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] util-linux: Update to 2.28.2.
@ 2016-10-05 8:08 Stefan Schantl
0 siblings, 0 replies; 7+ messages in thread
From: Stefan Schantl @ 2016-10-05 8:08 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
This is an major update to the latest stable version of util-linux.
The release-notes can be found here:
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes
Drop support for SELinux.
Fixes #11234.
Fixes #11232.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
util-linux/util-linux.nm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 4d14b85..344e19c 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,10 +4,10 @@
###############################################################################
name = util-linux
-major_ver = 2.27
-minor_ver =
-version = %{major_ver}
-#version = %{major_ver}.%{minor_ver}
+major_ver = 2.28
+minor_ver = 2
+#version = %{major_ver}
+version = %{major_ver}.%{minor_ver}
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -33,8 +33,6 @@ build
gettext
libcap-devel
libcap-ng-devel
- libselinux-devel
- libsepol-devel
libudev-devel
ncurses-devel
pam-devel
@@ -58,7 +56,6 @@ build
--enable-runuser \
--enable-su \
--with-systemd \
- --with-selinux \
--with-audit \
--with-udev \
--disable-makeinstall-chown \
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-08 19:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-06 8:38 [PATCH] util-linux update to 2.28.2 Marcel Lorenz
2017-06-06 8:38 ` [PATCH] util-linux: " Marcel Lorenz
2017-06-08 6:19 ` Stefan Schantl
2017-06-08 15:54 ` Michael Tremer
2017-06-08 19:37 ` Marcel Lorenz
2017-06-08 19:56 ` Marcel Lorenz
-- strict thread matches above, loose matches on Subject: below --
2016-10-05 8:08 [PATCH] util-linux: Update " Stefan Schantl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox