[Momonga-devel.ja:00493] openssh version and ssh-keysign
- From: KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
- Date: Sun, 22 Sep 2002 10:18:50 +0900
小松です。
いつの頃からか、openssh の rpm version から
portable 版の version (3.4p1 の p1 とか)が落ちてますね。
portable 版の version番号を含めて、マズイこととかあるでしょうか？
＃ 要するに、今 openssh-3.4-4m となっているのを
＃ openssh-3.4p1-4m としたい。
あと、/usr/libexec/ssh/ssh-keysign が %files から漏れてます。
ただ、これは ssh2 の hostbased authentication の時にだけ使われるので
ふつうは使う機会がないと思う上に、setuid root なんですよね。
だから、使わない人は入れたくないと思うので
openssh-keysign という sub package にしようと思います。
これについて意見などありましたらよろしくお願いします。
とりあえず spec の diff をつけておきます。
上記2点以外にも、rsh support を外したり(すでに obsolete されている)、
ssh_config(5) の man が抜けてたりしたのを直してあります。
特に何もなければ、今夜にでも commit する、ということで。
--
---------------------------------------
東京大学大学院総合文化研究科
広域科学専攻相関基礎科学系
佐々研究室 博士３年
小松 晋一朗
koma2@xxxxxxxxxxxxxxxxxxxx
koma2@xxxxxxxxxxxxxxxxx
http://kamuy.c.u-tokyo.ac.jp/~koma2/
---------------------------------------Index: openssh.spec
===================================================================
RCS file: /home/cvs/pkgs/openssh/openssh.spec,v
retrieving revision 1.55
diff -u -u -r1.55 openssh.spec
--- openssh.spec 2002/08/01 10:22:49 1.55
+++ openssh.spec 2002/09/22 01:17:55
@@ -5,18 +5,25 @@
# Version of ssh-askpass
%define aversion 1.2.4.1
+### include local configuration
+%{?include_specopt}
+
+### default configurations
+# If you'd like to change these configurations, please copy them to
+# /etc/rpm/specopt/openssh.specopt and edit it.
+
# Do we want to disable building of x11-askpass? (1=yes 0=no)
-%define no_x11_askpass 0
+%{!?no_x11_askpass:%define no_x11_askpass 0}
# Do we want to disable building of gnome-askpass? (1=yes 0=no)
-%define no_gnome_askpass 0
+%{!?no_gnome_askpass:%define no_gnome_askpass 0}
Summary: OpenSSH free Secure Shell (SSH) implementation
Name: openssh
-Version: %{over}
-Release: 4m
+Version: %{over}p%{pver}
+Release: 5m
URL: http://www.openssh.com/
-Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{over}p%{pver}.tar.gz
+Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
NoSource: 0
%if ! %{no_x11_askpass}
Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
@@ -33,7 +40,7 @@
Provides: ssh
Prereq: openssl >= 0.9.6c
BuildPreReq: perl, openssl-devel >= 0.9.6c, tcp_wrappers, glibc-devel
-BuildPreReq: util-linux, rsh, pam-devel
+BuildPreReq: util-linux, pam-devel
%if ! %{no_gnome_askpass}
BuildPreReq: gnome-libs-devel
%endif
@@ -66,6 +73,11 @@
Obsoletes: ssh-extras
Provides: ssh-extras
+%package keysign
+Summary: OpenSSH helper program for hostbased authentication
+Group: Applications/Internet
+Requires: openssh = %{version}-%{release}, openssh-clients = %{version}-%{release}
+
%description
Ssh (Secure Shell) a program for logging into a remote machine and for
executing commands in a remote machine. It is intended to replace
@@ -137,6 +149,14 @@
This package contains the GNOME passphrase dialog.
+%description keysign
+Ssh-keysign is used by ssh(1) to access the local host keys and generate
+the digital signature required during hostbased authentication with SSH
+protocol version 2.
+
+Since ssh-keysign is a setuid programm, installing it is not recommended
+if you do not use hostbased authentication with ssh2.
+
%prep
if [ %{version} == "3.4" ]; then
if md5sum %{SOURCE0} | grep -s -v "459c1d0262e939d6432f193c7a4ba8a8" ; then
@@ -156,9 +176,9 @@
fi
%if ! %{no_x11_askpass}
-%setup -q -a 1 -n %{name}-%{over}p%{pver}
+%setup -q -a 1
%else
-%setup -q -n %{name}-%{over}p%{pver}
+%setup -q
%endif
%if ! %{no_gnome_askpass}
#%patch10 -p1 -b .gnome-askpass
@@ -177,7 +197,6 @@
%configure --sysconfdir=%{_sysconfdir}/ssh \
--libexecdir=%{_libexecdir}/ssh \
--with-tcp-wrappers \
- --with-rsh=/usr/bin/rsh \
--without-kerberos4 \
%if ! %{_ipv6}
--with-ipv4-default \
@@ -295,6 +314,7 @@
%attr(0644,root,root) %{_mandir}/man1/scp.1*
%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
%attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
+%attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
%attr(0755,root,root) %dir %{_sysconfdir}/ssh
%attr(0755,root,root) %dir %{_libexecdir}/ssh
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
@@ -328,6 +348,11 @@
%attr(0755,root,root) %config %{_initscriptdir}/sshd
%attr(0755,root,sys) %{_var}/empty
+%files keysign
+%defattr(-,root,root)
+%attr(4711,root,root) %{_libexecdir}/ssh/ssh-keysign
+%{_mandir}/man8/ssh-keysign.8*
+
%if ! %{no_x11_askpass}
%files askpass
%defattr(-,root,root)
@@ -350,6 +375,19 @@
%endif
%changelog
+* Fri Sep 20 2002 KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
+- (3.4p1-5m)
+- add portable version to Version:
+- %%no_x11_askpass and %%no_gnome_askpass can now be defined
+ by command line arguments.
+- add %%{?include_specopt}
+- rsh support was deprecated, so remove BuildPrereq: rsh
+- add ssh_config(5) man page
+- add ssh-keysign sub package.
+ since ssh-keysign(8) is a setuid programm and only needed
+ during hostbased authentication with protocol version 2,
+ installing it is not recommened.
+
* Thu Aug 1 2002 HOSONO Hidetomo <h@xxxxxxxx>
- (3.4-4m)
- correct some wrong spelling of trojan(ed)