summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/consolekit.patch6
-rw-r--r--debian/patches/gssapi.patch6
-rw-r--r--debian/patches/selinux-role.patch8
-rw-r--r--monitor.h8
5 files changed, 21 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 366e5f855..57687ac17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.2p1-3) UNRELEASED; urgency=low
2
3 * Renumber Debian-specific additions to enum monitor_reqtype so that they
4 fit within a single byte (thanks, Jason Conti; LP: #1179202).
5
6 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:54:05 +0100
7
1openssh (1:6.2p1-2) unstable; urgency=low 8openssh (1:6.2p1-2) unstable; urgency=low
2 9
3 * Fix build failure on Ubuntu: 10 * Fix build failure on Ubuntu:
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index abc6839ba..36b3805b9 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-09 4Last-Updated: 2013-05-13
5 5
6Index: b/Makefile.in 6Index: b/Makefile.in
7=================================================================== 7===================================================================
@@ -591,9 +591,9 @@ Index: b/monitor.h
591+++ b/monitor.h 591+++ b/monitor.h
592@@ -75,6 +75,8 @@ 592@@ -75,6 +75,8 @@
593 593
594 MONITOR_REQ_AUTHROLE = 300, 594 MONITOR_REQ_AUTHROLE = 154,
595 595
596+ MONITOR_REQ_CONSOLEKIT_REGISTER = 400, MONITOR_ANS_CONSOLEKIT_REGISTER = 401, 596+ MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157,
597+ 597+
598 }; 598 };
599 599
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index 7690e5824..ce50db505 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -13,7 +13,7 @@ Description: GSSAPI key exchange support
13 security history. 13 security history.
14Author: Simon Wilkinson <simon@sxw.org.uk> 14Author: Simon Wilkinson <simon@sxw.org.uk>
15Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 15Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
16Last-Updated: 2013-05-07 16Last-Updated: 2013-05-13
17 17
18Index: b/ChangeLog.gssapi 18Index: b/ChangeLog.gssapi
19=================================================================== 19===================================================================
@@ -2207,8 +2207,8 @@ Index: b/monitor.h
2207 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, 2207 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2208 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, 2208 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2209 2209
2210+ MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, 2210+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2211+ MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, 2211+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2212+ 2212+
2213 }; 2213 };
2214 2214
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
index f2f8fcd21..c41c78b3b 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -5,7 +5,7 @@ Description: Handle SELinux authorisation roles
5Author: Manoj Srivastava <srivasta@debian.org> 5Author: Manoj Srivastava <srivasta@debian.org>
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641 6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641
7Bug-Debian: http://bugs.debian.org/394795 7Bug-Debian: http://bugs.debian.org/394795
8Last-Update: 2013-05-07 8Last-Update: 2013-05-13
9 9
10Index: b/auth.h 10Index: b/auth.h
11=================================================================== 11===================================================================
@@ -170,10 +170,10 @@ Index: b/monitor.h
170--- a/monitor.h 170--- a/monitor.h
171+++ b/monitor.h 171+++ b/monitor.h
172@@ -73,6 +73,8 @@ 172@@ -73,6 +73,8 @@
173 MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, 173 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
174 MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, 174 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
175 175
176+ MONITOR_REQ_AUTHROLE = 300, 176+ MONITOR_REQ_AUTHROLE = 154,
177+ 177+
178 }; 178 };
179 179
diff --git a/monitor.h b/monitor.h
index 504daa79a..cd8342823 100644
--- a/monitor.h
+++ b/monitor.h
@@ -70,12 +70,12 @@ enum monitor_reqtype {
70 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, 70 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
71 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, 71 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
72 72
73 MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, 73 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
74 MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, 74 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
75 75
76 MONITOR_REQ_AUTHROLE = 300, 76 MONITOR_REQ_AUTHROLE = 154,
77 77
78 MONITOR_REQ_CONSOLEKIT_REGISTER = 400, MONITOR_ANS_CONSOLEKIT_REGISTER = 401, 78 MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157,
79 79
80}; 80};
81 81