|
@@ -1,5 +1,5 @@
|
|
|
%define ver 5.5p1
|
|
|
-%define rel 2%{_dist_release}
|
|
|
+%define rel 3%{_dist_release}
|
|
|
|
|
|
# SELinux
|
|
|
%define WITH_SELINUX 0
|
|
@@ -11,9 +11,6 @@
|
|
|
# Version of ssh-askpass
|
|
|
%define aversion 1.2.4.1
|
|
|
|
|
|
-# Do we want to disable building of x11-askpass? (1=yes 0=no)
|
|
|
-%define no_x11_askpass 0
|
|
|
-
|
|
|
# Do we want to disable building of gnome-askpass? (1=yes 0=no)
|
|
|
%define no_gnome_askpass 0
|
|
|
|
|
@@ -37,7 +34,6 @@
|
|
|
|
|
|
# Reserve options to override askpass settings with:
|
|
|
# rpm -ba|--rebuild --define 'skip_xxx 1'
|
|
|
-%{?skip_x11_askpass:%define no_x11_askpass 1}
|
|
|
%{?skip_gnome_askpass:%define no_gnome_askpass 1}
|
|
|
|
|
|
# Options for static OpenSSL link:
|
|
@@ -68,7 +64,6 @@ Version: %{ver}
|
|
|
Release: %{rel}
|
|
|
URL: http://www.openssh.com/portable.html
|
|
|
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
|
|
|
-Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
|
|
|
Patch0: openssh-5.5p1-vine.patch
|
|
|
Patch2: openssh-5.3p1-skip-initial.patch
|
|
|
Patch4: openssh-5.2p1-vendor.patch
|
|
@@ -89,22 +84,21 @@ Patch120: openssh-4.7p1-sshd.init.patch
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
|
|
|
+
|
|
|
Obsoletes: ssh
|
|
|
|
|
|
-PreReq: initscripts >= 5.20
|
|
|
BuildRequires: perl, openssl-devel, sharutils, tcp_wrappers
|
|
|
BuildRequires: util-linux
|
|
|
BuildRequires: db4-devel
|
|
|
BuildRequires: pam-devel
|
|
|
BuildRequires: zlib-devel
|
|
|
-%if ! %{no_x11_askpass}
|
|
|
-BuildRequires: libX11-devel, libSM-devel, libXt-devel, libICE-devel
|
|
|
-%endif
|
|
|
%if ! %{no_gnome_askpass}
|
|
|
BuildRequires: libX11-devel
|
|
|
BuildRequires: gtk2-devel
|
|
|
%endif
|
|
|
BuildRequires: xorg-x11-xauth
|
|
|
+BuildRequires: groff
|
|
|
+BuildRequires: libedit-devel
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -122,22 +116,20 @@ Summary: The OpenSSH server daemon.
|
|
|
Summary(ja): OpenSSH Secure Shell プロトコルサーバ (sshd)
|
|
|
Group: System Environment/Daemons
|
|
|
Obsoletes: ssh-server
|
|
|
-PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9
|
|
|
+Requires(post): openssh = %{version}-%{release}
|
|
|
+Requires(post): chkconfig
|
|
|
+Requires(pre): shadow-utils
|
|
|
+Requires(post): initscripts >= 5.20
|
|
|
Requires: pam
|
|
|
|
|
|
-%package askpass
|
|
|
-Summary: A passphrase dialog for OpenSSH and X.
|
|
|
-Summary(ja): OpenSSH X11 パスフレーズ入力ダイアログ
|
|
|
-Group: Applications/Internet
|
|
|
-Requires: openssh = %{version}-%{release}
|
|
|
-Obsoletes: ssh-extras
|
|
|
-
|
|
|
%package askpass-gnome
|
|
|
Summary: A passphrase dialog for OpenSSH, X, and GNOME.
|
|
|
Summary(ja): OpenSSH GNOME パスフレーズ入力ダイアログ
|
|
|
Group: Applications/Internet
|
|
|
Requires: openssh = %{version}-%{release}
|
|
|
Obsoletes: ssh-extras
|
|
|
+Obsoletes: openssh-askpass < 5.5p1-3vl6
|
|
|
+Provides: openssh-askpass = %{version}-%{release}
|
|
|
|
|
|
%package contrib
|
|
|
Summary: addons for OpenSSH
|
|
@@ -222,26 +214,6 @@ OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で
|
|
|
このパッケージは OpenSSH をサーバとして使用する場合に必要な
|
|
|
デーモンなどを含んでいます。
|
|
|
|
|
|
-%description askpass
|
|
|
-OpenSSH is a free version of SSH (Secure SHell), a program for logging
|
|
|
-into and executing commands on a remote machine. This package contains
|
|
|
-an X11 passphrase dialog for OpenSSH.
|
|
|
-
|
|
|
-%description -l ja askpass
|
|
|
-OpenSSH は、ネットワーク接続ツールである SSH プロトコル実装の フリー版 です。
|
|
|
-Ssh はリモートマシンへログインしたり、リモートマシンでコマンドを実行したり
|
|
|
-するためのプログラムです。rlogin や rsh を置き換えるもので、二つの信頼でき
|
|
|
-ないホスト間の信頼できない通信路でセキュアで暗号化された通信を行うことが
|
|
|
-可能にします。X11 のコネクションやあらゆる TCP/IP のポートもまた、セキュア
|
|
|
-な通信路の中を通すことができます。
|
|
|
-
|
|
|
-OpenSSH は OpenBSD による最後のフリーのバージョンの再実装で、
|
|
|
-最新のセキュリティと機能を提供しています。またすべての特許がからむ
|
|
|
-アルゴリズムは分割したライブラリにわかれています。
|
|
|
-
|
|
|
-このパッケージは Jim Knoble <jmknoble@jmknoble.cx> による X11 上の
|
|
|
-パスフレーズ入力ダイアログを含んでいます。
|
|
|
-
|
|
|
%description askpass-gnome
|
|
|
OpenSSH is a free version of SSH (Secure SHell), a program for logging
|
|
|
into and executing commands on a remote machine. This package contains
|
|
@@ -270,11 +242,7 @@ OpenSSH のためのアドオン
|
|
|
|
|
|
%prep
|
|
|
|
|
|
-%if ! %{no_x11_askpass}
|
|
|
-%setup -q -a 1
|
|
|
-%else
|
|
|
%setup -q
|
|
|
-%endif
|
|
|
%patch0 -p1 -b .vine
|
|
|
%patch2 -p1 -b .skip-initial
|
|
|
%patch4 -p1 -b .vendor
|
|
@@ -318,11 +286,11 @@ LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
|
|
|
--libexecdir=%{_libexecdir}/openssh \
|
|
|
--datadir=%{_datadir}/openssh \
|
|
|
--with-tcp-wrappers \
|
|
|
- --with-rsh=%{_bindir}/rsh \
|
|
|
--with-default-path=/usr/local/bin:/bin:/usr/bin \
|
|
|
--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
|
|
|
--with-privsep-path=%{_var}/empty/sshd \
|
|
|
--enable-vendor-patchlevel="VL-%{version}-%{release}" \
|
|
|
+ --with-libedit \
|
|
|
%if %{scard}
|
|
|
--with-smartcard \
|
|
|
%endif
|
|
@@ -341,14 +309,6 @@ perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
|
|
|
|
|
|
make
|
|
|
|
|
|
-%if ! %{no_x11_askpass}
|
|
|
-pushd x11-ssh-askpass-%{aversion}
|
|
|
-%configure --libexecdir=%{_libexecdir}/openssh
|
|
|
-xmkmf -a
|
|
|
-make
|
|
|
-popd
|
|
|
-%endif
|
|
|
-
|
|
|
%if %{gtk2}
|
|
|
gtk2=yes
|
|
|
%else
|
|
@@ -383,11 +343,6 @@ install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
|
|
|
install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
|
|
|
install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
|
|
|
|
|
|
-%if ! %{no_x11_askpass}
|
|
|
-install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass
|
|
|
-ln -s x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
|
|
|
-%endif
|
|
|
-
|
|
|
%if ! %{scard}
|
|
|
rm -f $RPM_BUILD_ROOT%{_datadir}/openssh/Ssh.bin
|
|
|
%endif
|
|
@@ -452,6 +407,7 @@ fi
|
|
|
%postun server
|
|
|
# /sbin/service sshd condrestart > /dev/null 2>&1 || :
|
|
|
/sbin/service sshd condrestart
|
|
|
+exit 0
|
|
|
|
|
|
%preun server
|
|
|
if [ "$1" = 0 ]
|
|
@@ -516,16 +472,6 @@ fi
|
|
|
%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
|
|
|
%endif
|
|
|
|
|
|
-%if ! %{no_x11_askpass}
|
|
|
-%files askpass
|
|
|
-%defattr(-,root,root)
|
|
|
-%doc x11-ssh-askpass-%{aversion}/README
|
|
|
-%doc x11-ssh-askpass-%{aversion}/ChangeLog
|
|
|
-%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad
|
|
|
-%attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass
|
|
|
-%attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass
|
|
|
-%endif
|
|
|
-
|
|
|
%if ! %{no_gnome_askpass}
|
|
|
%files askpass-gnome
|
|
|
%defattr(-,root,root)
|
|
@@ -540,7 +486,13 @@ fi
|
|
|
%{_mandir}/man1/ssh-copy-id.1*
|
|
|
|
|
|
%changelog
|
|
|
-* Mon May 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.5p1-2
|
|
|
+* Sun May 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.5p1-3
|
|
|
+- drop x11-askpass, add Obsoletes: openssh-askpass
|
|
|
+- add BR: groff
|
|
|
+- enable --with-libedit option, add BR: libedit-devel
|
|
|
+- remove unrecognized option '--with-rsh'
|
|
|
+
|
|
|
+* Sun May 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.5p1-2
|
|
|
- add BR: xorg-x11-xauth for X11 forwarding support
|
|
|
|
|
|
* Thu Apr 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 5.5p1-1
|