[PR PATCH] xinetd: use libtirpc

[PR PATCH] xinetd: use libtirpc

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages xinetd
https://github.com/void-linux/void-packages/pull/27928

xinetd: use libtirpc


A patch file from https://github.com/void-linux/void-packages/pull/27928.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinetd-27928.patch --]
[-- Type: text/x-diff, Size: 1334 bytes --]

From 69e043fb0cfd6cd25e71d3a1ebf6aaccfb845aba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 14 Jan 2021 17:26:04 +0100
Subject: [PATCH] xinetd: use libtirpc

---
 srcpkgs/xinetd/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
index 9d71592b6e7..1bba8af8fd1 100644
--- a/srcpkgs/xinetd/template
+++ b/srcpkgs/xinetd/template
@@ -1,9 +1,10 @@
 # Template file for 'xinetd'
 pkgname=xinetd
 version=2.3.15
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--without-libwrap"
+makedepends="libtirpc-devel"
 short_desc="A secure replacement for inetd"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="xinetd"
@@ -13,11 +14,13 @@ checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 
 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) export CFLAGS+=" -DNO_RPC"; configure_args+=" xinetd_cv_type_rlim_t=yes";;
-	esac
-}
+CFLAGS=" -I/usr/include/tirpc"
+LDFLAGS=" -ltirpc"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" xinetd_cv_type_rlim_t=yes"
+fi
+
 do_install() {
 	make prefix=${DESTDIR}/usr DAEMONDIR=${DESTDIR}/usr/bin MANDIR=${DESTDIR}/usr/share/man install
 

Re: [PR REVIEW] xinetd: use libtirpc

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27928#discussion_r557551499

Comment:
```suggestion
CFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/tirpc"
```

For consistency?

Re: [PR REVIEW] xinetd: use libtirpc

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27928#discussion_r557552629

Comment:
And for not breaking cross, yeah xD

Re: [PR PATCH] [Updated] xinetd: use libtirpc

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages xinetd
https://github.com/void-linux/void-packages/pull/27928

xinetd: use libtirpc


A patch file from https://github.com/void-linux/void-packages/pull/27928.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinetd-27928.patch --]
[-- Type: text/x-diff, Size: 1352 bytes --]

From f55e30e14a228d42286dbb84f492c93cf04f46d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 14 Jan 2021 17:26:04 +0100
Subject: [PATCH] xinetd: use libtirpc

---
 srcpkgs/xinetd/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
index 9d71592b6e7..dbdd441c063 100644
--- a/srcpkgs/xinetd/template
+++ b/srcpkgs/xinetd/template
@@ -1,9 +1,10 @@
 # Template file for 'xinetd'
 pkgname=xinetd
 version=2.3.15
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--without-libwrap"
+makedepends="libtirpc-devel"
 short_desc="A secure replacement for inetd"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="xinetd"
@@ -13,11 +14,13 @@ checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 
 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) export CFLAGS+=" -DNO_RPC"; configure_args+=" xinetd_cv_type_rlim_t=yes";;
-	esac
-}
+CFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/tirpc"
+LDFLAGS=" -ltirpc"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" xinetd_cv_type_rlim_t=yes"
+fi
+
 do_install() {
 	make prefix=${DESTDIR}/usr DAEMONDIR=${DESTDIR}/usr/bin MANDIR=${DESTDIR}/usr/share/man install
 

Re: [PR PATCH] [Merged]: xinetd: use libtirpc

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

There's a merged pull request on the void-packages repository

xinetd: use libtirpc
https://github.com/void-linux/void-packages/pull/27928

Description: