From: g4s8 <g4s8@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libgit2: update to 1.2.0.
Date: Mon, 18 Oct 2021 11:13:37 +0200 [thread overview]
Message-ID: <20211018091337.UaK8Zkb4Ma-4xIHFim22KeP-idTUNJmd5_AzgERTftE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33535@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1932 bytes --]
There is an updated pull request by g4s8 against master on the void-packages repository
https://github.com/g4s8/void-packages libgit2-1.2.0
https://github.com/void-linux/void-packages/pull/33535
libgit2: update to 1.2.0.
Updated libgit2 to `v1.2.0`, added patch with PR
https://github.com/libgit2/libgit2/pull/6032 of
`git_remote_name_is_valid` fix for https://github.com/libgit2/git2go/issues/834 issue.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me: checked with tests of https://github.com/libgit2/git2go (`libgit2` is a dependency there)
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC) (built, installed and tested)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Ref: #28456
Maintainer: @q66
A patch file from https://github.com/void-linux/void-packages/pull/33535.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.2.0-33535.patch --]
[-- Type: text/x-diff, Size: 14012 bytes --]
From 58ff64b50163d5a927fde7f42ded1f7955b89cf3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:35:36 +0300
Subject: [PATCH 01/15] libgit2: update to 1.2.0.
Updated libgit2 to `v1.2.0`, added patch with PR
https://github.com/libgit2/libgit2/pull/6032 of
`git_remote_name_is_valid` fix.
---
common/shlibs | 2 +-
.../extern_git_remote_name_is_valid.patch | 58 +++++++++++++++++++
srcpkgs/libgit2/template | 6 +-
3 files changed, 62 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch
diff --git a/common/shlibs b/common/shlibs
index 6b97d658c44a..9555fd2ba611 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1315,7 +1315,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.0 libgit2-1.0.1_3
+libgit2.so.1.2 libgit2-1.2.0_1
libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch b/srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch
new file mode 100644
index 000000000000..a84a285da726
--- /dev/null
+++ b/srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch
@@ -0,0 +1,58 @@
+From 27f50a66124054518d5febe984bccad02ee0846b Mon Sep 17 00:00:00 2001
+From: Miguel Arroz <750683+arroz@users.noreply.github.com>
+Date: Thu, 2 Sep 2021 18:59:19 -0700
+Subject: [PATCH 1/2] #6028: Check if `threadstate->error_t.message` is not
+ `git_buf__initbuf` before freeing.
+
+This follows the same principle as `buffer.c` where the same check is done before freeing the buffer. It fixes the crash described in #6028.
+---
+ src/threadstate.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/threadstate.c b/src/threadstate.c
+index 6031e8280..e2c08975f 100644
+--- a/src/threadstate.c
++++ b/src/threadstate.c
+@@ -36,7 +36,8 @@ static void threadstate_dispose(git_threadstate *threadstate)
+ if (!threadstate)
+ return;
+
+- git__free(threadstate->error_t.message);
++ if (threadstate->error_t.message != git_buf__initbuf)
++ git__free(threadstate->error_t.message);
+ threadstate->error_t.message = NULL;
+ }
+
+--
+2.33.0
+
+
+From 62ee779ea4cdd877419571442860a0d29896a59c Mon Sep 17 00:00:00 2001
+From: lhchavez <lhchavez@lhchavez.com>
+Date: Sat, 4 Sep 2021 18:01:10 -0700
+Subject: [PATCH 2/2] remote: Mark `git_remote_name_is_valid` as `GIT_EXTERN`
+
+This change makes `git_remote_name_is_valid` be part of the public
+interface of the library. This is needed for other language bindings to
+be able to find this symbol (like in git2go, when linking against
+libgit2 dynamically).
+---
+ include/git2/remote.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/git2/remote.h b/include/git2/remote.h
+index 1f52fcd94..51a7d1cdc 100644
+--- a/include/git2/remote.h
++++ b/include/git2/remote.h
+@@ -971,7 +971,7 @@ GIT_EXTERN(int) git_remote_rename(
+ * @param remote_name name to be checked.
+ * @return 0 on success or an error code
+ */
+-int git_remote_name_is_valid(int *valid, const char *remote_name);
++GIT_EXTERN(int) git_remote_name_is_valid(int *valid, const char *remote_name);
+
+ /**
+ * Delete an existing persisted remote.
+--
+2.33.0
+
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 2722bd6553f7..bac5d513d6c7 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.0.1
-revision=3
+version=1.2.0
+revision=1
build_style=cmake
hostmakedepends="python3 git pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
@@ -10,7 +10,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2
+checksum=701a5086a968a46f25e631941b99fc23e4755ca2c56f59371ce1d94b9a0cc643
post_install() {
vlicense COPYING
From 625774907acd62190a5c8c6b2e4e671aac349150 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:36:58 +0300
Subject: [PATCH 02/15] DarkRadiant: revbump due to libgit2 update
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 6741fc8bae37..5badd1b40be0 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.13.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From d4c327faa0488df16fcfb9e146bac08be50658a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:38:23 +0300
Subject: [PATCH 03/15] Fritzing: revbump due to libgit2 update
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index d97ab1654a52..c0436d6506d0 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=5
+revision=6
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
wrksrc="fritzing-app-${version}"
build_style=qmake
From 7232c8c582c83ac6e4dadcdc67082412a0c51668 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:38:37 +0300
Subject: [PATCH 04/15] calligra: revbump due to libgit2 update
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fba5f1f16ee5..89d0b1648e9e 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=5
+revision=6
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 90a1a47fc0dfb7fb9941c2c72a3c1f5d701b75b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:38:51 +0300
Subject: [PATCH 05/15] cargo-outdated: revbump due to libgit2 update
---
srcpkgs/cargo-outdated/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 5105eb05af5f..494af6ac5117 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,7 +1,7 @@
# Template file for 'cargo-outdated'
pkgname=cargo-outdated
version=0.9.9
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel openssl-devel"
From ac67f357735466c8b457fdd68b00a44dd60caed1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:39:03 +0300
Subject: [PATCH 06/15] geany-plugins: revbump due to libgit2 update
---
srcpkgs/geany-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index 8038f5f3704b..3cba06294b9c 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=1.37.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 7e174e8f79f18bf596422e899e110e0e939be8c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:39:12 +0300
Subject: [PATCH 07/15] git-absorb: revbump due to libgit2 update
---
srcpkgs/git-absorb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index fa73d41afbae..b47901f6815e 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,7 +1,7 @@
# Template file for 'git-absorb'
pkgname=git-absorb
version=0.6.6
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
From 2ea7fac6d4fb78db0532a8cd5b3552dabc494b52 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:39:23 +0300
Subject: [PATCH 08/15] git-series: revbump due to libgit2 update
---
srcpkgs/git-series/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 53795ed697e7..6c7dc54af0c7 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
# Template file for 'git-series'
pkgname=git-series
version=0.9.1
-revision=13
+revision=14
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
From cedcd49afce278226313c8f5ad4d24bc57071bdf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:39:52 +0300
Subject: [PATCH 09/15] horizon: revbump due to libgit2 update
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 8615a24596f8..48cc91d2d6bb 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.1.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From ebe8ea909e5304701e8be50e14340ea2b9010e6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:39:59 +0300
Subject: [PATCH 10/15] juCi++: revbump due to libgit2 update
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From f08f5c26df1912ceb3bb7e9d89672404866f7a48 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:40:11 +0300
Subject: [PATCH 11/15] julia: revbump due to libgit2 update
---
srcpkgs/julia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 576b5beb9bf0..9587254f4a0c 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
# Template file for 'julia'
pkgname=julia
version=1.6.1
-revision=1
+revision=2
archs="i686* x86_64* armv7l* aarch64*"
build_style=gnu-makefile
make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
From 756aa7e5c4fcb35761d6c441bbb4043ffe4ac572 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:40:19 +0300
Subject: [PATCH 12/15] ktexteditor: revbump due to libgit2 update
---
srcpkgs/ktexteditor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index eb6205633deb..597915da456b 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,7 +1,7 @@
# Template file for 'ktexteditor'
pkgname=ktexteditor
version=5.86.0
-revision=1
+revision=2
build_style=cmake
configure_args="
-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
From c3c92d065e3a3bff5d4fbd4bd8b4d7010e96d233 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:40:29 +0300
Subject: [PATCH 13/15] kup: revbump due to libgit2 update
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 461bbcd45f97..de6a0e1d1ec9 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.8.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
makedepends="cmake qt5-devel kcoreaddons-devel ki18n-devel kio-devel ksolid-devel
From 914bf1d7fb96dd9650e5b8d4f80cbbc8cce85344 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:40:46 +0300
Subject: [PATCH 14/15] slcp: revbump due to libgit2 update
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 1873bcc6f233..6dd88ee79c66 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=12
+revision=13
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 2219831946cfeafb6446bca86c670194965a1a38 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 13 Oct 2021 14:40:55 +0300
Subject: [PATCH 15/15] stagit: revbump due to libgit2 update
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 89c5a8cb177c..c8b80447e90a 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=0.9.5
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
next prev parent reply other threads:[~2021-10-18 9:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 7:10 [PR PATCH] " g4s8
2021-10-14 16:25 ` q66
2021-10-15 6:39 ` [PR PATCH] [Updated] " g4s8
2021-10-15 7:16 ` g4s8
2021-10-15 7:20 ` g4s8
2021-10-15 13:36 ` [PR REVIEW] " ericonr
2021-10-15 13:36 ` ericonr
2021-10-15 13:36 ` ericonr
2021-10-15 13:40 ` ericonr
2021-10-15 14:13 ` q66
2021-10-15 14:14 ` q66
2021-10-15 14:42 ` g4s8
2021-10-15 15:28 ` q66
2021-10-15 16:35 ` g4s8
2021-10-18 9:13 ` g4s8 [this message]
2021-10-19 6:17 ` g4s8
2021-10-19 6:17 ` g4s8
2021-10-19 6:17 ` g4s8
2021-10-19 13:44 ` q66
2021-10-19 14:10 ` [PR PATCH] [Updated] " g4s8
2021-10-19 15:40 ` g4s8
2021-10-25 7:13 ` g4s8
2021-10-26 5:39 ` g4s8
2021-11-15 14:46 ` g4s8
2021-11-17 9:49 ` g4s8
2021-11-17 15:36 ` q66
2021-11-18 6:34 ` [PR PATCH] [Updated] " g4s8
2022-06-07 2:12 ` github-actions
2022-06-21 2:13 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018091337.UaK8Zkb4Ma-4xIHFim22KeP-idTUNJmd5_AzgERTftE@z \
--to=g4s8@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).