Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Oct 2013 12:54:10 +0000 (UTC)
From:      Sergey Matveychuk <sem@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329174 - in head/security/xinetd: . files
Message-ID:  <201310031254.r93CsAhP062735@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sem
Date: Thu Oct  3 12:54:10 2013
New Revision: 329174
URL: http://svnweb.freebsd.org/changeset/ports/329174

Log:
  - Fix CVE-2013-4342: xinetd ignores user and group directives for TCPMUX services
  - Rename old-style named file
  
  Submitted by:	Thomas Swan <thomas.swan@gmail.com>

Added:
  head/security/xinetd/files/patch-Makefile.in
     - copied unchanged from r329162, head/security/xinetd/files/patch-ab
  head/security/xinetd/files/patch-xinetd::builtins.c   (contents, props changed)
Deleted:
  head/security/xinetd/files/patch-ab
Modified:
  head/security/xinetd/Makefile

Modified: head/security/xinetd/Makefile
==============================================================================
--- head/security/xinetd/Makefile	Thu Oct  3 12:52:08 2013	(r329173)
+++ head/security/xinetd/Makefile	Thu Oct  3 12:54:10 2013	(r329174)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xinetd
 PORTVERSION=	2.3.15
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.xinetd.org/
 

Copied: head/security/xinetd/files/patch-Makefile.in (from r329162, head/security/xinetd/files/patch-ab)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xinetd/files/patch-Makefile.in	Thu Oct  3 12:54:10 2013	(r329174, copy of r329162, head/security/xinetd/files/patch-ab)
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Wed Jul 31 19:03:43 2002
++++ Makefile.in	Mon Aug 19 11:49:58 2002
+@@ -76,16 +76,14 @@
+ 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
+ 	   test -d $$i || mkdir -p $$i ; done
+ 	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
+-	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
+-	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
++	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(prefix)/bin/xconv
+ 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
+ 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
+ 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
+-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
++	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.8
+ 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
+ 	@echo "There is a sample config file in xinetd/sample.conf and you can"
+-	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
++	@echo "use xconv to convert your old inetd.conf file to an xinetd format"
+ 
+ uninstall:
+ 	rm -f $(DAEMONDIR)/xinetd

Added: head/security/xinetd/files/patch-xinetd::builtins.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xinetd/files/patch-xinetd::builtins.c	Thu Oct  3 12:54:10 2013	(r329174)
@@ -0,0 +1,11 @@
+--- xinetd/builtins.c.orig	2013-10-03 16:04:32.562080623 +0400
++++ xinetd/builtins.c	2013-10-03 16:04:57.297350342 +0400
+@@ -617,7 +617,7 @@
+    if( SC_IS_INTERNAL( scp ) ) {
+       SC_INTERNAL(scp, nserp);
+    } else {
+-      exec_server(nserp);
++      child_process(nserp);
+    }
+ }
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310031254.r93CsAhP062735>