socsvn commit: r253095 - in soc2013/dpl: bzip2 head/contrib/bzip2 mk

[dpl at FreeBSD.org]

Author: dpl
Date: Mon Jun 17 17:18:32 2013
New Revision: 253095
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253095

Log:
  Work in contrib now.
  

Deleted:
  soc2013/dpl/bzip2/
  soc2013/dpl/mk/
Modified:
  soc2013/dpl/head/contrib/bzip2/bzip2.c

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jun 17 15:42:21 2013	(r253094)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jun 17 17:18:32 2013	(r253095)
@@ -88,6 +88,15 @@
 
 #   define SET_BINARY_MODE(fd) /**/
 
+/* Capsicum Support */
+#	ifdef __FreeBSD__
+#		include <osreldate.h>
+#		if __FreeBSD_version >= 900041
+#			define CAPSICUM
+#			include <sys/capability.h>
+#		endif
+#	endif
+
 #   ifdef __GNUC__
 #      define NORETURN __attribute__ ((noreturn))
 #   else
@@ -1812,6 +1821,13 @@
 #  endif
 #  endif
 
+#	ifdef CAPSICUM
+	if (cap_enter() < 0) {
+		fprintf ( stderr, "%s: Couldn't enter capability mode.\n", progName );
+		exit(1);
+	}
+#	endif
+
    copyFileName ( inName,  (Char*)"(none)" );
    copyFileName ( outName, (Char*)"(none)" );