summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-09-19 22:34:32 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2017-09-19 22:34:42 +0100
commit1618968c56caf7f8c08823908d88dc49bb8f7649 (patch)
treef65ce4f5aad06bade1eedf3029d7bb21c8dd0c5e /sys-libs/gpm
parentsys-apps/portage: drop 2.3.9 keywords due to buggy postinst_qa_check behavior (diff)
downloadgentoo-1618968c56caf7f8c08823908d88dc49bb8f7649.tar.gz
gentoo-1618968c56caf7f8c08823908d88dc49bb8f7649.tar.bz2
gentoo-1618968c56caf7f8c08823908d88dc49bb8f7649.zip
sys-libs/gpm: tweak for glibc-2.26, bug #629774
Reported-by: Philipp Psurek Fix-by: cyrillic Closes: https://bugs.gentoo.org/629774 Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'sys-libs/gpm')
-rw-r--r--sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch12
-rw-r--r--sys-libs/gpm/gpm-1.20.7-r2.ebuild7
2 files changed, 18 insertions, 1 deletions
diff --git a/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch b/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch
new file mode 100644
index 00000000000..ef2de01a6d6
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-glibc-2.26.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/629774
+--- a/src/prog/gpm-root.y 2012-10-26 17:21:38.000000000 -0400
++++ b/src/prog/gpm-root.y 2017-09-07 20:39:51.933264063 -0400
+@@ -1197,7 +1197,7 @@
+ /* reap your zombies */
+ childaction.sa_handler=reap_children;
+ #if defined(__GLIBC__)
+- __sigemptyset(&childaction.sa_mask);
++ sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+ childaction.sa_mask=0;
+ #endif /* __GLIBC__ */
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index bfb8982b46e..943ef06732c 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# emacs support disabled due to #99533 #335900
@@ -36,6 +36,11 @@ src_prepare() {
epatch "${WORKDIR}"/${P}-docs.patch
touch -r . doc/* || die
+ # bug #629774
+ epatch "${FILESDIR}"/${P}-glibc-2.26.patch
+
+ epatch_user
+
# fix ABI values
sed -i \
-e '/^abi_lev=/s:=.*:=1:' \