commit 971f9098a79429ff3901924172b60a3dd9e86035
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Oct 22 13:21:19 2013 +0200
- up to 2.24; last, lastb, mesg moved from sysvinit-tools; po/pt_BR.po
needs fix
util-linux-fhs.patch | 4 +++-
util-linux-hotkeys.patch | 23 ++++++++++++-----------
util-linux-procpartitions.patch | 27 +++++++++++++++------------
util-linux.spec | 36 +++++++++++++++++++++++++++++++-----
4 files changed, 61 insertions(+), 29 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 2ddd337..22ad0e1 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -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.23.2
+Version: 2.24
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: b39fde897334a4858bb2098edcce5b3f
+Source0:
https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
+# Source0-md5: 4fac6443427f575fc5f3531a4ad2ca01
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
@@ -79,6 +79,7 @@ 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: sed >= 4.0
@@ -116,7 +117,7 @@ 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: shadow-extras < 1:4.0.3-6
Conflicts: upstart-SysVinit < 2.86-28
@@ -645,6 +646,18 @@ 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: libmount bindings
+Summary(pl.UTF-8): Dowiązania do biblioteki libmount
+Group: Libraries/Python
+Requires: libmount = %{version}-%{release}
+
+%description -n python3-libmount
+libmount bindings.
+
+%description -n python3-libmount -l pl.UTF-8
+Dowiązania do biblioteki libmount.
+
%prep
%setup -q -a1
#%patch0 -p1
@@ -757,6 +770,7 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses
-DHAVE_LSEEK64_PROTOTYPE
--enable-utmpdump \
--enable-vipw \
--enable-write \
+ --with-python=3 \
--with-audit \
--with-bashcompletiondir=/usr/share/bash-completion/completions \
--with-selinux%{!?with_selinux:=no}
@@ -845,7 +859,7 @@ echo '.so man8/swapon.8' >
$RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
%endif
# examples
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/getopt/getopt-parse.*sh
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt/getopt-parse.*sh
%if %{with initrd}
install -d $RPM_BUILD_ROOT%{_libdir}/initrd
@@ -994,10 +1008,13 @@ fi
%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
@@ -1043,11 +1060,14 @@ fi
%{_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*
@@ -1524,6 +1544,12 @@ fi
%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)
diff --git a/util-linux-fhs.patch b/util-linux-fhs.patch
index 7bbb01f..e9430dc 100644
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -1,6 +1,6 @@
--- util-linux-2.21/include/pathnames.h~ 2011-12-18 22:28:28.000000000
+0200
+++ util-linux-2.21/include/pathnames.h 2012-03-05 17:32:49.986673893
+0200
-@@ -26,13 +26,13 @@
+@@ -26,7 +26,7 @@
#define _PATH_DEFPATH_ROOT
"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
#define _PATH_SECURETTY "/etc/securetty"
@@ -9,6 +9,8 @@
#define _PATH_HUSHLOGIN ".hushlogin"
#define _PATH_HUSHLOGINS "/etc/hushlogins"
+@@ -34,7 +34,7 @@
+ #define _PATH_NOLOGIN_TXT "/etc/nologin.txt"
#ifndef _PATH_MAILDIR
-#define _PATH_MAILDIR "/var/spool/mail"
diff --git a/util-linux-hotkeys.patch b/util-linux-hotkeys.patch
index 84c73fa..7a262f0 100644
--- a/util-linux-hotkeys.patch
+++ b/util-linux-hotkeys.patch
@@ -33,17 +33,18 @@
#: login-utils/wall.c:112
#, c-format
---- util-linux-2.12j/po/pt_BR.po.sopwith 2004-12-05 14:08:15.000000000
-0500
-+++ util-linux-2.12j/po/pt_BR.po 2004-12-10 13:11:47.560587674 -0500
-@@ -7161,7 +7161,7 @@
- #: login-utils/vipw.c:354
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "Voc� gostaria de editar %s agora [s/n]"
-+msgstr "Voc� gostaria de editar %s agora [y/n]"
-
- #: login-utils/wall.c:104
- #, c-format
+; FIXME FIXME
+;--- util-linux-2.12j/po/pt_BR.po.sopwith 2004-12-05 14:08:15.000000000
-0500
+;+++ util-linux-2.12j/po/pt_BR.po 2004-12-10 13:11:47.560587674 -0500
+;@@ -7161,7 +7161,7 @@
+; #: login-utils/vipw.c:357
+; #, c-format
+; msgid "Would you like to edit %s now [y/n]? "
+;-msgstr "Voc� gostaria de editar %s agora [s/n]? "
+;+msgstr "Voc� gostaria de editar %s agora [y/n]? "
+;
+; #: misc-utils/cal.c:372
+; msgid "illegal day value"
--- util-linux-ng-2.17.2/po/ru.po.orig 2010-05-09 12:51:15.306941775 +0200
+++ util-linux-ng-2.17.2/po/ru.po 2010-05-09 12:51:21.562935070 +0200
@@ -7799,7 +7799,7 @@
diff --git a/util-linux-procpartitions.patch b/util-linux-procpartitions.patch
index 76e5a5a..8ad997f 100644
--- a/util-linux-procpartitions.patch
+++ b/util-linux-procpartitions.patch
@@ -24,18 +24,21 @@ drastic as it doesn't bail out like fsck does.
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
-@@ -2844,12 +2844,14 @@
- char line[128], ptname[128], devname[256];
- int ma, mi;
- unsigned long long sz;
+@@ -343,6 +343,7 @@ static void print_all_devices_pt(struct
+ {
+ FILE *f;
+ char line[128 + 1];
+ char iobuf[32*1024];
- procpt = fopen(_PATH_PROC_PARTITIONS, "r");
- if (procpt == NULL) {
- fprintf(stderr, _("cannot open %s\n"), _PATH_PROC_PARTITIONS);
- return;
- }
-+ setvbuf(procpt, iobuf, _IOFBF, sizeof(iobuf));
+ f = fopen(_PATH_PROC_PARTITIONS, "r");
+ if (!f) {
+@@ -352,6 +353,8 @@ static void print_all_devices_pt(struct
- while (fgets(line, sizeof(line), procpt)) {
- if (sscanf (line, " %d %d %llu %128[^\n ]",
+ DBG(FRONTEND, dbgprint("reading "_PATH_PROC_PARTITIONS));
+
++ setvbuf(f, iobuf, _IOFBF, sizeof(iobuf));
++
+ while (fgets(line, sizeof(line), f)) {
+ char ptname[128 + 1], devname[256];
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/971f9098a79429ff3901924172b60a3dd9e86035
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
