Date: Saturday, March 18, 2023 @ 08:45:35 Author: dvzrv Revision: 471460
upgpkg: libgit2 1:1.6.2-1: Upgrade to 1.6.2. Remove patch and ignore tests in check() specifically instead. Modified: libgit2/trunk/PKGBUILD Deleted: libgit2/trunk/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch ----------------------------------------------------------+ PKGBUILD | 57 ++++-- libgit2-1.5.0-remove_http-parse_incompatible_tests.patch | 117 ------------- 2 files changed, 37 insertions(+), 137 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-18 07:27:04 UTC (rev 471459) +++ PKGBUILD 2023-03-18 08:45:35 UTC (rev 471460) @@ -4,31 +4,31 @@ # Contributor: Dave Reisner <[email protected]> pkgname=libgit2 -pkgver=1.5.1 -pkgrel=2 +pkgver=1.6.2 +pkgrel=1 epoch=1 pkgdesc="A linkable library for Git" arch=(x86_64) url="https://github.com/libgit2/libgit2"; license=(GPL2) -depends=(gcc-libs glibc http-parser zlib) -makedepends=(cmake libssh2 openssl python pcre2) +depends=( + gcc-libs + glibc + http-parser + zlib +) +makedepends=( + cmake + libssh2 + openssl + pcre2 + python +) provides=(libgit2.so) -source=( - $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz - $pkgname-1.5.0-remove_http-parse_incompatible_tests.patch -) -sha512sums=('04cf389e30cd9fb787704e3c8997acaaeea5c13e1e2f9eaf9f5598d35c2e85f3cf04b47312cae9e7278236ecb089c2d33addd852e38d3c7d2daa87929b077f39' - 'f9bb9ad7eb0f43003f5f72c81575ef5751b893fdf257d888b56818ee2c136b496b7cf72627a53dbd01319e33d0dd373e9d6df887360f7bec367419ef0c7ab711') -b2sums=('4df80216523f4065e46c1ce99fd0747d2f8516571691c8c2b5638e32c805f5ce08d3add769e6d5ce29ac69b35419db82ce56c6b3019e70573c4ad63aca2e440d' - 'b3c2386ba84664318573e5c24797d28db914d60782397d8b39a21b54b4fb19502945fa8fcc0d8bbe8949349b5ec705d3e1345b0cbbb51b7d9631fec922f3ac41') +source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) +sha512sums=('ef9feef36c5876776f3aa608101115c9e7a0970e6dd752851d930cb85b4b1789ed68f42700ebea51095ff54600e37c18a4de0c0678d9a4d7d4aba83668890c09') +b2sums=('7a42d8440fbe0afa24057bf53d52bcb04b4e8654f71cfa55871a7e77a150297731879d8f5be51df61ad91556656b66b102536a508cf61d9c11e8658e841fc560') -prepare() { - # remove tests that are only compatible with the (modified) vendored version - # of http-parser, but not with upstream http-parser - patch -d $pkgname-$pkgver -Np1 -i ../$pkgname-1.5.0-remove_http-parse_incompatible_tests.patch -} - build() { local cmake_options=( -B build @@ -40,13 +40,30 @@ -S $pkgname-$pkgver -Wno-dev ) + cmake "${cmake_options[@]}" cmake --build build --verbose } check() { - # NOTE: disable tests requiring the internet and relying on non-existent resources - ctest --test-dir build --output-on-failure -E "invasive|online|ssh" + local ignored_tests=( + 'invasive|' + 'online|' + 'ssh|' + 'network_url_parse__hostname_implied_root_empty_port|' + 'network_url_parse__hostname_empty_port|' + 'network_url_parse__ipv4_implied_root_empty_port|' + 'network_url_parse__ipv4_empty_port|' + 'network_url_parse__ipv6_implied_root_empty_port|' + 'network_url_parse__ipv6_empty_port' + ) + local ifs="$IFS" + IFS= + # NOTE: disable tests requiring the internet, relying on non-existent + # resources, or those that are only compatible with the (modified) vendored + # version of http-parser, but not with upstream http-parser + ctest --test-dir build --output-on-failure -E "${ignored_tests[*]}" + IFS="$ifs" } package() { Deleted: libgit2-1.5.0-remove_http-parse_incompatible_tests.patch =================================================================== --- libgit2-1.5.0-remove_http-parse_incompatible_tests.patch 2023-03-18 07:27:04 UTC (rev 471459) +++ libgit2-1.5.0-remove_http-parse_incompatible_tests.patch 2023-03-18 08:45:35 UTC (rev 471460) @@ -1,117 +0,0 @@ -diff -ruN a/tests/libgit2/network/url/parse.c b/tests/libgit2/network/url/parse.c ---- a/tests/libgit2/network/url/parse.c 2022-07-14 02:06:59.000000000 +0200 -+++ b/tests/libgit2/network/url/parse.c 2022-08-07 14:28:45.012518372 +0200 -@@ -63,18 +63,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__hostname_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__hostname_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -129,18 +117,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__hostname_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__hostname_user_port(void) - { - /* [email protected]:port/resource */ -@@ -219,18 +195,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv4_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "192.168.1.1"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv4_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -283,18 +247,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv4_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:/resource";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "192.168.1.1"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv4_user_port(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -371,18 +323,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv6_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv6_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -435,18 +375,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv6_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:/resource";)); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv6_user_port(void) - { - cl_git_pass(git_net_url_parse(&conndata,
