Subversion Repositories sa-exim

Compare Revisions

Ignore whitespace Rev 67 → Rev 68

/trunk/debian/dirs
File deleted
/trunk/debian/control
2,7 → 2,7
Section: mail
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Build-Depends: debhelper (>= 5), links, exim4-dev
Build-Depends: debhelper (>= 7), links, exim4-dev
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.kibibyte.se/sa-exim/trunk
Vcs-Browser: http://svn.kibibyte.se/sa-exim
/trunk/debian/compat
1,0 → 0,0
5
7
/trunk/debian/greylistclean.cron.d
0,0 → 1,3
# If you have configured spamd to run as a fixed user, change "Debian-exim" below.
# Be smart and don't run this as root, it doesn't need those perms
33 * * * * Debian-exim [ -x /usr/share/sa-exim/greylistclean ] && /usr/share/sa-exim/greylistclean
/trunk/debian/changelog
15,8 → 15,21
runs as the calling user (Closes: #563492). Add documentation to
README.Debian and remove recommendation to run spamd as "nobody" from
README and README.greylisting.
* Some tidying of debian/rules and the packaging in general:
* Add build-arch and build-indep targets.
* Remove configure target; it's not a mandatory target.
* Remove install target and use dh_install (and dh_lintian) to put the
files in the staging directory.
* Replace /var/spool/exim with /var/spool/sa-exim in the Debian patch
instead of using sed.
* Pass SUFF='' to the makefile instead of renaming sa-exim-4.2.1.so
afterwards.
* Put our version of the crontab file in debian/greylistclean.cron.d
and install it using dh_installcron.
* Upgrade to Debhelper compat level 7. Replace dh_clean -k with
dh_prep.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 18 Sep 2011 23:08:48 +0200
-- Magnus Holmgren <holmgren@debian.org> Sat, 24 Sep 2011 21:26:25 +0200
 
sa-exim (4.2.1-13) unstable; urgency=low
 
/trunk/debian/rules
13,61 → 13,40
CFLAGS += -O2
endif
 
configure: configure-stamp
configure-stamp:
dh_testdir
touch configure-stamp
build: build-arch
 
build: build-stamp
build-stamp: configure-stamp
build-indep:
 
build-arch: build-stamp
build-stamp:
dh_testdir
$(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CFLAGS)'
$(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CFLAGS)' SUFF=''
touch build-stamp
 
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
rm -f build-stamp
$(MAKE) clean
dh_clean
 
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install -m755 sa-exim-*so \
$(CURDIR)/debian/sa-exim/usr/lib/exim4/local_scan/sa-exim.so
install -m755 accept*so \
$(CURDIR)/debian/sa-exim/usr/lib/exim4/local_scan/accept.so
sed "s/\/var\/spool\/exim/\/var\/spool\/sa-exim/" < sa-exim.conf > \
$(CURDIR)/debian/sa-exim/etc/exim4/sa-exim.conf
chmod 644 $(CURDIR)/debian/sa-exim/etc/exim4/sa-exim.conf
install -m644 debian/15_sa-exim_plugin_path \
$(CURDIR)/debian/sa-exim/etc/exim4/conf.d/main
install -m644 Greylisting.pm \
$(CURDIR)/debian/sa-exim/usr/share/perl5/Mail/SpamAssassin/Plugin/Greylisting.pm
install -m644 greylistclean.cron \
$(CURDIR)/debian/sa-exim/etc/cron.d/greylistclean
install -m755 greylistclean \
$(CURDIR)/debian/sa-exim/usr/share/sa-exim/greylistclean
 
# Build architecture-independent files here.
binary-indep: build install
binary-indep:
# We have nothing to do by default.
 
# Build architecture-dependent files here.
binary-arch: build install
binary-arch: build
dh_testdir
dh_testroot
dh_prep
dh_install
dh_installchangelogs Changelog.html
dh_installdocs
dh_installexamples
dh_installdebconf
dh_installman
install -d debian/sa-exim/usr/share/lintian/overrides
install -m 644 debian/sa-exim.lintian-overrides \
debian/sa-exim/usr/share/lintian/overrides/sa-exim
dh_installcron --name=greylistclean
dh_lintian
dh_link
dh_strip
dh_compress
82,4 → 61,4
dh_builddeb
 
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
.PHONY: build build-indep build-arch clean binary-indep binary-arch binary
/trunk/debian/install
0,0 → 1,6
sa-exim.so usr/lib/exim4/local_scan
accept.so usr/lib/exim4/local_scan
sa-exim.conf etc/exim4/
debian/15_sa-exim_plugin_path etc/exim4/conf.d/main
Greylisting.pm usr/share/perl5/Mail/SpamAssassin/Plugin/
greylistclean usr/share/sa-exim
/trunk/sa-exim.conf
166,7 → 166,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAtimeoutsave: /var/spool/exim/SAtimeoutsave
SAtimeoutsave: /var/spool/sa-exim/SAtimeoutsave
 
# You can optionally save or not save messages that matched the above rule
SAtimeoutSavCond: 1
178,7 → 178,7
# SA-Exim will try to create the directory if it has the permissions to do
# so, check your maillog for failures (or create the directory yourself and
# make it writeable by exim)
SAerrorsave: /var/spool/exim/SAerrorsave
SAerrorsave: /var/spool/sa-exim/SAerrorsave
 
# You can optionally save or not save messages that matched the above rule
# You should not put double quotes around the expression
237,7 → 237,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAteergrubesave: /var/spool/exim/SAteergrube
SAteergrubesave: /var/spool/sa-exim/SAteergrube
 
# When you stall the sender, you will probably get the mail again.
# By default, we'll only save messages by message ID so that we don't save
267,7 → 267,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAdevnullsave: /var/spool/exim/SAdevnull
SAdevnullsave: /var/spool/sa-exim/SAdevnull
 
 
 
287,7 → 287,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SApermrejectsave: /var/spool/exim/SApermreject
SApermrejectsave: /var/spool/sa-exim/SApermreject
 
 
 
310,7 → 310,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAtemprejectsave: /var/spool/exim/SAtempreject
SAtemprejectsave: /var/spool/sa-exim/SAtempreject
 
# When you send back a temp reject code, you will get the mail again.
# By default, we'll only save messages by message ID so that we don't save
348,7 → 348,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAspamacceptsave: /var/spool/exim/SAspamaccept
SAspamacceptsave: /var/spool/sa-exim/SAspamaccept
 
# You can control which messages you want saved if you only want a subset
SAspamacceptSavCond: 0
361,7 → 361,7
# SA-Exim will try to create the directory if it has the permissions to do so,
# check your maillog for failures (or create the directory yourself and make it
# writeable by exim)
SAnotspamsave: /var/spool/exim/SAnotspam
SAnotspamsave: /var/spool/sa-exim/SAnotspam
 
# You can control which messages you want saved if you only want a subset
SAnotspamSavCond: 0
/trunk/greylistclean.cron
1,3 → 1,3
# If you have configured spamd to run as a fixed user, change "Debian-exim" below.
# Be smart and don't run this as root, it doesn't need those perms
33 * * * * Debian-exim [ -x /usr/share/sa-exim/greylistclean ] && /usr/share/sa-exim/greylistclean
# If you don't run spamd as nobody (you should), change the user below
# be smart and don't run this as root, it doesn't need those perms
33 * * * * nobody [ -x /usr/sbin/greylistclean ] && /usr/sbin/greylistclean