From patchwork Sun Aug 23 20:30:09 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Anssi Hannula <anssi.hannula@gmail.com>
X-Patchwork-Id: 12748
Received: from mta-out.inet.fi ([195.156.147.13] helo=kirsi2.inet.fi)
	by mail.linuxtv.org with esmtp (Exim 4.69)
	(envelope-from <anssi.hannula@gmail.com>) id 1MfJhd-0003bA-Bt
	for vdr@linuxtv.org; Sun, 23 Aug 2009 22:30:14 +0200
Received: from mail.onse.fi (84.249.130.117) by kirsi2.inet.fi (8.5.014)
	id 4A77692A00ABBE9A for vdr@linuxtv.org;
	Sun, 23 Aug 2009 23:30:10 +0300
Received: from gamma.onse.fi (gamma [10.0.0.7])
	by mail.onse.fi (Postfix) with ESMTP id 5BFFC10DE45B
	for <vdr@linuxtv.org>; Sun, 23 Aug 2009 23:30:09 +0300 (EEST)
Message-ID: <4A91A6D1.7070007@gmail.com>
Date: Sun, 23 Aug 2009 23:30:09 +0300
From: Anssi Hannula <anssi.hannula@gmail.com>
User-Agent: Thunderbird 2.0.0.22 (X11/20090815)
MIME-Version: 1.0
To: VDR Mailing List <vdr@linuxtv.org>
References: <4A914C77.7050005@cadsoft.de>	<4A9187D7.9020301@gmail.com>
	<20090823223646.6155907e@bk.ru>	<200908232050.27962.zzam@gentoo.org>
	<20090823230017.6c5ff2fd@bk.ru>	<4A9193B0.1080404@gmail.com>
	<20090823231954.79628757@bk.ru>	<4A9199A4.1000309@gmail.com>
	<20090823233709.7cbd1200@bk.ru> <4A91A1E8.2040508@gmail.com>
In-Reply-To: <4A91A1E8.2040508@gmail.com>
X-LSpam-Score: -2.6 (--)
X-LSpam-Report: No, score=-2.6 required=5.0 tests=AWL=0.000,
	BAYES_00=-2.599 autolearn=ham
Subject: Re: [vdr] [ANNOUNCE] VDR developer version 1.7.9
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.11
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/options/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Aug 2009 20:30:14 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 21159

Anssi Hannula wrote:
> Thank you. The bug is in libcap header file
> /usr/include/sys/capability.h
> 
> It does evil stuff like this:
> 
>   25 /*
>   26  * Make sure we can be included from userland by preventing
>   27  * capability.h from including other kernel headers
>   28  */
>   29 #define _LINUX_TYPES_H
>   30 #define _LINUX_FS_H
>   31 #define __LINUX_COMPILER_H
>   32 #define __user
>   33
>   34 typedef unsigned int __u32;
>   35 typedef __u32 __le32;
> 
> This completely prevents including /usr/include/linux/types.h, etc.
> 
> It seems my distro has a patch that removes all the above lines to
> resolve this issue. I'll try contacting libcap upstream on this issue.

In the meantime, attached is a workaround that contains a clear comment
describing the issue.

Index: vdr-1.7.9/vdr.c
===================================================================
--- vdr-1.7.9/vdr.c
+++ vdr-1.7.9/vdr.c	2009-08-23 23:26:15.935332431 +0300
@@ -32,7 +32,6 @@
 #include <pwd.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/capability.h>
 #include <sys/prctl.h>
 #include <termios.h>
 #include <unistd.h>
@@ -64,6 +63,9 @@
 #include "tools.h"
 #include "transfer.h"
 #include "videodir.h"
+// include this one last due to some versions of it being buggy:
+// http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
+#include <sys/capability.h>
 
 #define MINCHANNELWAIT        10 // seconds to wait between failed channel switchings
 #define ACTIVITYTIMEOUT       60 // seconds before starting housekeeping