OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Jul-2003 16:05:10
Branch: HEAD Handle: 2003071015050801
Modified files:
openpkg-src/nessus-libs nessus-libs.spec
openpkg-web news.txt
Log:
disable parallel build for libnasl, polishing
Summary:
Revision Changes Path
1.14 +43 -42 openpkg-src/nessus-libs/nessus-libs.spec
1.5507 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nessus-libs/nessus-libs.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 nessus-libs.spec
--- openpkg-src/nessus-libs/nessus-libs.spec 8 Jul 2003 14:41:11 -0000 1.13
+++ openpkg-src/nessus-libs/nessus-libs.spec 10 Jul 2003 14:05:09 -0000 1.14
@@ -33,7 +33,7 @@
Group: Security
License: GPL
Version: 2.0.7
-Release: 20030704
+Release: 20030710
# list of sources
Source0:
ftp://ftp.nessus.org/pub/nessus/nessus-%{version}/src/nessus-libraries-%{version}.tar.gz
@@ -58,59 +58,60 @@
%setup1 -q -T -D -a 1
%build
+ tmproot=`pwd`/tmp
+
# build nessus-libraries part
- pushd nessus-libraries
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}"
- CPPFLAGS="%{l_cppflags}"
- LDFLAGS="%{l_ldflags}"
- ./configure \
- --prefix=%{l_prefix} \
- --with-ssl=%{l_prefix} \
- --disable-nessuspcap \
- --enable-bpf-sharing \
- --disable-cipher \
- --disable-shared \
- --enable-static
- %{l_make} %{l_mflags -O}
- popd
+ ( cd nessus-libraries
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}"
+ CPPFLAGS="%{l_cppflags}"
+ LDFLAGS="%{l_ldflags}"
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-ssl=%{l_prefix} \
+ --disable-nessuspcap \
+ --enable-bpf-sharing \
+ --disable-cipher \
+ --disable-shared \
+ --enable-static
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
# temporarily install nessus-libraries for libnasl building
- pushd nessus-libraries
- nessus_libs=`pwd`
- %{l_make} %{l_mflags -O} \
- install DESTDIR=${nessus_libs}/tmp
- %{l_shtool} subst \
- -e "s;^\\(PREFIX=\\)\\(.*\\);\\1${nessus_libs}/tmp\\2;" \
- ${nessus_libs}/tmp%{l_prefix}/bin/nessus-config
- popd
+ ( cd nessus-libraries
+ %{l_make} %{l_mflags -O} \
+ install DESTDIR=$tmproot
+ %{l_shtool} subst \
+ -e "s;^\\(PREFIX=\\)\\(.*\\);\\1$tmproot\\2;" \
+ $tmproot%{l_prefix}/bin/nessus-config
+ ) || exit $?
# build libnasl part
- pushd libnasl
- PATH="${nessus_libs}/tmp%{l_prefix}/bin:$PATH"
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}"
- CPPFLAGS="%{l_cppflags}"
- LDFLAGS="%{l_ldflags}"
- ./configure \
- --prefix=%{l_prefix} \
- --disable-shared \
- --enable-static
- %{l_make} %{l_mflags -O}
- popd
+ ( cd libnasl
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ NESSUSCONFIG=$tmproot%{l_prefix}/bin/nessus-config \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared \
+ --enable-static
+ %{l_make} %{l_mflags}
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
# install nessus-libraries
- pushd nessus-libraries
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- popd
+ ( cd nessus-libraries
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
# install libnasl
- pushd libnasl
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- popd
+ ( cd libnasl
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
# strip down installation
rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin/uninstall-nessus
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5506 -r1.5507 news.txt
--- openpkg-web/news.txt 10 Jul 2003 10:25:58 -0000 1.5506
+++ openpkg-web/news.txt 10 Jul 2003 14:05:08 -0000 1.5507
@@ -1,3 +1,4 @@
+10-Jul-2003: Upgraded package: P<nessus-libs-2.0.7-20030710>
10-Jul-2003: Upgraded package: P<gnutls-0.8.9-20030710>
10-Jul-2003: Upgraded package: P<gcc34-3.4s20030709-20030710>
10-Jul-2003: Upgraded package: P<infozip-1.1.0-1.1.1>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
