You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/12/05 03:29:21 UTC

svn commit: r109845 - /spamassassin/trunk/MANIFEST

Author: felicity
Date: Sat Dec  4 18:29:21 2004
New Revision: 109845

URL: http://svn.apache.org/viewcvs?view=rev&rev=109845
Log:
sort MANIFEST file
Modified:
   spamassassin/trunk/MANIFEST

Modified: spamassassin/trunk/MANIFEST
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST?view=diff&rev=109845&p1=spamassassin/trunk/MANIFEST&r1=109844&p2=spamassassin/trunk/MANIFEST&r2=109845
==============================================================================
--- spamassassin/trunk/MANIFEST	(original)
+++ spamassassin/trunk/MANIFEST	Sat Dec  4 18:29:21 2004
@@ -12,16 +12,15 @@
 ldap/README
 ldap/README.testing
 ldap/sa_test.ldif
-lib/Mail/SpamAssassin.pm
 lib/Mail/SpamAssassin/ArchiveIterator.pm
 lib/Mail/SpamAssassin/AutoWhitelist.pm
 lib/Mail/SpamAssassin/Bayes.pm
-lib/Mail/SpamAssassin/BayesStore.pm
 lib/Mail/SpamAssassin/BayesStore/DBM.pm
+lib/Mail/SpamAssassin/BayesStore.pm
 lib/Mail/SpamAssassin/BayesStore/SQL.pm
-lib/Mail/SpamAssassin/Conf.pm
 lib/Mail/SpamAssassin/Conf/LDAP.pm
 lib/Mail/SpamAssassin/Conf/Parser.pm
+lib/Mail/SpamAssassin/Conf.pm
 lib/Mail/SpamAssassin/Conf/SQL.pm
 lib/Mail/SpamAssassin/Constants.pm
 lib/Mail/SpamAssassin/DBBasedAddrList.pm
@@ -29,32 +28,33 @@
 lib/Mail/SpamAssassin/EvalTests.pm
 lib/Mail/SpamAssassin/HTML.pm
 lib/Mail/SpamAssassin/Locales.pm
-lib/Mail/SpamAssassin/Locker.pm
 lib/Mail/SpamAssassin/Locker/Flock.pm
+lib/Mail/SpamAssassin/Locker.pm
 lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
 lib/Mail/SpamAssassin/Locker/Win32.pm
 lib/Mail/SpamAssassin/MailingList.pm
-lib/Mail/SpamAssassin/Message.pm
 lib/Mail/SpamAssassin/Message/Metadata.pm
 lib/Mail/SpamAssassin/Message/Metadata/Received.pm
 lib/Mail/SpamAssassin/Message/Node.pm
+lib/Mail/SpamAssassin/Message.pm
 lib/Mail/SpamAssassin/NetSet.pm
 lib/Mail/SpamAssassin/PerMsgLearner.pm
 lib/Mail/SpamAssassin/PerMsgStatus.pm
 lib/Mail/SpamAssassin/PersistentAddrList.pm
-lib/Mail/SpamAssassin/Plugin.pm
+lib/Mail/SpamAssassin/PluginHandler.pm
 lib/Mail/SpamAssassin/Plugin/Hashcash.pm
 lib/Mail/SpamAssassin/Plugin/MSExec.pm
+lib/Mail/SpamAssassin/Plugin.pm
 lib/Mail/SpamAssassin/Plugin/Razor2.pm
 lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
 lib/Mail/SpamAssassin/Plugin/SPF.pm
 lib/Mail/SpamAssassin/Plugin/Test.pm
 lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
-lib/Mail/SpamAssassin/PluginHandler.pm
+lib/Mail/SpamAssassin.pm
 lib/Mail/SpamAssassin/Reporter.pm
 lib/Mail/SpamAssassin/SpamdForkScaling.pm
-lib/Mail/SpamAssassin/SubProcBackChannel.pm
 lib/Mail/SpamAssassin/SQLBasedAddrList.pm
+lib/Mail/SpamAssassin/SubProcBackChannel.pm
 lib/Mail/SpamAssassin/TextCat.pm
 lib/Mail/SpamAssassin/Util.pm
 lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
@@ -91,8 +91,8 @@
 masses/lint-rules-from-freqs
 masses/logs-to-c
 masses/mass-check
-masses/mass-check-results-to-mbox
 masses/mass-check.cf
+masses/mass-check-results-to-mbox
 masses/mboxget
 masses/mk-baseline-results
 masses/model-statistics
@@ -104,10 +104,10 @@
 masses/README.perceptron
 masses/rewrite-cf-with-new-scores
 masses/rule-dev/maildir-scan-headers
+masses/rule-qa/corpus.example
 masses/rule-qa/corpus-hourly
 masses/rule-qa/corpus-nightly
 masses/rule-qa/corpus-tagtime
-masses/rule-qa/corpus.example
 masses/rule-qa/markup-rules-file-with-freqs
 masses/rule-qa/post-bugs-for-retired-tests
 masses/rule-qa/README.nightly
@@ -209,8 +209,8 @@
 sql/userpref_pg.sql
 STATUS
 t/basic_lint.t
-t/bayesdbm.t
 t/bayesdbm_flock.t
+t/bayesdbm.t
 t/bayessql.t
 t/body_mod.t
 t/cidrs.t
@@ -260,16 +260,20 @@
 t/data/spam/011
 t/data/spam/012
 t/data/spam/013
-t/data/spam/badmime.txt
+t/data/spam/014
+t/data/spam/015
+t/data/spam/016
+t/data/spam/017
 t/data/spam/badmime2.txt
+t/data/spam/badmime.txt
 t/data/spam/base64.txt
 t/data/spam/bsmtp
 t/data/spam/dnsbl.eml
 t/data/spam/gtube.eml
 t/data/testplugin.pm
 t/data/whitelists/action.eff.org
-t/data/whitelists/amazon_co_uk_ship
 t/data/whitelists/amazon_com_ship
+t/data/whitelists/amazon_co_uk_ship
 t/data/whitelists/cert.org
 t/data/whitelists/debian_bts_reassign
 t/data/whitelists/linuxplanet
@@ -289,8 +293,8 @@
 t/data/whitelists/winxpnews.com
 t/data/whitelists/yahoo-inc.com
 t/db_awl_path.t
-t/db_based_whitelist.t
 t/db_based_whitelist_ips.t
+t/db_based_whitelist.t
 t/dnsbl.t
 t/forged_rcvd.t
 t/gtube.t
@@ -303,30 +307,41 @@
 t/mimeparse.t
 t/missing_hb_separator.t
 t/nonspam.t
-t/plugin.t
+tools/bayes_dump_to_trusted_networks
+tools/check_whitelist
+tools/convert_awl_dbm_to_sql
+tools/desc_length.pl
+tools/mboxsplit
+tools/README.speedtest
+tools/sa-stats.pl
+tools/speedtest
+tools/split_corpora
+tools/sysreport
+tools/test_extract
+tools/triplets.pl
 t/plugin_file.t
+t/plugin.t
 t/prefs_include.t
+TRADEMARK
 t/razor2.t
 t/rcvd_parser.t
 t/README
 t/recips.t
 t/relative_scores.t
-t/report_safe.t
-t/reportheader.t
 t/reportheader_8bit.t
+t/reportheader.t
+t/report_safe.t
 t/rule_names.t
 t/rule_types.t
 t/SATest.pl
 t/SATest.pm
 t/sha1.t
-t/spam.t
-t/spamc.t
 t/spamc_B.t
-t/spamc_c.t
 t/spamc_c_stdout_closed.t
+t/spamc_c.t
 t/spamc_E.t
 t/spamc_l.t
-t/spamd.t
+t/spamc.t
 t/spamd_allow_user_rules.t
 t/spamd_hup.t
 t/spamd_ldap.t
@@ -335,18 +350,21 @@
 t/spamd_parallel.t
 t/spamd_port.t
 t/spamd_protocol_10.t
-t/spamd_report.t
 t/spamd_report_ifspam.t
+t/spamd_report.t
 t/spamd_ssl.t
 t/spamd_stop.t
 t/spamd_symbols.t
 t/spamd_syslog.t
+t/spamd.t
 t/spamd_unix.t
 t/spamd_utf8.t
+t/spam.t
 t/spf.t
 t/sql_based_whitelist.t
 t/strip2.t
 t/stripmarkup.t
+t/strip_no_subject.t
 t/test_dir
 t/uri.t
 t/utf8.t
@@ -354,23 +372,5 @@
 t/whitelist_from.t
 t/whitelist_to.t
 t/zz_cleanup.t
-tools/bayes_dump_to_trusted_networks
-tools/check_whitelist
-tools/convert_awl_dbm_to_sql
-tools/desc_length.pl
-tools/mboxsplit
-tools/README.speedtest
-tools/sa-stats.pl
-tools/speedtest
-tools/split_corpora
-tools/sysreport
-tools/test_extract
-tools/triplets.pl
-TRADEMARK
 UPGRADE
 USAGE
-t/strip_no_subject.t
-t/data/spam/014
-t/data/spam/015
-t/data/spam/016
-t/data/spam/017

Re: sorting MANIFEST

Posted by Daniel Quinlan <qu...@pathname.com>.
"Malte S. Stretz" <ms...@gmx.net> writes:

> Even if we decide against 'make manifest' for everybody we should use the 
> sort criteria used by EU::MM as I will certainly use that feature :)

I'm okay with that, although "make manifest" adds working-tree files
that I usually don't want.  Note that "make manifest" uses the same
exact sort (note: I have set LANG=C) as Perl's cmp ... if you have LANG
or LC_COLLATE set to C.  I believe EU::MM also uses the locale.

At some point in the past, I sorted the MANIFEST with Emacs (which uses
case-insensitive sort) which is why I suspected that an editor sort was
the cause, I hadn't considered locale...

Daniel

-- 
Daniel Quinlan
http://www.pathname.com/~quinlan/

Re: sorting MANIFEST

Posted by "Malte S. Stretz" <ms...@gmx.net>.
On Sunday 05 December 2004 08:39 CET Daniel Quinlan wrote:
> I propose we use GNU sort (which has the same sorting order as any old
> sort(1) program) to sort the MANIFEST and only that program to sort the
> manifest.  No vi, no emacs, no options to sort other than "-u" if there
> are duplicates.

I propose that we use the EU::MM feature 'make manifest'.  That ensures that 
all files which aren't listed in MANIFEST.SKIP are added to the MANIFEST, 
all stale files are removed and the whole thing is sorted alphabetically.  
So no manual editing of the MANIFEST anymore.  If you don't want to have 
something included in the MANIFEST, edit MANIFEST.SKIP instead.  That way 
we have to take care of one file anymore and can be sure that the MANIFEST 
is always in a clean condition.  That feature is especially useful if you 
need to add or rename a whole bunch of files, like I'll have to do when I 
rename the test scripts to start with a number.

> It was sorted this way before, but anytime someone sorts it in their
> editor, it always has some difference (basically: line length
> differences and case-insensitivity).
>
> sort(1) is case sensitive by default which has the minor advantage of
> placing the capitalized files (README, Makefile, etc.) first in the
> listing.

Even if we decide against 'make manifest' for everybody we should use the 
sort criteria used by EU::MM as I will certainly use that feature :)

Cheers,
Malte

-- 
[SGT] Simon G. Tatham: "How to Report Bugs Effectively"
      <http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
[ESR] Eric S. Raymond: "How To Ask Questions The Smart Way"
      <http://www.catb.org/~esr/faqs/smart-questions.html>

Re: sorting MANIFEST

Posted by Nick Leverton <nj...@leverton.org>.
On Sun, Dec 05, 2004 at 06:03:49PM -0500, Theo Van Dinter wrote:
 
> Yeah, I get fed up with the case-insensitive stuff, but never spent time
> figuring out how to shut it off.  Thanks for the tip, I set the variable in my
> rc so sort should be good in the future. :)

I forgot to mention that you have to export it from the shell, to get
it passed to the sort exe.  You realised that, of course :)

	export LC_COLLATE=C

is the full phrase to stick in $SHELLRC, assuming it's sh-compatible.

Nick

Re: sorting MANIFEST

Posted by Theo Van Dinter <fe...@kluge.net>.
On Sun, Dec 05, 2004 at 06:48:22PM +0000, Nick Leverton wrote:
> the development boxes of mine that setup systemwide locales (RH, recent
> Debians and I think Mdk), I add LC_COLLATE=C to the default environment
> as this is the standard case-sensitive ASCII sorting sequence.

Yeah, I get fed up with the case-insensitive stuff, but never spent time
figuring out how to shut it off.  Thanks for the tip, I set the variable in my
rc so sort should be good in the future. :)

-- 
Randomly Generated Tagline:
Are you going to bother to set up an unspoofable identity for every
 shirt in your closet?
              -- Larry Wall, 8th State of the Onion

Re: sorting MANIFEST

Posted by Nick Leverton <nj...@leverton.org>.
On Sun, Dec 05, 2004 at 01:15:21PM -0500, Theo Van Dinter wrote:
 
> As an FYI, the sort I used was:
> 
> $ echo LANG
> en_US

That is probably the source of any difference in sorting.  Locales en_*
(and I think most Western language ones) are case insensitive.  On all
the development boxes of mine that setup systemwide locales (RH, recent
Debians and I think Mdk), I add LC_COLLATE=C to the default environment
as this is the standard case-sensitive ASCII sorting sequence.

Nick

Re: sorting MANIFEST

Posted by Theo Van Dinter <fe...@kluge.net>.
On Sat, Dec 04, 2004 at 11:39:45PM -0800, Dan Quinlan wrote:
> I propose we use GNU sort (which has the same sorting order as any old
> sort(1) program) to sort the MANIFEST and only that program to sort the
> manifest.
> 
> It was sorted this way before, but anytime someone sorts it in their
> editor, it always has some difference (basically: line length
> differences and case-insensitivity).

As an FYI, the sort I used was:

$ echo LANG
en_US
$ sort --version
sort (coreutils) 4.5.3
Written by Mike Haertel and Paul Eggert.

Copyright (C) 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
felicity has logged off pts/9 from local.



It's the standard setup that comes with RH Linux.

-- 
Randomly Generated Tagline:
"Clean code is an art, fortunately an art Linus in paticular seems to excel
 at."                                            - Alan Cox

Re: sorting MANIFEST

Posted by Nick Leverton <nj...@leverton.org>.
On Sat, Dec 04, 2004 at 11:39:45PM -0800, Daniel Quinlan wrote:
 
> It was sorted this way before, but anytime someone sorts it in their
> editor, it always has some difference (basically: line length
> differences and case-insensitivity).
> 
> sort(1) is case sensitive by default which has the minor advantage of
> placing the capitalized files (README, Makefile, etc.) first in the
> listing.

You also need to set LC_COLLATE=C, as developers may have a LANG setting
that alters the collating sequence.  I'd suspect any sort differences are
more likely due to that than to what editor is being used to invoke sort.

Nick

sorting MANIFEST

Posted by Daniel Quinlan <qu...@pathname.com>.
I propose we use GNU sort (which has the same sorting order as any old
sort(1) program) to sort the MANIFEST and only that program to sort the
manifest.  No vi, no emacs, no options to sort other than "-u" if there
are duplicates.

It was sorted this way before, but anytime someone sorts it in their
editor, it always has some difference (basically: line length
differences and case-insensitivity).

sort(1) is case sensitive by default which has the minor advantage of
placing the capitalized files (README, Makefile, etc.) first in the
listing.

-- 
Daniel Quinlan
http://www.pathname.com/~quinlan/