Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › a6e604b
capsicum: finish 3009baa48926cb
Baptiste Daroussin committed 3 months ago
commit a6e604b64a2a82588a3e0c86e5b9c042e77f7c5e
parent 679a201
4 files changed +8 -9
modified libpkg/lua.c
@@ -28,7 +28,8 @@


#include "pkg_config.h"
- 
#ifdef HAVE_CAPSICUM
+ 
#if __has_include(<sys/capsicum.h>)
+ 
#define HAVE_CAPSICUM 1

#include <sys/capsicum.h>

#endif
modified libpkg/pkg_ports.c
@@ -28,10 +28,6 @@


#include "pkg_config.h"
- 
#ifdef HAVE_CAPSICUM
- 
#include <sys/capsicum.h>
- 
#endif
- 


#include <sys/stat.h>

#include <sys/types.h>

#include <sys/wait.h>
modified libpkg/ssh.c
@@ -2,7 +2,7 @@
 * Copyright (c) 2013-2014 Baptiste Daroussin <bapt@FreeBSD.org>

 * Copyright (c) 2014 Vsevolod Stakhov <vsevolod@FreeBSD.org>

 * All rights reserved.
- 
 *
+ 
 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:
@@ -12,7 +12,7 @@
 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.
- 
 *
+ 
 *

 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR

 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -28,7 +28,8 @@
#ifdef HAVE_CONFIG_H

#include "pkg_config.h"

#endif
- 
#ifdef HAVE_CAPSICUM
+ 
#if __has_include(<sys/capsicum.h>)
+ 
#define HAVE_CAPSICUM 1

#include <sys/capsicum.h>

#endif

#include <sys/types.h>
modified libpkg/triggers.c
@@ -6,8 +6,9 @@


#include "pkg_config.h"
- 
#ifdef HAVE_CAPSICUM
+ 
#if __has_include(<sys/capsicum.h>)

#include <sys/capsicum.h>
+ 
#define HAVE_CAPSICUM 1

#endif



#include <sys/stat.h>