git: f11ed4160472 - main - devel/libgit2: update to 1.6.4
- Reply: Guido Falsi : "Re: git: f11ed4160472 - main - devel/libgit2: update to 1.6.4"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Sep 2023 10:35:32 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f11ed41604723ab3c75c6a108850858b7efd4f10
commit f11ed41604723ab3c75c6a108850858b7efd4f10
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-09-02 09:07:59 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-09-08 10:34:38 +0000
devel/libgit2: update to 1.6.4
Required for gitlab-ce 16.3.
Bump of pending ports will be done in another commit.
Changelog:
https://github.com/libgit2/libgit2/tags
---
devel/libgit2/Makefile | 3 +-
devel/libgit2/distinfo | 6 +-
devel/libgit2/files/patch-github-pr6555 | 145 ---------------------
.../files/patch-tests_libgit2_network_url_parse.c | 116 -----------------
devel/libgit2/pkg-plist | 3 +-
devel/py-pygit2/Makefile | 2 +-
devel/py-pygit2/distinfo | 6 +-
devel/rubygem-rugged/Makefile | 6 +-
devel/rubygem-rugged/distinfo | 8 +-
9 files changed, 14 insertions(+), 281 deletions(-)
diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 8d2a05ddd981..6077ec583236 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -5,8 +5,7 @@
PORTNAME= libgit2
DISTVERSIONPREFIX= v
-DISTVERSION= 1.5.2
-PORTREVISION= 1
+DISTVERSION= 1.6.4
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
diff --git a/devel/libgit2/distinfo b/devel/libgit2/distinfo
index d8156e1d9815..16e695742775 100644
--- a/devel/libgit2/distinfo
+++ b/devel/libgit2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677481875
-SHA256 (libgit2-libgit2-v1.5.2_GH0.tar.gz) = 57638ac0e319078f56a7e17570be754515e5b1276d3750904b4214c92e8fa196
-SIZE (libgit2-libgit2-v1.5.2_GH0.tar.gz) = 5896845
+TIMESTAMP = 1692804472
+SHA256 (libgit2-libgit2-v1.6.4_GH0.tar.gz) = d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
+SIZE (libgit2-libgit2-v1.6.4_GH0.tar.gz) = 6666964
diff --git a/devel/libgit2/files/patch-github-pr6555 b/devel/libgit2/files/patch-github-pr6555
deleted file mode 100644
index 99856eb18372..000000000000
--- a/devel/libgit2/files/patch-github-pr6555
+++ /dev/null
@@ -1,145 +0,0 @@
---- CMakeLists.txt.orig 2023-02-15 10:03:30 UTC
-+++ CMakeLists.txt
-@@ -96,7 +96,7 @@ include(CheckStructHasMember)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
- include(CheckStructHasMember)
--include(CheckPrototypeDefinition)
-+include(CheckPrototypeDefinitionSafe)
- include(AddCFlagIfSupported)
- include(FindPkgLibraries)
- include(FindThreads)
---- cmake/CheckPrototypeDefinitionSafe.cmake.orig 2023-05-14 12:22:20 UTC
-+++ cmake/CheckPrototypeDefinitionSafe.cmake
-@@ -0,0 +1,16 @@
-+include(CheckPrototypeDefinition)
-+
-+function(check_prototype_definition_safe function prototype return header variable)
-+ # temporarily save CMAKE_C_FLAGS and disable warnings about unused
-+ # unused functions and parameters, otherwise they will always fail
-+ # if ENABLE_WERROR is on
-+ set(SAVED_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-+
-+ disable_warnings(unused-function)
-+ disable_warnings(unused-parameter)
-+
-+ check_prototype_definition("${function}" "${prototype}" "${return}" "${header}" "${variable}")
-+
-+ # restore CMAKE_C_FLAGS
-+ set(CMAKE_C_FLAGS "${SAVED_CMAKE_C_FLAGS}")
-+endfunction()
---- src/CMakeLists.txt.orig 2023-02-15 10:03:30 UTC
-+++ src/CMakeLists.txt
-@@ -58,15 +58,29 @@ add_feature_info(futimens GIT_USE_FUTIMENS "futimens s
-
- # qsort
-
--check_prototype_definition(qsort_r
-- "void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, int (*compar)(void *, const void *, const void *))"
-- "" "stdlib.h" GIT_QSORT_R_BSD)
-+# old-style FreeBSD qsort_r() has the 'context' parameter as the first argument
-+# of the comparison function:
-+check_prototype_definition_safe(qsort_r
-+ "void (qsort_r)(void *base, size_t nmemb, size_t size, void *context, int (*compar)(void *, const void *, const void *))"
-+ "" "stdlib.h" GIT_QSORT_BSD)
-
--check_prototype_definition(qsort_r
-- "void qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)"
-- "" "stdlib.h" GIT_QSORT_R_GNU)
-+# GNU or POSIX qsort_r() has the 'context' parameter as the last argument of the
-+# comparison function:
-+check_prototype_definition_safe(qsort_r
-+ "void (qsort_r)(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *context)"
-+ "" "stdlib.h" GIT_QSORT_GNU)
-
--check_function_exists(qsort_s GIT_QSORT_S)
-+# C11 qsort_s() has the 'context' parameter as the last argument of the
-+# comparison function, and returns an error status:
-+check_prototype_definition_safe(qsort_s
-+ "errno_t (qsort_s)(void *base, rsize_t nmemb, rsize_t size, int (*compar)(const void *, const void *, void *), void *context)"
-+ "0" "stdlib.h" GIT_QSORT_C11)
-+
-+# MSC qsort_s() has the 'context' parameter as the first argument of the
-+# comparison function, and as the last argument of qsort_s():
-+check_prototype_definition_safe(qsort_s
-+ "void (qsort_s)(void *base, size_t num, size_t width, int (*compare )(void *, const void *, const void *), void *context)"
-+ "" "stdlib.h" GIT_QSORT_MSC)
-
- # random / entropy data
-
---- src/features.h.in.orig 2023-02-15 10:03:30 UTC
-+++ src/features.h.in
-@@ -24,9 +24,10 @@
- #cmakedefine GIT_REGEX_PCRE2
- #cmakedefine GIT_REGEX_BUILTIN 1
-
--#cmakedefine GIT_QSORT_R_BSD
--#cmakedefine GIT_QSORT_R_GNU
--#cmakedefine GIT_QSORT_S
-+#cmakedefine GIT_QSORT_BSD
-+#cmakedefine GIT_QSORT_GNU
-+#cmakedefine GIT_QSORT_C11
-+#cmakedefine GIT_QSORT_MSC
-
- #cmakedefine GIT_SSH 1
- #cmakedefine GIT_SSH_MEMORY_CREDENTIALS 1
---- src/util/util.c.orig 2023-02-15 10:03:30 UTC
-+++ src/util/util.c
-@@ -18,7 +18,7 @@
- # endif
- # include <windows.h>
-
--# ifdef GIT_QSORT_S
-+# ifdef GIT_QSORT_MSC
- # include <search.h>
- # endif
- #endif
-@@ -673,7 +673,7 @@ size_t git__unescape(char *str)
- return (pos - str);
- }
-
--#if defined(GIT_QSORT_S) || defined(GIT_QSORT_R_BSD)
-+#if defined(GIT_QSORT_MSC) || defined(GIT_QSORT_BSD)
- typedef struct {
- git__sort_r_cmp cmp;
- void *payload;
-@@ -688,9 +688,11 @@ static int GIT_LIBGIT2_CALL git__qsort_r_glue_cmp(
- #endif
-
-
--#if !defined(GIT_QSORT_R_BSD) && \
-- !defined(GIT_QSORT_R_GNU) && \
-- !defined(GIT_QSORT_S)
-+#if !defined(GIT_QSORT_BSD) && \
-+ !defined(GIT_QSORT_GNU) && \
-+ !defined(GIT_QSORT_C11) && \
-+ !defined(GIT_QSORT_MSC)
-+
- static void swap(uint8_t *a, uint8_t *b, size_t elsize)
- {
- char tmp[256];
-@@ -716,17 +718,20 @@ static void insertsort(
- for (j = i; j > base && cmp(j, j - elsize, payload) < 0; j -= elsize)
- swap(j, j - elsize, elsize);
- }
-+
- #endif
-
- void git__qsort_r(
- void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload)
- {
--#if defined(GIT_QSORT_R_BSD)
-+#if defined(GIT_QSORT_GNU)
-+ qsort_r(els, nel, elsize, cmp, payload);
-+#elif defined(GIT_QSORT_C11)
-+ qsort_s(els, nel, elsize, cmp, payload);
-+#elif defined(GIT_QSORT_BSD)
- git__qsort_r_glue glue = { cmp, payload };
- qsort_r(els, nel, elsize, &glue, git__qsort_r_glue_cmp);
--#elif defined(GIT_QSORT_R_GNU)
-- qsort_r(els, nel, elsize, cmp, payload);
--#elif defined(GIT_QSORT_S)
-+#elif defined(GIT_QSORT_MSC)
- git__qsort_r_glue glue = { cmp, payload };
- qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue);
- #else
diff --git a/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c b/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c
deleted file mode 100644
index 1e7cea713eb0..000000000000
--- a/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c
+++ /dev/null
@@ -1,116 +0,0 @@
---- tests/libgit2/network/url/parse.c.orig 2022-07-14 00:06:59 UTC
-+++ tests/libgit2/network/url/parse.c
-@@ -63,18 +63,6 @@ void test_network_url_parse__hostname_implied_root_cus
- 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 @@ void test_network_url_parse__hostname_port(void)
- 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@hostname.tld:port/resource */
-@@ -219,18 +195,6 @@ void test_network_url_parse__ipv4_implied_root_custom_
- 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 @@ void test_network_url_parse__ipv4_port(void)
- 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 @@ void test_network_url_parse__ipv6_implied_root_custom_
- 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,
-@@ -433,18 +373,6 @@ void test_network_url_parse__ipv6_port(void)
- 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), 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)
diff --git a/devel/libgit2/pkg-plist b/devel/libgit2/pkg-plist
index 5d774ab0854c..94c2f836e87f 100644
--- a/devel/libgit2/pkg-plist
+++ b/devel/libgit2/pkg-plist
@@ -1,4 +1,4 @@
-bin/git2_cli
+bin/git2
include/git2.h
include/git2/annotated_commit.h
include/git2/apply.h
@@ -22,6 +22,7 @@ include/git2/describe.h
include/git2/diff.h
include/git2/email.h
include/git2/errors.h
+include/git2/experimental.h
include/git2/filter.h
include/git2/global.h
include/git2/graph.h
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 6b0132008749..ee92624084c4 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -1,7 +1,7 @@
# Also update devel/libgit2, devel/libgit2-glib, devel/rubygem-rugged
PORTNAME= pygit2
-PORTVERSION= 1.11.1
+PORTVERSION= 1.12.2
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo
index 0f43cfa61b1f..5b40457dffe4 100644
--- a/devel/py-pygit2/distinfo
+++ b/devel/py-pygit2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668960780
-SHA256 (pygit2-1.11.1.tar.gz) = 793f583fd33620f0ac38376db0f57768ef2922b89b459e75b1ac440377eb64ec
-SIZE (pygit2-1.11.1.tar.gz) = 733883
+TIMESTAMP = 1692805526
+SHA256 (pygit2-1.12.2.tar.gz) = 56e85d0e66de957d599d1efb2409d39afeefd8f01009bfda0796b42a4b678358
+SIZE (pygit2-1.12.2.tar.gz) = 738453
diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
index ff72380b1f14..b004d1751aa0 100644
--- a/devel/rubygem-rugged/Makefile
+++ b/devel/rubygem-rugged/Makefile
@@ -1,14 +1,10 @@
# Also update devel/libgit2, devel/libgit2-glib, devel/py-pygit2
PORTNAME= rugged
-PORTVERSION= 1.5.1
+PORTVERSION= 1.6.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
-# libgit2 1.5 added more spaces in version definition, fetch the required patch
-PATCH_SITES= https://github.com/libgit2/rugged/commit/
-PATCHFILES= 9f9bce7e3346dfcf2a4256561e37ba8c888a16b6.diff:-p1
-
MAINTAINER= mfechner@FreeBSD.org
COMMENT= Ruby bindings to the libgit2 library
WWW= https://github.com/libgit2/rugged
diff --git a/devel/rubygem-rugged/distinfo b/devel/rubygem-rugged/distinfo
index 8faf6b9b4e91..6e5f68fdd737 100644
--- a/devel/rubygem-rugged/distinfo
+++ b/devel/rubygem-rugged/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1674451490
-SHA256 (rubygem/rugged-1.5.1.gem) = a83493d050652d9e65eb6844a32f2c3da59e385e875214f7e502db547a7fce72
-SIZE (rubygem/rugged-1.5.1.gem) = 1807360
-SHA256 (rubygem/9f9bce7e3346dfcf2a4256561e37ba8c888a16b6.diff) = 5f0ff2547649c9a1eddd73176322bb957b7d3d85c1b6c70d772f293289c88eac
-SIZE (rubygem/9f9bce7e3346dfcf2a4256561e37ba8c888a16b6.diff) = 741
+TIMESTAMP = 1692804240
+SHA256 (rubygem/rugged-1.6.3.gem) = 362631de8dc6f1074242f21e01148ac70b7fe8cdb17f85eee91d4ea83457cb04
+SIZE (rubygem/rugged-1.6.3.gem) = 1818624