forge/ayaports
1
0
Fork 0
Code Issues 44 Pull requests 15 Projects Releases Packages Wiki Activity Actions

user/ruby3.0-rugged: upgrade to 1.6.3

Browse source
This commit is contained in:
Antoine Martin 2023-08-31 13:01:46 -04:00
parent abc3b1a07a
commit d67dcd1811
Signed by: forge
GPG key ID: D62A472A4AA7D541
3 changed files with 99 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
user/ruby3.0-rugged/APKBUILD
View file

@ -1,10 +1,8 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=ruby3.0-rugged
_gemname=rugged
pkgver=1.5.0.1
pkgver=1.6.3
pkgrel=1
pkgdesc="Ruby bindings to libgit2"
url="https://github.com/libgit2/rugged"
@ -25,6 +23,7 @@ makedepends="
source="$_gemname-$pkgver.tar.gz::https://github.com/libgit2/$_gemname/archive/v$pkgver.tar.gz
fix-extconf-version-check.patch
libgit2-fixture-dir.patch
libgit2-1.7.patch
skip-test_discover_false.patch
skip-test_read_global_config_file.patch
skip-online-tests.patch
@ -66,9 +65,10 @@ package() {
}
sha512sums="
ae7cac3cf86c1889efb72e32e5fdbde15a31abf7ebf19c9c9b01a63b633fd4bfb3fef809c6003a9e6a2043dadad219eceb562447e2b0cd9ea06c52784bec12b7 rugged-1.5.0.1.tar.gz
76afe0e4de05460bdcbc6cb0c2c6af3d3214697212f6400ee8da4c023bad31f2f734289971c83ecfb98156ead0083a6631018fc68aa709966e45aefbc6697b1d fix-extconf-version-check.patch
4d54b5df04382628aff7e1abbf5fbd9730564c9bcb4e17da34ac59578b306db567b15151629a10c4a6d8174a31cd8be03c27ff0d1514cb19de237e773f4b64ce rugged-1.6.3.tar.gz
0e55aff667175496e9df1920c6d49042077196aa992a729323628224e7930a6f976bcbfae70d2af733a043c173e8cd5f571606f0b898b008472b40fcefe6b425 fix-extconf-version-check.patch
0c749aeb8d6a29aed51737bab09c7b0a6669ac691461758c856ede5d8510ad6edfa284cddd1b54982bf614a45ba817b70e838e071889a9b05e1b0580111ec826 libgit2-fixture-dir.patch
bcf7b554390fb2b1ef9043f8c934ae51a299f223ec1d7826dcb8eed078961cd084c05148c84142d60cc0a3213653bd416af1fbb09bfa5b26c9ce87fca79f6a18 libgit2-1.7.patch
33464eeefc7669fe3bf5f47c4016cacdcba4f7455ed22b441383b49721870072b5095dbb68832cdb933a7659a415476db64b579a98c888b83900d092bb8b54be skip-test_discover_false.patch
b9e028f18830e447773e895046eb03489e94bb5a76fede51f93545ed67f7249ed8f37ed4bb832eb68a2db281ff3e2b84dab8b72bb21eea4b835b0f1ce23943c3 skip-test_read_global_config_file.patch
5f0ad88eb7ac8c69605c43712e046efd47b727f48e98ee4047be850da4fea48c11fc2a383c791810a1bc81c08ca00428d4906c1af02a0d0da6e1ffbd4723b8f3 skip-online-tests.patch

14
user/ruby3.0-rugged/fix-extconf-version-check.patch
View file

@ -1,21 +1,13 @@
diff --git a/ext/rugged/extconf.rb b/ext/rugged/extconf.rb
index 47d13a6..92251e3 100644
index 7dbd2b3..92251e3 100644
--- a/ext/rugged/extconf.rb
+++ b/ext/rugged/extconf.rb
@@ -70,13 +70,13 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
@@ -70,7 +70,7 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
major = minor = nil
- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line|
- if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR ([0-9]+)$/))
+ File.readlines(File.join("/usr", "include", "git2", "version.h")).each do |line|
+ if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/))
if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/))
major = matches[1]
next
end
- if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR ([0-9]+)$/))
+ if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/))
minor = matches[1]
next
end

90
user/ruby3.0-rugged/libgit2-1.7.patch Normal file
View file

@ -0,0 +1,90 @@
Patch-Source: https://github.com/libgit2/rugged/pull/964
safe as we apply the libgit2 fix to libgit.
--
From 508fbc2bcd8fdc400fcc4513b53d5205c4b7e9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Tue, 18 Jul 2023 10:27:37 +0200
Subject: [PATCH 1/3] Update libgit2 to v1.7.0
---
vendor/libgit2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/rugged/rugged_allocator.c b/ext/rugged/rugged_allocator.c
index 30ee537..0059af6 100644
--- a/ext/rugged/rugged_allocator.c
+++ b/ext/rugged/rugged_allocator.c
@@ -13,58 +13,11 @@ static void *rugged_gmalloc(size_t n, const char *file, int line)
return xmalloc(n);
}
-static void *rugged_gcalloc(size_t nelem, size_t elsize, const char *file, int line)
-{
- return xcalloc(nelem, elsize);
-}
-
-static char *rugged_gstrdup(const char *str, const char *file, int line)
-{
- return ruby_strdup(str);
-}
-
-static char *rugged_gstrndup(const char *str, size_t n, const char *file, int line)
-{
- size_t len;
- char *newstr;
-
- len = strnlen(str, n);
- if (len < n)
- n = len;
-
- newstr = xmalloc(n+1);
- memcpy(newstr, str, n);
- newstr[n] = '\0';
-
- return newstr;
-}
-
-static char *rugged_gsubstrdup(const char *str, size_t n, const char *file, int line)
-{
- char *newstr;
-
- newstr = xmalloc(n+1);
- memcpy(newstr, str, n);
- newstr[n] = '\0';
-
- return newstr;
-}
-
static void *rugged_grealloc(void *ptr, size_t size, const char *file, int line)
{
return xrealloc(ptr, size);
}
-static void *rugged_greallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
-{
- return xrealloc2(ptr, nelem, elsize);
-}
-
-static void *rugged_gmallocarray(size_t nelem, size_t elsize, const char *file, int line)
-{
- return xmalloc2(nelem, elsize);
-}
-
static void rugged_gfree(void *ptr)
{
xfree(ptr);
@@ -75,14 +28,7 @@ void rugged_set_allocator(void)
git_allocator allocator;
allocator.gmalloc = rugged_gmalloc;
- allocator.gcalloc = rugged_gcalloc;
- allocator.gstrdup = rugged_gstrdup;
- allocator.gstrndup = rugged_gstrndup;
- allocator.gstrndup = rugged_gstrndup;
- allocator.gsubstrdup = rugged_gsubstrdup;
allocator.grealloc = rugged_grealloc;
- allocator.greallocarray = rugged_greallocarray;
- allocator.gmallocarray = rugged_gmallocarray;
allocator.gfree = rugged_gfree;
git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, &allocator);