From feabb2551a528c355cbffc58fd2dd8e3123a78af Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sun, 24 May 1998 03:21:59 +0000
Subject: Update to the May 10th version.

PR:		6723
Submitted by:	maintainer
---
 net/sendfile/Makefile       |  4 ++--
 net/sendfile/distinfo       |  2 +-
 net/sendfile/files/patch-ab | 56 ++++++++-------------------------------------
 3 files changed, 12 insertions(+), 50 deletions(-)

(limited to 'net/sendfile')

diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index a8903beed415..6bed17f373ac 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -3,10 +3,10 @@
 # Date created:         30 Oct 1997
 # Whom:                 sec@42.org
 #
-# $Id: Makefile,v 1.2 1998/03/01 21:50:37 steve Exp $
+# $Id: Makefile,v 1.3 1998/04/19 03:36:55 itojun Exp $
 #
 
-DISTNAME=	sendfile-19980316
+DISTNAME=	sendfile-19980510
 PKGNAME=	sendfile-2.1
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.uni-stuttgart.de/pub/unix/comm/sendfile/current/
diff --git a/net/sendfile/distinfo b/net/sendfile/distinfo
index b1e430da3238..1ebc810aaa38 100644
--- a/net/sendfile/distinfo
+++ b/net/sendfile/distinfo
@@ -1 +1 @@
-MD5 (sendfile-19980316.tar.gz) = 0f540ff6c451440c909ee1e11e95c869
+MD5 (sendfile-19980510.tar.gz) = 4ebb2be4277ca74324d413fca39b8902
diff --git a/net/sendfile/files/patch-ab b/net/sendfile/files/patch-ab
index 1e8f5e60c8df..025250ae8753 100644
--- a/net/sendfile/files/patch-ab
+++ b/net/sendfile/files/patch-ab
@@ -1,39 +1,9 @@
---- develop/install.orig	Fri Mar 13 01:16:41 1998
-+++ develop/install	Sat Apr  4 18:53:55 1998
-@@ -113,17 +113,9 @@
- if [ "$INETDCONF" = "" ]; then	INETDCONF=/etc/inetd.conf; fi
- if [ "$SERVICES" = "" ]; then	SERVICES=/etc/services; fi
- 
--if [ -f /usr/man/man7/locale.7 -o -f /usr/man/man7/term.7 ]; then
--  manmisc=7
--else
--  manmisc=5
--fi
-+manmisc=7
- 
--if [ -f /usr/man/man8/inetd.8 ]; then
--  manadmin=8
--else
--  manadmin=1m
--fi
-+manadmin=8
- 
- # purge old logfiles (bug from sendfile revision < 19980310)
- (cd $SPOOL && rm -f */.sendfile*.log)
-@@ -132,7 +124,7 @@
- 	umask 022
- 	cd src || exit 1
- 	cp sendfile sendmsg receive utf7encode fetchfile wlock $BINDIR/
--	[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm $SERVERDIR/sendfiled.old
-+	[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old
- 	cp sendfiled $SERVERDIR
- 	cd ..
- 	install_man
-@@ -156,14 +148,6 @@
- To deinstall the sendfile-daemon, simply type: 	rm $SERVERDIR/sendfiled
+--- develop/install.orig	Fri Apr 17 13:47:44 1998
++++ develop/install	Fri May 22 19:51:13 1998
+@@ -162,13 +162,6 @@
  
  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
@@ -44,16 +14,7 @@
  
  umask 022
  
-@@ -213,7 +197,7 @@
-   echo "         there is $SERVERDIR/sendfiled in makeconfig! Check it!"
- fi
- echo "installing the sendfile-daemon in $SERVERDIR"
--[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm $SERVERDIR/sendfiled.old
-+[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old
- cp src/sendfiled $SERVERDIR  || exit 1
- 
- NOSENDFILE=`dirname $DENY 2>/dev/null`/nosendfile
-@@ -259,7 +243,6 @@
+@@ -259,7 +252,6 @@
      echo "saft	487/tcp		# simple asynchronous file transfer" | niload services .
    else
      echo "configuring $SERVICES"
@@ -61,7 +22,7 @@
      echo "saft	487/tcp		# simple asynchronous file transfer" >>$SERVICES
    fi
  fi
-@@ -272,8 +255,6 @@
+@@ -272,8 +264,6 @@
    fi
    RESTART=true
    echo "configuring $INETDCONF"
@@ -70,7 +31,7 @@
    echo "saft	stream	tcp	nowait	root	$SFD" >>$INETDCONF
  fi
  
-@@ -337,15 +318,10 @@
+@@ -337,15 +327,11 @@
  EOD
  fi
  
@@ -87,6 +48,7 @@
 -  echo
 -  echo "please restart now your inetd ( or simply reboot :-) )"
 -  echo
-+  kill -HUP `ps auxw|awk '$11 == "inetd" { print $2 } '`
++  kill -HUP `cat /var/run/inetd.pid`
 +  [ -f $SERVERDIR/sendfiled.old ] && rm -f $SERVERDIR/sendfiled.old
  fi
++echo done.
-- 
cgit v1.2.3