mirror of git://anongit.mindrot.org/openssh.git
- (djm) Specify --datadir in RPM spec files so smartcard applet gets
put somewhere sane. Add Ssh.bin to manifest.
This commit is contained in:
parent
d97c2ceed1
commit
7948d93173
|
@ -4,6 +4,8 @@
|
||||||
- (djm) Avoid warning on BSDgetopt
|
- (djm) Avoid warning on BSDgetopt
|
||||||
- (djm) More makefile infrastructre for smartcard support, also based
|
- (djm) More makefile infrastructre for smartcard support, also based
|
||||||
on Ben's work
|
on Ben's work
|
||||||
|
- (djm) Specify --datadir in RPM spec files so smartcard applet gets
|
||||||
|
put somewhere sane. Add Ssh.bin to manifest.
|
||||||
|
|
||||||
20010917
|
20010917
|
||||||
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
|
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
|
||||||
|
@ -6464,4 +6466,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1528 2001/09/18 05:06:21 djm Exp $
|
$Id: ChangeLog,v 1.1529 2001/09/18 05:12:10 djm Exp $
|
||||||
|
|
|
@ -158,6 +158,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc/ssh \
|
--sysconfdir=/etc/ssh \
|
||||||
--libexecdir=/usr/lib/ssh \
|
--libexecdir=/usr/lib/ssh \
|
||||||
|
--datadir=/usr/share/openssh \
|
||||||
--with-pam \
|
--with-pam \
|
||||||
--with-tcp-wrappers \
|
--with-tcp-wrappers \
|
||||||
--with-ipv4-default \
|
--with-ipv4-default \
|
||||||
|
@ -309,4 +310,4 @@ fi
|
||||||
* Mon Jan 01 1998 ...
|
* Mon Jan 01 1998 ...
|
||||||
Template Version: 1.31
|
Template Version: 1.31
|
||||||
|
|
||||||
$Id: openssh.spec,v 1.17 2001/07/05 00:45:29 tim Exp $
|
$Id: openssh.spec,v 1.18 2001/09/18 05:12:11 djm Exp $
|
||||||
|
|
|
@ -139,6 +139,7 @@ GNOME GUI desktop environment.
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--libexecdir=%{_libexecdir}/openssh \
|
--libexecdir=%{_libexecdir}/openssh \
|
||||||
|
--datadir=%{_datadir}/openssh \
|
||||||
--with-pam \
|
--with-pam \
|
||||||
--with-tcp-wrappers \
|
--with-tcp-wrappers \
|
||||||
--with-ipv4-default \
|
--with-ipv4-default \
|
||||||
|
@ -221,6 +222,8 @@ fi
|
||||||
%attr(0755,root,root) %dir %{_sysconfdir}
|
%attr(0755,root,root) %dir %{_sysconfdir}
|
||||||
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
|
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
|
||||||
%attr(0755,root,root) %dir %{_libexecdir}/openssh
|
%attr(0755,root,root) %dir %{_libexecdir}/openssh
|
||||||
|
%attr(0755,root,root) %dir %{_datadir}/openssh
|
||||||
|
%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin
|
||||||
|
|
||||||
%files clients
|
%files clients
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
|
|
@ -90,6 +90,7 @@ passphrase dialog.
|
||||||
CFLAGS="$RPM_OPT_FLAGS" \
|
CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--sysconfdir=/etc/ssh \
|
--sysconfdir=/etc/ssh \
|
||||||
|
--datadir=/usr/share/openssh \
|
||||||
--with-pam \
|
--with-pam \
|
||||||
--with-gnome-askpass \
|
--with-gnome-askpass \
|
||||||
--with-tcp-wrappers \
|
--with-tcp-wrappers \
|
||||||
|
|
Loading…
Reference in New Issue