|
|
@@ -29,21 +29,11 @@
|
|
|
%define V_chroot 3.5
|
|
|
|
|
|
# package options
|
|
|
-%ifndef with_pam
|
|
|
-%define with_pam no
|
|
|
-%endif
|
|
|
-%ifndef with_pcre
|
|
|
-%define with_pcre no
|
|
|
-%endif
|
|
|
-%ifndef with_skey
|
|
|
-%define with_skey no
|
|
|
-%endif
|
|
|
-%ifndef with_x11
|
|
|
-%define with_x11 %{l_test -p x11}
|
|
|
-%endif
|
|
|
-%ifndef with_chroot
|
|
|
-%define with_chroot no
|
|
|
-%endif
|
|
|
+%option with_pam no
|
|
|
+%option with_pcre no
|
|
|
+%option with_skey no
|
|
|
+%option with_x11 %{l_test -p x11}
|
|
|
+%option with_chroot no
|
|
|
|
|
|
# package information
|
|
|
Name: openssh
|
|
|
@@ -55,7 +45,7 @@ Distribution: OpenPKG [CORE]
|
|
|
Group: Security
|
|
|
License: BSD
|
|
|
Version: %{V_base}%{V_portable}
|
|
|
-Release: 20021219
|
|
|
+Release: 20021230
|
|
|
|
|
|
# list of sources
|
|
|
Source0: ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
|
|
|
@@ -72,8 +62,8 @@ Source9: http://chrootssh.sourceforge.net/patches/osshChroot-%{V_chroot}.di
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
BuildRoot: %{l_buildroot}
|
|
|
-BuildPreReq: OpenPKG, openpkg >= 20021002, fsl, perl, openssl, zlib
|
|
|
-PreReq: OpenPKG, openpkg >= 20021002, fsl
|
|
|
+BuildPreReq: OpenPKG, openpkg >= 20021230, fsl, perl, openssl, zlib
|
|
|
+PreReq: OpenPKG, openpkg >= 20021230, fsl
|
|
|
%if "%{with_pam}" == "yes"
|
|
|
BuildPreReq: PAM
|
|
|
PreReq: PAM
|
|
|
@@ -102,12 +92,7 @@ AutoReqProv: no
|
|
|
terms of security and features, as well as removing all patented
|
|
|
algorithms to separate libraries (OpenSSL).
|
|
|
|
|
|
- Options:
|
|
|
- --define 'with_pam %{with_pam}'
|
|
|
- --define 'with_pcre %{with_pcre}'
|
|
|
- --define 'with_skey %{with_skey}'
|
|
|
- --define 'with_x11 %{with_x11}'
|
|
|
- --define 'with_chroot %{with_chroot}'
|
|
|
+ %options -p11
|
|
|
|
|
|
%prep
|
|
|
%setup0 -q
|
|
|
@@ -118,8 +103,8 @@ AutoReqProv: no
|
|
|
|
|
|
%build
|
|
|
# build OpenSSH
|
|
|
- inc="-I%{l_prefix}/include"
|
|
|
- lib="-L%{l_prefix}/lib"
|
|
|
+ inc="%{l_cppflags}"
|
|
|
+ lib="%{l_ldflags}"
|
|
|
%if "%{with_pam}" == "yes"
|
|
|
inc="$inc -I`%{l_prefix}/etc/rc --query pam_incdir`"
|
|
|
lib="$lib -L`%{l_prefix}/etc/rc --query pam_libdir`"
|
