|
|
@@ -55,7 +55,7 @@ Distribution: OpenPKG [CORE]
|
|
|
Group: Security
|
|
|
License: BSD
|
|
|
Version: %{V_base}%{V_portable}
|
|
|
-Release: 20021112
|
|
|
+Release: 20021127
|
|
|
|
|
|
# list of sources
|
|
|
Source0: ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
|
|
|
@@ -110,7 +110,7 @@ AutoReqProv: no
|
|
|
--define 'with_chroot %{with_chroot}'
|
|
|
|
|
|
%prep
|
|
|
- %setup0 -q -c
|
|
|
+ %setup0 -q
|
|
|
%if "%{with_chroot}" == "yes"
|
|
|
cd openssh-%{version}
|
|
|
%{l_patch} -p1 <%{SOURCE osshChroot-%{V_chroot}.diff}
|
|
|
@@ -118,64 +118,60 @@ AutoReqProv: no
|
|
|
|
|
|
%build
|
|
|
# build OpenSSH
|
|
|
- ( cd openssh-%{version}
|
|
|
- inc="-I%{l_prefix}/include"
|
|
|
- lib="-L%{l_prefix}/lib"
|
|
|
+ inc="-I%{l_prefix}/include"
|
|
|
+ lib="-L%{l_prefix}/lib"
|
|
|
%if "%{with_pam}" == "yes"
|
|
|
- inc="$inc -I`%{l_prefix}/etc/rc --query pam_incdir`"
|
|
|
- lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
|
|
|
+ inc="$inc -I`%{l_prefix}/etc/rc --query pam_incdir`"
|
|
|
+ lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
|
|
|
%endif
|
|
|
- CC="%{l_cc}" \
|
|
|
- CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/fsl-config --all --cflags` $inc" \
|
|
|
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \
|
|
|
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
|
|
|
- ./configure \
|
|
|
- --prefix=%{l_prefix} \
|
|
|
- --sbindir=%{l_prefix}/bin \
|
|
|
- --mandir=%{l_prefix}/man \
|
|
|
- --infodir=%{l_prefix}/info \
|
|
|
- --sysconfdir=%{l_prefix}/etc/openssh \
|
|
|
- --libexecdir=%{l_prefix}/libexec/openssh \
|
|
|
- --localstatedir=%{l_prefix}/var/openssh \
|
|
|
- --with-pid-dir=%{l_prefix}/var/openssh \
|
|
|
- --with-ssl-dir=%{l_prefix} \
|
|
|
+ CC="%{l_cc}" \
|
|
|
+ CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/fsl-config --all --cflags` $inc" \
|
|
|
+ LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags` $lib" \
|
|
|
+ LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
|
|
|
+ ./configure \
|
|
|
+ --prefix=%{l_prefix} \
|
|
|
+ --sbindir=%{l_prefix}/bin \
|
|
|
+ --mandir=%{l_prefix}/man \
|
|
|
+ --infodir=%{l_prefix}/info \
|
|
|
+ --sysconfdir=%{l_prefix}/etc/openssh \
|
|
|
+ --libexecdir=%{l_prefix}/libexec/openssh \
|
|
|
+ --localstatedir=%{l_prefix}/var/openssh \
|
|
|
+ --with-pid-dir=%{l_prefix}/var/openssh \
|
|
|
+ --with-ssl-dir=%{l_prefix} \
|
|
|
%if "%{with_pcre}" == "yes"
|
|
|
- --with-pcre=%{l_prefix} \
|
|
|
+ --with-pcre=%{l_prefix} \
|
|
|
%endif
|
|
|
%if "%{with_skey}" == "yes"
|
|
|
- --with-skey=%{l_prefix} \
|
|
|
+ --with-skey=%{l_prefix} \
|
|
|
%endif
|
|
|
%if "%{with_pam}" == "yes"
|
|
|
- --with-pam \
|
|
|
+ --with-pam \
|
|
|
%else
|
|
|
- --without-pam \
|
|
|
+ --without-pam \
|
|
|
%endif
|
|
|
%if "%{with_x11}" == "yes"
|
|
|
- --with-xauth="`%{l_prefix}/etc/rc --query x11_bindir`/xauth" \
|
|
|
+ --with-xauth="`%{l_prefix}/etc/rc --query x11_bindir`/xauth" \
|
|
|
%endif
|
|
|
- --with-md5-passwords \
|
|
|
- --with-zlib=%{l_prefix} \
|
|
|
- --with-ipv4-default \
|
|
|
- --without-smartcard \
|
|
|
- --without-kerberos4 \
|
|
|
- --disable-suid-ssh \
|
|
|
- --without-rsh \
|
|
|
- --with-mantype=man \
|
|
|
- --with-default-path=%{l_prefix}/bin:/bin:/usr/bin:/usr/local/bin \
|
|
|
- --with-privsep-user=%{l_nusr} \
|
|
|
- --with-privsep-path=%{l_prefix}/var/openssh/empty
|
|
|
+ --with-md5-passwords \
|
|
|
+ --with-zlib=%{l_prefix} \
|
|
|
+ --with-ipv4-default \
|
|
|
+ --without-smartcard \
|
|
|
+ --without-kerberos4 \
|
|
|
+ --disable-suid-ssh \
|
|
|
+ --without-rsh \
|
|
|
+ --with-mantype=man \
|
|
|
+ --with-default-path=%{l_prefix}/bin:/bin:/usr/bin:/usr/local/bin \
|
|
|
+ --with-privsep-user=%{l_nusr} \
|
|
|
+ --with-privsep-path=%{l_prefix}/var/openssh/empty
|
|
|
|
|
|
- # build package
|
|
|
- %{l_make} %{l_mflags -O}
|
|
|
- )
|
|
|
+ # build package
|
|
|
+ %{l_make} %{l_mflags -O}
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
# perform standard installation procedure of OpenSSH
|
|
|
- ( cd openssh-%{version}
|
|
|
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
- )
|
|
|
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
# strip down installation tree
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
|
