X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.procmailrc;h=a5e970c4633098faf6a0bca94017d4617b585a4f;hp=6117c7b5fb720e61a6eae9f356242c7bf84a4f49;hb=HEAD;hpb=80c6260ae2612ec45eb2f2abd1088a3a7eab10d6

diff --git a/.procmailrc b/.procmailrc
index 6117c7b..e132872 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -77,11 +77,11 @@ backup
 # No need to filter them for spam
 
 :0
-* ^List-Id: Moscow Linux User Group <mlug\.UnixCenter\.RU>
+* ^(From|To|Cc|Reply-To): .*((mlug@unixcenter\.ru)|@altlinux\.ru)
 lists/mlug
 
 :0
-* ^(From|To|Cc|Reply-To): .*((mlug@unixcenter\.ru)|@altlinux\.ru)
+* ^List-Id: Moscow Linux User Group <mlug\.UnixCenter\.RU>
 lists/mlug
 
 :0
@@ -89,61 +89,60 @@ lists/mlug
 lists/python
 
 :0
-* ^Sender: python-list-admin@python\.org
+* ^Sender: .*@python\.org
 lists/python
 
 :0
-* ^Newsgroups: .*comp\.lang\.python
+* ^List-Id: .*<(python-.*|core-workflow)\.python\.org>
 lists/python
 
 :0
-* ^List-Id: Python core developers <python-dev\.python\.org>
+* ^Newsgroups: .*comp\.lang\.python
 lists/python
 
 :0
-* ^List-Id: "Python 3000 process, design, development" <python-3000\.python\.org>
-lists/python
+* ^From: sitelist-bounces@lists\.sourceforge\.net
+* ^To: .*-owner@lists\.sourceforge\.net
+* ^Subject: Uncaught bounce notification
+${SPAMFOLDER}
 
 :0
-* ^List-Id: Discussions of speculative Python language ideas.*<python-ideas\.python\.org>
-lists/python
+* ^From: .*-bounces@lists\.sourceforge\.net
+* ^To: .*-owner@lists\.sourceforge\.net
+* ^Subject: Auto-discard notification
+${SPAMFOLDER}
 
 :0
-* ^Sender: "Email-SIG" <email-sig-bounces\+phd=phdru\.name@python\.org>
+* ^List-Id: .+<sqlobject-(discuss|cvs)\.lists\.sourceforge\.net>
 lists/python
 
 :0
-* ^Sender: mimelib-devel-admin@lists\.sourceforge\.net
+* ^To: "(\[sqlobject:(bugs|patches)\] )|(Ticket [0-9]+)" <[0-9]+@(bugs|patches)\.sqlobject\.p\.re\.sf\.net>
+* ^Reply-To: "?(\\?\[sqlobject:(bugs|patches)\\?\] )|(Ticket [0-9]+)"? <[0-9]+@(bugs|patches)\.sqlobject\.p\.re\.sf\.net>
+* ^Subject: (\[SQL-CVS\] )?\[sqlobject:(bugs|patches)\] (Re: )?\#[0-9]+
 lists/python
 
 :0
-* ^List-Id: Discussion of the Quixote Web development framework.*<quixote-users\.mems-exchange\.org>
+* ^From: "SQLObject Git repository" <noreply@(fullhistory|sqlobject|scripts)\.sqlobject\.p\.re\.sf\.net>
+* ^To: "SQLObject Git repository" <noreply@(fullhistory|sqlobject|scripts)\.sqlobject\.p\.re\.sf\.net>
+* ^Reply-To: "SQLObject Git repository" <noreply@(fullhistory|sqlobject|scripts)\.sqlobject\.p\.re\.sf\.net>
+* ^Subject: \[sqlobject:(fullhistory|sqlobject|scripts)\]
 lists/python
 
 :0
-* ^List-Id: Discussion of the Durus object database.*<durus-users\.mems-exchange\.org>
+* ^From: .+<notifications@github\.com>
+* ^To: sqlobject/sqlobject <sqlobject@noreply\.github\.com>
+* ^List-ID: sqlobject/sqlobject <sqlobject\.sqlobject\.github\.com>
 lists/python
 
 :0
-* ^From: sitelist-bounces@lists\.sourceforge\.net
-* ^To: sqlobject-discuss-owner@lists\.sourceforge\.net
-* ^Subject: Uncaught bounce notification
-${SPAMFOLDER}
-
-:0
-* ^From: sqlobject-cvs-bounces@lists\.sourceforge\.net
-* ^To: sqlobject-cvs-owner@lists\.sourceforge\.net
-* ^Subject: Auto-discard notification
-${SPAMFOLDER}
-
-:0
-* ^List-Id: .+<sqlobject-(discuss|cvs)\.lists\.sourceforge\.net>
+* ^List-Id: .*<cheetahtemplate-(announce|discuss)\.lists\.sourceforge\.net>
 lists/python
 
 :0
-* ^To: "(\[sqlobject:bugs\] )|(Ticket [0-9]+)" <[0-9]+@bugs\.sqlobject\.p\.re\.sf\.net>
-* ^Reply-To: "?(\\?\[sqlobject:bugs\\?\] )|(Ticket [0-9]+)"? <[0-9]+@bugs\.sqlobject\.p\.re\.sf\.net>
-* ^Subject: (\[SQL-CVS\] )?\[sqlobject:bugs\] (Re: )?\#[0-9]+
+* ^From: .+<notifications@github\.com>
+* ^To: CheetahTemplate3/cheetah3 <cheetah3@noreply\.github\.com>
+* ^List-ID: CheetahTemplate3/cheetah3 <cheetah3\.CheetahTemplate3\.github\.com>
 lists/python
 
 :0
@@ -151,16 +150,16 @@ lists/python
 lists/python
 
 :0
-* ^Sender: pysqlite-bounces@lists\.initd\.org
+* ^List-Id: PyGreSQL Development <pygresql\.vex\.net>
 lists/python
 
 :0
-* ^List-Id: <parsedatetime-dev\.googlegroups\.com>
+* ^List-Id: eGenix\.com User Mailinglist <egenix-users\.egenix\.com>
 lists/python
 
 :0
-* ^(To|Cc|Reply-To|Resent-To|Sender): .*(zope.*@zope\.(org|net|com))|(zip@eevolute\.com)
-lists/zope
+* ^List-Id: "generateDS\.py users discussion list".*<generateds-users\.lists\.sourceforge\.net>
+lists/python
 
 
 # Now filters
@@ -168,7 +167,7 @@ lists/zope
 # Klez
 :0 B
 * ^Content-Transfer-Encoding: base64
-* name( ?)=.*\.(com|exe|bat|scr|pif)
+* name( ?)=.*\.(exe|bat|scr|pif)
 | ${FORMAIL} -A"X-Note: Klez" -A"X-Folder: Virus" >${VIRUSFOLDER}
 
 # Sobig.E
@@ -298,6 +297,7 @@ disco|party|misc)\..*(zip|exe|scr|com|pif)"?$
 * < 10240000
 | spamc -U /tmp/spamassassin.sock -s 10240000
 
+
 # Mail with a score of 14 or higher is certainly spam
 :0:
 * ^X-Spam-Level: \*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -328,11 +328,6 @@ disco|party|misc)\..*(zip|exe|scr|com|pif)"?$
 * @besttraining\.ru
 | ${FORMAIL} -A"X-Note: besttraining spam" -A"X-Folder: Spam" >/dev/null
 
-# HTML-only mail is almost certainly spam
-#:0
-#* ^Content-Type: text/html
-#| ${FORMAIL} -A"X-Note: HTML-only mail" -A"X-Folder: Spam" >/dev/null
-
 :0:
 * ^X-Spam-Status: Yes
 ${SPAMFOLDER}