From nobody Wed Oct 09 17:29:30 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XP0Hv0cpTz5Yndq; Wed, 09 Oct 2024 17:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP0Ht6ShPz45fL; Wed, 9 Oct 2024 17:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728494970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDSJR7d/VQw3NIR/ySQZ42Aj9jotlUgRVHpqDi47El4=; b=x8bNm74w0JiJ3MJRzDRyV+kgcmt4uLL5Z3reZWcy+qxTY8OwwfFOcSdCPiSuc93a8/SbaJ odudREsJPMyaLLEZEmlxgCNRn4Rl77w4VGfZ4hRFD+9+PwiDXhdbRk1Z1zLfdlJpDECs9+ VoBxv3n0TRhvn3ol5RKyVq8iKvAqJ4IUuNHTo0yGAKngbzJGhaj1X05iyZcZCt+PL/BCwv EGOG3tcxqrA49jba+Ob7N3JLouZbPdHm6ylkMU6Ft+znBEOYSlQJgU5e643tsoefj54cmC 9MR1oBbd0u++NvwgoAfkas+CuUXRosZnUMdrDE26vvS765V4IC/FJUeEL2TMpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728494970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDSJR7d/VQw3NIR/ySQZ42Aj9jotlUgRVHpqDi47El4=; b=fNdA7Nm4L3CES7uEEOnMdOEsSJpZi2dtmGp9EiMro6cDuNZ0kCN+n+e8B6TIy5GXN8lm9j nYb8sPSqDG6s9xVWrx/PiVmc/HDSE3UbEpWtwL9JN4dpWDrp2iHVHFZN7ox7ziOaFcpLf0 UcTqHtLFJTf5YtD/sTLHKn2WZ5BTltDzmcdV8MUsiAHTtUq1ZTwG/hYKcIK0rk2r0K2Xec LXFgna+rIeJZ6W6MAbT0idhwhBL5w3PnDdh7QIIwHkhujKkFDvs4+8kWGqXtj4zhcowJ8n eI+NNORL+aoKDhfHXLP5FBCt39uUQPqnsEmCGH90rllAWQNobJOiCaoJjobAXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728494970; a=rsa-sha256; cv=none; b=g5v7BJgSdwapLJMpufnHpNh4SjLrQOGKhojLRunsiHyouiWqDLXoS62H10Nm23LhoX5/J/ C9Lv5/66kJ7kgXkWdw+QQR0zE6i9eqqFy9/ekmMDEunTxuvgzF3itdg/xpg0PRgtJPZ1ii Mp8vladvB8YK/JckJH9dS4JrmmwkJoiokA2nGYhjJAcoEaIZnQ/KuFQ62AxaYFNIHWKI8e KA6OwR1VAg6FOnCPrMtypY1XKZxx5Rbz6eZjQD2u81fgkBJVbA8bxgGkXsTGOEvVkAXpSC 2L6tLCoWBJof778ucbo9x+rT5lK6tZAi8hoQAU2iuj2BJJUxt3bMYvAtV3dqvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XP0Ht59YvzNJn; Wed, 9 Oct 2024 17:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499HTUiL050187; Wed, 9 Oct 2024 17:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499HTUGa050184; Wed, 9 Oct 2024 17:29:30 GMT (envelope-from git) Date: Wed, 9 Oct 2024 17:29:30 GMT Message-Id: <202410091729.499HTUGa050184@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: d357e43d0927 - main - sysutils/wmmemload: Fix stack overflow error List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d357e43d0927dc1d85870cfea1473f4fd4b17e81 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d357e43d0927dc1d85870cfea1473f4fd4b17e81 commit d357e43d0927dc1d85870cfea1473f4fd4b17e81 Author: Marco Beishuizen AuthorDate: 2024-10-09 17:26:58 +0000 Commit: Zsolt Udvari CommitDate: 2024-10-09 17:29:02 +0000 sysutils/wmmemload: Fix stack overflow error Add x11 and xext to USE_XORG. Add LICENSE_FILE. Switch to DISTVERSION. PR: 264669 Reported by: Arie Bikker Approved by: submitter is maintainer --- sysutils/wmmemload/Makefile | 11 ++++++----- sysutils/wmmemload/files/patch-src_mem__freebsd.c | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile index bd3945e4a960..a71f7d2daaa3 100644 --- a/sysutils/wmmemload/Makefile +++ b/sysutils/wmmemload/Makefile @@ -1,6 +1,6 @@ PORTNAME= wmmemload -PORTVERSION= 0.1.8 -PORTREVISION= 1 +DISTVERSION= 0.1.8 +PORTREVISION= 2 CATEGORIES= sysutils windowmaker MASTER_SITES= https://dev.gentoo.org/~voyageur/distfiles/ @@ -9,11 +9,12 @@ COMMENT= Dockapp for monitoring memory and swap usage WWW= https://windowmaker.org/dockapps/?name=wmmemload LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share USES= autoreconf xorg -USE_XORG= xpm +USE_XORG= x11 xext xpm +GNU_CONFIGURE= yes + WRKSRC= ${WRKDIR}/dockapps .include diff --git a/sysutils/wmmemload/files/patch-src_mem__freebsd.c b/sysutils/wmmemload/files/patch-src_mem__freebsd.c index b3fcb888ca70..e22d4975481b 100644 --- a/sysutils/wmmemload/files/patch-src_mem__freebsd.c +++ b/sysutils/wmmemload/files/patch-src_mem__freebsd.c @@ -8,3 +8,12 @@ #include #include #include +@@ -81,7 +82,7 @@ void mem_getusage(int *per_mem, int *per_swap, const s + if (swap_firsttime || + (((new_swappgsin > swappgsin) || (new_swappgsout > swappgsout)) + && cur_time > last_time_swap + 1)) { +- int mib[2], n; ++ int mib[3], n; + size_t mibsize, size; + struct xswdev xsw; +