[PR PATCH] libtirpc: update to 1.2.5

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/ndowens/void-packages tirpc
https://github.com/void-linux/void-packages/pull/17782

libtirpc: update to 1.2.5
Also add a -musl-devel subpackage since
musl does not have a native rpc, which
will cause no conflict and have no need
of adding CFLAGS=-I/usr/include/tirpc
when packaging software that depends on it

Signed-off-by: Nathan Owens <ndowens04@gmail.com>

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

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

From e509e90513814a71958ab1d4bef791b0ff5f94e5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 25 Dec 2019 16:12:20 -0600
Subject: [PATCH] libtirpc: update to 1.2.5

Also add a -musl-devel subpackage since
musl does not have a native rpc, which
will cause no conflict and have no need
of adding CFLAGS=-I/usr/include/tirpc
when packaging software that depends on it

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/libtirpc-musl-devel         |  1 +
 srcpkgs/libtirpc/patches/musl.patch | 11 -----------
 srcpkgs/libtirpc/template           | 27 ++++++++++++++++++++++++---
 3 files changed, 25 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/libtirpc-musl-devel
 delete mode 100644 srcpkgs/libtirpc/patches/musl.patch

diff --git a/srcpkgs/libtirpc-musl-devel b/srcpkgs/libtirpc-musl-devel
new file mode 120000
index 00000000000..7c9c0c99b08
--- /dev/null
+++ b/srcpkgs/libtirpc-musl-devel
@@ -0,0 +1 @@
+libtirpc
\ No newline at end of file
diff --git a/srcpkgs/libtirpc/patches/musl.patch b/srcpkgs/libtirpc/patches/musl.patch
deleted file mode 100644
index 5a4fb04f506..00000000000
--- a/srcpkgs/libtirpc/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tirpc/rpc/types.h.orig	2018-03-17 10:23:10.022055255 +0100
-+++ ./tirpc/rpc/types.h	2018-03-17 10:23:30.877751656 +0100
-@@ -66,7 +66,7 @@
- #define mem_free(ptr, bsize)	free(ptr)
- 
- 
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template
index 2145207327b..37e1128db7b 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,17 +1,23 @@
 # Template file for 'libtirpc'
 pkgname=libtirpc
-version=1.1.4
+version=1.2.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config mit-krb5-devel"
 makedepends="mit-krb5-devel libgssglue-devel"
 conf_files="/etc/netconfig /etc/bindresvport.blacklist"
 short_desc="Transport Independent RPC library (SunRPC replacement)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://libtirpc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d
+checksum=f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca
+subpackages="libtirpc-devel"
+
+case "$XBPS_TARGET_LIBC" in
+	musl)
+		subpackages="libtirpc-musl-devel";;
+esac
 
 post_install() {
 	vconf ${wrksrc}/doc/netconfig
@@ -29,3 +35,18 @@ libtirpc-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
+
+# Musl does not have rpc included, so we can install
+# in usr/include/rpc
+libtirpc-musl-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	archs="*-musl"
+	pkg_install() {
+		vmove usr/include/tirpc
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+	}
+}