From 59c6558ce3e26ecc8eec00a4ea1279f6fdfc0805 Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Fri, 9 Dec 2011 09:04:00 +0100
Subject: VDR 1.7.22 obsoletes cap_net_raw patch. Added cap_net_raw patch for
 VDR 1.7.5 - 1.7.21.

---
 patches/vdr-1.6.0-cap_net_raw.diff  | 11 +++++++++++
 patches/vdr-1.7.21-cap_net_raw.diff | 11 +++++++++++
 patches/vdr-cap_net_raw.diff        | 11 -----------
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 patches/vdr-1.6.0-cap_net_raw.diff
 create mode 100644 patches/vdr-1.7.21-cap_net_raw.diff
 delete mode 100644 patches/vdr-cap_net_raw.diff

(limited to 'patches')

diff --git a/patches/vdr-1.6.0-cap_net_raw.diff b/patches/vdr-1.6.0-cap_net_raw.diff
new file mode 100644
index 0000000..2f714b1
--- /dev/null
+++ b/patches/vdr-1.6.0-cap_net_raw.diff
@@ -0,0 +1,11 @@
+--- vdr.c.orig	2009-02-13 09:45:55.000000000 +0100
++++ vdr.c	2009-02-13 09:46:24.000000000 +0100
+@@ -115,7 +115,7 @@
+ static bool SetCapSysTime(void)
+ {
+   // drop all capabilities except cap_sys_time
+-  cap_t caps = cap_from_text("= cap_sys_time=ep");
++  cap_t caps = cap_from_text("= cap_sys_time,cap_net_raw=ep");
+   if (!caps) {
+      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
+      return false;
diff --git a/patches/vdr-1.7.21-cap_net_raw.diff b/patches/vdr-1.7.21-cap_net_raw.diff
new file mode 100644
index 0000000..a1d1f04
--- /dev/null
+++ b/patches/vdr-1.7.21-cap_net_raw.diff
@@ -0,0 +1,11 @@
+--- vdr.c.orig	2011-12-09 08:47:52.000000000 +0100
++++ vdr.c	2011-12-09 08:48:14.000000000 +0100
+@@ -116,7 +116,7 @@
+ static bool DropCaps(void)
+ {
+   // drop all capabilities except selected ones
+-  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time=ep");
++  cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
+   if (!caps) {
+      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
+      return false;
diff --git a/patches/vdr-cap_net_raw.diff b/patches/vdr-cap_net_raw.diff
deleted file mode 100644
index 2f714b1..0000000
--- a/patches/vdr-cap_net_raw.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vdr.c.orig	2009-02-13 09:45:55.000000000 +0100
-+++ vdr.c	2009-02-13 09:46:24.000000000 +0100
-@@ -115,7 +115,7 @@
- static bool SetCapSysTime(void)
- {
-   // drop all capabilities except cap_sys_time
--  cap_t caps = cap_from_text("= cap_sys_time=ep");
-+  cap_t caps = cap_from_text("= cap_sys_time,cap_net_raw=ep");
-   if (!caps) {
-      fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
-      return false;
-- 
cgit v1.2.3