[arch-commits] Commit in libgit2/repos (3 files)

David Runge dvzrv at gemini.archlinux.org
Fri Feb 18 16:44:09 UTC 2022


    Date: Friday, February 18, 2022 @ 16:44:08
  Author: dvzrv
Revision: 437686

archrelease: copy trunk to staging-x86_64

Added:
  libgit2/repos/staging-x86_64/
  libgit2/repos/staging-x86_64/PKGBUILD
    (from rev 437685, libgit2/trunk/PKGBUILD)
  libgit2/repos/staging-x86_64/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch
    (from rev 437685, libgit2/trunk/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch)

----------------------------------------------------------+
 PKGBUILD                                                 |   54 ++++++
 libgit2-1.2.0-remove_http-parse_incompatible_tests.patch |  117 +++++++++++++
 2 files changed, 171 insertions(+)

Copied: libgit2/repos/staging-x86_64/PKGBUILD (from rev 437685, libgit2/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2022-02-18 16:44:08 UTC (rev 437686)
@@ -0,0 +1,54 @@
+# 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.4.1
+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.2.0-remove_http-parse_incompatible_tests.patch
+)
+sha512sums=('66943d82811c5e24687231696bd1ce8d7d58f44081c00a7030e01a69a7c920605a427c315a26af6c57c9bd7c1d1d31ab857f80615fce1ba4b981d01f733215cd'
+            '01bf3a960b2e6d441017af363bff267bd1513915ebefda95012d7feb38f7020778ea0908664cc479da82f441a4dd2788772005006a9c19e87cfc234268dc3785')
+b2sums=('7c8316003c168c4b366fa4376d5e4dfa0a70dcb0cd0cc0b4ac7287f7b04eba50127cca89c4bcda94f86e5331b6a2951532b5108d5376a2a3fed7a68c31472151'
+        'e725fb41c9bdfd9952693c9c47be90c10a16a78ab91f80e74c40c5510a83325575ce95674a2e21282e9c300f2bc8d430c896fa379ef744b8a8a912729fa88827')
+
+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.2.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
+  make VERBOSE=1 -C build
+}
+
+check() {
+  make VERBOSE=1 test -C build
+}
+
+package() {
+  depends+=(libssh2.so)
+
+  make VERBOSE=1 DESTDIR="$pkgdir" install -C build
+  install -vDm 644 $pkgname-$pkgver/{AUTHORS,README.md} -t "$pkgdir/usr/share/doc/$pkgname"
+}

Copied: libgit2/repos/staging-x86_64/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch (from rev 437685, libgit2/trunk/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch)
===================================================================
--- staging-x86_64/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch	                        (rev 0)
+++ staging-x86_64/libgit2-1.2.0-remove_http-parse_incompatible_tests.patch	2022-02-18 16:44:08 UTC (rev 437686)
@@ -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)
+ {
+ 	/* 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