Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sysutils/e2fsprogs: sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2017-08-28 02:24:47 +02:00
parent 6ca2666f1a
commit 13b2ef7765
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils/e2fsprogs/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.43.5
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@ -137,7 +137,7 @@ post-patch::
.if ${MASTERDIR} == ${.CURDIR}
# NOTE: The previous .if block goes all the way to the end of the file.
.if !empty(PORT_OPTIONS:MNOTESTS) && (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1100000 || ((${ARCH} != i386) && (${ARCH} != amd64)))
.if !empty(PORT_OPTIONS:MNOTESTS) && (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1200000 || ((${ARCH} != i386) && (${ARCH} != amd64)))
BROKEN= it was not tested on your system by the maintainer; you must run self-tests
.endif

19
sysutils/e2fsprogs/files/patch-lib__ext2fs__unix_io.c Normal file
View file

@ -0,0 +1,19 @@
commit 649dbee84cf208244db7195d40e7fe57ddbea57a
Author: Matthias Andree <matthias.andree@gmx.de>
Date: Sun Aug 27 14:09:52 2017 +0200
Always obtain alignment on FreeBSD.
diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index 64141954..65f237ef 100644
--- ./lib/ext2fs/unix_io.c
+++ ./lib/ext2fs/unix_io.c
@@ -636,7 +636,7 @@ static errcode_t unix_open_channel(const char *name, int fd,
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- if (io->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
+ {
int dio_align = ext2fs_get_dio_alignment(fd);
if (io->align < dio_align)