[arch-commits] Commit in xinetd/trunk (PKGBUILD fix-CVE-2013-4342.patch)

[Tobias Powalowski]

    Date: Monday, August 17, 2020 @ 12:48:49
  Author: tpowa
Revision: 394341

upgpkg: xinetd 2.3.15.4-1: fix #60344

Modified:
  xinetd/trunk/PKGBUILD
Deleted:
  xinetd/trunk/fix-CVE-2013-4342.patch

-------------------------+
 PKGBUILD                |   34 ++++++++++++----------------------
 fix-CVE-2013-4342.patch |   13 -------------
 2 files changed, 12 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-17 12:12:00 UTC (rev 394340)
+++ PKGBUILD	2020-08-17 12:48:49 UTC (rev 394341)
@@ -2,45 +2,35 @@
 # Contributor: Judd <jvinet at zeroflux.org>
 
 pkgname=xinetd
-pkgver=2.3.15
-pkgrel=6
+pkgver=2.3.15.4
+pkgrel=1
 pkgdesc="A secure replacement for inetd"
 arch=('x86_64')
-url="http://www.xinetd.org/"
+url="https://github.com/openSUSE/xinetd"
 license=('custom')
 depends=('libtirpc')
 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"
+source=("https://github.com/openSUSE/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
         xinetd.conf
         servers
         services
-        xinetd.service
-        fix-CVE-2013-4342.patch)
-md5sums=('77358478fd58efa6366accae99b8b04c'
-         'f109f699a07bc8cfb5791060f5e87f9e'
-         '21f47b4aa20921cfaddddd9f9a407f81'
-         '9fa2061dc7dd738c8424251deb86f81e'
-         '38be35b6e7146dc59902e243d9063b4c'
-         'b14615c73753ceffbcc96d5e08f3c18d')
+        xinetd.service)
+sha256sums=('2baa581010bc70361abdfa37f121e92aeb9c5ce67f9a71913cebd69359cc9654'
+            '389a043503b287a1d096444b7da90c5187388a886687129c125135090bc2c86e'
+            '707a89ec32822f6d146b6ed3d43a38fee909b33d973f6ab7e9742ca8bc9f55f6'
+            '7f709257b08cb19f0a7066d1de6996bfe7c8c510546d11106512a19a76ccf540'
+            'fa9ffd5ecf71e2dbd6e8cf57eb040ff6ea349420707a7f3c7850974774f7a18d')
 
-prepare() {
-  cd $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 $pkgname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --without-libwrap
   CFLAGS+=' -I/usr/include/tirpc' LDFLAGS+=' -ltirpc' make
 }
 
 package() {
   cd $pkgname-$pkgver
-  make prefix="$pkgdir/usr" DAEMONDIR="$pkgdir/usr/bin" install
+  make prefix="$pkgdir/usr" sbindir="$pkgdir/usr/bin" sysconfdir="$pkgdir/etc" install
   
   install -Dm644 "$srcdir"/xinetd.conf "$pkgdir"/etc/xinetd.conf
   install -Dm644 "$srcdir"/servers "$pkgdir"/etc/xinetd.d/servers

Deleted: fix-CVE-2013-4342.patch
===================================================================
--- fix-CVE-2013-4342.patch	2020-08-17 12:12:00 UTC (rev 394340)
+++ fix-CVE-2013-4342.patch	2020-08-17 12:48:49 UTC (rev 394341)
@@ -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);
-    }
- }
-