From 0b1899d15d253f5f2659284c8deba5e12333ae44 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 17 May 2007 09:46:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=4 --- mutt-1.5.13-memmove.dif | 13 +++++++++++++ mutt.changes | 5 +++++ mutt.spec | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 mutt-1.5.13-memmove.dif diff --git a/mutt-1.5.13-memmove.dif b/mutt-1.5.13-memmove.dif new file mode 100644 index 0000000..88ccfcc --- /dev/null +++ b/mutt-1.5.13-memmove.dif @@ -0,0 +1,13 @@ +--- muttlib.c ++++ muttlib.c 2007-05-16 09:26:24.607110614 +0000 +@@ -537,8 +537,8 @@ char *mutt_gecos_name (char *dest, size_ + if (dest[idx] == '&') + { + memmove (&dest[idx + pwnl], &dest[idx + 1], +- MAX(destlen - idx - pwnl - 1, 0)); +- memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl)); ++ MAX((ssize_t)(destlen - idx - pwnl - 1), 0)); ++ memcpy (&dest[idx], pw->pw_name, MIN((ssize_t)(destlen - idx - 1), pwnl)); + dest[idx] = toupper ((unsigned char) dest[idx]); + } + } diff --git a/mutt.changes b/mutt.changes index c50b0b8..e798eaf 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 16 11:29:09 CEST 2007 - werner@suse.de + +- Overflow: don't compare signed with unsigned (bug #275069) + ------------------------------------------------------------------- Fri Mar 23 15:03:13 CET 2007 - rguenther@suse.de diff --git a/mutt.spec b/mutt.spec index dabfbd5..37fe9aa 100644 --- a/mutt.spec +++ b/mutt.spec @@ -24,7 +24,7 @@ Requires: smtp_daemon #Requires: desktop-data-SuSE Autoreqprov: on Version: 1.5.13 -Release: 52 +Release: 66 Summary: Mail Program BuildRoot: %{_tmppath}/%{name}-%{version}-build # ftp://ftp.mutt.org/mutt/devel/ @@ -44,6 +44,7 @@ Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 Patch6: patch-1.5.13.sidebar.20061023.txt.bz2 Patch7: mutt-1.5.13.sidebar-fix.dif Patch8: mutt-1.5.13-opennfs.dif +Patch9: mutt-1.5.13-memmove.dif %description A very powerful mail user agent. It supports (among other nice things) @@ -68,6 +69,7 @@ Authors: %patch6 -p1 %patch7 -p0 %patch8 -p0 +%patch9 -p0 cp Muttrc Muttrc.SuSE cp %{S:2} . @@ -157,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/Muttrc %changelog +* Wed May 16 2007 - werner@suse.de +- Overflow: don't compare signed with unsigned (bug #275069) * Fri Mar 23 2007 - rguenther@suse.de - add gdbm-devel and ncurses-devel BuildRequires * Mon Feb 26 2007 - stbinner@suse.de