- 2.11 - not tested, yet. Builds

diff --git a/alpine.spec b/alpine.spec
index b4fb4a3b1403f6c6b7923e29230ce8cdcb5cb43d..b1bdc181b9eae9fd9c6c65903786616bce646a03 100644 (file)
--- a/alpine.spec
+++ b/alpine.spec
@@ -3,22 +3,19 @@
 # - separate package with tcl web-frontend
 # - fix as-needed
 # - pico shouldn't link with kerberos, should it?
-# - switch to http://re-alpine.sourceforge.net/ - RIP alpine
-%define                ver             2.00
-%define                patchlevel      84
 Summary:       University of Washington Alpine mail user agent
 Summary(pl.UTF-8):     Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie
 Name:          alpine
-Version:       %{ver}.%{patchlevel}
-Release:       10
+Version:       2.11
+Release:       0.1
 Epoch:         1
 License:       Apache v2.0
 Group:         Applications/Mail
 # Main site:
 #Source0:      ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.gz
-# Source with applied patches from http://staff.washington.edu/chappa/alpine/
-Source0:       http://staff.washington.edu/chappa/alpine/patches/alpine-%{ver}/%{name}-%{ver}_%{patchlevel}.tar.gz
-# Source0-md5: 70ba4281354f1ba2d341038ec0e323c7
+# Current source is from: http://patches.freeiz.com/alpine/
+Source0:       http://patches.freeiz.com/alpine/patches/%{name}-%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: d2d9ca3716b9a23e5fa41ddf5ad06b6b
 Source1:       pico.desktop
 Source2:       %{name}.desktop
 Source3:       %{name}.png
@@ -32,7 +29,6 @@ Patch6:               %{name}-no_1777_warning.patch
 Patch7:                %{name}-home_etc.patch
 Patch8:                %{name}-RFC1522_MAXW.patch
 Patch9:                mimedesc.patch
-Patch10:       re-alpine-2.01.smime-signandencrypt.patch
 Patch11:       format-security.patch
 URL:           http://www.washington.edu/alpine/
 BuildRequires: autoconf
@@ -125,7 +121,7 @@ como no Pine, comandos são apresentados na parte de baixo da tela, e
 ajuda de acordo com o contexto está disponível.
 
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -136,8 +132,6 @@ ajuda de acordo com o contexto está disponível.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 rm -f libtool missing

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644 (file)
index d4f73d4..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- alpine-2.00/pith/ldap.c~   2008-04-08 00:58:40.000000000 +0200
-+++ alpine-2.00/pith/ldap.c    2012-12-07 08:16:50.304560842 +0100
-@@ -778,7 +778,7 @@
-        */
-       switch(args){
-         case 0:
--          snprintf(filter, sizeof(filter), filt_format);
-+          snprintf(filter, sizeof(filter), "%s", filt_format);
-           break;
-         case 1:
-           snprintf(filter, sizeof(filter), filt_format, scp);
---- alpine-2.00/imap/src/osdep/unix/flocklnx.c~        2008-06-04 20:18:34.000000000 +0200
-+++ alpine-2.00/imap/src/osdep/unix/flocklnx.c 2012-12-07 08:13:57.761233591 +0100
-@@ -57,7 +57,7 @@
-     case ENOLCK:              /* lock table is full */
-       sprintf (tmp,"File locking failure: %s",strerror (errno));
-       mm_log (tmp,WARN);      /* give the user a warning of what happened */
--      if (!logged++) syslog (LOG_ERR,tmp);
-+      if (!logged++) syslog (LOG_ERR,"File locking failure: %s",strerror (errno));
-                               /* return failure if non-blocking lock */
-       if (op & LOCK_NB) return -1;
-       sleep (5);              /* slow down in case it loops */
---- alpine-2.00/alpine/mailcmd.c~      2011-02-08 05:34:16.000000000 +0100
-+++ alpine-2.00/alpine/mailcmd.c       2012-12-07 08:18:38.574557022 +0100
-@@ -7963,7 +7963,7 @@
- 
-             case 13 :                 /* Match my addresses */
-               me++;
--              snprintf(sstring, sizeof(sstring), not ? _(dont_match_me) : _(match_me));
-+              snprintf(sstring, sizeof(sstring), "%s", not ? _(dont_match_me) : _(match_me));
-               continue;
- 
-             case 14 :                 /* Subject: default */

diff --git a/re-alpine-2.01.smime-signandencrypt.patch b/re-alpine-2.01.smime-signandencrypt.patch
deleted file mode 100644 (file)
index 7e76b93..0000000
--- a/re-alpine-2.01.smime-signandencrypt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -rup re-alpine-2.01.orig/pith/smime.c re-alpine-2.01.smime-patch/pith/smime.c
---- re-alpine-2.01.orig/pith/smime.c   2009-08-03 04:02:24.000000000 -0400
-+++ re-alpine-2.01.smime-patch/pith/smime.c    2011-03-06 22:41:08.894139317 -0500
-@@ -1736,7 +1736,6 @@ do_decoding(BODY *b, long msgno, const c
-     PERSONAL_CERT     *pcert = NULL;
-     char    *what_we_did = "";
-     char     null[1];
--    char     newSec[100];
- 
-     dprint((9, "do_decoding(msgno=%ld type=%d subtype=%s section=%s)", msgno, b->type, b->subtype ? b->subtype : "NULL", (section && *section) ? section : (section != NULL) ? "Top" : "NULL"));
-     null[0] = '\0';
-@@ -1751,8 +1750,25 @@ do_decoding(BODY *b, long msgno, const c
-     }
-     else{
- 
--      snprintf(newSec, sizeof(newSec), "%s%s1", section ? section : "", (section && *section) ? "." : "");
--      p7 = get_pkcs7_from_part(msgno, newSec);
-+      /*
-+       * Fix for signed-then-encrypted messages.
-+       *
-+       * If we're on the Top part (section == ""), then we need to bump it to "1".
-+       * Otherwise, we already know we're in a pkcs7-mime subpart and called
-+       * from do_fiddle_smime_message at the top, and the MULTIPART handline
-+       * has already bumped the section per-part.
-+       *
-+       * This allows signed-then-encrypted emails to work.
-+       * It *may* break signed or encrypted parts that are buried down in
-+       * a multi-part message (untested). Those are, IMO, far less common,
-+       * and I'd rather the signed+encrypted work.
-+       *
-+       * This used to do:
-+       * snprintf(newSec, sizeof(newSec), "%s%s1", section ? section : "", (section && *section) ? "." : "");
-+       * and pass the newSec to get_pkcs7_from_part
-+       *
-+       */
-+      p7 = get_pkcs7_from_part(msgno, (section && *section) ? section : "1");
-       if(!p7){
-             q_status_message1(SM_ORDER, 2, 2, "Couldn't load PKCS7 object: %s",
-                            (char*) openssl_error_string());