[packages/util-linux] - updated to 2.25 - updated pl.po-update,procpartitions patches - removed unmaintained union-mount p

qboosh qboosh at pld-linux.org
Sat Aug 2 10:05:29 CEST 2014 

commit 8b6144a342631d38538e42af5c3f8f478c2f36c1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 2 10:05:25 2014 +0200

    - updated to 2.25
    - updated pl.po-update,procpartitions patches
    - removed unmaintained union-mount patch (dropped from PLD kernel long time ago)

 util-linux-ng-union-mount.patch |  64 ----------------
 util-linux-pl.po-update.patch   | 106 +++++++++++++++++++++------
 util-linux-procpartitions.patch |   4 +-
 util-linux.spec                 | 157 ++++++++++++++++++++++++++--------------
 4 files changed, 189 insertions(+), 142 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 60bceb4..24c41ef 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,5 +1,5 @@
 # TODO
-# - remote chfn/chsh (BR: libuser)?
+# - remote chfn/chsh (BR: libuser)? - but PLD uses pwdutils/shadow implementation currently
 # - 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
@@ -36,12 +36,12 @@ Summary(ru.UTF-8):	Набор базовых системных утилит д
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
-Version:	2.24.2
+Version:	2.25
 Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
-# Source0-md5:	3f191727a0d28f7204b755cf1b6ea0aa
+Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.25/%{name}-%{version}.tar.xz
+# Source0-md5:	4c78fdef4cb882caafad61e33cafbc14
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:	login.pamd
@@ -57,7 +57,6 @@ 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
@@ -65,7 +64,7 @@ Patch7:		%{name}-login-lastlog.patch
 Patch8:		%{name}-procpartitions.patch
 Patch9:		su-paths.patch
 Patch10:	%{name}-diet.patch
-URL:		http://userweb.kernel.org/~kzak/util-linux/
+URL:		https://github.com/karelzak/util-linux
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -102,6 +101,7 @@ BuildRequires:	glibc-static
 %endif
 Requires:	libblkid = %{version}-%{release}
 %{?with_selinux:Requires:	libselinux >= 2.0}
+Requires:	libsmartcols = %{version}-%{release}
 Requires:	pam >= %{pam_ver}
 Provides:	eject = %{version}-%{release}
 Provides:	fdisk
@@ -220,6 +220,7 @@ Summary(ru.UTF-8):	Программы для настройки loopback-уст
 Summary(tr.UTF-8):	Yerel-çevrim aygıtlarının kurulması ve ayarlanması için programlar
 Summary(uk.UTF-8):	Програми для конфігурації loopback-пристроїв
 Group:		Applications/System
+Requires:	libsmartcols = %{version}-%{release}
 
 %description -n losetup
 Linux supports a special block device called the loopback device,
@@ -289,6 +290,7 @@ Summary(tr.UTF-8):	Dosya sistemlerini bağlamak ve çözmek için programlar
 Summary(uk.UTF-8):	Програми для монтування та розмонтування файлових систем
 Group:		Applications/System
 Requires:	libmount = %{version}-%{release}
+Requires:	libsmartcols = %{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
@@ -591,21 +593,17 @@ Static version of mount library.
 %description -n libmount-static -l pl.UTF-8
 Statyczna wersja biblioteki mount.
 
-%package -n libmount-dietlibc
-Summary:	Static dietlibc mount library
-Summary(pl.UTF-8):	Statyczna biblioteka mount dla dietlibc
-License:	LGPL v2.1+
-Group:		Development/Libraries
-Requires:	libblkid-devel = %{version}-%{release}
-Requires:	libblkid-dietlibc = %{version}-%{release}
-Requires:	libuuid-devel = %{version}-%{release}
-Requires:	libuuid-dietlibc = %{version}-%{release}
+%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 libmount-dietlibc
-Static dietlibc version of mount library.
+%description -n python3-libmount
+Python 3.x libmount bindings.
 
-%description -n libmount-dietlibc -l pl.UTF-8
-Statyczna wersja biblioteki mount dla dietlibc.
+%description -n python3-libmount -l pl.UTF-8
+Wiązania Pythona 3.x do biblioteki libmount.
 
 %package -n fsck
 Summary:	Check and repair a Linux file system
@@ -619,6 +617,44 @@ Check and repair a Linux file system.
 %description -n fsck -l pl.UTF-8
 Sprawdzanie i naprawa linuksowego systemu plików.
 
+%package -n libsmartcols
+Summary:	Library to handle tables and trees
+Summary(pl.UTF-8):	Biblioteka do obsługi tabelek i drzewek
+License:	LGPL
+Group:		Libraries
+
+%description -n libsmartcols
+Library to handle tables and trees.
+
+%description -n libsmartcols -l pl.UTF-8
+Biblioteka do obsługi tabelek i drzewek.
+
+%package -n libsmartcols-devel
+Summary:	Header files for smartcols library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki smartcols
+License:	LGPL
+Group:		Development/Libraries
+Requires:	libsmartcols = %{version}-%{release}
+
+%description -n libsmartcols-devel
+Header files for smartcols library.
+
+%description -n libsmartcols-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki smartcols.
+
+%package -n libsmartcols-static
+Summary:	Static version of smartcols library
+Summary(pl.UTF-8):	Statyczna wersja biblioteki smartcols
+License:	LGPL
+Group:		Development/Libraries
+Requires:	libsmartcols-devel = %{version}-%{release}
+
+%description -n libsmartcols-static
+Static version of smartcols library.
+
+%description -n libsmartcols-static -l pl.UTF-8
+Statyczna wersja biblioteki smartcols.
+
 %package initrd
 Summary:	blkid - initrd version
 Summary(pl.UTF-8):	blkid - wersja dla initrd
@@ -650,22 +686,9 @@ Bash completion for util-linux commands.
 %description -n bash-completion-util-linux -l pl.UTF-8
 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
-%patch1 -p1
 
 %patch3 -p1
 %patch4 -p1
@@ -794,8 +817,8 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
+%{__mv} $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
 
 install -p nologin $RPM_BUILD_ROOT/sbin
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
@@ -818,12 +841,17 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/runuser-l
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
 :> $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
-for lib in blkid uuid mount; do
+for lib in blkid uuid mount smartcols; do
 	mv $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so.* $RPM_BUILD_ROOT/%{_lib}
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${lib}.so.*.*.*) \
 		 $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
 done
 
+# python module
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
+# obsoleted by pkg-config (libuuid.la temporarily kept because of packages built with it)
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,mount,smartcols}.la
+
 ln -s hwclock $RPM_BUILD_ROOT/sbin/clock
 echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
 
@@ -860,7 +888,7 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 	$RPM_BUILD_ROOT%{_mandir}/man8/{vigr,vipw}.8 \
 	$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
+	$RPM_BUILD_ROOT%{_mandir}/*/man8/{cytune,elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8
 
 %ifarch sparc sparcv9 sparc64
 # programs not built on sparc
@@ -870,8 +898,6 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 # examples
 %{__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
 install -p initrd/bin/* $RPM_BUILD_ROOT%{_libdir}/initrd
@@ -879,7 +905,7 @@ install -p initrd/sbin/* $RPM_BUILD_ROOT%{_libdir}/initrd
 ln -s fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
 
 # 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}/initrd/{cal,col,colcrt,colrm,column,ctrlaltdel,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}
@@ -935,6 +961,9 @@ fi
 %post	-n libmount -p /sbin/ldconfig
 %postun -n libmount -p /sbin/ldconfig
 
+%post	-n libsmartcols -p /sbin/ldconfig
+%postun -n libsmartcols -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README README.licensing Documentation misc-utils/getopt-parse.{bash,tcsh}
@@ -1017,7 +1046,6 @@ fi
 %attr(755,root,root) %{_bindir}/colcrt
 %attr(755,root,root) %{_bindir}/colrm
 %attr(755,root,root) %{_bindir}/column
-%attr(755,root,root) %{_bindir}/cytune
 %attr(755,root,root) %{_bindir}/eject
 %attr(755,root,root) %{_bindir}/flock
 %{?with_fallocate:%attr(755,root,root) %{_bindir}/fallocate}
@@ -1035,6 +1063,7 @@ fi
 %attr(755,root,root) %{_bindir}/look
 %attr(755,root,root) %{_bindir}/lscpu
 %attr(755,root,root) %{_bindir}/lslocks
+%attr(755,root,root) %{_bindir}/lslogins
 %attr(755,root,root) %{_bindir}/mesg
 %attr(755,root,root) %{_bindir}/mcookie
 %attr(755,root,root) %{_bindir}/namei
@@ -1053,6 +1082,7 @@ fi
 %attr(755,root,root) %{_bindir}/tailf
 %attr(755,root,root) %{_bindir}/taskset
 %attr(755,root,root) %{_bindir}/ul
+%attr(755,root,root) %{_bindir}/uname26
 %attr(755,root,root) %{_bindir}/unshare
 %attr(755,root,root) %{_bindir}/utmpdump
 %attr(755,root,root) %{_bindir}/utmpx-dump
@@ -1064,6 +1094,9 @@ fi
 %attr(755,root,root) %{_sbindir}/resizepart
 %attr(755,root,root) %{_sbindir}/rtcwake
 
+%{systemdunitdir}/fstrim.service
+%{systemdunitdir}/fstrim.timer
+
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/chrt.1*
 %{_mandir}/man1/col.1*
@@ -1087,6 +1120,7 @@ fi
 %{_mandir}/man1/logger.1*
 %{_mandir}/man1/look.1*
 %{_mandir}/man1/lscpu.1*
+%{_mandir}/man1/lslogins.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/mesg.1*
 %{_mandir}/man1/more.1*
@@ -1116,7 +1150,6 @@ fi
 %{_mandir}/man8/lsblk.8*
 %{_mandir}/man8/chcpu.8*
 %{_mandir}/man8/ctrlaltdel.8*
-%{_mandir}/man8/cytune.8*
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/fsfreeze.8*
 %{_mandir}/man8/fstrim.8*
@@ -1133,6 +1166,7 @@ fi
 %{_mandir}/man8/switch_root.8*
 %endif
 %{_mandir}/man8/sulogin.8*
+%{_mandir}/man8/uname26.8*
 %{_mandir}/man8/wdctl.8*
 %{_mandir}/man8/wipefs.8*
 
@@ -1153,7 +1187,6 @@ fi
 %lang(es) %{_mandir}/es/man1/ul.1*
 %lang(es) %{_mandir}/es/man1/whereis.1*
 %lang(es) %{_mandir}/es/man1/write.1*
-%lang(es) %{_mandir}/es/man8/cytune.8*
 %lang(es) %{_mandir}/es/man8/ctrlaltdel.8*
 %lang(es) %{_mandir}/es/man8/ipcrm.8*
 %lang(es) %{_mandir}/es/man8/ipcs.8*
@@ -1229,7 +1262,6 @@ fi
 %lang(ja) %{_mandir}/ja/man1/whereis.1*
 %lang(ja) %{_mandir}/ja/man1/write.1*
 %lang(ja) %{_mandir}/ja/man8/ctrlaltdel.8*
-%lang(ja) %{_mandir}/ja/man8/cytune.8*
 %lang(ja) %{_mandir}/ja/man8/dmesg.8*
 %lang(ja) %{_mandir}/ja/man8/fdformat.8*
 %lang(ja) %{_mandir}/ja/man8/ipcrm.8*
@@ -1386,6 +1418,7 @@ fi
 
 %files -n mount
 %defattr(644,root,root,755)
+%attr(755,root,root) /bin/findmnt
 %attr(755,root,root) /bin/mountpoint
 %attr(4755,root,root) /bin/mount
 %attr(4755,root,root) /bin/umount
@@ -1395,6 +1428,7 @@ fi
 
 %{_mandir}/man1/mountpoint.1*
 %{_mandir}/man5/fstab.5*
+%{_mandir}/man8/findmnt.8*
 %{_mandir}/man8/mount.8*
 %{_mandir}/man8/umount.8*
 %{_mandir}/man8/pivot_root.8*
@@ -1524,10 +1558,6 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libuuid.a
 
-%files -n bash-completion-util-linux
-%defattr(644,root,root,755)
-/usr/share/bash-completion/completions/*
-
 %if %{with initrd} && %{with dietlibc}
 %files -n libuuid-dietlibc
 %defattr(644,root,root,755)
@@ -1546,9 +1576,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libmount.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libmount.so.1
-# move to -n mount when mount starts to use libmount
-%attr(755,root,root) /bin/findmnt
-%{_mandir}/man8/findmnt.8*
 
 %files -n libmount-devel
 %defattr(644,root,root,755)
@@ -1560,16 +1587,34 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libmount.a
 
+%files -n python3-libmount
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/libmount
+%attr(755,root,root) %{py3_sitedir}/libmount/pylibmount.so
+%{py3_sitedir}/libmount/__init__.py
+%{py3_sitedir}/libmount/__pycache__
+
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck
 %{_mandir}/man8/fsck.8*
 
-%files -n python3-libmount
+%files -n libsmartcols
 %defattr(644,root,root,755)
-%dir %{py3_sitedir}/libmount
-%{py3_sitedir}/libmount/__init__.py
-%attr(755,root,root) %{py3_sitedir}/libmount/pylibmount.so
+%attr(755,root,root) /%{_lib}/libsmartcols.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsmartcols.so.1
+# common for many utilities (hexdump,cal,dmesg,fdisk,cfdisk; also libblkid,libmount?)
+%{_mandir}/man5/terminal-colors.d.5*
+
+%files -n libsmartcols-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsmartcols.so
+%{_includedir}/libsmartcols
+%{_pkgconfigdir}/smartcols.pc
+
+%files -n libsmartcols-static
+%defattr(644,root,root,755)
+%{_libdir}/libsmartcols.a
 
 %if %{with initrd}
 %files initrd
@@ -1596,3 +1641,7 @@ fi
 #%attr(755,root,root) %{_libdir}/initrd/e2fsck
 #%attr(755,root,root) %{_libdir}/initrd/fsck
 %endif
+
+%files -n bash-completion-util-linux
+%defattr(644,root,root,755)
+/usr/share/bash-completion/completions/*
diff --git a/util-linux-ng-union-mount.patch b/util-linux-ng-union-mount.patch
deleted file mode 100644
index 74e9019..0000000
--- a/util-linux-ng-union-mount.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-The VFS union mount patches require some changes to util-linux and
-e2fsprogs to support the union mount option and the ext2 whiteout
-feature flag.  We are not submitting them for formal review at this
-time, but the patches are below for quick reference.  They are also
-available in git repos linked to from the Union Mount HOWTO page:
-
-http://valerieaurora.org/union/
-
--VAL
-
-From: Valerie Aurora Henson <vaurora at redhat.com>
-Date: Sat, 21 Mar 2009 20:56:57 -0700
-Subject: [PATCH 1/1] union mount patches from:
-
-ftp://ftp.suse.com/pub/people/jblunck/union-mount/util-linux-2.13-union_mount.diff
----
- mount/mount.c           |    5 +++++
- mount/mount_constants.h |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/mount-deprecated/mount.c b/mount-deprecated/mount.c
-index 9cbc466..9bf766b 100644
---- a/mount-deprecated/mount.c
-+++ b/mount-deprecated/mount.c
-@@ -138,6 +138,7 @@ static const struct opt_map opt_map[] = {
-   { "sync",	0, 0, MS_SYNCHRONOUS},	/* synchronous I/O */
-   { "async",	0, 1, MS_SYNCHRONOUS},	/* asynchronous I/O */
-   { "dirsync",	0, 0, MS_DIRSYNC},	/* synchronous directory modifications */
-+  { "union",	0, 0, MS_UNION  },	/* Union mount */
-   { "remount",  0, 0, MS_REMOUNT},      /* Alter flags of mounted FS */
-   { "bind",	0, 0, MS_BIND   },	/* Remount part of tree elsewhere */
-   { "rbind",	0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
-@@ -1638,6 +1639,7 @@ static struct option longopts[] = {
- 	{ "make-rprivate", 0, 0, 142 },
- 	{ "make-runbindable", 0, 0, 143 },
- 	{ "no-canonicalize", 0, 0, 144 },
-+	{ "union", 0, 0, 145 },
- 	{ "internal-only", 0, 0, 'i' },
- 	{ NULL, 0, 0, 0 }
- };
-@@ -1929,6 +1931,9 @@ main(int argc, char *argv[]) {
- 		case 143:
- 			mounttype = (MS_UNBINDABLE | MS_REC);
- 			break;
-+		case 145: /* union */
-+			mounttype = MS_UNION;
-+			break;
- 
- 		case '?':
- 		default:
-diff --git a/mount-deprecated/mount_constants.h b/mount-deprecated/mount_constants.h
-index dc3ca27..fb4c663 100644
---- a/mount-deprecated/mount_constants.h
-+++ b/mount-deprecated/mount_constants.h
-@@ -39,6 +39,9 @@ flags had been set; if we have a union with more than one element - fail;
- if we have a stack or plain mount - mount atop of it, forming a stack. */
- #define	MS_OVER		0x200	/* 512 */
- #endif
-+#ifndef MS_UNION
-+#define MS_UNION	0x100	/* 256: Mount on top of a union */
-+#endif
- #ifndef MS_NOATIME
- #define MS_NOATIME	0x400	/* 1024: Do not update access times. */
- #endif
diff --git a/util-linux-pl.po-update.patch b/util-linux-pl.po-update.patch
index 4ce5e8e..3090295 100644
--- a/util-linux-pl.po-update.patch
+++ b/util-linux-pl.po-update.patch
@@ -1,29 +1,91 @@
---- util-linux-2.24/po/pl.po.orig	2013-10-21 13:14:20.448967431 +0200
-+++ util-linux-2.24/po/pl.po	2013-10-24 15:43:04.968869314 +0200
-@@ -6059,7 +6059,7 @@
+--- util-linux-2.25/po/pl.po.orig	2014-08-01 23:17:19.135717387 +0200
++++ util-linux-2.25/po/pl.po	2014-08-01 23:17:24.159050506 +0200
+@@ -401,9 +401,8 @@
+ msgstr "  t          Zmiana typu partycji"
  
- #: libfdisk/src/gpt.c:145
- msgid "Intel Fast Flash"
+ #: disk-utils/cfdisk.c:1648
+-#, fuzzy
+ msgid "  s          Fix partitions order (only when in disarray)"
+-msgstr "  s          Poprawienie kolejności partycji"
++msgstr "  s          Poprawienie kolejności partycji (tylko jeśli nie uporządkowane)"
+ 
+ #: disk-utils/cfdisk.c:1649
+ msgid "  W          Write partition table to disk (must enter upper case W)"
+@@ -7190,7 +7189,7 @@
+ #: login-utils/lslogins.c:287 misc-utils/findmnt.c:158 misc-utils/lsblk.c:208
+ #, c-format
+ msgid "too many columns specified, the limit is %zu columns."
 -msgstr ""
-+msgstr "Intel Fast Flash"
++msgstr "podano za dużo kolumn, ograniczenie to %zu."
+ 
+ #: login-utils/lslogins.c:352
+ msgid "unssupported time type"
+@@ -7267,9 +7266,8 @@
+ msgstr " -n, --newline            każda informacja w nowej linii\n"
+ 
+ #: login-utils/lslogins.c:1197
+-#, fuzzy
+ msgid "     --noheadings         don't print headings\n"
+-msgstr " -n, --noheadings      bez wypisywania nagłówków\n"
++msgstr "     --noheadings         bez wypisywania nagłówków\n"
+ 
+ #: login-utils/lslogins.c:1198
+ msgid "     --notruncate         don't truncate output\n"
+@@ -8290,37 +8288,35 @@
+ msgstr "nieznany sygnał %s; poprawne sygnały:"
+ 
+ #: misc-utils/kill.c:306
+-#, fuzzy, c-format
++#, c-format
+ msgid " %s [options] <pid>|<name>...\n"
+-msgstr " %s [opcje] <pid|nazwa>...\n"
++msgstr " %s [opcje] <pid>|<nazwa>...\n"
+ 
+ #: misc-utils/kill.c:309
+-#, fuzzy
+ msgid ""
+ " -a, --all              do not restrict the name-to-pid conversion to processes\n"
+ "                          with the same uid as the present process\n"
+ msgstr ""
+ " -a, --all              bez ograniczania przekształcenia nazwa-pid do procesów\n"
+-"                        z tym samym uidem, co proces bieżący\n"
++"                          z tym samym uidem, co proces bieżący\n"
+ 
+ #: misc-utils/kill.c:311
+-#, fuzzy
+ msgid " -s, --signal <signal>  send this <signal> instead of SIGTERM\n"
+-msgstr " -s, --signal <sygnał>  wysłanie podanego sygnału\n"
++msgstr " -s, --signal <sygnał>  wysłanie podanego <sygnału> zamiast SIGTERM\n"
+ 
+ #: misc-utils/kill.c:313
+-#, fuzzy
+ msgid " -q, --queue <value>    use sigqueue(2), not kill(2), and pass <value> as data\n"
+-msgstr " -q, --queue <sygnał>   użycie sigqueue(2) zamiast kill(2)\n"
++msgstr ""
++" -q, --queue <wartość>  użycie sigqueue(2) zamiast kill(2) i przekazanie\n"
++"                          <wartości> jako danych\n"
  
- #: libfdisk/src/gpt.c:148
- msgid "BIOS boot partition"
-@@ -6400,13 +6400,13 @@
- msgstr "W użyciu jest %u z %d partycji."
+ #: misc-utils/kill.c:315
+ msgid " -p, --pid              print pids without signaling them\n"
+ msgstr " -p, --pid              wypisanie pidów bez wysyłania sygnału\n"
  
- #: libfdisk/src/gpt.c:1601
+ #: misc-utils/kill.c:316
+-#, fuzzy
+ msgid " -l, --list[=<signal>]  list signal names, or convert a signal number to a name\n"
+-msgstr " -l, --list [=<sygnał>] wypisanie nazw sygnałów lub zamiana na nazwę\n"
++msgstr " -l, --list[=<sygnał>]  wypisanie nazw sygnałów lub zamiana numeru na nazwę\n"
+ 
+ #: misc-utils/kill.c:317
+ msgid " -L, --table            list signal names and numbers\n"
+@@ -8359,9 +8355,9 @@
+ msgstr "błąd argumentu"
+ 
+ #: misc-utils/kill.c:432
 -#, fuzzy, c-format
 +#, c-format
- msgid "A total of %ju free sectors is available in %d segment."
- msgid_plural ""
- "A total of %ju free sectors is available in %d segments (the largest is %ju)."
--msgstr[0] "Dostępne sektory: razem %ld w %d segmencie."
--msgstr[1] "Dostępne sektory: razem %ld w %d segmentach (największy %ld)."
--msgstr[2] "Dostępne sektory: razem %ld w %d segmentach (największy %ld)."
-+msgstr[0] "Dostępne sektory: razem %ju w %d segmencie."
-+msgstr[1] "Dostępne sektory: razem %ju w %d segmentach (największy %ju)."
-+msgstr[2] "Dostępne sektory: razem %ju w %d segmentach (największy %ju)."
- 
- #: libfdisk/src/gpt.c:1607
+ msgid "invalid signal name or number: %s"
+-msgstr "błędne oznaczenie sygnału"
++msgstr "błędna nazwa lub numer sygnału: %s"
+ 
+ #: misc-utils/kill.c:449
  #, c-format
diff --git a/util-linux-procpartitions.patch b/util-linux-procpartitions.patch
index 8ad997f..c3a5e5d 100644
--- a/util-linux-procpartitions.patch
+++ b/util-linux-procpartitions.patch
@@ -22,8 +22,8 @@ drastic as it doesn't bail out like fsck does.
  
  	while (fgets(line, sizeof(line), procpt)) {
  		if (sscanf (line, " %d %d %d %[^\n ]",
---- util-linux-ng-2.17.2/fdisks/fdisk.c.orig	2010-03-22 09:21:34.000000000 +0100
-+++ util-linux-ng-2.17.2/fdisks/fdisk.c	2010-05-09 12:31:53.050933394 +0200
+--- util-linux-2.25/disk-utils/fdisk.c.orig	2010-03-22 09:21:34.000000000 +0100
++++ util-linux-2.25/disk-utils/fdisk.c	2010-05-09 12:31:53.050933394 +0200
 @@ -343,6 +343,7 @@ static void print_all_devices_pt(struct
  {
  	FILE *f;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/8b6144a342631d38538e42af5c3f8f478c2f36c1

More information about the pld-cvs-commit mailing list