r1731 - in vdr/vdr-plugin-xine/branches/network/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sun Jan 15 15:03:36 UTC 2006
Author: tiber-guest
Date: 2006-01-15 15:03:35 +0000 (Sun, 15 Jan 2006)
New Revision: 1731
Added:
vdr/vdr-plugin-xine/branches/network/debian/patches/02_grab.dpatch
vdr/vdr-plugin-xine/branches/network/debian/patches/03_format_strings.dpatch
Removed:
vdr/vdr-plugin-xine/branches/network/debian/patches/02_symlink_security.dpatch
Modified:
vdr/vdr-plugin-xine/branches/network/debian/changelog
vdr/vdr-plugin-xine/branches/network/debian/control
vdr/vdr-plugin-xine/branches/network/debian/patches/00list
vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
Log:
Synced with 0.7.6-5
Modified network patch for 03_format_strings.dpatch
Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog 2006-01-15 14:40:24 UTC (rev 1730)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog 2006-01-15 15:03:35 UTC (rev 1731)
@@ -1,3 +1,24 @@
+vdr-plugin-xine (0.7.6-5net1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Synced with 0.7.6-5
+ - Modified network patch for 03_format_strings.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 15 Jan 2006 15:20:35 +0100
+
+vdr-plugin-xine (0.7.6-5) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr (>=1.3.38-1)
+ * Tobias Grimm <tg at e-tobi.net>
+ - Synced with Darren Salt's package 0.7.6-6.ds
+ + Removed 02_symlink_security
+ + Fix the GRAB command back-end for VDR 1.3.38.
+ + Fix some printf() and esyslog() calls (missing format string).
+ Malicious DVB transmissions, anybody? :-)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 15 Jan 2006 15:21:47 +0100
+
vdr-plugin-xine (0.7.6-4net2) unstable; urgency=low
* Rebuild for libxine-dev (>= 1.0.3a-0vdr2)
Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control 2006-01-15 14:40:24 UTC (rev 1730)
+++ vdr/vdr-plugin-xine/branches/network/debian/control 2006-01-15 15:03:35 UTC (rev 1731)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.3a-0vdr2), vdr-dev (>=1.3.37-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.3a-0vdr2), vdr-dev (>=1.3.38-1)
Standards-Version: 3.6.2
Package: vdr-plugin-xine
Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/00list 2006-01-15 14:40:24 UTC (rev 1730)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/00list 2006-01-15 15:03:35 UTC (rev 1731)
@@ -1,4 +1,5 @@
01_debian
01_Makefile-fPIC-fix
-02_symlink_security
+02_grab
+03_format_strings
03_network
Copied: vdr/vdr-plugin-xine/branches/network/debian/patches/02_grab.dpatch (from rev 1728, vdr/vdr-plugin-xine/trunk/debian/patches/02_grab.dpatch)
Deleted: vdr/vdr-plugin-xine/branches/network/debian/patches/02_symlink_security.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/02_symlink_security.dpatch 2006-01-15 14:40:24 UTC (rev 1730)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/02_symlink_security.dpatch 2006-01-15 15:03:35 UTC (rev 1731)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_symlink_security.dpatch by <ds at flibble.youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fully plug security hole.
-
- at DPATCH@
-diff -urNad vdr-plugin-xine-0.7.0/xineLib.c /tmp/dpep.Cd3lwX/vdr-plugin-xine-0.7.0/xineLib.c
---- vdr-plugin-xine-0.7.0/xineLib.c 2005-01-29 22:28:31.000000000 +0000
-+++ /tmp/dpep.Cd3lwX/vdr-plugin-xine-0.7.0/xineLib.c 2005-01-30 00:25:56.000000000 +0000
-@@ -3254,7 +3254,7 @@
-
- bool success = false;
-
-- int outfd = ::open(FileName, O_CREAT /* | O_EXCL */ | O_TRUNC | O_RDWR, 0644);
-+ int outfd = ::open(FileName, O_CREAT | O_NOFOLLOW | O_TRUNC | O_RDWR, 0644);
- if (-1 != outfd)
- {
- int sizeX = SizeX;
Copied: vdr/vdr-plugin-xine/branches/network/debian/patches/03_format_strings.dpatch (from rev 1728, vdr/vdr-plugin-xine/trunk/debian/patches/03_format_strings.dpatch)
Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2006-01-15 14:40:24 UTC (rev 1730)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2006-01-15 15:03:35 UTC (rev 1731)
@@ -7,9 +7,9 @@
## DP: xine-0-7-4-network.
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./xine.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xine.c
---- ./xine.c 2005-08-24 00:01:55.000000000 +0200
-+++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xine.c 2005-09-14 23:59:01.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.6~/xine.c vdr-plugin-xine-0.7.6/xine.c
+--- vdr-plugin-xine-0.7.6~/xine.c 2006-01-15 15:56:06.000000000 +0100
++++ vdr-plugin-xine-0.7.6/xine.c 2006-01-15 15:56:21.000000000 +0100
@@ -17,8 +17,8 @@
@@ -49,9 +49,9 @@
default:
return false;
}
-diff -urNad --exclude=CVS --exclude=.svn ./xineLib.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.c
---- ./xineLib.c 2005-09-14 23:58:06.000000000 +0200
-+++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.c 2005-09-14 23:58:06.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.6~/xineLib.c vdr-plugin-xine-0.7.6/xineLib.c
+--- vdr-plugin-xine-0.7.6~/xineLib.c 2006-01-15 15:56:21.000000000 +0100
++++ vdr-plugin-xine-0.7.6/xineLib.c 2006-01-15 16:00:11.000000000 +0100
@@ -1855,6 +1855,10 @@
, m_plugin(plugin)
, m_settings(settings)
@@ -98,131 +98,23 @@
bool cXineLib::Open()
{
::unlink(m_fifoNameExtControl.c_str());
-@@ -1951,73 +1983,101 @@
+@@ -1951,6 +1983,8 @@
::unlink(m_fifoNameStream.c_str());
::rmdir(m_fifoDir.c_str());
-- const mode_t origUmask = ::umask(0);
--
-- if (::mkdir(m_fifoDir.c_str(), 0755) < 0)
+ if (! m_settings.ShallUseSocketInterface())
- {
-- perror(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
-
-- ::umask(origUmask);
-- return false;
-- }
-+ const mode_t origUmask = ::umask(0);
++ {
+ const mode_t origUmask = ::umask(0);
-- if (::mknod(m_fifoNameExtControl.c_str(), 0666 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
-+ if (::mkdir(m_fifoDir.c_str(), 0755) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
+ #define MkFifo(String, Mask) \
+@@ -1980,6 +2014,30 @@
+ MkFifo(m_fifoNameStream, 0644);
-- ::umask(origUmask);
-- return false;
-- }
-+ ::umask(origUmask);
-+ return false;
-+ }
-+
-+ if (::mknod(m_fifoNameExtControl.c_str(), 0666 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
-
-- if (::mknod(m_fifoNameExtResult.c_str(), 0644 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
-+ ::umask(origUmask);
-+ return false;
-+ }
-
-- ::umask(origUmask);
-- return false;
-- }
-+ if (::mknod(m_fifoNameExtResult.c_str(), 0644 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
-
-- if (::mknod(m_fifoNameControl.c_str(), 0644 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
-+ ::umask(origUmask);
-+ return false;
-+ }
-
-- ::umask(origUmask);
-- return false;
-- }
-+ if (::mknod(m_fifoNameControl.c_str(), 0644 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
-
-- if (::mknod(m_fifoNameResult.c_str(), 0666 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
-+ ::umask(origUmask);
-+ return false;
-+ }
-
-- ::umask(origUmask);
-- return false;
-- }
-+ if (::mknod(m_fifoNameResult.c_str(), 0666 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
-
-- if (::mknod(m_fifoNameRemote.c_str(), 0666 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
-+ ::umask(origUmask);
-+ return false;
-+ }
-+
-+ if (::mknod(m_fifoNameRemote.c_str(), 0666 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
-+
-+ ::umask(origUmask);
-+ return false;
-+ }
-+
-+ if (::mknod(m_fifoNameStream.c_str(), 0644 | S_IFIFO, 0) < 0)
-+ {
-+ perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-+ esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-
-+ ::umask(origUmask);
-+ return false;
-+ }
-+
- ::umask(origUmask);
-- return false;
-- }
-
-- if (::mknod(m_fifoNameStream.c_str(), 0644 | S_IFIFO, 0) < 0)
+ ::umask(origUmask);
+ }
+ else
- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-
-- ::umask(origUmask);
-- return false;
++ {
++
+/*
+{ .path = FIFO_STREAM, .mode = 0644, .port = 18701 },
+{ .path = FIFO_STREAM_CONTROL, .mode = 0644, .port = 18702 },
@@ -242,14 +134,11 @@
+
+ if ((fd_remote_serv = CreateServerSocket(18704)) == -1)
+ return false;
- }
++ }
-- ::umask(origUmask);
--
if (!Start())
return false;
-
-@@ -2049,6 +2109,11 @@
+@@ -2012,6 +2070,11 @@
::unlink(m_fifoNameRemote.c_str());
::unlink(m_fifoNameStream.c_str());
::rmdir(m_fifoDir.c_str());
@@ -261,7 +150,7 @@
}
void cXineLib::internalPaused(const bool paused)
-@@ -2110,7 +2175,13 @@
+@@ -2073,7 +2136,13 @@
int myErrno = errno;
::signal(SIGPIPE, sigPipeHandler);
@@ -276,7 +165,7 @@
if (r <= 0)
{
if (EAGAIN == myErrno || EINTR == myErrno)
-@@ -2118,7 +2189,7 @@
+@@ -2081,7 +2150,7 @@
xfprintf(stderr, "read(%d) returned %d, error %d: ", n, r, myErrno);
errno = myErrno;
@@ -285,7 +174,7 @@
perror("");
disconnect();
-@@ -2300,27 +2371,74 @@
+@@ -2263,27 +2332,74 @@
// fprintf(stderr, "Action done\n");
}
@@ -370,9 +259,9 @@
internalPaused(false);
-diff -urNad --exclude=CVS --exclude=.svn ./xineLib.h /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.h
---- ./xineLib.h 2005-08-14 12:55:10.000000000 +0200
-+++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.h 2005-09-14 23:58:06.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.6~/xineLib.h vdr-plugin-xine-0.7.6/xineLib.h
+--- vdr-plugin-xine-0.7.6~/xineLib.h 2006-01-15 15:56:21.000000000 +0100
++++ vdr-plugin-xine-0.7.6/xineLib.h 2006-01-15 15:56:21.000000000 +0100
@@ -136,8 +136,15 @@
return fd_remote;
}
@@ -390,9 +279,9 @@
cMutex m_ioMutex, m_dataMutex, m_disconnectMutex;
cMutex &m_osdMutex;
-diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.c
---- ./xineSettings.c 2005-03-28 20:33:02.000000000 +0200
-+++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.c 2005-09-14 23:58:06.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.6~/xineSettings.c vdr-plugin-xine-0.7.6/xineSettings.c
+--- vdr-plugin-xine-0.7.6~/xineSettings.c 2006-01-15 15:56:06.000000000 +0100
++++ vdr-plugin-xine-0.7.6/xineSettings.c 2006-01-15 15:56:21.000000000 +0100
@@ -57,6 +57,7 @@
cXineSettings::cXineSettings()
: m_switchSkin(false)
@@ -416,9 +305,9 @@
+ }
+
};
-diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.h /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.h
---- ./xineSettings.h 2005-03-28 20:25:27.000000000 +0200
-+++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.h 2005-09-14 23:58:06.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.6~/xineSettings.h vdr-plugin-xine-0.7.6/xineSettings.h
+--- vdr-plugin-xine-0.7.6~/xineSettings.h 2006-01-15 15:56:06.000000000 +0100
++++ vdr-plugin-xine-0.7.6/xineSettings.h 2006-01-15 15:56:21.000000000 +0100
@@ -74,6 +74,7 @@
private:
bool m_switchSkin;
More information about the pkg-vdr-dvb-changes
mailing list