Hello community, here is the log from the commit of package vcdimager checked in at Tue Mar 6 17:57:00 CET 2007. -------- --- vcdimager/vcdimager.changes 2006-06-30 13:19:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/vcdimager/vcdimager.changes 2007-03-06 17:23:41.117727000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 06 11:10:36 CEST 2007 - ckornacker@suse.de + +- Code cleanup. + +------------------------------------------------------------------- New: ---- vcdimager-0.7.23-strncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vcdimager.spec ++++++ --- /var/tmp/diff_new_pack.yX3323/_old 2007-03-06 17:56:46.000000000 +0100 +++ /var/tmp/diff_new_pack.yX3323/_new 2007-03-06 17:56:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vcdimager (Version 0.7.23) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,14 +13,15 @@ Name: vcdimager BuildRequires: cdparanoia libcddb-devel libcdio-devel libxml2-devel pkgconfig popt-devel URL: http://www.vcdimager.org/ -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Multimedia/CD/Record PreReq: %install_info_prereq Autoreqprov: on Version: 0.7.23 -Release: 20 +Release: 41 Summary: Video CD (VCD) authoring software Source: %{name}-%{version}.tar.bz2 +Patch: %{name}-0.7.23-strncat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,7 +56,7 @@ %package devel URL: http://www.vcdimager.org/ -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Multimedia/CD/Record Summary: Video CD (VCD) authoring software Requires: %{name} = %{version} libcdio-devel glibc-devel @@ -92,6 +93,7 @@ %prep %setup +%patch -p1 %build %{?suse_update_config:%{suse_update_config -f -l}} @@ -132,7 +134,9 @@ %{_libdir}/pkgconfig/*.pc /usr/include/* -%changelog -n vcdimager +%changelog +* Tue Mar 06 2007 - ckornacker@suse.de +- Code cleanup. * Fri Jun 30 2006 - sbrabec@suse.cz - Fixed cyclic dependencies in a correct way. * Thu Jun 22 2006 - sbrabec@suse.cz ++++++ vcdimager-0.7.23-strncat.patch ++++++ Index: vcdimager-0.7.23/frontends/xml/vcd_xml_rip.c =================================================================== --- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_rip.c +++ vcdimager-0.7.23/frontends/xml/vcd_xml_rip.c @@ -158,7 +158,7 @@ _parse_isofs_r (vcdxml_t *p_vcdxml, CdIo char *_name = statbuf->filename; strncpy (_fullname, pathname, sizeof (_fullname)); - strncat (_fullname, _name, sizeof (_fullname)); + strncat (_fullname, _name, sizeof (_fullname)-strlen(_fullname)-1); if (NULL == statbuf) return -1; @@ -177,7 +177,7 @@ _parse_isofs_r (vcdxml_t *p_vcdxml, CdIo _register_file (p_vcdxml, _fullname, statbuf); if (statbuf->type == _STAT_DIR) { - strncat (_fullname, "/", sizeof (_fullname)); + strncat (_fullname, "/", sizeof (_fullname)-strlen(_fullname)-1); if (_parse_isofs_r (p_vcdxml, p_cdio, _fullname)) { return -1; } Index: vcdimager-0.7.23/frontends/cli/vcd-info.c =================================================================== --- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c +++ vcdimager-0.7.23/frontends/cli/vcd-info.c @@ -943,7 +943,7 @@ _dump_fs_recurse (const vcdinfo_obj_t *o snprintf (_fullname, sizeof (_fullname), "%s%s", pathname, _name); - strncat (_fullname, "/", sizeof (_fullname)); + strncat (_fullname, "/", sizeof (_fullname)-strlen(_fullname)-1); if (statbuf->type == _STAT_DIR && strcmp (_name, ".") Index: vcdimager-0.7.23/frontends/xml/vcd_xml_build.c =================================================================== --- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c +++ vcdimager-0.7.23/frontends/xml/vcd_xml_build.c @@ -275,7 +275,7 @@ _do_cl (int argc, const char *argv[]) { char buf[1024] = { 0, }; strncpy (buf, opt_arg, sizeof (buf)); - strncat (buf, ".toc", sizeof (buf)); + strncat (buf, ".toc", sizeof (buf)-strlen(buf)-1); _set_img_opt ("toc", buf); } Index: vcdimager-0.7.23/lib/vcd.c =================================================================== --- vcdimager-0.7.23.orig/lib/vcd.c +++ vcdimager-0.7.23/lib/vcd.c @@ -1682,7 +1682,7 @@ _write_sequence (VcdObj_t *p_obj, int tr track->info->ahdr[i].bitrate / 1024, _mode_str[track->info->ahdr[i].mode]); - strncat (buf2, buf, sizeof(buf2)-i_buf2); + strncat (buf2, buf, sizeof(buf2)-strlen(buf2)-i_buf2-1); i_buf2 += i_buf; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org