From nobody Tue May 23 21:30:14 2023 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 4QQnXl1Lgtz4T4LC; Tue, 23 May 2023 21:30:15 +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 4QQnXl0dYcz40gQ; Tue, 23 May 2023 21:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684877415; 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=Isa7YHG2W3lG/X68BS5cD8rLsJ9KrDyqM0iVoEjXNmw=; b=TSC4rpSJAby28dHitrwpj7DNrXCZVbPa6Uwl3TVIkDjLWgY9kHjUZ58+mVOPb5ikVvdEJE L0Cq3dUj3nXfBp82MlBAXT/39NwNwdlO3zAFdLX9xRjzvW5lBtf+axzkSYCC39QLCz1D86 vJVBQ9NOpZzd56wK7KNI7XrCLtbWdfeUJ52vPPfWRczIwMqOBO17kErr2dY+s1Afq8w/bO iMTS71bImk+PNHac/qETnw2W+sa2RoQCMinsyoiHywN2PqqXCl+VDxNLmoUBG5JpI8TanX cIgCJyWJ1qvQHxuc18RCg/YCbPcn4aKRumNMUnHSXn38BsSG8+2YCzTkFcJUXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684877415; 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=Isa7YHG2W3lG/X68BS5cD8rLsJ9KrDyqM0iVoEjXNmw=; b=KvF/EdW2QGgZYfuWCLFwa8twpuJuLIRslhBIMWaGNSN+c5rdLnkQ+aq9nZ0gMVddyondbU FcdsWgz814kGQZxZPkX0HWjVFpL6u86N7u2quurFomcdi0Ddi8Aj9yrPsHLzk0Efjx1apS ddI0AUfZ6TfXoLsORe9dbO7ypwipA8m7OasflfgFveBihzuTfnAqPcAqk9dh3gaCHzf04d 76SR07RgYgU3tiTXux2aZCWIjv+gjQSI7krtpfxd/GlUpOaeSKFMrBeyQhyJgue1tji2Kg V7tN1h0Y1r0F6ZwjGaRYxWoR0J4zWPNcqk0HRj77J4lrxmzgIMhSzvO/pv1TKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684877415; a=rsa-sha256; cv=none; b=gvcSsRoT30jjnG4WKbPP+jLUmX4kTvrAVzfx9NlI7U+MmjUwPsViZIIksFFcaHb9RgSU5+ 4Qd1ig6D5VzgI0ArJBm6MLcdDAYpDcNwDgiiSm0qrzmMqlGn5KR6KT7GRh0lMyN08fo/og RV0jdo4EO4NV80gDOmUcEe1YEkIKb1dJgN8XZIuNqhwcQYjeffR+acV2F/o4MBIzCQVo+x p2cpkZMOI+E6mb4HckjYZPb5UlzJThryuiKd4fI4NJDF17UMGuWlZJPTIrmc+OlbB4X6h5 JqPQzUoQobmi5a0M2hClSShlQcwSxjDdnKOrDk1k4sOKBIV4J/0OZGcHob05CA== 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 4QQnXk6jrVzGZ7; Tue, 23 May 2023 21:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NLUEFP016492; Tue, 23 May 2023 21:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NLUEO1016485; Tue, 23 May 2023 21:30:14 GMT (envelope-from git) Date: Tue, 23 May 2023 21:30:14 GMT Message-Id: <202305232130.34NLUEO1016485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 5bb24584cf11 - main - devel/jech-dht: Use valid prototype for dht_init. 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bb24584cf11cf7d2c0bf003803243c4fc2b781b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/ports/commit/?id=5bb24584cf11cf7d2c0bf003803243c4fc2b781b commit 5bb24584cf11cf7d2c0bf003803243c4fc2b781b Author: John Baldwin AuthorDate: 2023-05-23 21:17:54 +0000 Commit: John Baldwin CommitDate: 2023-05-23 21:17:54 +0000 devel/jech-dht: Use valid prototype for dht_init. This change has already been made upstream. Differential Revision: https://reviews.freebsd.org/D40169 --- devel/jech-dht/files/patch-warns | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/devel/jech-dht/files/patch-warns b/devel/jech-dht/files/patch-warns index 12f373a895be..37653f02b378 100644 --- a/devel/jech-dht/files/patch-warns +++ b/devel/jech-dht/files/patch-warns @@ -1,5 +1,5 @@ ---- dht.c 2018-12-16 08:38:37.000000000 -0500 -+++ dht.c 2018-12-30 19:22:30.679020000 -0500 +--- dht.c.orig 2022-04-27 07:37:34.000000000 -0700 ++++ dht.c 2023-05-19 06:27:34.710210000 -0700 @@ -382,5 +382,5 @@ switch(sa->sa_family) { case AF_INET: { @@ -14,7 +14,7 @@ + const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa; const unsigned char *address = (const unsigned char*)&sin6->sin6_addr; return sin6->sin6_port == 0 || -@@ -1444,13 +1444,13 @@ +@@ -1448,13 +1448,13 @@ int i, len; struct storage *st; - unsigned char *ip; @@ -33,7 +33,7 @@ + ip = (const unsigned char*)&sin6->sin6_addr; len = 16; } else { -@@ -1569,15 +1569,15 @@ +@@ -1573,15 +1573,15 @@ make_token(const struct sockaddr *sa, int old, unsigned char *token_return) { - void *ip; @@ -52,56 +52,63 @@ + const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa; ip = &sin6->sin6_addr; iplen = 16; -@@ -2047,5 +2047,5 @@ +@@ -1844,5 +1844,5 @@ + + int +-dht_uninit() ++dht_uninit(void) + { + if(dht_socket < 0 && dht_socket6 < 0) { +@@ -2051,5 +2051,5 @@ } - if(((char*)buf)[buflen] != '\0') { + if(((const char*)buf)[buflen] != '\0') { debugf("Unterminated message.\n"); errno = EINVAL; -@@ -2904,5 +2904,5 @@ +@@ -2908,5 +2908,5 @@ #define CHECK(ptr, len) \ - if(((unsigned char*)ptr) + (len) > (buf) + (buflen)) goto overflow; + if(((const unsigned char*)ptr) + (len) > (buf) + (buflen)) goto overflow; p = dht_memmem(buf, buflen, "1:t", 3); -@@ -2910,5 +2910,5 @@ +@@ -2914,5 +2914,5 @@ long l; char *q; - l = strtol((char*)p + 3, &q, 10); + l = strtol((const char*)p + 3, &q, 10); if(q && *q == ':' && l > 0 && l < PARSE_TID_LEN) { CHECK(q + 1, l); -@@ -2934,5 +2934,5 @@ +@@ -2938,5 +2938,5 @@ long l; char *q; - l = strtol((char*)p + 7, &q, 10); + l = strtol((const char*)p + 7, &q, 10); if(q && *q == 'e' && l > 0 && l < 0x10000) m->port = l; -@@ -2943,5 +2943,5 @@ +@@ -2947,5 +2947,5 @@ long l; char *q; - l = strtol((char*)p + 16, &q, 10); + l = strtol((const char*)p + 16, &q, 10); if(q && *q == 'e' && l > 0 && l < 0x10000) m->implied_port = l; -@@ -2958,5 +2958,5 @@ +@@ -2962,5 +2962,5 @@ long l; char *q; - l = strtol((char*)p + 7, &q, 10); + l = strtol((const char*)p + 7, &q, 10); if(q && *q == ':' && l > 0 && l < PARSE_TOKEN_LEN) { CHECK(q + 1, l); -@@ -2970,5 +2970,5 @@ +@@ -2974,5 +2974,5 @@ long l; char *q; - l = strtol((char*)p + 7, &q, 10); + l = strtol((const char*)p + 7, &q, 10); if(q && *q == ':' && l > 0 && l <= PARSE_NODES_LEN) { CHECK(q + 1, l); -@@ -2982,5 +2982,5 @@ +@@ -2986,5 +2986,5 @@ long l; char *q; - l = strtol((char*)p + 8, &q, 10);