Attachment #177321 for bug #214773

View | Details | Raw Unified | Return to bug 214773
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/sysutils/flock/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= flock	4	PORTNAME= flock
5	PORTVERSION= 2.28	5	PORTVERSION= 2.29
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/	7	MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/
8	DISTNAME= util-linux-${PORTVERSION}	8	DISTNAME= util-linux-${PORTVERSION}

Lines 1-3 Link Here

(-)b/sysutils/flock/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464715562	1	TIMESTAMP = 1479448422
2	SHA256 (util-linux-2.28.tar.gz) = b79901455901d0e8cd5aa58671dcc9118fa333cce805a26904155e80a621f595	2	SHA256 (util-linux-2.29.tar.gz) = 36d2fe6fcc962b6b4354ecd427ad766bc4ad29581f83afe67c3eadbdc5245a1f
3	SIZE (util-linux-2.28.tar.gz) = 8860808	3	SIZE (util-linux-2.29.tar.gz) = 9161747




--- include/pathnames.h.orig	2016-03-09 10:44:05 UTC
+++ include/pathnames.h
@@ -46,10 +46,14 @@
 #define	_PATH_MAILDIR		"/var/spool/mail"
 #endif
 #define	_PATH_MOTDFILE		"/etc/motd"
+#ifndef _PATH_NOLOGIN
 #define	_PATH_NOLOGIN		"/etc/nologin"
+#endif
 #define	_PATH_VAR_NOLOGIN	"/var/run/nologin"
 
+#ifndef _PATH_LOGIN
 #define _PATH_LOGIN		"/bin/login"
+#endif
 #define _PATH_SHUTDOWN		"/sbin/shutdown"
 
 #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"




--- 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;

Return to bug 214773

Removed Link Here

(-)a/sysutils/flock/files/patch-include_pathnames.h (-17 lines)
1	--- include/pathnames.h.orig 2016-03-09 10:44:05 UTC
2	+++ include/pathnames.h
3	@@ -46,10 +46,14 @@
4	#define _PATH_MAILDIR "/var/spool/mail"
5	#endif
6	#define _PATH_MOTDFILE "/etc/motd"
7	+#ifndef _PATH_NOLOGIN
8	#define _PATH_NOLOGIN "/etc/nologin"
9	+#endif
10	#define _PATH_VAR_NOLOGIN "/var/run/nologin"
11
12	+#ifndef _PATH_LOGIN
13	#define _PATH_LOGIN "/bin/login"
14	+#endif
15	#define _PATH_SHUTDOWN "/sbin/shutdown"
16
17	#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"

Removed Link Here

(-)a/sysutils/flock/files/patch-lib_blkdev.c (-20 lines)
1	--- lib/blkdev.c.orig 2016-07-30 07:16:42 UTC
2	+++ lib/blkdev.c
3	@@ -133,7 +133,7 @@ blkdev_get_size(int fd, unsigned long lo
4	}
5	#endif /* FDGETPRM */
6
7	-#ifdef HAVE_SYS_DISKLABEL_H
8	+#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
9	{
10	/*
11	* This code works for FreeBSD 4.11 i386, except for the full device
12	@@ -161,7 +161,7 @@ blkdev_get_size(int fd, unsigned long lo
13	}
14	}
15	}
16	-#endif /* HAVE_SYS_DISKLABEL_H */
17	+#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */
18
19	{
20	struct stat st;