summaryrefslogtreecommitdiff
path: root/core/xinetd
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-10-20 01:03:58 -0700
committerroot <root@rshg054.dnsready.net>2013-10-20 01:03:58 -0700
commit3ff90101074484f08d42a36a095206b516d182c0 (patch)
tree84b693f7496302e898778ce13093f78f21fb8884 /core/xinetd
parent2acddcfe190f9a97a7148d263a21df434c67ffcf (diff)
Sun Oct 20 01:03:34 PDT 2013
Diffstat (limited to 'core/xinetd')
-rw-r--r--core/xinetd/PKGBUILD13
-rw-r--r--core/xinetd/fix-CVE-2013-4342.patch13
2 files changed, 22 insertions, 4 deletions
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index cb2526137..53d5b93ec 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $
+# $Id: PKGBUILD 196783 2013-10-19 06:36:43Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=xinetd
pkgver=2.3.15
-pkgrel=3
+pkgrel=4
pkgdesc="A secure replacement for inetd"
arch=('i686' 'x86_64')
url="http://www.xinetd.org/"
@@ -15,16 +15,21 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
xinetd.conf
servers
services
- xinetd.service)
+ xinetd.service
+ fix-CVE-2013-4342.patch)
md5sums=('77358478fd58efa6366accae99b8b04c'
'f109f699a07bc8cfb5791060f5e87f9e'
'21f47b4aa20921cfaddddd9f9a407f81'
'9fa2061dc7dd738c8424251deb86f81e'
- '38be35b6e7146dc59902e243d9063b4c')
+ '38be35b6e7146dc59902e243d9063b4c'
+ 'b14615c73753ceffbcc96d5e08f3c18d')
prepare() {
cd $srcdir/$pkgname-$pkgver
sed -i "s#${prefix}/man#${prefix}/share/man#" configure
+ # fix #37310
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1006100#c
+ patch -Np1 -i $srcdir/fix-CVE-2013-4342.patch
}
build() {
diff --git a/core/xinetd/fix-CVE-2013-4342.patch b/core/xinetd/fix-CVE-2013-4342.patch
new file mode 100644
index 000000000..83506c9c3
--- /dev/null
+++ b/core/xinetd/fix-CVE-2013-4342.patch
@@ -0,0 +1,13 @@
+diff --git a/xinetd/builtins.c b/xinetd/builtins.c
+index e61502f..a414cf3 100644
+--- 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);
+ }
+ }
+