You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@spamassassin.apache.org by bu...@bugzilla.spamassassin.org on 2009/06/29 13:40:22 UTC
[Bug 6139] New: remove "rulesrc" external from SVN tree
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
Summary: remove "rulesrc" external from SVN tree
Product: Spamassassin
Version: SVN Trunk (Latest Devel Version)
Platform: Other
OS/Version: All
Status: NEW
Severity: major
Priority: P1
Component: Building & Packaging
AssignedTo: dev@spamassassin.apache.org
ReportedBy: jm@jmason.org
from an email thread --
'Also, I would also like to get rid of the "rulesrc" external, and instead
just put its contents into each branch, separately. I don't think the
idea of sharing rules in this way between branches has worked out; in my
opinion it's caused more trouble than help (unanticipated dependencies,
complexity, SVN external = horrible anyway). Is anyone still attached to
this idea?'
nobody piped up, so rulesrc will be going the way of the dodo (yay).
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #6 from Justin Mason <jm...@jmason.org> 2009-06-29 15:00:53 PST ---
actually, it's worse than that. Every SVN checkout needs the following, it
seems:
svn propdel svn:externals . ; rm -rf rulesrc ; svn up
sorry folks. won't happen again!
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #3 from Mark Martinec <Ma...@ijs.si> 2009-06-29 10:26:25 PST ---
Btw, I have a couple of adsp_override rules (comparable to
def_whitelist_from_*,
but in the opposite sense, only applicable to 3.3), such as the ones below.
Should I put them in some .cf file? Where?
adsp_override ebay.com discardable
adsp_override *.ebay.com discardable
adsp_override paypal.com discardable
adsp_override *.paypal.com discardable
adsp_override paypal.co.uk discardable
adsp_override ealerts.bankofamerica.com
adsp_override alert.bankofamerica.com
adsp_override americangreetings.com
adsp_override yahoo.americangreetings.com
adsp_override msn.americangreetings.com
adsp_override egreetings.com
adsp_override bluemountain.com
adsp_override hallmark.com
adsp_override update.hallmark.com
adsp_override *.hallmark.com
adsp_override amazon.com all
adsp_override amazon.co.uk all
adsp_override amazon.de all
adsp_override amazon.fr all
adsp_override birthdayalarm.com all
adsp_override astrology.com all
adsp_override linkedin.com all
adsp_override *.linkedin.com all
adsp_override facebookmail.com all
adsp_override *.greenpeace.org all
adsp_override lists.sourceforge.net all
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
Justin Mason <jm...@jmason.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|REOPENED |RESOLVED
Resolution| |FIXED
--- Comment #10 from Justin Mason <jm...@jmason.org> 2009-07-01 04:01:13 PST ---
: 692...; svn commit -m "remove the 'make install' step from updates
generation; it no longer works to copy rules around" build/mkupdates/run_part2
Sending build/mkupdates/run_part2
Transmitting file data .
Committed revision 790114 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=790114 ).
I think that's fixed it. reopen again if not.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
Mark Martinec <Ma...@ijs.si> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|RESOLVED |REOPENED
Resolution|FIXED |
--- Comment #9 from Mark Martinec <Ma...@ijs.si> 2009-06-30 16:42:22 PST ---
> Hmm, sa-update did not copy this file to the
> /var/lib/spamassassin/3.003000/updates_spamassassin_org
>
> What else needs to be done please?
Reopening just so that my question is not forgotten.
Seems like sa-update is not supplying the current version
of 3.3 rules and scores from the SVN 'rules' directory.
(It is quite possible it's only happening to me due to
fudging soft links to make SVN SA coexist with the one
from FreeBSD ports - am I the only one?)
The release notes should boldly state the change in fetching of rules.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #1 from Justin Mason <jm...@jmason.org> 2009-06-29 04:40:51 PST ---
hm. to clarify: it'll still be there, but just as a normal SVN directory, not
a wierd SVN "external" link.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
Justin Mason <jm...@jmason.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
--- Comment #4 from Justin Mason <jm...@jmason.org> 2009-06-29 14:51:08 PST ---
ok, as of
: 500...; svn commit -m "bug 6139: add note indicating obsolete status of this
copy"
Adding README.txt
Sending sandbox/jm/20_sought.cf
Transmitting file data ..
Committed revision 789460 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=789460 ).
the rulesrc dirs in 3.3.0 trunk, and the 3.2.x maintainance branch, are
entirely separate.
Mark: feel free to put those in a .cf in the 'rules' dir.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #8 from Mark Martinec <Ma...@ijs.si> 2009-06-29 16:37:25 PST ---
> Adding rules/60_adsp_override_dkim.cf
> Committed revision 789478 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=789478 ).
Hmm, sa-update did not copy this file to the
/var/lib/spamassassin/3.003000/updates_spamassassin_org
What else needs to be done please?
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #7 from Mark Martinec <Ma...@ijs.si> 2009-06-29 15:39:35 PST ---
>> Btw, I have a couple of adsp_override rules (comparable to
>> def_whitelist_from_*, but in the opposite sense, only applicable
>> to 3.3), such as the ones below. Should I put them in some .cf file?
> Mark: feel free to put those in a .cf in the 'rules' dir.
Adding rules/60_adsp_override_dkim.cf
Committed revision 789478 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=789478 ).
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #5 from Justin Mason <jm...@jmason.org> 2009-06-29 14:53:21 PST ---
oh dear. this is annoying:
: 36...; sudo -u automc -H svn up
Password:
svn: Failed to add directory 'rulesrc': object of the same name already exists
: exit=[1] uid=jm Mon Jun 29 21:51:36 GMT 2009; cd
/export/home/automc/svn/spamassassin
: 37...; sudo -u automc rm -rf rulesrc
: uid=jm Mon Jun 29 21:51:50 GMT 2009; cd /export/home/automc/svn/spamassassin
: 38...; sudo -u automc -H svn up
A t.rules/MIME_BASE64_TEXT
[... etc.]
In other words, "svn up" can't cope with the replacement of an external with a
normal dir, and needs a manual "rm -rf rulesrc" to help...
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #12 from John Hardin <jh...@impsec.org> 2009-07-15 18:51:11 PST ---
Rules go in trunk/rulesrc/sandbox/{you}/
rules/trunk/{etc...} is deprecated.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #11 from Karsten Bräckelmann <gu...@rudersport.de> 2009-07-15 18:15:12 PST ---
So, from now on -- do we need to put rules for testing in trunk, too, in
addition to our sandboxes? Or is the sandbox still sufficient for testing?
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #2 from Mark Martinec <Ma...@ijs.si> 2009-06-29 09:47:13 PST ---
> hm. to clarify: it'll still be there, but just as a normal SVN directory, not
> a wierd SVN "external" link.
I'm not sure if I'm doing the right thing at the right place,
but some rules need adjusting for 3.3:
rules/25_dkim.cf, rules/50_scores.cf:
- remove DomainKeys rules (Bug 6098);
- drop scores of ENV_AND_HDR_DKIM_MATCH
and ENV_AND_HDR_SPF_MATCH as a great goldmine
for spammers;
- added new rules DKIM_VALID, DKIM_VALID_AU,
DKIM_ADSP_*, __DKIM_DEPENDABLE;
- dropped scores to 0 for old rules
DKIM_VERIFIED, DKIM_POLICY_*, while keeping them
for compatibility with existing uses .cf files
Sending rules/25_dkim.cf
Sending rules/50_scores.cf
Transmitting file data ..
Committed revision 789382 ( https://svn.apache.org/viewcvs.cgi?view=rev&rev=789382 ).
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
[Bug 6139] remove "rulesrc" external from SVN tree
Posted by bu...@bugzilla.spamassassin.org.
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6139
--- Comment #13 from Justin Mason <jm...@jmason.org> 2009-07-16 02:30:49 PST ---
(In reply to comment #12)
> Rules go in trunk/rulesrc/sandbox/{you}/
>
> rules/trunk/{etc...} is deprecated.
yep.
If you want to backport rules for 3.2.x updates, you have to _manually_ add
them to branches/3_2_x_updates/rulesrc/sandbox/{you}/ , as well.
--
Configure bugmail: https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.