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: 30-Dec-2006 15:31:45
Branch: HEAD Handle: 2006123014314500
Modified files:
openpkg-src/mimedefang mimedefang.patch mimedefang.spec
Log:
switch to MILTER package
Summary:
Revision Changes Path
1.2 +30 -7 openpkg-src/mimedefang/mimedefang.patch
1.27 +12 -9 openpkg-src/mimedefang/mimedefang.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mimedefang/mimedefang.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mimedefang.patch
--- openpkg-src/mimedefang/mimedefang.patch 4 Jul 2004 08:13:27 -0000
1.1
+++ openpkg-src/mimedefang/mimedefang.patch 30 Dec 2006 14:31:45 -0000
1.2
@@ -1,8 +1,19 @@
-A patch from FreeBSD mimedefang port for the embedding case.
-
---- embperl.c.orig Wed Jun 30 00:57:57 2004
-+++ embperl.c Wed Jun 30 01:01:55 2004
-@@ -26,6 +26,9 @@
+Index: configure
+--- configure.orig 2006-11-06 16:01:08 +0100
++++ configure 2006-12-30 14:32:43 +0100
+@@ -5086,7 +5086,7 @@
+
+ SMMILTER=`echo ../sendmail-*/include`
+ # Extract the first word of "libmilter/mfapi.h", so it can be a program
name with args.
+-set dummy libmilter/mfapi.h; ac_word=$2
++set dummy milter/mfapi.h; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_MINCLUDE+set}" = set; then
+Index: embperl.c
+--- embperl.c.orig 2006-08-30 20:11:14 +0200
++++ embperl.c 2006-12-30 14:32:11 +0100
+@@ -28,6 +28,9 @@
char *argv[6];
int argc;
@@ -11,8 +22,8 @@
+#endif
if (my_perl != NULL) {
#ifdef SAFE_EMBED_PERL
- perl_destruct(my_perl);
-@@ -46,7 +49,6 @@
+ PL_perl_destruct_level = 1;
+@@ -49,7 +52,6 @@
#ifdef PERL_SET_CONTEXT
PERL_SET_CONTEXT(my_perl);
#endif
@@ -20,3 +31,15 @@
perl_construct(my_perl);
if (subFilter) {
argv[0] = "";
+Index: mimedefang.c
+--- mimedefang.c.orig 2006-11-02 15:38:56 +0100
++++ mimedefang.c 2006-12-30 14:32:51 +0100
+@@ -64,7 +64,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
+-#include "libmilter/mfapi.h"
++#include "milter/mfapi.h"
+
+ #include <sys/socket.h>
+ #include <sys/un.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mimedefang/mimedefang.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 mimedefang.spec
--- openpkg-src/mimedefang/mimedefang.spec 8 Nov 2006 07:17:59 -0000
1.26
+++ openpkg-src/mimedefang/mimedefang.spec 30 Dec 2006 14:31:45 -0000
1.27
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 2.58
-Release: 20061108
+Release: 20061230
# package options
%option with_clamav no
@@ -48,8 +48,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, make, perl-openpkg
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: sendmail > 8.12.0, perl, perl-mail, perl-crypto, perl-ds
-PreReq: sendmail > 8.12.0, perl, perl-mail, perl-crypto, perl-ds
+BuildPreReq: milter, perl, perl-mail, perl-crypto, perl-ds
+PreReq: milter, perl, perl-mail, perl-crypto, perl-ds
%if "%{with_clamav}" == "yes"
BuildPreReq: clamav
PreReq: clamav
@@ -84,7 +84,14 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/mimedefang \
--with-confsubdir="" \
+ --with-sendmail=%{l_prefix}/sbin/sendmail \
+ --with-milterinc=%{l_prefix}/include \
+ --with-milterlib=%{l_prefix}/lib \
+ --with-spooldir=%{l_prefix}/var/mimedefang/spool \
+ --with-quarantinedir=%{l_prefix}/var/mimedefang/quarantine \
+ --with-user=%{l_rusr} \
%if "%{with_clamav}" == "yes"
+ --enable-anti-virus \
--enable-clamav \
--enable-clamd \
--disable-antivir \
@@ -100,14 +107,10 @@
--disable-fprot \
--disable-sophie \
--disable-nvcc \
- --disable-trophie \
+ --disable-trophie
%else
- --disable-anti-virus \
+ --disable-anti-virus
%endif
- --with-sendmail=%{l_prefix}/sbin/sendmail \
- --with-spooldir=%{l_prefix}/var/mimedefang/spool \
- --with-quarantinedir=%{l_prefix}/var/mimedefang/quarantine \
- --with-user=%{l_rusr}
# build program
%{l_make} %{l_mflags} install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
