FreeBSD Bugzilla – Attachment 199039 Details for
Bug 233026
sysutils/procenv: Fix use of deprecated #include (sys/capability.h).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff-procenv-0.50
svn-diff-procenv (text/plain), 3.99 KB, created by
Walter Schwarzenfeld
on 2018-11-07 02:52:29 UTC
(
hide
)
Description:
svn-diff-procenv-0.50
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2018-11-07 02:52:29 UTC
Size:
3.99 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 484376) >+++ Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= procenv >-PORTVERSION= 0.36 >-PORTREVISION= 1 >+PORTVERSION= 0.50 > CATEGORIES= sysutils > MASTER_SITES= https://launchpad.net/procenv/trunk/${PORTVERSION}/+download/ \ > http://people.canonical.com/~jhunt/debian/procenv/${PORTVERSION}/ \ >@@ -18,8 +17,13 @@ > 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 >Index: distinfo >=================================================================== >--- distinfo (revision 484376) >+++ distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (procenv-0.36.tar.gz) = 70550499d0602ffbb4bbbe91c1a6d468d44589ab29b74b5ccc42b9558f970fb4 >-SIZE (procenv-0.36.tar.gz) = 264248 >+TIMESTAMP = 1541557607 >+SHA256 (jamesodhunt-procenv-0.50-d89b0ac_GH0.tar.gz) = c95de696984187e944cd7cdf098662124ca60023d3f8e6e5ebf3c254adf72ee8 >+SIZE (jamesodhunt-procenv-0.50-d89b0ac_GH0.tar.gz) = 244613 >Index: files/patch-src_platform-headers.h >=================================================================== >--- files/patch-src_platform-headers.h (nonexistent) >+++ files/patch-src_platform-headers.h (working copy) >@@ -0,0 +1,24 @@ >+--- 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 >+ > >Property changes on: files/patch-src_platform-headers.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:keywords >## -0,0 +1 ## >+Author Date Id Rev URL >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-src_procenv.c >=================================================================== >--- files/patch-src_procenv.c (revision 484376) >+++ files/patch-src_procenv.c (nonexistent) >@@ -1,30 +0,0 @@ >---- 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); > >Property changes on: files/patch-src_procenv.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
koobs
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 233026
:
199037
|
199039
|
206290