summaryrefslogtreecommitdiff
path: root/debian/patches/selinux-build-failure.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/selinux-build-failure.patch')
-rw-r--r--debian/patches/selinux-build-failure.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/selinux-build-failure.patch b/debian/patches/selinux-build-failure.patch
index 47c953009..fb96e87b9 100644
--- a/debian/patches/selinux-build-failure.patch
+++ b/debian/patches/selinux-build-failure.patch
@@ -90,7 +90,7 @@ Index: b/configure
90 KRB5CONF 90 KRB5CONF
91 PRIVSEP_PATH 91 PRIVSEP_PATH
92 xauth_path 92 xauth_path
93@@ -9047,7 +9159,6 @@ 93@@ -9047,7 +9048,6 @@
94 _ACEOF 94 _ACEOF
95 95
96 SSHDLIBS="$SSHDLIBS -lcontract" 96 SSHDLIBS="$SSHDLIBS -lcontract"
@@ -98,7 +98,7 @@ Index: b/configure
98 SPC_MSG="yes" 98 SPC_MSG="yes"
99 fi 99 fi
100 100
101@@ -9126,7 +9237,6 @@ 101@@ -9126,7 +9126,6 @@
102 _ACEOF 102 _ACEOF
103 103
104 SSHDLIBS="$SSHDLIBS -lproject" 104 SSHDLIBS="$SSHDLIBS -lproject"
@@ -106,7 +106,7 @@ Index: b/configure
106 SP_MSG="yes" 106 SP_MSG="yes"
107 fi 107 fi
108 108
109@@ -27806,6 +27916,7 @@ 109@@ -27806,6 +27805,7 @@
110 { (exit 1); exit 1; }; } 110 { (exit 1); exit 1; }; }
111 fi 111 fi
112 112
@@ -114,7 +114,7 @@ Index: b/configure
114 SSHDLIBS="$SSHDLIBS $LIBSELINUX" 114 SSHDLIBS="$SSHDLIBS $LIBSELINUX"
115 115
116 116
117@@ -27908,6 +28019,8 @@ 117@@ -27908,6 +27908,8 @@
118 fi 118 fi
119 119
120 120
@@ -123,7 +123,7 @@ Index: b/configure
123 # Check whether user wants Kerberos 5 support 123 # Check whether user wants Kerberos 5 support
124 KRB5_MSG="no" 124 KRB5_MSG="no"
125 125
126@@ -31416,7 +31529,6 @@ 126@@ -31416,7 +31418,6 @@
127 LOGIN_PROGRAM_FALLBACK!$LOGIN_PROGRAM_FALLBACK$ac_delim 127 LOGIN_PROGRAM_FALLBACK!$LOGIN_PROGRAM_FALLBACK$ac_delim
128 PATH_PASSWD_PROG!$PATH_PASSWD_PROG$ac_delim 128 PATH_PASSWD_PROG!$PATH_PASSWD_PROG$ac_delim
129 LD!$LD$ac_delim 129 LD!$LD$ac_delim
@@ -131,7 +131,7 @@ Index: b/configure
131 PKGCONFIG!$PKGCONFIG$ac_delim 131 PKGCONFIG!$PKGCONFIG$ac_delim
132 LIBEDIT!$LIBEDIT$ac_delim 132 LIBEDIT!$LIBEDIT$ac_delim
133 TEST_SSH_SHA256!$TEST_SSH_SHA256$ac_delim 133 TEST_SSH_SHA256!$TEST_SSH_SHA256$ac_delim
134@@ -31433,6 +31545,7 @@ 134@@ -31433,6 +31434,7 @@
135 PROG_SAR!$PROG_SAR$ac_delim 135 PROG_SAR!$PROG_SAR$ac_delim
136 PROG_W!$PROG_W$ac_delim 136 PROG_W!$PROG_W$ac_delim
137 PROG_WHO!$PROG_WHO$ac_delim 137 PROG_WHO!$PROG_WHO$ac_delim
@@ -139,7 +139,7 @@ Index: b/configure
139 _ACEOF 139 _ACEOF
140 140
141 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 141 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
142@@ -31474,7 +31587,6 @@ 142@@ -31474,7 +31476,6 @@
143 ac_delim='%!_!# ' 143 ac_delim='%!_!# '
144 for ac_last_try in false false false false false :; do 144 for ac_last_try in false false false false false :; do
145 cat >conf$$subs.sed <<_ACEOF 145 cat >conf$$subs.sed <<_ACEOF
@@ -147,7 +147,7 @@ Index: b/configure
147 PROG_LASTLOG!$PROG_LASTLOG$ac_delim 147 PROG_LASTLOG!$PROG_LASTLOG$ac_delim
148 PROG_DF!$PROG_DF$ac_delim 148 PROG_DF!$PROG_DF$ac_delim
149 PROG_VMSTAT!$PROG_VMSTAT$ac_delim 149 PROG_VMSTAT!$PROG_VMSTAT$ac_delim
150@@ -31482,6 +31594,8 @@ 150@@ -31482,6 +31483,8 @@
151 PROG_IPCS!$PROG_IPCS$ac_delim 151 PROG_IPCS!$PROG_IPCS$ac_delim
152 PROG_TAIL!$PROG_TAIL$ac_delim 152 PROG_TAIL!$PROG_TAIL$ac_delim
153 INSTALL_SSH_PRNG_CMDS!$INSTALL_SSH_PRNG_CMDS$ac_delim 153 INSTALL_SSH_PRNG_CMDS!$INSTALL_SSH_PRNG_CMDS$ac_delim
@@ -156,7 +156,7 @@ Index: b/configure
156 KRB5CONF!$KRB5CONF$ac_delim 156 KRB5CONF!$KRB5CONF$ac_delim
157 PRIVSEP_PATH!$PRIVSEP_PATH$ac_delim 157 PRIVSEP_PATH!$PRIVSEP_PATH$ac_delim
158 xauth_path!$xauth_path$ac_delim 158 xauth_path!$xauth_path$ac_delim
159@@ -31496,7 +31610,7 @@ 159@@ -31496,7 +31499,7 @@
160 LTLIBOBJS!$LTLIBOBJS$ac_delim 160 LTLIBOBJS!$LTLIBOBJS$ac_delim
161 _ACEOF 161 _ACEOF
162 162
@@ -165,7 +165,7 @@ Index: b/configure
165 break 165 break
166 elif $ac_last_try; then 166 elif $ac_last_try; then
167 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 167 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
168@@ -31993,6 +32107,9 @@ 168@@ -31993,6 +31996,9 @@
169 if test ! -z "${SSHDLIBS}"; then 169 if test ! -z "${SSHDLIBS}"; then
170 echo " +for sshd: ${SSHDLIBS}" 170 echo " +for sshd: ${SSHDLIBS}"
171 fi 171 fi
@@ -179,7 +179,7 @@ Index: b/openbsd-compat/port-linux.c
179=================================================================== 179===================================================================
180--- a/openbsd-compat/port-linux.c 180--- a/openbsd-compat/port-linux.c
181+++ b/openbsd-compat/port-linux.c 181+++ b/openbsd-compat/port-linux.c
182@@ -222,6 +222,20 @@ 182@@ -218,6 +218,20 @@
183 xfree(oldctx); 183 xfree(oldctx);
184 xfree(newctx); 184 xfree(newctx);
185 } 185 }
@@ -205,8 +205,8 @@ Index: b/openbsd-compat/port-linux.h
205--- a/openbsd-compat/port-linux.h 205--- a/openbsd-compat/port-linux.h
206+++ b/openbsd-compat/port-linux.h 206+++ b/openbsd-compat/port-linux.h
207@@ -24,6 +24,7 @@ 207@@ -24,6 +24,7 @@
208 void ssh_selinux_setup_pty(char *, const char *); 208 void ssh_selinux_setup_pty(char *, const char *, const char *);
209 void ssh_selinux_setup_exec_context(char *); 209 void ssh_selinux_setup_exec_context(char *, const char *);
210 void ssh_selinux_change_context(const char *); 210 void ssh_selinux_change_context(const char *);
211+void ssh_selinux_setfscreatecon(const char *); 211+void ssh_selinux_setfscreatecon(const char *);
212 #endif 212 #endif