Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at Wed Jun 10 15:00:22 CEST 2009. -------- --- vdr/vdr.changes 2009-06-03 15:39:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr/vdr.changes 2009-06-08 10:03:43.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 8 10:03:09 CEST 2009 - lnussel@suse.de + +- remove dvb from BuildRequires, not actually needed +- update const patch with hunk from upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.x28825/_old 2009-06-10 14:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.x28825/_new 2009-06-10 14:57:52.000000000 +0200 @@ -19,7 +19,7 @@ Name: vdr -BuildRequires: dvb fontconfig-devel freetype2-devel gcc-c++ libjpeg-devel ncurses-devel +BuildRequires: fontconfig-devel freetype2-devel gcc-c++ libjpeg-devel ncurses-devel %if %suse_version > 1000 BuildRequires: libcap-devel %else @@ -39,7 +39,7 @@ Group: Hardware/TV PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq Version: 1.6.0 -Release: 45 +Release: 46 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -139,7 +139,7 @@ Henning Holtschneider <hh@holtschneider.com> %prep -%setup -n vdr-%{version} +%setup -q -n vdr-%{version} cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE4} . @@ -295,6 +295,9 @@ %{vdr_includedir}/* %changelog +* Mon Jun 08 2009 lnussel@suse.de +- remove dvb from BuildRequires, not actually needed +- update const patch with hunk from upstream * Wed Jun 03 2009 lnussel@suse.de - fix build with gcc 4.4 - add vdr maintenance patches 1 and 2 ++++++ vdr-1.6.0-const.diff ++++++ --- /var/tmp/diff_new_pack.x28825/_old 2009-06-10 14:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.x28825/_new 2009-06-10 14:57:53.000000000 +0200 @@ -45,18 +45,26 @@ if (Extension) { if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0) Jpeg = true; -@@ -796,12 +796,12 @@ void cSVDRP::CmdGRAB(const char *Option) +@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option) + char RealFileName[PATH_MAX]; if (FileName) { if (grabImageDir) { - cString s; +- cString s; - char *slash = strrchr(FileName, '/'); -+ char *slash = strrchr(const_cast<char*>(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 = strrchr(const_cast<char*>(FileName), '/'); // there definitely is one - *slash = 0; - char *r = realpath(FileName, RealFileName); - *slash = '/'; + 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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org