vdr/vdr-plugin-statusleds/debian/patches 00list 01_Makefile-fPIC-fix.dpatch 02_vdr-includes.dpatch 03_host.dpatch

[Tobias Grimm]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-statusleds/debian/patches
In directory haydn:/tmp/cvs-serv11082/debian/patches

Added Files:
	00list 01_Makefile-fPIC-fix.dpatch 02_vdr-includes.dpatch 
	03_host.dpatch 
Log Message:
Added debian changes for version 0.0.7-1. 


--- NEW FILE: 00list ---
01_Makefile-fPIC-fix
02_vdr-includes
03_host
--- NEW FILE: 02_vdr-includes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

## vdr-includes patch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes the vdr includes

@DPATCH@
--- vdr-plugin-statusleds-0.0.7.orig/i18n.h
+++ vdr-plugin-statusleds-0.0.7/i18n.h
@@ -9,7 +9,7 @@
 #ifndef _I18N__H
 #define _I18N__H
 
-#include "../../../i18n.h"
+#include <vdr/i18n.h>
 
 extern const tI18nPhrase Phrases[];
 
--- vdr-plugin-statusleds-0.0.7.orig/statusleds.c
+++ vdr-plugin-statusleds-0.0.7/statusleds.c
@@ -8,11 +8,11 @@
 #include "i18n.h"
 #include <unistd.h>
 #include <getopt.h>
-#include <videodir.h>
-#include <plugin.h>
-#include <interface.h>
-#include <status.h>
-#include <osd.h>
+#include <vdr/videodir.h>
+#include <vdr/plugin.h>
+#include <vdr/interface.h>
+#include <vdr/status.h>
+#include <vdr/osd.h>
 #include <ctype.h>
 #include <sys/kd.h>
 #include <sys/ioctl.h>

--- NEW FILE: 03_host.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

## host:port argument parsing patch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes a bug with parsing the host:port argument and sets default
## DP: blinkd port to 20013

@DPATCH@
--- vdr-plugin-statusleds-0.0.7.orig/statusleds.c
+++ vdr-plugin-statusleds-0.0.7/statusleds.c
@@ -54,8 +54,8 @@
 int iConsole = 0;
 bool bActive = false;
 bool bUseBlinkd = false;
-char sBlinkdHost[] = "localhost";
-int iBlinkdPort = 0;
+char sBlinkdHost[256] = "localhost";
+int iBlinkdPort = 20013;
 int iPrewarnBeeps = 3;
 int iPrewarnBeepPause = 500;
 bool bPrewarnBeep = false;
@@ -305,7 +305,11 @@
 	      if (Port)
 	      {
 	        iBlinkdPort = atoi(Port+1);
-		sprintf(sBlinkdHost, "%.*s", sizeof(sBlinkdHost)-1, Port - optarg);
+
+		unsigned int iHostLength = Port - optarg;
+		if (iHostLength >= sizeof(sBlinkdHost))
+		  iHostLength = sizeof(sBlinkdHost)-1;
+		sprintf(sBlinkdHost, "%.*s", iHostLength, optarg);
 	      }
 	      else
 		sprintf(sBlinkdHost, "%.*s", sizeof(sBlinkdHost)-1, optarg);

--- NEW FILE: 01_Makefile-fPIC-fix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run

## Makefile-fPIC-fix patch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds -fPIC to Makefile to fix potential FTBFS.

@DPATCH@
diff -urNad /usr/src/cvs/vdrdevel-plugin-solitaire/Makefile vdrdevel-plugin-solitaire/Makefile
--- /usr/src/cvs/vdrdevel-plugin-solitaire/Makefile	Fri Aug 27 18:07:06 2004
+++ vdrdevel-plugin-solitaire/Makefile	Sat Sep 18 18:30:11 2004
@@ -16,7 +16,7 @@
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
 
 ### The directory environment: