[Python-apps-commits] r1614 - in packages/pypolicyd-spf/trunk/debian (4 files)

[kitterma-guest at users.alioth.debian.org]

    Date: Saturday, July 26, 2008 @ 04:40:46
  Author: kitterma-guest
Revision: 1614

New upstream release.

Added:
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
Modified:
  packages/pypolicyd-spf/trunk/debian/changelog
  packages/pypolicyd-spf/trunk/debian/control
  packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch

Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog	2008-07-25 21:06:03 UTC (rev 1613)
+++ packages/pypolicyd-spf/trunk/debian/changelog	2008-07-26 04:40:46 UTC (rev 1614)
@@ -1,3 +1,14 @@
+pypolicyd-spf (0.7.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Documentation updates
+    - Freshen install-conf-fix.patch for new release
+  * Create and use dedicated user instead of nobody
+    - Add postfix-policyd-spf-python.postinst to create user if needed
+    - Add depends on adduser 
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 26 Jul 2008 00:14:50 -0400
+
 pypolicyd-spf (0.7-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pypolicyd-spf/trunk/debian/control
===================================================================
--- packages/pypolicyd-spf/trunk/debian/control	2008-07-25 21:06:03 UTC (rev 1613)
+++ packages/pypolicyd-spf/trunk/debian/control	2008-07-26 04:40:46 UTC (rev 1614)
@@ -14,7 +14,7 @@
 Package: postfix-policyd-spf-python
 Architecture: all
 XB-Python-Version: current
-Depends: ${python:Depends}, python-spf (>= 2.0), postfix (>= 2.1)
+Depends: ${python:Depends}, python-spf (>= 2.0), postfix (>= 2.1), adduser
 Provides: python-policyd-spf
 Replaces: python-policyd-spf
 Conflicts: python-policyd-spf 

Modified: packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch	2008-07-25 21:06:03 UTC (rev 1613)
+++ packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch	2008-07-26 04:40:46 UTC (rev 1614)
@@ -1,6 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7/policyd-spf pypolicyd-spf-0.7.new/policyd-spf
---- pypolicyd-spf-0.7/policyd-spf	2008-06-22 12:44:25.000000000 -0400
-+++ pypolicyd-spf-0.7.new/policyd-spf	2008-06-23 00:49:12.000000000 -0400
+diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7.1/policyd-spf pypolicyd-spf-0.7.1.new/policyd-spf
+--- pypolicyd-spf-0.7.1/policyd-spf	2008-07-25 23:58:29.000000000 -0400
++++ pypolicyd-spf-0.7.1.new/policyd-spf	2008-07-26 00:19:25.000000000 -0400
 @@ -385,7 +385,7 @@
  ###################################################
  #  load config file  {{{1
@@ -10,9 +10,9 @@
  if len(sys.argv) > 1:
      if sys.argv[1] in ( '-?', '--help', '-h' ):
          print 'usage: policyd-spf [<configfilename>]'
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7/policyd-spf.1 pypolicyd-spf-0.7.new/policyd-spf.1
---- pypolicyd-spf-0.7/policyd-spf.1	2008-06-20 23:24:45.000000000 -0400
-+++ pypolicyd-spf-0.7.new/policyd-spf.1	2008-06-23 00:51:28.000000000 -0400
+diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7.1/policyd-spf.1 pypolicyd-spf-0.7.1.new/policyd-spf.1
+--- pypolicyd-spf-0.7.1/policyd-spf.1	2008-07-25 23:58:29.000000000 -0400
++++ pypolicyd-spf-0.7.1.new/policyd-spf.1	2008-07-26 00:21:16.000000000 -0400
 @@ -145,12 +145,13 @@
  
  $ policyd-spf \-h (Display usage message)
@@ -32,9 +32,26 @@
  
  Additionally, whitelisting certain IP addresses or IP addresses used by listed
  domains from SPF checks is supported.  Skipping SPF checks for local submission
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7/policyd-spf.conf.5 pypolicyd-spf-0.7.new/policyd-spf.conf.5
---- pypolicyd-spf-0.7/policyd-spf.conf.5	2008-06-20 23:21:54.000000000 -0400
-+++ pypolicyd-spf-0.7.new/policyd-spf.conf.5	2008-06-23 00:49:12.000000000 -0400
+@@ -251,14 +252,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:
+ 
+diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7.1/policyd-spf.conf.5 pypolicyd-spf-0.7.1.new/policyd-spf.conf.5
+--- pypolicyd-spf-0.7.1/policyd-spf.conf.5	2008-07-25 23:58:29.000000000 -0400
++++ pypolicyd-spf-0.7.1.new/policyd-spf.conf.5	2008-07-26 00:19:25.000000000 -0400
 @@ -138,7 +138,7 @@
  .SH "USAGE"
  .IX Header "USAGE"
@@ -53,9 +70,9 @@
  
  Additionally, whitelisting certain IP addresses from SPF checks is supported.
  The this man page and the sample configuration file show the format to use.
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7/setup.py pypolicyd-spf-0.7.new/setup.py
---- pypolicyd-spf-0.7/setup.py	2008-06-18 01:50:24.000000000 -0400
-+++ pypolicyd-spf-0.7.new/setup.py	2008-06-23 00:49:12.000000000 -0400
+diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.7.1/setup.py pypolicyd-spf-0.7.1.new/setup.py
+--- pypolicyd-spf-0.7.1/setup.py	2008-07-25 23:58:29.000000000 -0400
++++ pypolicyd-spf-0.7.1.new/setup.py	2008-07-26 00:19:25.000000000 -0400
 @@ -17,8 +17,8 @@
        scripts = ['policyd-spf'],
        data_files=[(os.path.join('share', 'man', 'man1'),

Added: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	                        (rev 0)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	2008-07-26 04:40:46 UTC (rev 1614)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	if ! id -u policyd-spf >/dev/null 2>&1; then
+		adduser --quiet --system --group --no-create-home policyd-spf
+	elif [ -n "$2" ]; then
+		addgroup --quiet --system policyd-spf
+		usermod -g policyd-spf policyd-spf
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
+