r398 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 09 Apr 2005 20:42:30 +0000
Author: tschmidt
Date: 2005-04-09 20:42:30 +0000 (Sat, 09 Apr 2005)
New Revision: 398
Removed:
vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch
vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch
vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch
vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
vdr/vdr/trunk/debian/patches/13_remote.dpatch
Log:
vdr:
* New upstream 1.3.23
* Updated all default dpatch files
* Removed 09_amd64_epg and 01_gcc3.4-FTBFS-fix
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/changelog 2005-04-09 20:42:30 UTC (rev 398)
@@ -1,3 +1,14 @@
+vdr (1.3.23-1) experimental; urgency=low
+
+ * (NOT RELEASED YET)
+
+ * Thomas Schmidt <tschmidt@debian.org>
+ - New upstream release
+ + Removed 01_gcc3.4-FTBFS-fix.dpatch
+ + Removed 09_amd64_epg.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 09 Apr 2005 20:43:31 +0200
+
vdr (1.2.6-11) unstable; urgency=low
* Tobias Grimm <tg@e-tobi.net>
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/00list 2005-04-09 20:42:30 UTC (rev 398)
@@ -1,6 +1,4 @@
01_vdr_1.2.6-3.1.diff.gz
-01_gcc3.4-FTBFS-fix
-#01_gcc4.0-FTBFS-fix
02_Makefile-CFGDIR
03_cmdsubmenu
04_newplugin
@@ -8,7 +6,6 @@
06_default_svdrp_port_0
07_not_as_root
08_security_CAN-2005-0071
-09_amd64_epg
13_remote
# The Elchi AIO 4d patch for a nicer OSD, inlcuding the frames and black
Deleted: vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/01_gcc3.4-FTBFS-fix.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_gcc3.4-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for a FTBFS-Bug with gcc 3.4 (#262744)
-
-@DPATCH@
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.h vdr/config.h
---- /home/chelli/vdr/cvs/vdr/vdr/config.h 2004-05-14 12:32:15.000000000 +0200
-+++ vdr/config.h 2004-08-02 12:51:07.000000000 +0200
-@@ -137,7 +137,7 @@
- bool Save(void)
- {
- bool result = true;
-- T *l = (T *)First();
-+ T *l = (T *)this->First();
- cSafeFile f(fileName);
- if (f.Open()) {
- while (l) {
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/plugin.c vdr/plugin.c
---- /home/chelli/vdr/cvs/vdr/vdr/plugin.c 2004-05-14 12:32:19.000000000 +0200
-+++ vdr/plugin.c 2004-08-02 12:51:07.000000000 +0200
-@@ -162,7 +162,7 @@
- const char *error = dlerror();
- if (!error) {
- void *(*creator)(void);
-- (void *)creator = dlsym(handle, "VDRPluginCreator");
-+ creator = (void*(*)())dlsym(handle, "VDRPluginCreator");
- if (!(error = dlerror()))
- plugin = (cPlugin *)creator();
- }
Modified: vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/01_vdr_1.2.6-3.1.diff.gz.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -6,8 +6,9 @@
## DP: New patch generated from vdr 1.2.6-3.1 diff.gz
@DPATCH@
---- vdr-1.2.6.orig/PLUGINS/src/osddemo/Makefile
-+++ vdr-1.2.6/PLUGINS/src/osddemo/Makefile
+diff -urNad vdr-1.3.23/PLUGINS/src/hello/Makefile /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/hello/Makefile
+--- vdr-1.3.23/PLUGINS/src/hello/Makefile 2003-12-21 16:47:22.000000000 +0100
++++ /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/hello/Makefile 2005-04-09 21:25:03.085146680 +0200
@@ -16,7 +16,7 @@
### The C++ compiler and options:
@@ -17,8 +18,9 @@
### The directory environment:
---- vdr-1.2.6.orig/PLUGINS/src/sky/Makefile
-+++ vdr-1.2.6/PLUGINS/src/sky/Makefile
+diff -urNad vdr-1.3.23/PLUGINS/src/osddemo/Makefile /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/osddemo/Makefile
+--- vdr-1.3.23/PLUGINS/src/osddemo/Makefile 2003-12-21 16:47:26.000000000 +0100
++++ /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/osddemo/Makefile 2005-04-09 21:25:03.085146680 +0200
@@ -16,7 +16,7 @@
### The C++ compiler and options:
@@ -28,8 +30,9 @@
### The directory environment:
---- vdr-1.2.6.orig/PLUGINS/src/status/Makefile
-+++ vdr-1.2.6/PLUGINS/src/status/Makefile
+diff -urNad vdr-1.3.23/PLUGINS/src/sky/Makefile /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/sky/Makefile
+--- vdr-1.3.23/PLUGINS/src/sky/Makefile 2003-12-21 16:47:31.000000000 +0100
++++ /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/sky/Makefile 2005-04-09 21:25:03.085146680 +0200
@@ -16,7 +16,7 @@
### The C++ compiler and options:
@@ -39,8 +42,9 @@
### The directory environment:
---- vdr-1.2.6.orig/PLUGINS/src/hello/Makefile
-+++ vdr-1.2.6/PLUGINS/src/hello/Makefile
+diff -urNad vdr-1.3.23/PLUGINS/src/status/Makefile /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/status/Makefile
+--- vdr-1.3.23/PLUGINS/src/status/Makefile 2003-12-21 16:47:41.000000000 +0100
++++ /tmp/dpep.EDdlNh/vdr-1.3.23/PLUGINS/src/status/Makefile 2005-04-09 21:25:03.085146680 +0200
@@ -16,7 +16,7 @@
### The C++ compiler and options:
Modified: vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/02_Makefile-CFGDIR.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -6,9 +6,9 @@
## DP: Allow default config dir to be set as define.
@DPATCH@
-diff -urNad /home/chelli/vdr/test/vdr/Makefile vdr/Makefile
---- /home/chelli/vdr/test/vdr/Makefile 2003-08-09 13:09:45.000000000 +0200
-+++ vdr/Makefile 2004-05-01 13:35:27.000000000 +0200
+diff -urNad vdr-1.3.23/Makefile /tmp/dpep.VCRgia/vdr-1.3.23/Makefile
+--- vdr-1.3.23/Makefile 2005-02-13 11:13:45.000000000 +0100
++++ /tmp/dpep.VCRgia/vdr-1.3.23/Makefile 2005-04-09 21:28:19.430297680 +0200
@@ -23,6 +23,7 @@
PLUGINLIBDIR= $(PLUGINDIR)/lib
@@ -17,18 +17,18 @@
DOXYGEN = /usr/bin/doxygen
DOXYFILE = Doxyfile
-@@ -51,6 +52,7 @@
+@@ -69,6 +70,7 @@
DEFINES += -D_GNU_SOURCE
DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+DEFINES += -DCFGDIR=\"$(CFGDIR)\"
DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
- ifdef DEBUG_OSD
-diff -urNad /home/chelli/vdr/test/vdr/vdr.c vdr/vdr.c
---- /home/chelli/vdr/test/vdr/vdr.c 2004-04-22 12:48:59.000000000 +0200
-+++ vdr/vdr.c 2004-05-01 13:36:20.000000000 +0200
-@@ -340,7 +340,7 @@
+ # The version number of VDR (taken from VDR's "config.h"):
+diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.VCRgia/vdr-1.3.23/vdr.c
+--- vdr-1.3.23/vdr.c 2005-03-20 11:58:59.000000000 +0100
++++ /tmp/dpep.VCRgia/vdr-1.3.23/vdr.c 2005-04-09 21:28:19.431297528 +0200
+@@ -381,7 +381,7 @@
// Configuration data:
if (!ConfigDirectory)
@@ -36,4 +36,4 @@
+ ConfigDirectory = CFGDIR;
cPlugin::SetConfigDirectory(ConfigDirectory);
-
+ cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
Modified: vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -7,20 +7,9 @@
## DP: To create a submenu entry, prefix the name by one ore more "-".
@DPATCH@
-diff -urNad vdr-1.2.6.orig/Makefile vdr-1.2.6/Makefile
---- vdr-1.2.6.orig/Makefile Fri May 28 00:36:59 2004
-+++ vdr-1.2.6/Makefile Fri May 28 00:37:16 2004
-@@ -48,6 +48,7 @@
-
- DEFINES += -DREMOTE_$(REMOTE)
-
-+DEFINES += -DCMD_SUBMENUS
- DEFINES += -D_GNU_SOURCE
-
- DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
-diff -urNad vdr-1.2.6.orig/config.c vdr-1.2.6/config.c
---- vdr-1.2.6.orig/config.c Fri May 28 00:36:59 2004
-+++ vdr-1.2.6/config.c Fri May 28 00:38:14 2004
+diff -urNad vdr-1.3.23/config.c /tmp/dpep.74bcRU/vdr-1.3.23/config.c
+--- vdr-1.3.23/config.c 2005-02-20 13:52:59.000000000 +0100
++++ /tmp/dpep.74bcRU/vdr-1.3.23/config.c 2005-04-09 21:28:28.912856112 +0200
@@ -27,18 +27,29 @@
{
title = command = NULL;
@@ -51,12 +40,10 @@
int l = p - s;
if (l > 0) {
title = MALLOC(char, l + 1);
-@@ -83,6 +94,76 @@
- esyslog("ERROR: can't open pipe for command '%s'", cmd);
- free(cmdbuf);
+@@ -85,6 +96,76 @@
return result;
-+}
-+
+ }
+
+int cCommand::getIndent ()
+{
+ return nIndent;
@@ -125,15 +112,17 @@
+ }
+ }
+ cConfig<cCommand>::Add(Object);
- }
-
++}
++
// -- cSVDRPhost -------------------------------------------------------------
-diff -urNad vdr-1.2.6.orig/config.h vdr-1.2.6/config.h
---- vdr-1.2.6.orig/config.h Fri May 28 00:36:59 2004
-+++ vdr-1.2.6/config.h Fri May 28 00:37:16 2004
-@@ -32,11 +32,15 @@
- #define MaxFileName 256
+ cSVDRPhost::cSVDRPhost(void)
+diff -urNad vdr-1.3.23/config.h /tmp/dpep.74bcRU/vdr-1.3.23/config.h
+--- vdr-1.3.23/config.h 2005-03-05 16:44:35.000000000 +0100
++++ /tmp/dpep.74bcRU/vdr-1.3.23/config.h 2005-04-09 21:28:28.913855960 +0200
+@@ -35,11 +35,15 @@
+ #define MaxSkinName 16
+ #define MaxThemeName 16
+class cCommands;
+
@@ -147,7 +136,7 @@
static char *result;
public:
cCommand(void);
-@@ -45,6 +49,12 @@
+@@ -48,6 +52,12 @@
const char *Title(void) { return title; }
bool Confirm(void) { return confirm; }
const char *Execute(const char *Parameters = NULL);
@@ -160,7 +149,7 @@
};
typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
-@@ -87,6 +97,10 @@
+@@ -90,6 +100,10 @@
cConfig(void) { fileName = NULL; }
virtual ~cConfig() { free(fileName); }
const char *FileName(void) { return fileName; }
@@ -171,7 +160,7 @@
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
{
Clear();
-@@ -114,7 +128,7 @@
+@@ -117,7 +131,7 @@
if (!isempty(buffer)) {
T *l = new T;
if (l->Parse(buffer))
@@ -180,7 +169,7 @@
else {
esyslog("ERROR: error in %s, line %d\n", fileName, line);
delete l;
-@@ -156,7 +170,10 @@
+@@ -159,7 +173,10 @@
}
};
@@ -192,10 +181,21 @@
class cSVDRPhosts : public cConfig<cSVDRPhost> {
public:
-diff -urNad vdr-1.2.6.orig/menu.c vdr-1.2.6/menu.c
---- vdr-1.2.6.orig/menu.c Fri May 28 00:36:59 2004
-+++ vdr-1.2.6/menu.c Fri May 28 00:37:16 2004
-@@ -1518,6 +1518,12 @@
+diff -urNad vdr-1.3.23/Makefile /tmp/dpep.74bcRU/vdr-1.3.23/Makefile
+--- vdr-1.3.23/Makefile 2005-04-09 21:28:28.756879824 +0200
++++ /tmp/dpep.74bcRU/vdr-1.3.23/Makefile 2005-04-09 21:28:28.912856112 +0200
+@@ -67,6 +67,7 @@
+
+ DEFINES += -DREMOTE_$(REMOTE)
+
++DEFINES += -DCMD_SUBMENUS
+ DEFINES += -D_GNU_SOURCE
+
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+diff -urNad vdr-1.3.23/menu.c /tmp/dpep.74bcRU/vdr-1.3.23/menu.c
+--- vdr-1.3.23/menu.c 2005-03-20 16:14:51.000000000 +0100
++++ /tmp/dpep.74bcRU/vdr-1.3.23/menu.c 2005-04-09 21:28:28.914855808 +0200
+@@ -1272,6 +1272,12 @@
if (command) {
char *buffer = NULL;
bool confirmed = true;
Modified: vdr/vdr/trunk/debian/patches/04_newplugin.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/04_newplugin.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/04_newplugin.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -7,9 +7,9 @@
## DP: new plugin
@DPATCH@
-diff -urNad vdr/newplugin /tmp/dpep.PJ00Ue/vdr/newplugin
---- vdr/newplugin 2004-05-14 12:32:19.000000000 +0200
-+++ /tmp/dpep.PJ00Ue/vdr/newplugin 2004-11-06 16:21:56.000000000 +0100
+diff -urNad vdr-1.3.23/newplugin /tmp/dpep.xLpfdk/vdr-1.3.23/newplugin
+--- vdr-1.3.23/newplugin 2005-01-30 14:50:05.000000000 +0100
++++ /tmp/dpep.xLpfdk/vdr-1.3.23/newplugin 2005-04-09 21:28:38.310427464 +0200
@@ -24,7 +24,7 @@
$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
@@ -28,7 +28,7 @@
### The directory environment:
-@@ -233,7 +233,7 @@
+@@ -239,7 +239,7 @@
VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
};
@@ -37,7 +37,7 @@
die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
-@@ -254,7 +254,8 @@
+@@ -260,7 +260,8 @@
* fill in the code skeleton in "$PLUGIN_NAME.c" to implement your plugin function
* add further source files if necessary
* adapt the "Makefile" if necessary
Modified: vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -7,21 +7,21 @@
## DP: <ludwig.nussel@gmx.de>
@DPATCH@
-diff -urNad vdr-1.2.6/Makefile /tmp/dpep.OwcM4r/vdr-1.2.6/Makefile
---- vdr-1.2.6/Makefile 2005-01-31 22:48:08.000000000 +0100
-+++ /tmp/dpep.OwcM4r/vdr-1.2.6/Makefile 2005-01-31 22:48:09.000000000 +0100
-@@ -87,7 +87,7 @@
+diff -urNad vdr-1.3.23/Makefile /tmp/dpep.RJebnB/vdr-1.3.23/Makefile
+--- vdr-1.3.23/Makefile 2005-04-09 21:28:46.585169512 +0200
++++ /tmp/dpep.RJebnB/vdr-1.3.23/Makefile 2005-04-09 21:28:46.810135312 +0200
+@@ -109,7 +109,7 @@
# The main program:
- vdr: $(OBJS) $(DTVLIB)
-- $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
-+ $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -lcap -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
+ vdr: $(OBJS) $(SILIB)
+- $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
++ $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -lcap -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
# The font files:
-diff -urNad vdr-1.2.6/vdr.c /tmp/dpep.OwcM4r/vdr-1.2.6/vdr.c
---- vdr-1.2.6/vdr.c 2005-01-31 22:48:08.000000000 +0100
-+++ /tmp/dpep.OwcM4r/vdr-1.2.6/vdr.c 2005-01-31 23:03:08.000000000 +0100
+diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.RJebnB/vdr-1.3.23/vdr.c
+--- vdr-1.3.23/vdr.c 2005-04-09 21:28:46.551174680 +0200
++++ /tmp/dpep.RJebnB/vdr-1.3.23/vdr.c 2005-04-09 21:28:46.811135160 +0200
@@ -31,6 +31,10 @@
#include <stdlib.h>
#include <termios.h>
@@ -33,7 +33,7 @@
#include "audio.h"
#include "channels.h"
#include "config.h"
-@@ -77,6 +81,96 @@
+@@ -85,6 +89,96 @@
exit(1);
}
@@ -129,17 +129,17 @@
+
int main(int argc, char *argv[])
{
- // Save terminal settings:
-@@ -106,6 +200,8 @@
+ #ifdef _CS_GNU_LIBPTHREAD_VERSION
+@@ -135,6 +229,8 @@
const char *Terminal = NULL;
const char *Shutdown = NULL;
cPluginManager PluginManager(DEFAULTPLUGINDIR);
+ const char* username = NULL;
+ const char* groupname = NULL;
+ int ExitCode = 0;
static struct option long_options[] = {
- { "audio", required_argument, NULL, 'a' },
-@@ -125,11 +221,13 @@
+@@ -155,11 +251,13 @@
{ "version", no_argument, NULL, 'V' },
{ "video", required_argument, NULL, 'v' },
{ "watchdog", required_argument, NULL, 'w' },
@@ -154,7 +154,7 @@
switch (c) {
case 'a': AudioCommand = optarg;
break;
-@@ -219,6 +317,10 @@
+@@ -249,6 +347,10 @@
fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
return 2;
break;
@@ -165,16 +165,16 @@
default: return 2;
}
}
-@@ -260,6 +362,8 @@
+@@ -291,6 +393,8 @@
" -V, --version print version information and exit\n"
" -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
" seconds (default: %d); '0' disables the watchdog\n"
+ " -u USER, --user=USER run as user USER instead of root\n"
+ " -g GROUP, --group=GROUP use group GROUP instead of primary group of user\n"
"\n",
- cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
+ DEFAULTEPGDATAFILENAME,
DEFAULTPLUGINDIR,
-@@ -290,6 +394,21 @@
+@@ -321,6 +425,21 @@
return 0;
}
Modified: vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -7,10 +7,10 @@
## DP: another port with the --port option when starting vdr
@DPATCH@
-diff -urNad vdr-1.2.6/vdr.c /tmp/dpep.38cW8S/vdr-1.2.6/vdr.c
---- vdr-1.2.6/vdr.c 2004-04-22 12:48:59.000000000 +0200
-+++ /tmp/dpep.38cW8S/vdr-1.2.6/vdr.c 2005-01-15 18:51:46.000000000 +0100
-@@ -90,7 +90,7 @@
+diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.VfmeKc/vdr-1.3.23/vdr.c
+--- vdr-1.3.23/vdr.c 2005-04-09 21:28:57.170560288 +0200
++++ /tmp/dpep.VfmeKc/vdr-1.3.23/vdr.c 2005-04-09 21:28:57.354532320 +0200
+@@ -211,7 +211,7 @@
// Command line options:
@@ -18,4 +18,4 @@
+#define DEFAULTSVDRPPORT 0
#define DEFAULTWATCHDOG 0 // seconds
#define DEFAULTPLUGINDIR PLUGINDIR
-
+ #define DEFAULTEPGDATAFILENAME "epg.data"
Modified: vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/07_not_as_root.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -6,9 +6,9 @@
## DP: --allow-root option
@DPATCH@
-diff -urNad vdr/vdr.c /tmp/dpep.pru8wM/vdr/vdr.c
---- vdr/vdr.c 2005-04-09 11:33:32.000000000 +0200
-+++ /tmp/dpep.pru8wM/vdr/vdr.c 2005-04-09 11:34:17.000000000 +0200
+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
@@ -35,6 +35,7 @@
#include <grp.h>
#include <sys/capability.h>
@@ -17,18 +17,19 @@
#include "audio.h"
#include "channels.h"
#include "config.h"
-@@ -202,8 +203,10 @@
+@@ -231,9 +232,11 @@
cPluginManager PluginManager(DEFAULTPLUGINDIR);
const char* username = NULL;
const char* groupname = NULL;
+ bool IsAllowRootAnyway = false;
+ int ExitCode = 0;
static struct option long_options[] = {
+ { "allow-root",no_argument, NULL, '!' },
{ "audio", required_argument, NULL, 'a' },
{ "config", required_argument, NULL, 'c' },
{ "daemon", no_argument, NULL, 'd' },
-@@ -321,16 +324,36 @@
+@@ -351,16 +354,36 @@
break;
case 'g': groupname = optarg;
break;
@@ -68,7 +69,7 @@
if (DisplayHelp) {
printf("Usage: vdr [OPTIONS]\n\n" // for easier orientation, this is column 80|
" -a CMD, --audio=CMD send Dolby Digital audio to stdin of command CMD\n"
-@@ -374,7 +397,7 @@
+@@ -405,7 +428,7 @@
}
if (DisplayVersion)
printf("vdr (%s) - The Video Disk Recorder\n", VDRVERSION);
@@ -77,7 +78,7 @@
if (DisplayHelp)
printf("Plugins: vdr -P\"name [OPTIONS]\"\n\n");
for (int i = 0; ; i++) {
-@@ -394,6 +417,17 @@
+@@ -425,6 +448,17 @@
return 0;
}
Deleted: vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/09_amd64_epg.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_amd64_epg.dpatch by Thomas Schmidt <tschmidt@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the crc function to work under amd64 too
-## DP: (closes: #300702)
-
-@DPATCH@
-diff -urNad vdr-1.2.6/libdtv/libsi/si_parser.c /tmp/dpep.Y5cRRE/vdr-1.2.6/libdtv/libsi/si_parser.c
---- vdr-1.2.6/libdtv/libsi/si_parser.c 2003-08-15 15:56:02.000000000 +0200
-+++ /tmp/dpep.Y5cRRE/vdr-1.2.6/libdtv/libsi/si_parser.c 2005-03-21 18:13:17.285886176 +0100
-@@ -1278,7 +1278,7 @@
-
- // CRC32 lookup table for polynomial 0x04c11db7
-
--static u_long crc_table[256] = {
-+static __u32 crc_table[256] = {
- 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
- 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
- 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-@@ -1326,7 +1326,7 @@
- static u_long crc32 (char *data, int len)
- {
- register int i;
-- u_long crc = 0xffffffff;
-+ __u32 crc = 0xffffffff;
-
- for (i=0; i<len; i++)
- crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
Modified: vdr/vdr/trunk/debian/patches/13_remote.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/13_remote.dpatch 2005-04-09 20:35:57 UTC (rev 397)
+++ vdr/vdr/trunk/debian/patches/13_remote.dpatch 2005-04-09 20:42:30 UTC (rev 398)
@@ -5,12 +5,12 @@
## DP: Consolidate input device handling.
@DPATCH@
-diff -urNad vdr-1.2.6/Makefile /tmp/dpep.8j05le/vdr-1.2.6/Makefile
---- vdr-1.2.6/Makefile 2005-02-27 00:02:04.864404216 +0100
-+++ /tmp/dpep.8j05le/vdr-1.2.6/Makefile 2005-02-27 00:02:05.231348432 +0100
-@@ -43,11 +43,10 @@
- OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
- FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+diff -urNad vdr-1.3.23/Makefile /tmp/dpep.cA36ZO/vdr-1.3.23/Makefile
+--- vdr-1.3.23/Makefile 2005-04-09 21:19:37.881585136 +0200
++++ /tmp/dpep.cA36ZO/vdr-1.3.23/Makefile 2005-04-09 21:19:38.185538928 +0200
+@@ -61,11 +61,10 @@
+ OSDFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-15
+ SMLFONT_ISO8859_15 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-15
-ifndef NO_KBD
-DEFINES += -DREMOTE_KBD
@@ -23,16 +23,14 @@
DEFINES += -DCMD_SUBMENUS
DEFINES += -D_GNU_SOURCE
-diff -urNad vdr-1.2.6/vdr.1 /tmp/dpep.8j05le/vdr-1.2.6/vdr.1
---- vdr-1.2.6/vdr.1 2003-05-29 13:58:28.000000000 +0200
-+++ /tmp/dpep.8j05le/vdr-1.2.6/vdr.1 2005-02-27 00:06:28.218368328 +0100
-@@ -45,8 +45,19 @@
- Read config files from directory \fIdir\fR
+diff -urNad vdr-1.3.23/vdr.1 /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.1
+--- vdr-1.3.23/vdr.1 2004-12-19 10:36:25.000000000 +0100
++++ /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.1 2005-04-09 21:20:52.156293664 +0200
+@@ -46,7 +46,18 @@
(default is to read them from the video directory).
.TP
--.B -d, --daemon
+ .B \-d, \-\-daemon
-Run in daemon mode.
-+.B \-d, \-\-daemon
+Run in daemon mode. (This implies \-\-no\-kbd.)
+.TP
+.B \-\-no\-kbd
@@ -46,12 +44,46 @@
+If this option is present, vdr will use a serial port remote control device.
+If the device name is omitted, vdr uses \fI/dev/ttyS1\fR.
.TP
- .BI -D\ num ,\ --device= num
+ .BI \-D\ num ,\ \-\-device= num
Use only the given DVB device (\fInum\fR = 0, 1, 2...).
-diff -urNad vdr-1.2.6/vdr.c /tmp/dpep.8j05le/vdr-1.2.6/vdr.c
---- vdr-1.2.6/vdr.c 2005-02-27 00:02:04.889400416 +0100
-+++ /tmp/dpep.8j05le/vdr-1.2.6/vdr.c 2005-02-27 00:09:23.444729872 +0100
-@@ -200,6 +200,8 @@
+diff -urNad vdr-1.3.23/vdr.1.rej /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.1.rej
+--- vdr-1.3.23/vdr.1.rej 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.1.rej 2005-04-09 21:19:38.185538928 +0200
+@@ -0,0 +1,30 @@
++***************
++*** 45,52 ****
++ Read config files from directory \fIdir\fR
++ (default is to read them from the video directory).
++ .TP
++- .B -d, --daemon
++- Run in daemon mode.
++ .TP
++ .BI -D\ num ,\ --device= num
++ Use only the given DVB device (\fInum\fR = 0, 1, 2...).
++--- 45,63 ----
++ Read config files from directory \fIdir\fR
++ (default is to read them from the video directory).
++ .TP
+++ .B \-d, \-\-daemon
+++ Run in daemon mode. (This implies \-\-no\-kbd.)
+++ .TP
+++ .B \-\-no\-kbd
+++ Don't use the keyboard as an input device.
+++ .TP
+++ .BI \-\-lirc [=DEVICE]
+++ If this option is present, vdr will use a LIRC remote control device.
+++ If the device name is omitted, vdr uses \fI/dev/lircd\fR.
+++ .TP
+++ .BI \-\-rcu [=DEVICE]
+++ If this option is present, vdr will use a serial port remote control device.
+++ If the device name is omitted, vdr uses \fI/dev/ttyS1\fR.
++ .TP
++ .BI -D\ num ,\ --device= num
++ Use only the given DVB device (\fInum\fR = 0, 1, 2...).
+diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.c
+--- vdr-1.3.23/vdr.c 2005-04-09 21:19:37.951574496 +0200
++++ /tmp/dpep.cA36ZO/vdr-1.3.23/vdr.c 2005-04-09 21:19:38.186538776 +0200
+@@ -229,6 +229,8 @@
int WatchdogTimeout = DEFAULTWATCHDOG;
const char *Terminal = NULL;
const char *Shutdown = NULL;
@@ -60,7 +92,7 @@
cPluginManager PluginManager(DEFAULTPLUGINDIR);
const char* username = NULL;
const char* groupname = NULL;
-@@ -224,6 +226,9 @@
+@@ -256,6 +258,9 @@
{ "watchdog", required_argument, NULL, 'w' },
{ "user", required_argument, NULL, 'u' },
{ "group", required_argument, NULL, 'g' },
@@ -70,9 +102,9 @@
{ NULL }
};
-@@ -322,6 +327,15 @@
+@@ -356,6 +361,15 @@
break;
- case 'g': groupname = optarg;
+ case '!': IsAllowRootAnyway = true;
break;
+ case 'k'&31:
+ kbd = 0;
@@ -86,7 +118,7 @@
default: return 2;
}
}
-@@ -383,6 +397,11 @@
+@@ -418,6 +432,11 @@
" seconds (default: %d); '0' disables the watchdog\n"
" -u USER, --user=USER run as user USER instead of root\n"
" -g GROUP, --group=GROUP use group GROUP instead of primary group of user\n"
@@ -96,10 +128,10 @@
+ " --lirc[=PATH] use a LIRC remote control device, attached to PATH\n"
+ " (default: " REMOTE_LIRC ")\n"
"\n",
- cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
+ DEFAULTEPGDATAFILENAME,
DEFAULTPLUGINDIR,
-@@ -555,15 +574,12 @@
- return 2;
+@@ -634,15 +653,12 @@
+ cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
// Remote Controls:
-#if defined(REMOTE_RCU)