Date: Friday, September 10, 2021 @ 07:44:30 Author: dvzrv Revision: 423699
upgpkg: libgit2 1:1.2.0-1: Upgrade to 1.2.0. Adapt patch for removal of incompatible tests to new test setup. Added: libgit2/trunk/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch Modified: libgit2/trunk/PKGBUILD Deleted: libgit2/trunk/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch -----------------------------------------------------------+ PKGBUILD | 18 - libgit2-0.99.0-remove_http-parse_incompatible_tests.patch | 41 ---- libgit2-1.2.0-remove_http-parse_incompatible_tests.patch | 117 ++++++++++++ 3 files changed, 126 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-10 04:22:05 UTC (rev 423698) +++ PKGBUILD 2021-09-10 07:44:30 UTC (rev 423699) @@ -4,7 +4,7 @@ # Contributor: Dave Reisner <[email protected]> pkgname=libgit2 -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 epoch=1 pkgdesc='A linkable library for Git' @@ -15,17 +15,17 @@ provides=('libgit2.so') license=('GPL2') source=("$pkgname-$pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz"; - "${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch") -sha512sums=('287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc' - 'e73072424c9c1870eaaf93b3451295ef7333b59f6cb8a6897dd690b69a20aaeb70f00d15a692c1d9e0745d5ef16bbbb912fbd570d8bc83ca0b7d57f32025bf94') -b2sums=('46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df' - 'cdca2012f772afea99436faa02f80697dc9042a6eb5ae14f8ee8ba9e100a65b936cdfaf84ec0361543c70859375c823a25cfee52b0face40b8dea2ec2cf1de59') + "${pkgname}-1.2.0-remove_http-parse_incompatible_tests.patch") +sha512sums=('428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc' + '01bf3a960b2e6d441017af363bff267bd1513915ebefda95012d7feb38f7020778ea0908664cc479da82f441a4dd2788772005006a9c19e87cfc234268dc3785') +b2sums=('b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc' + 'e725fb41c9bdfd9952693c9c47be90c10a16a78ab91f80e74c40c5510a83325575ce95674a2e21282e9c300f2bc8d430c896fa379ef744b8a8a912729fa88827') prepare() { cd "$pkgname-$pkgver" - # removing tests that are only compatible with the (modified) vendored - # version of http-parser, but not with upstream http-parser - patch -Np1 -i "../${pkgname}-0.99.0-remove_http-parse_incompatible_tests.patch" + # remove tests that are only compatible with the (modified) vendored version + # of http-parser, but not with upstream http-parser + patch -Np1 -i "../${pkgname}-1.2.0-remove_http-parse_incompatible_tests.patch" } Deleted: libgit2-0.99.0-remove_http-parse_incompatible_tests.patch =================================================================== --- libgit2-0.99.0-remove_http-parse_incompatible_tests.patch 2021-09-10 04:22:05 UTC (rev 423698) +++ libgit2-0.99.0-remove_http-parse_incompatible_tests.patch 2021-09-10 07:44:30 UTC (rev 423699) @@ -1,41 +0,0 @@ -diff -ruN a/tests/network/urlparse.c b/tests/network/urlparse.c ---- a/tests/network/urlparse.c 2020-02-19 11:27:00.000000000 +0100 -+++ b/tests/network/urlparse.c 2020-02-20 17:29:46.667262285 +0100 -@@ -61,18 +61,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_urlparse__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_urlparse__encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -127,18 +115,6 @@ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_urlparse__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_urlparse__user_port(void) - { - /* [email protected]:port/resource */ Added: libgit2-1.2.0-remove_http-parse_incompatible_tests.patch =================================================================== --- libgit2-1.2.0-remove_http-parse_incompatible_tests.patch (rev 0) +++ libgit2-1.2.0-remove_http-parse_incompatible_tests.patch 2021-09-10 07:44:30 UTC (rev 423699) @@ -0,0 +1,117 @@ +diff -ruN a/tests/network/url/parse.c b/tests/network/url/parse.c +--- a/tests/network/url/parse.c 2021-09-02 05:06:19.000000000 +0200 ++++ b/tests/network/url/parse.c 2021-09-10 09:17:34.775074427 +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,
