[arch-commits] Commit in xinetd/repos (16 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Mon Oct 14 08:00:14 UTC 2013
Date: Monday, October 14, 2013 @ 10:00:14
Author: tpowa
Revision: 196476
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xinetd/repos/testing-i686/
xinetd/repos/testing-i686/PKGBUILD
(from rev 196475, xinetd/trunk/PKGBUILD)
xinetd/repos/testing-i686/fix-CVE-2013-4342.patch
(from rev 196475, xinetd/trunk/fix-CVE-2013-4342.patch)
xinetd/repos/testing-i686/servers
(from rev 196475, xinetd/trunk/servers)
xinetd/repos/testing-i686/services
(from rev 196475, xinetd/trunk/services)
xinetd/repos/testing-i686/xinetd
(from rev 196475, xinetd/trunk/xinetd)
xinetd/repos/testing-i686/xinetd.conf
(from rev 196475, xinetd/trunk/xinetd.conf)
xinetd/repos/testing-i686/xinetd.service
(from rev 196475, xinetd/trunk/xinetd.service)
xinetd/repos/testing-x86_64/
xinetd/repos/testing-x86_64/PKGBUILD
(from rev 196475, xinetd/trunk/PKGBUILD)
xinetd/repos/testing-x86_64/fix-CVE-2013-4342.patch
(from rev 196475, xinetd/trunk/fix-CVE-2013-4342.patch)
xinetd/repos/testing-x86_64/servers
(from rev 196475, xinetd/trunk/servers)
xinetd/repos/testing-x86_64/services
(from rev 196475, xinetd/trunk/services)
xinetd/repos/testing-x86_64/xinetd
(from rev 196475, xinetd/trunk/xinetd)
xinetd/repos/testing-x86_64/xinetd.conf
(from rev 196475, xinetd/trunk/xinetd.conf)
xinetd/repos/testing-x86_64/xinetd.service
(from rev 196475, xinetd/trunk/xinetd.service)
----------------------------------------+
testing-i686/PKGBUILD | 53 +++++++++++++++++++++++++++++++
testing-i686/fix-CVE-2013-4342.patch | 13 +++++++
testing-i686/servers | 10 +++++
testing-i686/services | 10 +++++
testing-i686/xinetd | 38 ++++++++++++++++++++++
testing-i686/xinetd.conf | 14 ++++++++
testing-i686/xinetd.service | 10 +++++
testing-x86_64/PKGBUILD | 53 +++++++++++++++++++++++++++++++
testing-x86_64/fix-CVE-2013-4342.patch | 13 +++++++
testing-x86_64/servers | 10 +++++
testing-x86_64/services | 10 +++++
testing-x86_64/xinetd | 38 ++++++++++++++++++++++
testing-x86_64/xinetd.conf | 14 ++++++++
testing-x86_64/xinetd.service | 10 +++++
14 files changed, 296 insertions(+)
Copied: xinetd/repos/testing-i686/PKGBUILD (from rev 196475, xinetd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Judd <jvinet at zeroflux.org>
+
+pkgname=xinetd
+pkgver=2.3.15
+pkgrel=4
+pkgdesc="A secure replacement for inetd"
+arch=('i686' 'x86_64')
+url="http://www.xinetd.org/"
+license=('custom')
+optdepends=('perl: for xconv.pl script')
+backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
+source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
+ xinetd.conf
+ servers
+ services
+ xinetd.service
+ fix-CVE-2013-4342.patch)
+md5sums=('77358478fd58efa6366accae99b8b04c'
+ 'f109f699a07bc8cfb5791060f5e87f9e'
+ '21f47b4aa20921cfaddddd9f9a407f81'
+ '9fa2061dc7dd738c8424251deb86f81e'
+ '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() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install
+
+ install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
+ install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
+ install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
+
+ # install systemd files
+ install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
+ # install license
+ install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+}
Copied: xinetd/repos/testing-i686/fix-CVE-2013-4342.patch (from rev 196475, xinetd/trunk/fix-CVE-2013-4342.patch)
===================================================================
--- testing-i686/fix-CVE-2013-4342.patch (rev 0)
+++ testing-i686/fix-CVE-2013-4342.patch 2013-10-14 08:00:14 UTC (rev 196476)
@@ -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);
+ }
+ }
+
Copied: xinetd/repos/testing-i686/servers (from rev 196475, xinetd/trunk/servers)
===================================================================
--- testing-i686/servers (rev 0)
+++ testing-i686/servers 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+service servers
+{
+ type = INTERNAL UNLISTED
+ port = 9099
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ disable = yes
+ only_from = 127.0.0.1
+}
Copied: xinetd/repos/testing-i686/services (from rev 196475, xinetd/trunk/services)
===================================================================
--- testing-i686/services (rev 0)
+++ testing-i686/services 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+service services
+{
+ type = INTERNAL UNLISTED
+ port = 9098
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ disable = yes
+ only_from = 127.0.0.1
+}
Copied: xinetd/repos/testing-i686/xinetd (from rev 196475, xinetd/trunk/xinetd)
===================================================================
--- testing-i686/xinetd (rev 0)
+++ testing-i686/xinetd 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/xinetd`
+case "$1" in
+ start)
+ stat_busy "Starting xinetd"
+ [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ echo $PID > /var/run/xinetd.pid
+ add_daemon xinetd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping xinetd"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm -f /var/run/xinetd.pid
+ rm_daemon xinetd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: xinetd/repos/testing-i686/xinetd.conf (from rev 196475, xinetd/trunk/xinetd.conf)
===================================================================
--- testing-i686/xinetd.conf (rev 0)
+++ testing-i686/xinetd.conf 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,14 @@
+#
+# /etc/xinetd.conf
+#
+
+defaults
+{
+ instances = 60
+ log_type = SYSLOG authpriv
+ log_on_success = HOST PID
+ log_on_failure = HOST
+ cps = 25 30
+}
+
+includedir /etc/xinetd.d
Copied: xinetd/repos/testing-i686/xinetd.service (from rev 196475, xinetd/trunk/xinetd.service)
===================================================================
--- testing-i686/xinetd.service (rev 0)
+++ testing-i686/xinetd.service 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+[Unit]
+Description=A secure replacement for inetd
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/xinetd -dontfork
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
Copied: xinetd/repos/testing-x86_64/PKGBUILD (from rev 196475, xinetd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Judd <jvinet at zeroflux.org>
+
+pkgname=xinetd
+pkgver=2.3.15
+pkgrel=4
+pkgdesc="A secure replacement for inetd"
+arch=('i686' 'x86_64')
+url="http://www.xinetd.org/"
+license=('custom')
+optdepends=('perl: for xconv.pl script')
+backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
+source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
+ xinetd.conf
+ servers
+ services
+ xinetd.service
+ fix-CVE-2013-4342.patch)
+md5sums=('77358478fd58efa6366accae99b8b04c'
+ 'f109f699a07bc8cfb5791060f5e87f9e'
+ '21f47b4aa20921cfaddddd9f9a407f81'
+ '9fa2061dc7dd738c8424251deb86f81e'
+ '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() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install
+
+ install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
+ install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
+ install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
+
+ # install systemd files
+ install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
+ # install license
+ install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+}
Copied: xinetd/repos/testing-x86_64/fix-CVE-2013-4342.patch (from rev 196475, xinetd/trunk/fix-CVE-2013-4342.patch)
===================================================================
--- testing-x86_64/fix-CVE-2013-4342.patch (rev 0)
+++ testing-x86_64/fix-CVE-2013-4342.patch 2013-10-14 08:00:14 UTC (rev 196476)
@@ -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);
+ }
+ }
+
Copied: xinetd/repos/testing-x86_64/servers (from rev 196475, xinetd/trunk/servers)
===================================================================
--- testing-x86_64/servers (rev 0)
+++ testing-x86_64/servers 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+service servers
+{
+ type = INTERNAL UNLISTED
+ port = 9099
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ disable = yes
+ only_from = 127.0.0.1
+}
Copied: xinetd/repos/testing-x86_64/services (from rev 196475, xinetd/trunk/services)
===================================================================
--- testing-x86_64/services (rev 0)
+++ testing-x86_64/services 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+service services
+{
+ type = INTERNAL UNLISTED
+ port = 9098
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ disable = yes
+ only_from = 127.0.0.1
+}
Copied: xinetd/repos/testing-x86_64/xinetd (from rev 196475, xinetd/trunk/xinetd)
===================================================================
--- testing-x86_64/xinetd (rev 0)
+++ testing-x86_64/xinetd 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/xinetd`
+case "$1" in
+ start)
+ stat_busy "Starting xinetd"
+ [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ echo $PID > /var/run/xinetd.pid
+ add_daemon xinetd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping xinetd"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm -f /var/run/xinetd.pid
+ rm_daemon xinetd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: xinetd/repos/testing-x86_64/xinetd.conf (from rev 196475, xinetd/trunk/xinetd.conf)
===================================================================
--- testing-x86_64/xinetd.conf (rev 0)
+++ testing-x86_64/xinetd.conf 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,14 @@
+#
+# /etc/xinetd.conf
+#
+
+defaults
+{
+ instances = 60
+ log_type = SYSLOG authpriv
+ log_on_success = HOST PID
+ log_on_failure = HOST
+ cps = 25 30
+}
+
+includedir /etc/xinetd.d
Copied: xinetd/repos/testing-x86_64/xinetd.service (from rev 196475, xinetd/trunk/xinetd.service)
===================================================================
--- testing-x86_64/xinetd.service (rev 0)
+++ testing-x86_64/xinetd.service 2013-10-14 08:00:14 UTC (rev 196476)
@@ -0,0 +1,10 @@
+[Unit]
+Description=A secure replacement for inetd
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/xinetd -dontfork
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list