Attachment #199039 for bug #233026




# $FreeBSD$

PORTNAME=	procenv
PORTVERSION=	0.50
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	https://launchpad.net/procenv/trunk/${PORTVERSION}/+download/ \
		http://people.canonical.com/~jhunt/debian/procenv/${PORTVERSION}/ \

BUILD_DEPENDS=	xmlwf:textproc/expat2

USES=		autoreconf gmake perl5
USE_PERL5=	build

USE_GITHUB=	yes
GH_ACCOUNT=	jamesodhunt
GH_TAGNAME=	d89b0ac

GNU_CONFIGURE=	yes
USE_PERL5=	build
TEST_TARGET=	check

PORTDOCS=	AUTHORS ChangeLog NEWS README TODO

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (procenv-0.36.tar.gz) = 70550499d0602ffbb4bbbe91c1a6d468d44589ab29b74b5ccc42b9558f970fb4	1	TIMESTAMP = 1541557607
2	SIZE (procenv-0.36.tar.gz) = 264248	2	SHA256 (jamesodhunt-procenv-0.50-d89b0ac_GH0.tar.gz) = c95de696984187e944cd7cdf098662124ca60023d3f8e6e5ebf3c254adf72ee8
		3	SIZE (jamesodhunt-procenv-0.50-d89b0ac_GH0.tar.gz) = 244613




--- src/platform-headers.h.orig	2018-11-07 02:39:39 UTC
+++ src/platform-headers.h
@@ -97,10 +97,6 @@ typedef struct statfs procenv_mnt_type;
 #include <selinux/selinux.h>
 #endif
 
-#if defined (HAVE_SYS_CAPABILITY_H)
-#include <sys/capability.h>
-#endif
-
 #if defined (__GLIBC__)
 #include <sys/sysmacros.h>
 #endif
@@ -262,10 +258,6 @@ typedef struct statfs procenv_mnt_type;
 #include <net/if.h>
 #include <link.h>
 
-#if defined (HAVE_SYS_CAPABILITY_H)
-#include <sys/capability.h>
-#endif
-
 #define PROCENV_CPU_TYPE     int
 #define PROCENV_CPU_SET_TYPE cpu_set_t
 




--- src/procenv.c.orig	2014-08-16 19:06:54 UTC
+++ src/procenv.c
@@ -5361,8 +5361,13 @@ show_capabilities_bsd (int fd)
 	show_capsicum_cap (rights, CAP_KQUEUE);
 	show_capsicum_cap (rights, CAP_KQUEUE_CHANGE);
 	show_capsicum_cap (rights, CAP_KQUEUE_EVENT);
+#if __FreeBSD__ > 10
+	show_capsicum_cap (rights, CAP_LINKAT_TARGET);
+	show_capsicum_cap (rights, CAP_LINKAT_SOURCE);
+#else
 	show_capsicum_cap (rights, CAP_LINKAT);
 #endif
+#endif
 	show_capsicum_cap (rights, CAP_LISTEN);
 	show_capsicum_cap (rights, CAP_LOOKUP);
 	show_capsicum_cap (rights, CAP_MAC_GET);
@@ -5392,8 +5397,13 @@ show_capabilities_bsd (int fd)
 	show_capsicum_cap (rights, CAP_READ);
 #if __FreeBSD__ > 9
 	show_capsicum_cap (rights, CAP_RECV);
+#if __FreeBSD__ > 10
+	show_capsicum_cap (rights, CAP_RENAMEAT_TARGET);
+	show_capsicum_cap (rights, CAP_RENAMEAT_SOURCE);
+#else
 	show_capsicum_cap (rights, CAP_RENAMEAT);
 #endif
+#endif
 	show_capsicum_cap (rights, CAP_SEEK);
 #if __FreeBSD__ > 9
 	show_capsicum_cap (rights, CAP_SEEK_TELL);

Return to bug 233026

Lines 2-9 Link Here

(-)Makefile (-3 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= procenv	4	PORTNAME= procenv
5	PORTVERSION= 0.36	5	PORTVERSION= 0.50
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= https://launchpad.net/procenv/trunk/${PORTVERSION}/+download/ \	7	MASTER_SITES= https://launchpad.net/procenv/trunk/${PORTVERSION}/+download/ \
9	http://people.canonical.com/~jhunt/debian/procenv/${PORTVERSION}/ \	8	http://people.canonical.com/~jhunt/debian/procenv/${PORTVERSION}/ \
Lines 18-25 Link Here
18	BUILD_DEPENDS= xmlwf:textproc/expat2	17	BUILD_DEPENDS= xmlwf:textproc/expat2
19		18
20	USES= autoreconf gmake perl5	19	USES= autoreconf gmake perl5
		20	USE_PERL5= build
		21
		22	USE_GITHUB= yes
		23	GH_ACCOUNT= jamesodhunt
		24	GH_TAGNAME= d89b0ac
		25
21	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
22	USE_PERL5= build
23	TEST_TARGET= check	27	TEST_TARGET= check
24		28
25	PORTDOCS= AUTHORS ChangeLog NEWS README TODO	29	PORTDOCS= AUTHORS ChangeLog NEWS README TODO

Line 0 Link Here

(-)files/patch-src_platform-headers.h (+24 lines)
	1	--- src/platform-headers.h.orig 2018-11-07 02:39:39 UTC
	2	+++ src/platform-headers.h
	3	@@ -97,10 +97,6 @@ typedef struct statfs procenv_mnt_type;
	4	#include <selinux/selinux.h>
	5	#endif
	6
	7	-#if defined (HAVE_SYS_CAPABILITY_H)
	8	-#include <sys/capability.h>
	9	-#endif
	10	-
	11	#if defined (__GLIBC__)
	12	#include <sys/sysmacros.h>
	13	#endif
	14	@@ -262,10 +258,6 @@ typedef struct statfs procenv_mnt_type;
	15	#include <net/if.h>
	16	#include <link.h>
	17
	18	-#if defined (HAVE_SYS_CAPABILITY_H)
	19	-#include <sys/capability.h>
	20	-#endif
	21	-
	22	#define PROCENV_CPU_TYPE int
	23	#define PROCENV_CPU_SET_TYPE cpu_set_t
	24

Lines 1-30 Link Here

(-)files/patch-src_procenv.c (-30 lines)
1	--- src/procenv.c.orig 2014-08-16 19:06:54 UTC
2	+++ src/procenv.c
3	@@ -5361,8 +5361,13 @@ show_capabilities_bsd (int fd)
4	show_capsicum_cap (rights, CAP_KQUEUE);
5	show_capsicum_cap (rights, CAP_KQUEUE_CHANGE);
6	show_capsicum_cap (rights, CAP_KQUEUE_EVENT);
7	+#if __FreeBSD__ > 10
8	+ show_capsicum_cap (rights, CAP_LINKAT_TARGET);
9	+ show_capsicum_cap (rights, CAP_LINKAT_SOURCE);
10	+#else
11	show_capsicum_cap (rights, CAP_LINKAT);
12	#endif
13	+#endif
14	show_capsicum_cap (rights, CAP_LISTEN);
15	show_capsicum_cap (rights, CAP_LOOKUP);
16	show_capsicum_cap (rights, CAP_MAC_GET);
17	@@ -5392,8 +5397,13 @@ show_capabilities_bsd (int fd)
18	show_capsicum_cap (rights, CAP_READ);
19	#if __FreeBSD__ > 9
20	show_capsicum_cap (rights, CAP_RECV);
21	+#if __FreeBSD__ > 10
22	+ show_capsicum_cap (rights, CAP_RENAMEAT_TARGET);
23	+ show_capsicum_cap (rights, CAP_RENAMEAT_SOURCE);
24	+#else
25	show_capsicum_cap (rights, CAP_RENAMEAT);
26	#endif
27	+#endif
28	show_capsicum_cap (rights, CAP_SEEK);
29	#if __FreeBSD__ > 9
30	show_capsicum_cap (rights, CAP_SEEK_TELL);