* [PR PATCH] libtirpc: update to 1.2.5
@ 2019-12-25 23:15 voidlinux-github
2019-12-25 23:18 ` [PR PATCH] [Updated] " voidlinux-github
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: voidlinux-github @ 2019-12-25 23:15 UTC (permalink / raw)
To: ml
[-- 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
+ }
+}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] libtirpc: update to 1.2.5
2019-12-25 23:15 [PR PATCH] libtirpc: update to 1.2.5 voidlinux-github
@ 2019-12-25 23:18 ` voidlinux-github
2019-12-25 23:47 ` voidlinux-github
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2019-12-25 23:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
There is an updated 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. Also doing this will
make packaging easier instead
of adding CFLAGS=-I/usr/include/tirpc
when packaging software for musl 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: 3330 bytes --]
From b169807dcfd07542863a6ab55fbec581fda82961 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. Also doing this will
make packaging easier instead
of adding CFLAGS=-I/usr/include/tirpc
when packaging software for musl 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 | 32 ++++++++++++++++++++++++++---
3 files changed, 30 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..d656c724ff7 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,21 +1,34 @@
# 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
vlicense COPYING
+
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ # Create copy for musl-devel package
+ cp -R ${DESTDIR}/usr/include/tirpc/* ${DESTDIR}/usr/include/
+ rm -r ${DESTDIR}/usr/include/tirpc ;;
+esac
}
libtirpc-devel_package() {
@@ -29,3 +42,16 @@ libtirpc-devel_package() {
vmove usr/lib/*.so
}
}
+
+libtirpc-musl-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ archs="*-musl"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/man/man3
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ }
+}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] libtirpc: update to 1.2.5
2019-12-25 23:15 [PR PATCH] libtirpc: update to 1.2.5 voidlinux-github
2019-12-25 23:18 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-25 23:47 ` voidlinux-github
2019-12-25 23:51 ` voidlinux-github
2019-12-26 8:01 ` [PR PATCH] [Merged]: " voidlinux-github
3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2019-12-25 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
There is an updated 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. Also doing this will
make packaging easier instead
of adding CFLAGS=-I/usr/include/tirpc
when packaging software for musl 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: 3158 bytes --]
From 8c8eff40db40b2de7c8d3a93151160b601e7acdb 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. Also doing this will
make packaging easier instead
of adding CFLAGS=-I/usr/include/tirpc
when packaging software for musl 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 | 26 +++++++++++++++++++++++---
3 files changed, 24 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..a75891d013a 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,17 @@ libtirpc-devel_package() {
vmove usr/lib/*.so
}
}
+
+libtirpc-musl-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ archs="*-musl"
+ pkg_install() {
+ vcopy ${DESTDIR}/usr/include/tirpc/* usr/include
+ rm -r ${DESTDIR}/usr/include/tirpc
+ vmove usr/lib/pkgconfig
+ vmove usr/share/man/man3
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ }
+}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] libtirpc: update to 1.2.5
2019-12-25 23:15 [PR PATCH] libtirpc: update to 1.2.5 voidlinux-github
2019-12-25 23:18 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-25 23:47 ` voidlinux-github
@ 2019-12-25 23:51 ` voidlinux-github
2019-12-26 8:01 ` [PR PATCH] [Merged]: " voidlinux-github
3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2019-12-25 23:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
There is an updated 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. Also doing this will
make packaging easier instead
of adding CFLAGS=-I/usr/include/tirpc
when packaging software for musl 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: 2022 bytes --]
From 0f16a8bb48eebcd7f883325c6de662f43e38269a 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.
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/libtirpc/patches/musl.patch | 11 -----------
srcpkgs/libtirpc/template | 6 +++---
2 files changed, 3 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/libtirpc/patches/musl.patch
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..07837e77ce5 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,17 +1,17 @@
# 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
post_install() {
vconf ${wrksrc}/doc/netconfig
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: libtirpc: update to 1.2.5
2019-12-25 23:15 [PR PATCH] libtirpc: update to 1.2.5 voidlinux-github
` (2 preceding siblings ...)
2019-12-25 23:51 ` voidlinux-github
@ 2019-12-26 8:01 ` voidlinux-github
3 siblings, 0 replies; 5+ messages in thread
From: voidlinux-github @ 2019-12-26 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
There's a merged pull request on the void-packages repository
libtirpc: update to 1.2.5
https://github.com/void-linux/void-packages/pull/17782
Description:
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-26 8:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-25 23:15 [PR PATCH] libtirpc: update to 1.2.5 voidlinux-github
2019-12-25 23:18 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-25 23:47 ` voidlinux-github
2019-12-25 23:51 ` voidlinux-github
2019-12-26 8:01 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).