summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-06-24 08:20:46 +0200
committerJeroen Roovers <jer@gentoo.org>2020-06-24 08:21:33 +0200
commit4d2516ef563fdf2a533b427a139f7552da97dfd7 (patch)
tree800dedf85f23208f10d4bb1d6234d945fb43dbb6
parentsys-apps/portage: Re-add portage-2.3.102.tar.bz2 to Manifest (diff)
downloadgentoo-4d2516ef563fdf2a533b427a139f7552da97dfd7.tar.gz
gentoo-4d2516ef563fdf2a533b427a139f7552da97dfd7.tar.bz2
gentoo-4d2516ef563fdf2a533b427a139f7552da97dfd7.zip
x11-wm/wmfs: Actually apply dropped patch instead
Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--x11-wm/wmfs/files/wmfs-99999999-strncat.patch20
-rw-r--r--x11-wm/wmfs/wmfs-99999999.ebuild1
2 files changed, 21 insertions, 0 deletions
diff --git a/x11-wm/wmfs/files/wmfs-99999999-strncat.patch b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
new file mode 100644
index 000000000000..e55cd00121ba
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-strncat.patch
@@ -0,0 +1,20 @@
+--- a/src/launcher.c
++++ b/src/launcher.c
+@@ -366,7 +366,7 @@
+ if(pos && (end = complete(&cache, tmpbuf)))
+ {
+ strncpy(buf, tmpbuf, sizeof(buf));
+- strncat(buf, end, sizeof(buf));
++ strncat(buf, end, sizeof(buf) - 1);
+ found = true;
+ }
+
+@@ -387,7 +387,7 @@
+
+ default:
+ lastwastab = false;
+- strncat(buf, tmp, sizeof(tmp));
++ strncat(buf, tmp, sizeof(buf) - 1);
+ ++pos;
+ break;
+ }
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index a2a1959136ed..416f8f678db2 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-99999999-Debian.patch
"${FILESDIR}"/${PN}-99999999-desktop.patch
"${FILESDIR}"/${PN}-99999999-fno-common.patch
+ "${FILESDIR}"/${PN}-99999999-strncat.patch
)
src_configure() {