Description: Rename internal timelimit(1). There exists an independent and actively maintained service timelimit(1), which is an enhanced replacement for the program produced by this source. The in-house executable is therefore renamed `timelimit.netpipes`. . An old left-over, referencing `ssl-auth` in the manual page, is also removed from the page netpipes(1). The executable was never built by the Debian package. Author: Mats Erik Andersson Forwarded: not-needed Last-Update: 2011-04-10 diff -Nru netpipes-4.2.debian/Makefile netpipes-4.2/Makefile --- netpipes-4.2.debian/Makefile 2011-04-08 17:30:47.000000000 +0200 +++ netpipes-4.2/Makefile 2011-04-10 12:29:08.000000000 +0200 @@ -98,15 +98,19 @@ EOBJS = encapsulate.o common.o version.o memmove.o SSLOBJS = ssl-auth.o ssl-criteria.o common.o version.o memmove.o +# Avoid conflict with an independent service `timelimit`. +TIMELIMIT = timelimit.netpipes + SSLDIR = /usr/local/ssl SSLINC = -I${SSLDIR}/include #SSLLIB = -L${SSLDIR}/lib -lssl -lcrypto SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto MANPAGES = netpipes.1 faucet.1 hose.1 \ - sockdown.1 getpeername.1 timelimit.1 encapsulate.1 + sockdown.1 getpeername.1 encapsulate.1 +# timelimit.1 # ssl-auth.1 -PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate +PROGRAMS = faucet hose sockdown getpeername ${TIMELIMIT} encapsulate all : ${PROGRAMS} @@ -122,7 +126,7 @@ getpeername: ${GOBJS} ${CC} ${CFLAGS} -o $@ ${GOBJS} ${LDLIBS} -timelimit: ${TOBJS} +${TIMELIMIT}: ${TOBJS} ${CC} ${CFLAGS} -o $@ ${TOBJS} ${LDLIBS} encapsulate: ${EOBJS} @@ -146,6 +150,7 @@ #- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/ mkdir -p ${INSTMAN}/man1 cp ${MANPAGES} ${INSTMAN}/man1/ + cp timelimit.1 ${INSTMAN}/man1/${TIMELIMIT}.1 mv -f ${INSTMAN}/man1/getpeername.1 ${INSTMAN}/man1/getsockname.1 #ln -s getpeername.1 ${INSTMAN}/man1/getsockname.1 diff -Nru netpipes-4.2.debian/netpipes.1 netpipes-4.2/netpipes.1 --- netpipes-4.2.debian/netpipes.1 1998-10-28 21:30:31.000000000 +0100 +++ netpipes-4.2/netpipes.1 2011-04-10 12:35:27.000000000 +0200 @@ -64,17 +64,17 @@ \fB\-\fP[\fB#\fP\fIn\fP][\fBv\fP][\fBs\fP[\fBi\fP\fIn\fP][\fBo\fP\fIn\fP][\fBd\fP\fIn\fP][\fBio\fP\fIn\fP][\fBoi\fP\fIn\fP][\fBl\fP][\fBr\fP][\fBL\fP][\fBR\fP]] \fIcommand args ...\fP -\fBssl\-auth\fP \fB\-\-fd\fP \fIn\fP ( \fB\-\-server\fP | \fB\-\-client\fP ) -[ \fB\-\-cert\fP \fIfile\fP ] -[ \fB\-\-key\fP \fIfile\fP ] -[ \fB\-\-verbose\fP ] -[ \fB\-\-verify\fP \fIn\fP ] -[ \fB\-\-CApath\fP \fIpath/\fP ] -[ \fB\-\-CAfile\fP \fIfile\fP ] -[ \fB\-\-cipher\fP \fIcipher\-list\fP ] -[ \fB\-\-criteria\fP \fIcriteria\-expr\fP ] -[ \fB\-\-subproc\fP [ \fB\-\-infd\fP \fIn\fP ] [ \fB\-\-outfd\fP \fIn\fP ] ] -[ \fB\-\fP[\fB#\fP\fIn\fP][\fBv\fP][\fBs\fP[\fBi\fP\fIn\fP][\fBo\fP\fIn\fP]] ] +.\" \fBssl\-auth\fP \fB\-\-fd\fP \fIn\fP ( \fB\-\-server\fP | \fB\-\-client\fP ) +.\" [ \fB\-\-cert\fP \fIfile\fP ] +.\" [ \fB\-\-key\fP \fIfile\fP ] +.\" [ \fB\-\-verbose\fP ] +.\" [ \fB\-\-verify\fP \fIn\fP ] +.\" [ \fB\-\-CApath\fP \fIpath/\fP ] +.\" [ \fB\-\-CAfile\fP \fIfile\fP ] +.\" [ \fB\-\-cipher\fP \fIcipher\-list\fP ] +.\" [ \fB\-\-criteria\fP \fIcriteria\-expr\fP ] +.\" [ \fB\-\-subproc\fP [ \fB\-\-infd\fP \fIn\fP ] [ \fB\-\-outfd\fP \fIn\fP ] ] +.\" [ \fB\-\fP[\fB#\fP\fIn\fP][\fBv\fP][\fBs\fP[\fBi\fP\fIn\fP][\fBo\fP\fIn\fP]] ] \fBsockdown\fP [\fIfd\fP @@ -90,7 +90,7 @@ [ \fB\-peer\fP ] [ \fIfd\fP ] -\fBtimelimit\fP +\fBtimelimit.netpipes\fP [ \fB\-v\fP ] [ \fB\-nokill\fP ] \fItime\fP @@ -118,12 +118,12 @@ Protocol. It allows you to multiplex several streams across a single TCP session and also transmits remote exit status. -\fBssl\-auth\fP is an encryption filter that encapsulates -stdin/stdout from a subprocess (or its own stdin/stdout) in the Secure -Socket Layer protocol as implemented by the SSLeay library. It -can be used to communicate with encrypted daemons (HTTPS daemons, or -SSL IMAP daemons) and can sometimes be used to jury\-rig secure -versions of such services. +.\" \fBssl\-auth\fP is an encryption filter that encapsulates +.\" stdin/stdout from a subprocess (or its own stdin/stdout) in the Secure +.\" Socket Layer protocol as implemented by the SSLeay library. It +.\" can be used to communicate with encrypted daemons (HTTPS daemons, or +.\" SSL IMAP daemons) and can sometimes be used to jury\-rig secure +.\" versions of such services. \fBsockdown\fP is a simple program designed to shut down part or all of the socket connection. It is primarily useful when the processes @@ -134,9 +134,9 @@ \fBgetpeername\fP prints the address of the remote end and \fBgetsockname\fP prints the address of the local end. -\fBtimelimit\fP limits the amount of foreground wallclock time a -process can consume. After the time limit runs out it either kills -the process or exits and leaves it in the background. +\fBtimelimit.netpipes \fP limits the amount of foreground wallclock time a +process may consume. After the time limit runs out, it either kills +the process, or exits and leaves it in the background. .SH EXAMPLES @@ -234,14 +234,21 @@ encapsulate \-\-fd 3 \-\-client .fi +.SH REMARK +The Debian package maintainer has renamed \fBtimelimit\fR to +the more expressive \fBtimelimit.netpipes\fR, as there exists +a better alternative using the same short name, but which is +actively maintained as an independent software. + .SH SEE ALSO -faucet\ (1), -hose\ (1), -encapsulate\ (1), -sockdown\ (1), -getpeername\ (1), -timelimit\ (1), -ssl\-auth\ (1) +.BR faucet (1), +.BR hose (1), +.BR encapsulate (1), +.BR sockdown (1), +.BR getpeername (1), +.BR timelimit.netpipes (1), +.BR timelimit (1). +.\"ssl\-auth\ (1) .SH BUGS diff -Nru netpipes-4.2.debian/timelimit.1 netpipes-4.2/timelimit.1 --- netpipes-4.2.debian/timelimit.1 1998-10-28 21:30:39.000000000 +0100 +++ netpipes-4.2/timelimit.1 2011-04-10 12:40:02.000000000 +0200 @@ -3,33 +3,35 @@ .TH TIMELIMIT 1 "February 12, 1998" .SH NAME -timelimit \- spawn a subprocess and if the child does not finish -within the time limit either kill it, or exit, leaving the child in -the background. +.\" timelimit \- spawn a subprocess and if the child does not finish +.\" within the time limit either kill it, or exit, leaving the child in +.\" the background. +timelimit.netpipes \- limit execution time of foreground tasks netpipes 4.2 .SH SYNOPSIS -\fBtimelimit\fP +\fBtimelimit.netpipes\fP [ \fB\-v\fP ] [ \fB\-nokill\fP ] \fItime\fP \fIcommand args\fP .SH DESCRIPTION -\fBtimelimit\fP is used to limit the amount of foreground wallclock -time a process consumes. Once the time limit expires \fBtimelimit\fP -will kill the process unless \fB\-nokill\fP is specified. +\fBtimelimit.netpipes\fP is used to limit the amount of foreground wallclock +time a process consumes. Once the time limit expires, \fBtimelimit.netpipes\fP +will kill the process, unless \fB\-nokill\fP had been specified. \fB\-v\fP adds some diagnostic messages. .SH EXAMPLES -.nf timelimit 5m faucet 3000 \-\-out cat time\-sensitive\-info +.nf +remote$ \ timelimit.netpipes 5m faucet 3000 \-\-out cat time\-sensitive\-info .fi .SH SEE ALSO -netpipes (1) +.BR netpipes (1) .SH BUGS