diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -3,6 +3,8 @@ | |||
3 | the superuser receives. | 3 | the superuser receives. |
4 | - (djm) Bug #231: UsePrivilegeSeparation turns off Banner. | 4 | - (djm) Bug #231: UsePrivilegeSeparation turns off Banner. |
5 | - (djm) Add --with-privsep-path configure option | 5 | - (djm) Add --with-privsep-path configure option |
6 | - (djm) Update RPM spec file: different superuser path, use | ||
7 | /var/empty/sshd for privsep | ||
6 | 8 | ||
7 | 20020511 | 9 | 20020511 |
8 | - (tim) [configure.ac] applied a rework of djm's OpenSSL search cleanup patch. | 10 | - (tim) [configure.ac] applied a rework of djm's OpenSSL search cleanup patch. |
@@ -573,4 +575,4 @@ | |||
573 | - (stevesk) entropy.c: typo in debug message | 575 | - (stevesk) entropy.c: typo in debug message |
574 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 576 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
575 | 577 | ||
576 | $Id: ChangeLog,v 1.2109 2002/05/13 03:15:42 djm Exp $ | 578 | $Id: ChangeLog,v 1.2110 2002/05/13 03:26:57 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index e70f43893..e5b2ed894 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -175,6 +175,9 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS | |||
175 | --datadir=%{_datadir}/openssh \ | 175 | --datadir=%{_datadir}/openssh \ |
176 | --with-tcp-wrappers \ | 176 | --with-tcp-wrappers \ |
177 | --with-rsh=%{_bindir}/rsh \ | 177 | --with-rsh=%{_bindir}/rsh \ |
178 | --with-default-path=/usr/local/bin:/bin:/usr/bin \ | ||
179 | --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ | ||
180 | --with-privsep-path=%{_var}/empty/sshd | ||
178 | %if %{scard} | 181 | %if %{scard} |
179 | --with-smartcard \ | 182 | --with-smartcard \ |
180 | %endif | 183 | %endif |
@@ -187,6 +190,7 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS | |||
187 | --with-pam --with-kerberos5=/usr/kerberos | 190 | --with-pam --with-kerberos5=/usr/kerberos |
188 | %endif | 191 | %endif |
189 | 192 | ||
193 | |||
190 | %if %{static_libcrypto} | 194 | %if %{static_libcrypto} |
191 | perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile | 195 | perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile |
192 | %endif | 196 | %endif |
@@ -213,7 +217,7 @@ popd | |||
213 | rm -rf $RPM_BUILD_ROOT | 217 | rm -rf $RPM_BUILD_ROOT |
214 | mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh | 218 | mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh |
215 | mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh | 219 | mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh |
216 | mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/run/empty-sshd | 220 | mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd |
217 | 221 | ||
218 | make install DESTDIR=$RPM_BUILD_ROOT | 222 | make install DESTDIR=$RPM_BUILD_ROOT |
219 | 223 | ||
@@ -275,7 +279,7 @@ fi | |||
275 | 279 | ||
276 | %pre server | 280 | %pre server |
277 | %{_sbindir}/groupadd -r -g %{sshd_gid} sshd 2>/dev/null || : | 281 | %{_sbindir}/groupadd -r -g %{sshd_gid} sshd 2>/dev/null || : |
278 | %{_sbindir}/useradd -d /var/run/empty-sshd -s /bin/false -u %{sshd_uid} \ | 282 | %{_sbindir}/useradd -d /var/empty/sshd -s /bin/false -u %{sshd_uid} \ |
279 | -g sshd -M -r sshd 2>/dev/null || : | 283 | -g sshd -M -r sshd 2>/dev/null || : |
280 | 284 | ||
281 | %post server | 285 | %post server |
@@ -329,7 +333,7 @@ fi | |||
329 | %if ! %{rescue} | 333 | %if ! %{rescue} |
330 | %files server | 334 | %files server |
331 | %defattr(-,root,root) | 335 | %defattr(-,root,root) |
332 | %dir %attr(0111,root,root) %{_var}/run/empty-sshd | 336 | %dir %attr(0111,root,root) %{_var}/empty/sshd |
333 | %attr(0755,root,root) %{_sbindir}/sshd | 337 | %attr(0755,root,root) %{_sbindir}/sshd |
334 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | 338 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
335 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 339 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |