[Python-modules-commits] r28314 - in packages/plainbox/trunk/debian (4 files)

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

    Date: Monday, March 24, 2014 @ 12:31:55
  Author: zyga-guest
Revision: 28314

* New upstream release
* debian/patches/disable-development-option: dropped, applied upstream
* debian/copyright: associate vendorized copies of argparse with appropriate
  copyright section

Modified:
  packages/plainbox/trunk/debian/changelog
  packages/plainbox/trunk/debian/copyright
  packages/plainbox/trunk/debian/patches/series
Deleted:
  packages/plainbox/trunk/debian/patches/disable-development-option

Modified: packages/plainbox/trunk/debian/changelog
===================================================================
--- packages/plainbox/trunk/debian/changelog	2014-03-24 03:14:00 UTC (rev 28313)
+++ packages/plainbox/trunk/debian/changelog	2014-03-24 12:31:55 UTC (rev 28314)
@@ -1,6 +1,10 @@
-plainbox (0.5~b2-2) UNRELEASED; urgency=medium
+plainbox (0.5-1) UNRELEASED; urgency=medium
 
+  * New upstream release
   * debian/control: drop X-Python3-Version << 3.5 
+  * debian/patches/disable-development-option: dropped, applied upstream
+  * debian/copyright: associate vendorized copies of argparse with appropriate
+    copyright section
 
  -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Wed, 19 Mar 2014 00:08:12 +0100
 

Modified: packages/plainbox/trunk/debian/copyright
===================================================================
--- packages/plainbox/trunk/debian/copyright	2014-03-24 03:14:00 UTC (rev 28313)
+++ packages/plainbox/trunk/debian/copyright	2014-03-24 12:31:55 UTC (rev 28314)
@@ -114,6 +114,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: plainbox/impl/_argparse.py
+Files: plainbox/vendor/argparse/*.py
 Copyright:
  Steven J. Bethard <steven.bethard at gmail.com>.
 License: Python Software Foundation License Version 2 

Deleted: packages/plainbox/trunk/debian/patches/disable-development-option
===================================================================
--- packages/plainbox/trunk/debian/patches/disable-development-option	2014-03-24 03:14:00 UTC (rev 28313)
+++ packages/plainbox/trunk/debian/patches/disable-development-option	2014-03-24 12:31:55 UTC (rev 28314)
@@ -1,39 +0,0 @@
-Description: Disable the --development option on plainbox-trusted-launcher-1
- The --development option allows the trusted launcher to bypass system
- security and load content from locations controlled by the user. It has
- been disabled by the Debian packaging, in agreement with the upstream
- developers (actually upstream wrote this patch). Until a better
- solution is found this patch needs to be maintained for every release.
- .
- Note, the patch is marked as "not-needed" so that nobody just forwards
- it upstream as it obviously cannot be applied there.
-Author: Zygmunt Krynicki <zygmunt.krynicki at canonical.com>
-Origin: upstream
-Bug-Ubuntu: https://bugs.launchpad.net/checkbox/+bug/1262809
-Forwarded: not-needed
-Last-Update: 2014-03-18
-
---- a/plainbox/impl/secure/launcher1.py
-+++ b/plainbox/impl/secure/launcher1.py
-@@ -31,7 +31,6 @@
- from plainbox.i18n import gettext as _
- from plainbox.impl.job import JobDefinition
- from plainbox.impl.job import JobOutputTextSource
--from plainbox.impl.providers.special import CheckBoxSrcProvider
- from plainbox.impl.secure.providers.v1 import all_providers
- from plainbox.impl.secure.rfc822 import load_rfc822_records, RFC822SyntaxError
- 
-@@ -242,9 +241,10 @@
-     launcher = TrustedLauncher()
-     # Feed jobs into the trusted launcher
-     if ns.development:
--        # Use the checkbox source provider if requested via --development
--        launcher.add_job_list(
--            CheckBoxSrcProvider().get_builtin_jobs())
-+        # NOTE: the --development option is insecure and has been disabled by
-+        # Debian packaging.
-+        parser.error(_("--development is disabled, see: {0}").format(
-+            'https://bugs.launchpad.net/checkbox/+bug/1262809'))
-     else:
-         # Siphon all jobs from all secure providers otherwise
-         all_providers.load()

Modified: packages/plainbox/trunk/debian/patches/series
===================================================================
--- packages/plainbox/trunk/debian/patches/series	2014-03-24 03:14:00 UTC (rev 28313)
+++ packages/plainbox/trunk/debian/patches/series	2014-03-24 12:31:55 UTC (rev 28314)
@@ -1,4 +1,3 @@
 unvendorize
-disable-development-option
 silence-logging-failure
 documentation-theme