From 30037505622d7c6a67d5e93e5774ff0a7d9ee343 Mon Sep 17 00:00:00 2001 From: lisu Date: Mon, 14 Apr 2008 17:27:23 +0000 Subject: [PATCH] - devel merge, now works with 0.93 version Changed files: clamav-find_milter.patch -> 1.5 clamav-no_auto_libwrap.patch -> 1.6 clamav-nolibs.patch -> 1.5 clamav-valid_pp_exp.patch -> 1.2 --- clamav-find_milter.patch | 10 +++++----- clamav-no_auto_libwrap.patch | 10 +++++----- clamav-nolibs.patch | 14 +++++++------- clamav-valid_pp_exp.patch | 12 ++++++------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/clamav-find_milter.patch b/clamav-find_milter.patch index a1c7c1a..7488edd 100644 --- a/clamav-find_milter.patch +++ b/clamav-find_milter.patch @@ -1,6 +1,6 @@ ---- clamav-0.90/configure.in~ 2007-02-14 10:50:45.652285467 +0200 -+++ clamav-0.90/configure.in 2007-02-14 10:52:06.844121121 +0200 -@@ -603,10 +603,7 @@ +--- clamav-0.93rc1/configure.in~ 2008-03-30 15:23:02.706953608 +0200 ++++ clamav-0.93rc1/configure.in 2008-03-30 15:24:20.343998437 +0200 +@@ -911,10 +911,7 @@ dnl Check for libmilter and it's header files in the usual locations save_LDFLAGS="$LDFLAGS" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" @@ -9,6 +9,6 @@ - fi - LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS" + LDFLAGS="-lmilter $CLAMAV_MILTER_LIBS" - AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[ + AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[ dnl Older sendmails require libsm or libsmutil for support functions - AC_SEARCH_LIBS(strlcpy, [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"]) + AC_SEARCH_LIBS([strlcpy], [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"]) diff --git a/clamav-no_auto_libwrap.patch b/clamav-no_auto_libwrap.patch index cac59e3..10feafe 100644 --- a/clamav-no_auto_libwrap.patch +++ b/clamav-no_auto_libwrap.patch @@ -1,9 +1,9 @@ ---- clamav-0.80rc4.orig/configure.in 2004-10-11 04:13:35.000000000 +0200 -+++ clamav-0.80rc4/configure.in 2004-10-16 23:33:12.456451560 +0200 -@@ -480,12 +480,12 @@ +--- clamav-0.93rc1/configure.in~ 2008-03-30 15:10:25.470753399 +0200 ++++ clamav-0.93rc1/configure.in 2008-03-30 15:12:07.615636507 +0200 +@@ -989,12 +989,12 @@ dnl tcpwrappers support dnl rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html - AC_ARG_WITH(tcpwrappers, + AC_ARG_WITH([tcpwrappers], -[ --with-tcpwrappers support hosts.allow / hosts.deny (default=auto)], +[ --with-tcpwrappers support hosts.allow / hosts.deny (default=no)], [ case "$withval" in @@ -14,4 +14,4 @@ +[ tcpw=no ]) if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then - AC_CHECK_HEADERS(tcpd.h,[ + AC_CHECK_HEADERS([tcpd.h],[ diff --git a/clamav-nolibs.patch b/clamav-nolibs.patch index d3f1f77..3ef8053 100644 --- a/clamav-nolibs.patch +++ b/clamav-nolibs.patch @@ -1,15 +1,15 @@ ---- clamav-0.92.1/configure.in~ 2008-02-17 23:33:10.000000000 +0200 -+++ clamav-0.92.1/configure.in 2008-02-17 23:55:37.144126563 +0200 -@@ -205,8 +205,12 @@ - AC_DEFINE(CL_EXPERIMENTAL,1,[enable experimental code]) +--- clamav-0.93rc1/configure.in~ 2008-03-30 15:22:36.772380455 +0200 ++++ clamav-0.93rc1/configure.in 2008-03-30 15:22:22.568368090 +0200 +@@ -307,8 +307,12 @@ + AC_DEFINE([CL_EXPERIMENTAL],1,[enable experimental code]) fi +AC_CHECK_FUNC(socket,, [ - AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"]) + AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"]) +]) +AC_CHECK_FUNC(gethostent,, [ AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")]) +]) - AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv") - + AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp]) + AC_FUNC_MMAP diff --git a/clamav-valid_pp_exp.patch b/clamav-valid_pp_exp.patch index 1f15686..38f1d64 100644 --- a/clamav-valid_pp_exp.patch +++ b/clamav-valid_pp_exp.patch @@ -1,12 +1,12 @@ ---- configure.in 2007-06-29 14:31:13.029322058 +0200 -+++ configure.in-new 2007-06-29 14:31:51.871236822 +0200 -@@ -209,9 +209,9 @@ +--- clamav-0.93rc1/configure.in~ 2008-03-30 15:25:01.112614075 +0200 ++++ clamav-0.93rc1/configure.in 2008-03-30 15:26:27.256732255 +0200 +@@ -472,9 +472,9 @@ sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'` sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` -- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail]) -- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail]) -- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail]) +- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail]) +- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail]) +- AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail]) + AC_DEFINE(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail]) + AC_DEFINE(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail]) + AC_DEFINE(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail]) -- 2.44.0