Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
c5de989c
Commit
c5de989c
authored
5 months ago
by
Celeste
Browse files
Options
Downloads
Patches
Plain Diff
main/xfsprogs: upgrade to 6.10.1
https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v6.10.1
parent
342f67bb
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/xfsprogs/APKBUILD
+4
-6
4 additions, 6 deletions
main/xfsprogs/APKBUILD
main/xfsprogs/xfsprogs-6.10.0-c++-void.patch
+0
-46
0 additions, 46 deletions
main/xfsprogs/xfsprogs-6.10.0-c++-void.patch
with
4 additions
and
52 deletions
main/xfsprogs/APKBUILD
+
4
−
6
View file @
c5de989c
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
xfsprogs
pkgver
=
6.10.
0
pkgrel
=
1
pkgver
=
6.10.
1
pkgrel
=
0
pkgdesc
=
"XFS filesystem utilities"
url
=
"https://xfs.org/index.php/Main_Page"
arch
=
"all"
...
...
@@ -18,8 +18,7 @@ makedepends="
"
options
=
"!check"
# no test suite
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-libs
$pkgname
-extra"
source
=
"https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-
$pkgver
.tar.xz
xfsprogs-6.10.0-c++-void.patch"
source
=
"https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-
$pkgver
.tar.xz"
build
()
{
export
DEBUG
=
-DNDEBUG
...
...
@@ -58,6 +57,5 @@ extra() {
}
sha512sums
=
"
ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce xfsprogs-6.10.0.tar.xz
09df6b846621c0bea65628e38c286935eb1fc2d7d1a3a08877c3121cc012df9345a53dc12e4ec43785500d890767d02e5e9ba144c2bfb67d2bf5812ba2987bcf xfsprogs-6.10.0-c++-void.patch
b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08 xfsprogs-6.10.1.tar.xz
"
This diff is collapsed.
Click to expand it.
main/xfsprogs/xfsprogs-6.10.0-c++-void.patch
deleted
100644 → 0
+
0
−
46
View file @
342f67bb
https://bugs.gentoo.org/938569
https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
From: "Darrick J. Wong" <djwong@kernel.org>
Date: Tue, 27 Aug 2024 16:33:58 -0700
Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
Several people reported C++ compilation errors due to things that C
compilers allow but C++ compilers do not. Fix both of these problems,
and hope there aren't more of these brown paper bags in 2 months when we
finally get these fixes through the process into a released xfsprogs.
Reported-by: kernel@mattwhitlock.name
Reported-by: sam@gentoo.org
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
libxfs/xfs_fs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
index 454b63ef..2b8e1f4f 100644
--- a/libxfs/xfs_fs.h
+++ b/libxfs/xfs_fs.h
@@ -906,13 +906,13 @@
static inline struct xfs_getparents_rec *
xfs_getparents_next_rec(struct xfs_getparents *gp,
struct xfs_getparents_rec *gpr)
{
- void *next = ((void *)gpr + gpr->gpr_reclen);
+ void *next = ((char *)gpr + gpr->gpr_reclen);
void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
if (next >= end)
return NULL;
- return next;
+ return (struct xfs_getparents_rec *)next;
}
/* Iterate through this file handle's directory parent pointers. */
--
2.46.0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment