diff options
| author | cvs2git | 2006-09-27 19:41:11 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 798096f9806355a62bf2d0ee7b6bbc289454f992 (patch) | |
| tree | b2cbd979d26c0476502915834fb59d854c52d5f3 | |
| parent | a1a809063a9e42730b21ffe8f69958643573cf86 (diff) | |
| download | openssh-798096f9806355a62bf2d0ee7b6bbc289454f992.zip openssh-798096f9806355a62bf2d0ee7b6bbc289454f992.tar.gz | |
This commit was manufactured by cvs2git to create tag 'auto-ac-openssh-auto/ac/openssh-4_3p2-7
4_3p2-7'.
Sprout from master 2006-09-27 19:40:43 UTC Elan Ruusamäe <glen@pld-linux.org> '- CVE-2006-4924 from gentoo'
Cherrypick from unlabeled-1.251.2 2006-09-27 19:41:11 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 7; fixes CVE-2006-4924':
openssh.spec -> 1.251.2.9
| -rw-r--r-- | openssh.spec | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/openssh.spec b/openssh.spec index ae83926..31c6697 100644 --- a/openssh.spec +++ b/openssh.spec @@ -16,7 +16,7 @@ %endif # gtk2-based gnome-askpass means no gnome1-based %{?with_gtk:%undefine with_gnome} -%define _rel 4 +%define _rel 7 Summary: OpenSSH free Secure Shell (SSH) implementation Summary(de): OpenSSH - freie Implementation der Secure Shell (SSH) Summary(es): Implementación libre de SSH @@ -70,6 +70,7 @@ Patch11: %{name}-4.3p1-hpn11.patch # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11-none.diff Patch12: %{name}-4.3p1-hpn11-none.patch Patch13: %{name}-include.patch +Patch14: %{name}-identical-simple-dos-2.patch URL: http://www.openssh.com/ BuildRequires: %{__perl} BuildRequires: autoconf @@ -467,6 +468,7 @@ GNOME. %{?with_hpn:%patch11 -p1} %{?with_hpn_none:%patch12 -p1} %patch13 -p1 +%patch14 -p3 %build cp %{_datadir}/automake/config.sub . @@ -489,11 +491,11 @@ cp %{_datadir}/automake/config.sub . %{?with_kerberos5:--with-kerberos5} \ --with-privsep-path=%{_privsepdir} \ --with-pid-dir=%{_localstatedir}/run \ - --with-xauth=/usr/bin/xauth \ + --with-xauth=/usr/X11R6/bin/xauth \ --enable-utmpx \ --enable-wtmpx -echo '#define LOGIN_PROGRAM "/bin/login"' >>config.h +echo '#define LOGIN_PROGRAM "/bin/login"' >>config.h %{__make} @@ -557,10 +559,10 @@ echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd %if "%{_lib}" != "lib" -find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 perl -pi -e "s#/usr/lib#/usr/%{_lib}#" +find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 sed -i -e 's#%{_prefix}/lib#%{_libdir}#' %endif -cat << EOF >$RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS +cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS #SSH_ASKPASS="%{_libexecdir}/ssh-askpass" EOF |