main/libtirpc: upgrade to 0.2.4

main/libtirpc/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtirpc
-pkgver=0.2.3
-pkgrel=1
+pkgver=0.2.4
+pkgrel=0
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 url="http://libtirpc.sourceforge.net/"
 arch="all"
@@ -12,15 +12,12 @@ makedepends="$depends_dev autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	nis.h
-	gssglue.patch
 	libtirpc-no-des.patch
-	automake.patch
-	fix-cdefs.patch
+	musl-compliance.patch
 	"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
 
 	# uclibc does not provide nis.h so provide our own
 	mkdir src/rpcsvc
@@ -54,23 +51,17 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
-	install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig
 }
-md5sums="b70e6c12a369a91e69fcc3b9feb23d61  libtirpc-0.2.3.tar.bz2
+
+md5sums="847995e8d002cbf1387bda05947be086  libtirpc-0.2.4.tar.bz2
 082dff1bc78bdcbac6d305c1534fe3c0  nis.h
-7c50e2381f103cc9b84a86fad9b8eac5  gssglue.patch
 80e8f54aab0f5bed37e58ad79fe4ff2b  libtirpc-no-des.patch
-5cac96c765922f33de61a215aa264a7f  automake.patch
-5a5f63b42c2c10845584eaa6d5da61ba  fix-cdefs.patch"
-sha256sums="4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c  libtirpc-0.2.3.tar.bz2
+26e391e40f06d3d14189ec6ae0598948  musl-compliance.patch"
+sha256sums="45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1  libtirpc-0.2.4.tar.bz2
 7149d53da167168cbad9e75cbab302768f659e59e208763b1bf5df2a6ff3bfdb  nis.h
-02658756777563dccb3904a00e87fa562eddeab0fe15ef0c6c21893b2d8619aa  gssglue.patch
 5b7c8f6d19f17541902dfd1b1132f2b07e4cc0987152d4e8007243e776d4d47f  libtirpc-no-des.patch
-6188b7236b1f9088ad09749eed6407bd7b75fe37d1569a19977f44d15ec6a10c  automake.patch
-802d2bad879c3554496414d9b882d8a68a2c00acc9bff5d4c6fbb07b0d756a27  fix-cdefs.patch"
-sha512sums="dd480fcb6feda4a2bba7e5a5dc9b1f523697a39ddaa44a5742405f66d202996d99a562a31dbf6daf06e9b7ce5d82dfd1cce7b76a34466b92f84176e77498163d  libtirpc-0.2.3.tar.bz2
+8c54cf46095945c25c8bf4968e67e6304bbae82352d3c25a6532af66443e931a  musl-compliance.patch"
+sha512sums="8b7fec13d34ad0ddfa3832f4a4955607d94f6a691fedcc81a98554345f6c6e64d5f289490a10a80600cebf5b53cfad99c0d78007b88f8f2fbc60cbb8680fc87f  libtirpc-0.2.4.tar.bz2
 15edac1e30cc1aa65ca495bae14c6c7455d65ca539b7e5c865c3fbd5a51c76966b37dd34e9a6483aadcaea3602aefb0b48cdb46f877dae1c65dfa6840dfd8c54  nis.h
-3dd3d4a082b1b9bb82c358a5b74e6c5f23fdd522ea2875fc27a7b1035e04b14aeec30db08aa3ce5c0168df325e540799bf6f55c3a67226e05cf52de11968ad86  gssglue.patch
 9a984a7741deb943f92cd8a9f23d1a0e09a01e91aa88268456ccbb7998b24f50ad431e26400def3a8ba9d6cd345e5abccf5acf9c59708ce8f0653275c2ea5d61  libtirpc-no-des.patch
-dcbc55ed5551703799e6a690e65dbdbd9cc0293c0392a1a3c2d52bc9e91e8b0e18b89fa146f78fea8476c04409b766b6cdbde38a5f226d32043987ca1471634c  automake.patch
-f1c95df18a97a633d49fca4698c090c138b18bb4c330a59be48849065c6ecbf7be06254fd4a145884cf1c3fdd05946a962bdfb7452bf31e5261f49edfab0f11b  fix-cdefs.patch"
+5c0414345e863057eb0ff28f97e654e22fc444f4d72c392de83ab372d0485123c8a42bc558c3688c5b24f3cc83997db5324b2cc57a2676b658761dce45605999  musl-compliance.patch"

main/libtirpc/gssglue.patch

-From 9151a39539145e1f62f8b30168d1cdeb19299dac Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Tue, 26 Mar 2013 11:13:05 -0400
-Subject: [PATCH 1/2] Switch to use standard GSSAPI by default
-
-Make libgssglue configurable still but disabled by default.
-There is no reason to use libgssglue anymore, and modern gssapi
-supports all needed features for libtirpc and its dependencies.
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- configure.ac    | 23 +++++++++++++++++++----
- src/Makefile.am |  4 ++--
- 2 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 40dce96..4a4adba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,15 +5,30 @@ AC_CONFIG_SRCDIR([src/auth_des.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
- AC_ARG_ENABLE(gss,[  --enable-gss            Turn on gss api], [case "${enableval}" in
--        yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;;
-+        yes) gss=true ;;
-         no)  gss=false ;;
-         *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;;
-       esac],[gss=false])
- AM_CONDITIONAL(GSS, test x$gss = xtrue)
-+AC_ARG_WITH(gssglue,
-+		[  --with-gssglue        Use libgssglue],
-+		 [case "${enableval}" in
-+		  yes) gssglue=true ;;
-+		  no)  gssglue=false ;;
-+		  *) AC_MSG_ERROR(bad value ${enableval} for --with-gssglue) ;;
-+		  esac],
-+		[gssglue=false])
-+AM_CONDITIONAL(USEGSSGLUE, test x$gssglue = xtrue)
- if test x$gss = xtrue; then
--	AC_DEFINE(HAVE_LIBGSSAPI, 1, [])
--	PKG_CHECK_MODULES(GSSGLUE, libgssglue, [],
--	AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
-+	if test x$gssglue = xtrue; then
-+		PKG_CHECK_MODULES(GSSAPI, libgssglue, [],
-+		AC_MSG_ERROR([Unable to locate information required to use libgssglue.]))
-+	else
-+		GSSAPI_CFLAGS=`krb5-config --cflags gssapi`
-+		GSSAPI_LIBS=`krb5-config --libs gssapi`
-+		AC_SUBST([GSSAPI_CFLAGS])
-+		AC_SUBST([GSSAPI_LIBS])
-+	fi
- fi
- AC_ARG_ENABLE(ipv6,
- 	[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 66350f5..2dd7768 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -58,8 +58,8 @@ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_ref
- ## Secure-RPC
- if GSS
-     libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c
--    libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS)
--    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
-+    libtirpc_la_LDFLAGS += $(GSSAPI_LIBS)
-+    libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
- endif
- 
- ## libtirpc_a_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
--- 
-1.8.1.4
-
-
-From 4072a0bb8b619cab027bb3833785768681da4ed5 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Wed, 10 Apr 2013 11:38:14 -0400
-Subject: [PATCH 2/2] gss: Fix private data giveaway
-
-When the private data is given away the gss context also needs to go,
-because the caller may destroy it, such as when the context is exported
-into a lucid context to hand it to the kernel.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/auth_gss.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/auth_gss.c b/src/auth_gss.c
-index 81ae8ae..703bc3f 100644
---- a/src/auth_gss.c
-+++ b/src/auth_gss.c
-@@ -269,6 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd)
- 	 * send an RPCSEC_GSS_DESTROY request which might inappropriately
- 	 * destroy the context.
- 	 */
-+        gd->ctx = GSS_C_NO_CONTEXT;
- 	gd->gc.gc_ctx.length = 0;
- 	gd->gc.gc_ctx.value = NULL;
- 
-@@ -284,7 +285,8 @@ authgss_free_private_data(struct authgss_private_data *pd)
- 	if (!pd)
- 		return (FALSE);
- 
--	pd->pd_ctx = NULL;
-+	if (pd->pd_ctx != GSS_C_NO_CONTEXT)
-+		gss_delete_sec_context(&min_stat, &pd->pd_ctx, NULL);
- 	gss_release_buffer(&min_stat, &pd->pd_ctx_hndl);
- 	memset(&pd->pd_ctx_hndl, 0, sizeof(pd->pd_ctx_hndl));
- 	pd->pd_seq_win = 0;
--- 
-1.8.1.4
-

main/libtirpc/musl-compliance.patch

+--- libtirpc-0.2.4.orig/src/bindresvport.c
++++ libtirpc-0.2.4/src/bindresvport.c
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
++#include <netdb.h>
+ #include <netinet/in.h>
+ 
+ #include <errno.h>
+--- libtirpc-0.2.4.orig/tirpc/rpc/rpcent.h
++++ libtirpc-0.2.4/tirpc/rpc/rpcent.h
+@@ -47,7 +47,7 @@
+ __BEGIN_DECLS
+ 
+ /* These are defined in /usr/include/rpc/netdb.h */
+-#if 0
++#if !defined(__GLIBC__)
+ struct rpcent {
+ 	char	*r_name;	/* name of server for this rpc program */
+ 	char	**r_aliases;	/* alias list */
+--- libtirpc-0.2.4.orig/tirpc/rpc/types.h
++++ libtirpc-0.2.4/tirpc/rpc/types.h
+@@ -39,6 +39,7 @@
+ #define _TIRPC_TYPES_H
+ 
+ #include <sys/types.h>
++#include <sys/cdefs.h>
+ 
+ typedef int32_t bool_t;
+ typedef int32_t enum_t;