|
|
@@ -1,5 +1,5 @@
|
|
|
-%define ver 5.5p1
|
|
|
-%define rel 4%{_dist_release}
|
|
|
+%define ver 5.6p1
|
|
|
+%define rel 1%{_dist_release}
|
|
|
|
|
|
# SELinux
|
|
|
%define WITH_SELINUX 0
|
|
|
@@ -63,9 +63,10 @@ Name: openssh
|
|
|
Version: %{ver}
|
|
|
Release: %{rel}
|
|
|
URL: http://www.openssh.com/portable.html
|
|
|
+
|
|
|
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
|
|
|
+
|
|
|
Patch0: openssh-5.5p1-vine.patch
|
|
|
-Patch2: openssh-5.3p1-skip-initial.patch
|
|
|
Patch4: openssh-5.2p1-vendor.patch
|
|
|
Patch5: openssh-3.9p1-noinitlog.patch
|
|
|
Patch12: openssh-selinux.patch
|
|
|
@@ -77,6 +78,7 @@ Patch27: openssh-5.1p1-log-in-chroot.patch
|
|
|
Patch30: openssh-4.0p1-exit-deadlock.patch
|
|
|
# Patch31: openssh-3.9p1-skip-used.patch
|
|
|
Patch35: openssh-4.2p1-askpass-progress.patch
|
|
|
+
|
|
|
# Vine Patch
|
|
|
Patch100: openssh-norootlogin.patch
|
|
|
Patch120: openssh-4.7p1-sshd.init.patch
|
|
|
@@ -110,6 +112,7 @@ Summary(ja): OpenSSH Secure Shell プロトコルクライアント
|
|
|
Requires: openssh = %{version}-%{release}
|
|
|
Group: Applications/Internet
|
|
|
Obsoletes: ssh-clients
|
|
|
+Obsoletes: openssh-contrib
|
|
|
|
|
|
%package server
|
|
|
Summary: The OpenSSH server daemon.
|
|
|
@@ -131,12 +134,6 @@ Obsoletes: ssh-extras
|
|
|
Obsoletes: openssh-askpass < 5.5p1-3vl6
|
|
|
Provides: openssh-askpass = %{version}-%{release}
|
|
|
|
|
|
-%package contrib
|
|
|
-Summary: addons for OpenSSH
|
|
|
-Summary(ja): OpenSSH のためのアドオン
|
|
|
-Group: Applications/Internet
|
|
|
-Requires: openssh-clients = %{version}-%{release}
|
|
|
-
|
|
|
%description
|
|
|
SSH (Secure SHell) is a program for logging into and executing
|
|
|
commands on a remote machine. SSH is intended to replace rlogin and
|
|
|
@@ -234,17 +231,10 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
|
|
|
|
|
|
このパッケージは GNOME 用のパスフレーズ入力ダイアログを含んでいます。
|
|
|
|
|
|
-%description contrib
|
|
|
-addons for OpenSSH
|
|
|
-
|
|
|
-%description -l ja contrib
|
|
|
-OpenSSH のためのアドオン
|
|
|
-
|
|
|
%prep
|
|
|
|
|
|
%setup -q
|
|
|
%patch0 -p1 -b .vine
|
|
|
-%patch2 -p1 -b .skip-initial
|
|
|
%patch4 -p1 -b .vendor
|
|
|
%patch5 -p1 -b .noinitlog
|
|
|
|
|
|
@@ -449,10 +439,14 @@ fi
|
|
|
%attr(0755,root,root) %{_bindir}/ssh-add
|
|
|
%attr(0755,root,root) %{_bindir}/ssh-keyscan
|
|
|
%attr(0755,root,root) %{_bindir}/sftp
|
|
|
+%attr(0755,root,root) %{_bindir}/ssh-copy-id
|
|
|
+%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper
|
|
|
%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
|
|
|
%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
|
|
|
%attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
|
|
|
%attr(0644,root,root) %{_mandir}/man1/sftp.1*
|
|
|
+%attr(0644,root,root) %{_mandir}/man1/ssh-copy-id.1*
|
|
|
+%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8*
|
|
|
%endif
|
|
|
|
|
|
%if ! %{rescue}
|
|
|
@@ -479,13 +473,12 @@ fi
|
|
|
%attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass
|
|
|
%endif
|
|
|
|
|
|
-%files contrib
|
|
|
-%defattr(-,root,root)
|
|
|
-%doc contrib/README.contrib
|
|
|
-%{_bindir}/ssh-copy-id
|
|
|
-%{_mandir}/man1/ssh-copy-id.1*
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Jan 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 5.6p1-1
|
|
|
+- new upstream release
|
|
|
+- obsolete contrib subpackage, move ssh-copy-id to client subpackage
|
|
|
+
|
|
|
* Sun Jan 9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.5p1-4
|
|
|
- rebuilt with openssl 1.0.0c
|
|
|
|
daisuke