Attachment 177321 Details for Bug 214773 – full patch

[patch] full patch

flock.patch (text/plain), 3.48 KB, created by Franco Fichtner on 2016-11-23 08:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2016-11-23 08:38:12 UTC

Size: 3.48 KB

patch

obsolete

>From 0acd91cbaeb2dd7db3cfe311343d3974386c8324 Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Fri, 18 Nov 2016 06:58:11 +0100
>Subject: [PATCH] sysutils/flock: update to 2.29
>
>Update to the latest version, omitting the need for our custom
>patches.  Relevant patch notes from upstream as follows:
>
>Util-linux 2.29 Release Notes
>=============================
>
>blkdev:
>   - guard against missing DIOCGDINFO on FreeBSD 11  [Franco Fichtner]
>flock:
>   - Introduce no-fork option.  [Terry Burton]
>   - fix no-flock patch  [Karel Zak]
>   - keep run_program() simple  [Karel Zak]
>pathnames:
>   - guard clashing definitions on FreeBSD  [Franco Fichtner]
>tests:
>   - add flock tests  [Karel Zak]
>   - wait for flock background process  [Ruediger Meier]
>---
> sysutils/flock/Makefile                        |  2 +-
> sysutils/flock/distinfo                        |  6 +++---
> sysutils/flock/files/patch-include_pathnames.h | 17 -----------------
> sysutils/flock/files/patch-lib_blkdev.c        | 20 --------------------
> 4 files changed, 4 insertions(+), 41 deletions(-)
> delete mode 100644 sysutils/flock/files/patch-include_pathnames.h
> delete mode 100644 sysutils/flock/files/patch-lib_blkdev.c
>
>diff --git a/sysutils/flock/Makefile b/sysutils/flock/Makefile
>index 03650c7..f749b9f 100644
>--- a/sysutils/flock/Makefile
>+++ b/sysutils/flock/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	flock
>-PORTVERSION=	2.28
>+PORTVERSION=	2.29
> CATEGORIES=	sysutils
> MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/
> DISTNAME=	util-linux-${PORTVERSION}
>diff --git a/sysutils/flock/distinfo b/sysutils/flock/distinfo
>index 0101e00..f47d837 100644
>--- a/sysutils/flock/distinfo
>+++ b/sysutils/flock/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1464715562
>-SHA256 (util-linux-2.28.tar.gz) = b79901455901d0e8cd5aa58671dcc9118fa333cce805a26904155e80a621f595
>-SIZE (util-linux-2.28.tar.gz) = 8860808
>+TIMESTAMP = 1479448422
>+SHA256 (util-linux-2.29.tar.gz) = 36d2fe6fcc962b6b4354ecd427ad766bc4ad29581f83afe67c3eadbdc5245a1f
>+SIZE (util-linux-2.29.tar.gz) = 9161747
>diff --git a/sysutils/flock/files/patch-include_pathnames.h b/sysutils/flock/files/patch-include_pathnames.h
>deleted file mode 100644
>index 05b2998..0000000
>--- a/sysutils/flock/files/patch-include_pathnames.h
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- 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
>deleted file mode 100644
>index f37989e..0000000
>--- a/sysutils/flock/files/patch-lib_blkdev.c
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- 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;

Flags:

franco: maintainer-approval+

Actions: View | Diff

Attachments on bug 214773: 177321