summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-12 18:15:49 +1000
committerDamien Miller <djm@mindrot.org>2003-05-12 18:15:49 +1000
commit75d3b05c57e8284389f77d6105ebc29d00875b17 (patch)
treea1f2e64948f09a6760acb0ae16ec030b259cb2b2 /contrib
parent0d8b792931b32442b66b9300e8678e425446ae3b (diff)
- (djm) Redhat spec: Don't install profile.d scripts when not
building with GNOME/GTK askpass (patch from bet@rahul.net)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/redhat/openssh.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 8809ded7..623cfa6d 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 <djm@mindrot.org>
+- Don't install profile.d scripts when not building with GNOME/GTK askpass
+ (patch from bet@rahul.net)
+
* Wed Oct 01 2002 Damien Miller <djm@mindrot.org>
- Install ssh-agent setgid nobody to prevent ptrace() key theft attacks