From nobody Fri Oct 25 16:56:23 2024 X-Original-To: dev-commits-ports-main@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 4XZppH6ZmWz5Zx4k; Fri, 25 Oct 2024 16:56:23 +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 4XZppH5jRbz4PKs; Fri, 25 Oct 2024 16:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729875383; 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=lKM3hBQV4LV95qoQVhtD4TD9CZI1ddyqyZr4rQ48fy0=; b=AjLqEwy7bsWaWxzxrzm8lXvFyPd/UEE9Vz0Z35Ul3MP1InUC5LKEN7VyUO/xzU/wAqEJ8h vwdM5AD7ab1IxWY8GtNp/xkvpvukg/1L1NL5rOtXKtJJOrz86I30D5I4+5+1OhvBVR82x5 Tio02CQHeg7NLbrwEEaQD+mXuJyTgJ+MwaL6jrtp8ywoJSQnKYb83FCqVghLTO8OSXi5oQ VV5iReJ/MQN7B9ZpIl/yF6VD8Ob3EKczEDq4NI9BmF5e4/N9k7xayptZ0ssB/dUD+eaOCf K+hx8PtE8hlWxxlimlWB7nJRui53AAU2R7Kp/5zM5Ui6NHcX6/y9ThRQdIAzxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729875383; 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=lKM3hBQV4LV95qoQVhtD4TD9CZI1ddyqyZr4rQ48fy0=; b=WErgYlYrwt1A9ZerhZoH4hgoJlAPxp5cezLd/4vJy/+zALgB+8ZpTGRGhA22uFNTCeu0ur uZCEWe1Tfl6hmJTzdrunioU2cbPEG/z4C4DbEusZrIswbJCT6Eucz6BkNlzpJfysHbOyTi 4LArU1AZDtUdSxWGKKV9ymaLByhNpRvfk0rDjFTjxAPIYstoO/rXpZTJBdWSnOfYXvwBSG u5XdH+DMYyyWYfCkQdcrH81y58bqE5vb6dkRm9hG7A0tw5BHm/wSiTZrtmueVBaSGRTkr+ /7ibRLAHfXVbELUBISupaFbO13lGmYddfQktri0wIYTuGiAOL0IZka1ytY25sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729875383; a=rsa-sha256; cv=none; b=kDmVgfAg+Y15yDwTeQ9dxRlnMe5Yf23ylvo37UTU0GoRtoX/qQnRugzN3FN9fPD0e8Sr4E wYfAMqWViz4+RCgiFE5jTjfH5ZU7fSdhRch5Ja+FBzXOWOkG1i9x2ope/t6mjdh6VGKyW5 xrAOp1AdgBA1d+uup2isC1vCekhYBZT3YEwP1YeWuZUu3NufKLQtdPNwudhmp/Yejc2cYh tUoJpv5ugPTyRecVn3YSPTwnp9h+jalYsbffOdO2BTWcA6fH805j9paySXhJ51aiFTQMtR +2YJQ2JK0bqzmQwRgjTbt1i883dwGDIRZTP5ibPQEUrkS96ff9/Yqv+0Gobgiw== 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 4XZppH4zL8zZ5D; Fri, 25 Oct 2024 16:56:23 +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 49PGuNAO037392; Fri, 25 Oct 2024 16:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PGuNiL037389; Fri, 25 Oct 2024 16:56:23 GMT (envelope-from git) Date: Fri, 25 Oct 2024 16:56:23 GMT Message-Id: <202410251656.49PGuNiL037389@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: 8822c36b1cff - main - net/tayga: Remove debug message List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 8822c36b1cff3af829ab7f67b8e63837eab192ec Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8822c36b1cff3af829ab7f67b8e63837eab192ec commit 8822c36b1cff3af829ab7f67b8e63837eab192ec Author: Franco Fichtner AuthorDate: 2024-10-25 16:52:48 +0000 Commit: Zsolt Udvari CommitDate: 2024-10-25 16:55:55 +0000 net/tayga: Remove debug message Add LICENSE_FILE. Submitter takes maintainership. Switch to DISTVERSION. PR: 253605 Approved by: melifaro (ex-maintainer) --- net/tayga/Makefile | 8 +++--- net/tayga/files/patch-freebsd | 58 +++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 39 deletions(-) diff --git a/net/tayga/Makefile b/net/tayga/Makefile index 8bc53303e4f6..02a89ae1d446 100644 --- a/net/tayga/Makefile +++ b/net/tayga/Makefile @@ -1,17 +1,17 @@ PORTNAME= tayga -PORTVERSION= 0.9.2 -PORTREVISION= 1 +DISTVERSION= 0.9.2 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.litech.org/tayga/ -MAINTAINER= melifaro@FreeBSD.org +MAINTAINER= franco@opnsense.org COMMENT= Userland stateless NAT64 daemon WWW= http://www.litech.org/tayga/ LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake tar:bzip2 GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share .include diff --git a/net/tayga/files/patch-freebsd b/net/tayga/files/patch-freebsd index 2e7ce1dbdcc2..a0771c8b798e 100644 --- a/net/tayga/files/patch-freebsd +++ b/net/tayga/files/patch-freebsd @@ -1,7 +1,6 @@ -diff -ur nat64.c nat64.c ---- nat64.c 2012-10-03 16:55:57.000000000 +0400 -+++ nat64.c 2012-10-04 14:22:01.000000000 +0400 -@@ -94,8 +94,7 @@ +--- nat64.c.orig 2011-05-25 14:11:30 UTC ++++ nat64.c +@@ -94,8 +94,7 @@ static void host_send_icmp4(uint8_t tos, struct in_add } __attribute__ ((__packed__)) header; struct iovec iov[2]; @@ -11,7 +10,7 @@ diff -ur nat64.c nat64.c header.ip4.ver_ihl = 0x45; header.ip4.tos = tos; header.ip4.length = htons(sizeof(header.ip4) + sizeof(header.icmp) + -@@ -156,6 +155,7 @@ +@@ -156,6 +155,7 @@ static void host_handle_icmp4(struct pkt *p) } } @@ -19,7 +18,7 @@ diff -ur nat64.c nat64.c static void xlate_header_4to6(struct pkt *p, struct ip6 *ip6, int payload_length) { -@@ -266,8 +266,7 @@ +@@ -266,8 +266,7 @@ static void xlate_4to6_data(struct pkt *p) if (dest) dest->flags |= CACHE_F_SEEN_4TO6; @@ -29,7 +28,7 @@ diff -ur nat64.c nat64.c if (no_frag_hdr) { iov[0].iov_base = &header; -@@ -514,8 +513,7 @@ +@@ -514,8 +513,7 @@ static void xlate_4to6_icmp_error(struct pkt *p) sizeof(header.ip6_em)), ip_checksum(p_em.data, p_em.data_len))); @@ -39,7 +38,7 @@ diff -ur nat64.c nat64.c iov[0].iov_base = &header; iov[0].iov_len = sizeof(header); -@@ -566,8 +564,7 @@ +@@ -566,8 +564,7 @@ static void host_send_icmp6(uint8_t tc, struct in6_add } __attribute__ ((__packed__)) header; struct iovec iov[2]; @@ -49,16 +48,7 @@ diff -ur nat64.c nat64.c header.ip6.ver_tc_fl = htonl((0x6 << 28) | (tc << 20)); header.ip6.payload_length = htons(sizeof(header.icmp) + data_len); header.ip6.next_header = 58; -@@ -588,6 +585,8 @@ - if (writev(gcfg->tun_fd, iov, data_len ? 2 : 1) < 0) - slog(LOG_WARNING, "error writing packet to tun device: %s\n", - strerror(errno)); -+ -+ slog(LOG_WARNING, "Wrote somethinh\n"); - } - - static void host_send_icmp6_error(uint8_t type, uint8_t code, uint32_t word, -@@ -728,8 +727,7 @@ +@@ -728,8 +725,7 @@ static void xlate_6to4_data(struct pkt *p) if (dest) dest->flags |= CACHE_F_SEEN_6TO4; @@ -68,7 +58,7 @@ diff -ur nat64.c nat64.c header.ip4.cksum = ip_checksum(&header.ip4, sizeof(header.ip4)); -@@ -932,8 +930,7 @@ +@@ -932,8 +928,7 @@ static void xlate_6to4_icmp_error(struct pkt *p) sizeof(header.ip4_em)), ip_checksum(p_em.data, p_em.data_len)); @@ -78,10 +68,9 @@ diff -ur nat64.c nat64.c iov[0].iov_base = &header; iov[0].iov_len = sizeof(header); -diff -ur tayga.c tayga.c ---- tayga.c 2012-10-03 16:55:57.000000000 +0400 -+++ tayga.c 2012-10-04 15:13:49.000000000 +0400 -@@ -84,6 +84,7 @@ +--- tayga.c.orig 2011-05-25 14:11:30 UTC ++++ tayga.c +@@ -84,6 +84,7 @@ void read_random_bytes(void *d, int len) } } @@ -89,12 +78,12 @@ diff -ur tayga.c tayga.c static void tun_setup(int do_mktun, int do_rmtun) { struct ifreq ifr; -@@ -161,6 +162,113 @@ +@@ -161,7 +162,114 @@ static void tun_setup(int do_mktun, int do_rmtun) slog(LOG_INFO, "Using tun device %s with MTU %d\n", gcfg->tundev, gcfg->mtu); } +#endif -+ + +#ifdef __FreeBSD__ +static void tun_setup(int do_mktun, int do_rmtun) +{ @@ -200,10 +189,11 @@ diff -ur tayga.c tayga.c + gcfg->mtu); +} +#endif - ++ static void signal_handler(int signal) { -@@ -214,7 +322,7 @@ + write(signalfds[1], &signal, sizeof(signal)); +@@ -214,7 +322,7 @@ static void read_from_tun(void) memset(p, 0, sizeof(struct pkt)); p->data = gcfg->recv_buf + sizeof(struct tun_pi); p->data_len = ret - sizeof(struct tun_pi); @@ -212,10 +202,9 @@ diff -ur tayga.c tayga.c case ETH_P_IP: handle_ip4(p); break; -diff -ur tayga.h tayga.h ---- tayga.h 2012-10-03 16:55:57.000000000 +0400 -+++ tayga.h 2012-10-04 14:26:09.000000000 +0400 -@@ -31,14 +31,44 @@ +--- tayga.h.orig 2011-05-25 14:11:30 UTC ++++ tayga.h +@@ -31,13 +31,43 @@ #include #include #include @@ -231,12 +220,12 @@ diff -ur tayga.h tayga.h +#include +#include +#endif -+ ++ #include "list.h" #include "config.h" - ++ +#ifdef __Linux__ +#define TUN_SET_PROTO(_pi, _af) { (_pi)->flags = 0; (_pi)->proto = htons(_af); } +#define TUN_GET_PROTO(_pi) ntohs((_pi)->proto) @@ -256,7 +245,6 @@ diff -ur tayga.h tayga.h +#define TUN_SET_PROTO(_pi, _af) { (_pi)->proto = htonl(_af); } +#define TUN_GET_PROTO(_pi) ntohl((_pi)->proto) +#endif -+ + /* Configuration knobs */ - /* Number of seconds of silence before a map ages out of the cache */