Attachment 173111 Details for Bug 210185 – revised patch for FreeBSD 11+

[patch] revised patch for FreeBSD 11+

flock-11-up.diff (text/plain), 3.10 KB, created by Franco Fichtner on 2016-07-30 07:51:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2016-07-30 07:51:31 UTC

Size: 3.10 KB

patch

obsolete

>diff --git a/sysutils/flock/Makefile b/sysutils/flock/Makefile
>index 8d8a61e..03650c7 100644
>--- a/sysutils/flock/Makefile
>+++ b/sysutils/flock/Makefile
>@@ -2,18 +2,34 @@
> # $FreeBSD$
> 
> PORTNAME=	flock
>-PORTVERSION=	2.19
>+PORTVERSION=	2.28
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.zonov.org/${PORTNAME}/
>+MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/
>+DISTNAME=	util-linux-${PORTVERSION}
> 
>-MAINTAINER=	zont@FreeBSD.org
>+MAINTAINER=	franco@opnsense.org
> COMMENT=	Manage locks from shell scripts
> 
>-PLIST_FILES=	bin/${PORTNAME} \
>-		man/man1/${PORTNAME}.1.gz
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+GNU_CONFIGURE=	yes
>+USES=		libtool pkgconfig
>+
>+OPTIONS_DEFINE=	NLS
>+
>+NLS_CONFIGURE_OFF=--disable-nls
>+NLS_USES=	autoreconf:autopoint gettext
>+
>+PLIST_FILES=	bin/flock man/man1/flock.1.gz
>+
>+do-build:
>+	# skip building unneeded utils
>+	${MAKE} -C ${WRKSRC} flock
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_PROGRAM} ${WRKSRC}/flock ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/sys-utils/flock.1 \
>+	    ${STAGEDIR}${MANPREFIX}/man/man1
> 
> .include <bsd.port.mk>
>diff --git a/sysutils/flock/distinfo b/sysutils/flock/distinfo
>index 0c16c7c..0101e00 100644
>--- a/sysutils/flock/distinfo
>+++ b/sysutils/flock/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (flock-2.19.tar.gz) = 9716618042a753cc4bd6e787d0886ea5fce8a167d5ce62421cee2c09ea86fbda
>-SIZE (flock-2.19.tar.gz) = 5452
>+TIMESTAMP = 1464715562
>+SHA256 (util-linux-2.28.tar.gz) = b79901455901d0e8cd5aa58671dcc9118fa333cce805a26904155e80a621f595
>+SIZE (util-linux-2.28.tar.gz) = 8860808
>diff --git a/sysutils/flock/files/patch-include_pathnames.h b/sysutils/flock/files/patch-include_pathnames.h
>new file mode 100644
>index 0000000..05b2998
>--- /dev/null
>+++ b/sysutils/flock/files/patch-include_pathnames.h
>@@ -0,0 +1,17 @@
>+--- 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"
>diff --git a/sysutils/flock/files/patch-lib_blkdev.c b/sysutils/flock/files/patch-lib_blkdev.c
>new file mode 100644
>index 0000000..f37989e
>--- /dev/null
>+++ b/sysutils/flock/files/patch-lib_blkdev.c
>@@ -0,0 +1,20 @@
>+--- 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;

Actions: View | Diff

Attachments on bug 210185: 171251 | 171252 | 171253 | 171254 | 172163 | 173111