From owner-svn-soc-all@FreeBSD.ORG  Sat Sep  7 19:11:50 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B1B63436
 for <svn-soc-all@FreeBSD.org>; Sat,  7 Sep 2013 19:11:50 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9ECD32F9E
 for <svn-soc-all@FreeBSD.org>; Sat,  7 Sep 2013 19:11:50 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r87JBo2q088498
 for <svn-soc-all@FreeBSD.org>; Sat, 7 Sep 2013 19:11:50 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r87JBou2088492
 for svn-soc-all@FreeBSD.org; Sat, 7 Sep 2013 19:11:50 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Sat, 7 Sep 2013 19:11:50 GMT
Message-Id: <201309071911.r87JBou2088492@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r257094 - soc2013/dpl/head/contrib/bzip2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Sep 2013 19:11:50 -0000

Author: dpl
Date: Sat Sep  7 19:11:50 2013
New Revision: 257094
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257094

Log:
  Updated bzip2 to cope with the current Capsicum interface.
  

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

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Sep  7 18:55:52 2013	(r257093)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Sep  7 19:11:50 2013	(r257094)
@@ -670,17 +670,23 @@
 {
    cap_rights_t rights;
 
+   cap_rights_init(&rights);
    if (fd == OUT_FILENO)
-      rights = CAP_READ|CAP_FSTAT|CAP_WRITE|CAP_FCHMOD|CAP_FCHOWN|CAP_FUTIMES;
+	  cap_rights_set(&rights, CAP_READ|CAP_FSTAT|CAP_WRITE|CAP_FCHMOD|CAP_FCHOWN|CAP_FUTIMES);
    else if (fd == IN_FILENO)
-      rights = CAP_WRITE|CAP_READ|CAP_FSTAT;
+	  cap_rights_set(&rights, CAP_WRITE|CAP_READ|CAP_FSTAT);
    else if (fd == STDERR_FILENO)
-      rights = CAP_WRITE;
-   else if ( fd == cwd )
-      rights = CAP_UNLINKAT|CAP_LOOKUP;
+	  cap_rights_set(&rights, CAP_WRITE);
+   else if (fd == cwd)
+	  cap_rights_set(&rights, CAP_UNLINKAT|CAP_LOOKUP);
+   else {
+      fprintf (stderr, "%s: Wrong file descriptor.\n", progName);
+      setExit(1);
+      exit(exitValue);
+   }
 
-   if (cap_rights_limit(fd, rights) < 0 && errno != ENOSYS){
-      fprintf ( stderr, "%s: Couldn't limit rights for descriptor %d: %s.\n", 
+   if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS){
+      fprintf (stderr, "%s: Couldn't limit rights for descriptor %d: %s.\n", 
          progName, fd, strerror(errno));
       setExit(1);
       exit(exitValue);