pool/openssh
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 60035 from home:pcerny:factory

Browse Source 
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/60035
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=6
This commit is contained in:
Petr Cerny 2011-02-04 10:44:51 +00:00 committed by Git OBS Bridge
parent 397970d96a
commit 5920438cad
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
openssh-5.7p1.dif → openssh-5.7p1-sshd_config.diff
View File

5
openssh.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 3 16:42:01 UTC 2011 - pcerny@novell.com
- specfile/patches cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 24 11:24:59 UTC 2011 - lchiquitto@novell.com Mon Jan 24 11:24:59 UTC 2011 - lchiquitto@novell.com

46
openssh.spec
View File

@ -30,7 +30,7 @@ PreReq: pwdutils %insserv_prereq %fillup_prereq coreutils
Conflicts: nonfreessh Conflicts: nonfreessh
AutoReqProv: on AutoReqProv: on
Version: 5.7p1 Version: 5.7p1
Release: 1 Release: 2
%define xversion 1.2.4.1 %define xversion 1.2.4.1
Summary: Secure Shell Client and Server (Remote Login Program) Summary: Secure Shell Client and Server (Remote Login Program)
Url: http://www.openssh.com/ Url: http://www.openssh.com/
@ -44,7 +44,7 @@ Source6: README.kerberos
Source7: ssh.reg Source7: ssh.reg
Source8: ssh-askpass Source8: ssh-askpass
Source9: sshd.fw Source9: sshd.fw
Patch: %{name}-%{version}.dif Patch: %{name}-%{version}-sshd_config.diff
Patch1: %{name}-%{version}-askpass-fix.diff Patch1: %{name}-%{version}-askpass-fix.diff
Patch2: %{name}-%{version}-pam-fix2.diff Patch2: %{name}-%{version}-pam-fix2.diff
Patch3: %{name}-%{version}-saveargv-fix.diff Patch3: %{name}-%{version}-saveargv-fix.diff
@ -62,10 +62,10 @@ Patch16: %{name}-%{version}-pts.diff
Patch17: %{name}-%{version}-homechroot.patch Patch17: %{name}-%{version}-homechroot.patch
Patch18: %{name}-%{version}-sshconfig-knownhostschanges.diff Patch18: %{name}-%{version}-sshconfig-knownhostschanges.diff
Patch19: %{name}-%{version}-host_ident.diff Patch19: %{name}-%{version}-host_ident.diff
Patch20: %{name}-%{version}-selinux.diff Patch21: %{name}-%{version}-selinux.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package askpass %package askpass
License: BSD3c(or similar) ; MIT License (or similar) License: BSD3c(or similar) ; MIT License (or similar)
Summary: A passphrase dialog for OpenSSH and the X Window System Summary: A passphrase dialog for OpenSSH and the X Window System
Requires: openssh = %{version} Requires: openssh = %{version}
@ -107,7 +107,7 @@ Window System passphrase dialog for OpenSSH.
%patch17 %patch17
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch21 -p1
cp -v %{SOURCE4} . cp -v %{SOURCE4} .
cp -v %{SOURCE6} . cp -v %{SOURCE6} .
cd ../x11-ssh-askpass-%{xversion} cd ../x11-ssh-askpass-%{xversion}
@ -130,30 +130,30 @@ PIEFLAGS="-fpie"
#Obsoleted LDFLAGS="-lpthread" \ #Obsoleted LDFLAGS="-lpthread" \
LDFLAGS="-pie" CFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" CXXFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" \ LDFLAGS="-pie" CFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" CXXFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" \
./configure --with-ssl-engine \ ./configure --with-ssl-engine \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--prefix=%{prefix} \ --prefix=%{prefix} \
--infodir=%{_infodir} \ --infodir=%{_infodir} \
--sysconfdir=/etc/ssh \ --sysconfdir=/etc/ssh \
--libexecdir=%{prefix}/%_lib/ssh \ --libexecdir=%{prefix}/%_lib/ssh \
--with-tcp-wrappers \ --with-tcp-wrappers \
--with-selinux \ --with-selinux \
--with-pam \ --with-pam \
--with-kerberos5=/usr \ --with-kerberos5=/usr \
--with-privsep-path=/var/lib/empty \ --with-privsep-path=/var/lib/empty \
--disable-strip \ --disable-strip \
--with-linux-audit \ --with-linux-audit \
--with-xauth=%{_prefix}/bin/xauth \ --with-xauth=%{_prefix}/bin/xauth \
--target=%{_target_cpu}-suse-linux --target=%{_target_cpu}-suse-linux
# --with-afs=/usr \ # --with-afs=/usr \
make %{?_smp_mflags} make %{?_smp_mflags}
(cd converter; make %{?_smp_mflags}) (cd converter; make %{?_smp_mflags})
cd contrib cd contrib
cd ../../x11-ssh-askpass-%{xversion} cd ../../x11-ssh-askpass-%{xversion}
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
./configure \ ./configure \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libexecdir=%{prefix}/%_lib/ssh --libexecdir=%{prefix}/%_lib/ssh
xmkmf xmkmf
make includes USRLIBDIR=%_prefix/%_lib make includes USRLIBDIR=%_prefix/%_lib
make %{?_smp_mflags} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS" make %{?_smp_mflags} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS"