From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 636D01384B4 for ; Tue, 3 Nov 2015 15:08:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50397E0893; Tue, 3 Nov 2015 15:08:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 777BEE088B for ; Tue, 3 Nov 2015 15:08:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5E08340712 for ; Tue, 3 Nov 2015 15:08:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 968911FA6 for ; Tue, 3 Nov 2015 15:08:21 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1446563287.426002bfe2789fb6213fba832c8bfee634d68d02.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/xinetd/, sys-apps/xinetd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/xinetd/files/xinetd-2.3.15-creds.patch sys-apps/xinetd/xinetd-2.3.15-r2.ebuild X-VCS-Directories: sys-apps/xinetd/ sys-apps/xinetd/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 426002bfe2789fb6213fba832c8bfee634d68d02 X-VCS-Branch: master Date: Tue, 3 Nov 2015 15:08:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cb6da1b1-0409-4787-b000-fcd911d0dfd6 X-Archives-Hash: 6c72654e72f9c2ec9a3613d67e4ca41a commit: 426002bfe2789fb6213fba832c8bfee634d68d02 Author: Mike Frysinger gentoo org> AuthorDate: Tue Nov 3 15:02:36 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Nov 3 15:08:07 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426002bf sys-apps/xinetd: add fix from Fedora for CVE-2013-4342 #488158 sys-apps/xinetd/files/xinetd-2.3.15-creds.patch | 17 ++++++++ sys-apps/xinetd/xinetd-2.3.15-r2.ebuild | 55 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch new file mode 100644 index 0000000..39df3ca --- /dev/null +++ b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/488158 + +taken from Fedora + +Patch by Thomas Swan + +--- a/xinetd/builtins.c ++++ b/xinetd/builtins.c +@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) + if( SC_IS_INTERNAL( scp ) ) { + SC_INTERNAL(scp, nserp); + } else { +- exec_server(nserp); ++ child_process(nserp); + } + } + diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild new file mode 100644 index 0000000..edd9a74 --- /dev/null +++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic systemd toolchain-funcs + +DESCRIPTION="powerful replacement for inetd" +HOMEPAGE="http://www.xinetd.org/" +SRC_URI="http://www.xinetd.org/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="perl rpc tcpd" + +DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) + rpc? ( net-libs/libtirpc:= )" +RDEPEND="${DEPEND} + perl? ( dev-lang/perl )" +DEPEND="${DEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch + epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch + epatch "${FILESDIR}"/${PN}-2.3.14-config.patch + epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158 + find -name Makefile.in -exec sed -i 's:\:$(AR):' {} + +} + +src_configure() { + if ! use rpc ; then + append-cppflags -DNO_RPC + export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no + fi + tc-export AR PKG_CONFIG + LIBS=$(${PKG_CONFIG} --libs libtirpc) \ + econf \ + $(use_with tcpd libwrap) \ + --with-loadavg +} + +src_install() { + emake DESTDIR="${ED}" install install-contrib + use perl || rm -f "${ED}"/usr/sbin/xconv.pl + + newinitd "${FILESDIR}"/xinetd.rc6 xinetd + newconfd "${FILESDIR}"/xinetd.confd xinetd + systemd_dounit "${FILESDIR}/${PN}.service" + + newdoc contrib/xinetd.conf xinetd.conf.dist.sample + dodoc AUDIT INSTALL README TODO CHANGELOG +}