Hello community,
here is the log from the commit of package alpine for openSUSE:Factory checked
in at 2013-05-27 09:31:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alpine (Old)
and /work/SRC/openSUSE:Factory/.alpine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alpine"
Changes:
--------
--- /work/SRC/openSUSE:Factory/alpine/alpine.changes 2012-07-30
11:35:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alpine.new/alpine.changes 2013-05-27
09:31:31.000000000 +0200
@@ -1,0 +2,27 @@
+Wed May 22 20:37:21 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 2.10
+* Quota report for IMAP folders that support it
+ (press the "@" command in the index screen of such folder).
+* Search a folder for the content of any header with the ";"
+ command.
+* Foreign characters are decoded correctly in IMAP folders.
+* Recognition of proper mime type for docx, xlsx, and pptx files.
+* When composing a message, Alpine will create a new thread when
+ the subject is erased.
+- Uncompress patches, since quilt does not like working with them
+- Remove because merged upstream: chappa-filterflagbug.patch(.gz),
+ chappa-nlinfobug.patch(.gz), chappa-replacebug.patch(.gz),
+ chappa-searchheader.patch(.gz), chappa-streamlock.patch(.gz)
+- Rediff to clear fuzz: alpine-no-add-needed.patch,
+ pine-nonvoid-function.patch
+- Remove because no longer applies and total lack of description
+ as per Patch Guidelines:
+ alpine-no-add-needed.patch
+
+-------------------------------------------------------------------
+Wed May 22 12:10:17 UTC 2013 - jeng...@inai.de
+
+- Remove old SUSE definitions
+
+-------------------------------------------------------------------
Old:
----
alpine-2.00.tar.bz2
chappa-WrtAcc.patch.gz
chappa-colortext.patch.gz
chappa-fancy.patch.gz
chappa-filterflagbug.patch.gz
chappa-ignoresize.patch.gz
chappa-insertpat.patch.gz
chappa-maildir.patch.gz
chappa-nlinfobug.patch.gz
chappa-replacebug.patch.gz
chappa-searchheader.patch.gz
chappa-streamlock.patch.gz
chappa-unixnullbug.patch.gz
chappa-unverified.patch.gz
New:
----
alpine-2.10.clean.tar.lzma
chappa-WrtAcc.patch
chappa-colortext.patch
chappa-fancy.patch
chappa-ignoresize.patch
chappa-insertpat.patch
chappa-maildir.patch
chappa-unixnullbug.patch
chappa-unverified.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alpine.spec ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package alpine
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,7 @@
Name: alpine
#
-# Package configuration:
-#
-%if %{suse_version} > 1030
-%define obsolete_pine 1
-%define provide_pico_and_pilot 1
-%else
-%define obsolete_pine 0
-%define provide_pico_and_pilot 0
-%endif
-#
# For debugging only:
-%define use_mudflap 0
%define build_vanilla 0
#
Summary: Mail User Agent
@@ -44,23 +33,17 @@
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: update-desktop-files
-%if %{use_mudflap}
-BuildRequires: libmudflap
-%endif
+BuildRequires: xz
# pgp4pine requires pine:
Provides: pine
#
-%if %obsolete_pine
Obsoletes: pine4
Provides: pine4
-%else
-Conflicts: pine4
-%endif
#
-Version: 2.00
+Version: 2.10
Release: 0
Url: http://www.washington.edu/alpine/
-Source: %{name}-%{version}.tar.bz2
+Source:
http://patches.freeiz.com/alpine/patches/alpine-2.10/alpine-2.10.clean.tar.lzma
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1: %name.png
Source2: %name.desktop
@@ -71,28 +54,21 @@
Patch5: alpine-gcc44.diff
Patch6: alpine-2.00-as_needed.patch
Patch7: alpine-month_name-utf8.patch
-Patch8: alpine-maildir-closedir.patch
Patch10: pico-fix-spurious-undef-warnings.diff
Patch20: pine-expression-warnings.diff
Patch40: pico-stripwhitespace.diff
Patch60: signal-and-panic-improvements.diff
#
# Eduardo Chappa's patches.
-# http://staff.washington.edu/chappa/alpine/patches
+# http://patches.freeiz.com/alpine/
#
-Patch600: chappa-colortext.patch.gz
-Patch601: chappa-fancy.patch.gz
-Patch602: chappa-ignoresize.patch.gz
-Patch603: chappa-insertpat.patch.gz
-Patch604: chappa-maildir.patch.gz
-Patch605: chappa-searchheader.patch.gz
-Patch606: chappa-WrtAcc.patch.gz
-Patch607: chappa-replacebug.patch.gz
-Patch608: chappa-unixnullbug.patch.gz
-Patch609: chappa-streamlock.patch.gz
-Patch610: chappa-filterflagbug.patch.gz
-Patch611: chappa-nlinfobug.patch.gz
-Patch612: chappa-unverified.patch.gz
+Patch600: chappa-colortext.patch
+Patch601: chappa-fancy.patch
+Patch602: chappa-ignoresize.patch
+Patch603: chappa-insertpat.patch
+Patch604: chappa-maildir.patch
+Patch605: chappa-WrtAcc.patch
+Patch606: chappa-unixnullbug.patch
Patch613: alpine-no-add-needed.patch
%description
@@ -151,24 +127,17 @@
%patch604 -p1
%patch605 -p1
%patch606 -p1
-%patch607 -p1
-%patch608 -p1
-%patch609 -p1
-%patch610 -p1
-%patch611 -p1
-%patch612 -p1
-%patch613
+%patch613 -p1
#
# SuSE patches - warning fixes, etc:
#
-%patch1
+%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7
-%patch8
%patch10 -p1
%patch20 -p1
%patch40 -p1
@@ -176,25 +145,13 @@
%endif # End of "if !{build_vanilla}"
%build
-# Workaround for older distros which slashed the gnu:
-%if %{suse_version} <= 1010
-%define _host_os %{_os}%{?_gnu}
-%define _host %{_host_cpu}-%{_host_vendor}-%{_host_os}
-%endif
#
# Comment on disabled warnings: The disabled warnings are rather harmless
# and disabling them allows to focus on the really serious warnings:
#
export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \
-%if %{suse_version} >= 1010
-Wno-unused-value -fno-strict-aliasing -Wno-pointer-sign
-Wno-unused \
-%endif
-%if %{suse_version} >= 1030
-Wno-address \
-%endif
-%if %{use_mudflap}
- -fmudflap \
-%endif
"
#
# On -Waddress:
@@ -213,26 +170,8 @@
#
export LDFLAGS="-rdynamic" # -rdynamic is used for backtrace_symbols:
:
-#
-# In case one wants to compile alpine with libmudflap to instrument all risky
-# pointer/array dereferencing operations, some standard library string/heap
-# functions, and some other associated constructs with range/validity tests.
-# Modules so instrumented should be immune to buffer overflows, invalid heap
-# use, and some other classes of C/C++ programming errors. Disabled by default,
-# but may be used for debugging issues which are otherwise hard to catch:
-#-fmudflap -fmudflapir \
-%if %{use_mudflap}
-export EXTRALDFLAGS="-lmudflap"
-# Silences warnings at startup (faster, could be used for production builds):
-#export EXTRALDFLAGS="-lmudflapir"
-LDFLAGS="$LDFLAGS $EXTRALDFLAGS"
-%endif
autoreconf -fiv
%configure \
-%if %{use_mudflap}
- %( : 'mudflap(th) does not work with with threads:' )\
- --without-pthread \
-%endif
--with-ssl-dir=/usr \
--with-smtp-msa=/usr/sbin/sendmail \
--with-password-prog=/usr/bin/passwd \
@@ -266,14 +205,10 @@
install -D -m644 %{SOURCE2}
$RPM_BUILD_ROOT/usr/share/applications/%name.desktop
%suse_update_desktop_file %name
:
-%if %obsolete_pine
ln -sf alpine $RPM_BUILD_ROOT%{_bindir}/pine
-%endif
:
-%if %provide_pico_and_pilot
install -m755 pico/{pico,pilot} $RPM_BUILD_ROOT%{_bindir}
install -m644 doc/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/
-%endif
%check
#since where are no logs in the package at the moment, there are no checks,
@@ -342,7 +277,6 @@
%{_bindir}/mailutil
/usr/share/applications/%name.desktop
/usr/share/pixmaps/%name.png
-%if %provide_pico_and_pilot
%files -n pico
%defattr(-, root, root)
@@ -353,6 +287,5 @@
%defattr(-, root, root)
%{_bindir}/pilot
%doc %{_mandir}/man1/pilot.*
-%endif
%changelog
++++++ alpine-no-add-needed.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,5 +1,12 @@
---- alpine/Makefile.am.orig
-+++ alpine/Makefile.am
+---
+ alpine/Makefile.am | 2 +-
+ configure.ac | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+Index: alpine-2.10/alpine/Makefile.am
+===================================================================
+--- alpine-2.10.orig/alpine/Makefile.am
++++ alpine-2.10/alpine/Makefile.am
@@ -35,7 +35,7 @@ BUILT_SOURCES = date.c
LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
../pith/libpith.a ../pith/osdep/libpithosd.a \
@@ -7,10 +14,12 @@
- osdep/libpineosd.a ../c-client/c-client.a
+ osdep/libpineosd.a ../c-client/c-client.a -lkrb5 -lcrypto
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-DLOCALEDIR=\"$(localedir)\"
+ AM_CPPFLAGS = -I@top_builddir@/include -I@top_srcdir@/include
-DLOCALEDIR=\"$(localedir)\"
---- configure.ac.orig
-+++ configure.ac
+Index: alpine-2.10/configure.ac
+===================================================================
+--- alpine-2.10.orig/configure.ac
++++ alpine-2.10/configure.ac
@@ -37,8 +37,9 @@ WEB_BUILD=web/src/alpined.d
dnl CHECK PROGRAMS
++++++ chappa-WrtAcc.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,9 +1,9 @@
-diff -rc alpine-2.00/pico/basic.c alpine-2.00.WrtAcc/pico/basic.c
-*** alpine-2.00/pico/basic.c 2007-11-26 15:45:22.000000000 -0800
---- alpine-2.00.WrtAcc/pico/basic.c 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/basic.c alpine-2.10.WrtAcc/pico/basic.c
+*** alpine-2.10/pico/basic.c 2013-01-11 11:25:28.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/basic.c 2013-01-11 20:43:11.000000000 -0700
***************
-*** 343,348 ****
---- 343,531 ----
+*** 344,349 ****
+--- 344,532 ----
return(TRUE);
}
@@ -193,11 +193,11 @@
/*
* go forword to the end of the current paragraph
-diff -rc alpine-2.00/pico/composer.c alpine-2.00.WrtAcc/pico/composer.c
-*** alpine-2.00/pico/composer.c 2008-03-21 14:31:58.000000000 -0700
---- alpine-2.00.WrtAcc/pico/composer.c 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/composer.c alpine-2.10.WrtAcc/pico/composer.c
+*** alpine-2.10/pico/composer.c 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/composer.c 2013-01-11 20:43:11.000000000 -0700
***************
-*** 1990,1996 ****
+*** 2015,2021 ****
tbufp = &strng[ods.p_len];
if(VALID_KEY(ch)){ /* char input */
@@ -205,7 +205,7 @@
* if we are allowing editing, insert the new char
* end up leaving tbufp pointing to newly
* inserted character in string, and offset to the
---- 1990,1996 ----
+--- 2015,2021 ----
tbufp = &strng[ods.p_len];
if(VALID_KEY(ch)){ /* char input */
@@ -214,8 +214,8 @@
* end up leaving tbufp pointing to newly
* inserted character in string, and offset to the
***************
-*** 2070,2075 ****
---- 2070,2082 ----
+*** 2095,2100 ****
+--- 2095,2107 ----
}
else { /* interpret ch as a
command */
switch (ch = normalize_cmd(ch, ckm, 2)) {
@@ -229,12 +229,12 @@
case (CTRL|KEY_LEFT): /* word skip left */
if(ods.p_ind > 0) /* Scoot one char left if possible */
ods.p_ind--;
-diff -rc alpine-2.00/pico/display.c alpine-2.00.WrtAcc/pico/display.c
-*** alpine-2.00/pico/display.c 2008-03-26 10:27:45.000000000 -0700
---- alpine-2.00.WrtAcc/pico/display.c 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/display.c alpine-2.10.WrtAcc/pico/display.c
+*** alpine-2.10/pico/display.c 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/display.c 2013-01-11 20:43:11.000000000 -0700
***************
-*** 1750,1755 ****
---- 1750,1760 ----
+*** 1751,1756 ****
+--- 1751,1761 ----
b = &buf[ucs4_strlen(buf)];
continue;
@@ -247,7 +247,7 @@
case KEY_RIGHT :
if(*b == '\0')
***************
-*** 1868,1874 ****
+*** 1869,1875 ****
#endif
default :
@@ -255,7 +255,7 @@
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
---- 1873,1879 ----
+--- 1874,1880 ----
#endif
default :
@@ -263,9 +263,9 @@
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
-diff -rc alpine-2.00/pico/ebind.h alpine-2.00.WrtAcc/pico/ebind.h
-*** alpine-2.00/pico/ebind.h 2007-11-06 15:51:13.000000000 -0800
---- alpine-2.00.WrtAcc/pico/ebind.h 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/ebind.h alpine-2.10.WrtAcc/pico/ebind.h
+*** alpine-2.10/pico/ebind.h 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/ebind.h 2013-01-11 20:43:11.000000000 -0700
***************
*** 61,67 ****
#ifdef MOUSE
@@ -319,12 +319,12 @@
#endif
#endif
{CTRL|'A', gotobol},
-diff -rc alpine-2.00/pico/efunc.h alpine-2.00.WrtAcc/pico/efunc.h
-*** alpine-2.00/pico/efunc.h 2007-11-06 15:51:13.000000000 -0800
---- alpine-2.00.WrtAcc/pico/efunc.h 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/efunc.h alpine-2.10.WrtAcc/pico/efunc.h
+*** alpine-2.10/pico/efunc.h 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/efunc.h 2013-01-11 20:43:11.000000000 -0700
***************
-*** 53,58 ****
---- 53,61 ----
+*** 54,59 ****
+--- 54,62 ----
extern int backline(int, int);
extern int gotobop(int, int);
extern int gotoeop(int, int);
@@ -334,12 +334,12 @@
extern int forwpage(int, int);
extern int backpage(int, int);
extern int scrollupline(int, int);
-diff -rc alpine-2.00/pico/main.c alpine-2.00.WrtAcc/pico/main.c
-*** alpine-2.00/pico/main.c 2008-04-02 15:09:20.000000000 -0700
---- alpine-2.00.WrtAcc/pico/main.c 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/main.c alpine-2.10.WrtAcc/pico/main.c
+*** alpine-2.10/pico/main.c 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/main.c 2013-01-11 20:43:11.000000000 -0700
***************
-*** 415,420 ****
---- 415,426 ----
+*** 416,421 ****
+--- 416,427 ----
emlwrite(_("You may possibly have new mail."), NULL);
}
@@ -352,11 +352,11 @@
if(km_popped)
switch(c){
case NODATA:
-diff -rc alpine-2.00/pico/search.c alpine-2.00.WrtAcc/pico/search.c
-*** alpine-2.00/pico/search.c 2008-01-04 14:49:15.000000000 -0800
---- alpine-2.00.WrtAcc/pico/search.c 2008-08-26 20:56:33.000000000 -0700
+diff -rc alpine-2.10/pico/search.c alpine-2.10.WrtAcc/pico/search.c
+*** alpine-2.10/pico/search.c 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.WrtAcc/pico/search.c 2013-01-11 20:43:11.000000000 -0700
***************
-*** 273,279 ****
+*** 274,280 ****
}
if(status + curwp->w_doto >= llength(curwp->w_dotp) ||
@@ -364,7 +364,7 @@
break; /* do nothing! */
status++;
}
---- 273,279 ----
+--- 274,280 ----
}
if(status + curwp->w_doto >= llength(curwp->w_dotp) ||
@@ -373,7 +373,7 @@
status++;
}
***************
-*** 924,930 ****
+*** 927,933 ****
c = lgetc(curline, curoff++).c; /* get the char */
/* test it against first char in pattern */
@@ -381,7 +381,7 @@
/* setup match pointers */
matchline = curline;
matchoff = curoff;
---- 924,930 ----
+--- 927,933 ----
c = lgetc(curline, curoff++).c; /* get the char */
/* test it against first char in pattern */
@@ -390,7 +390,7 @@
matchline = curline;
matchoff = curoff;
***************
-*** 945,951 ****
+*** 948,954 ****
return(FALSE);
/* and test it against the pattern */
@@ -398,7 +398,7 @@
goto fail;
}
---- 945,951 ----
+--- 948,954 ----
return(FALSE);
/* and test it against the pattern */
++++++ chappa-colortext.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,9 +1,9 @@
-diff -rc alpine-2.00/alpine/confscroll.c
alpine-2.00.colortext/alpine/confscroll.c
-*** alpine-2.00/alpine/confscroll.c 2008-08-21 15:14:45.000000000 -0700
---- alpine-2.00.colortext/alpine/confscroll.c 2008-08-26 20:56:51.000000000
-0700
+diff -rc alpine-2.10/alpine/confscroll.c
alpine-2.10.colortext/alpine/confscroll.c
+*** alpine-2.10/alpine/confscroll.c 2013-01-11 15:21:34.000000000 -0700
+--- alpine-2.10.colortext/alpine/confscroll.c 2013-01-11 20:43:16.000000000
-0700
***************
-*** 5176,5181 ****
---- 5176,5184 ----
+*** 5180,5185 ****
+--- 5180,5188 ----
clear_index_cache(ps->mail_stream, 0);
}
@@ -13,12 +13,12 @@
else if(var == &ps->vars[V_INIT_CMD_LIST]){
if(!revert)
q_status_message(SM_ASYNC, 0, 3,
-diff -rc alpine-2.00/pith/conf.c alpine-2.00.colortext/pith/conf.c
-*** alpine-2.00/pith/conf.c 2008-08-22 17:07:05.000000000 -0700
---- alpine-2.00.colortext/pith/conf.c 2008-08-26 20:56:51.000000000 -0700
+diff -rc alpine-2.10/pith/conf.c alpine-2.10.colortext/pith/conf.c
+*** alpine-2.10/pith/conf.c 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.colortext/pith/conf.c 2013-01-11 20:43:16.000000000 -0700
***************
-*** 225,230 ****
---- 225,232 ----
+*** 226,231 ****
+--- 226,233 ----
CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the
screen where the composer should wrap.";
@@ -28,8 +28,8 @@
CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to
replace quotes with when viewing a message.";
***************
-*** 557,562 ****
---- 559,566 ----
+*** 558,563 ****
+--- 560,567 ----
NULL, cf_text_speller},
{"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
NULL, cf_text_fillcol},
@@ -39,8 +39,8 @@
NULL, cf_text_replystr},
{"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
***************
-*** 808,813 ****
---- 812,819 ----
+*** 809,814 ****
+--- 813,820 ----
{"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
{"signature-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1,
0},
{"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1,
0},
@@ -50,8 +50,8 @@
{"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
{"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
***************
-*** 1943,1948 ****
---- 1949,1956 ----
+*** 1972,1977 ****
+--- 1978,1985 ----
set_current_val(&vars[V_FORM_FOLDER], TRUE, TRUE);
set_current_val(&vars[V_EDITOR], TRUE, TRUE);
set_current_val(&vars[V_SPELLER], TRUE, TRUE);
@@ -61,8 +61,8 @@
set_current_val(&vars[V_BROWSER], TRUE, TRUE);
set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE);
***************
-*** 6379,6384 ****
---- 6387,6393 ----
+*** 6424,6429 ****
+--- 6432,6438 ----
set_color_val(&vars[V_IND_OP_FORE_COLOR], 0);
set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0);
set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0);
@@ -71,8 +71,8 @@
set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE);
set_current_val(&ps->vars[V_KW_COLORS], TRUE, TRUE);
***************
-*** 7554,7559 ****
---- 7563,7570 ----
+*** 7599,7604 ****
+--- 7608,7615 ----
return(h_config_scroll_margin);
case V_DEADLETS :
return(h_config_deadlets);
@@ -82,8 +82,8 @@
return(h_config_composer_wrap_column);
case V_TCPOPENTIMEO :
***************
-*** 7713,7718 ****
---- 7724,7732 ----
+*** 7758,7763 ****
+--- 7769,7777 ----
case V_SIGNATURE_FORE_COLOR :
case V_SIGNATURE_BACK_COLOR :
return(h_config_signature_color);
@@ -93,12 +93,12 @@
case V_PROMPT_FORE_COLOR :
case V_PROMPT_BACK_COLOR :
return(h_config_prompt_color);
-diff -rc alpine-2.00/pith/conf.h alpine-2.00.colortext/pith/conf.h
-*** alpine-2.00/pith/conf.h 2008-08-19 17:27:11.000000000 -0700
---- alpine-2.00.colortext/pith/conf.h 2008-08-26 20:56:51.000000000 -0700
+diff -rc alpine-2.10/pith/conf.h alpine-2.10.colortext/pith/conf.h
+*** alpine-2.10/pith/conf.h 2013-01-11 11:26:44.000000000 -0700
+--- alpine-2.10.colortext/pith/conf.h 2013-01-11 20:43:16.000000000 -0700
***************
-*** 160,165 ****
---- 160,167 ----
+*** 161,166 ****
+--- 161,168 ----
#define GLO_EDITOR vars[V_EDITOR].global_val.l
#define VAR_SPELLER vars[V_SPELLER].current_val.p
#define GLO_SPELLER vars[V_SPELLER].global_val.p
@@ -108,8 +108,8 @@
#define GLO_FILLCOL vars[V_FILLCOL].global_val.p
#define VAR_DEADLETS vars[V_DEADLETS].current_val.p
***************
-*** 443,448 ****
---- 445,452 ----
+*** 444,449 ****
+--- 446,453 ----
#define GLO_SIGNATURE_FORE_COLOR
vars[V_SIGNATURE_FORE_COLOR].global_val.p
#define VAR_SIGNATURE_BACK_COLOR
vars[V_SIGNATURE_BACK_COLOR].current_val.p
#define GLO_SIGNATURE_BACK_COLOR
vars[V_SIGNATURE_BACK_COLOR].global_val.p
@@ -118,12 +118,12 @@
#define VAR_PROMPT_FORE_COLOR
vars[V_PROMPT_FORE_COLOR].current_val.p
#define VAR_PROMPT_BACK_COLOR
vars[V_PROMPT_BACK_COLOR].current_val.p
#define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l
-diff -rc alpine-2.00/pith/conftype.h alpine-2.00.colortext/pith/conftype.h
-*** alpine-2.00/pith/conftype.h 2008-08-19 17:27:11.000000000 -0700
---- alpine-2.00.colortext/pith/conftype.h 2008-08-26 20:56:51.000000000
-0700
+diff -rc alpine-2.10/pith/conftype.h alpine-2.10.colortext/pith/conftype.h
+*** alpine-2.10/pith/conftype.h 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.colortext/pith/conftype.h 2013-01-11 20:43:16.000000000
-0700
***************
-*** 79,84 ****
---- 79,85 ----
+*** 80,85 ****
+--- 80,86 ----
, V_EDITOR
, V_SPELLER
, V_FILLCOL
@@ -132,8 +132,8 @@
, V_REPLY_INTRO
, V_QUOTE_REPLACE_STRING
***************
-*** 223,228 ****
---- 224,231 ----
+*** 224,229 ****
+--- 225,232 ----
, V_INCUNSEEN_BACK_COLOR
, V_SIGNATURE_FORE_COLOR
, V_SIGNATURE_BACK_COLOR
@@ -142,12 +142,12 @@
, V_PROMPT_FORE_COLOR
, V_PROMPT_BACK_COLOR
, V_HEADER_GENERAL_FORE_COLOR
-diff -rc alpine-2.00/pith/mailview.c alpine-2.00.colortext/pith/mailview.c
-*** alpine-2.00/pith/mailview.c 2008-07-11 16:20:32.000000000 -0700
---- alpine-2.00.colortext/pith/mailview.c 2008-08-26 20:56:51.000000000
-0700
+diff -rc alpine-2.10/pith/mailview.c alpine-2.10.colortext/pith/mailview.c
+*** alpine-2.10/pith/mailview.c 2013-01-11 17:43:09.000000000 -0700
+--- alpine-2.10.colortext/pith/mailview.c 2013-01-11 20:43:16.000000000
-0700
***************
-*** 281,286 ****
---- 281,294 ----
+*** 282,287 ****
+--- 282,295 ----
if((flgs & FM_DISPLAY)
&& !(flgs & FM_NOCOLOR)
&& pico_usingcolor()
@@ -163,14 +163,13 @@
&& ps_global->VAR_SIGNATURE_BACK_COLOR){
gf_link_filter(gf_line_test, gf_line_test_opt(color_signature,
&is_in_sig));
***************
-*** 2488,2493 ****
---- 2496,2716 ----
+*** 2503,2508 ****
+--- 2511,2700 ----
return(color_pair);
}
+ void
-+ interval_free(ival)
-+ IVAL_S **ival;
++ interval_free(IVAL_S **ival)
+ {
+ if (!(*ival))
+ return;
@@ -182,38 +181,23 @@
+ }
+
+ IVAL_S *
-+ compute_interval (string, endm)
-+ char *string;
-+ int endm;
++ compute_interval (char *string, int endm)
+ {
-+ IVAL_S *ival = NULL, *nextival= NULL, *d;
++ IVAL_S *ival = NULL;
+ regmatch_t pmatch;
+
-+ if(ps_global->paterror == 0)
-+ if (regexec(&ps_global->colorpat, string, 1, &pmatch, 0) == 0){
++ if(ps_global->paterror == 0 &&
++ regexec(&ps_global->colorpat, string + endm, 1, &pmatch, 0) == 0){
+ ival = (IVAL_S *) fs_get(sizeof(IVAL_S));
-+ memset (ival, 0, sizeof(IVAL_S));
+ ival->start = endm + pmatch.rm_so;
+ ival->end = endm + pmatch.rm_eo;
-+ nextival = compute_interval(string+pmatch.rm_so+1, ival->start+1);
-+ if (nextival){
-+ if (nextival->start <= ival->end){
-+ ival->end = nextival->end;
-+ d = nextival->next;
-+ nextival->next = NULL;
-+ ival->next = d;
-+ interval_free(&nextival);
-+ }
-+ else
-+ ival->next = nextival;
-+ }
-+ }
++ ival->next = compute_interval(string, ival->end);
++ }
+ return ival;
+ }
+
+ void
-+ regex_pattern(plist)
-+ char **plist;
++ regex_pattern(char **plist)
+ {
+ int i = 0, j = 0, len = 0;
+ char *pattern = NULL;
@@ -241,12 +225,8 @@
+ }
+
+ LT_INS_S **
-+ insert_color_special_text(ins, p, ival, last_end, col)
-+ LT_INS_S **ins;
-+ char **p;
-+ IVAL_S *ival;
-+ int last_end;
-+ COLOR_PAIR *col;
++ insert_color_special_text(LT_INS_S **ins, char **p, IVAL_S *ival, int
last_end,
++ COLOR_PAIR *col)
+ {
+ struct variable *vars = ps_global->vars;
+
@@ -263,9 +243,7 @@
+ }
+
+ int
-+ length_color(p, begin_color)
-+ char *p;
-+ int begin_color;
++ length_color(char *p, int begin_color)
+ {
+ int len = 0, done = begin_color ? 0 : -1;
+ char *orig = p;
@@ -293,8 +271,7 @@
+ }
+
+ int
-+ any_color_in_string(p)
-+ char *p;
++ any_color_in_string(char *p)
+ {
+ int rv = 0;
+ char *orig = p;
@@ -305,9 +282,7 @@
+ }
+
+ void
-+ remove_spaces_ival(ivalp, p)
-+ IVAL_S **ivalp;
-+ char *p;
++ remove_spaces_ival(IVAL_S **ivalp, char *p)
+ {
+ IVAL_S *ival;
+ int i;
@@ -326,22 +301,16 @@
+ }
+
+ int
-+ color_this_text(linenum, line, ins, local)
-+ long linenum;
-+ char *line;
-+ LT_INS_S **ins;
-+ void *local;
++ color_this_text(long linenum, char *line, LT_INS_S **ins, void *local)
+ {
+ struct variable *vars = ps_global->vars;
+ COLOR_PAIR *col = NULL;
+ char *p;
+ int i = 0;
+ static char *pattern = NULL;
-+ /* char *buf;
+
-+ select_quote(linenum, line, ins, (void *)code);
-+ for (i = 0; tmp_20k_buf[i] && (buf[i] = tmp_20k_buf[i]); i++);
-+ buf[i] = '\0'; */
++ /* select_quote(linenum, line, ins, (void *) &i);
++ for (i = 0; tmp_20k_buf[i] != '\0'; i++); */
+ p = line + i;
+
+ if(VAR_SPECIAL_TEXT_FORE_COLOR && VAR_SPECIAL_TEXT_BACK_COLOR
@@ -386,12 +355,12 @@
/*
* The argument fieldname is something like "Subject:..." or "Subject".
-diff -rc alpine-2.00/pith/mailview.h alpine-2.00.colortext/pith/mailview.h
-*** alpine-2.00/pith/mailview.h 2008-06-03 08:54:15.000000000 -0700
---- alpine-2.00.colortext/pith/mailview.h 2008-08-26 20:56:51.000000000
-0700
+diff -rc alpine-2.10/pith/mailview.h alpine-2.10.colortext/pith/mailview.h
+*** alpine-2.10/pith/mailview.h 2013-01-11 11:26:44.000000000 -0700
+--- alpine-2.10.colortext/pith/mailview.h 2013-01-11 20:43:16.000000000
-0700
***************
-*** 29,34 ****
---- 29,40 ----
+*** 30,35 ****
+--- 30,41 ----
#include "../pith/color.h"
@@ -405,8 +374,8 @@
#define FM_DISPLAY 0x0001 /* result is headed for display
*/
#define FM_NEW_MESS 0x0002 /* a new message so zero out
attachment descrip */
***************
-*** 125,130 ****
---- 131,145 ----
+*** 126,131 ****
+--- 132,146 ----
int url_hilite(long, char *, LT_INS_S **, void *);
int handle_start_color(char *, size_t, int *, int);
int handle_end_color(char *, size_t, int *);
@@ -422,12 +391,12 @@
/*
* BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to
webpine
-diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.colortext/pith/pine.hlp
-*** alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
---- alpine-2.00.colortext/pith/pine.hlp 2008-08-26 20:56:52.000000000
-0700
+diff -rc alpine-2.10/pith/pine.hlp alpine-2.10.colortext/pith/pine.hlp
+*** alpine-2.10/pith/pine.hlp 2013-01-11 20:33:27.000000000 -0700
+--- alpine-2.10.colortext/pith/pine.hlp 2013-01-11 20:43:16.000000000
-0700
***************
-*** 3402,3407 ****
---- 3402,3408 ----
+*** 3517,3522 ****
+--- 3517,3523 ----
<li><a href="h_config_print_cat">OPTION: <!--#echo
var="VAR_personal-print-category"--></a>
<li><a href="h_config_print_command">OPTION: <!--#echo
var="VAR_personal-print-command"--></a>
<li><a href="h_config_post_char_set">OPTION: <!--#echo
var="VAR_posting-character-set"--></a>
@@ -436,8 +405,8 @@
<li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a>
<li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a>
***************
-*** 3430,3435 ****
---- 3431,3437 ----
+*** 3545,3550 ****
+--- 3546,3552 ----
<li><a href="h_config_sending_filter">OPTION: <!--#echo
var="VAR_sending-filters"--></a>
<li><a href="h_config_sendmail_path">OPTION: <!--#echo
var="VAR_sendmail-path"--></a>
<li><a href="h_config_signature_color">OPTION: Signature Color</a>
@@ -446,8 +415,8 @@
<li><a href="h_config_smtp_server">OPTION: <!--#echo
var="VAR_smtp-server"--></a>
<li><a href="h_config_sort_key">OPTION: <!--#echo var="VAR_sort-key"--></a>
***************
-*** 22592,22597 ****
---- 22594,22636 ----
+*** 22792,22797 ****
+--- 22794,22836 ----
<End of help on this topic>
</BODY>
</HTML>
@@ -492,11 +461,17 @@
<HTML>
<HEAD>
***************
-*** 31197,31202 ****
---- 31236,31265 ----
- <End of help on this topic>
- </BODY>
- </HTML>
+*** 31396,31401 ****
+--- 31435,31464 ----
+ <P>
+ <A HREF="h_color_setup">Descriptions of the available commands</A>
+ <P>
++ Look <A HREF="h_edit_nav_cmds">here</A>
++ to see the available Editing and Navigation commands.
++ <P>
++ <End of help on this topic>
++ </BODY>
++ </HTML>
+ ====== h_config_special_text_color =====
+ <HTML>
+ <HEAD>
@@ -515,21 +490,15 @@
+ <P>
+ <A HREF="h_color_setup">Descriptions of the available commands</A>
+ <P>
-+ Look <A HREF="h_edit_nav_cmds">here</A>
-+ to see the available Editing and Navigation commands.
-+ <P>
-+ <End of help on this topic>
-+ </BODY>
-+ </HTML>
- ====== h_config_prompt_color =====
- <HTML>
- <HEAD>
-diff -rc alpine-2.00/pith/state.c alpine-2.00.colortext/pith/state.c
-*** alpine-2.00/pith/state.c 2008-06-03 15:31:05.000000000 -0700
---- alpine-2.00.colortext/pith/state.c 2008-08-26 20:56:52.000000000 -0700
+ Look <A HREF="h_edit_nav_cmds">here</A>
+ to see the available Editing and Navigation commands.
+ <P>
+diff -rc alpine-2.10/pith/state.c alpine-2.10.colortext/pith/state.c
+*** alpine-2.10/pith/state.c 2013-01-11 11:26:44.000000000 -0700
+--- alpine-2.10.colortext/pith/state.c 2013-01-11 20:43:16.000000000 -0700
***************
-*** 130,135 ****
---- 130,138 ----
+*** 131,136 ****
+--- 131,139 ----
if((*pps)->folders_dir != NULL)
fs_give((void **)&(*pps)->folders_dir);
@@ -539,12 +508,12 @@
if((*pps)->ui.homedir)
fs_give((void **)&(*pps)->ui.homedir);
-diff -rc alpine-2.00/pith/state.h alpine-2.00.colortext/pith/state.h
-*** alpine-2.00/pith/state.h 2008-06-03 08:54:15.000000000 -0700
---- alpine-2.00.colortext/pith/state.h 2008-08-26 20:56:52.000000000 -0700
+diff -rc alpine-2.10/pith/state.h alpine-2.10.colortext/pith/state.h
+*** alpine-2.10/pith/state.h 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.colortext/pith/state.h 2013-01-11 20:43:16.000000000 -0700
***************
-*** 317,322 ****
---- 317,324 ----
+*** 320,325 ****
+--- 320,327 ----
char *display_charmap; /* needs to be freed */
char *keyboard_charmap; /* needs to be freed */
void *input_cs;
@@ -553,12 +522,12 @@
char *posting_charmap; /* needs to be freed */
-diff -rc alpine-2.00/pith/text.c alpine-2.00.colortext/pith/text.c
-*** alpine-2.00/pith/text.c 2008-03-18 10:24:31.000000000 -0700
---- alpine-2.00.colortext/pith/text.c 2008-08-26 20:56:52.000000000 -0700
+diff -rc alpine-2.10/pith/text.c alpine-2.10.colortext/pith/text.c
+*** alpine-2.10/pith/text.c 2013-01-11 11:26:44.000000000 -0700
+--- alpine-2.10.colortext/pith/text.c 2013-01-11 20:43:16.000000000 -0700
***************
-*** 170,175 ****
---- 170,184 ----
+*** 171,176 ****
+--- 171,185 ----
gf_url_hilite_opt(&uh,handlesp,0));
}
++++++ chappa-fancy.patch ++++++
++++ 2407 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-fancy.patch.gz
++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-fancy.patch
++++++ chappa-ignoresize.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,9 +1,9 @@
-diff -rc alpine-2.00/alpine/mailcmd.c alpine-2.00.ignoresize/alpine/mailcmd.c
-*** alpine-2.00/alpine/mailcmd.c 2008-08-21 15:14:45.000000000 -0700
---- alpine-2.00.ignoresize/alpine/mailcmd.c 2008-08-26 20:57:34.000000000
-0700
+diff -rc alpine-2.10/alpine/mailcmd.c alpine-2.10.ignoresize/alpine/mailcmd.c
+*** alpine-2.10/alpine/mailcmd.c 2013-01-11 15:21:34.000000000 -0700
+--- alpine-2.10.ignoresize/alpine/mailcmd.c 2013-01-11 20:43:20.000000000
-0700
***************
-*** 3347,3352 ****
---- 3347,3355 ----
+*** 3349,3354 ****
+--- 3349,3357 ----
{-1, 0, NULL, NULL}
};
@@ -13,12 +13,12 @@
if(flags & SSCP_INIT || flags & SSCP_END){
if(flags & SSCP_END && possible_corruption)
q_status_message(SM_ORDER, 3, 3, "There is possible data corruption,
check the results");
-diff -rc alpine-2.00/pith/conf.c alpine-2.00.ignoresize/pith/conf.c
-*** alpine-2.00/pith/conf.c 2008-08-22 17:07:05.000000000 -0700
---- alpine-2.00.ignoresize/pith/conf.c 2008-08-26 20:57:34.000000000 -0700
+diff -rc alpine-2.10/pith/conf.c alpine-2.10.ignoresize/pith/conf.c
+*** alpine-2.10/pith/conf.c 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.ignoresize/pith/conf.c 2013-01-11 20:43:20.000000000 -0700
***************
-*** 3044,3049 ****
---- 3044,3051 ----
+*** 3082,3087 ****
+--- 3082,3089 ----
F_FULL_AUTO_EXPUNGE, h_config_full_auto_expunge, PREF_MISC, 0},
{"force-arrow-cursor", NULL,
F_FORCE_ARROW, h_config_force_arrow, PREF_MISC, 0},
@@ -27,12 +27,12 @@
{"maildrops-preserve-state", NULL,
F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state,
PREF_MISC, 0},
-diff -rc alpine-2.00/pith/conftype.h alpine-2.00.ignoresize/pith/conftype.h
-*** alpine-2.00/pith/conftype.h 2008-08-19 17:27:11.000000000 -0700
---- alpine-2.00.ignoresize/pith/conftype.h 2008-08-26 20:57:34.000000000
-0700
+diff -rc alpine-2.10/pith/conftype.h alpine-2.10.ignoresize/pith/conftype.h
+*** alpine-2.10/pith/conftype.h 2013-01-11 19:45:41.000000000 -0700
+--- alpine-2.10.ignoresize/pith/conftype.h 2013-01-11 20:43:20.000000000
-0700
***************
-*** 334,339 ****
---- 334,340 ----
+*** 335,340 ****
+--- 335,341 ----
F_FORCE_ARROW,
F_PRUNE_USES_ISO,
F_ALT_ED_NOW,
@@ -40,12 +40,12 @@
F_SHOW_DELAY_CUE,
F_CANCEL_CONFIRM,
F_AUTO_OPEN_NEXT_UNREAD,
-diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.ignoresize/pith/pine.hlp
-*** alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
---- alpine-2.00.ignoresize/pith/pine.hlp 2008-08-26 20:57:34.000000000
-0700
+diff -rc alpine-2.10/pith/pine.hlp alpine-2.10.ignoresize/pith/pine.hlp
+*** alpine-2.10/pith/pine.hlp 2013-01-11 20:33:27.000000000 -0700
+--- alpine-2.10.ignoresize/pith/pine.hlp 2013-01-11 20:43:20.000000000
-0700
***************
-*** 3136,3141 ****
---- 3136,3142 ----
+*** 3251,3256 ****
+--- 3251,3257 ----
<li><a href="h_config_full_auto_expunge">FEATURE: <!--#echo
var="FEAT_expunge-without-confirm-everywhere"--></a>
<li><a href="h_config_no_fcc_attach">FEATURE: <!--#echo
var="FEAT_fcc-without-attachments"--></a>
<li><a href="h_config_force_arrow">FEATURE: <!--#echo
var="FEAT_force-arrow-cursor"--></a>
@@ -54,11 +54,13 @@
<li><a href="h_config_quell_empty_dirs">FEATURE: <!--#echo
var="FEAT_quell-empty-directories"--></a>
<li><a href="h_config_hide_nntp_path">FEATURE: <!--#echo
var="FEAT_hide-nntp-path"--></a>
***************
-*** 30209,30214 ****
---- 30210,30249 ----
+*** 30437,30442 ****
+--- 30438,30477 ----
+
+ <P>
<End of help on this topic>
- </BODY>
- </HTML>
++ </BODY>
++ </HTML>
+ ====== h_config_ignore_size =====
+ <HTML>
+ <HEAD>
@@ -91,17 +93,15 @@
+
+ <P>
+ <End of help on this topic>
-+ </BODY>
-+ </HTML>
+ </BODY>
+ </HTML>
====== h_config_force_low_speed =====
- <HTML>
- <HEAD>
-diff -rc alpine-2.00/pith/save.c alpine-2.00.ignoresize/pith/save.c
-*** alpine-2.00/pith/save.c 2008-05-02 14:58:34.000000000 -0700
---- alpine-2.00.ignoresize/pith/save.c 2008-08-26 20:57:34.000000000 -0700
+diff -rc alpine-2.10/pith/save.c alpine-2.10.ignoresize/pith/save.c
+*** alpine-2.10/pith/save.c 2013-01-11 11:26:44.000000000 -0700
+--- alpine-2.10.ignoresize/pith/save.c 2013-01-11 20:43:20.000000000 -0700
***************
-*** 1136,1141 ****
---- 1136,1142 ----
+*** 1157,1162 ****
+--- 1157,1163 ----
snprintf(buf, sizeof(buf),
"Message to save shrank: source msg # %ld may be saved incorrectly",
mn_raw2m(pkg->msgmap, raw));
++++++ chappa-insertpat.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,9 +1,9 @@
-diff -rc alpine-2.00/pico/display.c alpine-2.00.insertpat/pico/display.c
-*** alpine-2.00/pico/display.c 2008-03-26 10:27:45.000000000 -0700
---- alpine-2.00.insertpat/pico/display.c 2008-08-26 20:56:48.000000000
-0700
+diff -rc alpine-2.10/pico/display.c alpine-2.10.insertpat/pico/display.c
+*** alpine-2.10/pico/display.c 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.insertpat/pico/display.c 2013-01-11 20:43:15.000000000
-0700
***************
-*** 1759,1764 ****
---- 1759,1776 ----
+*** 1760,1765 ****
+--- 1760,1777 ----
continue;
@@ -22,12 +22,12 @@
case (CTRL|'G') : /* CTRL-G help */
if(term.t_mrow == 0 && km_popped == 0){
movecursor(term.t_nrow-2, 0);
-diff -rc alpine-2.00/pico/search.c alpine-2.00.insertpat/pico/search.c
-*** alpine-2.00/pico/search.c 2008-01-04 14:49:15.000000000 -0800
---- alpine-2.00.insertpat/pico/search.c 2008-08-26 20:56:48.000000000
-0700
+diff -rc alpine-2.10/pico/search.c alpine-2.10.insertpat/pico/search.c
+*** alpine-2.10/pico/search.c 2013-01-11 11:25:29.000000000 -0700
+--- alpine-2.10.insertpat/pico/search.c 2013-01-11 20:43:15.000000000
-0700
***************
-*** 75,80 ****
---- 75,84 ----
+*** 76,81 ****
+--- 76,85 ----
N_("~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"),
N_(" search to be made with the default value."),
" ",
++++++ chappa-maildir.patch ++++++
++++ 2130 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/alpine/chappa-maildir.patch.gz
++++ and /work/SRC/openSUSE:Factory/.alpine.new/chappa-maildir.patch
++++++ chappa-unixnullbug.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,6 +1,6 @@
-diff -rc alpine-2.00/imap/src/c-client/mail.c
alpine-2.00.unixnullbug/imap/src/c-client/mail.c
-*** alpine-2.00/imap/src/c-client/mail.c 2008-06-04 11:39:54.000000000
-0700
---- alpine-2.00.unixnullbug/imap/src/c-client/mail.c 2009-06-06
12:41:49.000000000 -0700
+diff -rc alpine-2.10/imap/src/c-client/mail.c
alpine-2.10.unixnullbug/imap/src/c-client/mail.c
+*** alpine-2.10/imap/src/c-client/mail.c 2013-01-11 15:21:34.000000000
-0700
+--- alpine-2.10.unixnullbug/imap/src/c-client/mail.c 2013-01-11
20:45:05.000000000 -0700
***************
*** 3352,3364 ****
long flags)
++++++ chappa-unverified.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,8 +1,8 @@
-diff -rc alpine-2.00/alpine/reply.c alpine-2.00.unverified/alpine/reply.c
-*** alpine-2.00/alpine/reply.c 2008-06-03 08:54:15.000000000 -0700
---- alpine-2.00.unverified/alpine/reply.c 2008-08-26 20:57:03.000000000
-0700
+diff -rc alpine-2.10/alpine/reply.c alpine-2.10.unverified/alpine/reply.c
+*** alpine-2.10/alpine/reply.c 2013-01-11 11:19:33.000000000 -0700
+--- alpine-2.10.unverified/alpine/reply.c 2013-01-11 16:20:11.000000000
-0700
***************
-*** 1164,1172 ****
+*** 1165,1173 ****
}
else if(!outgoing->newsgroups)
outgoing->newsgroups = cpystr(env->newsgroups);
@@ -12,10 +12,10 @@
}
return(ret);
---- 1164,1169 ----
-diff -rc alpine-2.00/imap/src/c-client/imap4r1.c
alpine-2.00.unverified/imap/src/c-client/imap4r1.c
-*** alpine-2.00/imap/src/c-client/imap4r1.c 2008-06-04 11:39:54.000000000
-0700
---- alpine-2.00.unverified/imap/src/c-client/imap4r1.c 2008-08-26
20:57:03.000000000 -0700
+--- 1165,1170 ----
+diff -rc alpine-2.10/imap/src/c-client/imap4r1.c
alpine-2.10.unverified/imap/src/c-client/imap4r1.c
+*** alpine-2.10/imap/src/c-client/imap4r1.c 2011-01-09 21:00:20.000000000
-0700
+--- alpine-2.10.unverified/imap/src/c-client/imap4r1.c 2013-01-11
16:20:11.000000000 -0700
***************
*** 4527,4532 ****
--- 4527,4533 ----
@@ -36,9 +36,9 @@
(*env)->followup_to = oenv->followup_to;
oenv->followup_to = NIL;
(*env)->references = oenv->references;
-diff -rc alpine-2.00/imap/src/c-client/mail.h
alpine-2.00.unverified/imap/src/c-client/mail.h
-*** alpine-2.00/imap/src/c-client/mail.h 2008-08-08 10:34:22.000000000
-0700
---- alpine-2.00.unverified/imap/src/c-client/mail.h 2008-08-26
20:57:03.000000000 -0700
+diff -rc alpine-2.10/imap/src/c-client/mail.h
alpine-2.10.unverified/imap/src/c-client/mail.h
+*** alpine-2.10/imap/src/c-client/mail.h 2013-01-11 15:21:34.000000000
-0700
+--- alpine-2.10.unverified/imap/src/c-client/mail.h 2013-01-11
16:20:11.000000000 -0700
***************
*** 685,690 ****
--- 685,691 ----
@@ -49,9 +49,9 @@
unsigned int incomplete : 1; /* envelope may be incomplete */
unsigned int imapenvonly : 1; /* envelope only has IMAP envelope */
char *remail; /* remail header if any */
-diff -rc alpine-2.00/imap/src/c-client/rfc822.c
alpine-2.00.unverified/imap/src/c-client/rfc822.c
-*** alpine-2.00/imap/src/c-client/rfc822.c 2008-06-04 11:46:10.000000000
-0700
---- alpine-2.00.unverified/imap/src/c-client/rfc822.c 2008-08-26
20:57:04.000000000 -0700
+diff -rc alpine-2.10/imap/src/c-client/rfc822.c
alpine-2.10.unverified/imap/src/c-client/rfc822.c
+*** alpine-2.10/imap/src/c-client/rfc822.c 2011-01-09 21:00:20.000000000
-0700
+--- alpine-2.10.unverified/imap/src/c-client/rfc822.c 2013-01-11
16:20:11.000000000 -0700
***************
*** 128,133 ****
--- 128,134 ----
@@ -74,11 +74,11 @@
case 'R': /* possible Reply-To: */
if (!strcmp (tmp+1,"EPLY-TO"))
rfc822_parse_adrlist (&env->reply_to,d,host);
-diff -rc alpine-2.00/pith/mailview.c alpine-2.00.unverified/pith/mailview.c
-*** alpine-2.00/pith/mailview.c 2008-07-11 16:20:32.000000000 -0700
---- alpine-2.00.unverified/pith/mailview.c 2008-08-26 20:57:04.000000000
-0700
+diff -rc alpine-2.10/pith/mailview.c alpine-2.10.unverified/pith/mailview.c
+*** alpine-2.10/pith/mailview.c 2013-01-11 11:26:43.000000000 -0700
+--- alpine-2.10.unverified/pith/mailview.c 2013-01-11 16:20:11.000000000
-0700
***************
-*** 2377,2384 ****
+*** 2379,2386 ****
format_addr_string(s, n, sect, "Return-Path: ", e->return_path,
flags, oacs, pc);
@@ -87,7 +87,7 @@
if((which & FE_FOLLOWUPTO) && e->followup_to)
format_newsgroup_string("Followup-To: ", e->followup_to, flags, pc);
---- 2377,2397 ----
+--- 2379,2399 ----
format_addr_string(s, n, sect, "Return-Path: ", e->return_path,
flags, oacs, pc);
++++++ pine-nonvoid-function.patch ++++++
--- /var/tmp/diff_new_pack.BHhYBM/_old 2013-05-27 09:31:33.000000000 +0200
+++ /var/tmp/diff_new_pack.BHhYBM/_new 2013-05-27 09:31:33.000000000 +0200
@@ -1,10 +1,16 @@
---- pith/filter.c
-+++ pith/filter.c
-@@ -6871,6 +6871,7 @@
-
- gf_error("Incompatible RSS version");
+---
+ pith/filter.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: alpine-2.10/pith/filter.c
+===================================================================
+--- alpine-2.10.orig/pith/filter.c
++++ alpine-2.10/pith/filter.c
+@@ -7710,6 +7710,7 @@ html_element_comment(FILTER_S *f, char *
+ }
+ }
}
+ return(1); /* Is this correct? */
}
- /*
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
