openssh编译rpm包（防火防盗防漏扫）

阅读原文时间：2023年07月09日阅读：4

参考链接：https://www.jianshu.com/p/0882b0502960

openssh下载链接：

wget https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.6p1.tar.gz

ssh-askpass下载链接（可以不要）：

wget https://src.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz

依赖环境准备：

yum install rpm-build rpm-devel rpmdevtools gcc gcc-c++ glibc glibc-devel openssl-devel openssl prce pcre-devel zlib zlib-devel make wget krb5-devel pam-devel libX11-devel xmkmf libXt-devel initscripts libXt-devel imake gtk2-devel

创建编译目录：

mkdir -p rpmbuild/{SOURCES,SPECS,RPMS,SRPMS,BUILD,BUILDROOT} #手动创建
或
rpmdev-setuptree #命令创建（需要依赖包rpm-devel rpmdevtools）

rpmbuild基本格式：

rpmbuild [options] [spec文档|tarball包(或者压缩包—以.gz或.xz或.bz2结尾的)|源码包]
options有下面的几种选择：
1.-bp #只执行spec的%pre段(解开源码包并打补丁,即只做准备)
2.-bc #执行spec的%pre和%build 段(准备并编译)
3.-bi #执行spec中%pre,%build与%install(准备,编译并安装)
4.-bl #检查spec中的%file段(查看文件是否齐全)
5.-ba #建立源码与二进制包(常用):即编译后做成*.rpm和*.src.rpm
6.-bb #只建立二进制包(常用):即编译后做成*.rpm
7.-bs #只建立源码包:即只做成*.src.rpm
-tc -ti -ta -tb -ts 的功能类似，只是所需参数由spec文件变成tar包。

cp ~/openssh-8.6p1/contrib/redhat/openssh.spec ~/rpmbuild/SPECS/

cp /etc/pam.d/sshd ~/rpmbuild/SOURCES/

cp openssh-8.6p1.tar.gz ~/rpmbuild/SOURCES/

cp x11-ssh-askpass-1.2.4.1.tar.gz ~/rpmbuild/SOURCES/

cd SPECS

第104行：注释该行，检测openssl版本的，否则构建时会出现报错
BuildRequires: openssl-devel < 1.1

第 89 行: 添加一个源
Source2: sshd
第280行：更改为从SOURCE目录复制 sshd到/etc/pam.d/sshd，具体原因上面有解释注释掉原命令，改为下面这行
#install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
install -m644 $RPM_SOURCE_DIR/sshd $RPM_BUILD_ROOT/etc/pam.d/sshd

第 340-341行这两行需要放在 %pre server 下，为安装前备份内容
cp -r /etc/ssh /etc/ssh_bak

第 345 -353行: 需要放在 %post server后面，表示安装后需要执行的命令
1.允许root登录；升级为8.6后默认为不允许root登录
2.允许使用PAM登录认证；
3.允许使用X11Forwarding图形模块；
4.增加认证支持（默认openssh 8.6，默认不支持部分低版本的认证模式），不添加会造成低版本的连接器如：CRT等，客户端连接失败
5.给/etc/init.d/sshd 执行权限
6.三个文件 ssh_host_rsa_key、ssh_host_ecdsa_key、ssh_host_ed25519_key 为你要文件，8.6版本缩小了权限，只允许root查看，否者启动sshd服务会报错
sed -i -e "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
sed -i -e "s/#UsePAM no/UsePAM yes/g" /etc/ssh/sshd_config
sed -i -e "s/#X11Forwarding no/X11Forwarding yes/g" /etc/ssh/sshd_config
echo "KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group14-sha1" >>/etc/ssh/sshd_config
chmod +x /etc/init.d/sshd
chmod 600 /etc/ssh/ssh_host_rsa_key
chmod 600 /etc/ssh/ssh_host_ecdsa_key
chmod 600 /etc/ssh/ssh_host_ed25519_key

第 10-15行: 是否生成 x11-askpass、gnome-askpass两个RPM包。可以不选，不选的话就不要 x11-ssh-askpass-1.2.4.1.tar.gz 包；默认生成，我建议选上，万一需要又得再来构建，麻烦

Do we want to disable building of x11-askpass? (1=yes 0=no)

%global no_x11_askpass 0

Do we want to disable building of gnome-askpass? (1=yes 0=no)

%global no_gnome_askpass 0

rpmbuild -bb openssh.spec

cd /root/rpmbuild/RPMS/x86_64/

echo "

#!/bin/bash
cp /etc/pam.d/sshd /etc/pam.d/sshd_bak
cp /etc/ssh/sshd_config /etc/ssh/sshd_config_bak
rpm -Uvh ./*.rpm 2> /dev/null
cp -r /etc/pam.d/sshd_bak /etc/pam.d/sshd
cp /etc/ssh/sshd_config_bak /etc/ssh/sshd_config
#rm -rf /etc/ssh/ssh*key
chmod 600 /etc/ssh/ssh_host_rsa_key
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
chkconfig daemon-reload
service sshd restart

" > install.sh

cd ..&&tar -zcvf ssh8.6_x86_el6.tar x86_64/

附：openssh.spec文件范例（可复制粘贴）

%global ver 8.6p1
%global rel 1%{?dist}

OpenSSH privilege separation requires a user & group ID

%global sshd_uid 74
%global sshd_gid 74

Version of ssh-askpass

%global aversion 1.2.4.1

Do we want to disable building of x11-askpass? (1=yes 0=no)

%global no_x11_askpass 0

Do we want to disable building of gnome-askpass? (1=yes 0=no)

%global no_gnome_askpass 0

Do we want to link against a static libcrypto? (1=yes 0=no)

%global static_libcrypto 0

Do we want smartcard support (1=yes 0=no)

%global scard 0

Use GTK2 instead of GNOME in gnome-ssh-askpass

%global gtk2 1

Use build6x options for older RHEL builds

RHEL 7 not yet supported

%if 0%{?rhel} > 6
%global build6x 0
%else
%global build6x 1
%endif

%if 0%{?fedora} >= 26
%global compat_openssl 1
%else
%global compat_openssl 0
%endif

Do we want kerberos5 support (1=yes 0=no)

%global kerberos5 1

Reserve options to override askpass settings with:

rpm -ba|--rebuild --define 'skip_xxx 1'

%{?skip_x11_askpass:%global no_x11_askpass 1}
%{?skip_gnome_askpass:%global no_gnome_askpass 1}

Add option to build without GTK2 for older platforms with only GTK+.

RedHat <= 7.2 and Red Hat Advanced Server 2.1 are examples.

rpm -ba|--rebuild --define 'no_gtk2 1'

%{?no_gtk2:%global gtk2 0}

Is this a build for RHL 6.x or earlier?

%{?build_6x:%global build6x 1}

If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc.

%if %{build6x}
%global _sysconfdir /etc
%endif

Options for static OpenSSL link:

rpm -ba|--rebuild --define "static_openssl 1"

%{?static_openssl:%global static_libcrypto 1}

Options for Smartcard support: (needs libsectok and openssl-engine)

rpm -ba|--rebuild --define "smartcard 1"

%{?smartcard:%global scard 1}

Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no)

%global rescue 0
%{?build_rescue:%global rescue 1}

Turn off some stuff for resuce builds

%if %{rescue}
%global kerberos5 0
%endif

Summary: The OpenSSH implementation of SSH protocol version 2.
Name: openssh
Version: %{ver}
%if %{rescue}
Release: %{rel}rescue
%else
Release: %{rel}
%endif
URL: https://www.openssh.com/portable.html
Source0: https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
Source2: sshd
License: BSD
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Obsoletes: ssh
%if %{build6x}
PreReq: initscripts >= 5.00
%else
Requires: initscripts >= 5.20
%endif
BuildRequires: perl
%if %{compat_openssl}
BuildRequires: compat-openssl10-devel
%else
BuildRequires: openssl-devel >= 1.0.1
#BuildRequires: openssl-devel < 1.1
%endif
BuildRequires: /bin/login
%if ! %{build6x}
BuildRequires: glibc-devel, pam
%else
BuildRequires: /usr/include/security/pam_appl.h
%endif
%if ! %{no_x11_askpass}
BuildRequires: /usr/include/X11/Xlib.h

Xt development tools

BuildRequires: libXt-devel

Provides xmkmf

BuildRequires: imake

Rely on relatively recent gtk

BuildRequires: gtk2-devel
%endif
%if ! %{no_gnome_askpass}
BuildRequires: pkgconfig
%endif
%if %{kerberos5}
BuildRequires: krb5-devel
BuildRequires: krb5-libs
%endif

%package clients
Summary: OpenSSH clients.
Requires: openssh = %{version}-%{release}
Group: Applications/Internet
Obsoletes: ssh-clients

%package server
Summary: The OpenSSH server daemon.
Group: System Environment/Daemons
Obsoletes: ssh-server
Requires: openssh = %{version}-%{release}, chkconfig >= 0.9
%if ! %{build6x}
Requires: /etc/pam.d/system-auth
%endif

%package askpass
Summary: A passphrase dialog for OpenSSH and X.
Group: Applications/Internet
Requires: openssh = %{version}-%{release}
Obsoletes: ssh-extras

%package askpass-gnome
Summary: A passphrase dialog for OpenSSH, X, and GNOME.
Group: Applications/Internet
Requires: openssh = %{version}-%{release}
Obsoletes: ssh-extras

%description
SSH (Secure SHell) is a program for logging into and executing
commands on a remote machine. SSH is intended to replace rlogin and
rsh, and to provide secure encrypted communications between two
untrusted hosts over an insecure network. X11 connections and
arbitrary TCP/IP ports can also be forwarded over the secure channel.

OpenSSH is OpenBSD's version of the last free version of SSH, bringing
it up to date in terms of security and features, as well as removing
all patented algorithms to separate libraries.

This package includes the core files necessary for both the OpenSSH
client and server. To make this package useful, you should also
install openssh-clients, openssh-server, or both.

%description clients
OpenSSH is a free version of SSH (Secure SHell), a program for logging
into and executing commands on a remote machine. This package includes
the clients necessary to make encrypted connections to SSH servers.
You'll also need to install the openssh package on OpenSSH clients.

%description server
OpenSSH is a free version of SSH (Secure SHell), a program for logging
into and executing commands on a remote machine. This package contains
the secure shell daemon (sshd). The sshd daemon allows SSH clients to
securely connect to your SSH server. You also need to have the openssh
package installed.

%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 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
an X11 passphrase dialog for OpenSSH and the GNOME GUI desktop
environment.

%prep

%if ! %{no_x11_askpass}
%setup -q -a 1
%else
%setup -q
%endif

%build
%if %{rescue}
CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
%endif

%configure \
--sysconfdir=%{_sysconfdir}/ssh \
--libexecdir=%{_libexecdir}/openssh \
--datadir=%{_datadir}/openssh \
--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 \
--with-md5-passwords \
--mandir=%{_mandir} \
--with-mantype=man \
--disable-strip \
%if %{scard}
--with-smartcard \
%endif
%if %{rescue}
--without-pam \
%else
--with-pam \
%endif
%if %{kerberos5}
--with-kerberos5=$K5DIR \
%endif

%if %{static_libcrypto}
perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
%endif

make

%if ! %{no_x11_askpass}
pushd x11-ssh-askpass-%{aversion}
%configure --libexecdir=%{_libexecdir}/openssh
xmkmf -a
make
popd
%endif

Define a variable to toggle gnome1/gtk2 building. This is necessary

because RPM doesn't handle nested %if statements.

%if %{gtk2}
gtk2=yes
%else
gtk2=no
%endif

%if ! %{no_gnome_askpass}
pushd contrib
if [ $gtk2 = yes ] ; then
make gnome-ssh-askpass2
mv gnome-ssh-askpass2 gnome-ssh-askpass
else
make gnome-ssh-askpass1
mv gnome-ssh-askpass1 gnome-ssh-askpass
fi
popd
%endif

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh
mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd

make install DESTDIR=$RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT/etc/pam.d/
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
%if %{build6x}
install -m644 contrib/redhat/sshd.pam.old $RPM_BUILD_ROOT/etc/pam.d/sshd
%else
install -m644 $RPM_SOURCE_DIR/sshd $RPM_BUILD_ROOT/etc/pam.d/sshd
%endif
install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd

%if ! %{no_x11_askpass}
install 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 ! %{no_gnome_askpass}
install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass
%endif

%if ! %{scard}
rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin
%endif

%if ! %{no_gnome_askpass}
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
%endif

perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/*

%clean
rm -rf $RPM_BUILD_ROOT

%triggerun server -- ssh-server
if [ "$1" != 0 -a -r /var/run/sshd.pid ] ; then
touch /var/run/sshd.restart
fi

%triggerun server -- openssh-server < 2.5.0p1

Count the number of HostKey and HostDsaKey statements we have.

gawk 'BEGIN {IGNORECASE=1}
/^hostkey/ || /^hostdsakey/ {sawhostkey = sawhostkey + 1}
END {exit sawhostkey}' /etc/ssh/sshd_config

And if we only found one, we know the client was relying on the old default

behavior, which loaded the the SSH2 DSA host key when HostDsaKey wasn't

specified. Now that HostKey is used for both SSH1 and SSH2 keys, specifying

one nullifies the default, which would have loaded both.

if [ $? -eq 1 ] ; then
echo HostKey /etc/ssh/ssh_host_rsa_key >> /etc/ssh/sshd_config
echo HostKey /etc/ssh/ssh_host_dsa_key >> /etc/ssh/sshd_config
fi

%triggerpostun server -- ssh-server
if [ "$1" != 0 ] ; then
/sbin/chkconfig --add sshd
if test -f /var/run/sshd.restart ; then
rm -f /var/run/sshd.restart
/sbin/service sshd start > /dev/null 2>&1 || :
fi
fi

%pre server
%{_sbindir}/groupadd -r -g %{sshd_gid} sshd 2>/dev/null || :
%{_sbindir}/useradd -d /var/empty/sshd -s /bin/false -u %{sshd_uid} \
-g sshd -M -r sshd 2>/dev/null || :
cp -r /etc/ssh /etc/ssh_bak
cp -r /etc/pam.d/sshd /etc/pam.d/sshd.bak

%post server
/sbin/chkconfig --add sshd
sed -i -e "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
sed -i -e "s/#UsePAM no/UsePAM yes/g" /etc/ssh/sshd_config
sed -i -e "s/#X11Forwarding no/X11Forwarding yes/g" /etc/ssh/sshd_config
echo "KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group14-sha1" >>/etc/ssh/sshd_config
chmod +x /etc/init.d/sshd
chmod 600 /etc/ssh/ssh_host_rsa_key
chmod 600 /etc/ssh/ssh_host_ecdsa_key
chmod 600 /etc/ssh/ssh_host_ed25519_key

%postun server
/sbin/service sshd condrestart > /dev/null 2>&1 || :

%preun server
if [ "$1" = 0 ]
then
/sbin/service sshd stop > /dev/null 2>&1 || :
/sbin/chkconfig --del sshd
fi

%files
%defattr(-,root,root)
%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO
%attr(0755,root,root) %{_bindir}/scp
%attr(0644,root,root) %{_mandir}/man1/scp.1*
%attr(0755,root,root) %dir %{_sysconfdir}/ssh
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli
%if ! %{rescue}
%attr(0755,root,root) %{_bindir}/ssh-keygen
%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
%attr(0755,root,root) %dir %{_libexecdir}/openssh
%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign
%attr(0755,root,root) %{_libexecdir}/openssh/ssh-pkcs11-helper
%attr(0755,root,root) %{_libexecdir}/openssh/ssh-sk-helper
%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
%attr(0644,root,root) %{_mandir}/man8/ssh-pkcs11-helper.8*
%attr(0644,root,root) %{_mandir}/man8/ssh-sk-helper.8*
%endif
%if %{scard}
%attr(0755,root,root) %dir %{_datadir}/openssh
%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin
%endif

%files clients
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/ssh
%attr(0644,root,root) %{_mandir}/man1/ssh.1*
%attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
%if ! %{rescue}
%attr(2755,root,nobody) %{_bindir}/ssh-agent
%attr(0755,root,root) %{_bindir}/ssh-add
%attr(0755,root,root) %{_bindir}/ssh-keyscan
%attr(0755,root,root) %{_bindir}/sftp
%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*
%endif

%if ! %{rescue}
%files server
%defattr(-,root,root)
%dir %attr(0111,root,root) %{_var}/empty/sshd
%attr(0755,root,root) %{_sbindir}/sshd
%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
%attr(0644,root,root) %{_mandir}/man8/sshd.8*
%attr(0644,root,root) %{_mandir}/man5/moduli.5*
%attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
%attr(0755,root,root) %dir %{_sysconfdir}/ssh
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
%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
%{_libexecdir}/openssh/ssh-askpass
%attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass
%endif

%if ! %{no_gnome_askpass}
%files askpass-gnome
%defattr(-,root,root)
%attr(0755,root,root) %config %{_sysconfdir}/profile.d/gnome-ssh-askpass.*
%attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass
%endif

%changelog
* Mon Jul 20 2020 Damien Miller djm@mindrto.org

Add ssh-sk-helper and corresponding manual page.

* Sat Feb 10 2018 Darren Tucker dtucker@dtucker.net

Update openssl-devel dependency to match current requirements.
Handle Fedora >=6 openssl 1.0 compat libs.
Remove SSH1 from description.
Don't strip binaries at build time so that debuginfo package can be
created.

* Sun Nov 16 2014 Nico Kadel-Garcia nakdel@gmail.com

Add '--mandir' and '--with-mantype' for RHEL 5 compatibility
Add 'dist' option to 'ver' so package names reflect OS at build time
Always include x11-ssh-askpass tarball in SRPM
Add openssh-x11-aspass BuildRequires for libXT-devel, imake, gtk2-devel
Discard 'K5DIR' reporting, not usable inside 'mock' for RHEL 5 compatibility
Discard obsolete '--with-rsh' configure option
Update openssl-devel dependency to 0.9.8f, as found in autoconf

* Wed Jul 14 2010 Tim Rice tim@multitalents.net

test for skip_x11_askpass (line 77) should have been for no_x11_askpass

* Mon Jun 2 2003 Damien Miller djm@mindrot.org

Remove noip6 option. This may be controlled at run-time in client config
file using new AddressFamily directive

* Mon May 12 2003 Damien Miller djm@mindrot.org

Don't install profile.d scripts when not building with GNOME/GTK askpass
(patch from bet@rahul.net)

* Tue Oct 01 2002 Damien Miller djm@mindrot.org

Install ssh-agent setgid nobody to prevent ptrace() key theft attacks

* Mon Sep 30 2002 Damien Miller djm@mindrot.org

Use contrib/ Makefile for building askpass programs

* Fri Jun 21 2002 Damien Miller djm@mindrot.org

Merge in spec changes from seba@iq.pl (Sebastian Pachuta)
Add new {ssh,sshd}_config.5 manpages
Add new ssh-keysign program and remove setuid from ssh client

* Fri May 10 2002 Damien Miller djm@mindrot.org

Merge in spec changes from RedHat, reorgansie a little
Add Privsep user, group and directory

* Thu Mar 7 2002 Nalin Dahyabhai nalin@redhat.com 3.1p1-2

bump and grind (through the build system)

* Thu Mar 7 2002 Nalin Dahyabhai nalin@redhat.com 3.1p1-1

require sharutils for building (mindrot #137)
require db1-devel only when building for 6.x (#55105), which probably won't
work anyway (3.1 requires OpenSSL 0.9.6 to build), but what the heck
require pam-devel by file (not by package name) again
add Markus's patch to compile with OpenSSL 0.9.5a (from
http://bugzilla.mindrot.org/show_bug.cgi?id=141) and apply it if we're
building for 6.x

* Thu Mar 7 2002 Nalin Dahyabhai nalin@redhat.com 3.1p1-0

update to 3.1p1

* Tue Mar 5 2002 Nalin Dahyabhai nalin@redhat.com SNAP-20020305

update to SNAP-20020305
drop debug patch, fixed upstream

* Wed Feb 20 2002 Nalin Dahyabhai nalin@redhat.com SNAP-20020220

update to SNAP-20020220 for testing purposes (you've been warned, if there's
anything to be warned about, gss patches won't apply, I don't mind)

* Wed Feb 13 2002 Nalin Dahyabhai nalin@redhat.com 3.0.2p1-3

add patches from Simon Wilkinson and Nicolas Williams for GSSAPI key
exchange, authentication, and named key support

* Wed Jan 23 2002 Nalin Dahyabhai nalin@redhat.com 3.0.2p1-2

remove dependency on db1-devel, which has just been swallowed up whole
by gnome-libs-devel

* Sat Dec 29 2001 Nalin Dahyabhai nalin@redhat.com

adjust build dependencies so that build6x actually works right (fix
from Hugo van der Kooij)

* Tue Dec 4 2001 Nalin Dahyabhai nalin@redhat.com 3.0.2p1-1

update to 3.0.2p1

* Fri Nov 16 2001 Nalin Dahyabhai nalin@redhat.com 3.0.1p1-1

update to 3.0.1p1

* Tue Nov 13 2001 Nalin Dahyabhai nalin@redhat.com

update to current CVS (not for use in distribution)

* Thu Nov 8 2001 Nalin Dahyabhai nalin@redhat.com 3.0p1-1

merge some of Damien Miller djm@mindrot.org changes from the upstream
3.0p1 spec file and init script

* Wed Nov 7 2001 Nalin Dahyabhai nalin@redhat.com

update to 3.0p1
update to x11-ssh-askpass 1.2.4.1
change build dependency on a file from pam-devel to the pam-devel package
replace primes with moduli

* Thu Sep 27 2001 Nalin Dahyabhai nalin@redhat.com 2.9p2-9

incorporate fix from Markus Friedl's advisory for IP-based authorization bugs

* Thu Sep 13 2001 Bernhard Rosenkraenzer bero@redhat.com 2.9p2-8

Merge changes to rescue build from current sysadmin survival cd

* Thu Sep 6 2001 Nalin Dahyabhai nalin@redhat.com 2.9p2-7

fix scp's server's reporting of file sizes, and build with the proper
preprocessor define to get large-file capable open(), stat(), etc.
(sftp has been doing this correctly all along) (#51827)
configure without --with-ipv4-default on RHL 7.x and newer (#45987,#52247)
pull cvs patch to fix support for /etc/nologin for non-PAM logins (#47298)
mark profile.d scriptlets as config files (#42337)
refer to Jason Stone's mail for zsh workaround for exit-hanging quasi-bug
change a couple of log() statements to debug() statements (#50751)
pull cvs patch to add -t flag to sshd (#28611)
clear fd_sets correctly (one bit per FD, not one byte per FD) (#43221)

* Mon Aug 20 2001 Nalin Dahyabhai nalin@redhat.com 2.9p2-6

add db1-devel as a BuildPrerequisite (noted by Hans Ecke)

* Thu Aug 16 2001 Nalin Dahyabhai nalin@redhat.com

pull cvs patch to fix remote port forwarding with protocol 2

* Thu Aug 9 2001 Nalin Dahyabhai nalin@redhat.com

pull cvs patch to add session initialization to no-pty sessions
pull cvs patch to not cut off challengeresponse auth needlessly
refuse to do X11 forwarding if xauth isn't there, handy if you enable
it by default on a system that doesn't have X installed (#49263)

* Wed Aug 8 2001 Nalin Dahyabhai nalin@redhat.com

don't apply patches to code we don't intend to build (spotted by Matt Galgoci)

* Mon Aug 6 2001 Nalin Dahyabhai nalin@redhat.com

pass OPTIONS correctly to initlog (#50151)

* Wed Jul 25 2001 Nalin Dahyabhai nalin@redhat.com

switch to x11-ssh-askpass 1.2.2

* Wed Jul 11 2001 Nalin Dahyabhai nalin@redhat.com

rebuild in new environment

* Mon Jun 25 2001 Nalin Dahyabhai nalin@redhat.com

disable the gssapi patch

* Mon Jun 18 2001 Nalin Dahyabhai nalin@redhat.com

update to 2.9p2
refresh to a new version of the gssapi patch

* Thu Jun 7 2001 Nalin Dahyabhai nalin@redhat.com

change Copyright: BSD to License: BSD
add Markus Friedl's unverified patch for the cookie file deletion problem
so that we can verify it
drop patch to check if xauth is present (was folded into cookie patch)
don't apply gssapi patches for the errata candidate
clear supplemental groups list at startup

* Fri May 25 2001 Nalin Dahyabhai nalin@redhat.com

fix an error parsing the new default sshd_config
add a fix from Markus Friedl (via openssh-unix-dev) for ssh-keygen not
dealing with comments right

* Thu May 24 2001 Nalin Dahyabhai nalin@redhat.com

add in Simon Wilkinson's GSSAPI patch to give it some testing in-house,
to be removed before the next beta cycle because it's a big departure
from the upstream version

* Thu May 3 2001 Nalin Dahyabhai nalin@redhat.com

finish marking strings in the init script for translation
modify init script to source /etc/sysconfig/sshd and pass $OPTIONS to sshd
at startup (change merged from openssh.com init script, originally by
Pekka Savola)
refuse to do X11 forwarding if xauth isn't there, handy if you enable
it by default on a system that doesn't have X installed

* Wed May 2 2001 Nalin Dahyabhai nalin@redhat.com

update to 2.9
drop various patches that came from or went upstream or to or from CVS

* Wed Apr 18 2001 Nalin Dahyabhai nalin@redhat.com

only require initscripts 5.00 on 6.2 (reported by Peter Bieringer)

* Sun Apr 8 2001 Preston Brown pbrown@redhat.com

remove explicit openssl requirement, fixes builddistro issue
make initscript stop() function wait until sshd really dead to avoid
races in condrestart

* Mon Apr 2 2001 Nalin Dahyabhai nalin@redhat.com

mention that challengereponse supports PAM, so disabling password doesn't
limit users to pubkey and rsa auth (#34378)
bypass the daemon() function in the init script and call initlog directly,
because daemon() won't start a daemon it detects is already running (like
open connections)
require the version of openssl we had when we were built

* Fri Mar 23 2001 Nalin Dahyabhai nalin@redhat.com

make do_pam_setcred() smart enough to know when to establish creds and
when to reinitialize them
add in a couple of other fixes from Damien for inclusion in the errata

* Thu Mar 22 2001 Nalin Dahyabhai nalin@redhat.com

update to 2.5.2p2
call setcred() again after initgroups, because the "creds" could actually
be group memberships

* Tue Mar 20 2001 Nalin Dahyabhai nalin@redhat.com

update to 2.5.2p1 (includes endianness fixes in the rijndael implementation)
don't enable challenge-response by default until we find a way to not
have too many userauth requests (we may make up to six pubkey and up to
three password attempts as it is)
remove build dependency on rsh to match openssh.com's packages more closely

* Sat Mar 3 2001 Nalin Dahyabhai nalin@redhat.com

remove dependency on openssl -- would need to be too precise

* Fri Mar 2 2001 Nalin Dahyabhai nalin@redhat.com

rebuild in new environment

* Mon Feb 26 2001 Nalin Dahyabhai nalin@redhat.com

Revert the patch to move pam_open_session.
Init script and spec file changes from Pekka Savola. (#28750)
Patch sftp to recognize '-o protocol' arguments. (#29540)

* Thu Feb 22 2001 Nalin Dahyabhai nalin@redhat.com

Chuck the closing patch.
Add a trigger to add host keys for protocol 2 to the config file, now that
configuration file syntax requires us to specify it with HostKey if we
specify any other HostKey values, which we do.

* Tue Feb 20 2001 Nalin Dahyabhai nalin@redhat.com

Redo patch to move pam_open_session after the server setuid()s to the user.
Rework the nopam patch to use be picked up by autoconf.

* Mon Feb 19 2001 Nalin Dahyabhai nalin@redhat.com

Update for 2.5.1p1.
Add init script mods from Pekka Savola.
Tweak the init script to match the CVS contrib script more closely.
Redo patch to ssh-add to try to adding both identity and id_dsa to also try
adding id_rsa.

* Fri Feb 16 2001 Nalin Dahyabhai nalin@redhat.com

Update for 2.5.0p1.
Use $RPM_OPT_FLAGS instead of -O when building gnome-ssh-askpass
Resync with parts of Damien Miller's openssh.spec from CVS, including
update of x11 askpass to 1.2.0.
Only require openssl (don't prereq) because we generate keys in the init
script now.

* Tue Feb 13 2001 Nalin Dahyabhai nalin@redhat.com

Don't open a PAM session until we've forked and become the user (#25690).
Apply Andrew Bartlett's patch for letting pam_authenticate() know which
host the user is attempting a login from.
Resync with parts of Damien Miller's openssh.spec from CVS.
Don't expose KbdInt responses in debug messages (from CVS).
Detect and handle errors in rsa_{public,private}_decrypt (from CVS).

* Wed Feb 7 2001 Trond Eivind Glomsrxd teg@redhat.com

i18n-tweak to initscript.

* Tue Jan 23 2001 Nalin Dahyabhai nalin@redhat.com

More gettextizing.
Close all files after going into daemon mode (needs more testing).
Extract patch from CVS to handle auth banners (in the client).
Extract patch from CVS to handle compat weirdness.

* Fri Jan 19 2001 Nalin Dahyabhai nalin@redhat.com

Finish with the gettextizing.

* Thu Jan 18 2001 Nalin Dahyabhai nalin@redhat.com

Fix a bug in auth2-pam.c (#23877)
Gettextize the init script.

* Wed Dec 20 2000 Nalin Dahyabhai nalin@redhat.com

Incorporate a switch for using PAM configs for 6.x, just in case.

* Tue Dec 5 2000 Nalin Dahyabhai nalin@redhat.com

Incorporate Bero's changes for a build specifically for rescue CDs.

* Wed Nov 29 2000 Nalin Dahyabhai nalin@redhat.com

Don't treat pam_setcred() failure as fatal unless pam_authenticate() has
succeeded, to allow public-key authentication after a failure with "none"
authentication. (#21268)

* Tue Nov 28 2000 Nalin Dahyabhai nalin@redhat.com

Update to x11-askpass 1.1.1. (#21301)
Don't second-guess fixpaths, which causes paths to get fixed twice. (#21290)

* Mon Nov 27 2000 Nalin Dahyabhai nalin@redhat.com

Merge multiple PAM text messages into subsequent prompts when possible when
doing keyboard-interactive authentication.

* Sun Nov 26 2000 Nalin Dahyabhai nalin@redhat.com

Disable the built-in MD5 password support. We're using PAM.
Take a crack at doing keyboard-interactive authentication with PAM, and
enable use of it in the default client configuration so that the client
will try it when the server disallows password authentication.
Build with debugging flags. Build root policies strip all binaries anyway.

* Tue Nov 21 2000 Nalin Dahyabhai nalin@redhat.com

Use DESTDIR instead of %%makeinstall.
Remove /usr/X11R6/bin from the path-fixing patch.

* Mon Nov 20 2000 Nalin Dahyabhai nalin@redhat.com

Add the primes file from the latest snapshot to the main package (#20884).
Add the dev package to the prereq list (#19984).
Remove the default path and mimic login's behavior in the server itself.

* Fri Nov 17 2000 Nalin Dahyabhai nalin@redhat.com

Resync with conditional options in Damien Miller's .spec file for an errata.
Change libexecdir from %%{_libexecdir}/ssh to %%{_libexecdir}/openssh.

* Tue Nov 7 2000 Nalin Dahyabhai nalin@redhat.com

Update to OpenSSH 2.3.0p1.
Update to x11-askpass 1.1.0.
Enable keyboard-interactive authentication.

* Mon Oct 30 2000 Nalin Dahyabhai nalin@redhat.com

Update to ssh-askpass-x11 1.0.3.
Change authentication related messages to be private (#19966).

* Tue Oct 10 2000 Nalin Dahyabhai nalin@redhat.com

Patch ssh-keygen to be able to list signatures for DSA public key files
it generates.

* Thu Oct 5 2000 Nalin Dahyabhai nalin@redhat.com

Add BuildRequires on /usr/include/security/pam_appl.h to be sure we always
build PAM authentication in.
Try setting SSH_ASKPASS if gnome-ssh-askpass is installed.
Clean out no-longer-used patches.
Patch ssh-add to try to add both identity and id_dsa, and to error only
when neither exists.

* Mon Oct 2 2000 Nalin Dahyabhai nalin@redhat.com

Update x11-askpass to 1.0.2. (#17835)
Add BuildRequiress for /bin/login and /usr/bin/rsh so that configure will
always find them in the right place. (#17909)
Set the default path to be the same as the one supplied by /bin/login, but
add /usr/X11R6/bin. (#17909)
Try to handle obsoletion of ssh-server more cleanly. Package names
are different, but init script name isn't. (#17865)

* Wed Sep 6 2000 Nalin Dahyabhai nalin@redhat.com