<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/124ea1e8ab868e87e90e56eab2c64e6013ca25af">https://github.com/macports/macports-ports/commit/124ea1e8ab868e87e90e56eab2c64e6013ca25af</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 124ea1e8ab8 alpine: update to 2.24 (2020-10-10)
</span>124ea1e8ab8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 124ea1e8ab868e87e90e56eab2c64e6013ca25af
</span>Author: Mark Mentovai <mark@chromium.org>
AuthorDate: Fri May 21 10:10:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> alpine: update to 2.24 (2020-10-10)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This also backports an upstream fix, b3c7debd83ba (2021-03-30), to allow
</span><span style='display:block; white-space:pre;color:#404040;'> building on macOS 11. That fix has not yet made it into any upstream
</span><span style='display:block; white-space:pre;color:#404040;'> release.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The existing MacPorts patch files are removed, as they have not been
</span><span style='display:block; white-space:pre;color:#404040;'> used since 4868537e25c5 (2015-02-23).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61590
</span>---
mail/alpine/Portfile | 10 +-
mail/alpine/files/alpine-2.00_panic_rename.patch | 658 -----------------------
mail/alpine/files/alpine-osx-10.6.patch | 17 -
mail/alpine/files/patch-Makefile.in.diff | 19 -
mail/alpine/files/patch-configure.diff | 11 -
mail/alpine/files/patch-imap_Makefile.diff | 17 -
mail/alpine/files/patch-imap_time.diff | 33 ++
7 files changed, 39 insertions(+), 726 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/Portfile b/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33730e08f5b..474909a63f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name alpine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.24
</span> revision 0
categories mail
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,11 @@ long_description Alpine is a tool for reading, sending, and \
</span>
master_sites http://alpine.x10host.com/alpine/release/src
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e26cb9da9484b0d95daf0375553053b9210aaa2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 793a61215c005b5fcffb48f642f125915276b7ec7827508dd9e83d4c4da91f7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6330784
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1612ff9edfdd66a0ef145f338fa9db26177360e0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 651a9ffa0a29e2b646a0a6e0d5a2c8c50f27a07a26a61640b7c783d06d0abcef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7341676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-imap_time.diff
</span>
depends_lib port:gettext \
port:libiconv \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/alpine-2.00_panic_rename.patch b/mail/alpine/files/alpine-2.00_panic_rename.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c51a2f10dba..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/alpine-2.00_panic_rename.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,658 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/adrbkcmd.c alpine-2.00/alpine/adrbkcmd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/adrbkcmd.c 2014-09-30 23:25:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/adrbkcmd.c 2014-09-21 02:41:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,7 +527,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected command in process_abook_view_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected command in process_abook_view_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2634,7 +2634,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!ps->prc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL prc in convert_to_remote_config");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL prc in convert_to_remote_config");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dprint((2, "convert_to_remote_config\n"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5011,7 +5011,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("can't happen in write_single_vcard_entry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("can't happen in write_single_vcard_entry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(; ll && *ll; ll++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5144,7 +5144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("can't happen in write_single_tab_entry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("can't happen in write_single_tab_entry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7366,7 +7366,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected command in process_ldap_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected command in process_ldap_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/alpine.c alpine-2.00/alpine/alpine.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/alpine.c 2014-09-30 23:25:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/alpine.c 2014-09-21 02:41:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2321,7 +2321,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected command in choose_setup_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected command in choose_setup_cmd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3317,7 +3317,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is also called from imap routines and fs_get and fs_resize.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ----*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--panic(char *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+uw_panic(char *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char buf[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/confscroll.c alpine-2.00/alpine/confscroll.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/confscroll.c 2014-09-30 23:25:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/confscroll.c 2014-09-21 02:41:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5236,7 +5236,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(reset_character_set_stuff(&err) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(err ? err : "trouble with Character-Set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(err ? err : "trouble with Character-Set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(err){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- q_status_message(SM_ORDER | SM_DING, 3, 5, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs_give((void **) &err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5252,7 +5252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(reset_character_set_stuff(&err) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(err ? err : "trouble with Character-Set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(err ? err : "trouble with Character-Set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(err){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- q_status_message(SM_ORDER | SM_DING, 3, 5, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs_give((void **) &err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/folder.c alpine-2.00/alpine/folder.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/folder.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/folder.c 2014-09-21 02:41:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1014,7 +1014,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strncat(servpart, "#news.", sizeof(servpart)-1-strlen(servpart));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected invalid server");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected invalid server");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- servpart[0] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/help.c alpine-2.00/alpine/help.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/help.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/help.c 2014-09-21 02:41:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(rv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -878,7 +878,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected command in journal_processor");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected command in journal_processor");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/mailcmd.c alpine-2.00/alpine/mailcmd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/mailcmd.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/mailcmd.c 2014-09-21 02:41:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1464,7 +1464,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*--------- Default, unknown command ----------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected command case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected command case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2657,7 +2657,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ESCKEY_S ekey[10];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!cntxt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("no context ptr in save_prompt");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("no context ptr in save_prompt");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_hist(&history, HISTSIZE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3040,7 +3040,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5665,7 +5665,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/mailview.c alpine-2.00/alpine/mailview.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/mailview.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/mailview.c 2014-09-21 02:41:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -982,7 +982,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected HANDLE type");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected HANDLE type");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1085,7 +1085,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(l == start_line)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Internal Error: no handle found");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Internal Error: no handle found");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start_line = l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/radio.c alpine-2.00/alpine/radio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/radio.c 2014-09-30 23:25:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/radio.c 2014-09-21 02:41:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,7 +279,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(flags & RB_RET_HELP){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(help_text != NO_HELP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("RET_HELP and help in radio_buttons!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("RET_HELP and help in radio_buttons!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- button_list[b].ch = '?';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- button_list[b].rval = 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -359,7 +359,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clrbitmap(bitmap);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memset(fkey_table, NO_OP_COMMAND, 12 * sizeof(int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(flags & RB_RET_HELP && help_text != NO_HELP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("RET_HELP and help in radio_buttons!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("RET_HELP and help in radio_buttons!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* if shown, always at position 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(help_text != NO_HELP || flags & RB_RET_HELP){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,7 +397,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && esc_list[i-start].label[0] != '\0'){ /* visible */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(i == 12){ /* special case where we put it in help slot */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(help_text != NO_HELP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programming botch in radio_buttons(): too many keys");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programming botch in radio_buttons(): too many keys");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(esc_list[i-start].ch != -2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setbitn(0, bitmap); /* the help slot */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,7 +419,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rb_keymenu.keys[0].label = esc_list[i-start].label;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Botch in radio_buttons(): too many keys");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Botch in radio_buttons(): too many keys");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -822,16 +822,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0; list1 && list1[i].ch != -1; i++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(list1[i].rval == list[j].rval)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("1bad rval in d_r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("1bad rval in d_r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(F_OFF(F_USE_FK,ps_global) && list1[i].ch == list[j].ch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("1bad ch in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("1bad ch in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0; list2 && list2[i].ch != -1; i++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(list2[i].rval == list[j].rval)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("2bad rval in d_r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("2bad rval in d_r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(F_OFF(F_USE_FK,ps_global) && list2[i].ch == list[j].ch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("2bad ch in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("2bad ch in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- j++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -839,7 +839,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* the visible set */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0; list1 && list1[i].ch != -1; i++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(i >= KEYS_PER_LIST && list1[i].label[0] != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("too many visible keys in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("too many visible keys in ccl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list[j++] = list1[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/roleconf.c alpine-2.00/alpine/roleconf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/roleconf.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/roleconf.c 2014-09-21 02:41:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5929,7 +5929,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char ***alval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!(v && name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("setup_dummy_pattern_var");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("setup_dummy_pattern_var");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v->name = (char *) fs_get(strlen(name)+NOTLEN+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(v->name, strlen(name)+NOTLEN+1, "%s%s", (defpat && defpat->not) ? NOT : "", name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/alpine/signal.c alpine-2.00/alpine/signal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/alpine/signal.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/alpine/signal.c 2014-09-21 02:41:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +174,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Handle signals caused by aborts -- SIGSEGV, SIGILL, etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Call panic which cleans up tty modes and then core dumps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Call uw_panic which cleans up tty modes and then core dumps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ----------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static RETSIGTYPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auger_in_signal(int sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,9 +187,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(buf, sizeof(buf), "Received abort signal(sig=%d)", sig);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf[sizeof(buf)-1] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(buf); /* clean up and get out */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(buf); /* clean up and get out */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(-1); /* in case panic doesn't kill us */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(-1); /* in case uw_panic doesn't kill us */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/adrbklib.c alpine-2.00/pith/adrbklib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/adrbklib.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/adrbklib.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4326,7 +4326,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nn = (adrbk_cntr_t)n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!exp_head)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("exp_head not set in exp_set_expanded");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("exp_head not set in exp_set_expanded");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(e = exp_head; e->next; e = e->next)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(e->next->ent >= nn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4358,7 +4358,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nn = (adrbk_cntr_t)n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!exp_head)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("exp_head not set in exp_unset_expanded");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("exp_head not set in exp_unset_expanded");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(e = exp_head; e->next; e = e->next)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(e->next->ent >= nn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4390,7 +4390,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nn = (adrbk_cntr_t)n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!exp_head)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("exp_head not set in exp_del_nth");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("exp_head not set in exp_del_nth");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e = exp_head->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while(e && e->ent < nn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4430,7 +4430,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nn = (adrbk_cntr_t)n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!exp_head)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("exp_head not set in exp_add_nth");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("exp_head not set in exp_add_nth");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e = exp_head->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while(e && e->ent < nn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/charset.c alpine-2.00/pith/charset.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/charset.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/charset.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -428,7 +428,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(utf8_charset(cset)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!utf8_text(&src, cset, &xsrc, 0L)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* should not happen */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("c-client failed to transliterate recognized characterset");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("c-client failed to transliterate recognized characterset");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -455,7 +455,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!(cs->type == CT_ASCII || cs->type == CT_UTF8)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!utf8_text_cs(&src, cs, &xsrc, 0L, 0L)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* should not happen */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("c-client failed to transliterate recognized characterset");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("c-client failed to transliterate recognized characterset");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -465,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && utf8_charset(cset)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!utf8_text(&src, cset, &xsrc, 0L)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* should not happen */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("c-client failed to transliterate recognized character set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("c-client failed to transliterate recognized character set");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/conf.c alpine-2.00/pith/conf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/conf.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/conf.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1798,7 +1798,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(reset_character_set_stuff(&err) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(err ? err : "trouble with character set setup");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(err ? err : "trouble with character set setup");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(err){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_error(ps, SM_ORDER | SM_DING, 3, 5, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs_give((void **) &err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2583,7 +2583,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 4: valptr = v->global_val.l; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 5: valptr = v->fixed_val.l; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 6: valptr = v->cmdline_val.l; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default: panic("bad case in convert_configvar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ default: uw_panic("bad case in convert_configvar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(valptr){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2609,7 +2609,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 4: valptr = &v->global_val.p; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 5: valptr = &v->fixed_val.p; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 6: valptr = &v->cmdline_val.p; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default: panic("bad case in convert_configvar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ default: uw_panic("bad case in convert_configvar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(valptr && *valptr && (*valptr)[0]){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7435,7 +7435,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(buf1, sizeof(buf1), "%.*s", MAX(sizeof(buf1) - 1 - strlen(message), 0), arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(buf2, sizeof(buf2), message, buf1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(buf2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(buf2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/filter.c alpine-2.00/pith/filter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/filter.c 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/filter.c 2014-09-21 02:41:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,10 +363,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs_give((void **) &sp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch: Can't unstack store readc");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch: Can't unstack store readc");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch: NULL store clearing store readc");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch: NULL store clearing store readc");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -397,10 +397,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs_give((void **) &sp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch: Can't unstack store writec");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch: Can't unstack store writec");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch: NULL store clearing store writec");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch: NULL store clearing store writec");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/folder.c alpine-2.00/pith/folder.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/folder.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/folder.c 2014-09-21 02:41:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -586,7 +586,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * collection???
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!prime)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(_("No folder collections defined"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(_("No folder collections defined"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * At this point, insert the INBOX mapping as the leading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/imap.c alpine-2.00/pith/imap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/imap.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/imap.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,7 +642,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mm_fatal(char *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(message);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(message);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/ldap.c alpine-2.00/pith/ldap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/ldap.c 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/ldap.c 2014-09-21 02:41:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1700,7 +1700,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("LDAP function not implemented");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("LDAP function not implemented");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/mailcap.c alpine-2.00/pith/mailcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/mailcap.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/mailcap.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch in mc_process_file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch in mc_process_file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*NOTREACHED*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/mailcmd.c alpine-2.00/pith/mailcmd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/mailcmd.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/mailcmd.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1228,7 +1228,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unexpected incoming startup case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unexpected incoming startup case");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/mailindx.c alpine-2.00/pith/mailindx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/mailindx.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/mailindx.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1179,7 +1179,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled fixed case in setup_index_header");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled fixed case in setup_index_header");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3279,7 +3279,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IELEM_S *ielem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!buf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL buf in simple_index_line()");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL buf in simple_index_line()");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(buflen > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf[0] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5052,7 +5052,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled case in prio_str");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled case in prio_str");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/mimetype.c alpine-2.00/pith/mimetype.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/mimetype.c 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/mimetype.c 2014-09-21 02:41:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +175,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Unhandled mime type search");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Unhandled mime type search");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/pattern.c alpine-2.00/pith/pattern.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/pattern.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/pattern.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1294,9 +1294,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!patgrp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL patgrp to parse_patgrp_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL patgrp to parse_patgrp_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(!(str && *str)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL or empty string to parse_patgrp_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL or empty string to parse_patgrp_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patgrp->bogus = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(!strncmp(str, "/NICK=", 6))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1515,9 +1515,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NAMEVAL_S *v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!action)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL action to parse_action_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL action to parse_action_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(!(str && *str))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("NULL or empty string to parse_action_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("NULL or empty string to parse_action_slash");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(!strncmp(str, "/ROLE=1", 7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- action->is_a_role = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(!strncmp(str, "/OTHER=1", 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/save.c alpine-2.00/pith/save.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/save.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/save.c 2014-09-21 02:41:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +239,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(botch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(botch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/send.c alpine-2.00/pith/send.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/send.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/send.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -428,7 +428,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fields[++i] = "X-Our-ReplyTo"; /* ReplyTo is real */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fields[++i] = "Lcc"; /* Lcc: too... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(++i != FIELD_COUNT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Fix FIELD_COUNT");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Fix FIELD_COUNT");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(pf = *custom; pf && pf->name; pf = pf->next)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!pf->standard)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3087,7 +3087,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return((char *)s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(dlen < SIZEOF_20KBUF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("bad call to encode_header_value");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("bad call to encode_header_value");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!encode_all){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/sort.c alpine-2.00/pith/sort.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/sort.c 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/sort.c 2014-09-21 02:41:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -487,7 +487,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dprint((2, "sort_sort_callback\n"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(mn_get_total(g_sort.msgmap) < nmsgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Message count shrank after sort!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Message count shrank after sort!");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* copy ulongs to array of longs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i = nmsgs; i > 0; i--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/stream.c alpine-2.00/pith/stream.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/stream.c 2014-09-30 23:25:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/stream.c 2014-09-21 02:41:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1728,7 +1728,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * partial text.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!str_to_free)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("Programmer botch: partial fetch attempt w/o string pointer");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("Programmer botch: partial fetch attempt w/o string pointer");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *str_to_free = (char *) new_text.data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/string.c alpine-2.00/pith/string.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/string.c 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/string.c 2014-09-21 02:41:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2644,7 +2644,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *ans = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!quote_these_chars)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic("bad arg to add_escapes");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic("bad arg to add_escapes");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(src){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *q, *p, *qchar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/pith/util.h alpine-2.00/pith/util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/pith/util.h 2014-09-30 23:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/pith/util.h 2014-09-21 02:41:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* currently mandatory to implement stubs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* called when we detect a serious program error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void panic(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void uw_panic(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* called when testing to see if panic state is in effect */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int panicking(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN alpine-2.00-patched/web/src/alpined.d/signal.c alpine-2.00/web/src/alpined.d/signal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-patched/web/src/alpined.d/signal.c 2014-09-30 23:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/web/src/alpined.d/signal.c 2014-09-21 02:41:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,7 +117,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Handle signals caused by aborts -- SIGSEGV, SIGILL, etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Call panic which cleans up tty modes and then core dumps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Call uw_panic which cleans up tty modes and then core dumps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ----------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static RETSIGTYPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auger_in_signal(int sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,8 +128,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void) unlink(peSocketName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Abort: signal %d", sig);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- panic(tmp_20k_buf); /* clean up and get out */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(-1); /* in case panic doesn't kill us */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uw_panic(tmp_20k_buf); /* clean up and get out */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(-1); /* in case uw_panic doesn't kill us */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/alpine-osx-10.6.patch b/mail/alpine/files/alpine-osx-10.6.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddd8b3d81fb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/alpine-osx-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rc alpine-2.00/imap/src/osdep/unix/ckp_pam.c alpine-2.00-10.6/imap/src/osdep/unix/ckp_pam.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** alpine-2.00/imap/src/osdep/unix/ckp_pam.c 2008-06-04 19:18:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00-10.6/imap/src/osdep/unix/ckp_pam.c 2009-09-02 10:56:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 27,37 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #ifdef MAC_OSX_KLUDGE /* why can't Apple be compatible? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <pam/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct checkpw_cred {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *uname; /* user name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 27,33 ----
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-Makefile.in.diff b/mail/alpine/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00c29864f99..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.01/alpine/Makefile.in.orig 2010-06-25 23:57:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.01/alpine/Makefile.in 2010-06-25 23:58:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,14 +85,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- alpine_DEPENDENCIES = $(LDADD) $(am__DEPENDENCIES_1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_rpdump_OBJECTS = rpdump.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpdump_OBJECTS = $(am_rpdump_OBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rpdump_LDADD = $(LDADD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+rpdump_LDADD = $(LDADD) $(INTLLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpdump_DEPENDENCIES = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../pith/libpith.a ../pith/osdep/libpithosd.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../pith/charconv/libpithcc.a osdep/libpineosd.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../c-client/c-client.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_rpload_OBJECTS = rpload.$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpload_OBJECTS = $(am_rpload_OBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rpload_LDADD = $(LDADD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+rpload_LDADD = $(LDADD) $(INTLLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpload_DEPENDENCIES = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../pith/libpith.a ../pith/osdep/libpithosd.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../pith/charconv/libpithcc.a osdep/libpineosd.a \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-configure.diff b/mail/alpine/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d09ef271d09..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00/configure.orig 2010-07-16 16:29:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/configure 2010-07-16 16:29:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25435,7 +25435,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$ac_res" != no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="$LIBS -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="$LIBS -lssl -lcrypto"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-imap_Makefile.diff b/mail/alpine/files/patch-imap_Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 50a3c4a96ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/patch-imap_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alpine-2.00/imap/Makefile.orig 2008-06-05 04:43:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alpine-2.00/imap/Makefile 2012-06-18 05:05:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,12 +419,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PASSWDTYPE=pam \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SPECIALS="SSLINCLUDE=__PREFIX__/include/openssl SSLLIB=__PREFIX__/lib GSSINCLUDE=__PREFIX__/include GSSLIB=__PREFIX__/lib PAMDLFLAGS=-lpam"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osx: osxok an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TOUCH) ip6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(BUILD) BUILDTYPE=$@ IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SPECIALS="SSLINCLUDE=__PREFIX__/include/openssl SSLLIB=__PREFIX__/lib GSSINCLUDE=__PREFIX__/include GSSLIB=__PREFIX__/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osxok:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @$(SH) -c '(test ! -f /usr/include/pam/pam_appl.h ) || make osxwarn'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-imap_time.diff b/mail/alpine/files/patch-imap_time.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb73013ff06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/alpine/files/patch-imap_time.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b3c7debd83bacac7b076381f8ad4f731391004df Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Eduardo Chappa <chappa@washington.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 30 Mar 2021 09:35:20 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] * Added line "#include <time.h>" to file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ imap/src/osdep/unix/os_osx.h to fix a compilation error in mac, reported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by several people. The fix was tested successfuly by Steven Michaud in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the following systems: macOS 11.2.3 XCode 12.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macOS 10.15.7 XCode 11.1 macOS 10.14.6 XCode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.3 macOS 10.13.6 XCode 9.1 macOS 10.12.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCode 8.3.3 OS X 10.11.6 XCode 7.3.1 OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.10.5 XCode 6.1.1 OS X 10.9.5 XCode 6.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See https://trac.macports.org/ticket/61590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ imap/src/osdep/unix/os_osx.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git imap/src/osdep/unix/os_osx.h imap/src/osdep/unix/os_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6fcb014da959..558106e9907e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- imap/src/osdep/unix/os_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ imap/src/osdep/unix/os_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <utime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <syslog.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/file.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Mac OS X gets this wrong as of Leopard */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.31.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>