summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/consolekit.patch5
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 10464ae42..d0f19f9fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.2p1-2) UNRELEASED; urgency=low
2
3 * Fix build failure on Ubuntu:
4 - Include openbsd-compat/sys-queue.h from consolekit.c.
5
6 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 00:55:50 +0100
7
1openssh (1:6.2p1-1) unstable; urgency=low 8openssh (1:6.2p1-1) unstable; urgency=low
2 9
3 * New upstream release (http://www.openssh.com/txt/release-6.2). 10 * New upstream release (http://www.openssh.com/txt/release-6.2).
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index d67123a1e..0d0a3d9d6 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -1,7 +1,7 @@
1Description: Add support for registering ConsoleKit sessions on login 1Description: Add support for registering ConsoleKit sessions on login
2Author: Colin Watson <cjwatson@ubuntu.com> 2Author: Colin Watson <cjwatson@ubuntu.com>
3Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450 3Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450
4Last-Updated: 2013-05-07 4Last-Updated: 2013-05-09
5 5
6Index: b/Makefile.in 6Index: b/Makefile.in
7=================================================================== 7===================================================================
@@ -228,7 +228,7 @@ Index: b/consolekit.c
228=================================================================== 228===================================================================
229--- /dev/null 229--- /dev/null
230+++ b/consolekit.c 230+++ b/consolekit.c
231@@ -0,0 +1,239 @@ 231@@ -0,0 +1,240 @@
232+/* 232+/*
233+ * Copyright (c) 2008 Colin Watson. All rights reserved. 233+ * Copyright (c) 2008 Colin Watson. All rights reserved.
234+ * 234+ *
@@ -277,6 +277,7 @@ Index: b/consolekit.c
277+ 277+
278+#include <ck-connector.h> 278+#include <ck-connector.h>
279+ 279+
280+#include "openbsd-compat/sys-queue.h"
280+#include "xmalloc.h" 281+#include "xmalloc.h"
281+#include "channels.h" 282+#include "channels.h"
282+#include "key.h" 283+#include "key.h"