spfmilter (1.99+0.97-3) debian-dir only changes

--- spfmilter-1.99+0.97.orig/debian/README.Debian
+++ spfmilter-1.99+0.97/debian/README.Debian
@@ -0,0 +1,28 @@
+spfmilter for Debian
+--------------------
+
+Note on features:
+
+libspf doesn't support --recipientmx, and spfmilter doesn't build
+against current versions of libspf2. As a result, that feature is
+disabled in this package.
+
+Milter.macros.envfrom and the {auth_type} macro:
+
+spfmilter is able to always "pass" users who have successfully authenticated
+via SASL. In order to do this, however, Sendmail must pass the {auth_type}
+macro to envfrom Milter callbacks. The default is to do this if any Milters
+are available, but some Milter software instructs users to modify the list.
+
+There are two ways to fix this:
+1. Remove any custom re-definition of Milter.macros.envfrom in sendmail.cf
+   or confMILTER_MACROS_ENVFROM in sendmail.mc, or
+2. Add {auth_type} to the redefined Milter.macros.envfrom or
+   confMILTER_MACROS_ENVFROM, i.e.:
+	O Milter.macros.envfrom=i, {auth_type}
+	define(`confMILTER_MACROS_ENVFROM',`i, {auth_type}')
+
+If you are receiving this warning in error (perhaps because you are running
+spfmilter on a server other than your Sendmail host) or if you simply don't
+want to pass {auth_type} in envfrom callbacks, you can disable this check
+in /etc/default/spfmilter.
--- spfmilter-1.99+0.97.orig/debian/changelog
+++ spfmilter-1.99+0.97/debian/changelog
@@ -0,0 +1,77 @@
+spfmilter (1.99+0.97-3) unstable; urgency=low
+
+  * Integrate NMU from Luk Claes. Closes: #417039
+  * Removed --recipientmx from docs and default file since it's
+    not supported in libspf. Closes: #389927
+
+ -- Mike Markley <mike@markley.org>  Tue, 05 Jun 2007 21:53:39 -0700
+
+spfmilter (1.99+0.97-2.1) unstable; urgency=high
+
+  * Non-maintainer upload during BSP.
+  * Fix unconditional use of deluser (Closes: #417039).
+
+ -- Luk Claes <luk@debian.org>  Sun, 20 May 2007 16:04:55 +0200
+
+spfmilter (1.99+0.97-2) unstable; urgency=low
+
+  * Add -L/usr/lib/libmilter to LDFLAGS to support libmilter0 ->
+    libmilter1 transition. Also fixes FTBFS and Closes: #424449.
+
+ -- Mike Markley <mike@markley.org>  Sat, 19 May 2007 19:46:50 -0700
+
+spfmilter (1.99+0.97-1) unstable; urgency=low
+
+  * New upstream version.
+  * Patch init script to create /var/run/spfmilter if needed
+    (Closes: #392307)
+  * Doc fix (sample sendmail config) (Closes: #392885)
+  * Use start-stop-daemon's --retry so init script waits for processes
+    to die (Closes: #291949)
+
+ -- Mike Markley <mike@markley.org>  Sat, 14 Oct 2006 15:44:29 -0700
+
+spfmilter (1.99+0.95-4.1) unstable; urgency=low
+
+  * NMU
+  * Built against libspf (closes: #306071, #307086, #316239)
+  * Added dependency on adduser (closes: #306202)
+
+ -- Peter Eisentraut <petere@debian.org>  Wed,  7 Jun 2006 00:34:54 +0200
+
+spfmilter (1.99+0.95-4) unstable; urgency=low
+
+  * Drop --pidfile argument in init script's stop stanza since the
+    main spfmilter process does not seem to signal children
+    Closes: #290015
+
+ -- Mike Markley <mike@markley.org>  Mon, 17 Jan 2005 01:45:17 -0800
+
+spfmilter (1.99+0.95-3) unstable; urgency=low
+
+  * Versioned build-depends on libspf2-dev, which apparently had some
+    issues on arm prior to 1.0.4-4. Closes: #283268
+
+ -- Mike Markley <mike@markley.org>  Mon, 17 Jan 2005 01:18:39 -0800
+
+spfmilter (1.99+0.95-2) unstable; urgency=low
+
+  * Add a test & warning for {auth_type} in Milter.macros.envfrom,
+    which is required if the administrator wants to always pass
+    authenticated users
+
+ -- Mike Markley <mike@markley.org>  Thu, 18 Nov 2004 16:08:57 -0800
+
+spfmilter (1.99+0.95-1) unstable; urgency=low
+
+  * New upstream version
+  * Funny version number until 2.0 comes out; 0.95 is effectively
+    2.0 prerelease.
+
+ -- Mike Markley <mike@markley.org>  Wed,  3 Nov 2004 00:04:07 -0800
+spfmilter (1.0.7+0.93-1) unstable; urgency=low
+
+  * Initial Release (Closes: #262205)
+  * Use spfmilter.c and version.h from 0.93 as per upstream advice
+
+ -- Mike Markley <mike@markley.org>  Sat,  7 Aug 2004 23:51:12 -0700
--- spfmilter-1.99+0.97.orig/debian/compat
+++ spfmilter-1.99+0.97/debian/compat
@@ -0,0 +1 @@
+4
--- spfmilter-1.99+0.97.orig/debian/control
+++ spfmilter-1.99+0.97/debian/control
@@ -0,0 +1,17 @@
+Source: spfmilter
+Section: mail
+Priority: extra
+Maintainer: Mike Markley <mike@markley.org>
+Build-Depends: debhelper (>= 4.0.0), libspf-dev, libmilter-dev (>= 8.13.0-2)
+Standards-Version: 3.7.2
+
+Package: spfmilter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Description: A simple milter for performing SPF checks
+ spfmilter implements Sender Policy Framework (SPF) checks using the
+ Milter (Mail Filter) interface. This interface is primarily used to plug
+ filters in to Sendmail.
+ .
+ See http://openspf.org for more on SPF and http://www.milter.org for
+ more on Milter.
--- spfmilter-1.99+0.97.orig/debian/copyright
+++ spfmilter-1.99+0.97/debian/copyright
@@ -0,0 +1,37 @@
+This package was debianized by Mike Markley <mike@markley.org> on
+Sun, 18 Jul 2004 19:48:53 -0700.
+
+It was downloaded from http://www.acme.com/software/spfmilter/ and http://www.libspf2.org/download.html 
+
+Upstream Authors: Jef Poskanzer <jef@acme.com>, Shevek <spf@anarres.org>
+
+Copyright:
+
+/* spfmilter - SPF mail filter module
+**
+** Copyright <A9> 2004 by Jef Poskanzer <jef@acme.com>.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+** SUCH DAMAGE.
+**
+** For commentary on this license please see http://www.acme.com/license.html
+*/
--- spfmilter-1.99+0.97.orig/debian/dirs
+++ spfmilter-1.99+0.97/debian/dirs
@@ -0,0 +1,2 @@
+usr/sbin
+var/run/spfmilter
--- spfmilter-1.99+0.97.orig/debian/docs
+++ spfmilter-1.99+0.97/debian/docs
@@ -0,0 +1 @@
+README
--- spfmilter-1.99+0.97.orig/debian/postinst
+++ spfmilter-1.99+0.97/debian/postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	if ! id -u spfmilter >/dev/null 2>&1; then
+		adduser --quiet --system --home /var/run/spfmilter spfmilter
+	fi
+	chown spfmilter /var/run/spfmilter
+fi
+
+#DEBHELPER#
+
+exit 0
--- spfmilter-1.99+0.97.orig/debian/postrm
+++ spfmilter-1.99+0.97/debian/postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+	if [ -x /usr/sbin/deluser ] && id -u spfmilter >/dev/null 2>&1; then
+		deluser --quiet spfmilter
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- spfmilter-1.99+0.97.orig/debian/recipientmx-disable.patch
+++ spfmilter-1.99+0.97/debian/recipientmx-disable.patch
@@ -0,0 +1,13 @@
+RCS file: /usr/local/cvs/spfmilter/spfmilter.8,v
+retrieving revision 1.4
+diff -u -r1.4 spfmilter.8
+--- spfmilter.8	15 Oct 2006 00:52:39 -0000	1.4
++++ spfmilter.8	20 May 2007 23:18:15 -0000
+@@ -79,6 +79,7 @@
+ The assumption here is that your MX-secondaries are themselves running
+ SPF and have already done the real check when they initially received
+ the message.
++.B Note: This build of spfmilter does not support this option because library limitations.
+ .TP
+ .B --explanation or -e
+ The explanation message that gets returned in mail bounce messages.
--- spfmilter-1.99+0.97.orig/debian/rules
+++ spfmilter-1.99+0.97/debian/rules
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS	= -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+	dh_testdir
+	LDFLAGS="-L/usr/lib/libmilter" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	-$(MAKE) distclean
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	$(MAKE) install prefix=$(CURDIR)/debian/spfmilter/usr
+
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+#	dh_installdebconf	
+#	dh_installlogrotate
+	dh_installinit
+#	dh_installcron
+	dh_installman spfmilter.8
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- spfmilter-1.99+0.97.orig/debian/spfmilter.default
+++ spfmilter-1.99+0.97/debian/spfmilter.default
@@ -0,0 +1,15 @@
+# Defaults for spfmilter
+
+# Some possibly useful options:
+# --trustedforwarders (use the trusted-forwarder.org whitelist)
+# --localpolicy "local SPF policy" (add a local SPF policy to all checks)
+# remove --markonly to reject SPF-fail emails in the SMTP conversation
+#   (instead of merely tagging their headers)
+DAEMON_OPTS="--markonly"
+# Uncomment this to disable the warning about {auth_type} missing from
+# Milter.macros.envfrom (see README.Debian.gz for more information)
+#NO_MACROS_CHECK=1
+# Use this to listen on an alternate socket
+#SOCKET="inet:54321" # listen to the whole world on port 54321
+#SOCKET="inet:12345@localhost" # listen just on loopback on port 12345
+#SOCKET="inet:12345@192.0.2.1" # listen on 192.0.2.1 on port 12345
--- spfmilter-1.99+0.97.orig/debian/spfmilter.init
+++ spfmilter-1.99+0.97/debian/spfmilter.init
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# $Id: spfmilter.init,v 1.7 2007-05-20 02:48:13 madhack Exp $
+#
+### BEGIN INIT INFO
+# Provides:		spfmilter
+# Required-Start:	$syslog $local_fs
+# Required-Stop:	$syslog $local_fs
+# Should-Start:		$network
+# Should-Stop:		$network
+# Default-Start:	2 3 4 5
+# Default-Stop:		0 1 6
+# Short-Description:	Starts or stops spfmilter daemon
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/spfmilter
+NAME=spfmilter
+DESC="SPF Milter"
+RUNDIR=/var/run/$NAME
+SOCKET=$RUNDIR/$NAME.sock
+USER=spfmilter
+
+test -x $DAEMON || exit 0
+
+# Include spfmilter defaults if available
+if [ -f /etc/default/spfmilter ] ; then
+	. /etc/default/spfmilter
+fi
+
+set -e
+
+case "$1" in
+  start)
+	if [ -z "$NO_MACROS_CHECK" ]; then
+		/usr/sbin/sendmail -d64.5 -bt </dev/null | grep "milter_set_option(macros.envfrom" | grep "{auth_type}" >/dev/null || \
+		echo "WARNING: {auth_type} not defined in Milter.macros.envfrom. Please see /usr/share/doc/spfmilter/README.Debian.gz for more information."
+	fi
+	if [ ! -d $RUNDIR ]; then
+		mkdir $RUNDIR
+		chown $USER $RUNDIR
+	fi
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --exec $DAEMON -- \
+		--user $USER --pidfile $RUNDIR/$NAME.pid \
+		$DAEMON_OPTS $SOCKET
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --retry 15 --exec $DAEMON
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --retry 15 --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --exec $DAEMON -- \
+		--user $USER --pidfile $RUNDIR/$NAME.pid \
+		$DAEMON_OPTS $SOCKET
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- spfmilter-1.99+0.97.orig/debian/patches/man-section
+++ spfmilter-1.99+0.97/debian/patches/man-section
@@ -0,0 +1,13 @@
+Index: spfmilter.8
+===================================================================
+RCS file: /usr/local/cvs/debian/spfmilter/spfmilter.8,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 spfmilter.8
+--- spfmilter.8	30 Jul 2004 05:19:13 -0000	1.1.1.1
++++ spfmilter.8	30 Jul 2004 05:20:17 -0000
+@@ -1,4 +1,4 @@
+-.TH spfmilter 1 "25 May 2004"
++.TH spfmilter 8 "25 May 2004"
+ .SH NAME
+ spfmilter - SPF mail filter module
+ .SH SYNOPSIS