head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.120 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.118 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.116 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.114 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.112 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.110 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.108 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.106 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.104 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.102 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.100 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.98 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.96 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.94 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.92 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.90 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.88 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.86 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.84 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.82 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.80 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.78 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.76 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.72 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.52 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.74 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.70 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.68 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.66 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.64 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.62 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.60 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.58 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.56 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.54 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.50 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.48 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.46 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.44 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.42 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.40 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.38 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.36 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.34 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.32 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.30 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.28 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.26 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.24 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.22 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.20 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.18 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.16 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.12 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.10 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.8 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.6 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.4 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.4.0.2 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.3.0.62 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.60 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.58 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.56 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.54 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.52 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.50 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.48 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.46 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.44 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.42 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.40 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.38 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.6 date 2011.06.01.11.21.01; author is; state Exp; branches; next 1.5; 1.5 date 2011.05.27.13.13.35; author is; state Exp; branches; next 1.4; 1.4 date 2011.03.23.18.22.28; author joerg; state Exp; branches; next 1.3; 1.3 date 2003.05.01.15.44.44; author jmmv; state Exp; branches; next 1.2; 1.2 date 2001.02.26.11.34.55; author wiz; state Exp; branches; next 1.1; 1.1 date 2000.09.09.19.51.39; author wiz; state Exp; branches; next ; desc @@ 1.6 log @Update to sendfile-2.1b. Most visible change is multiprotocol support. @ text @$NetBSD$ --- develop/install.orig 2005-06-06 20:39:29.000000000 +0000 +++ develop/install @@@@ -59,12 +59,12 @@@@ mkdir_recursive() { } make_dirs() { - mkdir_recursive $BINDIR - mkdir_recursive $MANDIR/man1 - mkdir_recursive $SERVERDIR - mkdir_recursive `dirname $DENY` - mkdir_recursive `dirname $CONFIG` - mkdir $MANDIR/man$manmisc $MANDIR/man$manadmin 2>/dev/null + mkdir_recursive $D$BINDIR + mkdir_recursive $D$MANDIR/man1 + mkdir_recursive $D$SERVERDIR + mkdir_recursive $D$EGDIR + mkdir_recursive $D$EGDIR + mkdir $D/$MANDIR/man$manmisc $D/$MANDIR/man$manadmin 2>/dev/null } make_man() { @@@@ -72,7 +72,7 @@@@ make_man() { s:/usr/local/etc/sendfile.deny:$DENY: s:/usr/local/etc/sendfile.cf:$CONFIG: s:/var/spool/sendfile:$SPOOL: - " doc/$1.$2 >$MANDIR/man$3/$1.$3 + " doc/$1.$2 >$D$MANDIR/man$3/$1.$3 } install_man() { @@@@ -82,8 +82,8 @@@@ install_man() { make_man fetchfile 1 1 make_man fetchfile 7 $manmisc make_man sendfiled 8 $manadmin - cp doc/wlock.1 doc/utf7encode.1 $MANDIR/man1 - (cd $MANDIR/man1; ln -s utf7encode.1 utf7decode.1 2>/dev/null) + cp doc/wlock.1 doc/utf7encode.1 $D$MANDIR/man1 + (cd $D$MANDIR/man1; ln -s utf7encode.1 utf7decode.1 2>/dev/null) } SYSTEM=$1 @@@@ -94,18 +94,11 @@@@ if [ "$SYSTEM" = "" ]; then exit fi -if [ "$LOGNAME" != root ]; then - if [ "`whoami`" != root ]; then - echo - echo "You are not root! You probably run into problems now..." - echo - fi -fi - eval `awk -F\" '/define BINDIR/ {print "BINDIR="$2} /define MANDIR/ {print "MANDIR="$2} /define SERVERDIR/ {print "SERVERDIR="$2} /define SPOOL/ {print "SPOOL="$2} + /define EGDIR/ {print "EGDIR="$2} /define CONFIG/ {print "CONFIG="$2} /define DENY/ {print "DENY="$2} /define ALLOW/ {print "ALLOW="$2} @@@@ -114,6 +107,8 @@@@ eval `awk -F\" '/define BINDIR/ {prin /define OUTLOG/ {print "OUTLOG="$2} ' src/globals.h` +D=$DESTDIR + if [ "$BINDIR" = "" ]; then BINDIR=/usr/local/bin; fi if [ "$MANDIR" = "" ]; then MANDIR=/usr/local/man; fi if [ "$SERVERDIR" = "" ]; then SERVERDIR=/usr/local/sbin; fi @@@@ -131,54 +126,28 @@@@ if [ -f /etc/xinetd.conf -a -d /etc/xine INETDCONF=/etc/xinetd.d/sendfile fi +CONFIG=$PKG_SYSCONFDIR/sendfile.cf +DENY=$PKG_SYSCONFDIR/sendfile.deny + case "$SYSTEM" in - *BSD*) manmisc=7; manadmin=8;; - *) manmisc=5; manadmin=1m;; + *) manmisc=7; manadmin=8;; esac -# purge old logfiles (bug from sendfile revision < 19980310) -rm -f $SPOOL*/.sendfile*.log - if [ "$2" = "reinstall" ] ; then umask 022 cd src || exit 1 make_dirs - cp sendfile sendmsg receive utf7encode fetchfile wlock $BINDIR/ - [ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old - cp sendfiled $SERVERDIR + cp sendfile sendmsg receive utf7encode fetchfile wlock $D$BINDIR/ + [ -x $D$SERVERDIR/sendfiled ] && mv $D$SERVERDIR/sendfiled $D$SERVERDIR/sendfiled.old && rm -f $D$SERVERDIR/sendfiled.old + cp sendfiled $D$SERVERDIR cd ../etc - cp sfconf sfdconf $BINDIR/ + cp sfconf sfdconf $D$BINDIR/ cd .. install_man echo Done. exit 0 fi -cat < $BINDIR/sf_cleanup + > $D$BINDIR/sf_cleanup sed "s:SPOOL=/var/spool/sendfile:SPOOL=$SPOOL: s:INLOG=/var/spool/sendfile/LOG/in:INLOG=$INLOG: s:OUTLOG=/var/spool/sendfile/LOG/in:OUTLOG=$OUTLOG: @@@@ -198,13 +167,13 @@@@ sed "s:SPOOL=/var/spool/sendfile:SPOOL=$ s:ALLOW=/usr/local/etc/sendfile.allow:ALLOW=$ALLOW: " sfdconf \ | awk '{if ($0 != "CONFIG") print $0; else system("cat sendfile.cf")}' \ - > $BINDIR/sfdconf -sed "s:/var/spool/sendfile:$SPOOL:" sfconf >$BINDIR/sfconf -sed "s:receive :$BINDIR/receive :" check_sendfile >$BINDIR/check_sendfile + > $D$BINDIR/sfdconf +sed "s:/var/spool/sendfile:$SPOOL:" sfconf >$D$BINDIR/sfconf +sed "s:receive :$BINDIR/receive :" check_sendfile >$D$BINDIR/check_sendfile cd ../src || exit 1 -cp sendfile sendmsg receive utf7encode fetchfile wlock $BINDIR/ +cp sendfile sendmsg receive utf7encode fetchfile wlock $D$BINDIR/ cd .. -(cd $BINDIR +(cd $D$BINDIR ln -s utf7encode utf7decode 2>/dev/null ln -s sendfile sf 2>/dev/null ln -s sendmsg sm 2>/dev/null @@@@ -216,153 +185,37 @@@@ echo "installing the man-pages in $MANDI install_man echo "installing the sendfile-daemon in $SERVERDIR" -[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old -cp src/sendfiled $SERVERDIR || exit 1 +[ -x $D$SERVERDIR/sendfiled ] && mv $D$SERVERDIR/sendfiled $D$SERVERDIR/sendfiled.old && rm -f $D$SERVERDIR/sendfiled.old +cp src/sendfiled $D$SERVERDIR || exit 1 -NOSENDFILE=`dirname $DENY 2>/dev/null`/nosendfile +NOSENDFILE=$D`dirname $DENY 2>/dev/null`/nosendfile if [ -f $NOSENDFILE ]; then - if grep ^allow-only $NOSENDFILE >/dev/null; then - echo "Information: $NOSENDFILE is now $ALLOW (autoconverted)" - grep -v ^allow-only $NOSENDFILE > $ALLOW + if grep ^allow-only $D$NOSENDFILE >/dev/null; then + echo "Information: $D$NOSENDFILE is now $ALLOW (autoconverted)" + grep -v ^allow-only $D$NOSENDFILE > $D$ALLOW else echo "Information: $NOSENDFILE is now $DENY (autoconverted)" - mv $NOSENDFILE $DENY + mv $NOSENDFILE $D$DENY fi fi -if [ ! -f $DENY -a ! -f $ALLOW ]; then - echo "installing the sendfile deny file as $DENY" - cp etc/sendfile.deny $DENY - chmod 644 $DENY +if [ ! -f $D$EGDIR/sendfile.allow -a ! -f $D$EGDIR/sendfile.deny ]; then + echo "installing the sendfile deny file into $D/$EGDIR" + cp etc/sendfile.deny $D$EGDIR + chmod 644 $D$EGDIR/sendfile.deny fi -if [ ! -f $CONFIG ]; then - echo "installing the global sendfile config file as $CONFIG" - cp etc/sendfile.cf $CONFIG - chmod 644 $CONFIG +if [ ! -f $D$EGDIR ]; then + echo "installing the global sendfile config file as $D$EGDIR/sendfile.cf" + cp etc/sendfile.cf $D$EGDIR + chmod 644 $D$EGDIR/sendfile.cf else - if [ "`diff etc/sendfile.cf $CONFIG`" ]; then - echo "Warning: `pwd`/etc/sendfile.cf differs from $CONFIG !" + if [ "`diff etc/sendfile.cf $D$EGDIR`" ]; then + echo "Warning: `pwd`/etc/sendfile.cf differs from $D$EGDIR !" echo "Please take a look what has been changed!" fi fi -if [ "$SYSTEM" = NEXT ]; then - SERVICE="`nidump services . | awk '/[ \t]487\/tcp/'`" -else - SERVICE="`awk '/[ \t]487\/tcp/' /etc/services`" -fi -if [ "$SERVICE" != "" ]; then - case "$SERVICE" in - saft*) ;; - *) echo "ERROR: tcp-port 487 is already in use!"; exit 1;; - esac -else - if [ "$SYSTEM" = NEXT ]; then - echo "configuring services" - echo "saft 487/tcp # simple asynchronous file transfer" | niload services . - else - echo "configuring $SERVICES" - echo "#" >>$SERVICES - echo "saft 487/tcp # simple asynchronous file transfer" >>$SERVICES - fi -fi - -case "$INETDCONF" in - *xinetd*) - if [ -f $INETDCONF ]; then - echo $INETDCONF does already exist -skipping - else - echo installing $INETDCONF - sed "s:/usr/local/sbin/sendfiled:$SERVERDIR/sendfiled:" etc/xinetd >$INETDCONF - RESTART=true - fi - SENDFILED=`awk '/[ \t]*server[ \t]*=/ { print $3 }' $INETDCONF` - ;; - *) - SENDFILED=`awk '/^saft/ { sfd=$6; - if (index($7,"/sendfiled")>0) sfd=$7; - if (substr(sfd,1,1)=="?") sfd=substr(sfd,2); - print sfd; }' $INETDCONF` - if [ "$SENDFILED" = "" ]; then - if [ -f /usr/sbin/tcpd ]; then - SFD="/usr/sbin/tcpd $SERVERDIR/sendfiled" - else - SFD="$SERVERDIR/sendfiled sendfiled" - fi - RESTART=true - echo "configuring $INETDCONF" - echo "#" >>$INETDCONF - echo "# simple asynchronous file transfer" >>$INETDCONF - echo "saft stream tcp nowait root $SFD" >>$INETDCONF - fi - ;; -esac - -if [ "$SENDFILED" != "$SERVERDIR/sendfiled" -a "$SENDFILED" != "" ]; then - echo "WARNING: you have specified $SENDFILED in $INETDCONF, but" - echo " there is $SERVERDIR/sendfiled in makeconfig! Check it!" -fi - -if [ -f /etc/inetd.sec ]; then - if [ "`grep '^saft' /etc/inetd.sec`" = "" ]; then - echo >> /etc/inetd.sec - echo "saft allow" >> /etc/inetd.sec - fi -fi - -if [ -f /etc/profile ]; then - if [ "`grep check_sendfile /etc/profile`" = "" ]; then - echo "adding check_sendfile to /etc/profile" - echo >>/etc/profile - echo "test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile"\ - >>/etc/profile - fi -fi -if [ -f /etc/csh.login ]; then - if [ "`grep check_sendfile /etc/csh.login`" = "" ]; then - echo "adding check_sendfile to /etc/csh.login" - echo >>/etc/csh.login - echo "test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile" \ - >>/etc/csh.login - fi -fi - -if [ ! -d "$SPOOL/OUTGOING" ]; then - echo "creating $SPOOL" - mkdir_recursive $SPOOL/OUTGOING - chmod 755 $SPOOL || exit 1 - chmod 1777 $SPOOL/OUTGOING -fi -if [ ! -d `dirname "$INLOG"` ]; then - mkdir_recursive `dirname $INLOG` - chmod 700 `dirname $INLOG` -fi -if [ ! -d `dirname "$OUTLOG"` ]; then - mkdir_recursive `dirname $OUTLOG` - chmod 700 `dirname $OUTLOG` -fi -if [ ! -f "$INLOG" ]; then - echo "# use \"utf7decode $INLOG\" to view this file" > $INLOG - echo >> $INLOG - chmod 600 $INLOG -fi -if [ ! -f "$OUTLOG" ]; then - echo "# use \"utf7decode $OUTLOG\" to view this file" > $OUTLOG - echo >> $OUTLOG - chmod 600 $OUTLOG -fi - -free=`$SERVERDIR/sendfiled -f` -minfree=`awk '/minfree =/{print $3}' $CONFIG` -if [ "$free" -le "$minfree" ]; then - cat </dev/null; then - /etc/init.d/xinetd reload - else - /etc/init.d/xinetd stop - /etc/init.d/xinetd start - fi - else - echo - echo "please restart now your inetd ( or simply reboot :-) )" - echo - fi -fi @ 1.5 log @DESTDIR support. @ text @d3 1 a3 1 --- develop/install.orig 1999-12-07 10:40:11.000000000 +0100 d5 1 a5 1 @@@@ -58,12 +58,12 @@@@ mkdir_recursive() { d18 2 a19 2 + mkdir_recursive $D`dirname $DENY` + mkdir_recursive $D`dirname $CONFIG` d24 1 a24 1 @@@@ -71,7 +71,7 @@@@ make_man() { d33 1 a33 1 @@@@ -81,8 +81,8 @@@@ install_man() { d44 1 a44 1 @@@@ -93,18 +93,11 @@@@ if [ "$SYSTEM" = "" ]; then d64 1 a64 1 @@@@ -113,6 +106,8 @@@@ eval `awk -F\" '/define BINDIR/ {prin d73 3 a75 3 @@@@ -126,53 +121,29 @@@@ if [ "$OUTLOG" = "" ]; then OUTLOG=$SPOO if [ "$INETDCONF" = "" ]; then INETDCONF=/etc/inetd.conf; fi if [ "$SERVICES" = "" ]; then SERVICES=/etc/services; fi d77 2 a78 2 +CONFIG=$EGDIR/sendfile.cf +DENY=$EGDIR/sendfile.deny d81 3 a83 2 *BSD*) manmisc=7; manadmin=8;; *) manmisc=5; manadmin=1m;; d87 1 a87 1 -(cd $SPOOL && rm -f */.sendfile*.log) d93 1 a93 1 - cp sendfile sendmsg receive utf7encode fetchfile wlock ewl $BINDIR/ d96 2 a97 2 + cp sendfile sendmsg receive utf7encode fetchfile wlock ewl $D$BINDIR/ + [ -x $D$SERVERDIR/sendfiled ] && mv $D$SERVERDIR/sendfiled $D$SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old d132 1 a132 1 d135 2 a136 1 @@@@ -183,7 +154,7 @@@@ echo "installing the clients in $BINDIR" d145 1 a145 1 @@@@ -193,13 +164,13 @@@@ sed "s:SPOOL=/var/spool/sendfile:SPOOL=$ d156 2 a157 2 -cp sendfile sendmsg receive utf7encode fetchfile wlock ewl $BINDIR/ +cp sendfile sendmsg receive utf7encode fetchfile wlock ewl $D$BINDIR/ d164 3 a166 3 @@@@ -220,8 +191,8 @@@@ if [ "$SENDFILED" != "$SERVERDIR/sendfil echo " there is $SERVERDIR/sendfiled in makeconfig! Check it!" fi d173 2 a174 1 NOSENDFILE=`dirname $DENY 2>/dev/null`/nosendfile d176 10 a185 2 @@@@ -233,16 +204,16 @@@@ if [ -f $NOSENDFILE ]; then mv $NOSENDFILE $DENY d189 1 a189 2 +if [ ! -f $D$DENY -a ! -f $D$ALLOW ]; then echo "installing the sendfile deny file as $DENY" d192 4 a195 2 + cp etc/sendfile.deny $D$DENY + chmod 644 $D$DENY d199 1 a199 2 +if [ ! -f $D$CONFIG ]; then echo "installing the global sendfile config file as $CONFIG" d202 4 a205 2 + cp etc/sendfile.cf $D$CONFIG + chmod 644 $D$CONFIG d207 5 a211 3 if [ "`diff etc/sendfile.cf $CONFIG`" ]; then echo "Warning: `pwd`/etc/sendfile.cf differs from $CONFIG !" @@@@ -250,100 +221,6 @@@@ else d236 34 a269 11 -if [ "$SENDFILED" = "" ]; then - if [ -f /usr/sbin/tcpd ]; then - SFD="/usr/sbin/tcpd $SERVERDIR/sendfiled" - else - SFD="$SERVERDIR/sendfiled sendfiled" - fi - RESTART=true - echo "configuring $INETDCONF" - echo "#" >>$INETDCONF - echo "# simple asynchronous file transfer" >>$INETDCONF - echo "saft stream tcp nowait root $SFD" >>$INETDCONF d332 1 d336 19 @ 1.4 log @DESTDIR support @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2003/05/01 15:44:44 jmmv Exp $ d5 52 a56 1 @@@@ -105,6 +105,7 @@@@ eval `awk -F\" '/define BINDIR/ {prin d64 1 a64 1 @@@@ -113,6 +114,11 @@@@ eval `awk -F\" '/define BINDIR/ {prin d68 1 a68 4 +BINDIR=$DESTDIR$BINDIR +MANDIR=$DESTDIR$MANDIR +SERVERDIR=$DESTDIR$SERVERDIR +EGDIR=$DESTDIR$EGDIR d73 1 a73 1 @@@@ -126,6 +132,9 @@@@ if [ "$OUTLOG" = "" ]; then OUTLOG=$SPOO d83 1 a83 2 @@@@ -165,14 +174,6 @@@@ In /etc/profile and /etc/csh.login a cal To deinstall the sendfile-daemon, simply type: rm -f $SERVERDIR/sendfiled d85 38 a122 1 EOD d134 163 @ 1.3 log @Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2001/02/26 11:34:55 wiz Exp $ d13 13 a25 1 @@@@ -126,6 +127,9 @@@@ if [ "$OUTLOG" = "" ]; then OUTLOG=$SPOO d35 1 a35 1 @@@@ -165,14 +169,6 @@@@ In /etc/profile and /etc/csh.login a cal @ 1.2 log @Upgrade to 2.1a (pkgsrc 2.1.0.1): Fixes a security problem. Closes pkg/12097. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- develop/install.orig Tue Dec 7 10:40:11 1999 d5 19 a23 1 @@@@ -165,14 +165,6 @@@@ @ 1.1 log @No longer IS_INTERACTIVE. (Addresses pkg/9801.) Move contents of post-patch script to Makefile. Add DEINSTALL that mentions all the changes the install step does. @ text @d3 1 a3 1 --- develop/install.orig Thu Jan 28 22:45:40 1999 a19 9 @@@@ -304,7 +296,7 @@@@ echo "adding check_sendfile to /etc/csh.login" echo >>/etc/csh.login echo "test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile" \ - >>/etc/profile + >>/etc/csh.login fi fi @