[Python-apps-commits] r13644 - in packages/irker/trunk/debian/patches (4 files)

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

    Date: Tuesday, November 1, 2016 @ 11:38:09
  Author: drnlmza-guest
Revision: 13644

Include NMU patches. Add patch to fix IOError bug from upstream issue tracker

Added:
  packages/irker/trunk/debian/patches/0008-user-service.patch
  packages/irker/trunk/debian/patches/0009-env-service.patch
  packages/irker/trunk/debian/patches/0010-fix_ioerror_exception.patch
Modified:
  packages/irker/trunk/debian/patches/series

Added: packages/irker/trunk/debian/patches/0008-user-service.patch
===================================================================
--- packages/irker/trunk/debian/patches/0008-user-service.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0008-user-service.patch	2016-11-01 11:38:09 UTC (rev 13644)
@@ -0,0 +1,28 @@
+commit 1980b7cb4239463b581579cc39480774d3e2d2fe
+Author: Antoine Beaupré <anarcat at debian.org>
+Date:   Mon Sep 12 12:01:44 2016 -0400
+
+    run daemon as the irker user (Close: #832758)
+    
+    this is an improvement upon the default .service file. it requires a
+    irker user to be created, something which is automatically handled by
+    the debian package, but should be handled by other distributions when
+    deploying the .service file.
+    
+    there are obvious dangers in running irkerd as root: a compromise
+    would be catastrophic, and since it runs on public servers that are
+    traditionnally pretty hostile (IRC), it seems critical that rights of
+    the daemon be limited.
+
+diff --git a/irkerd.service b/irkerd.service
+index d19378b..82f39b0 100644
+--- a/irkerd.service
++++ b/irkerd.service
+@@ -7,6 +7,7 @@ Requires=network.target
+ 
+ [Service]
+ ExecStart=/usr/bin/irkerd
++User=irker
+ 
+ [Install]
+ WantedBy=multi-user.target

Added: packages/irker/trunk/debian/patches/0009-env-service.patch
===================================================================
--- packages/irker/trunk/debian/patches/0009-env-service.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0009-env-service.patch	2016-11-01 11:38:09 UTC (rev 13644)
@@ -0,0 +1,14 @@
+diff --git a/irkerd.service b/irkerd.service
+index 82f39b0..f4cd45b 100644
+--- a/irkerd.service
++++ b/irkerd.service
+@@ -6,7 +6,8 @@ Description=irker daemon
+ Requires=network.target
+ 
+ [Service]
+-ExecStart=/usr/bin/irkerd
++EnvironmentFile=-/etc/default/irker
++ExecStart=/usr/bin/irkerd $IRKER_OPTIONS
+ User=irker
+ 
+ [Install]

Added: packages/irker/trunk/debian/patches/0010-fix_ioerror_exception.patch
===================================================================
--- packages/irker/trunk/debian/patches/0010-fix_ioerror_exception.patch	                        (rev 0)
+++ packages/irker/trunk/debian/patches/0010-fix_ioerror_exception.patch	2016-11-01 11:38:09 UTC (rev 13644)
@@ -0,0 +1,31 @@
+From 7zb5019b8bdba49e24ca1cbc8b81f665e19f50ce1 Mon Sep 12 17:39:15 2016
+From Laurent Bachelier <laurent at bachelier.name>
+Date: Tue, 1 Nov 13:22:18 2016 +0200
+Subject: Only HTTPError has a code attribute
+
+This would cause irker to crash in case we get a URLError instead of HTTPError,
+for example.
+
+Patch-Name: 0010-fix_ioerror_exception.patch
+Forwarded: https://gitlab.com/esr/irker/merge_requests/14
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 9768eac..ce19446 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -95,12 +95,14 @@ class Commit:
+                         self.url = webview
+                 else:
+                     self.url = webview
+-            except IOError as e:
++            except urllib2.HTTPError as e:
+                 if e.code == 401:
+                     # Authentication error, so we assume the view is valid
+                     self.url = webview
+                 else:
+                     self.url = ""
++            except IOError:
++                self.url = ""
+         res = self.template % self.__dict__
+         return unicode(res, 'UTF-8') if not isinstance(res, unicode) else res
+ 

Modified: packages/irker/trunk/debian/patches/series
===================================================================
--- packages/irker/trunk/debian/patches/series	2016-10-31 14:10:47 UTC (rev 13643)
+++ packages/irker/trunk/debian/patches/series	2016-11-01 11:38:09 UTC (rev 13644)
@@ -2,3 +2,6 @@
 0005-author-name.patch
 0006-alias-service.patch
 0007-irkerhook-git.patch
+0008-user-service.patch
+0009-env-service.patch
+0010-fix_ioerror_exception.patch