summaryrefslogtreecommitdiff
path: root/debian/patches/debian-config.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-04-14 12:11:05 +0100
committerColin Watson <cjwatson@debian.org>2014-04-14 12:11:07 +0100
commit38252a749b8c69154a08924a1c2851aecaed87a7 (patch)
tree3064b42a1153257dfe1ce24f7e659363a77893c7 /debian/patches/debian-config.patch
parentceaa88579f692501b1c17f541c083d42ccd63ac1 (diff)
parent08a63152deb5deda168aaef870bdb9f56425acb3 (diff)
Never signal the service supervisor with SIGSTOP more than once, to
prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r--debian/patches/debian-config.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index ac15d90e0..9ada04a10 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
1From 9cbb60f5e4932634db04c330c88abc49cc5567bd Mon Sep 17 00:00:00 2001 1From df5c8d109fb3d9ec16a487107a44300ed3006849 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:18 +0000 3Date: Sun, 9 Feb 2014 16:10:18 +0000
4Subject: Various Debian-specific configuration changes 4Subject: Various Debian-specific configuration changes
@@ -26,11 +26,11 @@ Last-Update: 2014-02-12
26 26
27Patch-Name: debian-config.patch 27Patch-Name: debian-config.patch
28--- 28---
29 readconf.c | 2 +- 29 readconf.c | 2 +-
30 ssh_config | 7 ++++++- 30 ssh_config | 7 ++++++-
31 ssh_config.5 | 19 ++++++++++++++++++- 31 ssh_config.5 | 19 ++++++++++++++++++-
32 sshd_config | 1 + 32 sshd_config | 1 +
33 sshd_config.5 | 25 +++++++++++++++++++++++++ 33 sshd_config.5 | 25 +++++++++++++++++++++++++
34 5 files changed, 51 insertions(+), 3 deletions(-) 34 5 files changed, 51 insertions(+), 3 deletions(-)
35 35
36diff --git a/readconf.c b/readconf.c 36diff --git a/readconf.c b/readconf.c