Synch to No Gnus 200512151659.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7939fba..fdf2d6a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * 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  <angeli@iwi.uni-sb.de>
 
        * 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 (file)
--- 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 "@" "<at>"))
+  "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 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Gmane Spam Reporting): Fix
+       spam-report-gmane-use-article-number.  Add
+       spam-report-user-mail-address.
+
 2005-12-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * 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 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -23515,8 +23515,13 @@ Gmane \e$B$O\e(B @uref{http://gmane.org} \e$B$G8+$D$1$k$3$H$,$G$-$^$9!#\e(B
 \e$B$r1?1D$7$F$$$k$J$I$NM}M3$K$h$C$F!"%m!<%+%k$J5-;vHV9f$,\e(B Gmane \e$B$N5-;vHV9f\e(B
 \e$B$H9g$o$J$$>l9g$O!"\e(B@code{nil} \e$B$K@_Dj$7$F2<$5$$!#\e(B
 @code{spam-report-gmane-use-article-number} \e$B$,\e(B @code{nil} \e$B$G$"$k$H!"\e(B
-@file{spam-report.el} \e$B$O\e(B Gmane \e$B$,Ds6!$9$k\e(B @code{X-Report-Spam} \e$B%X%C%@!<\e(B
-\e$B$r;H$$$^$9!#\e(B
+@code{spam-report.el} \e$B$O$=$NHV9f$r5-;v$N%X%C%@!<$+$i<hF@$7$^$9!#\e(B
+@end defvar
+
+@defvar spam-report-user-mail-address
+Gmane \e$B$X$N\e(B spam \e$B$NJs9p$KIU2C$5$l$k\e(B User-Agent \e$B$K8=$l$k%a!<%k%"%I%l%9$G$9!#\e(B
+\e$B$3$l$O!"8m$C$?Js9p$,9T$J$o$l$?$H$-$K!"\e(BGmane \e$B$N4IM}<T$,$"$J$?$KO"Mm$G$-$k\e(B
+\e$B$h$&$K$9$k$?$a$N$b$N$G$9!#%G%#%U%)%k%H$O\e(B @code{user-mail-address} \e$B$G$9!#\e(B
 @end defvar
 
 @node Anti-spam Hashcash Payments

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 178254a..684ff39 100644 (file)
--- 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