|
|
@@ -1,28 +1,31 @@
|
|
|
Index: configure
|
|
|
---- configure.orig 2006-04-05 18:00:01 +0200
|
|
|
-+++ configure 2008-02-19 00:08:39 +0100
|
|
|
-@@ -7080,9 +7080,6 @@
|
|
|
+--- configure.orig 2011-02-14 22:57:07.000000000 +0100
|
|
|
++++ configure 2011-02-15 09:41:12.000000000 +0100
|
|
|
+@@ -6362,9 +6362,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
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
|
|
|
+ $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
|
|
|
+ if ${ac_cv_lib_milter_mi_stop+:} false; then :
|
|
|
+@@ -6520,9 +6517,9 @@
|
|
|
|
|
|
- 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
|
|
|
+ do :
|
|
|
+- ac_fn_cxx_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
|
|
|
++ ac_fn_cxx_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
|
|
|
+ if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then :
|
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
|
+ #define HAVE_LIBMILTER_MFAPI_H 1
|
|
|
Index: spamass-milter.1.in
|
|
|
---- spamass-milter.1.in.orig 2004-03-18 19:37:08 +0100
|
|
|
-+++ spamass-milter.1.in 2008-02-19 00:08:39 +0100
|
|
|
+--- spamass-milter.1.in.orig 2005-02-12 00:33:00.000000000 +0100
|
|
|
++++ spamass-milter.1.in 2011-02-15 09:40:20.000000000 +0100
|
|
|
@@ -20,6 +20,8 @@
|
|
|
.Op Fl r Ar nn
|
|
|
.Op Fl u Ar defaultuser
|
|
|
@@ -45,8 +48,8 @@ Index: spamass-milter.1.in
|
|
|
Pass all remaining options to spamc.
|
|
|
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 2008-02-19 00:08:55 +0100
|
|
|
+--- spamass-milter.cpp.orig 2011-02-14 22:53:02.000000000 +0100
|
|
|
++++ spamass-milter.cpp 2011-02-15 09:40:20.000000000 +0100
|
|
|
@@ -100,7 +100,7 @@
|
|
|
extern "C" {
|
|
|
#endif
|
|
|
@@ -63,9 +66,9 @@ Index: spamass-milter.cpp
|
|
|
+bool auth = false; /* don't scan authenticated users */
|
|
|
+char *comment = NULL;
|
|
|
|
|
|
- #if defined(__FreeBSD__) /* popen bug - see PR bin/50770 */
|
|
|
- static pthread_mutex_t popen_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
-@@ -181,7 +183,7 @@
|
|
|
+ // {{{ main()
|
|
|
+
|
|
|
+@@ -177,7 +179,7 @@
|
|
|
main(int argc, char* argv[])
|
|
|
{
|
|
|
int c, err = 0;
|
|
|
@@ -74,7 +77,7 @@ Index: spamass-milter.cpp
|
|
|
char *sock = NULL;
|
|
|
bool dofork = false;
|
|
|
char *pidfilename = NULL;
|
|
|
-@@ -196,9 +198,15 @@
|
|
|
+@@ -192,9 +194,15 @@
|
|
|
/* Process command line options */
|
|
|
while ((c = getopt(argc, argv, args)) != -1) {
|
|
|
switch (c) {
|
|
|
@@ -90,7 +93,7 @@ Index: spamass-milter.cpp
|
|
|
case 'd':
|
|
|
parse_debuglevel(optarg);
|
|
|
break;
|
|
|
-@@ -265,6 +273,8 @@
|
|
|
+@@ -261,6 +269,8 @@
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -99,7 +102,7 @@ Index: spamass-milter.cpp
|
|
|
|
|
|
if (flag_full_email && !flag_sniffuser)
|
|
|
{
|
|
|
-@@ -281,7 +291,8 @@
|
|
|
+@@ -277,7 +287,8 @@
|
|
|
cout << "SpamAssassin Sendmail Milter Plugin" << endl;
|
|
|
cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl;
|
|
|
cout << " [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl;
|
|
|
@@ -109,7 +112,7 @@ Index: spamass-milter.cpp
|
|
|
cout << " [-- spamc args ]" << endl;
|
|
|
cout << " -p socket: path to create socket" << endl;
|
|
|
cout << " -b bucket: redirect spam to this mail address. The orignal" << endl;
|
|
|
-@@ -302,6 +313,8 @@
|
|
|
+@@ -298,6 +309,8 @@
|
|
|
cout << " -u defaultuser: pass the recipient's username to spamc.\n"
|
|
|
" Uses 'defaultuser' if there are multiple recipients." << endl;
|
|
|
cout << " -x: pass email address through alias and virtusertable expansion." << endl;
|
|
|
@@ -118,7 +121,7 @@ Index: spamass-milter.cpp
|
|
|
cout << " -- spamc args: pass the remaining flags to spamc." << endl;
|
|
|
|
|
|
exit(EX_USAGE);
|
|
|
-@@ -355,6 +368,8 @@
|
|
|
+@@ -351,6 +364,8 @@
|
|
|
debug(D_ALWAYS, "spamass-milter %s exiting", PACKAGE_VERSION);
|
|
|
if (pidfilename)
|
|
|
unlink(pidfilename);
|
|
|
@@ -127,7 +130,7 @@ Index: spamass-milter.cpp
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-@@ -452,8 +467,7 @@
|
|
|
+@@ -448,8 +463,7 @@
|
|
|
if (do_reject)
|
|
|
{
|
|
|
debug(D_MISC, "Rejecting");
|
|
|
@@ -137,7 +140,7 @@ Index: spamass-milter.cpp
|
|
|
|
|
|
if (flag_bucket)
|
|
|
{
|
|
|
-@@ -783,6 +797,15 @@
|
|
|
+@@ -746,6 +760,15 @@
|
|
|
}
|
|
|
/* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */
|
|
|
|
