Your message dated Fri, 09 Oct 2009 22:28:19 +0000
with message-id <[email protected]>
and subject line Bug#549380: fixed in vdr 1.6.0-12
has caused the Debian Bug report #549380,
regarding vdr: FTBFS with gcc 4.4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
549380: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549380
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: vdr
Version: 1.6.0-11
Tags: patch
User: [email protected]
Usertags: origin-ubuntu ubuntu-patch karmic
vdr FTBFS with gcc 4.4
Attaching patch copied from Fedora.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_gcc44_ftbfs.dpatch copied from Fedora
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix FTBFS with gcc 4.4
## DP:
http://cvs.fedoraproject.org/viewvc/rpms/vdr/devel/vdr-1.6.0-const.diff?revision=1.1&view=markup
@DPATCH@
--- vdr-1.6.0.orig/recording.c
+++ vdr-1.6.0/recording.c
@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, co
Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
Subtitle = SubtitleBuffer;
}
- char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE);
- char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
+ const char *macroTITLE = strstr(Timer->File(), TIMERMACRO_TITLE);
+ const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
if (macroTITLE || macroEPISODE) {
name = strdup(Timer->File());
name = strreplace(name, TIMERMACRO_TITLE, Title);
@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileN
sortBuffer = NULL;
fileName = strdup(FileName);
FileName += strlen(VideoDirectory) + 1;
- char *p = strrchr(FileName, '/');
+ const char *p = strrchr(FileName, '/');
name = NULL;
info = new cRecordingInfo;
@@ -1022,7 +1022,8 @@ void cRecordings::DelByName(const char *
if (recording) {
cThreadLock DeletedRecordingsLock(&DeletedRecordings);
Del(recording, false);
- char *ext = strrchr(recording->FileName(), '.');
+ // wtf?
+ char *ext = strrchr(const_cast<char*>(recording->FileName()), '.');
if (ext) {
strncpy(ext, DELEXT, strlen(ext));
recording->fileSizeMB = DirSizeMB(recording->FileName());
--- vdr-1.6.0.orig/svdrp.c
+++ vdr-1.6.0/svdrp.c
@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
char *strtok_next;
FileName = strtok_r(p, delim, &strtok_next);
// image type:
- char *Extension = strrchr(FileName, '.');
+ const char *Extension = strrchr(FileName, '.');
if (Extension) {
if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension,
".jpeg") == 0)
Jpeg = true;
@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
char RealFileName[PATH_MAX];
if (FileName) {
if (grabImageDir) {
- cString s;
- char *slash = strrchr(FileName, '/');
+ cString s(FileName);
+ FileName = s;
+ const char *slash = strrchr(FileName, '/');
if (!slash) {
s = AddDirectory(grabImageDir, FileName);
FileName = s;
}
slash = strrchr(FileName, '/'); // there definitely is one
- *slash = 0;
- char *r = realpath(FileName, RealFileName);
- *slash = '/';
+ cString t(s);
+ t.Truncate(slash - FileName);
+ char *r = realpath(t, RealFileName);
if (!r) {
LOG_ERROR_STR(FileName);
Reply(501, "Invalid file name \"%s\"", FileName);
--- End Message ---
--- Begin Message ---
Source: vdr
Source-Version: 1.6.0-12
We believe that the bug you reported is fixed in the latest version of
vdr, which is due to be installed in the Debian FTP archive:
vdr-dbg_1.6.0-12_amd64.deb
to pool/main/v/vdr/vdr-dbg_1.6.0-12_amd64.deb
vdr-dev_1.6.0-12_all.deb
to pool/main/v/vdr/vdr-dev_1.6.0-12_all.deb
vdr-plugin-examples_1.6.0-12_amd64.deb
to pool/main/v/vdr/vdr-plugin-examples_1.6.0-12_amd64.deb
vdr-plugin-sky_1.6.0-12_amd64.deb
to pool/main/v/vdr/vdr-plugin-sky_1.6.0-12_amd64.deb
vdr_1.6.0-12.diff.gz
to pool/main/v/vdr/vdr_1.6.0-12.diff.gz
vdr_1.6.0-12.dsc
to pool/main/v/vdr/vdr_1.6.0-12.dsc
vdr_1.6.0-12_amd64.deb
to pool/main/v/vdr/vdr_1.6.0-12_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Tobias Grimm <[email protected]> (supplier of updated vdr package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 09 Oct 2009 21:55:31 +0200
Source: vdr
Binary: vdr vdr-dev vdr-dbg vdr-plugin-sky vdr-plugin-examples
Architecture: source all amd64
Version: 1.6.0-12
Distribution: unstable
Urgency: low
Maintainer: Debian VDR Team <[email protected]>
Changed-By: Tobias Grimm <[email protected]>
Description:
vdr - Video Disk Recorder for DVB cards
vdr-dbg - Debuggable version of the VDR Video Disk Recorder
vdr-dev - Video Disk Recorder for DVB cards
vdr-plugin-examples - Plugins for vdr to show some possible features
vdr-plugin-sky - Plugin for using a Sky Digibox with vdr
Closes: 548798 549380
Changes:
vdr (1.6.0-12) unstable; urgency=low
.
[ Thomas Günther ]
* Upgraded make-special-vdr.sh to version 1.3
.
[ Tobias Grimm ]
* Added Italian debconf translation (Closes: #548798)
* Fixed FTBFS with gcc 4.4 (Closes: #549380)
* Standards-Version: 3.8.3
Checksums-Sha1:
1b34a5335fdb527769184b7fedf4c4ce367ea6a8 1424 vdr_1.6.0-12.dsc
e72d02d6571009c2c8f27c0f0d3a0d42248c22a5 150306 vdr_1.6.0-12.diff.gz
7d5d52a6f4a82cdd790861f4f3edd8e6b55d6fb5 302172 vdr-dev_1.6.0-12_all.deb
b7550b81e329733f41e820f55c07e2df631e74ac 875860 vdr_1.6.0-12_amd64.deb
0a1d941c0702b1f4cdfa2743df41e16c5f02bb04 1295494 vdr-dbg_1.6.0-12_amd64.deb
2f8630b6cd600053ab3c879b54da7150effd03e8 32986
vdr-plugin-sky_1.6.0-12_amd64.deb
28aaf2f05324f9674403052e8a126c5eac09b782 75326
vdr-plugin-examples_1.6.0-12_amd64.deb
Checksums-Sha256:
2b56a9f03138bb126bedd76f0ce0007ad299d5ebd6689f464c6ed3c79a92957d 1424
vdr_1.6.0-12.dsc
f1c1483893ba28d0cd90d7ed896aceac3115642da28a67b88439976a92ebba9a 150306
vdr_1.6.0-12.diff.gz
4133bb6cb5ae5ef0b5fdd9f999f56294b43c466bf9ad17044babcecca2039655 302172
vdr-dev_1.6.0-12_all.deb
081f67218a82cf55c8b9398e8f55c61f0b97abe9548ad21d19f78c5535d5772e 875860
vdr_1.6.0-12_amd64.deb
9cd80ee39fad7dbbc26e89beee533e5d2fa4f05060fecf5d9f14fec12a5b7501 1295494
vdr-dbg_1.6.0-12_amd64.deb
2b944a1007e9cf4673a97cf98886fe130cf54abeea270651097b4fc3a8c9fb3c 32986
vdr-plugin-sky_1.6.0-12_amd64.deb
b8af6d1cba2f90b4d115be6ef52be21f0109d02fdcd1bd0c3bd2ae8768b612b9 75326
vdr-plugin-examples_1.6.0-12_amd64.deb
Files:
8be0dcfc88b27b496a0316bf8642d34a 1424 video extra vdr_1.6.0-12.dsc
8881940780597562a81c14fcb94d4cca 150306 video extra vdr_1.6.0-12.diff.gz
7b0cab156a1a6c4eb7b823177a5bfe8b 302172 video extra vdr-dev_1.6.0-12_all.deb
78f3fb41aad071d37d032779aad4841d 875860 video extra vdr_1.6.0-12_amd64.deb
d95231ec036f143a8ac1922355a876e7 1295494 debug extra vdr-dbg_1.6.0-12_amd64.deb
c47b91ac7fe05449a2e51732159382bb 32986 video extra
vdr-plugin-sky_1.6.0-12_amd64.deb
69a3726df2027e6246e10fa495ccb69c 75326 video extra
vdr-plugin-examples_1.6.0-12_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkrPmm0ACgkQ9xgNJq7apkL8UwCeL9bK3FjY5VwJm0AJlYckP3JY
dj4AoIy1BMlETnd2At6VoDQuvxcJynu6
=TCEp
-----END PGP SIGNATURE-----
--- End Message ---
