r442 - in vdr/vdr/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-04-10 21:00:36 +0000 (Sun, 10 Apr 2005)
New Revision: 442

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
   vdr/vdr/trunk/debian/plugin-loader.sh
Log:
vdr: merged changes from sarge branch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-04-10 20:57:53 UTC (rev 441)
+++ vdr/vdr/trunk/debian/changelog	2005-04-10 21:00:36 UTC (rev 442)
@@ -7,9 +7,20 @@
       + Removed 01_gcc3.4-FTBFS-fix.dpatch
       + Removed 09_amd64_epg.dpatch
     - Use LD_ASSUME_KERNEL=2.4.1 when calling vdr in plugins-loader.sh
+  * Tobias Grimm <tg@e-tobi.net>
+    - Don't restrict root capabilities with --allow-root anymore
+    - Passing $OPTIONS to binary compatibility test in plugin loader now
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 09 Apr 2005 20:43:31 +0200
 
+vdr (1.2.6-12) unstable; urgency=low
+
+  * Tobias Grimm <tg@e-tobi.net>
+    - Don't restrict root capabilities with --allow-root anymore
+    - Passing $OPTIONS to binary compatibility test in plugin loader now
+
+ -- Tobias Grimm <tg@e-tobi.net>  Sun, 10 Apr 2005 17:00:24 +0200
+
 vdr (1.2.6-11) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net> 

Modified: vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch	2005-04-10 20:57:53 UTC (rev 441)
+++ vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch	2005-04-10 21:00:36 UTC (rev 442)
@@ -6,9 +6,9 @@
 ## DP: --allow-root option
 
 @DPATCH@
-diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.Ftm3Zt/vdr-1.3.23/vdr.c
---- vdr-1.3.23/vdr.c	2005-04-09 21:08:41.891310816 +0200
-+++ /tmp/dpep.Ftm3Zt/vdr-1.3.23/vdr.c	2005-04-09 21:09:46.491490096 +0200
+diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.ML49nd/vdr-1.3.23/vdr.c
+--- vdr-1.3.23/vdr.c	2005-04-10 18:44:25.000000000 +0200
++++ /tmp/dpep.ML49nd/vdr-1.3.23/vdr.c	2005-04-10 18:45:27.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <grp.h>
  #include <sys/capability.h>
@@ -78,7 +78,7 @@
          if (DisplayHelp)
             printf("Plugins: vdr -P\"name [OPTIONS]\"\n\n");
          for (int i = 0; ; i++) {
-@@ -425,6 +448,17 @@
+@@ -425,9 +448,20 @@
       return 0;
       }
  
@@ -95,4 +95,8 @@
 +  
    // Only try to change capabilities/user when vdr is called by 
    // root
-   if (!getuid () || !getgid () || !geteuid () || !getegid ()) {
+-  if (!getuid () || !getgid () || !geteuid () || !getegid ()) {
++  if (!IsAllowRootAnyway && (!getuid () || !getgid () || !geteuid () || !getegid ())) {
+      	if(username && set_keepcaps() != 0)
+     		return 2;
+ 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2005-04-10 20:57:53 UTC (rev 441)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2005-04-10 21:00:36 UTC (rev 442)
@@ -47,7 +47,7 @@
 
         # move not startable plugins to $leftout2
         for (( i=${#installed_plugins[@]}, i-- ; i >= 0 ; i-- )); do
-            if ! LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr -u $USER -g $GROUP -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
+            if ! LD_ASSUME_KERNEL=2.4.1 /usr/bin/vdr -u $USER -g $GROUP $OPTIONS -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
                 2>/dev/null | grep -q "^${installed_plugins[$i]} "; then
                 leftout2="${leftout2} ${installed_plugins[$i]}"
                 unset installed_plugins[$i]