This patch is to integrate with the package namespace for Debian and derived

distributions.  It has not gone, and does not need to go, upstream.

Index: pypolicyd-spf-1.1/policyd-spf

===================================================================

--- pypolicyd-spf-1.1.orig/policyd-spf	2012-07-21 21:24:58.754207273 -0400

+++ pypolicyd-spf-1.1/policyd-spf	2012-07-21 21:48:28.234165627 -0400

@@ -644,7 +644,7 @@

 ###################################################

 #  load config file  {{{1

 #  Default location:

-configFile = '/etc/python-policyd-spf/policyd-spf.conf'

+configFile = '/etc/postfix-policyd-spf-python/policyd-spf.conf'

 if len(sys.argv) > 1:

     if sys.argv[1] in ( '-?', '--help', '-h' ):

         print('usage: policyd-spf [<configfilename>]')

Index: pypolicyd-spf-1.1/policyd-spf.1

===================================================================

--- pypolicyd-spf-1.1.orig/policyd-spf.1	2012-07-21 21:24:58.758207273 -0400

+++ pypolicyd-spf-1.1/policyd-spf.1	2012-07-21 21:48:28.238165627 -0400

@@ -145,12 +145,13 @@

 $ policyd-spf \-h (Display usage message)

-$ policyd-spf /etc/policyd-spf/policyd-spf.conf (Config file name to use)

+$ policyd-spf /etc/postfix-policyd-spf-python/policyd-spf.conf

+  (Config file name to use)

-Configuration options are described in the sample configuration file provided

-with the package (policyd-spf.conf.commented) and in policyd-spf.conf(5).  The

-provided setup.py installs an uncommented configuration file in 

-/etc/policyd-spf/.

+Configuration options are described in the sample configuration file installed

+in /usr/share/doc/postfix-policyd-spf-python (policyd-spf.conf.commented) and

+in policyd-spf.conf(5).  The provided setup.py installs an uncommented

+configuration file in /etc/postfix-policyd-spf-python/.

 Additionally, whitelisting certain IP addresses or IP addresses used by listed

 domains from SPF checks is supported.  Skipping SPF checks for local submission

@@ -254,14 +255,12 @@

  1. Add the following to /etc/postfix/master.cf:

         policyd-spf  unix  -       n       n       -       0       spawn

-            user=nobody argv=/usr/bin/policyd-spf

+            user=policyd-spf argv=/usr/bin/policyd-spf

     NOTE: Check the path to both the installed Python interpreter and

           policyd-spf.  These vary from system to system.  To use non-default

           settings, you must also add the config file (see above and 

-          policyd-spf.conf(5) for details).  If you run other services with

-          user nobody, create a dedicated user for this policy server and use

-          that instead.

+          policyd-spf.conf(5) for details).

  2. Configure the Postfix policy service in /etc/postfix/main.cf:

Index: pypolicyd-spf-1.1/policyd-spf.conf.5

===================================================================

--- pypolicyd-spf-1.1.orig/policyd-spf.conf.5	2012-07-21 21:24:58.778207272 -0400

+++ pypolicyd-spf-1.1/policyd-spf.conf.5	2012-07-21 21:48:28.238165627 -0400

@@ -138,7 +138,7 @@

 .SH "USAGE"

 .IX Header "USAGE"

 Usage:

-  policyd-spf [/etc/policyd-spf/policyd-spf.conf]

+  policyd-spf [/etc/postfix-policyd-spf-python/policyd-spf.conf]

 .SH "OTHER DOCUMENTATION"

 .IX Header "OTHER DOCUMENTATION"

@@ -166,7 +166,7 @@

 Configuration options are described here and in the configuration file 

 provided with the package.  The provided setup.py installs this configuration 

-file in /etc/policyd-spf/.

+file in /etc/postfix-policyd-spf-python/.

 Additionally, whitelisting certain IP addresses from SPF checks is supported.

 This man page and the sample configuration file show the format to use.

Index: pypolicyd-spf-1.1/setup.py

===================================================================

--- pypolicyd-spf-1.1.orig/setup.py	2012-07-21 21:24:58.758207273 -0400

+++ pypolicyd-spf-1.1/setup.py	2012-07-21 21:48:28.238165627 -0400

@@ -15,9 +15,9 @@

       scripts = ['policyd-spf'],

       data_files=[(os.path.join('share', 'man', 'man1'),

           ['policyd-spf.1']), (os.path.join('share', 'man', 'man5'),

-          ['policyd-spf.conf.5']), (os.path.join('/etc', 'python-policyd-spf'),

-          ['policyd-spf.conf']), (os.path.join('share', 'man', 'man5'),

-          ['policyd-spf.peruser.5'])],

+          ['policyd-spf.conf.5']), (os.path.join('../etc',

+          'postfix-policyd-spf-python'), ['policyd-spf.conf']),

+          (os.path.join('share', 'man', 'man5'), ['policyd-spf.peruser.5'])],

       classifiers = [

         'Development Status :: 5 - Production/Stable',

         'Environment :: No Input/Output (Daemon)',