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: 02-Mar-2007 10:36:59
Branch: HEAD Handle: 2007030209365900
Modified files:
openpkg-src/milter-sa milter-sa.patch milter-sa.spec
Log:
unbreak under runtime (version mismatch) by including the OpenPKG (and
not the system) MILTER API
Summary:
Revision Changes Path
1.2 +33 -2 openpkg-src/milter-sa/milter-sa.patch
1.3 +1 -4 openpkg-src/milter-sa/milter-sa.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-sa/milter-sa.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 milter-sa.patch
--- openpkg-src/milter-sa/milter-sa.patch 30 Dec 2006 17:16:08 -0000
1.1
+++ openpkg-src/milter-sa/milter-sa.patch 2 Mar 2007 09:36:59 -0000
1.2
@@ -1,6 +1,28 @@
+Index: configure
+--- configure.orig 2006-04-05 18:00:01 +0200
++++ configure 2007-03-02 10:32:13 +0100
+@@ -7080,9 +7080,6 @@
+
+
+ # Check for libmilter and its header files in the usual locations
+-if test -d /usr/lib/libmilter ; then
+- LDFLAGS="$LDFLAGS -L/usr/lib/libmilter"
+-fi
+
+ echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5
+ echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6
+@@ -7369,7 +7366,7 @@
+ fi
+
+
+-for ac_header in libmilter/mfapi.h
++for ac_header in milter/mfapi.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
Index: spamass-milter.1.in
--- spamass-milter.1.in.orig 2004-03-18 19:37:08 +0100
-+++ spamass-milter.1.in 2006-12-30 18:09:16 +0100
++++ spamass-milter.1.in 2007-03-02 10:30:55 +0100
@@ -199,6 +199,9 @@
Requires the
.Fl u
@@ -13,7 +35,16 @@
This allows you to connect to a remote spamd with
Index: spamass-milter.cpp
--- spamass-milter.cpp.orig 2006-03-23 22:41:36 +0100
-+++ spamass-milter.cpp 2006-12-30 18:09:16 +0100
++++ spamass-milter.cpp 2007-03-02 10:31:50 +0100
+@@ -100,7 +100,7 @@
+ extern "C" {
+ #endif
+
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+ //#include "libmilter/mfdef.h"
+
+ #if !HAVE_DECL_STRSEP
@@ -170,6 +170,7 @@
bool flag_full_email = false; /* pass full email address to
spamc */
bool flag_expand = false; /* alias/virtusertable expansion */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-sa/milter-sa.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 milter-sa.spec
--- openpkg-src/milter-sa/milter-sa.spec 1 Jan 2007 17:39:46 -0000
1.2
+++ openpkg-src/milter-sa/milter-sa.spec 2 Mar 2007 09:36:59 -0000
1.3
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 0.3.1
-Release: 20061230
+Release: 20070302
# package options
%option with_fsl yes
@@ -75,9 +75,6 @@
%build
# configure program
- %{l_shtool} subst \
- -e 's;libmilter/mfapi;milter/mfapi;g' \
- configure
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
