diff options
Diffstat (limited to 'contrib/redhat/openssh.spec')
-rw-r--r-- | contrib/redhat/openssh.spec | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b73fb929f..e7005064d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 3.4p1 | 1 | %define ver 3.5p1 |
2 | %define rel 1 | 2 | %define rel 1 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
@@ -20,6 +20,9 @@ | |||
20 | # Do we want smartcard support (1=yes 0=no) | 20 | # Do we want smartcard support (1=yes 0=no) |
21 | %define scard 0 | 21 | %define scard 0 |
22 | 22 | ||
23 | # Use GTK2 instead of GNOME in gnome-ssh-askpass | ||
24 | %define gtk2 0 | ||
25 | |||
23 | # Is this build for RHL 6.x? | 26 | # Is this build for RHL 6.x? |
24 | %define build6x 0 | 27 | %define build6x 0 |
25 | 28 | ||
@@ -86,7 +89,7 @@ PreReq: initscripts >= 5.20 | |||
86 | %endif | 89 | %endif |
87 | BuildPreReq: perl, openssl-devel, sharutils, tcp_wrappers | 90 | BuildPreReq: perl, openssl-devel, sharutils, tcp_wrappers |
88 | BuildPreReq: /bin/login | 91 | BuildPreReq: /bin/login |
89 | %if %{build6x} | 92 | %if ! %{build6x} |
90 | BuildPreReq: glibc-devel, pam | 93 | BuildPreReq: glibc-devel, pam |
91 | %else | 94 | %else |
92 | BuildPreReq: db1-devel, /usr/include/security/pam_appl.h | 95 | BuildPreReq: db1-devel, /usr/include/security/pam_appl.h |
@@ -95,7 +98,7 @@ BuildPreReq: db1-devel, /usr/include/security/pam_appl.h | |||
95 | BuildPreReq: XFree86-devel | 98 | BuildPreReq: XFree86-devel |
96 | %endif | 99 | %endif |
97 | %if ! %{no_gnome_askpass} | 100 | %if ! %{no_gnome_askpass} |
98 | BuildPreReq: gnome-libs-devel | 101 | BuildPreReq: pkgconfig |
99 | %endif | 102 | %endif |
100 | %if %{kerberos5} | 103 | %if %{kerberos5} |
101 | BuildPreReq: krb5-devel | 104 | BuildPreReq: krb5-devel |
@@ -220,11 +223,23 @@ make | |||
220 | popd | 223 | popd |
221 | %endif | 224 | %endif |
222 | 225 | ||
226 | # Define a variable to toggle gnome1/gtk2 building. This is necessary | ||
227 | # because RPM doesn't handle nested %if statements. | ||
228 | %if %{gtk2} | ||
229 | gtk2=yes | ||
230 | %else | ||
231 | gtk2=no | ||
232 | %endif | ||
233 | |||
223 | %if ! %{no_gnome_askpass} | 234 | %if ! %{no_gnome_askpass} |
224 | pushd contrib | 235 | pushd contrib |
225 | gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ | 236 | if [ $gtk2 = yes ] ; then |
226 | gnome-ssh-askpass.c -o gnome-ssh-askpass \ | 237 | make gnome-ssh-askpass2 |
227 | `gnome-config --libs gnome gnomeui` | 238 | mv gnome-ssh-askpass2 gnome-ssh-askpass |
239 | else | ||
240 | make gnome-ssh-askpass1 | ||
241 | mv gnome-ssh-askpass1 gnome-ssh-askpass | ||
242 | fi | ||
228 | popd | 243 | popd |
229 | %endif | 244 | %endif |
230 | 245 | ||
@@ -255,6 +270,10 @@ ln -s x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass | |||
255 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass | 270 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass |
256 | %endif | 271 | %endif |
257 | 272 | ||
273 | %if ! %{scard} | ||
274 | rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin | ||
275 | %endif | ||
276 | |||
258 | install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 277 | install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
259 | install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 278 | install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
260 | install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 279 | install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
@@ -338,7 +357,7 @@ fi | |||
338 | %attr(-,root,root) %{_bindir}/slogin | 357 | %attr(-,root,root) %{_bindir}/slogin |
339 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | 358 | %attr(-,root,root) %{_mandir}/man1/slogin.1* |
340 | %if ! %{rescue} | 359 | %if ! %{rescue} |
341 | %attr(0755,root,root) %{_bindir}/ssh-agent | 360 | %attr(2755,root,nobody) %{_bindir}/ssh-agent |
342 | %attr(0755,root,root) %{_bindir}/ssh-add | 361 | %attr(0755,root,root) %{_bindir}/ssh-add |
343 | %attr(0755,root,root) %{_bindir}/ssh-keyscan | 362 | %attr(0755,root,root) %{_bindir}/ssh-keyscan |
344 | %attr(0755,root,root) %{_bindir}/sftp | 363 | %attr(0755,root,root) %{_bindir}/sftp |
@@ -381,6 +400,12 @@ fi | |||
381 | %endif | 400 | %endif |
382 | 401 | ||
383 | %changelog | 402 | %changelog |
403 | * Wed Oct 01 2002 Damien Miller <djm@mindrot.org> | ||
404 | - Install ssh-agent setgid nobody to prevent ptrace() key theft attacks | ||
405 | |||
406 | * Mon Sep 30 2002 Damien Miller <djm@mindrot.org> | ||
407 | - Use contrib/ Makefile for building askpass programs | ||
408 | |||
384 | * Fri Jun 21 2002 Damien Miller <djm@mindrot.org> | 409 | * Fri Jun 21 2002 Damien Miller <djm@mindrot.org> |
385 | - Merge in spec changes from seba@iq.pl (Sebastian Pachuta) | 410 | - Merge in spec changes from seba@iq.pl (Sebastian Pachuta) |
386 | - Add new {ssh,sshd}_config.5 manpages | 411 | - Add new {ssh,sshd}_config.5 manpages |