From 522d2027001aa5b023e790ffdbf422ea9ca95c85 Mon Sep 17 00:00:00 2001 From: siefca Date: Wed, 15 Jan 2003 15:16:10 +0000 Subject: [PATCH] - added BuildRequires: chrpath - fixed source version number while compiling ssh-askpass - added /etc/profile.d/openssh-askpass.{sh,csh} - rel 3 Changed files: openssh-askpass.csh -> 1.1 openssh-askpass.sh -> 1.1 openssh.spec -> 1.138 --- openssh-askpass.csh | 1 + openssh-askpass.sh | 2 ++ openssh.spec | 12 ++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 openssh-askpass.csh create mode 100755 openssh-askpass.sh diff --git a/openssh-askpass.csh b/openssh-askpass.csh new file mode 100755 index 0000000..5abd6b5 --- /dev/null +++ b/openssh-askpass.csh @@ -0,0 +1 @@ +setenv SSH_ASKPASS "/usr/lib/openssh/ssh-askpass" diff --git a/openssh-askpass.sh b/openssh-askpass.sh new file mode 100755 index 0000000..4f55972 --- /dev/null +++ b/openssh-askpass.sh @@ -0,0 +1,2 @@ +SSH_ASKPASS="/usr/lib/openssh/ssh-askpass" +export SSH_ASKPASS diff --git a/openssh.spec b/openssh.spec index 08811db..30f8e83 100644 --- a/openssh.spec +++ b/openssh.spec @@ -14,7 +14,7 @@ Summary(ru): OpenSSH - Summary(uk): OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH) Name: openssh Version: 3.5p1 -Release: 2 +Release: 3 Epoch: 1 License: BSD Group: Applications/Networking @@ -25,6 +25,8 @@ Source3: %{name}d.init Source4: %{name}d.pamd Source5: %{name}.sysconfig Source6: passwd.pamd +Source7: %{name}-askpass.sh +Source8: %{name}-askpass.csh Patch0: %{name}-no_libnsl.patch Patch1: %{name}-set_12.patch Patch2: %{name}-linux-ipv6.patch @@ -34,6 +36,7 @@ URL: http://www.openssh.com/ BuildRequires: XFree86-devel BuildRequires: autoconf BuildRequires: automake +BuildRequires: chrpath %{!?_without_gnome:BuildRequires: gnome-libs-devel} BuildRequires: libwrap-devel BuildRequires: openssl-devel >= 0.9.6a @@ -395,13 +398,13 @@ echo '#define LOGIN_PROGRAM "/bin/login"' >>config.h %{__make} -%{!?_without_gnome:cd contrib && %{__cc} %{rpmcflags} `gnome-config --cflags gnome gnomeui gtk` } \ -%{!?_without_gnome:gnome-ssh-askpass.c -o gnome-ssh-askpass } \ +%{!?_without_gnome:cd contrib && %{__cc} %{rpmcflags} `gnome-config --cflags gnome gnomeui gtk`} \ +%{!?_without_gnome:gnome-ssh-askpass1.c -o gnome-ssh-askpass} \ %{!?_without_gnome:`gnome-config --libs gnome gnomeui gtk` } %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security}} +install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,profile.d}} %{__make} install DESTDIR="$RPM_BUILD_ROOT" @@ -413,6 +416,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config install -d $RPM_BUILD_ROOT%{_libexecdir}/ssh %{!?_without_gnome:install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass} +%{!?_without_gnome:install %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT/etc/profile.d} rm -f $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1 echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1 -- 2.44.0