From 7e394703c47da87a610f04ce47141e48150371a8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 May 2013 10:55:58 +0100 Subject: Renumber Debian-specific additions to enum monitor_reqtype so that they fit within a single byte (thanks, Jason Conti; LP: #1179202). --- debian/changelog | 7 +++++++ debian/patches/consolekit.patch | 6 +++--- debian/patches/gssapi.patch | 6 +++--- debian/patches/selinux-role.patch | 8 ++++---- monitor.h | 8 ++++---- 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 @@ +openssh (1:6.2p1-3) UNRELEASED; urgency=low + + * Renumber Debian-specific additions to enum monitor_reqtype so that they + fit within a single byte (thanks, Jason Conti; LP: #1179202). + + -- Colin Watson Mon, 13 May 2013 10:54:05 +0100 + openssh (1:6.2p1-2) unstable; urgency=low * 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 @@ Description: Add support for registering ConsoleKit sessions on login Author: Colin Watson Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450 -Last-Updated: 2013-05-09 +Last-Updated: 2013-05-13 Index: b/Makefile.in =================================================================== @@ -591,9 +591,9 @@ Index: b/monitor.h +++ b/monitor.h @@ -75,6 +75,8 @@ - MONITOR_REQ_AUTHROLE = 300, + MONITOR_REQ_AUTHROLE = 154, -+ MONITOR_REQ_CONSOLEKIT_REGISTER = 400, MONITOR_ANS_CONSOLEKIT_REGISTER = 401, ++ MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157, + }; 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 security history. Author: Simon Wilkinson Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 -Last-Updated: 2013-05-07 +Last-Updated: 2013-05-13 Index: b/ChangeLog.gssapi =================================================================== @@ -2207,8 +2207,8 @@ Index: b/monitor.h MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, -+ MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, -+ MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, ++ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151, ++ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153, + }; 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 Author: Manoj Srivastava Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641 Bug-Debian: http://bugs.debian.org/394795 -Last-Update: 2013-05-07 +Last-Update: 2013-05-13 Index: b/auth.h =================================================================== @@ -170,10 +170,10 @@ Index: b/monitor.h --- a/monitor.h +++ b/monitor.h @@ -73,6 +73,8 @@ - MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, - MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, + MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151, + MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153, -+ MONITOR_REQ_AUTHROLE = 300, ++ MONITOR_REQ_AUTHROLE = 154, + }; 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 { MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, - MONITOR_REQ_GSSSIGN = 200, MONITOR_ANS_GSSSIGN = 201, - MONITOR_REQ_GSSUPCREDS = 202, MONITOR_ANS_GSSUPCREDS = 203, + MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151, + MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153, - MONITOR_REQ_AUTHROLE = 300, + MONITOR_REQ_AUTHROLE = 154, - MONITOR_REQ_CONSOLEKIT_REGISTER = 400, MONITOR_ANS_CONSOLEKIT_REGISTER = 401, + MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157, }; -- cgit v1.2.3