From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1445055-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DBECD158094
for <garchives@archives.gentoo.org>; Sun, 9 Oct 2022 11:47:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2149BE085B;
Sun, 9 Oct 2022 11:47:40 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 06F54E085B
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 11:47:39 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D6D0F340E7C
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 11:47:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ECE19523
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 11:47:36 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1665316000.9f16edcdcdb68ccb69d94998d81174faae673fb3.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netwatch/, net-analyzer/netwatch/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
X-VCS-Directories: net-analyzer/netwatch/files/ net-analyzer/netwatch/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 9f16edcdcdb68ccb69d94998d81174faae673fb3
X-VCS-Branch: master
Date: Sun, 9 Oct 2022 11:47:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f6fcd768-1f90-487c-83be-06a300aca0c7
X-Archives-Hash: 45aa298432e1fd2e6b8b7a6976a504d5
commit: 9f16edcdcdb68ccb69d94998d81174faae673fb3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 11:02:52 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 11:46:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f16edcd
net-analyzer/netwatch: EAPI7->8, drop dead urls, lto+clang16 fixes
Also remove IUSE=doc and install the single pre-gen html
file uncoditionally.
May be an easy fix wrt #861203 but haven't looked, passing
-fno-strict-aliasing just as better than nothing (did need
a patch for lto mismatch either way).
Closes: https://bugs.gentoo.org/861203
Closes: https://bugs.gentoo.org/871375
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../netwatch/files/netwatch-1.3.0.1-clang16.patch | 22 +++++++++++++
.../files/netwatch-1.3.0.1-lto-mismatch.patch | 8 +++++
....3.0.1-r4.ebuild => netwatch-1.3.0.1-r5.ebuild} | 36 +++++++++++-----------
3 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
new file mode 100644
index 000000000000..e1b0cbd115b2
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/871375
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -42,3 +42,3 @@
+
+-extern destroy_program;
++extern int destroy_program;
+ extern Semaphore masterdo;
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -608,2 +608,4 @@
+ void findaddr (u_int32_t searchaddr);
++int doeth ();
++int gh (int opt);
+
+--- a/netwatch.h
++++ b/netwatch.h
+@@ -220,2 +220,4 @@
+ char *servicenm( char *s, int port);
++void uthread_wait( long usec);
++int dokeyin (int force);
+
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
new file mode 100644
index 000000000000..7a89ce111e9a
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
@@ -0,0 +1,8 @@
+Fix failure with -Werror=lto-type-mismatch
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -96,3 +96,3 @@
+ #define MAXSTATUS 14
+-#define STATUSSIZE 200
++#define STATUSSIZE 256
+ extern char status_lines[MAXSTATUS][STATUSSIZE];
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
similarity index 53%
rename from net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
rename to net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
index df2471e3538e..a7215c4e36d0 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools
+EAPI=8
-MY_PV=$(ver_cut 1-3)-$(ver_cut 4)
+inherit autotools flag-o-matic
DESCRIPTION="Ethernet/PPP IP Packet Monitor"
-HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
-SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}-$(ver_rs 3 -).tgz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
-IUSE="doc"
-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses:="
DEPEND="
${RDEPEND}
- sys-kernel/linux-headers
- virtual/pkgconfig
-"
+ sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
PATCHES=(
"${FILESDIR}"/${P}-append_ldflags.patch
"${FILESDIR}"/${P}-open.patch
@@ -29,22 +28,23 @@ PATCHES=(
"${FILESDIR}"/${P}-includes.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-lto-mismatch.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
-S=${WORKDIR}/${PN}-$(ver_cut 1-3)
src_prepare() {
default
+
eautoreconf
+
+ append-flags -fno-strict-aliasing #861203
}
src_install() {
dosbin netresolv netwatch
-
doman netwatch.1
- dodoc BUGS CHANGES README* TODO
+ einstalldocs
- if use doc; then
- docinto html
- dodoc NetwatchKeyCommands.html
- fi
+ docinto html
+ dodoc NetwatchKeyCommands.html
}