From 22c39a7cfb66225ec68a211205434255e95c5e0b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 27 Jun 2015 13:00:34 +0200
Subject: fix rpcbind build, reported by Oliver
---
package/libtirpc/Makefile | 2 +-
package/libtirpc/patches/patch-src_Makefile_am | 17 ++++++++++++++---
package/libtirpc/patches/patch-src_rpc_soc_c | 18 ++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 package/libtirpc/patches/patch-src_rpc_soc_c
(limited to 'package/libtirpc')
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index dca48206d..f88d3a6fb 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= libtirpc
PKG_VERSION:= 0.3.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= 2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc
PKG_DESCR:= transport independent rpc library
PKG_SECTION:= libs/net
diff --git a/package/libtirpc/patches/patch-src_Makefile_am b/package/libtirpc/patches/patch-src_Makefile_am
index 0c39f90b9..5c8e5dccb 100644
--- a/package/libtirpc/patches/patch-src_Makefile_am
+++ b/package/libtirpc/patches/patch-src_Makefile_am
@@ -1,5 +1,14 @@
--- libtirpc-0.3.2.orig/src/Makefile.am 2015-06-16 17:35:08.000000000 +0200
-+++ libtirpc-0.3.2/src/Makefile.am 2015-06-21 21:02:26.000000000 +0200
++++ libtirpc-0.3.2/src/Makefile.am 2015-06-27 12:05:34.000000000 +0200
+@@ -41,7 +41,7 @@ lib_LTLIBRARIES = libtirpc.la
+ # release number of your package. This is an abuse that only fosters
+ # misunderstanding of the purpose of library versions."
+ #
+-libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0
++libtirpc_la_LDFLAGS = -no-undefined -lpthread -version-info 1:10:0
+
+ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
+ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
@@ -51,7 +51,7 @@ 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 \
@@ -9,12 +18,14 @@
## 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,7 +68,7 @@ if GSS
+@@ -68,8 +68,8 @@ if GSS
libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
endif
-libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
+-libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
+libtirpc_la_SOURCES += key_call.c key_prot_xdr.c
- libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
++libtirpc_la_SOURCES += rtime.c
CLEANFILES = cscope.* *~
+ DISTCLEANFILES = Makefile.in
diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c
new file mode 100644
index 000000000..a03858799
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_rpc_soc_c
@@ -0,0 +1,18 @@
+--- libtirpc-0.3.2.orig/src/rpc_soc.c 2015-06-16 17:35:08.000000000 +0200
++++ libtirpc-0.3.2/src/rpc_soc.c 2015-06-27 11:37:58.000000000 +0200
+@@ -520,6 +520,7 @@ clnt_broadcast(prog, vers, proc, xargs,
+ (resultproc_t) rpc_wrap_bcast, "udp");
+ }
+
++#if 0
+ /*
+ * Create the client des authentication object. Obsoleted by
+ * authdes_seccreate().
+@@ -551,6 +552,7 @@ fallback:
+ dummy = authdes_seccreate(servername, window, NULL, ckey);
+ return (dummy);
+ }
++#endif
+
+ /*
+ * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
--
cgit v1.2.3