[arch-commits] Commit in xinetd/repos (28 files)

Antonio Rojas arojas at archlinux.org
Sat Apr 1 08:20:40 UTC 2017


    Date: Saturday, April 1, 2017 @ 08:20:39
  Author: arojas
Revision: 291969

archrelease: copy trunk to core-i686, core-x86_64

Added:
  xinetd/repos/core-i686/PKGBUILD
    (from rev 291968, xinetd/trunk/PKGBUILD)
  xinetd/repos/core-i686/fix-CVE-2013-4342.patch
    (from rev 291968, xinetd/trunk/fix-CVE-2013-4342.patch)
  xinetd/repos/core-i686/servers
    (from rev 291968, xinetd/trunk/servers)
  xinetd/repos/core-i686/services
    (from rev 291968, xinetd/trunk/services)
  xinetd/repos/core-i686/xinetd
    (from rev 291968, xinetd/trunk/xinetd)
  xinetd/repos/core-i686/xinetd.conf
    (from rev 291968, xinetd/trunk/xinetd.conf)
  xinetd/repos/core-i686/xinetd.service
    (from rev 291968, xinetd/trunk/xinetd.service)
  xinetd/repos/core-x86_64/PKGBUILD
    (from rev 291968, xinetd/trunk/PKGBUILD)
  xinetd/repos/core-x86_64/fix-CVE-2013-4342.patch
    (from rev 291968, xinetd/trunk/fix-CVE-2013-4342.patch)
  xinetd/repos/core-x86_64/servers
    (from rev 291968, xinetd/trunk/servers)
  xinetd/repos/core-x86_64/services
    (from rev 291968, xinetd/trunk/services)
  xinetd/repos/core-x86_64/xinetd
    (from rev 291968, xinetd/trunk/xinetd)
  xinetd/repos/core-x86_64/xinetd.conf
    (from rev 291968, xinetd/trunk/xinetd.conf)
  xinetd/repos/core-x86_64/xinetd.service
    (from rev 291968, xinetd/trunk/xinetd.service)
Deleted:
  xinetd/repos/core-i686/PKGBUILD
  xinetd/repos/core-i686/fix-CVE-2013-4342.patch
  xinetd/repos/core-i686/servers
  xinetd/repos/core-i686/services
  xinetd/repos/core-i686/xinetd
  xinetd/repos/core-i686/xinetd.conf
  xinetd/repos/core-i686/xinetd.service
  xinetd/repos/core-x86_64/PKGBUILD
  xinetd/repos/core-x86_64/fix-CVE-2013-4342.patch
  xinetd/repos/core-x86_64/servers
  xinetd/repos/core-x86_64/services
  xinetd/repos/core-x86_64/xinetd
  xinetd/repos/core-x86_64/xinetd.conf
  xinetd/repos/core-x86_64/xinetd.service

-------------------------------------+
 /PKGBUILD                           |  106 ++++++++++++++++++++++++++++++++++
 /fix-CVE-2013-4342.patch            |   26 ++++++++
 /servers                            |   20 ++++++
 /services                           |   20 ++++++
 /xinetd                             |   76 ++++++++++++++++++++++++
 /xinetd.conf                        |   28 ++++++++
 /xinetd.service                     |   20 ++++++
 core-i686/PKGBUILD                  |   53 -----------------
 core-i686/fix-CVE-2013-4342.patch   |   13 ----
 core-i686/servers                   |   10 ---
 core-i686/services                  |   10 ---
 core-i686/xinetd                    |   38 ------------
 core-i686/xinetd.conf               |   14 ----
 core-i686/xinetd.service            |   10 ---
 core-x86_64/PKGBUILD                |   53 -----------------
 core-x86_64/fix-CVE-2013-4342.patch |   13 ----
 core-x86_64/servers                 |   10 ---
 core-x86_64/services                |   10 ---
 core-x86_64/xinetd                  |   38 ------------
 core-x86_64/xinetd.conf             |   14 ----
 core-x86_64/xinetd.service          |   10 ---
 21 files changed, 296 insertions(+), 296 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/PKGBUILD	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,53 +0,0 @@
-# $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/core-i686/PKGBUILD (from rev 291968, xinetd/trunk/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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=("https://sources.archlinux.org/other/packages/$pkgname/$pkgname-$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
+}

Deleted: core-i686/fix-CVE-2013-4342.patch
===================================================================
--- core-i686/fix-CVE-2013-4342.patch	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/fix-CVE-2013-4342.patch	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,13 +0,0 @@
-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/core-i686/fix-CVE-2013-4342.patch (from rev 291968, xinetd/trunk/fix-CVE-2013-4342.patch)
===================================================================
--- core-i686/fix-CVE-2013-4342.patch	                        (rev 0)
+++ core-i686/fix-CVE-2013-4342.patch	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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);
+    }
+ }
+ 

Deleted: core-i686/servers
===================================================================
--- core-i686/servers	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/servers	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-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/core-i686/servers (from rev 291968, xinetd/trunk/servers)
===================================================================
--- core-i686/servers	                        (rev 0)
+++ core-i686/servers	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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
+}

Deleted: core-i686/services
===================================================================
--- core-i686/services	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/services	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-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/core-i686/services (from rev 291968, xinetd/trunk/services)
===================================================================
--- core-i686/services	                        (rev 0)
+++ core-i686/services	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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
+}

Deleted: core-i686/xinetd
===================================================================
--- core-i686/xinetd	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/xinetd	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,38 +0,0 @@
-#!/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/core-i686/xinetd (from rev 291968, xinetd/trunk/xinetd)
===================================================================
--- core-i686/xinetd	                        (rev 0)
+++ core-i686/xinetd	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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

Deleted: core-i686/xinetd.conf
===================================================================
--- core-i686/xinetd.conf	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/xinetd.conf	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,14 +0,0 @@
-#
-# /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/core-i686/xinetd.conf (from rev 291968, xinetd/trunk/xinetd.conf)
===================================================================
--- core-i686/xinetd.conf	                        (rev 0)
+++ core-i686/xinetd.conf	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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

Deleted: core-i686/xinetd.service
===================================================================
--- core-i686/xinetd.service	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-i686/xinetd.service	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-[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/core-i686/xinetd.service (from rev 291968, xinetd/trunk/xinetd.service)
===================================================================
--- core-i686/xinetd.service	                        (rev 0)
+++ core-i686/xinetd.service	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/PKGBUILD	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,53 +0,0 @@
-# $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/core-x86_64/PKGBUILD (from rev 291968, xinetd/trunk/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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=("https://sources.archlinux.org/other/packages/$pkgname/$pkgname-$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
+}

Deleted: core-x86_64/fix-CVE-2013-4342.patch
===================================================================
--- core-x86_64/fix-CVE-2013-4342.patch	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/fix-CVE-2013-4342.patch	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,13 +0,0 @@
-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/core-x86_64/fix-CVE-2013-4342.patch (from rev 291968, xinetd/trunk/fix-CVE-2013-4342.patch)
===================================================================
--- core-x86_64/fix-CVE-2013-4342.patch	                        (rev 0)
+++ core-x86_64/fix-CVE-2013-4342.patch	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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);
+    }
+ }
+ 

Deleted: core-x86_64/servers
===================================================================
--- core-x86_64/servers	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/servers	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-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/core-x86_64/servers (from rev 291968, xinetd/trunk/servers)
===================================================================
--- core-x86_64/servers	                        (rev 0)
+++ core-x86_64/servers	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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
+}

Deleted: core-x86_64/services
===================================================================
--- core-x86_64/services	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/services	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-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/core-x86_64/services (from rev 291968, xinetd/trunk/services)
===================================================================
--- core-x86_64/services	                        (rev 0)
+++ core-x86_64/services	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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
+}

Deleted: core-x86_64/xinetd
===================================================================
--- core-x86_64/xinetd	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/xinetd	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,38 +0,0 @@
-#!/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/core-x86_64/xinetd (from rev 291968, xinetd/trunk/xinetd)
===================================================================
--- core-x86_64/xinetd	                        (rev 0)
+++ core-x86_64/xinetd	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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

Deleted: core-x86_64/xinetd.conf
===================================================================
--- core-x86_64/xinetd.conf	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/xinetd.conf	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,14 +0,0 @@
-#
-# /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/core-x86_64/xinetd.conf (from rev 291968, xinetd/trunk/xinetd.conf)
===================================================================
--- core-x86_64/xinetd.conf	                        (rev 0)
+++ core-x86_64/xinetd.conf	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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

Deleted: core-x86_64/xinetd.service
===================================================================
--- core-x86_64/xinetd.service	2017-04-01 08:20:18 UTC (rev 291968)
+++ core-x86_64/xinetd.service	2017-04-01 08:20:39 UTC (rev 291969)
@@ -1,10 +0,0 @@
-[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/core-x86_64/xinetd.service (from rev 291968, xinetd/trunk/xinetd.service)
===================================================================
--- core-x86_64/xinetd.service	                        (rev 0)
+++ core-x86_64/xinetd.service	2017-04-01 08:20:39 UTC (rev 291969)
@@ -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