[packages/util-linux] - updated to 2.29.2 (fixes CVE-2017-2616 in su) - updated fdformat-ide patch - added ac patch
qboosh
qboosh at pld-linux.org
Tue Mar 28 18:10:47 CEST 2017
commit 768477bc3b26843fcf7cb846d7a125a18462191c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Mar 28 18:10:38 2017 +0200
- updated to 2.29.2 (fixes CVE-2017-2616 in su)
- updated fdformat-ide patch
- added ac patch
util-linux-ac.patch | 13 +++++++++++++
util-linux-fdformat-ide.patch | 17 ++++++++---------
util-linux.spec | 18 ++++++++++++------
3 files changed, 33 insertions(+), 15 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 8182df3..12740cb 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -36,13 +36,13 @@ Summary(ru.UTF-8): Набор базовых системных утилит д
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
-Version: 2.29
-Release: 2
+Version: 2.29.2
+Release: 1
License: GPL v2+
Group: Applications/System
# https://github.com/karelzak/util-linux (GitHub backup)
-Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 07b6845f48a421ad5844aa9d58edb837
+Source0: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/%{name}-%{version}.tar.xz
+# Source0-md5: 63c40c2068fcbb7e1d5c1d281115d973
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
@@ -61,7 +61,8 @@ Patch1: %{name}-fhs.patch
Patch2: %{name}-login-lastlog.patch
Patch3: %{name}-procpartitions.patch
Patch4: su-paths.patch
-Patch5: %{name}-diet.patch
+Patch5: %{name}-ac.patch
+Patch6: %{name}-diet.patch
URL: https://github.com/karelzak/util-linux
BuildRequires: audit-libs-devel >= 1.0.6
BuildRequires: autoconf >= 2.60
@@ -71,6 +72,10 @@ BuildRequires: gettext-tools >= 0.18.3
BuildRequires: gtk-doc >= 1.10
BuildRequires: gtk-doc-automake >= 1.10
BuildRequires: libcap-ng-devel
+%ifarch ppc ppc64
+# for lscpu
+BuildRequires: librtas-devel
+%endif
%{?with_selinux:BuildRequires: libselinux-devel >= 2.0}
%{?with_selinux:BuildRequires: libsepol-devel}
BuildRequires: libtool >= 2:2.2
@@ -735,7 +740,8 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%{?with_initrd:%patch5 -p1}
+%patch5 -p1
+%{?with_initrd:%patch6 -p1}
cp -p %{SOURCE10} nologin.c
diff --git a/util-linux-ac.patch b/util-linux-ac.patch
new file mode 100644
index 0000000..6f3351d
--- /dev/null
+++ b/util-linux-ac.patch
@@ -0,0 +1,13 @@
+--- util-linux-2.29.2/configure.ac.orig 2017-03-28 17:43:59.234397364 +0200
++++ util-linux-2.29.2/configure.ac 2017-03-28 17:44:12.451063880 +0200
+@@ -460,8 +460,8 @@
+
+ AC_CHECK_LIB([rtas], [rtas_get_sysparm], [
+ RTAS_LIBS="-lrtas"
+- AC_DEFINE_UNQUOTED([HAVE_LIBRTAS], [1], [Define if librtas exists]), [],
+-])
++ AC_DEFINE_UNQUOTED([HAVE_LIBRTAS], [1], [Define if librtas exists])]
++)
+ AC_SUBST([RTAS_LIBS])
+
+
diff --git a/util-linux-fdformat-ide.patch b/util-linux-fdformat-ide.patch
index 8222098..26980d8 100644
--- a/util-linux-fdformat-ide.patch
+++ b/util-linux-fdformat-ide.patch
@@ -1,5 +1,5 @@
---- util-linux-2.12p/disk-utils/fdformat.8.ide 2005-04-25 11:39:19.528340384 +0200
-+++ util-linux-2.12p/disk-utils/fdformat.8 2005-04-25 11:44:07.189609224 +0200
+--- util-linux-2.29.2/disk-utils/fdformat.8.orig 2017-02-22 11:16:55.235092833 +0100
++++ util-linux-2.29.2/disk-utils/fdformat.8 2017-03-28 16:45:00.661104437 +0200
@@ -43,6 +43,11 @@
autodetected earlier. In this case, use
.BR setfdprm (8)
@@ -11,13 +11,12 @@
+
.SH OPTIONS
.TP
- \fB\-n\fR, \fB\-\-no\-verify\fR
-@@ -54,6 +58,7 @@
+ \fB\-f\fR, \fB\-\-from\fR \fIN\fR
+@@ -65,6 +70,7 @@
+ .SH "SEE ALSO"
.BR fd (4),
- .BR setfdprm (8),
+ .BR emkfs (8),
++.BR floppy (8),
.BR mkfs (8),
--.BR emkfs (8)
-+.BR emkfs (8),
-+.BR floppy (8)
+ .BR setfdprm (8)
.SH AUTHOR
- Werner Almesberger (almesber at nessie.cs.id.ethz.ch)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/768477bc3b26843fcf7cb846d7a125a18462191c
More information about the pld-cvs-commit
mailing list