head	1.15;
access;
symbols
	RELEASE_5_3_0:1.14
	RELEASE_4_10_0:1.14
	RELEASE_5_2_1:1.14
	RELEASE_5_2_0:1.14
	RELEASE_4_9_0:1.14
	RELEASE_5_1_0:1.12
	RELEASE_4_8_0:1.12
	RELEASE_5_0_0:1.10
	RELEASE_4_7_0:1.9
	RELEASE_4_6_2:1.8
	RELEASE_4_6_1:1.8
	RELEASE_4_6_0:1.8
	RELEASE_5_0_DP1:1.7
	RELEASE_4_5_0:1.7
	RELEASE_4_4_0:1.3;
locks; strict;
comment	@# @;


1.15
date	2004.11.25.11.54.01;	author sem;	state dead;
branches;
next	1.14;

1.14
date	2003.07.01.06.51.41;	author ache;	state Exp;
branches;
next	1.13;

1.13
date	2003.06.07.09.43.39;	author ache;	state Exp;
branches;
next	1.12;

1.12
date	2003.02.19.03.53.59;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	2003.02.18.04.45.26;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	2002.10.07.00.06.17;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	2002.08.25.05.30.34;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2002.05.11.03.26.45;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	2001.10.20.20.50.21;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	2001.10.06.04.25.14;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	2001.10.03.07.34.32;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	2001.10.03.04.56.34;	author ache;	state dead;
branches;
next	1.3;

1.3
date	2001.08.25.19.03.29;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	2001.08.25.16.42.54;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	2001.08.25.14.14.27;	author ache;	state Exp;
branches;
next	;


desc
@@


1.15
log
@- Update to 4.32.1
- Pass maintainership to submitter

PR:		ports/72511
Submitted by:	Demin Alexander <support(at)spectrum.ru>
@
text
@--- doc/sendmail/configure.orig	Wed Jun  4 16:46:57 2003
+++ doc/sendmail/configure	Tue Jul  1 09:41:05 2003
@@@@ -1,4 +1,4 @@@@
-#!/bin/sh
+#!%LOCALBASE%/bin/bash
 #
 # $Id: configure,v 1.25 2003/04/10 15:47:33 cvser Exp $
 #
@@@@ -134,7 +134,7 @@@@
 # Read transport
 
 POS=`$GREP -i PidFile $DAEMON_INI | $GREP -v ";"`
-if [ "x$POS" = "x" ] ; then
+if [ "x" = "x" ] ; then
     echo
     echo -n "Daemon pidfile not defined in ini-file ..."
     if [ $VER -eq 1 ] ; then
@@@@ -377,8 +377,13 @@@@
             echo "Edit one of configuration files and try again."
             exit 1
         fi 
+    else
+	echo "Press Enter"
+	read INPUT
     fi
 else 
+    echo "Press Enter"
+    read INPUT
     FILTER_TIMEOUT=0
 fi
 
@


1.14
log
@Upgrade to 4.29.12-D
@
text
@@


1.13
log
@FIx to understand drweb 4.29.5 config
@
text
@d1 9
a9 22
--- doc/sendmail/configure.orig	Tue Feb 18 18:03:06 2003
+++ doc/sendmail/configure	Sat Jun  7 13:29:29 2003
@@@@ -34,18 +34,6 @@@@
 FILTER_CFG_NOSTD="-- ERROR ---"
 FILTER_TIMEOUT="-- ERROR ---"
 
-# Test bash version
-
-if [ "x$BASH_VERSION" = "x" ] ; then
-    echo "You should use bash (version 2.04 at least) as shell to use this script"
-    exit
-fi
-echo "You current shell - bash $BASH_VERSION"
-if [ ${BASH_VERSINFO[0]} -lt 2 -o ${BASH_VERSINFO[1]} -lt 4 ] ; then
-    echo "You should use version 2.04 at least to use this script"
-    exit
-fi
-
 # Test echo properties
 
 (echo "12345\c" ; echo " ") > echotmp
@@@@ -124,14 +112,14 @@@@
d17 2
a18 12
-    POS=`$GREP -i SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
-    if [ $POS -eq 0 ] ; then
+    POS=`$GREP -i "Socket[^a-z]" $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /\// ) }'`
+    if [ $POS -ne 0 ] ; then
         echo " but defined UNIX sockets"
         DAEMON_MODE="local"
-        DAEMON_SOCKET=`$GREP -i SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+	DAEMON_SOCKET=`$GREP -i "Socket[^a-z]" $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]|[[:blank:]]+[0-7]+$/, "", str ); print str; }'`
         DAEMON_IP=""
         DAEMON_PORT=""
         DAEMON_PID=""
@@@@ -297,8 +285,13 @@@@
@


1.12
log
@Upgrade to 4.29.10-A
@
text
@d1 2
a2 2
--- doc/sendmail/configure.orig	Wed Feb  5 19:04:53 2003
+++ doc/sendmail/configure	Tue Feb 18 07:10:13 2003
d22 1
a22 1
@@@@ -124,7 +112,7 @@@@
d30 11
a40 1
     POS=`$GREP -i SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
@


1.11
log
@Upgrade to 4.29.10
@
text
@a30 9
@@@@ -191,7 +179,7 @@@@
 
 # Read transport
 
-TMP=`$GREP -i Address $FILTER_CFG | $GREP -v "#"`
+TMP=`$GREP -i Address[^a-z] $FILTER_CFG | $GREP -v "#"`
 DADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, match( $0, /^Address=/ ), match( substr( $0, 2 ), /MilterAddress=/ ) ); print str; }'`
 FADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, 1+match( substr( $0, 2 ), /MilterAddress=/ ) ); print str; }'`
 DMODE=`echo $DADR | $AWK '{ str = substr( $0, 1+index( $0, "=" ), index( $0, ":" ) - index( $0, "=" ) - 1 ); print str; }'`
@


1.10
log
@Upgrade to 4.28.11
@
text
@d1 22
a22 3
--- doc/sendmail/configure.orig	Fri Sep 20 19:29:05 2002
+++ doc/sendmail/configure	Mon Oct  7 03:28:04 2002
@@@@ -110,7 +110,7 @@@@
d31 10
a40 1
@@@@ -266,8 +266,13 @@@@
@


1.9
log
@Upgrade to 4.28.10
@
text
@d1 2
a2 2
--- doc/sendmail/configure.orig	Wed May 15 20:41:27 2002
+++ doc/sendmail/configure	Sun Aug 25 06:42:08 2002
d12 1
a12 19
@@@@ -178,7 +178,7 @@@@
 # Read transport
 
 TMP=`$GREP -i Address $FILTER_CFG | $GREP -v "#"`
-DADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, match( $0, /^Address=/ ), match( substr( $0, 2 ), /Address=/ ) ); print str; }'`
+DADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, match( $0, /^MilterAddress=/ ), match( substr( $0, 2 ), /MilterAddress=/ ) ); print str; }'`
 FADR=`echo $TMP | $AWK '{ gsub( /["[:blank:]]/, "", $0 ); str = substr( $0, 1+match( substr( $0, 2 ), /Address=/ ) ); print str; }'`
 DMODE=`echo $DADR | $AWK '{ str = substr( $0, 1+index( $0, "=" ), index( $0, ":" ) - index( $0, "=" ) - 1 ); print str; }'`
 FMODE=`echo $FADR | $AWK '{ str = substr( $0, 1+index( $0, "=" ), index( $0, ":" ) - index( $0, "=" ) - 1 ); print str; }'`
@@@@ -243,7 +243,7 @@@@
 
 SOCKET_TIMEOUT=`$GREP -i SocketTimeout $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
 FILE_TIMEOUT=`$GREP -i FileTimeout $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
-FILTER_TIMEOUT=`$GREP -i Timeout $FILTER_CFG | $GREP -v "#" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+FILTER_TIMEOUT=`$GREP -i ^Timeout $FILTER_CFG | $GREP -v "#" | $AWK '{ str = substr( $0, 1+match( $0, /=./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
 if [ "x$SOCKET_TIMEOUT" != "x" -a "x$FILE_TIMEOUT" != "x" ] ; then
     RFILTER_TIMEOUT=`expr 2 \* $SOCKET_TIMEOUT + 2 \* $FILE_TIMEOUT`
 elif [ "x$SOCKET_TIMEOUT" != "x" ] ; then
@@@@ -265,8 +265,13 @@@@
@


1.8
log
@Upgrade to 4.28
@
text
@d1 2
a2 2
--- doc/sendmail/configure.orig	Mon May  6 19:23:27 2002
+++ doc/sendmail/configure	Fri May 10 18:21:04 2002
d12 18
@


1.7
log
@Upgrade to 4.26b
@
text
@d1 4
a4 3
--- ../sendmail/configure.orig	Tue Oct 16 19:28:24 2001
+++ ../sendmail/configure	Sun Oct 21 00:09:16 2001
@@@@ -117,7 +117,7 @@@@
d6 1
a6 2
 CACHE_ADDR="n"
 POS=`$GREP PidFile $DAEMON_INI | $GREP -v ";"`
d11 15
a25 1
     POS=`$GREP SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
@


1.6
log
@Run as drweb user, not as root
@
text
@d1 3
a3 11
--- ../sendmail/configure.orig	Wed Sep 26 01:02:29 2001
+++ ../sendmail/configure	Sat Oct  6 08:20:13 2001
@@@@ -22,6 +22,7 @@@@
 ___T_MILTER_LOGLEVEL___="-- ERROR ---"
 ___T_MILTER_TIMEOUT_1___="-- ERROR ---"
 ___T_MILTER_TIMEOUT_2___="-- ERROR ---"
+___T_COMMENT_LCF___="-- ERROR --"
 ___T_COMMENT_LOG___="-- ERROR --"
 ___T_COMMENT_FFR___="-- ERROR --"
 
@@@@ -100,13 +101,13 @@@@
a11 35
     if [ $POS -eq 0 ] ; then
         echo " but defined UNIX sockets"
-        ___T_DAEMON_SOCKET___=`$GREP SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, 1+match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
+	___T_DAEMON_SOCKET___=`$GREP SocketFile $DAEMON_INI | $GREP -v ";" | $AWK '{ str = substr( $0, match( $0, /\/./ ) ); gsub( /["[:blank:]]/, "", str ); print str; }'`
         ___T_DAEMON_IP___=""
         ___T_DAEMON_PORT___=""
         ___T_DAEMON_PID___=""
@@@@ -421,10 +422,12 @@@@
 read INPUT
 if [ "x$INPUT" = "x" -o "x$INPUT" = "xy" -o "x$INPUT" = "xY" ] ; then
     MILTER_FFR="n"
+    ___T_COMMENT_LCF___=""
     ___T_COMMENT_LOG___=""
     ___T_COMMENT_FFR___="dnl "
 else
     MILTER_FFR="y"
+    ___T_COMMENT_LCF___="#"
     ___T_COMMENT_LOG___="dnl "
     ___T_COMMENT_FFR___=""
 fi
@@@@ -633,7 +636,7 @@@@
     mv -f sendmail.cf.addon sendmail.cf.addon.bak
 fi
 $SED \
-        -e "s&___COMMENT_LOG___&${___T_COMMENT_LOG___}&" \
+	-e "s&___COMMENT_LCF___&${___T_COMMENT_LCF___}&" \
         -e "s&___MILTER_LOGLEVEL___&${___T_MILTER_LOGLEVEL___}&" \
         -e "s&___MILTER_ADDRESS___&${___T_MILTER_ADDRESS___}&" \
         -e "s&___MILTER_ACTION___&${___T_MILTER_ACTION___}&" \
@@@@ -729,4 +732,5 @@@@
 #echo "___T_MILTER_TIMEOUT_1___="${___T_MILTER_TIMEOUT_1___}
 #echo "___T_MILTER_TIMEOUT_2___="${___T_MILTER_TIMEOUT_2___}
 #echo "___T_COMMENT_LOG___="${___T_COMMENT_LOG___}
+#echo "___T_COMMENT_LCF___="${___T_COMMENT_LCF___}
 #echo "___T_COMMENT_FFR___="${___T_COMMENT_FFR___}
@


1.5
log
@Configuration tunings
@
text
@d2 1
a2 1
+++ ../sendmail/configure	Wed Oct  3 11:27:50 2001
d11 8
a18 1
@@@@ -106,7 +107,7 @@@@
@


1.4
log
@Upgrade to 4.26
(working, but not cleanly configured)
@
text
@d1 47
a47 11
--- dwf_main.c.orig	Mon Jul 30 05:14:43 2001
+++ dwf_main.c	Sat Aug 25 19:44:40 2001
@@@@ -251,7 +251,7 @@@@
             wprintLib( "can not change directory to root" );
             return -1;
         }
-        umask( 0 );        
+	umask( 0117 );
         if( getrlimit( RLIMIT_NOFILE, &filelimit ) < 0 )
         {
             wprintLib( "can not get system limits" );
@


1.3
log
@Remove workaround until I dig more on this - can't reproduce the bug now.
@
text
@@


1.2
log
@Workaround to prevent coredump in stdio cleanup() on exit() when signal 15
arrived
@
text
@a2 9
@@@@ -199,7 +199,7 @@@@
             dprintLib("Results: daemon return code %#x (%s)\n", retcode, getDaemonCode( retcode ) );
         }
     }
-    return retcode;
+    _exit(retcode);     /* due to core dump in stdio cleanup() after signal */
 }
 
 /* ----------------------------------------------------------------------- */
@


1.1
log
@Use right umask for socket creation
@
text
@d1 11
a11 2
--- dwf_main.c.bak	Mon Jul 30 05:14:43 2001
+++ dwf_main.c	Sat Aug 25 18:08:18 2001
@

