From nobody Fri Dec 08 23:31:02 2023 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 4Sn6pG741tz53by3; Fri, 8 Dec 2023 23:31:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sn6pG552Hz3DXl; Fri, 8 Dec 2023 23:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702078262; 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=hG31sqe9woUuWEWuhkwyj1Z/MzmE4z4PyqO3uUwWAKM=; b=uIUJF4tn+V70eIFoGi1ajLLtW9gkHqumij5+cgTJvKZt14/DpzpXX3C+ht1LFZaSIowXZr 1uyjwnx+Aqfdb6nrI888uB2g08VmLHPUdyD93CQuNS884MtPkU0M9TdYDw+OY2bO9NdtAH gB5+rY5AJFU17SecihZGcRMPnPeHeIxbshUiBTjlOxkS7BJhM4zVNwpPtjXXT4QJJjyxpN x2UY5yi/7x0FIQxtwiGD/Kz9qGIW0O6HXzH+OfqJIcmyMgTbGNN35263YfKkMqV/ftKfYu WfntsxPAr12Ve+h4ETu0hiOSmXrXu9Fduq93POnXz5Vla5crGtaIDRwyLY8OsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702078262; a=rsa-sha256; cv=none; b=clPbE/Z8sd9bUJAbgo1gvXagvarYXe6C/QP9J4eE/9r7QMxGTE3hv1+RwY0x6ZdnAtU9jo SVO7MnSji7pQ36JfqfgkD+0luA0Fd44kBkgvBMI1qwLxZqkfzcTZCeqUzDcgYc8Yibx7uG wwLvK2R6Z49BynipUNhYkvnaPLFoZgbtqPA5akAB3qBFg9U2n/KMFQye1xqKILvwP0TA16 k5l2jnQ1Z0qQNPcRwwi0oLL0u2n/ZA9qG6Iq6DrA1GggI9k/mTWevo0T+j9tOR+ptvFzmg Dm0fuINj5/d+ykj4OzuZxhdCF0UaINKlvba8n69QzEj4lNgO4z3rLxrLQjYEZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702078262; 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=hG31sqe9woUuWEWuhkwyj1Z/MzmE4z4PyqO3uUwWAKM=; b=qu0GqbcoQR+72tgftTxjtmNjlTEKHogmOUVSaCn9XCioTzFtEkv5Cz+vXlG14jTpj8lssJ aQjT1w67I8k4jeaYXq4/BZjvVncHUANrzd/e+uCbH2FoyjmrmBIzSu1lzpQ3DnCk3aojZc MIvwfnUcN5mmZT1WNDiVnBmG8dRgyQBgfZ3AWm8RbtDyvg8mSp+xcfquz06+7EsuB54nTB BrBFYSw7Tt8vXHS1H0tUqN0qDqx0Chu952ueYOLJXFzypoOPEx5/XOX3rLDtlv6rmSU9hp 1MRkSYqXHJDTyJdYuN/+Lwtz2+ja0QknutK774QxOdL40FTYB6W1aOGGdM4PFA== 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 4Sn6pG49RCzgPl; Fri, 8 Dec 2023 23:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8NV2EW067421; Fri, 8 Dec 2023 23:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8NV2qZ067418; Fri, 8 Dec 2023 23:31:02 GMT (envelope-from git) Date: Fri, 8 Dec 2023 23:31:02 GMT Message-Id: <202312082331.3B8NV2qZ067418@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 1d254d487260 - main - news/nn: remove sbrk use 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d254d487260e6e940a171aa0ab0d658b1a13407 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d254d487260e6e940a171aa0ab0d658b1a13407 commit 1d254d487260e6e940a171aa0ab0d658b1a13407 Author: Brooks Davis AuthorDate: 2023-12-07 19:43:29 +0000 Commit: Brooks Davis CommitDate: 2023-12-08 23:29:38 +0000 news/nn: remove sbrk use It was used to report a heap size but this is inaccurate. Just patch it out for now. --- news/nn/Makefile | 5 +---- news/nn/files/patch-init.c | 29 +++++++++++++++++++++++++++++ news/nn/files/patch-nn.c | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/news/nn/Makefile b/news/nn/Makefile index ce6bb9b93480..a60ffaf6d285 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,6 +1,6 @@ PORTNAME= nn PORTVERSION= 6.7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= news MASTER_SITES= ftp://ftp.nndev.org/pub/nn-${PORTVERSION:R}/ @@ -8,9 +8,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Menu based USENET newsreader WWW= http://www.nndev.org/ -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - SUB_FILES= pkg-message USES= tar:Z diff --git a/news/nn/files/patch-init.c b/news/nn/files/patch-init.c new file mode 100644 index 000000000000..7d69ad2d6918 --- /dev/null +++ b/news/nn/files/patch-init.c @@ -0,0 +1,29 @@ +--- init.c.orig ++++ init.c +@@ -58,8 +58,6 @@ + int in_init = 0; /* true when parsing init file */ + int alt_cmd_key; /* K_ when parse_command returns AC_KEYCMD */ + +-long initial_memory_break; /* for :debug statistics */ +- + int first_time_user = 0; + + static int init_err = 0; /* errors in init file */ +@@ -566,17 +564,8 @@ + struct mallinfo mallinfo(), mi; + #endif + +- static long prev_mem = 0; +- long cur_mem; +- + clrdisp(); + tprintf("group=%s, nart=%ld\n\r", current_group->group_name, n_articles); +- +- cur_mem = (((long) sbrk(0)) - initial_memory_break) / 1024; +- +- tprintf("\nMemory usage: %ldk, previous: %ldk, change: %ldk\n\r", +- cur_mem, prev_mem, cur_mem - prev_mem); +- prev_mem = cur_mem; + + #ifdef USE_MALLOC_H + mi = mallinfo(); diff --git a/news/nn/files/patch-nn.c b/news/nn/files/patch-nn.c new file mode 100644 index 000000000000..46f34fdd9f9c --- /dev/null +++ b/news/nn/files/patch-nn.c @@ -0,0 +1,18 @@ +--- nn.c.orig ++++ nn.c +@@ -74,7 +74,6 @@ + extern int seq_cross_filtering; + extern char *news_active; + extern long unread_articles; +-extern long initial_memory_break; + extern int first_time_user; + extern int also_cross_postings; + +@@ -745,7 +744,6 @@ + int say_welcome = 0, cmd; + flag_type access_mode = 0; + char *mask = NULL; +- initial_memory_break = (long) sbrk(0); + + #ifdef USE_MALLOC_H +