[Python-modules-commits] r18011 - in packages/parallelpython/trunk/debian (10 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Tue Aug 2 22:42:28 UTC 2011
Date: Tuesday, August 2, 2011 @ 22:42:27
Author: morph
Revision: 18011
Converted to '3.0 (quilt)' source format (so also dpatch -> quilt)
Added:
packages/parallelpython/trunk/debian/patches/10_remove_default_password.patch
packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.patch
packages/parallelpython/trunk/debian/patches/series
Modified:
packages/parallelpython/trunk/debian/changelog
packages/parallelpython/trunk/debian/control
packages/parallelpython/trunk/debian/rules
packages/parallelpython/trunk/debian/source/format
Deleted:
packages/parallelpython/trunk/debian/patches/00list
packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.dpatch
Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/changelog 2011-08-02 22:42:27 UTC (rev 18011)
@@ -5,8 +5,9 @@
- updated both upstream and packaging copyright years
* debian/control
- bump Standards-Version to 3.9.2 (no changes needed)
+ * Converted to '3.0 (quilt)' source format (so also dpatch -> quilt)
- -- Sandro Tosi <morph at debian.org> Tue, 02 Aug 2011 23:56:05 +0200
+ -- Sandro Tosi <morph at debian.org> Wed, 03 Aug 2011 00:41:52 +0200
parallelpython (1.6.0-1) unstable; urgency=low
Modified: packages/parallelpython/trunk/debian/control
===================================================================
--- packages/parallelpython/trunk/debian/control 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/control 2011-08-02 22:42:27 UTC (rev 18011)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all (>= 2.5.4-1~), dpatch
+Build-Depends: debhelper (>= 5.0.38), python-all (>= 2.5.4-1~)
Build-Depends-Indep: python-support (>= 0.4)
Homepage: http://www.parallelpython.com/
Standards-Version: 3.9.2
Deleted: packages/parallelpython/trunk/debian/patches/00list
===================================================================
--- packages/parallelpython/trunk/debian/patches/00list 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/patches/00list 2011-08-02 22:42:27 UTC (rev 18011)
@@ -1,2 +0,0 @@
-10_remove_default_password
-20_hyphen-used-as-minus-sign
Deleted: packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch 2011-08-02 22:42:27 UTC (rev 18011)
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_remove_default_password.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch removes the default password from pp code, requiring users to
-## DP: explicitly write one; it updates the documentation along the source code
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' parallelpython~/doc/ppdoc.html parallelpython/doc/ppdoc.html
---- parallelpython~/doc/ppdoc.html 2010-07-11 09:29:04.000000000 +0200
-+++ parallelpython/doc/ppdoc.html 2010-07-15 18:47:28.987525212 +0200
-@@ -43,7 +43,7 @@
- -s secret : secret for authentication
- -t seconds : timeout to exit if no connections with clients exist
- </pre>
--<hr /><h1 id="COMMANDLINE"> Security and secret key<a name="SECURITY" title="SECURITY"></a></h1><p> Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (-s command line argument) which should be paired with the matching <em>secret</em> keyword of PP Server class constructor. Since PP 1.5.3 it is possible to set secret key by assigning <strong>pp_secret</strong> variable in the configuration file <strong>.pythonrc.py</strong> which should be located in the user home directory (please make this file readable and writable only by user). The secret key set in .pythonrc.py could be overridden by command line argument (for ppserver.py) and <em>secret</em> keyword (for PP Server class constructor). </p>
-+<hr /><h1 id="COMMANDLINE"> Security and secret key<a name="SECURITY" title="SECURITY"></a></h1><p>Due to the security concerns, in Debian we decided to disable default password authentication, and require to run <strong>ppserver</strong> with a non-trivial secret key (<trong>-s</strong> command line argument) which should be paired with the matching <em>secret</em> keyword of PP Server class constructor. An alternative way to set a secret key is by assigning <strong>pp_secret</strong> variable in the configuration file <strong>.pythonrc.py</strong> which should be located in the user home directory (please make this file readable and writable only by user). The secret key set in <strong>.pythonrc.py</strong> could be overridden by command line argument (for <strong>ppserver</strong>) and <em>secret</em> keyword (for PP Server class constructor). Note that passing the password on the command line allows every user to see it (e.g. using <strong>ps(1)</strong>), and that running it on an open/untrusted network can be a security problem as traffic, including the password, is not encrypted.</p>
-
- </td>
- </tr>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' parallelpython~/pp.py parallelpython/pp.py
---- parallelpython~/pp.py 2010-05-30 08:10:29.000000000 +0200
-+++ parallelpython/pp.py 2010-07-15 18:52:16.612523852 +0200
-@@ -285,7 +285,6 @@
- """
-
- default_port = 60000
-- default_secret = "epo20pdosl;dksldkmm"
-
- def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
- restart=False, proto=2):
-@@ -296,9 +295,8 @@
- the number of processors in the system
- ppservers - list of active parallel python execution servers
- to connect with
-- secret - passphrase for network connections, if omitted a default
-- passphrase will be used. It's highly recommended to use a
-- custom passphrase for all network connections.
-+ secret - passphrase for network connections; it can be set via
-+ command-line or configuration file
- restart - wheather to restart worker process after each task completion
- proto - protocol number for pickle module
-
-@@ -372,7 +370,7 @@
- raise TypeError("secret must be of a string type")
- self.secret = str(secret)
- else:
-- self.secret = Server.default_secret
-+ raise ValueError("secret must be set using command-line option or configuration file")
- self.__connect()
- self.__creation_time = time.time()
- self.logger.info("pp local server started with %d workers"
Added: packages/parallelpython/trunk/debian/patches/10_remove_default_password.patch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.patch (rev 0)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.patch 2011-08-02 22:42:27 UTC (rev 18011)
@@ -0,0 +1,45 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: This patch removes the default password from pp code, requiring users to
+explicitly write one; it updates the documentation along the source code
+--- parallelpython-1.6.1.orig/doc/ppdoc.html
++++ parallelpython-1.6.1/doc/ppdoc.html
+@@ -43,7 +43,7 @@
+ -s secret : secret for authentication
+ -t seconds : timeout to exit if no connections with clients exist
+ </pre>
+-<hr /><h1 id="COMMANDLINE"> Security and secret key<a name="SECURITY" title="SECURITY"></a></h1><p> Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (-s command line argument) which should be paired with the matching <em>secret</em> keyword of PP Server class constructor. Since PP 1.5.3 it is possible to set secret key by assigning <strong>pp_secret</strong> variable in the configuration file <strong>.pythonrc.py</strong> which should be located in the user home directory (please make this file readable and writable only by user). The secret key set in .pythonrc.py could be overridden by command line argument (for ppserver.py) and <em>secret</em> keyword (for PP Server class constructor). </p>
++<hr /><h1 id="COMMANDLINE"> Security and secret key<a name="SECURITY" title="SECURITY"></a></h1><p>Due to the security concerns, in Debian we decided to disable default password authentication, and require to run <strong>ppserver</strong> with a non-trivial secret key (<trong>-s</strong> command line argument) which should be paired with the matching <em>secret</em> keyword of PP Server class constructor. An alternative way to set a secret key is by assigning <strong>pp_secret</strong> variable in the configuration file <strong>.pythonrc.py</strong> which should be located in the user home directory (please make this file readable and writable only by user). The secret key set in <strong>.pythonrc.py</strong> could be overridden by command line argument (for <strong>ppserver</strong>) and <em>secret</em> keyword (for PP Server class constructor). Note that passing the password on the command line allows every user to see it (e.g. using <strong>ps(1)</strong>), and that running it on an open/untrusted network can be a security problem as traffic, including the password, is not encrypted.</p>
+
+ </td>
+ </tr>
+--- parallelpython-1.6.1.orig/pp.py
++++ parallelpython-1.6.1/pp.py
+@@ -280,7 +280,6 @@
+ """
+
+ default_port = 60000
+- default_secret = "epo20pdosl;dksldkmm"
+
+ def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
+ restart=False, proto=2):
+@@ -291,9 +290,8 @@
+ the number of processors in the system
+ ppservers - list of active parallel python execution servers
+ to connect with
+- secret - passphrase for network connections, if omitted a default
+- passphrase will be used. It's highly recommended to use a
+- custom passphrase for all network connections.
++ secret - passphrase for network connections; it can be set via
++ command-line or configuration file
+ restart - whether to restart worker process after each task completion
+ proto - protocol number for pickle module
+
+@@ -369,7 +367,7 @@
+ raise TypeError("secret must be of a string type")
+ self.secret = str(secret)
+ else:
+- self.secret = Server.default_secret
++ raise ValueError("secret must be set using command-line option or configuration file")
+ self.__connect()
+ self.__creation_time = time.time()
+ self.logger.info("pp local server started with %d workers"
Deleted: packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.dpatch 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.dpatch 2011-08-02 22:42:27 UTC (rev 18011)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_hyphen-used-as-minus-sign.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: escape minus sign where needed
-
- at DPATCH@
-diff -urNad parallelpython~/doc/ppserver.1 parallelpython/doc/ppserver.1
---- parallelpython~/doc/ppserver.1 2009-02-23 08:34:09.000000000 +0100
-+++ parallelpython/doc/ppserver.1 2009-10-31 21:58:09.078064871 +0100
-@@ -49,7 +49,7 @@
- documentation, examples and support forums
- .br
- .SH SECURITY
--Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
-+Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (\-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
- .B pp_secret
- variable in the configuration file
- .B .pythonrc.py
Added: packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.patch
===================================================================
--- packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.patch (rev 0)
+++ packages/parallelpython/trunk/debian/patches/20_hyphen-used-as-minus-sign.patch 2011-08-02 22:42:27 UTC (rev 18011)
@@ -0,0 +1,13 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: escape minus sign where needed
+--- parallelpython-1.6.1.orig/doc/ppserver.1
++++ parallelpython-1.6.1/doc/ppserver.1
+@@ -49,7 +49,7 @@
+ documentation, examples and support forums
+ .br
+ .SH SECURITY
+-Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
++Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (\-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
+ .B pp_secret
+ variable in the configuration file
+ .B .pythonrc.py
Added: packages/parallelpython/trunk/debian/patches/series
===================================================================
--- packages/parallelpython/trunk/debian/patches/series (rev 0)
+++ packages/parallelpython/trunk/debian/patches/series 2011-08-02 22:42:27 UTC (rev 18011)
@@ -0,0 +1,2 @@
+10_remove_default_password.patch
+20_hyphen-used-as-minus-sign.patch
Modified: packages/parallelpython/trunk/debian/rules
===================================================================
--- packages/parallelpython/trunk/debian/rules 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/rules 2011-08-02 22:42:27 UTC (rev 18011)
@@ -3,17 +3,16 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
include /usr/share/python/python.mk
-build: patch
+build:
dh_testdir
python setup.py build
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
Modified: packages/parallelpython/trunk/debian/source/format
===================================================================
--- packages/parallelpython/trunk/debian/source/format 2011-08-02 21:56:36 UTC (rev 18010)
+++ packages/parallelpython/trunk/debian/source/format 2011-08-02 22:42:27 UTC (rev 18011)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list