From 1d8f08c9f9993c881ed0822102bc6b41cc861dca Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 15 Dec 2005 22:22:22 +0000 Subject: [PATCH] Synch to No Gnus 200512151659. --- lisp/ChangeLog | 6 ++++++ lisp/spam-report.el | 22 ++++++++++++++++++++-- texi/ChangeLog | 6 ++++++ texi/gnus-ja.texi | 9 +++++++-- texi/gnus.texi | 11 +++++++++-- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7939fba..fdf2d6a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-12-15 Reiner Steib + + * spam-report.el (spam-report-user-mail-address) + (spam-report-user-agent): New variables. + (spam-report-url-ping-plain): Use spam-report-user-agent. + 2005-12-14 Ralf Angeli * gnus-art.el (gnus-button-handle-custom): Do not just use diff --git a/lisp/spam-report.el b/lisp/spam-report.el index 9fad9d2..a7179d5 100644 --- a/lisp/spam-report.el +++ b/lisp/spam-report.el @@ -185,6 +185,24 @@ the function specified by `spam-report-url-ping-function'." ;; report: "/gmane.some.group:123456" (funcall spam-report-url-ping-function host report)) +(defcustom spam-report-user-mail-address + (and (stringp user-mail-address) + (gnus-replace-in-string user-mail-address "@" "")) + "Mail address of this user used for spam reports to Gmane. +This is initialized based on `user-mail-address'." + :type '(choice string + (const :tag "Don't expose address" nil)) + :version "23.0" ;; No Gnus + :group 'spam-report) + +(defvar spam-report-user-agent + (if spam-report-user-mail-address + (format "%s (%s) %s" "spam-report.el" + spam-report-user-mail-address + (gnus-extended-version)) + (format "%s %s" "spam-report.el" + (gnus-extended-version)))) + (defun spam-report-url-ping-plain (host report) "Ping a host through HTTP, addressing a specific GET resource." (let ((tcp-connection)) @@ -199,8 +217,8 @@ the function specified by `spam-report-url-ping-function'." (set-marker (process-mark tcp-connection) (point-min)) (process-send-string tcp-connection - (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n" - report (gnus-extended-version) host))))) + (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n" + report spam-report-user-agent host))))) ;;;###autoload (defun spam-report-process-queue (&optional file keep) diff --git a/texi/ChangeLog b/texi/ChangeLog index d9aeb90..cdc73cc 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2005-12-15 Reiner Steib + + * gnus.texi (Gmane Spam Reporting): Fix + spam-report-gmane-use-article-number. Add + spam-report-user-mail-address. + 2005-12-13 Reiner Steib * gnus-news.el (gnus-news-translate-file): Fix previous commit. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 4c93785..dad8e71 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -23515,8 +23515,13 @@ Gmane は @uref{http://gmane.org} で見つけることができます。 を運営しているなどの理由によって、ローカルな記事番号が Gmane の記事番号 と合わない場合は、@code{nil} に設定して下さい。 @code{spam-report-gmane-use-article-number} が @code{nil} であると、 -@file{spam-report.el} は Gmane が提供する @code{X-Report-Spam} ヘッダー -を使います。 +@code{spam-report.el} はその番号を記事のヘッダーから取得します。 +@end defvar + +@defvar spam-report-user-mail-address +Gmane への spam の報告に付加される User-Agent に現れるメールアドレスです。 +これは、誤った報告が行なわれたときに、Gmane の管理者があなたに連絡できる +ようにするためのものです。ディフォルトは @code{user-mail-address} です。 @end defvar @node Anti-spam Hashcash Payments diff --git a/texi/gnus.texi b/texi/gnus.texi index 178254a..684ff39 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -24046,8 +24046,15 @@ This variable is @code{t} by default. Set it to @code{nil} if you are running your own news server, for instance, and the local article numbers don't correspond to the Gmane article numbers. When @code{spam-report-gmane-use-article-number} is @code{nil}, -@code{spam-report.el} will use the @code{X-Report-Spam} header that -Gmane provides. +@code{spam-report.el} will fetch the number from the article headers. + +@end defvar + +@defvar spam-report-user-mail-address + +Mail address exposed in the User-Agent spam reports to Gmane. It allows +the Gmane administrators to contact you in case of misreports. The +default is @code{user-mail-address}. @end defvar -- 1.7.10.4