[arch-commits] Commit in libgit2/repos (3 files)
David Runge
dvzrv at gemini.archlinux.org
Tue Aug 16 14:00:58 UTC 2022
Date: Tuesday, August 16, 2022 @ 14:00:57
Author: dvzrv
Revision: 453002
archrelease: copy trunk to staging-x86_64
Added:
libgit2/repos/staging-x86_64/
libgit2/repos/staging-x86_64/PKGBUILD
(from rev 453001, libgit2/trunk/PKGBUILD)
libgit2/repos/staging-x86_64/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch
(from rev 453001, libgit2/trunk/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch)
----------------------------------------------------------+
PKGBUILD | 55 ++++++
libgit2-1.5.0-remove_http-parse_incompatible_tests.patch | 117 +++++++++++++
2 files changed, 172 insertions(+)
Copied: libgit2/repos/staging-x86_64/PKGBUILD (from rev 453001, libgit2/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-08-16 14:00:57 UTC (rev 453002)
@@ -0,0 +1,55 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Hilton Medeiros <medeiros.hilton at gmail.com>
+# Contributor: Dave Reisner <d at falconindy.com>
+
+pkgname=libgit2
+pkgver=1.5.0
+pkgrel=1
+epoch=1
+pkgdesc="A linkable library for Git"
+arch=(x86_64)
+url="https://github.com/libgit2/libgit2"
+license=(GPL2)
+depends=(glibc http-parser openssl pcre zlib)
+makedepends=(cmake libssh2 python)
+provides=(libgit2.so)
+options=(debug)
+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=('7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7'
+ 'f9bb9ad7eb0f43003f5f72c81575ef5751b893fdf257d888b56818ee2c136b496b7cf72627a53dbd01319e33d0dd373e9d6df887360f7bec367419ef0c7ab711')
+b2sums=('4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf'
+ 'b3c2386ba84664318573e5c24797d28db914d60782397d8b39a21b54b4fb19502945fa8fcc0d8bbe8949349b5ec705d3e1345b0cbbb51b7d9631fec922f3ac41')
+
+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() {
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DUSE_HTTP_PARSER=system \
+ -DUSE_SSH=ON \
+ -DTHREADSAFE=ON \
+ -Wno-dev \
+ -B build \
+ -S $pkgname-$pkgver
+ cmake --build build
+}
+
+check() {
+ # NOTE: disable tests requiring the internet and relying on non-existent resources
+ ctest --test-dir build --output-on-failure -E "invasive|online"
+}
+
+package() {
+ depends+=(libssh2.so)
+
+ DESTDIR="$pkgdir" cmake --install build
+ install -vDm 644 $pkgname-$pkgver/{AUTHORS,README.md} -t "$pkgdir/usr/share/doc/$pkgname"
+}
Copied: libgit2/repos/staging-x86_64/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch (from rev 453001, libgit2/trunk/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch)
===================================================================
--- staging-x86_64/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch (rev 0)
+++ staging-x86_64/libgit2-1.5.0-remove_http-parse_incompatible_tests.patch 2022-08-16 14:00:57 UTC (rev 453002)
@@ -0,0 +1,117 @@
+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)
+ {
+ /* user at hostname.tld: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,
More information about the arch-commits
mailing list