1
0
forked from pool/mutt

Accepting request 397514 from server:mail

- Enable some of the new patches like sidebar (boo#980830) 
- Add patch COLS-workaround.dif which should become removed once
  the sidebar patch does not modify COLS anymore

OBS-URL: https://build.opensuse.org/request/show/397514
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2016-05-24 07:35:18 +00:00 committed by Git OBS Bridge
commit 5d857a0069
3 changed files with 42 additions and 0 deletions

24
COLS-workaround.dif Normal file
View File

@ -0,0 +1,24 @@
Current neomutt sidebar patch does change COLS which does
not work with threadsafe ncurses6
---
configure.ac | 8 ++++++++
1 file changed, 8 insertions(+)
--- configure.ac
+++ configure.ac 2016-05-23 13:43:40.810914709 +0000
@@ -305,6 +305,14 @@ main ()
if test x$mutt_cv_curses != x/usr; then
LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
+ fi
+ if test -d /usr/include/ncurses5 ; then
+ if test -d /usr/lib64/ncurses5 ; then
+ LDFLAGS="$LDFLAGS -L/usr/lib64/ncurses5"
+ else
+ LDFLAGS="$LDFLAGS -L/usr/lib/ncurses5"
+ fi
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses5"
fi])
AC_CHECK_FUNC(initscr,,[

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 20 15:14:52 UTC 2016 - werner@suse.de
- Enable some of the new patches like sidebar (boo#980830)
- Add patch COLS-workaround.dif which should become removed once
the sidebar patch does not modify COLS anymore
-------------------------------------------------------------------
Thu May 12 13:50:14 UTC 2016 - werner@suse.de

View File

@ -43,6 +43,9 @@ BuildRequires: libxml2
BuildRequires: libxslt
BuildRequires: lynx
BuildRequires: ncurses-devel
%if 0%{?is_opensuse}
BuildRequires: notmuch-devel
%endif
BuildRequires: postfix
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
@ -107,6 +110,8 @@ Patch16: mutt-1.5.23-cariage-return.path
Patch18: mutt-1.5.21-mailcap.diff
# PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup()
Patch19: bsc907453-CVE-2014-9116-jessie.patch
# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream
Patch20: COLS-workaround.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir}
@ -137,6 +142,7 @@ patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch
%patch16 -p0 -b .crlf
%patch18 -p0 -b .mailcap
%patch19 -p0 -b .cvw2014.9116
%patch20 -p0 -b .cols
rm -vf README*.orig
rm -vf PATCHES*.orig
@ -200,6 +206,11 @@ chmod 755 $KRB5CFGPATH
--enable-nfs-fix \
--enable-mailtool \
--enable-compressed \
--enable-sidebar \
%if 0%{?is_opensuse}
--enable-notmuch \
%endif
--enable-hcache \
--disable-external-dotlock \
--with-ssl=%{_prefix} \
--with-sasl=%{_prefix} \