You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2011/05/24 18:13:19 UTC
svn commit: r1127126 - in /spamassassin/trunk: ./ debian/
debian/spamc/DEBIAN/ debian/spamc/usr/share/doc/spamc/
Author: kmcgrail
Date: Tue May 24 16:13:18 2011
New Revision: 1127126
URL: http://svn.apache.org/viewvc?rev=1127126&view=rev
Log:
Pass #2 on cleaning up Debian Files
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/debian/files
spamassassin/trunk/debian/spamassassin.debhelper.log
spamassassin/trunk/debian/spamc.debhelper.log
spamassassin/trunk/debian/spamc.substvars
spamassassin/trunk/debian/spamc/DEBIAN/control
spamassassin/trunk/debian/spamc/DEBIAN/md5sums
spamassassin/trunk/debian/spamc/usr/share/doc/spamc/README.Debian
spamassassin/trunk/debian/spamc/usr/share/doc/spamc/TRADEMARK
spamassassin/trunk/debian/spamc/usr/share/doc/spamc/copyright
spamassassin/trunk/debian/spamc/usr/share/doc/spamc/procmailrc.example
spamassassin/trunk/debian/spamc/usr/share/doc/spamc/sample-spam.txt
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Tue May 24 16:13:18 2011
@@ -21,6 +21,42 @@ build/mkrules
build/parse-rules-for-masses
build/preprocessor
build/sha1sum.pl
+debian/65_debian.cf
+debian/changelog
+debian/compat
+debian/control
+debian/copyright
+debian/examples/courier
+debian/examples/filter.sh
+debian/examples/gnus
+debian/examples/muttrc
+debian/GPG.KEY
+debian/NEWS
+debian/patches/10_change_config_paths
+debian/patches/20_edit_spamc_pod
+debian/patches/30_edit_README
+debian/patches/50_sa-learn_fix_empty_list_handling
+debian/patches/85_disable_SSLv2
+debian/patches/series
+debian/README.postfix
+debian/rules
+debian/source/format
+debian/spamassassin.cron.daily
+debian/spamassassin.default
+debian/spamassassin.dirs
+debian/spamassassin.examples
+debian/spamassassin.init
+debian/spamassassin.links
+debian/spamassassin.postinst
+debian/spamassassin.preinst
+debian/spamassassin.prerm
+debian/spamassassin.README.Debian
+debian/spamassassin.triggers
+debian/spamc.dirs
+debian/spamc.docs
+debian/spamc.manpages
+debian/spamc.README.Debian
+debian/watch
ldap/README
ldap/README.testing
ldap/sa_test.ldif
Modified: spamassassin/trunk/debian/files
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/files?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/files (original)
+++ spamassassin/trunk/debian/files Tue May 24 16:13:18 2011
@@ -1,2 +0,0 @@
-spamassassin_3.3.1-2_all.deb mail optional
-spamc_3.3.1-2_i386.deb mail optional
Modified: spamassassin/trunk/debian/spamassassin.debhelper.log
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamassassin.debhelper.log?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamassassin.debhelper.log (original)
+++ spamassassin/trunk/debian/spamassassin.debhelper.log Tue May 24 16:13:18 2011
@@ -1,17 +0,0 @@
-dh_prep
-dh_installdirs
-dh_installman
-dh_installdocs
-dh_installexamples
-dh_installinit
-dh_installcron
-dh_installchangelogs
-dh_link
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_perl
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_prep
Modified: spamassassin/trunk/debian/spamc.debhelper.log
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc.debhelper.log?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc.debhelper.log (original)
+++ spamassassin/trunk/debian/spamc.debhelper.log Tue May 24 16:13:18 2011
@@ -1,14 +0,0 @@
-dh_prep
-dh_prep
-dh_installdirs
-dh_installdocs
-dh_installman
-dh_installchangelogs
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_shlibdeps
-dh_gencontrol
-dh_md5sums
-dh_builddeb
Modified: spamassassin/trunk/debian/spamc.substvars
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc.substvars?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc.substvars (original)
+++ spamassassin/trunk/debian/spamc.substvars Tue May 24 16:13:18 2011
@@ -1,2 +0,0 @@
-shlibs:Depends=libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8k-1), zlib1g (>= 1:1.1.4)
-misc:Depends=
Modified: spamassassin/trunk/debian/spamc/DEBIAN/control
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/DEBIAN/control?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/DEBIAN/control (original)
+++ spamassassin/trunk/debian/spamc/DEBIAN/control Tue May 24 16:13:18 2011
@@ -1,22 +0,0 @@
-Package: spamc
-Source: spamassassin
-Version: 3.3.1-2
-Architecture: i386
-Maintainer: Noah Meyerhans <no...@debian.org>
-Installed-Size: 288
-Depends: libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8k-1), zlib1g (>= 1:1.1.4)
-Suggests: spamassassin
-Conflicts: spamassassin (<< 2.30-2)
-Section: mail
-Priority: optional
-Homepage: http://www.spamassassin.org/
-Description: Client for SpamAssassin spam filtering daemon
- spamc is the client to communicate with spamd, the daemonized form of
- SpamAssassin (see the spamassassin package). It is written in C for
- maximum speed and minimum loading overhead.
- .
- spamc is quite useful for integrating spamassassin into an MTA or
- into a .procmailrc file because of its speed.
- .
- This package is useless unless you have spamassassin installed,
- either on this machine or another local machine (i.e. a mail server).
Modified: spamassassin/trunk/debian/spamc/DEBIAN/md5sums
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/DEBIAN/md5sums?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/DEBIAN/md5sums (original)
+++ spamassassin/trunk/debian/spamc/DEBIAN/md5sums Tue May 24 16:13:18 2011
@@ -1,14 +0,0 @@
-6bfa02276ffe62b6fb154cdd56bb140c usr/bin/spamc
-436ad8183fc997f7a30dd931861d8c3c usr/share/doc/spamc/USAGE.gz
-a383214f4b37a0df5bc78359f39e2a1d usr/share/doc/spamc/TRADEMARK
-99798a6c35ab4e2c8c1dab173b437c6f usr/share/doc/spamc/changelog.Debian.gz
-23de00e370e172bf1131549161f4971b usr/share/doc/spamc/sample-spam.txt
-94b5c3770f23594baceba77a9003b30c usr/share/doc/spamc/procmailrc.example
-bf6568b37fa0a72d5c6bab1038060d3e usr/share/doc/spamc/README.Debian
-785a1a7ee0588d11f03f47f55c7db4b4 usr/share/doc/spamc/copyright
-c44606dd2d3006cee664f09347d07eb5 usr/share/doc/spamc/NEWS.Debian.gz
-a800757d80918df913ddcc72af90ade5 usr/share/doc/spamc/changelog.gz
-e051b9bad64afd81c079605df48aacf3 usr/share/doc/spamc/CREDITS.gz
-0c26000869b8039195c5dd7e1e0c4118 usr/share/doc/spamc/README.gz
-0ff08949774abbb48bd0ec2bf632195c usr/share/doc/spamc/sample-nonspam.txt.gz
-2e197b77a5a22f86040452459d35cad6 usr/share/man/man1/spamc.1.gz
Modified: spamassassin/trunk/debian/spamc/usr/share/doc/spamc/README.Debian
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/usr/share/doc/spamc/README.Debian?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/usr/share/doc/spamc/README.Debian (original)
+++ spamassassin/trunk/debian/spamc/usr/share/doc/spamc/README.Debian Tue May 24 16:13:18 2011
@@ -1,9 +0,0 @@
-spamc has been separated from the spamassassin package to accommodate
-people who wish to install spamd on a server, and just run spamc from
-other computers.
-
-Unless you are using spamc to connect to a spamd server on the local
-network, it is strongly recommended that you install spamassassin.
-
-Duncan Findlay
-duncf@debian.org
Modified: spamassassin/trunk/debian/spamc/usr/share/doc/spamc/TRADEMARK
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/usr/share/doc/spamc/TRADEMARK?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/usr/share/doc/spamc/TRADEMARK (original)
+++ spamassassin/trunk/debian/spamc/usr/share/doc/spamc/TRADEMARK Tue May 24 16:13:18 2011
@@ -1,67 +0,0 @@
-Guidelines for Use of the SpamAssassin Trademark
-
-The goal of these guidelines is to minimize the likelihood that email
-users and other relevant readers will be confused as to the relationship
-between the licensees of the SpamAssassin(tm) technology, and the project
-itself. The Apache Software Foundation has acquired the trademark and
-will be taking the appropriate steps to protect the valuable goodwill that
-has developed under the SpamAssassin mark.
-
-What do these guidelines cover?
-
-These guidelines explain how you can use the trademark SpamAssassin to
-refer to the SpamAssassin software as required for reasonable and
-customary use in describing the origin of the software and reproducing
-the content of the NOTICE file. All such use is at your own risk.
-Without advance written permission from the Apache Software Foundation,
-you may not use the SpamAssassin trademark, logos, or artwork for any
-other purpose. Under no circumstances may you use SpamAssassin in or as
-part of a product, service, company, domain, or other name, or in any
-slogan, tag line, promotional campaign title, advertising hook, or meta
-tag. If you have any concerns about whether your plans might conflict
-with these guidelines, please contact the Apache Software Foundation at
-<hu...@apache.org>.
-
-What are the rules?
-
-Proper use of the SpamAssassin trademark is simple: (1) stylize the mark
-properly, (2) use it in a grammatically appropriate way, (3) use the (tm)
-marking and attribute ownership in the fine print, and (4) avoid any
-misleading usage. The following paragraphs provide additional detail on
-these four steps.
-
-(1) Stylization of the SpamAssassin mark.
-
-SpamAssassin should always be written in mixed case with the initial S and
-the first A in assassin in capital letters, and the other letters in
-lowercase type. There is no space between "Spam" and "Assassin".
-
-(2) Grammatically Appropriate Use of the SpamAssassin mark.
-
-A trademark is used correctly when the word "brand" would comfortably fit
-between the mark and the following word. "SpamAssassin [brand] software"
-and "SpamAssassin [brand] technology" are correct uses; "SpamAssassin
-[brand] will intercept" is not. A trademark is an adjective that should
-be followed by an appropriate generic term. It may be cumbersome to
-always make technically correct use of the SpamAssassin trademark, but you
-should do so the first time you refer to the mark and as often as possible
-thereafter.
-
-Because a trademark is an adjective, it should never be used in a
-possessive form ("SpamAssassin's") or made plural ("SpamAssassins") or
-used as a verb. You also should not create new forms of the trademark
-("SpamAssassinate"). Consistency in repetition helps make a mark more
-memorable, and will promote the success of the SpamAssassin project.
-
-(3) Markings and Fine Print.
-
-The appropriate marking to use with SpamAssassin is the (tm) symbol
-(™). At the bottom of the page in which SpamAssassin is referenced,
-you should add the statement "SpamAssassin is a trademark of the Apache
-Software Foundation".
-
-(4) Avoiding Misleading Use.
-
-The SpamAssassin mark must never be used to imply that the Apache Software
-Foundation or the SpamAssassin project wrote, tested, endorses, or
-approves any particular third party product.
Modified: spamassassin/trunk/debian/spamc/usr/share/doc/spamc/copyright
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/usr/share/doc/spamc/copyright?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/usr/share/doc/spamc/copyright (original)
+++ spamassassin/trunk/debian/spamc/usr/share/doc/spamc/copyright Tue May 24 16:13:18 2011
@@ -1,30 +0,0 @@
-This package was debianized by Duncan Findlay <du...@debian.org> on
-Sat, 24 Nov 2001 18:37:39 -0500.
-
-It was downloaded from http://www.spamassassin.org/
-
-Upstream Authors: Justin Mason <jm...@jmason.org>,
- Craig Hughes <cr...@hughes-family.org>
- Daniel Quinlan <qu...@pathname.com>
- Theo van Dinter <fe...@kluge.net>
- and others
-
-Copyright 2000-2004 Justin Mason and others
-Copyright 2004-2008 Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-
-On Debian GNU/Linux systems, the complete text of the License can be
-found in /usr/share/common-licenses/Apache-2.0.
-
-You may also obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
Modified: spamassassin/trunk/debian/spamc/usr/share/doc/spamc/procmailrc.example
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/usr/share/doc/spamc/procmailrc.example?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/usr/share/doc/spamc/procmailrc.example (original)
+++ spamassassin/trunk/debian/spamc/usr/share/doc/spamc/procmailrc.example Tue May 24 16:13:18 2011
@@ -1,50 +0,0 @@
-# SpamAssassin sample procmailrc
-# ==============================
-
-# The following line is only used if you use a system-wide /etc/procmailrc.
-# See procmailrc(5) for infos on what it exactly does, the short version:
-# * It ensures that the correct user is passed to spamd if spamc is used
-# * The folders the mail is filed to later on is owned by the user, not
-# root.
-DROPPRIVS=yes
-
-# Pipe the mail through spamassassin (replace 'spamassassin' with 'spamc'
-# if you use the spamc/spamd combination)
-#
-# The condition line ensures that only messages smaller than 500 kB
-# (500 * 1024 = 512000 bytes) are processed by SpamAssassin. Most spam
-# isn't bigger than a few k and working with big messages can bring
-# SpamAssassin to its knees.
-#
-# The lock file ensures that only 1 spamassassin invocation happens
-# at 1 time, to keep the load down.
-#
-:0fw: spamassassin.lock
-* < 512000
-| spamassassin
-
-# Mails with a score of 15 or higher are almost certainly spam (with 0.05%
-# false positives according to rules/STATISTICS.txt). Let's put them in a
-# different mbox. (This one is optional.)
-:0:
-* ^X-Spam-Level: \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
-almost-certainly-spam
-
-# All mail tagged as spam (eg. with a score higher than the set threshold)
-# is moved to "probably-spam".
-:0:
-* ^X-Spam-Status: Yes
-probably-spam
-
-# Work around procmail bug: any output on stderr will cause the "F" in "From"
-# to be dropped. This will re-add it.
-# NOTE: This is probably NOT needed in recent versions of procmail
-:0
-* ^^rom[ ]
-{
- LOG="*** Dropped F off From_ header! Fixing up. "
-
- :0 fhw
- | sed -e '1s/^/F/'
-}
-
Modified: spamassassin/trunk/debian/spamc/usr/share/doc/spamc/sample-spam.txt
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamc/usr/share/doc/spamc/sample-spam.txt?rev=1127126&r1=1127125&r2=1127126&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamc/usr/share/doc/spamc/sample-spam.txt (original)
+++ spamassassin/trunk/debian/spamc/usr/share/doc/spamc/sample-spam.txt Tue May 24 16:13:18 2011
@@ -1,26 +0,0 @@
-Subject: Test spam mail (GTUBE)
-Message-ID: <GT...@example.net>
-Date: Wed, 23 Jul 2003 23:30:00 +0200
-From: Sender <se...@example.net>
-To: Recipient <re...@example.net>
-Precedence: junk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-This is the GTUBE, the
- Generic
- Test for
- Unsolicited
- Bulk
- Email
-
-If your spam filter supports it, the GTUBE provides a test by which you
-can verify that the filter is installed correctly and is detecting incoming
-spam. You can send yourself a test mail containing the following string of
-characters (in upper case and with no white spaces and line breaks):
-
-XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X
-
-You should send this test mail from an account outside of your network.
-