svn commit: r351154 - in stable: 11/usr.bin/bsdiff/bspatch 12/usr.bin/bsdiff/bspatch

[Xin LI]

Author: delphij
Date: Sat Aug 17 01:49:57 2019
New Revision: 351154
URL: https://svnweb.freebsd.org/changeset/base/351154

Log:
  MFC r350108: Remove support for FreeBSD 10.x.

Modified:
  stable/12/usr.bin/bsdiff/bspatch/bspatch.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.bin/bsdiff/bspatch/bspatch.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- stable/12/usr.bin/bsdiff/bspatch/bspatch.c	Sat Aug 17 00:10:56 2019	(r351153)
+++ stable/12/usr.bin/bsdiff/bspatch/bspatch.c	Sat Aug 17 01:49:57 2019	(r351154)
@@ -29,13 +29,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#if defined(__FreeBSD__)
-#include <sys/param.h>
-#if __FreeBSD_version >= 1001511
+#ifndef WITHOUT_CAPSICUM
 #include <sys/capsicum.h>
-#define HAVE_CAPSICUM
 #endif
-#endif
 
 #include <bzlib.h>
 #include <err.h>
@@ -107,7 +103,7 @@ int main(int argc, char *argv[])
 	off_t oldpos, newpos;
 	off_t ctrl[3];
 	off_t i, lenread, offset;
-#ifdef HAVE_CAPSICUM
+#ifndef WITHOUT_CAPSICUM
 	cap_rights_t rights_dir, rights_ro, rights_wr;
 #endif
 
@@ -143,7 +139,7 @@ int main(int argc, char *argv[])
 		err(1, "open(%s)", argv[2]);
 	atexit(exit_cleanup);
 
-#ifdef HAVE_CAPSICUM
+#ifndef WITHOUT_CAPSICUM
 	if (cap_enter() < 0) {
 		/* Failed to sandbox, fatal if CAPABILITY_MODE enabled */
 		if (errno != ENOSYS)