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

[David Runge]

    Date: Thursday, October 15, 2020 @ 14:45:42
  Author: dvzrv
Revision: 398393

archrelease: copy trunk to staging-x86_64

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

-----------------------------------------------------------+
 PKGBUILD                                                  |   55 ++++++++++++
 libgit2-0.99.0-remove_http-parse_incompatible_tests.patch |   41 ++++++++
 2 files changed, 96 insertions(+)

Copied: libgit2/repos/staging-x86_64/PKGBUILD (from rev 398392, libgit2/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-10-15 14:45:42 UTC (rev 398393)
@@ -0,0 +1,55 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: Hilton Medeiros <medeiros.hilton at gmail.com>
+# Contributor: Dave Reisner <d at falconindy.com>
+
+pkgname=libgit2
+pkgver=1.1.0
+pkgrel=1
+epoch=1
+pkgdesc='A linkable library for Git'
+arch=('x86_64')
+url="https://libgit2.github.com/"
+depends=('glibc' 'http-parser' 'openssl' 'pcre' 'zlib')
+makedepends=('cmake' 'libssh2' 'python')
+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=('347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8'
+            'e73072424c9c1870eaaf93b3451295ef7333b59f6cb8a6897dd690b69a20aaeb70f00d15a692c1d9e0745d5ef16bbbb912fbd570d8bc83ca0b7d57f32025bf94')
+b2sums=('2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f'
+        'cdca2012f772afea99436faa02f80697dc9042a6eb5ae14f8ee8ba9e100a65b936cdfaf84ec0361543c70859375c823a25cfee52b0face40b8dea2ec2cf1de59')
+
+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"
+}
+
+
+build() {
+  cd "$pkgname-$pkgver"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DUSE_HTTP_PARSER=system \
+        -DTHREADSAFE=ON \
+        -Wno-dev \
+        -B build \
+        -S .
+  make -C build VERBOSE=1
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  make -C build test VERBOSE=1
+}
+
+package() {
+  depends+=('libssh2.so')
+  cd "$pkgname-$pkgver"
+  make -C build DESTDIR="$pkgdir" install
+  install -vDm 644 {AUTHORS,README.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}"
+}

Copied: libgit2/repos/staging-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch (from rev 398392, libgit2/trunk/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch)
===================================================================
--- staging-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch	                        (rev 0)
+++ staging-x86_64/libgit2-0.99.0-remove_http-parse_incompatible_tests.patch	2020-10-15 14:45:42 UTC (rev 398393)
@@ -0,0 +1,41 @@
+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)
+ {
+ 	/* user at hostname.tld:port/resource */