From 17477a40024e9a9e0a8c26ff0521dc3b271aaa05b34bf01afd8fe23f7a251cd3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 29 Jun 2010 17:12:50 +0000 Subject: [PATCH] Accepting request 42280 from Base:System Copy from Base:System/mtools based on submit request 42280 from user pgajdos OBS-URL: https://build.opensuse.org/request/show/42280 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mtools?expand=0&rev=18 --- mtools-4.0.13-initialize.diff | 13 +++++++++++++ mtools.changes | 5 +++++ mtools.spec | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 mtools-4.0.13-initialize.diff diff --git a/mtools-4.0.13-initialize.diff b/mtools-4.0.13-initialize.diff new file mode 100644 index 0000000..6ee3810 --- /dev/null +++ b/mtools-4.0.13-initialize.diff @@ -0,0 +1,13 @@ +Index: mtools-4.0.13/mlabel.c +=================================================================== +--- mtools-4.0.13.orig/mlabel.c ++++ mtools-4.0.13/mlabel.c +@@ -35,7 +35,7 @@ void label_name(doscp_t *cp, const char + int have_lower, have_upper; + wchar_t wbuffer[12]; + +- memset(ans, ' ', sizeof(ans)-1); ++ memset(ans, ' ', sizeof(*ans)-1); + ans->sentinel = '\0'; + len = native_to_wchar(filename, wbuffer, 11, 0, 0); + if(len > 11){ diff --git a/mtools.changes b/mtools.changes index 6b3ab45..6727ec7 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 29 18:27:11 CEST 2010 - pgajdos@suse.cz + +- fixed initialization in mlabel.c [bnc#618326] + ------------------------------------------------------------------- Mon Mar 1 16:20:52 CET 2010 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index dd609d4..9e588ce 100644 --- a/mtools.spec +++ b/mtools.spec @@ -21,10 +21,10 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel Version: 4.0.13 -Release: 1 +Release: 2 AutoReqProv: on Group: System/Filesystems -License: GPLv3+ +License: GPLv2+ Url: http://mtools.linux.lu/ Summary: Access Files on an MS-DOS File System Source: %{name}-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch7: %{name}-%{version}-file-close.diff +Patch8: %{name}-%{version}-initialize.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -97,6 +98,7 @@ Authors: %patch4 %patch5 %patch7 +%patch8 -p1 %build %{suse_update_config -f}