OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 27-Nov-2002 10:16:28
Branch: HEAD Handle: 2002112709162701
Modified files:
openpkg-src/openssh openssh.spec
openpkg-web news.txt
Log:
we no longer need a sub-directory while building
Summary:
Revision Changes Path
1.64 +40 -44 openpkg-src/openssh/openssh.spec
1.2123 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/openssh/openssh.spec
============================================================
$ cvs diff -u -r1.63 -r1.64 openssh.spec
--- openpkg-src/openssh/openssh.spec 12 Nov 2002 13:20:43 -0000 1.63
+++ openpkg-src/openssh/openssh.spec 27 Nov 2002 09:16:28 -0000 1.64
@@ -55,7 +55,7 @@
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 @@
--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 @@
%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
-
- # build package
- %{l_make} %{l_mflags -O}
- )
+ --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}
%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
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2122 -r1.2123 news.txt
--- openpkg-web/news.txt 27 Nov 2002 08:14:25 -0000 1.2122
+++ openpkg-web/news.txt 27 Nov 2002 09:16:27 -0000 1.2123
@@ -1,3 +1,4 @@
+27-Nov-2002: Upgraded package: P<openssh-3.5p1-20021127>
27-Nov-2002: Upgraded package: P<spambouncer-1.5.20021122-20021127>
27-Nov-2002: Upgraded package: P<openpkg-tool-20021127-20021127>
27-Nov-2002: Upgraded package: P<linkchecker-1.7.1-20021127>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
