# TODO
+# - remote chfn/chsh (BR: libuser)?
# - verify initrd tools set:
# - I've taken list from 2.21.3 package, but there was no explicit list, so
# there are probably some unneeded tools
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
-Version: 2.23.1
-Release: 2
+Version: 2.24.2
+Release: 1
License: GPL
Group: Applications/System
-Source0: https://www.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.xz
-# Source0-md5: 33ba55ce82f8e3b8d7a38fac0f62779a
+Source0: https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
+# Source0-md5: 3f191727a0d28f7204b755cf1b6ea0aa
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
Source9: runuser-l.pamd
Source10: nologin.c
Source11: nologin.8
+Source12: blockdev.service
+Source13: blockdev.sh
Patch0: %{name}-pl.po-update.patch
Patch1: %{name}-ng-union-mount.patch
Patch3: %{name}-fdformat-ide.patch
Patch4: %{name}-fhs.patch
-Patch5: %{name}-hotkeys.patch
Patch7: %{name}-login-lastlog.patch
Patch8: %{name}-procpartitions.patch
Patch9: su-paths.patch
Patch10: %{name}-diet.patch
-# Patch11-md5: 2a37a871117466841edb3e8be692825b
URL: http://userweb.kernel.org/~kzak/util-linux/
BuildRequires: audit-libs-devel >= 1.0.6
BuildRequires: autoconf >= 2.60
%{?with_fallocate:BuildRequires: glibc-devel >= 6:2.11}
BuildRequires: gtk-doc >= 1.10
BuildRequires: gtk-doc-automake >= 1.10
-%{?with_selinux:BuildRequires: libselinux-devel}
+BuildRequires: libcap-ng-devel
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.0}
%{?with_selinux:BuildRequires: libsepol-devel}
BuildRequires: libtool >= 2:2.2
BuildRequires: linux-libc-headers >= 7:2.6.27
BuildRequires: ncurses-devel >= 5.0
BuildRequires: pam-devel >= %{pam_ver}
BuildRequires: pkgconfig
+BuildRequires: python3-devel
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.470
+BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
%endif
%endif
Requires: libblkid = %{version}-%{release}
+%{?with_selinux:Requires: libselinux >= 2.0}
Requires: pam >= %{pam_ver}
Provides: eject = %{version}-%{release}
Provides: fdisk
Obsoletes: util-linux-chkdupexe
Obsoletes: util-linux-ng < 2.20-1
Obsoletes: util-linux-suids
-Conflicts: SysVinit < 2.86-26
-Conflicts: SysVinit-tools < 2.88-9
+Conflicts: SysVinit-tools < 2.88-15
Conflicts: e2fsprogs < 1.41.8-5
+Conflicts: rc-scripts < 0.4.9-2
Conflicts: shadow-extras < 1:4.0.3-6
-Conflicts: upstart-SysVinit < 2.86-28
%if %{with su}
Conflicts: coreutils < 8.19
%endif
Summary(pl.UTF-8): Obsługa blockdev
Group: Applications/System
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: coreutils
Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
%description -n blockdev
The utility blockdev allows one to call block device ioctls from the
Group: Applications/System
Requires: libmount = %{version}-%{release}
Conflicts: SysVinit < 2.86-26
+Conflicts: upstart-SysVinit < 2.86-28
# C: nfs-utils-common is opposite to http://cvs.pld-linux.org/packages/nfs-utils/nfs-utils.spec?r1=1.165&r2=1.166
Conflicts: nfs-utils-common < 1.1.3-3
Requires(pre): /usr/sbin/groupmod
Requires(pre): /usr/sbin/useradd
Requires(pre): /usr/sbin/usermod
-Requires(post,preun,postun): systemd-units >= 38
+Requires(post,preun,postun): systemd-units >= 38
Requires: libuuid = %{version}-%{release}
Requires: systemd-units >= 38
Provides: group(uuidd)
etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
%package -n bash-completion-util-linux
-Summary: bash completion for util-linux
-Summary(pl.UTF-8): Dopełnienia basha dla util-linux
-Group: Applications/Shells
-Requires: %{name} = %{version}-%{release}
-Requires: bash-completion
+Summary: bash completion for util-linux commands
+Summary(pl.UTF-8): Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
%description -n bash-completion-util-linux
-Bash completion for util-linux.
+Bash completion for util-linux commands.
%description -n bash-completion-util-linux -l pl.UTF-8
-Dopełnienia basha dla util-linux.
+Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
+
+%package -n python3-libmount
+Summary: Python 3.x libmount bindings
+Summary(pl.UTF-8): Wiązania Pythona 3.x do biblioteki libmount
+Group: Libraries/Python
+Requires: libmount = %{version}-%{release}
+
+%description -n python3-libmount
+Python 3.x libmount bindings.
+
+%description -n python3-libmount -l pl.UTF-8
+Wiązania Pythona 3.x do biblioteki libmount.
%prep
%setup -q -a1
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%{?with_initrd:%patch10 -p1}
-install %{SOURCE10} nologin.c
+cp -p %{SOURCE10} nologin.c
%{__rm} po/stamp-po
--disable-wall \
--without-audit \
--without-ncurses \
- --without-selinux
+ --without-selinux \
+ --without-smack
# configure gets it unconditionally wrong
%{__sed} -i -e 's/#define HAVE_WIDECHAR 1//' config.h
--enable-utmpdump \
--enable-vipw \
--enable-write \
+ --with-python=3 \
--with-audit \
- --with-bashcompletiondir=/etc/bash_completion.d \
- --with-selinux%{!?with_selinux:=no}
+ --with-bashcompletiondir=/usr/share/bash-completion/completions \
+ --with-selinux%{!?with_selinux:=no} \
+ --with-smack
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
- $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}}
+ $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}} \
+ $RPM_BUILD_ROOT{/lib/systemd/pld-helpers.d,%{systemdunitdir}}
%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
%{__make} install \
mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
mv $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
-install nologin $RPM_BUILD_ROOT/sbin
-install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
+install -p nologin $RPM_BUILD_ROOT/sbin
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/blockdev.service
+cp -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d/blockdev.sh
%if %{with su}
-ln -s ../sbin/runuser $RPM_BUILD_ROOT/bin/runuser
+ln -s ../sbin/runuser $RPM_BUILD_ROOT/bin/runuser
cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/su
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/su-l
cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/runuser
$RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
done
-ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock
+ln -s hwclock $RPM_BUILD_ROOT/sbin/clock
echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
ln -s utmpdump $RPM_BUILD_ROOT%{_bindir}/utmpx-dump
+ln -s mkswap $RPM_BUILD_ROOT/sbin/mkfs.swap
for d in cs de es fi fr hu id it ja ko nl pl ; do
for m in man1 man5 man8 ; do
if [ -d man/$d/$m ]; then
install -d $RPM_BUILD_ROOT%{_mandir}/$d/$m
- cp -a man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
+ cp -p man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
fi
done
done
$RPM_BUILD_ROOT%{_sbindir}/{vigr,vipw} \
$RPM_BUILD_ROOT%{_mandir}/man1/{chfn,chsh,newgrp}.1 \
$RPM_BUILD_ROOT%{_mandir}/man8/{vigr,vipw}.8 \
- $RPM_BUILD_ROOT%{_mandir}/*/man1/{arch,reset}.1 \
+ $RPM_BUILD_ROOT%{_mandir}/*/man1/{arch,chkdupexe,ddate,reset}.1 \
$RPM_BUILD_ROOT%{_mandir}/*/man5/nfs.5 \
$RPM_BUILD_ROOT%{_mandir}/*/man8/{elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8
%endif
# examples
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/getopt/getopt-parse.*sh
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt/getopt-parse.*sh
+
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
%if %{with initrd}
install -d $RPM_BUILD_ROOT%{_libdir}/initrd
# We don't need those
%{__rm} $RPM_BUILD_ROOT%{_libdir}/initrd/{cal,col,colcrt,colrm,column,ctrlaltdel,cytune,dmesg,flock,fsfreeze,fstrim,getopt,hexdump,ipcmk,ipcrm,ipcs,isosize,logger,lslocks,mcookie,mkfs*,readprofile,renice,rev,rtcwake,script,scriptreplay,setsid,tailf,tunelp,wdctl,whereis}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,mount}.la
%if %{with dietlibc}
cp -a initrd/%{_lib}/lib*.a $RPM_BUILD_ROOT%{dietlibdir}
%post -n blockdev
/sbin/chkconfig --add blockdev
%service blockdev restart
+%systemd_post blockdev.service
%preun -n blockdev
if [ "$1" = "0" ]; then
%service blockdev stop
/sbin/chkconfig --del blockdev
fi
+%systemd_preun blockdev.service
+
+%postun -n blockdev
+%systemd_reload
+
+%triggerpostun -n blockdev -- blockdev < 2.24-4
+%systemd_trigger blockdev.service
%post -n libblkid -p /sbin/ldconfig
%postun -n libblkid -p /sbin/ldconfig
%pre -n uuidd
if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
- /usr/sbin/groupmod -n uuidd libuuid
+ /usr/sbin/groupmod -n uuidd libuuid
fi
%groupadd -g 222 uuidd
if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
- /usr/sbin/usermod -l uuidd libuuid
+ /usr/sbin/usermod -l uuidd libuuid
fi
%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd
%postun -n uuidd
if [ "$1" = "0" ]; then
- %userremove uuidd
- %groupremove uuidd
+ %userremove uuidd
+ %groupremove uuidd
fi
%post -n libmount -p /sbin/ldconfig
%attr(755,root,root) /sbin/fsfreeze
%attr(755,root,root) /sbin/fstrim
%attr(755,root,root) /sbin/mkfs
+%attr(755,root,root) /sbin/mkfs.swap
%attr(755,root,root) /sbin/mkswap
%attr(755,root,root) /sbin/sulogin
%attr(755,root,root) /sbin/swaplabel
%attr(755,root,root) %{_bindir}/ipcs
%attr(755,root,root) %{_bindir}/isosize
%attr(755,root,root) %{_bindir}/line
+%attr(755,root,root) %{_bindir}/last
+%attr(755,root,root) %{_bindir}/lastb
%attr(755,root,root) %{_bindir}/logger
%attr(755,root,root) %{_bindir}/look
%attr(755,root,root) %{_bindir}/lscpu
%attr(755,root,root) %{_bindir}/lslocks
+%attr(755,root,root) %{_bindir}/mesg
%attr(755,root,root) %{_bindir}/mcookie
%attr(755,root,root) %{_bindir}/namei
%attr(755,root,root) %{_bindir}/nsenter
%{_mandir}/man1/ipcmk.1*
%{_mandir}/man1/ipcs.1*
%{_mandir}/man1/kill.1*
+%{_mandir}/man1/last.1*
+%{_mandir}/man1/lastb.1*
%{_mandir}/man1/line.1*
%{_mandir}/man1/logger.1*
%{_mandir}/man1/look.1*
%{_mandir}/man1/lscpu.1*
%{_mandir}/man1/mcookie.1*
+%{_mandir}/man1/mesg.1*
%{_mandir}/man1/more.1*
%{_mandir}/man1/namei.1*
%{_mandir}/man1/nsenter.1*
%attr(755,root,root) /sbin/blockdev
%{_mandir}/man8/blockdev.8*
%lang(ja) %{_mandir}/ja/man8/blockdev.8*
+%{systemdunitdir}/blockdev.service
+%attr(755,root,root) /lib/systemd/pld-helpers.d/blockdev.sh
%files -n mount
%defattr(644,root,root,755)
%files -n libblkid-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libblkid.so
-%{_libdir}/libblkid.la
%{_includedir}/blkid
%{_pkgconfigdir}/blkid.pc
%{_mandir}/man3/libblkid.3*
%files -n bash-completion-util-linux
%defattr(644,root,root,755)
-/etc/bash_completion.d/*
+/usr/share/bash-completion/completions/*
%if %{with initrd} && %{with dietlibc}
%files -n libuuid-dietlibc
%files -n libmount-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libmount.so
-%{_libdir}/libmount.la
%{_includedir}/libmount
%{_pkgconfigdir}/mount.pc
%attr(755,root,root) /sbin/fsck
%{_mandir}/man8/fsck.8*
+%files -n python3-libmount
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/libmount
+%{py3_sitedir}/libmount/__init__.py
+%attr(755,root,root) %{py3_sitedir}/libmount/pylibmount.so
+
%if %{with initrd}
%files initrd
%defattr(644,root,root,755)
projects / packages / util-linux.git / blobdiff