[PR PATCH] [WIP] libgit2 1.8

[tranzystorekk <tranzystorekk@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

There is a new pull request by tranzystorekk against master on the void-packages repository

https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901

[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 7529 bytes --]

From 5a6d40ec77a7a7a0b1b961c33c1a38951f67ec11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Jun 2024 13:32:44 +0200
Subject: [PATCH 1/2] llhttp: update to 9.2.1

---
 common/shlibs                                 |  2 +-
 srcpkgs/llhttp/files/Makefile                 | 25 -------------------
 .../patches/allow-build-type-none.patch       | 17 +++++++++++++
 srcpkgs/llhttp/template                       | 19 +++++---------
 4 files changed, 24 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/llhttp/files/Makefile
 create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index 4ebfd6bb20f6ad..d76059edceecb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3664,7 +3664,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
 libcaf_io.so.0.18.0 zeek-4.0.0_1
 libcaf_openssl.so.0.18.0 zeek-4.0.0_1
 libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9 llhttp-9.2.1_1
 libpinyin.so.15 libpinyin-2.8.1_1
 libzhuyin.so.15 libzhuyin-2.8.1_1
 libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc 
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f 
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
-	$(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
-	-${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+   else()
+     string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+-    if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+-      message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+-    endif()
++    # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++    #   message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++    # endif()
+   endif()
+ endif()
+ 
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
 # or at least a revbump in the same pull request since they work in-sync.
 
 pkgname=llhttp
-version=2.2.1
+version=9.2.1
 revision=1
-build_style=gnu-makefile
+build_style=cmake
 short_desc="Port of http_parser to llparse"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
 # _always_ use releases. Those have the C code generated, otherwise
 # we'd have a dep loop nodejs<->llhttp
 distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
 
-post_extract() {
-	# No need to pull in gyp for such a simple Makefile...
-	cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
-	vinstall libllhttp.so.1.0 755 /usr/lib
-	ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
-	ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
-	vcopy include /usr
+post_install() {
 	vlicense LICENSE-MIT
 }
 
@@ -34,6 +25,8 @@ llhttp-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}
 }

From b08350997321dd82247aa3dedeb2806bdedda9ae Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 17 Apr 2024 10:05:10 +0200
Subject: [PATCH 2/2] libgit2: update to 1.8.1

---
 common/shlibs                                          |  4 ++--
 .../disable-test-validate_current_user_ownership.patch | 10 +++++-----
 srcpkgs/libgit2/template                               |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d76059edceecb0..31a74149cfef14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1331,7 +1331,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8.0_1
 libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
@@ -3664,7 +3664,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
 libcaf_io.so.0.18.0 zeek-4.0.0_1
 libcaf_openssl.so.0.18.0 zeek-4.0.0_1
 libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.9 llhttp-9.2.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
 libpinyin.so.15 libpinyin-2.8.1_1
 libzhuyin.so.15 libzhuyin-2.8.1_1
 libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 3f316543f36b22..3cbe2c9b773f4e 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,8 +1,8 @@
-diff --git a/tests/util/path.c b/tests/util/path.c
-index 02ec42f..60f7d70 100644
---- a/tests/util/path.c
-+++ b/tests/util/path.c
-@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
  #else
  	cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..f7c1d6665c606a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,17 +1,17 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.7.2
+version=1.8.1
 revision=1
 build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
 hostmakedepends="python3 pkg-config"
-makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"