Upgrade to 4.26b

8 files changed, 18 insertions, 146 deletions

diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index a40d665f2f47..6af175467d01 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drweb_sendmail
-PORTVERSION=    4.26
-PORTREVISION=   12
+PORTVERSION=    4.26b
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.drweb.ru/ftp/web_pub/
 DISTNAME=	drwebd-${PORTVERSION}-freebsd4
@@ -92,10 +91,12 @@ do-install:
 		${ECHO} y; \
 		${ECHO} /tmp; \
 		${ECHO} y; \
+		${ECHO} y; \
 		${ECHO} ; \
 		${ECHO} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
 		${ECHO} y; \
 		${ECHO} y; \
+		${ECHO} y; \
 		${ECHO} c; \
 		${ECHO} t; \
 		${ECHO} t; \
diff --git a/security/drweb-sendmail/distinfo b/security/drweb-sendmail/distinfo
index 36feae42cc28..6f6531f7a32b 100644
--- a/security/drweb-sendmail/distinfo
+++ b/security/drweb-sendmail/distinfo
@@ -1 +1 @@
-MD5 (drwebd-4.26-freebsd4.tgz) = 4a58e3b573135558e1fe2da60c72bde4
+MD5 (drwebd-4.26b-freebsd4.tgz) = 1d174f20c65095819ea6e2adfdebdd05
diff --git a/security/drweb-sendmail/files/patch-aa b/security/drweb-sendmail/files/patch-aa
index f068e449dbff..40e8a74984bf 100644
--- a/security/drweb-sendmail/files/patch-aa
+++ b/security/drweb-sendmail/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Sep 27 01:00:45 2001
-+++ configure	Wed Oct  3 07:59:17 2001
-@@ -105,6 +105,9 @@
+--- configure.orig	Tue Oct 16 19:28:21 2001
++++ configure	Sun Oct 21 00:00:54 2001
+@@ -138,6 +138,9 @@
      if [ $MILTER_VER = "STD" ] ; then
          SM_LIB="libsm"
          SM_LIB_CMD="-lsm"
@@ -10,7 +10,7 @@
      elif [ $OS = "Linux_DW" ] ; then
          SM_LIB="libsmutil"
          SM_LIB_CMD="-lsmutil"
-@@ -140,40 +143,13 @@
+@@ -173,40 +176,13 @@
      rm -f configure.cache
      echo $n "${SM_DIR}${c}" >> configure.cache
      
@@ -41,7 +41,7 @@
 -        echo "Please go to $SM_DIR and check it"
 -        exit 1    
 -    fi
-     rm -dfr include/libmilter
+     rm -fr include/libmilter
      rm -f lib/libmilter.a           
      ln -s "$SM_DIR/include/libmilter" include/libmilter
 -    ln -s "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" lib/libmilter.a           
diff --git a/security/drweb-sendmail/files/patch-ab b/security/drweb-sendmail/files/patch-ab
deleted file mode 100644
index eee234e4f2d1..000000000000
--- a/security/drweb-sendmail/files/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
---- dw_filter.c.orig	Thu Sep 27 01:00:46 2001
-+++ dw_filter.c	Wed Oct  3 23:05:43 2001
-@@ -606,7 +606,7 @@
-         }
-         else
-         {
--            wprintLib( "block proccessing from <>" );
-+	    wprintLib( "block processing from <>" );
-             free_private_data( priv );
-             if( set_private_data( context, NULL ) != MI_SUCCESS )
-             {
-@@ -621,7 +621,7 @@
-         wprintLib( "%s(%d) - no memory for private data", __FILE__, __LINE__ );
-         FAIL_EXIT( context, priv );
-     }
--    wprintLib( "start proccessing from %s", priv->from );
-+    wprintLib( "start processing from %s", priv->from );
-     priv->fname_tmp = strdup( ShareTemplate );
-     if( !priv->fname_tmp )
-     {
-@@ -906,7 +906,8 @@
-         if( plog )
-         {
-             len = snprintf( NotifyMsg, sizeof(NotifyMsg),
--                            "Message sent from %s infected by virus and has not been delivered.\r\n"
-+			    "Message sent from %s\r\n"
-+			    "infected by virus and has not been delivered.\r\n"
-                             "Diagnostic:\r\n%s\r\n"
-                             "Original message was stored in the archive.\r\n"
-                             "Archive record: %s\r\n"
-@@ -917,7 +918,8 @@
-         else
-         {
-             len = snprintf( NotifyMsg, sizeof(NotifyMsg),
--                            "Message sent from %s infected by virus and has not been delivered.\r\n"
-+			    "Message sent from %s\r\n"
-+			    "infected by virus and has not been delivered.\r\n"
-                             "Original message was stored in the archive.\r\n"
-                             "Archive record: %s\r\n"
-                             "To receive original message please contact postmaster:\r\n%s\r\n\r\n"
-@@ -983,7 +985,7 @@
-     }
-     else
-     {
--        wprintLib( "message sent by %s is okey.\n", priv->from );
-+	wprintLib( "message sent by %s is okay.\n", priv->from );
-         exit_code = SMFIS_ACCEPT;
-     }
-     if( bLocal && (virus == 0) && (exit_code == SMFIS_ACCEPT) && (status & DERR_EVAL_KEY) && (priv->body_offset > 0) )
diff --git a/security/drweb-sendmail/files/patch-ac b/security/drweb-sendmail/files/patch-ac
index 500bbb4363dd..eda090c10ef6 100644
--- a/security/drweb-sendmail/files/patch-ac
+++ b/security/drweb-sendmail/files/patch-ac
@@ -1,14 +1,6 @@
---- ../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 @@
+--- ../sendmail/configure.orig	Tue Oct 16 19:28:24 2001
++++ ../sendmail/configure	Sun Oct 21 00:09:16 2001
+@@ -117,7 +117,7 @@
  
  CACHE_ADDR="n"
  POS=`$GREP PidFile $DAEMON_INI | $GREP -v ";"`
@@ -17,38 +9,3 @@
      echo
      echo -n "Daemon pidfile not defined in ini-file ..."
      POS=`$GREP SocketMode $DAEMON_INI | $GREP -v ";" | $AWK '{ print match( $0, /[Tt][Cc][Pp]/ ) }'`
-     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___}
diff --git a/security/drweb-sendmail/files/patch-ad b/security/drweb-sendmail/files/patch-ad
deleted file mode 100644
index 83a6f0776882..000000000000
--- a/security/drweb-sendmail/files/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
---- ../sendmail/template.mc.addon.bak	Wed Sep 26 01:02:29 2001
-+++ ../sendmail/template.mc.addon	Wed Oct  3 11:17:54 2001
-@@ -1,5 +1,4 @@
- ___COMMENT_FFR___define(`_FFR_MILTER',1)
--MAIL_FILTER(`drweb-filter', `S=___MILTER_ADDRESS___
--, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___')
-+MAIL_FILTER(`drweb-filter', `S=___MILTER_ADDRESS___, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___')
- define(`confINPUT_MAIL_FILTERS', `drweb-filter')
- ___COMMENT_LOG___define(`confMILTER_LOG_LEVEL',`___MILTER_LOGLEVEL___')
diff --git a/security/drweb-sendmail/files/patch-ae b/security/drweb-sendmail/files/patch-ae
deleted file mode 100644
index b70ce7107155..000000000000
--- a/security/drweb-sendmail/files/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../sendmail/template.cf.addon.bak	Wed Sep 26 01:02:29 2001
-+++ ../sendmail/template.cf.addon	Wed Oct  3 11:17:54 2001
-@@ -2,11 +2,10 @@
- # Input mail filters
- ############################
- O InputMailFilters=drweb-filter
--___COMMENT_LOG___O Milter.LogLevel=___MILTER_LOGLEVEL___
-+___COMMENT_LCF___O Milter.LogLevel=___MILTER_LOGLEVEL___
- 
- ############################
- # The eXternal filters
- ############################
- 
--Xdrweb-filter,  S=___MILTER_ADDRESS___
--, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___
-+Xdrweb-filter,  S=___MILTER_ADDRESS___, ___MILTER_ACTION___ T=S:___MILTER_TIMEOUT_1___;R:___MILTER_TIMEOUT_1___;E:___MILTER_TIMEOUT_2___
diff --git a/security/drweb-sendmail/files/patch-af b/security/drweb-sendmail/files/patch-af
index 5cd3304133c4..f137f0a29f83 100644
--- a/security/drweb-sendmail/files/patch-af
+++ b/security/drweb-sendmail/files/patch-af
@@ -1,22 +1,10 @@
---- ../sendmail/template.initscript.orig	Wed Sep 26 01:02:29 2001
-+++ ../sendmail/template.initscript	Wed Oct  3 22:36:07 2001
-@@ -13,7 +13,7 @@
- # Use these if cannot found functions
- dw_daemon() {
-     ulimit -c 0
--    $* &
-+    $*
-     return $?
- }
- 
-@@ -105,9 +105,7 @@
-     RETVAL=$?
+--- ../sendmail/template.initscript.bak	Thu Oct  4 12:29:12 2001
++++ ../sendmail/template.initscript	Sun Oct 21 00:15:59 2001
+@@ -105,6 +105,7 @@
+ 	RETVAL=$?
      if [ $RETVAL -eq 0 ] ; then
-         [ $FILTER_UNIX = "yes" ] && rm -f $FILTER_SOCKET
--        if [ "x$DAEMON_PID" != "x" ] ; then
--            sleep 1
--        fi
+ 	    [ $FILTER_UNIX = "yes" ] && rm -f $FILTER_SOCKET
 +	[ $DAEMON_UNIX = "yes" ] && chmod 660 $DAEMON_SOCKET
          $PROC_DAEMON $FILTER_CMD
-         RETVAL=$?
+ 	    RETVAL=$?
      fi