OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Dec-2006 11:00:46
Branch: HEAD Handle: 2006123110004400
Modified files:
openpkg-src/milter-greylist
greylist.conf milter-greylist.spec
Log:
make cURL and SPF support optional
Summary:
Revision Changes Path
1.2 +0 -2 openpkg-src/milter-greylist/greylist.conf
1.4 +31 -7 openpkg-src/milter-greylist/milter-greylist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/greylist.conf
============================================================================
$ cvs diff -u -r1.1 -r1.2 greylist.conf
--- openpkg-src/milter-greylist/greylist.conf 30 Dec 2006 12:07:44 -0000
1.1
+++ openpkg-src/milter-greylist/greylist.conf 31 Dec 2006 10:00:44 -0000
1.2
@@ -16,8 +16,6 @@
# run-time behaviour
#verbose
#quiet
-nospf
-nodrac
# access control list definition: my own networks
list "my networks" addr { \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 milter-greylist.spec
--- openpkg-src/milter-greylist/milter-greylist.spec 31 Dec 2006 09:17:22
-0000 1.3
+++ openpkg-src/milter-greylist/milter-greylist.spec 31 Dec 2006 10:00:44
-0000 1.4
@@ -37,6 +37,8 @@
# package options
%option with_fsl yes
+%option with_curl no
+%option with_spf no
# list of sources
Source0:
ftp://ftp.espci.fr/pub/milter-greylist/milter-greylist-%{version}.tgz
@@ -50,12 +52,20 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, bison, flex, pkgconfig
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: milter, db, curl, libspf2
-PreReq: milter, db, curl, libspf2
+BuildPreReq: milter, db
+PreReq: milter, db
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_curl}" == "yes"
+BuildPreReq: curl
+PreReq: curl
+%endif
+%if "%{with_spf}" == "yes"
+BuildPreReq: libspf2
+PreReq: libspf2
+%endif
AutoReq: no
AutoReqProv: no
@@ -76,19 +86,33 @@
%build
# configure program
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} `pkg-config libcurl db --cflags-only-other`" \
- CPPFLAGS="%{l_cppflags} `pkg-config libcurl db --cflags-only-I`" \
- LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} `pkg-config libcurl db
--libs-only-other`" \
- LIBS="%{l_fsl_libs} `pkg-config libcurl db --libs-only-l`" \
+ export CC="%{l_cc}" \
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
+ export LIBS="%{l_fsl_libs}"
+ CFLAGS="$CFLAGS `pkg-config db --cflags-only-other`"
+ CPPFLAGS="$CPPFLAGS `pkg-config db --cflags-only-I`"
+ LDFLAGS="$LDFLAGS `pkg-config db --libs-only-other`"
+ LIBS="$LIBS `pkg-config db --libs-only-l`"
+%if "%{with_curl}" == "yes"
+ CFLAGS="$CFLAGS `pkg-config libcurl --cflags-only-other`"
+ CPPFLAGS="$CPPFLAGS `pkg-config libcurl --cflags-only-I`"
+ LDFLAGS="$LDFLAGS `pkg-config libcurl --libs-only-other`"
+ LIBS="$LIBS `pkg-config libcurl --libs-only-l`"
+%endif
sh ./configure \
--prefix=%{l_prefix} \
--with-conffile=%{l_prefix}/etc/milter-greylist/greylist.conf \
--with-dumpfile=%{l_prefix}/var/milter-greylist/greylist.db \
--with-libmilter=%{l_prefix} \
--with-db=%{l_prefix} \
+%if "%{with_curl}" == "yes"
--with-libcurl=%{l_prefix} \
+%endif
+%if "%{with_spf}" == "yes"
--with-libspf2=%{l_prefix} \
+%endif
--with-user=%{l_rusr} \
--enable-dnsrbl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
