mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

sysutils/e2fsprogs: update to v1.46.1, bug fixes

Browse Source 
Release notes:
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/doc/RelNotes/v1.46.1.txt?h=v1.46.1

This removes the -DHAVE_PTHREAD_H (in CPPFLAGS) and qsort_r() patches
to e2fsck/rehash.c we used in v1.46.0. They are no longer needed in v1.46.1.
This commit is contained in:
Matthias Andree 2021-02-12 20:26:49 +00:00
parent 1ef2089984
commit e04f0a67b9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=565060
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/e2fsprogs/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= e2fsprogs
PORTVERSION= 1.46.0
PORTVERSION= 1.46.1
PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@ -42,7 +42,7 @@ CONFIGURE_ARGS?=--disable-fsck \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf'
# apparently HAVE_PTHREAD_H checks go missing if the FUSEFS option is unset, force it:
CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include -DHAVE_PTHREAD_H # -D_EXT2_USE_C_VERSIONS
CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
MAKE_ENV+= CHECK_CMD=@true

6
sysutils/e2fsprogs/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1612477988
SHA256 (e2fsprogs-1.46.0.tar.xz) = 91d61cef9a251a18e49a700be0028a8d35b0549a25d2bc263af6fa5d9f7c7d13
SIZE (e2fsprogs-1.46.0.tar.xz) = 7007144
TIMESTAMP = 1613160077
SHA256 (e2fsprogs-1.46.1.tar.xz) = bbe6af3b7bb7119556b6f57a78d41b330007738bca8530b2ba95d2ba35430151
SIZE (e2fsprogs-1.46.1.tar.xz) = 7019700

32
sysutils/e2fsprogs/files/patch-e2fsck_rehash.c
View File

@ -1,32 +0,0 @@
e2fsprogs is developed on GNU/Linux and with glibc in particular,
which uses a qsort_r() function interface differing from FreeBSD's,
both WRT argument ordering on qsort_r() itself, as well as
the thunk argument on hash_cmp() is first on FreeBSD, last on glibc.
This applies to FreeBSD 11 and 12 and might change on FreeBSD 13.
Watch https://reviews.freebsd.org/D17083
--- e2fsck/rehash.c.orig 2021-01-29 22:02:31 UTC
+++ e2fsck/rehash.c
@@ -305,7 +305,7 @@ static EXT2_QSORT_TYPE name_cf_cmp(const struct name_c
}
/* Used for sorting the hash entry */
-static EXT2_QSORT_TYPE hash_cmp(const void *a, const void *b, void *arg)
+static EXT2_QSORT_TYPE hash_cmp(void *arg, const void *a, const void *b)
{
const struct name_cmp_ctx *ctx = (struct name_cmp_ctx *) arg;
const struct hash_entry *he_a = (const struct hash_entry *) a;
@@ -1049,10 +1049,10 @@ retry_nohash:
resort:
if (fd.compress && fd.num_array > 1)
qsort_r(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
- hash_cmp, &name_cmp_ctx);
+ &name_cmp_ctx, hash_cmp);
else
qsort_r(fd.harray, fd.num_array, sizeof(struct hash_entry),
- hash_cmp, &name_cmp_ctx);
+ &name_cmp_ctx, hash_cmp);
/*
* Look for duplicates