From 6486d2b43ee2ce595a4b292cd2620f56d7c20757 Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sun, 1 Nov 2020 01:44:36 -0600
Subject:    * When forwarding a message, replacing an attachment might make
 Alpine      re-attach the original attachment. Reported by Michael Traxler.
 The      solution was that as soon as we recognize that the attachment has   
   changed we delete its id, since Alpine recognizes an old attachment      by
 the existence of an id field in the attachment structure.

---
 doc/tech-notes/tech-notes.txt | 102 ++++++++++++++++++++++++++++++++++++++++++
 pico/attach.c                 |   2 +
 pith/pine.hlp                 |  12 ++++-
 3 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index f9702f52..9f4ff4d1 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,4 +1,106 @@
 
+                             Alpine Technical Notes
+
+   Version 2.24, October 2020
+
+Table of Contents
+
+  Introduction
+
+     * Design Goals
+     * Alpine Components
+
+  Background Details
+
+     * Domain Names
+     * RFC 2822 Compliance
+     * SMTP and Sendmail
+     * Internet Message Access Protocol (IMAP)
+     * Multipurpose Internet Mail Extensions (MIME)
+     * Folder Collections
+
+  Building and Installation
+
+     * Compile-time Options
+     * Including LDAP Functionality
+     * Including Kerberos 5 Functionality
+     * Other Alpine Compile-time Options
+     * IMAPd Compile-time Options
+     * Building the Alpine Programs
+     * Installing Alpine and Pico on UNIX Platforms
+     * Installing PC-Alpine
+     * Installing IMAPd
+     * Support Files and Environment Variables: UNIX Alpine
+     * Support Files, Environment Variables, and Registry Values:
+       PC-Alpine
+
+  Command Line Arguments
+
+     * Alpine
+     * Pico
+     * Pilot
+
+  Configuration and Preferences
+
+     * Alpine Configuration
+     * General Configuration Variables
+     * Configuration Features
+     * Hidden Config Variables and Features
+     * Retired Variables
+     * Tokens for Index and Replying
+     * Conditional Inclusion of Text for Reply-Leadin, Signatures, and
+       Templates
+     * Per Server Directory Configuration
+     * Color Configuration
+     * Index Line Color Configuration
+     * Role Configuration
+     * Filtering Configuration
+     * Scoring Configuration
+     * Other Rules Configuration
+     * Search Rules Configuration
+     * Patterns
+     * Configuring News
+       Configuration Notes
+          + Alpine in Function Key Mode
+          + Domain Settings
+          + Syntax for Collections
+          + Syntax for Folder Names
+          + Server Name Syntax
+          + Folder Namespaces
+          + What is a Mail Drop?
+          + Sorting a Folder
+          + Alternate Editor
+          + Signatures and Signature Placement
+          + Feature List Variable
+          + Configuration Inheritance
+          + Using Environment Variables
+          + SMTP Servers
+          + MIME.Types file
+          + Color Details
+          + S/MIME Overview
+          + Additional Notes on PC-Alpine
+
+  Behind the Scenes
+
+     * Address Books
+     * Remote Configuration
+     * Checkpointing
+     * Debug Files
+     * INBOX and Special Folders
+     * Internal Help Files
+     * International Character Sets
+     * Interrupted and Postponed Messages
+     * Message Status
+     * MIME: Reading a Message
+     * MIME: Sending a Message
+     * New Mail Notification
+     * NFS
+     * Printers and Printing
+     * Save and Export
+     * Sent Mail
+     * Spell Checker
+     * Terminal Emulation and Key Mapping
+
                                   Introduction
 
 Design Goals
diff --git a/pico/attach.c b/pico/attach.c
index d05a1d3e..302947a6 100644
--- a/pico/attach.c
+++ b/pico/attach.c
@@ -544,6 +544,8 @@ SyncAttach(void)
 
 		    strncpy(tp->filename, file, j);
 		    tp->filename[j] = '\0';
+
+		    if(tp->id) fs_give((void **) &tp->id);
 		}
 		else if(tp->size && strcmp(tp->size, size)){
 		    rv = 1;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 56f77bcd..054ba3e2 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 512 2020-10-18 17:44:58
+Alpine Commit 513 2020-11-01 01:40:24
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -183,6 +183,16 @@ it for you. Please take some time to read it and understand it.
 Since the Privacy Policy could be ammended to take into consideration
 new additions to Alpine, please check it periodically.
 
+<P> These changes were made after the release of version 2.24.
+
+<P>
+Bugs addressed:
+
+<UL>
+<LI> When forwarding a message, replacing an attachment might make Alpine
+     re-attach the original attachment. Reported by Michael Traxler.
+</UL>
+
 <P> Version 2.24 adds new features and addresses bugs found in previous
 releases.
 
-- 
cgit v1.2.3-54-g00ecf