Date: Fri, 22 May 1998 20:07:07 +0200 (CEST) From: Stefan `Sec` Zehl <sec@42.org> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/6723: sendfile-port update Message-ID: <199805221807.UAA18580@btl.42.org>
next in thread | raw e-mail | index | archive | help
>Number: 6723 >Category: ports >Synopsis: sendfile-port update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 22 11:10:01 PDT 1998 >Last-Modified: >Originator: Stefan `Sec` Zehl >Organization: >Release: FreeBSD 2.2.6-STABLE i386 >Environment: >Description: I updated the sendfile port to the most recent version. >How-To-Repeat: >Fix: Apply this diff. diff -burN /usr/ports/net/sendfile/Makefile sendfile/Makefile --- /usr/ports/net/sendfile/Makefile Tue Apr 21 17:18:47 1998 +++ sendfile/Makefile Fri May 22 20:06:18 1998 @@ -6,7 +6,7 @@ # $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 -burN /usr/ports/net/sendfile/files/md5 sendfile/files/md5 --- /usr/ports/net/sendfile/files/md5 Tue Apr 21 17:18:47 1998 +++ sendfile/files/md5 Fri May 22 19:26:34 1998 @@ -1 +1 @@ -MD5 (sendfile-19980316.tar.gz) = 0f540ff6c451440c909ee1e11e95c869 +MD5 (sendfile-19980510.tar.gz) = 4ebb2be4277ca74324d413fca39b8902 diff -burN /usr/ports/net/sendfile/patches/patch-ab sendfile/patches/patch-ab --- /usr/ports/net/sendfile/patches/patch-ab Tue Apr 21 17:18:47 1998 +++ sendfile/patches/patch-ab Fri May 22 19:51:31 1998 @@ -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. diff -burN /usr/ports/net/sendfile/patches/patch-ac sendfile/patches/patch-ac --- /usr/ports/net/sendfile/patches/patch-ac Thu Jan 1 01:00:00 1970 +++ sendfile/patches/patch-ac Fri May 22 19:48:47 1998 @@ -0,0 +1,11 @@ +--- develop/makefile.src.orig Fri May 22 19:48:03 1998 ++++ develop/makefile.src Fri May 22 19:48:18 1998 +@@ -53,6 +53,8 @@ + ln -s utf7encode utf7decode + + wlock: wlock.o ++ $(LINK) $(LDFLAGS) wlock.o -o wlock $(LIBS) ++ + + clean: + rm -rf core *.o *~ a.out .deps \ diff -burN /usr/ports/net/sendfile/patches/patch-ad sendfile/patches/patch-ad --- /usr/ports/net/sendfile/patches/patch-ad Thu Jan 1 01:00:00 1970 +++ sendfile/patches/patch-ad Fri May 22 19:56:05 1998 @@ -0,0 +1,11 @@ +--- makeconfig.orig Fri May 22 19:55:37 1998 ++++ makeconfig Fri May 22 19:55:49 1998 +@@ -43,7 +43,7 @@ + export TAR GZIP BZIP2 PGP RECODE METAMAIL SENDMAIL + + topmake() { +- sed "s/!SYSTEM/ok/g ++ sed "s/!SYSTEM/$SYSTEM/g + s/!VERSION/$VERSION/g + " develop/makefile.top > Makefile + } >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?199805221807.UAA18580>