Date: Sat, 15 Jun 2002 19:42:34 +0400 (MSD) From: "Andrey V. Pevnev" <andrey@mgul.ac.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39336: Update port: mail/mimedefang from 2.14 to 2.15 Message-ID: <200206151542.g5FFgYaw081462@ns1.mgul.ac.ru>
next in thread | raw e-mail | index | archive | help
>Number: 39336 >Category: ports >Synopsis: Update port: mail/mimedefang from 2.14 to 2.15 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 15 08:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Andrey V. Pevnev >Release: FreeBSD 4.5-RELEASE-p6 i386 >Organization: Moscow State Forestry University >Environment: System: FreeBSD ns1.mgul.ac.ru 4.5-RELEASE-p6 FreeBSD 4.5-RELEASE-p6 #0: Wed May 29 20:54:20 MSD 2002 andrey@ns1.mgul.ac.ru:/usr/obj/usr/src/sys/NS1 i386 >Description: WARNING! COMMIT ports/38873 BEFORE! 1. Update from 2.14 to 2.15 2. Fixed build on 4.6 (without libsm.a and libsmutil.a) New files: files/patch-configure files/patch-mimedefang-multiplexor.c >How-To-Repeat: >Fix: --- mimedefang.diff begins here --- diff -ruN mimedefang.bak/Makefile mimedefang/Makefile --- mimedefang.bak/Makefile Sat Jun 15 19:08:39 2002 +++ mimedefang/Makefile Sat Jun 15 19:09:02 2002 @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.14 +PORTVERSION= 2.15 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ diff -ruN mimedefang.bak/distinfo mimedefang/distinfo --- mimedefang.bak/distinfo Sat Jun 15 19:08:39 2002 +++ mimedefang/distinfo Sat Jun 15 19:09:20 2002 @@ -1 +1 @@ -MD5 (mimedefang-2.14.tar.gz) = 0b8dc56aed0a0b3e6044919a89b53431 +MD5 (mimedefang-2.15.tar.gz) = 977c25b76b040d66a65757cc88f1746c diff -ruN mimedefang.bak/files/patch-configure mimedefang/files/patch-configure --- mimedefang.bak/files/patch-configure Thu Jan 1 03:00:00 1970 +++ mimedefang/files/patch-configure Sat Jun 15 19:04:07 2002 @@ -0,0 +1,132 @@ +--- configure Sat Jun 15 18:55:57 2002 ++++ configure Sat Jun 15 19:02:10 2002 +@@ -2172,80 +2172,6 @@ + echo "$ac_t""no" 1>&6 + fi + +-SMPATH=`echo ../sendmail-*/obj.*/libsmutil` +-# Extract the first word of "libsmutil.a", so it can be a program name with args. +-set dummy libsmutil.a; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2180: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_LIBSMUTIL'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- case "$LIBSMUTIL" in +- /*) +- ac_cv_path_LIBSMUTIL="$LIBSMUTIL" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_LIBSMUTIL="$LIBSMUTIL" # Let the user override the test with a dos path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$MILTERLIB:$SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libsmutil:/usr/lib/libmilter" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_LIBSMUTIL="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_LIBSMUTIL" && ac_cv_path_LIBSMUTIL="no" +- ;; +-esac +-fi +-LIBSMUTIL="$ac_cv_path_LIBSMUTIL" +-if test -n "$LIBSMUTIL"; then +- echo "$ac_t""$LIBSMUTIL" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-SMPATH=`echo ../sendmail-*/obj.*/libsm` +-# Extract the first word of "libsm.a", so it can be a program name with args. +-set dummy libsm.a; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2217: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_LIBSM'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- case "$LIBSM" in +- /*) +- ac_cv_path_LIBSM="$LIBSM" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_LIBSM="$LIBSM" # Let the user override the test with a dos path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$MILTERLIB:$SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libsm:/usr/lib/libmilter" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_LIBSM="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_LIBSM" && ac_cv_path_LIBSM="no" +- ;; +-esac +-fi +-LIBSM="$ac_cv_path_LIBSM" +-if test -n "$LIBSM"; then +- echo "$ac_t""$LIBSM" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- + # Extract the first word of "mail", so it can be a program name with args. + set dummy mail; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +@@ -2369,12 +2295,6 @@ + + echo "" + +-if test "$LIBSMUTIL" = "no" ; then +- echo "Oops.. I couldn't find libsmutil.a. Please install Sendmail 8.11" +- echo "and its libraries." +- PROBLEM=1 +-fi +- + if test "$LIBMILTER" = "no" ; then + echo "Oops.. I couldn't find libmilter.a. Please install Sendmail 8.11" + echo "and its libraries." +@@ -2389,35 +2309,6 @@ + else + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lsfio" +- fi +- +- +- echo $ac_n "checking whether libmilter requires -lsm""... $ac_c" 1>&6 +-echo "configure:2397: checking whether libmilter requires -lsm" >&5 +- RESULT=`$NM $LIBMILTER | grep sm_strlcpy` +- if test -z "$RESULT" ; then +- echo "$ac_t""no" 1>&6 +- LIBSM="" +- else +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS" +- if test "$LIBSM" = "no" ; then +- echo "Oops.. I couldn't find libsm.a. Please install Sendmail 8.12" +- echo "and its libraries." +- PROBLEM=1 +- else +- +- echo $ac_n "checking whether libsm requires -lldap""... $ac_c" 1>&6 +-echo "configure:2412: checking whether libsm requires -lldap" >&5 +- RESULT=`$NM $LIBSM | grep ldap_` +- if test -z "$RESULT" ; then +- echo "$ac_t""no" 1>&6 +- else +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -lldap -llber" +- fi +- +- fi + fi + + fi diff -ruN mimedefang.bak/files/patch-init-script.in mimedefang/files/patch-init-script.in --- mimedefang.bak/files/patch-init-script.in Sat Jun 15 19:08:39 2002 +++ mimedefang/files/patch-init-script.in Sat Jun 15 19:29:58 2002 @@ -1,5 +1,5 @@ ---- examples/init-script.in.orig Wed May 29 22:34:24 2002 -+++ examples/init-script.in Sun Jun 2 22:50:49 2002 +--- examples/init-script.in.orig Sat Jun 15 19:27:26 2002 ++++ examples/init-script.in Sat Jun 15 19:28:03 2002 @@ -37,7 +37,7 @@ MULTIPLEXOR=yes @@ -9,3 +9,17 @@ # If you want to keep spool directories around if the filter fails, # set the next one to yes +@@ -99,11 +99,11 @@ + + # Limit slave processes' resident-set size to this many kilobytes. Default + # is unlimited. +-# MX_MAX_RSS=10000 ++MX_MAX_RSS=10000 + + # Limit total size of slave processes' memory space to this many kilobytes. + # Default is unlimited. +-# MX_MAX_AS=30000 ++MX_MAX_AS=30000 + + # Number of seconds a process should be idle before checking for + # minimum number and killed diff -ruN mimedefang.bak/files/patch-mimedefang-multiplexor.c mimedefang/files/patch-mimedefang-multiplexor.c --- mimedefang.bak/files/patch-mimedefang-multiplexor.c Thu Jan 1 03:00:00 1970 +++ mimedefang/files/patch-mimedefang-multiplexor.c Sat Jun 15 18:46:34 2002 @@ -0,0 +1,44 @@ +*** mimedefang-multiplexor.c Sat Jun 15 01:44:53 2002 +--- mimedefang-multiplexor.c Sat Jun 15 18:42:55 2002 +*************** +*** 13,19 **** + ***********************************************************************/ + + static char const RCSID[] = +! "$Id: mimedefang-multiplexor.c,v 1.71 2002/06/14 17:08:24 dfs Exp $"; + + #include "config.h" + #include "event_tcp.h" +--- 13,19 ---- + ***********************************************************************/ + + static char const RCSID[] = +! "$Id: mimedefang-multiplexor.c,v 1.72 2002/06/15 01:12:25 dfs Exp $"; + + #include "config.h" + #include "event_tcp.h" +*************** +*** 1989,1999 **** +--- 1989,2010 ---- + as *= 1024; + lim.rlim_cur = as; + lim.rlim_max = as; ++ #ifdef RLIMIT_AS + n = setrlimit(RLIMIT_AS, &lim); + if (n < 0) { + syslog(LOG_WARNING, "setrlimit(RLIMIT_AS, %lu) failed: %m", + as); + } ++ #endif ++ ++ #ifdef RLIMIT_DATA ++ n = setrlimit(RLIMIT_DATA, &lim); ++ if (n < 0) { ++ syslog(LOG_WARNING, "setrlimit(RLIMIT_DATA, %lu) failed: %m", ++ as); ++ } ++ #endif ++ + } + } + diff -ruN mimedefang.bak/pkg-plist mimedefang/pkg-plist --- mimedefang.bak/pkg-plist Sat Jun 15 19:08:39 2002 +++ mimedefang/pkg-plist Sat Jun 15 19:10:49 2002 @@ -8,6 +8,7 @@ %%PORTDOCS%%share/doc/mimedefang/README.ANOMY %%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN %%PORTDOCS%%share/doc/mimedefang/README.NONROOT +%%PORTDOCS%%share/doc/mimedefang/README.SECURITY %%PORTDOCS%%share/examples/mimedefang/suggested-minimum-filter-for-windows-clients %%PORTDOCS%%share/examples/mimedefang/stream-by-domain-filter %%PORTDOCS%%share/examples/mimedefang/README --- mimedefang.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206151542.g5FFgYaw081462>