Index: branches/2016Q3/security/xinetd/Makefile =================================================================== --- branches/2016Q3/security/xinetd/Makefile (revision 421440) +++ branches/2016Q3/security/xinetd/Makefile (revision 421441) @@ -1,43 +1,43 @@ # Created by: markm # $FreeBSD$ PORTNAME= xinetd PORTVERSION= 2.3.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security ipv6 MASTER_SITES= GENTOO MAINTAINER= sem@FreeBSD.org COMMENT= Replacement for inetd with better control and logging GNU_CONFIGURE= yes USE_RC_SUBR= xinetd ALL_TARGET= build CONFIGURE_ARGS+= --with-loadavg OPTIONS_SUB= yes USES= cpe shebangfix SHEBANG_FILES= ${WRKSRC}/xinetd/xconv.pl OPTIONS_DEFINE= IPV6 LIBWRAP XCONV OPTIONS_DEFAULT= LIBWRAP XCONV XCONV_DESC= Install xconv utility (requires perl) IPV6_CONFIGURE_WITH= ipv6 LIBWRAP_CONFIGURE_WITH= libwrap XCONV_USES= perl5 XCONV_USE= PERL5=run post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xinetd/xinetd ${STAGEDIR}${PREFIX}/sbin/xinetd ${INSTALL_SCRIPT} ${WRKSRC}/xinetd/xconv.pl ${STAGEDIR}${PREFIX}/bin/xconv ${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.conf.man ${STAGEDIR}${PREFIX}/man/man5/xinetd.conf.5 ${INSTALL_MAN} ${WRKSRC}/xinetd/xconv.pl.8 ${STAGEDIR}${PREFIX}/man/man8/xconv.8 ${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.8 ${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.log.man ${STAGEDIR}${PREFIX}/man/man8/xinetd.log.8 .include Index: branches/2016Q3/security/xinetd/files/patch-xinetd_child.c =================================================================== --- branches/2016Q3/security/xinetd/files/patch-xinetd_child.c (nonexistent) +++ branches/2016Q3/security/xinetd/files/patch-xinetd_child.c (revision 421441) @@ -0,0 +1,24 @@ +--- xinetd/child.c.orig 2016-07-13 19:00:31 UTC ++++ xinetd/child.c +@@ -168,7 +168,8 @@ void exec_server( const struct server *s + } + #endif + +- (void) Sclose( descriptor ) ; ++ if ( descriptor > MAX_PASS_FD ) ++ (void) Sclose( descriptor ) ; + + #ifndef solaris + #if !defined(HAVE_SETSID) +@@ -321,11 +322,6 @@ void child_process( struct server *serp + signals_pending[0] = -1; + signals_pending[1] = -1; + +- Sclose(0); +- Sclose(1); +- Sclose(2); +- +- + #ifdef DEBUG_SERVER + if ( debug.on ) + { Property changes on: branches/2016Q3/security/xinetd/files/patch-xinetd_child.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 421440) +++ branches/2016Q3 (revision 421441) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r421378