From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 865D41382C5 for ; Wed, 24 Jun 2020 06:21:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AABBAE0864; Wed, 24 Jun 2020 06:21:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FF87E0864 for ; Wed, 24 Jun 2020 06:21:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 218C134F0C0 for ; Wed, 24 Jun 2020 06:21:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9AE5253 for ; Wed, 24 Jun 2020 06:21:35 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1592979693.4d2516ef563fdf2a533b427a139f7552da97dfd7.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/wmfs/, x11-wm/wmfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/wmfs/files/wmfs-99999999-strncat.patch x11-wm/wmfs/wmfs-99999999.ebuild X-VCS-Directories: x11-wm/wmfs/files/ x11-wm/wmfs/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 4d2516ef563fdf2a533b427a139f7552da97dfd7 X-VCS-Branch: master Date: Wed, 24 Jun 2020 06:21:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b0086bc6-1403-41f0-bb10-2d389d49b56d X-Archives-Hash: e9b4486ecd338249f2530b36b06cf247 commit: 4d2516ef563fdf2a533b427a139f7552da97dfd7 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Jun 24 06:20:46 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Jun 24 06:21:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2516ef x11-wm/wmfs: Actually apply dropped patch instead Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jeroen Roovers gentoo.org> x11-wm/wmfs/files/wmfs-99999999-strncat.patch | 20 ++++++++++++++++++++ x11-wm/wmfs/wmfs-99999999.ebuild | 1 + 2 files changed, 21 insertions(+) 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 00000000000..e55cd00121b --- /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 a2a1959136e..416f8f678db 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() {