ports/58526: maintainer-update of mail/mutt-devel
Udo Schweigert
udo.schweigert at siemens.com
Sat Oct 25 16:20:19 UTC 2003
>Number: 58526
>Category: ports
>Synopsis: maintainer-update of mail/mutt-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 25 09:20:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.9-RC FreeBSD 4.9-RC #111: Thu Oct 23 08:13:48 CEST 2003 ust at alaska.cert.siemens.de:/usr/obj/usr/src/sys/alaska i386
>Description:
Maintainer update of mail/mutt-devel:
- Add the new option "smime_encrypt_self" to addtionally encrypt to
the default key also.
- Fix some SGML errors in the manual.
Committer: cvs add files/patch-manual.sgml files/patch-smime-self
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt-devel/files/patch-manual.sgml ./files/patch-manual.sgml
--- /usr/ports/mail/mutt-devel/files/patch-manual.sgml Thu Jan 1 01:00:00 1970
+++ ./files/patch-manual.sgml Sat Oct 25 16:50:38 2003
@@ -0,0 +1,47 @@
+--- doc/manual.sgml.head Tue Mar 4 08:49:49 2003
++++ doc/manual.sgml.head Sat Oct 25 16:38:09 2003
+@@ -886,34 +886,34 @@
+ defined maps are:
+
+ <descrip>
+-<tag/generic
++<tag/generic/
+ This is not a real menu, but is used as a fallback for all of the other
+ menus except for the pager and editor modes. If a key is not defined in
+ another menu, Mutt will look for a binding to use in this menu. This allows
+ you to bind a key to a certain function in multiple menus instead of having
+ multiple bind statements to accomplish the same task.
+-<tag/alias
++<tag/alias/
+ The alias menu is the list of your personal aliases as defined in your
+ muttrc. It is the mapping from a short alias name to the full email
+ address(es) of the recipient(s).
+-<tag/attach
++<tag/attach/
+ The attachment menu is used to access the attachments on received messages.
+-<tag/browser
++<tag/browser/
+ The browser is used for both browsing the local directory structure, and for
+ listing all of your incoming mailboxes.
+-<tag/editor
++<tag/editor/
+ The editor is the line-based editor the user enters text data.
+-<tag/index
++<tag/index/
+ The index is the list of messages contained in a mailbox.
+-<tag/compose
++<tag/compose/
+ The compose menu is the screen used when sending a new message.
+-<tag/pager
++<tag/pager/
+ The pager is the mode used to display message/attachment data, and help
+ listings.
+-<tag/pgp
++<tag/pgp/
+ The pgp menu is used to select the OpenPGP keys used for encrypting outgoing
+ messages.
+-<tag/postpone
++<tag/postpone/
+ The postpone menu is similar to the index menu, except is used when
+ recalling a message the user was composing, but saved until later.
+ </descrip>
diff -ru /usr/ports/mail/mutt-devel/files/patch-smime-self ./files/patch-smime-self
--- /usr/ports/mail/mutt-devel/files/patch-smime-self Thu Jan 1 01:00:00 1970
+++ ./files/patch-smime-self Sat Oct 25 17:57:19 2003
@@ -0,0 +1,65 @@
+--- crypt.c 7 Mar 2003 08:23:27 -0000 3.17
++++ crypt.c 7 May 2003 14:57:00 -0000
+@@ -246,8 +246,18 @@
+ if ((WithCrypto & APPLICATION_SMIME)
+ && (msg->security & APPLICATION_SMIME))
+ {
+- if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody,
+- keylist)))
++ char *new_keylist = keylist;
++
++ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == M_YES)
++ {
++ int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */
++ new_keylist = safe_malloc(size);
++ snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey);
++ }
++
++ tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist);
++ safe_free((void **)&new_keylist);
++ if (!tmp_pbody)
+ {
+ /* signed ? free it! */
+ return (-1);
+--- init.h 14 Apr 2003 09:09:53 -0000 3.38
++++ init.h 7 May 2003 14:57:02 -0000
+@@ -1585,6 +1585,11 @@
+ /*
+ */
+
++ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, M_YES },
++ /*
++ ** .pp
++ ** Encrypt the message to smime_default_key too.
++ */
+ { "smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, 300 },
+ /*
+ ** .pp
+diff -u -d -b -B -r3.18 mutt.h
+--- mutt.h Tue Mar 4 08:49:48 2003
++++ mutt.h Sat Oct 25 16:17:56 2003
+@@ -271,6 +271,7 @@
+
+ OPT_PRINT,
+ OPT_INCLUDE,
++ OPT_SMIMEENCRYPTSELF,
+ OPT_DELETE,
+ OPT_MFUPTO,
+ OPT_MIMEFWD,
+--- contrib/smime.rc.orig Sat Mar 2 13:11:35 2002
++++ contrib/smime.rc Sat Oct 25 17:56:28 2003
+@@ -23,9 +23,12 @@
+
+ # The (default) keyfile for signing/decrypting. Uncomment the following
+ # line and replace the keyid with your own.
+-set smime_default_key="12345678.0"
++# set smime_default_key="12345678.0"
++# Uncomment the following line in addition to the one above, if you want that
++# all encrypted messages are also encrypted with your default key.
++# set smime_encrypt_self = yes
+
+-# Uncommen to make mutt ask what key to use when trying to decrypt a message.
++# Uncomment to make mutt ask what key to use when trying to decrypt a message.
+ # It will use the default key above (if that was set) else.
+ # unset smime_decrypt_use_default_key
+
diff -ru /usr/ports/mail/mutt-devel/files/patch-smime-sender ./files/patch-smime-sender
--- /usr/ports/mail/mutt-devel/files/patch-smime-sender Fri Mar 21 18:20:51 2003
+++ ./files/patch-smime-sender Sat Oct 25 17:59:58 2003
@@ -37,31 +37,18 @@
OPTSDEFAULTDECRYPTKEY,
#endif
#ifdef HAVE_PGP
---- contrib/smime.rc.orig Sat Mar 2 12:59:50 2002
-+++ contrib/smime.rc Fri May 31 17:09:04 2002
-@@ -6,9 +6,12 @@
+--- contrib/smime.rc.orig Sat Oct 25 17:57:35 2003
++++ contrib/smime.rc Sat Oct 25 17:57:35 2003
+@@ -6,8 +6,11 @@
# will be the default method unless the following option is set
set smime_is_default
-# Uncoment this if you don't want to set labels for certificates you add.
+# Uncomment this if you don't want to set labels for certificates you add.
# unset smime_ask_cert_label
-
++
+# Uncomment this if you don't want to check for sender's email address
+# set smime_dont_check_sender = yes
-+
+
# Passphrase expiration
set smime_timeout=300
-
-@@ -23,9 +26,9 @@
-
- # The (default) keyfile for signing/decrypting. Uncomment the following
- # line and replace the keyid with your own.
--set smime_default_key="12345678.0"
-+# set smime_default_key="12345678.0"
-
--# Uncommen to make mutt ask what key to use when trying to decrypt a message.
-+# Uncomment to make mutt ask what key to use when trying to decrypt a message.
- # It will use the default key above (if that was set) else.
- # unset smime_decrypt_use_default_key
-
diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
--- /usr/ports/mail/mutt-devel/scripts/generate-plist Thu Sep 25 06:34:29 2003
+++ ./scripts/generate-plist Sat Oct 25 18:02:30 2003
@@ -122,7 +122,7 @@
fi
if [ "$MUTT_HTML" = "yes" ]; then
- html=366
+ html=367
if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
html=$(($html + 5))
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list