[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     73318be505bc35e10cd9b4ec43b04c38cdb7da2f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 23:21:43 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 01:18:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73318be5

sys-apps/util-linux: Bump to version 2.30. Removed old.

Also fix pylibmount segfault with python3.6 (bug #621176).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/util-linux/Manifest                       |  2 +-
 .../util-linux-2.30-pylibmount_segfault.patch      | 25 ++++++++++++++++++++++
 ...inux-2.30_rc2.ebuild => util-linux-2.30.ebuild} |  6 ++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index cc57bb33ef8..21f4ab9dce9 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,4 +2,4 @@ DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651
 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
 DIST util-linux-2.29.1.tar.xz 4278756 SHA256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f SHA512 221fc7651eb0534c55206eaf9184b2eb55d9f838cd0e1623cadac5d4ac57a118d96cdd770b6492b39381dd1316b81553866bc0f8c25dbb52dac9641f2fa0f7fa WHIRLPOOL d509168960b0ad54ade4d03dc39dca1dcf0bb0a5b51a594f04bc02ff3a6c89fc5966cff4653dfc826f75f8864497da600c7a86039099845b98e6f9d7981cff98
 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
-DIST util-linux-2.30-rc2.tar.xz 4376864 SHA256 5cdb28f6221ab68cb593c5e3fb01bb7cce9466a42bad031411eea6b5adc08c5d SHA512 df03ca776af6838c06387e017fdf38abb29adc1d29df56ce7c55d1df5a5ab16d6123e649c63734e75a0239f89b994147f261edd5e78e16881fd5ec12a4365763 WHIRLPOOL 7961bbc51117dd7ee2768ecfaef20758db882bdd888ff0495cba41860caf91354a78332d5131bdedb0cbb7fa2380485e15bbbc80ee8cd6f927787816c9d04e83
+DIST util-linux-2.30.tar.xz 4478016 SHA256 c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d SHA512 30e311768718508066829567200e975fd08a22360915b27c8839f368fe6d84c8eca6c2f69a60f113d934eea9934e49f05cd98c3db7fd6bc5ad8f7f770badbc97 WHIRLPOOL 11749d9842e6de9ba0b164b533ac6eeae26557eed8da601eedc1505c5da88d0a6ef25586efb17c68ba0644a5ba8110188587c197f360b75191f1d4f90691d23b

diff --git a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch b/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
new file mode 100644
index 00000000000..73fbc994923
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/621176
+
+From 29b721bc9d20ed44858017689ce1745c220bd0d4 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Wed, 7 Jun 2017 17:21:33 -0700
+Subject: [PATCH] pylibmount: NULL terminate kwlist in Context_init
+
+Fixes a segfault observed with python3.6.
+---
+ libmount/python/context.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmount/python/context.c b/libmount/python/context.c
+index 6d82e1432..982414d01 100644
+--- a/libmount/python/context.c
++++ b/libmount/python/context.c
+@@ -90,7 +90,7 @@ static int Context_init(ContextObjext *self, PyObject *args, PyObject *kwds)
+ 		"source", "target", "fstype",
+ 		"options", "mflags", "fstype_pattern",
+ 		"options_pattern", "fs", "fstab",
+-		"optsmode"
++		"optsmode", NULL
+ 	};
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(

diff --git a/sys-apps/util-linux/util-linux-2.30_rc2.ebuild b/sys-apps/util-linux/util-linux-2.30.ebuild
similarity index 98%
rename from sys-apps/util-linux/util-linux-2.30_rc2.ebuild
rename to sys-apps/util-linux/util-linux-2.30.ebuild
index 37dbeaf6c98..b016bb8652f 100644
--- a/sys-apps/util-linux/util-linux-2.30_rc2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.ebuild
@@ -61,11 +61,17 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.30-pylibmount_segfault.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	epatch "${PATCHES[@]}"
+
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf