From 4aff58ef4bdbb5dab23e88e868f0f3e1c440003c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 19 Aug 2015 22:31:41 +0200 Subject: [PATCH] libtirpc: fix musl. --- ...ing_rpc_get_default_domain+fix_musl.patch} | 38 +++++++++++++++++-- srcpkgs/libtirpc/template | 2 +- 2 files changed, 35 insertions(+), 5 deletions(-) rename srcpkgs/libtirpc/patches/{fix_missing_rpc_get_default_domain.patch => fix_missing_rpc_get_default_domain+fix_musl.patch} (68%) diff --git a/srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain.patch b/srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain+fix_musl.patch similarity index 68% rename from srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain.patch rename to srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain+fix_musl.patch index 9b2655f2339..87c437f3627 100644 --- a/srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain.patch +++ b/srcpkgs/libtirpc/patches/fix_missing_rpc_get_default_domain+fix_musl.patch @@ -1,12 +1,42 @@ +diff -r -up libtirpc-0.3.2.org/configure.ac libtirpc-0.3.2/configure.ac +--- configure.ac 2015-06-16 17:35:08.000000000 +0200 ++++ configure.ac 2015-08-19 22:02:17.094796496 +0200 +@@ -7,6 +7,8 @@ AC_PROG_CC + + AC_CHECK_HEADER([gssapi/gssapi.h], [HAVE_GSSAPI_H=yes], [HAVE_GSSAPI_H=no]) + ++AC_CHECK_HEADER([rpcsvc/yp_prot.h], [HAVE_YP_PROT_H=yes], [HAVE_YP_PROT_H=no]) ++AM_CONDITIONAL(HAVE_YP_PROT_H, test x$HAVE_YP_PROT_H = xyes) + AC_ARG_ENABLE(gssapi, + [AC_HELP_STRING([--disable-gssapi], [Disable GSSAPI support @<:@default=no@:>@])], + [],[enable_gssapi=yes]) +diff -r -up libtirpc-0.3.2.org/src/Makefile.am libtirpc-0.3.2/src/Makefile.am --- src/Makefile.am 2015-06-16 17:35:08.000000000 +0200 -+++ src/Makefile.am 2015-06-17 21:23:05.185276962 +0200 -@@ -69,7 +69,7 @@ ++++ src/Makefile.am 2015-08-19 22:08:02.241770664 +0200 +@@ -51,7 +51,11 @@ libtirpc_la_SOURCES = auth_none.c auth_u + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ + svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c debug.c ++ debug.c ++ ++if HAVE_YP_PROT_H ++libtirpc_la_SOURCES += auth_time.c auth_des.c authdes_prot.c ++endif + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c +@@ -68,8 +72,11 @@ if GSS + libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) endif - + ++if HAVE_YP_PROT_H libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -libtirpc_la_SOURCES += netname.c netnamer.c rtime.c +libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - ++endif ++ + CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in diff -Naur a/src/rpcdname.c b/src/rpcdname.c diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template index 1b400e6b16a..321d70ea3bf 100644 --- a/srcpkgs/libtirpc/template +++ b/srcpkgs/libtirpc/template @@ -1,7 +1,7 @@ # Template file for 'libtirpc' pkgname=libtirpc version=0.3.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config mit-krb5-devel automake libtool" makedepends="mit-krb5-devel libgssglue-devel"