From nobody Wed Apr 10 22:27:21 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 4VFHWY5bFYz5GG6Y; Wed, 10 Apr 2024 22:27:21 +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 4VFHWY53rzz4h2C; Wed, 10 Apr 2024 22:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712788041; 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=Ydjk/Voq04tVF0bUZSG1c1+h1Q2vhoueED+53gfUtrY=; b=J9Fn3zIBSovwZHIk9j9H1o29unMeUI4I+9kUWV5NQlc0RMSuVmOFmalUM4hqxtunwUnO+n F3ph6155peLLER2WLmFDVVsi1hv05N6zsMXaKYeHfFsLrLSR82z/ruw/0Q1v6G8v4knKwS IQprR/txDKyO+Y1TLM7ZoBrArrnH+NnzTxvo/nEq2rsw4hNzzQxbnd+hmKdTB5VWCpd1mQ 1gxNPqsPrkd6UsoqBE6JG7PTar1Hc6+5QJCxPrQ0NtXZNeNs5MZVgHHZ+ZCye/QtxU0nIj FJYhsTF4B996yxwtVRVkPdf0yn0dNgu9kreScRrb0WYQuzEBJii+oXGFqA+pIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712788041; a=rsa-sha256; cv=none; b=oW9yxz02eHiJ8D+CH3l+S1fxf2OF7WIY4PfdLQAbBe28rg60PwFBhiCMyqha1hPy0w48iM nppzzkBB04t5sTxtJeTXDGX3zpSKcVgTvrkeMkBpM2Eq0V5m4C1LsiBWRboQp9Ihm+Ap2r 3rZ8g+00/HVoq3s2mamZukbm3mwFYNNCBzp0qSEYAsm/zQA7Ks82kfX2y+VsYQiD/Ziumv txvkX5YyXhjAI5dtjD/RdoandSDQZH6ln8Dg8jhBXo8Y2tak5edT3ojUvqdQi+/VDm5ENI ecuf5qF6nQbgxQ4fMaIVyhu1ru2IiVzOnX4coIIomiYkL2ZIv+acZDumyR7mcA== 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=1712788041; 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=Ydjk/Voq04tVF0bUZSG1c1+h1Q2vhoueED+53gfUtrY=; b=V9VnrYY8njlX4MiHljS66JxbhapzBUuhLkIjodWj1lAM/ijjTFGn5v0qd6huUhA4uKyW0v cmQ3wO2GWAUR6erMl5W2e16RCS4IWgz3EeZ9lpHqkVK8DrR3ZUfFRXumltS6fiQPdN0OIn hISBzpkOZ1yTayVKLYPsRG9KngXN6H5H9QJP1APByuImt+Hap2Cpm/rO9iQqyxU+FRZjwq nVAZ8taVEOm8ITYiaXQf7fbcST+h7jUM1rLNEE4Nn9UifNSoUxuvjTN4cHnFXuVJnrMGFY eEVI4Cwa+qTJ9dKV+3rBcAghKfA5ew2IqLTsw7LppvCt7uNG3vy/U0qUyBa9TQ== 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 4VFHWY4fzJzwDp; Wed, 10 Apr 2024 22:27:21 +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 43AMRL4Z022089; Wed, 10 Apr 2024 22:27:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AMRLAq022085; Wed, 10 Apr 2024 22:27:21 GMT (envelope-from git) Date: Wed, 10 Apr 2024 22:27:21 GMT Message-Id: <202404102227.43AMRLAq022085@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Timur I. Bakeyev" Subject: git: 6e2daf8b8e85 - main - devel/resolv_wrapper: Upgrade to 1.1.8 version 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: dev-commits-ports-main+owner@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: timur X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e2daf8b8e85abaebeeb17b3c817ec8dde8a6092 Auto-Submitted: auto-generated The branch main has been updated by timur: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e2daf8b8e85abaebeeb17b3c817ec8dde8a6092 commit 6e2daf8b8e85abaebeeb17b3c817ec8dde8a6092 Author: Timur I. Bakeyev AuthorDate: 2024-04-10 22:25:13 +0000 Commit: Timur I. Bakeyev CommitDate: 2024-04-10 22:27:14 +0000 devel/resolv_wrapper: Upgrade to 1.1.8 version PR: 274479 --- devel/resolv_wrapper/Makefile | 24 +++--- devel/resolv_wrapper/distinfo | 6 +- ...git-01-dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 | 96 ++++++++++++++++++++++ ...git-02-f2e7f58025ecb4cf399494166abea01813b1d0f0 | 31 +++++++ devel/resolv_wrapper/pkg-plist | 7 ++ 5 files changed, 147 insertions(+), 17 deletions(-) diff --git a/devel/resolv_wrapper/Makefile b/devel/resolv_wrapper/Makefile index a6cce23e9871..ad72d5e63daf 100644 --- a/devel/resolv_wrapper/Makefile +++ b/devel/resolv_wrapper/Makefile @@ -1,31 +1,27 @@ PORTNAME= resolv_wrapper -PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTVERSION= 1.1.8 CATEGORIES= devel MASTER_SITES= SAMBA/cwrap MAINTAINER= timur@FreeBSD.org COMMENT= Wrapper for dns name resolving or dns faking -WWW= https://cwrap.org/resolv_wrapper.html +WWW= https://cwrap.org/resolv_wrapper.html LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake +LIB_DEPENDS= libsocket_wrapper.so:devel/socket_wrapper + +USES= cmake pathfix USE_LDCONFIG= yes +CMAKE_ARGS= -DMAN_INSTALL_DIR:PATH="${PREFIX}/man" + OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST -TEST_TEST_TARGET= test +TEST_BUILD_DEPENDS= cmocka>=1.1.5:sysutils/cmocka TEST_CMAKE_BOOL= UNIT_TESTING -TEST_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka - -PLIST_FILES= libdata/pkgconfig/resolv_wrapper.pc \ - lib/cmake/resolv_wrapper/resolv_wrapper-config-version.cmake \ - lib/cmake/resolv_wrapper/resolv_wrapper-config.cmake \ - lib/libresolv_wrapper.so.0.0.5 \ - lib/libresolv_wrapper.so.0 \ - lib/libresolv_wrapper.so \ - share/man/man1/resolv_wrapper.1.gz +TEST_TEST_TARGET= test .include diff --git a/devel/resolv_wrapper/distinfo b/devel/resolv_wrapper/distinfo index 3546fe64bc5d..a2f9d9962ba5 100644 --- a/devel/resolv_wrapper/distinfo +++ b/devel/resolv_wrapper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530576086 -SHA256 (resolv_wrapper-1.1.5.tar.gz) = e989fdaa1385bdf3ef7dbcb83b3f7f15c69e78ca6432e254be390b7c63e1b06c -SIZE (resolv_wrapper-1.1.5.tar.gz) = 34241 +TIMESTAMP = 1697354945 +SHA256 (resolv_wrapper-1.1.8.tar.gz) = fbc30f77da3e12ecd4ef66ccf5ab77e0b744930ccd89062404082f928a8ec2e0 +SIZE (resolv_wrapper-1.1.8.tar.gz) = 38051 diff --git a/devel/resolv_wrapper/files/patch-git-01-dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 b/devel/resolv_wrapper/files/patch-git-01-dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 new file mode 100644 index 000000000000..d5729bae96e1 --- /dev/null +++ b/devel/resolv_wrapper/files/patch-git-01-dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 @@ -0,0 +1,96 @@ +From dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 18:01:57 +0100 +Subject: [PATCH] tests: Fix pointer type for assert_string_equal() +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +error: pointer targets in passing argument 1 of ‘_assert_string_equal’ +differ in signedness [-Werror=pointer-sign] + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/test_dns_fake.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/test_dns_fake.c b/tests/test_dns_fake.c +index c057ebe..4f19f12 100644 +--- tests/test_dns_fake.c ++++ tests/test_dns_fake.c +@@ -392,7 +392,7 @@ static void test_res_fake_uri_query(void **state) + + assert_int_equal(prio, 2); + assert_int_equal(weight, 5); +- assert_string_equal(rrdata, "https://vpn.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn.cwrap.org/VPN"); + + assert_int_equal(ns_parserr(&handle, ns_s_an, 1, &rr), 0); + assert_int_equal(ns_rr_type(rr), ns_t_uri); +@@ -402,7 +402,7 @@ static void test_res_fake_uri_query(void **state) + + assert_int_equal(prio, 2); + assert_int_equal(weight, 10); +- assert_string_equal(rrdata, "https://vpn2.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn2.cwrap.org/VPN"); + + assert_int_equal(ns_parserr(&handle, ns_s_an, 2, &rr), 0); + assert_int_equal(ns_rr_type(rr), ns_t_uri); +@@ -412,7 +412,7 @@ static void test_res_fake_uri_query(void **state) + + assert_int_equal(prio, 2); + assert_int_equal(weight, 20); +- assert_string_equal(rrdata, "https://vpn3.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn3.cwrap.org/VPN"); + + } + +@@ -461,7 +461,7 @@ static void test_res_fake_uri_query_minimal(void **state) + + assert_int_equal(prio, 1); + assert_int_equal(weight, 100); +- assert_string_equal(rrdata, "ftp://ftp.cwrap.org/public"); ++ assert_string_equal((const char *)rrdata, "ftp://ftp.cwrap.org/public"); + } + + static void test_res_fake_soa_query(void **state) +@@ -746,7 +746,7 @@ static void test_res_fake_txt_query(void **state) + assert_int_equal(ns_rr_type(rr), ns_t_txt); + + rrdata = ns_rr_rdata(rr); +- assert_string_equal(rrdata, "v=spf1 mx"); ++ assert_string_equal((const char *)rrdata, "v=spf1 mx"); + } + + static void test_res_fake_uri_nsearch(void **state) +@@ -787,7 +787,7 @@ static void test_res_fake_uri_nsearch(void **state) + NS_GET16(weight, rrdata); + assert_int_equal(prio, 2); + assert_int_equal(weight, 5); +- assert_string_equal(rrdata, "https://vpn.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn.cwrap.org/VPN"); + + assert_int_equal(ns_parserr(&handle, ns_s_an, 1, &rr), 0); + assert_int_equal(ns_rr_type(rr), ns_t_uri); +@@ -796,7 +796,7 @@ static void test_res_fake_uri_nsearch(void **state) + NS_GET16(weight, rrdata); + assert_int_equal(prio, 2); + assert_int_equal(weight, 10); +- assert_string_equal(rrdata, "https://vpn2.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn2.cwrap.org/VPN"); + + assert_int_equal(ns_parserr(&handle, ns_s_an, 2, &rr), 0); + assert_int_equal(ns_rr_type(rr), ns_t_uri); +@@ -805,7 +805,7 @@ static void test_res_fake_uri_nsearch(void **state) + NS_GET16(weight, rrdata); + assert_int_equal(prio, 2); + assert_int_equal(weight, 20); +- assert_string_equal(rrdata, "https://vpn3.cwrap.org/VPN"); ++ assert_string_equal((const char *)rrdata, "https://vpn3.cwrap.org/VPN"); + } + + int main(void) +-- +2.34.1 + diff --git a/devel/resolv_wrapper/files/patch-git-02-f2e7f58025ecb4cf399494166abea01813b1d0f0 b/devel/resolv_wrapper/files/patch-git-02-f2e7f58025ecb4cf399494166abea01813b1d0f0 new file mode 100644 index 000000000000..541a0c286c0e --- /dev/null +++ b/devel/resolv_wrapper/files/patch-git-02-f2e7f58025ecb4cf399494166abea01813b1d0f0 @@ -0,0 +1,31 @@ +From f2e7f58025ecb4cf399494166abea01813b1d0f0 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1262bed..7f2f4ee 100644 +--- tests/CMakeLists.txt ++++ tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + set(TORTURE_LIBRARY torture) + + # A simple DNS server for testing +-- +2.34.1 + diff --git a/devel/resolv_wrapper/pkg-plist b/devel/resolv_wrapper/pkg-plist new file mode 100644 index 000000000000..b102f1b05cce --- /dev/null +++ b/devel/resolv_wrapper/pkg-plist @@ -0,0 +1,7 @@ +lib/cmake/resolv_wrapper/resolv_wrapper-config-version.cmake +lib/cmake/resolv_wrapper/resolv_wrapper-config.cmake +lib/libresolv_wrapper.so +lib/libresolv_wrapper.so.0 +lib/libresolv_wrapper.so.0.0.8 +libdata/pkgconfig/resolv_wrapper.pc +share/man/man1/resolv_wrapper.1.gz