Accepting request 1075153 from home:eeich

- Update to latest launchpad version.
  Delete obsolete patches:
  * U_rev-1313.patch
  * U_Require-vm-reply.el-from-vm-compose-mail.patch
  Add: vcard-Make-vcard-parser-more-robust-to-invalid-vcards.patch

OBS-URL: https://build.opensuse.org/request/show/1075153
OBS-URL: https://build.opensuse.org/package/show/editors/emacs-vm?expand=0&rev=22

U_Require-vm-reply.el-from-vm-compose-mail.patch

@@ -1,107 +0,0 @@
-From: Egbert Eich <eich@suse.de>
-Date: Thu Jan 21 14:47:45 2016 +0100
-Subject: Require vm-reply.el from vm-compose-mail.
-Patch-mainline: Upstream
-
-References: bsc#939497
-
-Also, cleaned up all redundant autoloads in vm-reply.el.
-
-Uday S Reddy
-https://launchpad.net/bugs/913005
-http://bazaar.launchpad.net/~vm/vm/trunk/revision/1331
-
-Signed-off-by: Egbert Eich <eich@suse.de>
-Signed-off-by: Egbert Eich <eich@suse.com>
----
- lisp/vm-reply.el | 9 ---------
- lisp/vm.el       | 1 +
- 2 files changed, 1 insertion(+), 9 deletions(-)
-diff --git a/lisp/vm-reply.el b/lisp/vm-reply.el
-index add837f..34b794d 100755
---- a/lisp/vm-reply.el
-+++ b/lisp/vm-reply.el
-@@ -114,7 +114,6 @@
-   (while (re-search-forward "^" (point-max) t)
-     (insert vm-included-text-prefix)))
- 
--;;;###autoload
- (defun vm-fill-long-lines-in-reply ()
-   (interactive)
-   (let ((vm-word-wrap-paragraphs vm-word-wrap-paragraphs-in-reply)
-@@ -295,7 +294,6 @@ messages of the folder are involved in this reply."
- 	    (setq re-list (cdr re-list))))
- 	result)))
- 
--;;;###autoload
- (defun vm-mail-yank-default (&optional message)
-   "The default message yank handler when `mail-citation-hook' is set to nil."
-   (save-excursion
-@@ -319,7 +317,6 @@ messages of the folder are involved in this reply."
- 	(insert vm-included-text-prefix)
- 	(forward-line 1)))))
- 
--;;;###autoload
- (defun vm-yank-message-other-folder (folder)
-   "Like vm-yank-message except the message is yanked from a folder other
- than the one that spawned the current Mail mode buffer.  The name of the
-@@ -366,7 +363,6 @@ Don't call this function from a program."
-       (vm-bury-buffer newbuf)
-       (vm-bury-buffer sumbuf))))
- 
--;;;###autoload
- (defun vm-yank-message (message)
-   "Yank message number N into the current buffer at point.
- When called interactively N is always read from the minibuffer.  When
-@@ -627,7 +623,6 @@ specified by `vm-included-text-headers' and
- 	       (setq alternatives (1- alternatives))
- 	       (setq parts (cdr parts))))))))
- 
--;;;###autoload
- (defun vm-mail-send-and-exit (&rest ignored)
-   "Send message and maybe delete the composition buffer.
- The value of `vm-keep-sent-mesages' determines whether the composition buffer
-@@ -803,7 +798,6 @@ This function is a variant of `vm-get-header-contents'."
- 
- (defvar coding-system-for-write)
- 
--;;;###autoload
- (defun vm-mail-send ()
-   "Just like mail-send except that VM flags the appropriate message(s)
- as replied to, forwarded, etc, if appropriate."
-@@ -888,7 +882,6 @@ as replied to, forwarded, etc, if appropriate."
-       (vm-keep-mail-buffer (current-buffer)))
-     (vm-display nil nil '(vm-mail-send) '(vm-mail-send))))
- 
--;;;###autoload
- (defun vm-do-fcc-before-mime-encode ()
-   "The name says it all.
- Sometimes you may want to save a message unencoded, specifically not to waste
-@@ -923,7 +916,6 @@ storage for attachments which are stored on disk anyway."
- 	      (vm-matched-header-contents)
- 	    nil ))))))
- 
--;;;###autoload
- (defun vm-mail-mode-remove-header (header-name-regexp)
-   (let (regexp)
-     (setq regexp (concat "^\\(" header-name-regexp "\\)\\|\\(^"
-@@ -1653,7 +1645,6 @@ there is a current message."
-     (vm-get-header-contents (car vm-message-pointer) "From:")))
- 
- 
--;;;###autoload
- (defun* vm-mail-internal (&key buffer-name to guessed-to subject 
- 			       in-reply-to cc references newsgroups)
-     "Create a message buffer and set it up according to args.
-diff --git a/lisp/vm.el b/lisp/vm.el
-index 9b1395f..650d60e 100755
---- a/lisp/vm.el
-+++ b/lisp/vm.el
-@@ -1207,6 +1207,7 @@ summary buffer to select a folder."
- 			send-actions return-action &rest ignored)
-   (interactive)
-   (vm-session-initialization)
-+  (require 'vm-reply)
-   (if continue
-       (vm-continue-composing-message)
-     (let ((buffer (vm-mail-internal

U_rev-1313.patch

@@ -1,102 +0,0 @@
-------------------------------------------------------------
-revno: 1313
-fixes bugs: https://launchpad.net/bugs/793541 https://launchpad.net/bugs/907286
-committer: Uday S Reddy <u.s.reddy@cs.bham.ac.uk>
-branch nick: trunk
-timestamp: Thu 2011-12-29 19:19:09 +0000
-message:
-  - Added a variable `vm-confirm-for-auto-archive' that controls the
-  confirmation dialogue for `vm-auto-archive-messages'.  (Bug 793541)
-  - Add autoload for `vm-select-recipient-from-sender'.  (Bug 907286)
-diff:
-=== modified file 'info/vm.texinfo'
---- info/vm.texinfo	2011-12-26 17:40:02 +0000
-+++ info/vm.texinfo	2011-12-29 19:19:09 +0000
-@@ -3487,10 +3487,15 @@
- does.  Messages saved this way are flagged ``written''.
- @findex vm-auto-archive-messages
- @kindex A
-+@vindex vm-confirm-for-auto-archive
- @item A (@code{vm-auto-archive-messages})
- Save all unfiled messages that auto-match a folder via
- @code{vm-auto-folder-alist} to their appropriate folders.  Messages that
--are flagged for deletion are not saved by this command.  If invoked with a
-+are flagged for deletion are not saved by this command.  This command asks
-+for confirmation before archiving because it is a wholesale operation that
-+cannot be easy reversed.  (Set @code{vm-confirm-for-auto-archive} to
-+@code{nil} to override the confirmation dialogue.)  If the command is
-+invoked with a 
- prefix argument, confirmation will be requested for each save.
- @findex vm-pipe-message-to-command
- @kindex ||
-
-=== modified file 'lisp/vm-reply.el'
---- lisp/vm-reply.el	2011-12-26 09:50:31 +0000
-+++ lisp/vm-reply.el	2011-12-29 19:19:09 +0000
-@@ -1643,6 +1643,7 @@
-   (add-hook 'vm-mail-send-hook 'vm-forget-composition-buffer nil t)
-   (vm-update-ml-composition-buffer-count))
- 
-+;;;###autoload
- (defun vm-select-recipient-from-sender ()
-   "Select a recipient's address from the current message's sender, if
- there is a current message."
-
-=== modified file 'lisp/vm-save.el'
---- lisp/vm-save.el	2011-12-26 15:46:17 +0000
-+++ lisp/vm-save.el	2011-12-29 19:19:09 +0000
-@@ -105,6 +105,10 @@
- `vm-auto-folder-alist' to their appropriate folders.  Messages that
- are flagged for deletion are not saved.
- 
-+This command asks for confirmation before proceeding.  Set
-+`vm-confirm-for-auto-archive' to nil to turn off the confirmation
-+dialogue. 
-+
- Prefix arg means to ask user for confirmation before saving each message.
- 
- When invoked on marked messages (via `vm-next-command-uses-marks'),
-
-=== modified file 'lisp/vm-vars.el'
---- lisp/vm-vars.el	2011-12-27 14:56:42 +0000
-+++ lisp/vm-vars.el	2011-12-29 19:19:09 +0000
-@@ -2983,7 +2983,7 @@
- sent is a resent message (i.e. has a Resent- recipient header)
- then the Resent-Date header will be removed/inserted instead.
- 
--This is useful if you set mail-archive-file-name,
-+This is useful if you set `mail-archive-file-name',
- because your archived message will contain a Date header.
- 
- A nil value means don't insert a Date header."
-@@ -2997,7 +2997,7 @@
- sent is a resent message (i.e. has a Resent- recipient header) a
- Resent-Message-ID header will be removed/inserted instead.
- 
--This is useful if you set mail-archive-file-name, because your
-+This is useful if you set `mail-archive-file-name', because your
- archived messages will contain a Message-ID header, which may be
- useful later for threading messages.
- 
-@@ -4606,7 +4606,7 @@
-   :type 'boolean)
- 
- (defcustom vm-delete-after-archiving nil
--  "*Non-nil value causes VM automatically to mark messages for deletion
-+  "*Non-nil value causes VM to automatically mark messages for deletion
- after successfully auto-archiving them with the `vm-auto-archive-messages'
- command."
-   :group 'vm-dispose
-@@ -4618,6 +4618,12 @@
-   :group 'vm-dispose
-   :type 'boolean)
- 
-+(defcustom vm-confirm-for-auto-archive t
-+  "*Non-nil value causes VM to ask for confirmation when
-+`vm-auto-archive-messages' is invoked."
-+  :group 'vm-dispose
-+  :type 'boolean)
-+
- (defcustom vm-circular-folders nil
-   "*Value determines whether VM folders will be considered circular by
- various commands.  `Circular' means VM will wrap from the end of the folder

emacs-vm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 29 05:10:07 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Update to latest launchpad version.
+  Delete obsolete patches:
+  * U_rev-1313.patch
+  * U_Require-vm-reply.el-from-vm-compose-mail.patch
+  Add: vcard-Make-vcard-parser-more-robust-to-invalid-vcards.patch
+
 -------------------------------------------------------------------
 Thu Dec  7 12:43:45 UTC 2017 - mpluskal@suse.com
 

emacs-vm.spec

@@ -17,17 +17,19 @@
 
 
 Name:           emacs-vm
-Version:        8.2.0b
+Version:        8.2.0b.1538
 Release:        0
 Summary:        VM - a mail reader for GNU Emacs
 License:        GPL-2.0+
 Group:          Productivity/Text/Editors
 Url:            http://www.nongnu.org/viewmail/
-Source:         https://launchpad.net/vm/8.2.x/%{version}/+download/vm-%{version}.tgz
+#Source:        https://launchpad.net/vm/8.2.x/%{version}/+download/vm-%{version}.tgz
+Source:         vm-%{version}.tgz
 Source2:        emacs-vm-autoload.el
 # PATCH-FIX-UPSTREAM U_rev-1313.patch bsc#939497 eich@suse.com -- Fix Launchpad lp#793541 and lp#907286
-Patch1:         U_rev-1313.patch
+Patch0:         vcard-Make-vcard-parser-more-robust-to-invalid-vcards.patch
-Patch2:         U_Require-vm-reply.el-from-vm-compose-mail.patch
+# For 'trunk':
+BuildRequires:  autoconf
 BuildRequires:  emacs-nox
 BuildRequires:  makeinfo
 Requires:       ed
@@ -51,9 +53,9 @@ various criteria.
 %define _vmdocdir %{_prefix}/share/doc/packages/%{name}
 
 %prep
-%setup -q -n vm-%{version}
+%setup -q -n ~vm/vm/trunk
-%patch1
+# For trunk
-%patch2 -p1
+%autopatch -p3
 
 %build
 export LC_CTYPE=ISO-8859-1
@@ -61,8 +63,10 @@ export EMACS_UNIBYTE=1
 EMACS="emacs --no-site"
 emacs_ver=$(rpm -q --qf '%%{VERSION}' emacs)
 rm -rf lisp/*.elc
+# For trunk
+autoconf
 %configure FLAGS="-batch -q -no-site-file -no-init-file -l \$(srcdir)/vm-build.el" --with-etcdir=%{_vmetcdir} --with-docdir=%{_vmdocdir}
-make %{?_smp_mflags} DESTDIR=%{buildroot} MAKEINFO="makeinfo --force"
+make %{?_smp_mflags} MAKEINFO="makeinfo --force"
 
 %install
 mkdir -p %{buildroot}

vcard-Make-vcard-parser-more-robust-to-invalid-vcards.patch

@@ -0,0 +1,55 @@
+From: Egbert Eich <eich@suse.com>
+Date: Wed Mar 29 06:54:49 2023 +0200
+Subject: vcard: Make vcard parser more robust to invalid vcards
+Patch-mainline: Not yet
+Git-commit: b072046a2098da9d81af39aa5fa29768dbdd46b8
+References: 
+
+Signed-off-by: Egbert Eich <eich@suse.com>
+Signed-off-by: Egbert Eich <eich@suse.de>
+---
+ vm/trunk/lisp/vcard.el | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+diff --git a/vm/trunk/lisp/vcard.el b/vm/trunk/lisp/vcard.el
+index fe58cf1..5084e60 100644
+--- a/vm/trunk/lisp/vcard.el
++++ b/vm/trunk/lisp/vcard.el
+@@ -235,22 +235,22 @@ Note: this function modifies the buffer!"
+           (delete-char 1))
+ 
+         (goto-char (point-min))
+-        (re-search-forward "^begin:[ \t]*vcard[ \t]*\n")
+-        (set-marker pos (point))
+-        (while (and (not (looking-at "^end[ \t]*:[ \t]*vcard[ \t]*$"))
+-                    (re-search-forward ":[ \t]*" nil t))
+-          (set-marker newpos (match-end 0))
+-          (setq properties
+-                (vcard-parse-region-properties pos (match-beginning 0)))
+-          (set-marker pos (marker-position newpos))
+-          (re-search-forward "[ \t]*\n")
+-          (set-marker newpos (match-end 0))
+-          (setq value
+-                (vcard-parse-region-value properties pos (match-beginning 0)))
+-          (set-marker pos (marker-position newpos))
+-          (goto-char pos)
+-          (funcall filter properties value)
+-          (setq vcard-data (cons (cons properties value) vcard-data)))))
++        (if (re-search-forward "^begin:[ \t]*vcard[ \t]*\n" nil t)
++            (set-marker pos (point))
++          (while (and (not (looking-at "^end[ \t]*:[ \t]*vcard[ \t]*$"))
++                      (re-search-forward ":[ \t]*" nil t))
++            (set-marker newpos (match-end 0))
++            (setq properties
++                  (vcard-parse-region-properties pos (match-beginning 0)))
++            (set-marker pos (marker-position newpos))
++            (re-search-forward "[ \t]*\n")
++            (set-marker newpos (match-end 0))
++            (setq value
++                  (vcard-parse-region-value properties pos (match-beginning 0)))
++            (set-marker pos (marker-position newpos))
++            (goto-char pos)
++            (funcall filter properties value)
++            (setq vcard-data (cons (cons properties value) vcard-data))))))
+     (nreverse vcard-data)))
+ 
+ (defun vcard-parse-region-properties (beg end)

vm-8.2.0b.1538.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e464989f919a09ccba9633f235c89792cf9a6c6002fbf66d8bf6e5722c638cd
+size 848540

vm-8.2.0b.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12
-size 839789