From nobody Mon Nov 13 13:10:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4STVCg57FZz50cF9; Mon, 13 Nov 2023 13:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4STVCg4gKbz4cWp; Mon, 13 Nov 2023 13:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699881023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gK+7KPayDgO11QuTfRXuQR/HLutFRiuqWJrL7G2yl0=; b=XEwUvDXSwtez4rZkW4fPxdvhyEDoGUnyrncGCte40KVDrtJi4Bu/fUh2CJq8Cj3k9qyeZR 0Ip6XZB41XPkHgaEpopruNVZkhgV7PLB6mctkzwpMyZvhMtS5oqGrBAd30t3l4zHOC4nNJ zupenraPknjp50sLY8bpP1Oke3Xc/GqAhb9ZHEdAyE/hrknezdvPyspe1RDCk70uYzb/xf TFGP39a/0x0kksq824FeM3A9nUacNIHknxp9vS54gNfiy0UHfwub8L+Q67jekJRFr/TrJw 15nDTNh3frjgwOX+CI8a0Fv65KcWEXeBPgb5aQE7fhqqpAg9ZfAbbgXkNt3USA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699881023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gK+7KPayDgO11QuTfRXuQR/HLutFRiuqWJrL7G2yl0=; b=ZpSMUEyWLnzxAQVtHlxWhIDsghY7Qk/B2jEye4qkH8jjG8A1glIcPi2SXhvY2FU/eK8gsG IUMspwnukiy2AJXac5umeSz+Q/C2xTxq2T0FcTUQtb/ChqZPDXszyLav7hCdlxV8DaPUEt mEek1MeicyT22Oh50IIrkWzRfYNl3cjvS22bwDn/UFSUNySA5qNvuhzQtl6y7qXoOvS53l Tgj8+a+mQ+teqag66pY7SloRH/W0MtVAKUTQAhQogzs0z853OUJMiEFymhUUn4bS9bAQUd U28LQEoIhdHSuO3SuD+DBMBI2ASUDStIxPyx4JZGpweJThJodS8P33vz1dBKsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699881023; a=rsa-sha256; cv=none; b=Z12HQofvjcaggeyPq0V9nY8gJgK5tnb06Q41juGadN8SmpZ7m0eoP9fKr34bW9c4F+8kcm FZPXgsiTBLX6CXWzk0WU2VQL059kgRlwQHeMH3kzWInwd4vSH5Fxow4YJ+VxevGyB0r/50 M5wAlAmBuMkLilNuAf/qjBAa7D9S3AwmN89p6KSPxi9cMp2bXeRGl21HOvdrfoIcazO9Zs PIUMLsrxOZ5pqLGWRIpb6f7yhz5t//ss5iID/9Ea2qqwcmgJGxttETl88+w87FEYwaM+GD BMZvID78kDHwXp4DTzMrlMpxsx5cMDsLu7Cdxc0tWtwRrER+fuZrPA7LPFyedw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4STVCg3fFKz15Mp; Mon, 13 Nov 2023 13:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ADDANR9036218; Mon, 13 Nov 2023 13:10:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADDANko036215; Mon, 13 Nov 2023 13:10:23 GMT (envelope-from git) Date: Mon, 13 Nov 2023 13:10:23 GMT Message-Id: <202311131310.3ADDANko036215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 2c68245ea1a7 - main - devel/libgit2: update to 1.7.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c68245ea1a721ce31bc95ccc6f34440068149eb Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c68245ea1a721ce31bc95ccc6f34440068149eb commit 2c68245ea1a721ce31bc95ccc6f34440068149eb Author: Matthias Fechner AuthorDate: 2023-11-13 12:05:16 +0000 Commit: Matthias Fechner CommitDate: 2023-11-13 13:10:10 +0000 devel/libgit2: update to 1.7.1 Including direct dependencies. Changelog: https://github.com/libgit2/libgit2/releases --- devel/libgit2/Makefile | 2 +- devel/libgit2/distinfo | 6 +- devel/libgit2/files/patch-github-pr6555 | 145 -------------------------------- devel/py-pygit2/Makefile | 2 +- devel/py-pygit2/distinfo | 6 +- devel/rubygem-rugged/Makefile | 2 +- devel/rubygem-rugged/distinfo | 6 +- 7 files changed, 12 insertions(+), 157 deletions(-) diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile index 57dea0d9397e..132a8771deee 100644 --- a/devel/libgit2/Makefile +++ b/devel/libgit2/Makefile @@ -5,7 +5,7 @@ PORTNAME= libgit2 DISTVERSIONPREFIX= v -DISTVERSION= 1.6.4 +DISTVERSION= 1.7.1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org diff --git a/devel/libgit2/distinfo b/devel/libgit2/distinfo index 16e695742775..f4c6e3ce1b3e 100644 --- a/devel/libgit2/distinfo +++ b/devel/libgit2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692804472 -SHA256 (libgit2-libgit2-v1.6.4_GH0.tar.gz) = d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d -SIZE (libgit2-libgit2-v1.6.4_GH0.tar.gz) = 6666964 +TIMESTAMP = 1699806099 +SHA256 (libgit2-libgit2-v1.7.1_GH0.tar.gz) = 17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 +SIZE (libgit2-libgit2-v1.7.1_GH0.tar.gz) = 7548081 diff --git a/devel/libgit2/files/patch-github-pr6555 b/devel/libgit2/files/patch-github-pr6555 deleted file mode 100644 index af4a5f36ef08..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/util/git2_features.h.in.orig 2023-02-15 10:03:30 UTC -+++ src/util/git2_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 - --# ifdef GIT_QSORT_S -+# ifdef GIT_QSORT_MSC - # include - # 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/py-pygit2/Makefile b/devel/py-pygit2/Makefile index 2ad6e2493243..b8b59f58bb4b 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.12.2 +PORTVERSION= 1.13.2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo index 5b40457dffe4..2904ccd58d68 100644 --- a/devel/py-pygit2/distinfo +++ b/devel/py-pygit2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692805526 -SHA256 (pygit2-1.12.2.tar.gz) = 56e85d0e66de957d599d1efb2409d39afeefd8f01009bfda0796b42a4b678358 -SIZE (pygit2-1.12.2.tar.gz) = 738453 +TIMESTAMP = 1699806297 +SHA256 (pygit2-1.13.2.tar.gz) = 75c7eb86b47c70f6f1434bcf3b5eb41f4e8006a15cee6bef606651b97d23788c +SIZE (pygit2-1.13.2.tar.gz) = 739956 diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile index b004d1751aa0..033b9ab5d014 100644 --- a/devel/rubygem-rugged/Makefile +++ b/devel/rubygem-rugged/Makefile @@ -1,7 +1,7 @@ # Also update devel/libgit2, devel/libgit2-glib, devel/py-pygit2 PORTNAME= rugged -PORTVERSION= 1.6.3 +PORTVERSION= 1.7.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-rugged/distinfo b/devel/rubygem-rugged/distinfo index 6e5f68fdd737..b0f0a41017d6 100644 --- a/devel/rubygem-rugged/distinfo +++ b/devel/rubygem-rugged/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692804240 -SHA256 (rubygem/rugged-1.6.3.gem) = 362631de8dc6f1074242f21e01148ac70b7fe8cdb17f85eee91d4ea83457cb04 -SIZE (rubygem/rugged-1.6.3.gem) = 1818624 +TIMESTAMP = 1699806115 +SHA256 (rubygem/rugged-1.7.1.gem) = 11aab9b468a28b784b42afc10444510c3e5a3917b89bb217fcbc0deff4fca90a +SIZE (rubygem/rugged-1.7.1.gem) = 1834496