From 252d16ebec7dd9631b002e7576e88da3b369061f Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sat, 3 Aug 2024 19:25:30 +0200 Subject: [PATCH 1/6] 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 5eb5ecd44724a3..446e4ae04992d1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3679,7 +3679,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.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/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 " 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 a3286f6446c78f1db42e0cf21c9077dd1653335c Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sun, 4 Aug 2024 11:33:42 +0200 Subject: [PATCH 2/6] New package: libgit2-1.8-1.8.1 --- common/shlibs | 1 + srcpkgs/libgit2-1.8-cli | 1 + srcpkgs/libgit2-1.8-devel | 1 + ...test-validate_current_user_ownership.patch | 13 +++++ srcpkgs/libgit2-1.8/template | 52 +++++++++++++++++++ 5 files changed, 68 insertions(+) create mode 120000 srcpkgs/libgit2-1.8-cli create mode 120000 srcpkgs/libgit2-1.8-devel create mode 100644 srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch create mode 100644 srcpkgs/libgit2-1.8/template diff --git a/common/shlibs b/common/shlibs index 446e4ae04992d1..60e900856d2ade 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1342,6 +1342,7 @@ 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-1.8.1_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 diff --git a/srcpkgs/libgit2-1.8-cli b/srcpkgs/libgit2-1.8-cli new file mode 120000 index 00000000000000..38cbde53b67fa4 --- /dev/null +++ b/srcpkgs/libgit2-1.8-cli @@ -0,0 +1 @@ +libgit2-1.8 \ No newline at end of file diff --git a/srcpkgs/libgit2-1.8-devel b/srcpkgs/libgit2-1.8-devel new file mode 120000 index 00000000000000..38cbde53b67fa4 --- /dev/null +++ b/srcpkgs/libgit2-1.8-devel @@ -0,0 +1 @@ +libgit2-1.8 \ No newline at end of file diff --git a/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch new file mode 100644 index 00000000000000..3cbe2c9b773f4e --- /dev/null +++ b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch @@ -0,0 +1,13 @@ +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, "/")); +- cl_assert_equal_i(is_cur, (geteuid() == 0)); ++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root + + cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist")); + #endif diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template new file mode 100644 index 00000000000000..e1051bbd9facf6 --- /dev/null +++ b/srcpkgs/libgit2-1.8/template @@ -0,0 +1,52 @@ +# Template file for 'libgit2-1.8' +pkgname=libgit2-1.8 +version=1.8.1 +revision=1 +build_style=cmake +configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp" +hostmakedepends="python3 pkg-config" +makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel" +short_desc="Git linkable library ${pkgname#libgit2-}" +maintainer="Orphaned " +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=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e + +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTS=OFF" +fi + +CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" + +post_patch() { + # no online tests + vsed \ + -i tests/libgit2/CMakeLists.txt \ + -e '/-sonline/s/^/#/' +} + +post_install() { + vlicense COPYING +} + +libgit2-1.8-cli_package() { + short_desc+=" - cli tools" + provides="virtual-libgit2-cli-${version}_${revision}" + conflicts="virtual-libgit2-cli" + pkg_install() { + vmove usr/bin + } +} + +libgit2-1.8-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + provides="virtual-libgit2-devel-${version}_${revision}" + conflicts="virtual-libgit2-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 103be2dda96e254fc0c5a51b7d47bdec42b612df Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sun, 4 Aug 2024 11:55:19 +0200 Subject: [PATCH 3/6] libgit2: provide virtual packages for conflicts --- srcpkgs/libgit2/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 5c4e1a48a75c7c..266d23f1cf1948 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,7 +1,7 @@ # Template file for 'libgit2' pkgname=libgit2 version=1.7.2 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system" hostmakedepends="python3 pkg-config" @@ -12,6 +12,8 @@ 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 +provides="virtual-libgit2-cli-${version}_${revision}" +conflicts="virtual-libgit2-cli" if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON" @@ -34,6 +36,8 @@ post_install() { libgit2-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + provides="virtual-libgit2-devel-${version}_${revision}" + conflicts="virtual-libgit2-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From e695e215bb064fecfdec1ee50494e7ed71ec7c10 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sun, 4 Aug 2024 12:05:55 +0200 Subject: [PATCH 4/6] eza: rebuild for libgit2-1.8 --- srcpkgs/eza/patches/downgrade-git2.patch | 13 ------------- srcpkgs/eza/template | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch deleted file mode 100644 index 68d2c5b3bde760..00000000000000 --- a/srcpkgs/eza/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index b76d5c3..5cb3123 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -94,7 +94,7 @@ rayon = "1.10.0" - ansi-width = "0.1.0" - - [dependencies.git2] --version = "0.19" -+version = "0.18" - optional = true - default-features = false - diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template index affe77b802481b..eb9a6c37d09122 100644 --- a/srcpkgs/eza/template +++ b/srcpkgs/eza/template @@ -1,10 +1,10 @@ # Template file for 'eza' pkgname=eza version=0.18.24 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libgit2-devel" +makedepends="libgit2-1.8-devel" short_desc="Modern, maintained replacement for ls" maintainer="tranzystorekk " license="MIT" @@ -21,10 +21,6 @@ post_extract() { vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz } -post_patch() { - cargo update --package git2@0.19.0 --precise 0.18.3 -} - post_install() { vcompletion completions/bash/eza bash vcompletion completions/fish/eza.fish fish From efbab9aa741dfda29c0df2b9c397193479c58545 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sun, 4 Aug 2024 12:13:58 +0200 Subject: [PATCH 5/6] git-cliff: rebuild for libgit2-1.8 --- srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 ------------- srcpkgs/git-cliff/template | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch deleted file mode 100644 index 3751aa7fa9f3d6..00000000000000 --- a/srcpkgs/git-cliff/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml -index 79cab62..fb21383 100644 ---- a/git-cliff-core/Cargo.toml -+++ b/git-cliff-core/Cargo.toml -@@ -76,7 +76,7 @@ url = "2.5.2" - dyn-clone = "1.0.17" - - [dependencies.git2] --version = "0.19.0" -+version = "0.18" - default-features = false - optional = true - diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template index 85304bfc88b75b..e4722aa883dd6b 100644 --- a/srcpkgs/git-cliff/template +++ b/srcpkgs/git-cliff/template @@ -1,7 +1,7 @@ # Template file for 'git-cliff' pkgname=git-cliff version=2.4.0 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo build_helper=qemu @@ -9,7 +9,7 @@ make_install_args="--path git-cliff" # These tests fail without a git repo make_check_args="-- --skip repo::" hostmakedepends="pkg-config" -makedepends="libgit2-devel libzstd-devel" +makedepends="libgit2-1.8-devel libzstd-devel" short_desc="Changelog generator based on conventional commits" maintainer="tranzystorekk " license="Apache-2.0, MIT" @@ -18,10 +18,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md" distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz" checksum=d5791600e440d0842e42f3b0dbc8d503f4902920675054a23f046fbb1c252636 -post_patch() { - cargo update --package git2@0.19.0 --precise 0.18.3 -} - post_install() { vdoc README.md From 9afa26676a60089eae11ce4bf21263936b9a196d Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sun, 4 Aug 2024 12:23:40 +0200 Subject: [PATCH 6/6] codeberg-cli: rebuild for libgit2-1.8 --- srcpkgs/codeberg-cli/patches/downgrade-git2.patch | 13 ------------- srcpkgs/codeberg-cli/template | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/codeberg-cli/patches/downgrade-git2.patch diff --git a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch b/srcpkgs/codeberg-cli/patches/downgrade-git2.patch deleted file mode 100644 index 45bfb5ed1a59b6..00000000000000 --- a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index ea57a6d..16d7a4e 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -47,7 +47,7 @@ url = "2.5" - webbrowser = "1.0" - - forgejo-api = "0.3" --git2 = "0.19" -+git2 = "0.18" - - [dev-dependencies] - insta = "1.34" diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template index 6a17fd7a1f4cf3..7897a9db5e55a7 100644 --- a/srcpkgs/codeberg-cli/template +++ b/srcpkgs/codeberg-cli/template @@ -1,11 +1,11 @@ # Template file for 'codeberg-cli' pkgname=codeberg-cli version=0.4.3 -revision=1 +revision=2 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" -makedepends="libgit2-devel openssl-devel" +makedepends="libgit2-1.8-devel openssl-devel" short_desc="CLI Tool for Codeberg similar to gh and glab" maintainer="tranzystorekk " license="AGPL-3.0-or-later" @@ -14,10 +14,6 @@ changelog="https://codeberg.org/Aviac/codeberg-cli/raw/branch/main/CHANGELOG.md" distfiles="https://codeberg.org/Aviac/codeberg-cli/archive/v${version}.tar.gz" checksum=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4 -post_patch() { - cargo update --package git2@0.19.0 --precise 0.18.3 -} - post_install() { vlicense LICENSE