update to 2.1a.

PR:		25563
Submitted by:	maintainer

5 files changed, 63 insertions, 17 deletions

diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index bde629cbe59a..3ae0804ae858 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sendfile
-PORTVERSION=	2.1
+PORTVERSION=	2.1a
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.belwue.de/pub/unix/sendfile/current/
-DISTFILES=	sendfile-20000102.tar.gz
+DISTFILES=	sendfile-20010216.tar.gz
 
 MAINTAINER=	sec@42.org
 
diff --git a/net/sendfile/distinfo b/net/sendfile/distinfo
index 3c3d0829906e..382d0ec84375 100644
--- a/net/sendfile/distinfo
+++ b/net/sendfile/distinfo
@@ -1 +1 @@
-MD5 (sendfile-20000102.tar.gz) = 4deaa00bf9a2e3f1c15abb54b30f2de0
+MD5 (sendfile-20010216.tar.gz) = 436684ea7e76aec5d5ad5e321be06917
diff --git a/net/sendfile/files/patch-aa b/net/sendfile/files/patch-aa
index 50ecc25f5149..03a4c24d4412 100644
--- a/net/sendfile/files/patch-aa
+++ b/net/sendfile/files/patch-aa
@@ -1,5 +1,5 @@
---- makeconfig.orig	Sat Feb 28 13:21:59 1998
-+++ makeconfig	Sun Mar  1 19:45:58 1998
+--- makeconfig.orig	Mon Mar  5 23:06:22 2001
++++ makeconfig	Mon Mar  5 23:07:26 2001
 @@ -11,15 +11,14 @@
  
  # default compiling settings
@@ -20,10 +20,11 @@
  INETDCONF=/etc/inetd.conf
  SERVICES=/etc/services
  
-@@ -35,6 +34,7 @@
+@@ -34,7 +33,7 @@
+ #PGP=/usr/local/bin/pgp
  #RECODE=/usr/local/bin/recode
  #METAMAIL=/usr/local/bin/metamail
- #SENDMAIL=/usr/lib/sendmail
+-#SENDMAIL=/usr/lib/sendmail
 +SENDMAIL=/usr/sbin/sendmail
             
  ######################### END OF USER CONFIGURATION ##########################
diff --git a/net/sendfile/files/patch-ab b/net/sendfile/files/patch-ab
index 29f2e9fd8f74..fddb80308b59 100644
--- a/net/sendfile/files/patch-ab
+++ b/net/sendfile/files/patch-ab
@@ -1,6 +1,6 @@
---- develop/install.orig	Sat Jul 11 14:02:38 1998
-+++ develop/install	Sun Aug 16 17:41:15 1998
-@@ -80,7 +80,6 @@
+--- develop/install.orig	Mon Mar  5 23:27:57 2001
++++ develop/install	Mon Mar  5 23:34:38 2001
+@@ -82,7 +82,6 @@
    make_man fetchfile 7 $manmisc
    make_man sendfiled 8 $manadmin
    cp doc/wlock.1 doc/utf7encode.1 $MANDIR/man1
@@ -8,10 +8,11 @@
  }
  
  SYSTEM=$1
-@@ -164,13 +163,6 @@
+@@ -165,14 +164,6 @@
+ To deinstall the sendfile-daemon, simply type: 	rm -f $SERVERDIR/sendfiled
  
  EOD
- echo 'If you are satisfied with these defaults, then type "ok" now:'
+-echo 'If you are satisfied with these defaults, then type "ok" now:'
 -read answer
 -if [ "$answer" != ok ]; then
 -  echo
@@ -22,7 +23,31 @@
  
  umask 022
  
-@@ -261,7 +253,6 @@
+@@ -250,6 +241,23 @@
+   fi
+ fi
+ 
++if [ -z "$BATCH" ] ; then
++echo ''
++echo 'I would now configure and start your sendfiled.'
++echo 'If you do not like this, enter "no" here'
++read answer
++fi
++if [ "$answer" = no ]; then
++  echo
++  echo "Things left to do if you want to start sendfiled:"
++  echo 
++  echo " - Maybe add 'saft	487/tcp' to /etc/services (prior to FreeBSD-4)"
++  echo " - Add sendfiled to /etc/inetd.conf and killall -HUP inetd"
++  echo " - Add 'test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile'"
++  echo "   to /etc/profile and /etc/csh.login"
++  echo
++else
++
+ if [ "$SYSTEM" = NEXT ]; then
+   SERVICE="`nidump services . | awk '/[ \t]487\/tcp/'`"
+ else
+@@ -266,7 +274,6 @@
      echo "saft	487/tcp		# simple asynchronous file transfer" | niload services .
    else
      echo "configuring $SERVICES"
@@ -30,7 +55,7 @@
      echo "saft	487/tcp		# simple asynchronous file transfer" >>$SERVICES
    fi
  fi
-@@ -274,8 +265,6 @@
+@@ -279,8 +286,6 @@
    fi
    RESTART=true
    echo "configuring $INETDCONF"
@@ -39,7 +64,16 @@
    echo "saft	stream	tcp	nowait	root	$SFD" >>$INETDCONF
  fi
  
-@@ -339,15 +328,11 @@
+@@ -308,6 +313,8 @@
+   fi
+ fi
+ 				
++fi
++				
+ if [ ! -d "$SPOOL/OUTGOING" ]; then
+   echo "creating $SPOOL"
+   mkdir_recursive $SPOOL/OUTGOING
+@@ -344,15 +351,12 @@
  EOD
  fi
  
@@ -55,8 +89,8 @@
  if [ "$RESTART" = true ]; then
 -  echo
 -  echo "please restart now your inetd ( or simply reboot :-) )"
--  echo
 +  kill -HUP `cat /var/run/inetd.pid`
-+  [ -f $SERVERDIR/sendfiled.old ] && rm -f $SERVERDIR/sendfiled.old
+   echo
  fi
++[ -f $SERVERDIR/sendfiled.old ] && rm -f $SERVERDIR/sendfiled.old
 +echo done.
diff --git a/net/sendfile/files/patch-ac b/net/sendfile/files/patch-ac
new file mode 100644
index 000000000000..dc8e40075785
--- /dev/null
+++ b/net/sendfile/files/patch-ac
@@ -0,0 +1,11 @@
+--- src/io.h.orig	Mon Mar  5 23:38:04 2001
++++ src/io.h	Mon Mar  5 23:38:04 2001
+@@ -15,6 +15,8 @@
+  * This file is covered by the GNU General Public License
+  */
+ 
++#include <sys/types.h>
++
+ 
+ /* read n bytes from network socket */
+ int readn(int, char *, int);