Date: Wed, 10 Apr 2024 22:27:21 GMT From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6e2daf8b8e85 - main - devel/resolv_wrapper: Upgrade to 1.1.8 version Message-ID: <202404102227.43AMRLAq022085@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by timur: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e2daf8b8e85abaebeeb17b3c817ec8dde8a6092 commit 6e2daf8b8e85abaebeeb17b3c817ec8dde8a6092 Author: Timur I. Bakeyev <timur@FreeBSD.org> AuthorDate: 2024-04-10 22:25:13 +0000 Commit: Timur I. Bakeyev <timur@FreeBSD.org> 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 <bsd.port.mk> 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 <asn@samba.org> +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 <asn@samba.org> +Reviewed-by: Pavel Filipenský <pfilipensky@samba.org> +--- + 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 <asn@samba.org> +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 <asn@samba.org> +Reviewed-by: Pavel Filipenský <pfilipensky@samba.org> +--- + 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404102227.43AMRLAq022085>