From 75d3b05c57e8284389f77d6105ebc29d00875b17 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 12 May 2003 18:15:49 +1000 Subject: - (djm) Redhat spec: Don't install profile.d scripts when not building with GNOME/GTK askpass (patch from bet@rahul.net) --- ChangeLog | 6 +++++- contrib/redhat/openssh.spec | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25492fd67..bc1fb1387 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20030512 + - (djm) Redhat spec: Don't install profile.d scripts when not + building with GNOME/GTK askpass (patch from bet@rahul.net) + 20030510 - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than "make install". Patch by roth@feep.net. @@ -1380,4 +1384,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2674 2003/05/10 13:42:12 djm Exp $ +$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 @@ %define ver 3.6.1p2 -%define rel 1 +%define rel 2 # OpenSSH privilege separation requires a user & group ID %define sshd_uid 74 @@ -274,9 +274,11 @@ install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin %endif +%if ! %{no_gnome_askpass} install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +%endif perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* @@ -400,6 +402,10 @@ fi %endif %changelog +* Mon May 12 2003 Damien Miller +- Don't install profile.d scripts when not building with GNOME/GTK askpass + (patch from bet@rahul.net) + * Wed Oct 01 2002 Damien Miller - Install ssh-agent setgid nobody to prevent ptrace() key theft attacks -- cgit v1.2.3