From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/65983 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.gnus.general Subject: Re: emacs->gnus merge questions Date: Mon, 17 Dec 2007 17:03:44 -0600 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <86mys8q5yn.fsf@lifelogs.com> References: <874petkgw8.fsf@catnip.gol.com> <868x41jj51.fsf@lifelogs.com> <86r6hkq60k.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1197932640 31510 80.91.229.12 (17 Dec 2007 23:04:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Dec 2007 23:04:00 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M14476@lists.math.uh.edu Tue Dec 18 00:04:11 2007 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.50) id 1J4P0L-0004h5-Vy for ding-account@gmane.org; Tue, 18 Dec 2007 00:04:10 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1J4P02-0004B4-20; Mon, 17 Dec 2007 17:03:50 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1J4P00-0004Ao-OH for ding@lists.math.uh.edu; Mon, 17 Dec 2007 17:03:48 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.67) (envelope-from ) id 1J4Ozt-0003c7-H8 for ding@lists.math.uh.edu; Mon, 17 Dec 2007 17:03:48 -0600 Original-Received: from blockstar.com ([170.224.69.95] helo=mail.blockstar.com) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1J4Ozr-0004j7-00 for ; Tue, 18 Dec 2007 00:03:39 +0100 Original-Received: from tzlatanov-ubuntu-desktop.jumptrading.com (unknown [38.98.147.130]) by mail.blockstar.com (Postfix) with ESMTP id C760B3F86B4 for ; Mon, 17 Dec 2007 15:31:11 -0800 (PST) X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6;d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" X-Hashcash: 1:20:071217:ding@gnus.org::Pj0PDjL+EMkw6+AJ:0000A4u+ Mail-Followup-To: ding@gnus.org In-Reply-To: <86r6hkq60k.fsf@lifelogs.com> (Ted Zlatanov's message of "Mon, 17 Dec 2007 17:02:35 -0600") User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/22.1 (gnu/linux) X-Spam-Score: -2.6 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:65983 Archived-At: --=-=-= On Mon, 17 Dec 2007 17:02:35 -0600 Ted Zlatanov wrote: TZ> I am including a patch (not comitted yet) ... I didn't, but I am now :) Ted --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=netrc+encrypt.patch ? netrc+encrypt.patch Index: encrypt.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/encrypt.el,v retrieving revision 7.11 diff -u -r7.11 encrypt.el --- encrypt.el 1 Nov 2007 15:01:11 -0000 7.11 +++ encrypt.el 17 Dec 2007 22:55:28 -0000 @@ -29,11 +29,12 @@ ;;; particular aspect. ;;; Use in Gnus like this: +;;; (require 'encrypt) ;;; (setq ;;; nnimap-authinfo-file "~/.authinfo.enc" ;;; nntp-authinfo-file "~/.authinfo.enc" ;;; smtpmail-auth-credentials "~/.authinfo.enc" -;;; ;; using the AES256 cipher, feel free to use your own favorite +;;; ;; GnuPG using the AES256 cipher, feel free to use your own favorite ;;; encrypt-file-alist (quote (("~/.authinfo.enc" (gpg "AES256")))) ;;; password-cache-expiry 600) @@ -53,7 +54,9 @@ ;; autoload password (eval-and-compile - (autoload 'password-read "password")) + (if (locate-library "password-cache") + (require 'password-cache) + (require 'password))) (defgroup encrypt '((password-cache custom-variable) (password-cache-expiry custom-variable)) Index: netrc.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/netrc.el,v retrieving revision 7.17 diff -u -r7.17 netrc.el --- netrc.el 9 Dec 2007 00:04:21 -0000 7.17 +++ netrc.el 17 Dec 2007 22:55:28 -0000 @@ -34,6 +34,10 @@ ;;; .netrc and .authinfo rc parsing ;;; +;; use encrypt if loaded (but netrc-use-encrypt also has to be on) +(eval-and-compile + (autoload 'encrypt-find-model "encrypt") + (autoload 'encrypt-insert-file-contents "encrypt")) (defalias 'netrc-point-at-eol (if (fboundp 'point-at-eol) 'point-at-eol @@ -54,8 +58,12 @@ (let ((tokens '("machine" "default" "login" "password" "account" "macdef" "force" "port")) + (encryption-model (when (bound-and-true-p encrypt-file-alist) + (encrypt-find-model file))) alist elem result pair) - (insert-file-contents file) + (if encryption-model + (encrypt-insert-file-contents file encryption-model) + (insert-file-contents file)) (goto-char (point-min)) ;; Go through the file, line by line. (while (not (eobp)) --=-=-=--