head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.1.2.2 OPENPKG_E1_FP:1.1.2.2 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1.2.2 OPENPKG_2_STABLE:1.1.0.2 OPENPKG_CW_FP:1.1; locks; strict; comment @# @; 1.5 date 2008.09.02.19.37.15; author rse; state Exp; branches; next 1.4; commitid P2u5MFk2eH59weht; 1.4 date 2007.07.20.17.39.15; author rse; state Exp; branches; next 1.3; commitid yu1LoPTnFJsL2xqs; 1.3 date 2007.04.11.06.44.55; author rse; state Exp; branches; next 1.2; commitid kEERJzZ9mxhzDCds; 1.2 date 2006.12.30.14.31.45; author rse; state Exp; branches; next 1.1; commitid Le6AdYMgahVZuy0s; 1.1 date 2004.07.04.08.13.27; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2004.07.04.08.13.27; author rse; state dead; branches; next 1.1.2.2; commitid iZxwRSmmWscPXUQr; 1.1.2.2 date 2006.10.16.14.52.48; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @upgrading package: mimedefang 2.64 -> 2.65 @ text @Index: configure --- configure.orig 2008-08-15 20:03:41 +0200 +++ configure 2008-09-02 21:33:25 +0200 @@@@ -5664,7 +5664,7 @@@@ old_as_test_x="$as_test_x" as_test_x='test -e' # 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 2008-08-15 20:03:41 +0200 +++ embperl.c 2008-09-02 21:31:05 +0200 @@@@ -29,6 +29,9 @@@@ char *argv[6]; int argc; +#ifdef SAFE_EMBED_PERL + PL_perl_destruct_level = 1; +#endif if (my_perl != NULL) { #ifdef SAFE_EMBED_PERL PL_perl_destruct_level = 1; @@@@ -80,7 +83,6 @@@@ #ifdef PERL_SET_CONTEXT PERL_SET_CONTEXT(my_perl); #endif - PL_perl_destruct_level = 1; perl_construct(my_perl); perl_parse(my_perl, xs_init, argc, argv, NULL); perl_run(my_perl); Index: milter_cap.c --- milter_cap.c.orig 2008-08-15 20:03:33 +0200 +++ milter_cap.c 2008-09-02 21:31:05 +0200 @@@@ -12,7 +12,7 @@@@ * ***********************************************************************/ #include -#include "libmilter/mfapi.h" +#include "milter/mfapi.h" #include "milter_cap.h" /********************************************************************** Index: mimedefang.c --- mimedefang.c.orig 2008-03-07 21:59:28 +0100 +++ mimedefang.c 2008-09-02 21:31:05 +0200 @@@@ -65,7 +65,7 @@@@ #include #include -#include "libmilter/mfapi.h" +#include "milter/mfapi.h" #include "milter_cap.h" #include @ 1.4 log @fix building against the 'milter' package @ text @d2 5 a6 5 --- configure.orig 2007-03-28 21:12:16 +0200 +++ configure 2007-07-20 19:34:11 +0200 @@@@ -5086,7 +5086,7 @@@@ SMMILTER=`echo ../sendmail-*/include` d10 2 a11 2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 d14 3 a16 3 --- embperl.c.orig 2006-08-30 20:11:14 +0200 +++ embperl.c 2007-07-20 19:34:11 +0200 @@@@ -28,6 +28,9 @@@@ d26 1 a26 1 @@@@ -49,7 +52,6 @@@@ d32 2 a33 2 if (subFilter) { argv[0] = ""; d35 2 a36 2 --- milter_cap.c.orig 2007-04-02 18:21:30 +0200 +++ milter_cap.c 2007-07-20 19:35:19 +0200 d47 2 a48 2 --- mimedefang.c.orig 2007-04-02 19:33:57 +0200 +++ mimedefang.c 2007-07-20 19:34:11 +0200 @ 1.3 log @upgrading package: mimedefang 2.61 -> 2.62 @ text @d3 1 a3 1 +++ configure 2007-04-11 08:41:47 +0200 d15 1 a15 1 +++ embperl.c 2007-04-11 08:41:47 +0200 d34 12 d48 1 a48 1 +++ mimedefang.c 2007-04-11 08:42:14 +0200 @ 1.2 log @switch to MILTER package @ text @d2 2 a3 2 --- configure.orig 2006-11-06 16:01:08 +0100 +++ configure 2006-12-30 14:32:43 +0100 d15 1 a15 1 +++ embperl.c 2006-12-30 14:32:11 +0100 d35 3 a37 3 --- mimedefang.c.orig 2006-11-02 15:38:56 +0100 +++ mimedefang.c 2006-12-30 14:32:51 +0100 @@@@ -64,7 +64,7 @@@@ d43 1 a45 1 #include @ 1.1 log @modifying package: mimedefang-2.43 20040527 -> 20040704 @ text @d1 16 a16 5 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 @@@@ d25 2 a26 2 perl_destruct(my_perl); @@@@ -46,7 +49,6 @@@@ d34 12 @ 1.1.2.1 log @file mimedefang.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:48 +0000 @ text @d1 22 @ 1.1.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 22 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 @@@@ char *argv[6]; int argc; +#ifdef SAFE_EMBED_PERL + PL_perl_destruct_level = 1; +#endif if (my_perl != NULL) { #ifdef SAFE_EMBED_PERL perl_destruct(my_perl); @@@@ -46,7 +49,6 @@@@ #ifdef PERL_SET_CONTEXT PERL_SET_CONTEXT(my_perl); #endif - PL_perl_destruct_level = 1; perl_construct(my_perl); if (subFilter) { argv[0] = ""; @