diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 8 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030512 | ||
2 | - (djm) Redhat spec: Don't install profile.d scripts when not | ||
3 | building with GNOME/GTK askpass (patch from bet@rahul.net) | ||
4 | |||
1 | 20030510 | 5 | 20030510 |
2 | - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than | 6 | - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than |
3 | "make install". Patch by roth@feep.net. | 7 | "make install". Patch by roth@feep.net. |
@@ -1380,4 +1384,4 @@ | |||
1380 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1384 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1381 | ok provos@ | 1385 | ok provos@ |
1382 | 1386 | ||
1383 | $Id: ChangeLog,v 1.2674 2003/05/10 13:42:12 djm Exp $ | 1387 | $Id: ChangeLog,v 1.2675 2003/05/12 08:15:49 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 8809ded70..623cfa6d6 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,5 +1,5 @@ | |||
1 | %define ver 3.6.1p2 | 1 | %define ver 3.6.1p2 |
2 | %define rel 1 | 2 | %define rel 2 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
5 | %define sshd_uid 74 | 5 | %define sshd_uid 74 |
@@ -274,9 +274,11 @@ install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome | |||
274 | rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin | 274 | rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin |
275 | %endif | 275 | %endif |
276 | 276 | ||
277 | %if ! %{no_gnome_askpass} | ||
277 | install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 278 | install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
278 | install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 279 | install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
279 | install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ | 280 | install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ |
281 | %endif | ||
280 | 282 | ||
281 | perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* | 283 | perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* |
282 | 284 | ||
@@ -400,6 +402,10 @@ fi | |||
400 | %endif | 402 | %endif |
401 | 403 | ||
402 | %changelog | 404 | %changelog |
405 | * Mon May 12 2003 Damien Miller <djm@mindrot.org> | ||
406 | - Don't install profile.d scripts when not building with GNOME/GTK askpass | ||
407 | (patch from bet@rahul.net) | ||
408 | |||
403 | * Wed Oct 01 2002 Damien Miller <djm@mindrot.org> | 409 | * Wed Oct 01 2002 Damien Miller <djm@mindrot.org> |
404 | - Install ssh-agent setgid nobody to prevent ptrace() key theft attacks | 410 | - Install ssh-agent setgid nobody to prevent ptrace() key theft attacks |
405 | 411 | ||