forked from Lainports/freebsd-ports
85778282f2
- This brings flock to the current state based on fetching the original util-linux sources and configuring them accordingly - adding a NLS knob as suggested by portlint. - For background on DIOCGDINFO see https://lists.freebsd.org/pipermail/freebsd-current/2015-January/053963.html - Submitter becomes maintainer PR: 210185 Changes: http://git.kernel.org/?p=utils/util-linux/util-linux.git/ Submitted by: Franco Fichtner <franco@opnsense.org> Approved by: zont (maintainer)
20 lines
525 B
C
20 lines
525 B
C
--- lib/blkdev.c.orig 2016-07-30 07:16:42 UTC
|
|
+++ lib/blkdev.c
|
|
@@ -133,7 +133,7 @@ blkdev_get_size(int fd, unsigned long lo
|
|
}
|
|
#endif /* FDGETPRM */
|
|
|
|
-#ifdef HAVE_SYS_DISKLABEL_H
|
|
+#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
|
|
{
|
|
/*
|
|
* This code works for FreeBSD 4.11 i386, except for the full device
|
|
@@ -161,7 +161,7 @@ blkdev_get_size(int fd, unsigned long lo
|
|
}
|
|
}
|
|
}
|
|
-#endif /* HAVE_SYS_DISKLABEL_H */
|
|
+#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */
|
|
|
|
{
|
|
struct stat st;
|