fix rpcbind build, reported by Oliver

5 files changed, 35 insertions, 43 deletions

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()
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index 81266c039..97860e902 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		rpcbind
-PKG_VERSION:=		0.2.2
+PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		1
-PKG_HASH:=		13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29
+PKG_HASH:=		9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b
 PKG_DESCR:=		converts rpc program numbers into universal addresses
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libtirpc
diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
deleted file mode 100644
index 36035d1b0..000000000
--- a/package/rpcbind/patches/patch-src_security_c
+++ /dev/null
@@ -1,37 +0,0 @@
---- rpcbind-0.2.1.orig/src/security.c	2013-08-19 16:49:34.000000000 +0200
-+++ rpcbind-0.2.1/src/security.c	2014-05-14 18:57:44.779341743 +0200
-@@ -20,12 +20,28 @@
- /*
-  * XXX for special case checks in check_callit.
-  */
--#include <rpcsvc/mount.h>
--#include <rpcsvc/rquota.h>
--#include <rpcsvc/nfs_prot.h>
--#include <rpcsvc/yp.h>
--#include <rpcsvc/ypclnt.h>
--#include <rpcsvc/yppasswd.h>
-+#define MOUNTPROC_MNT 1
-+#define MOUNTPROC_UMNT 3
-+
-+#define NFS_PROGRAM    100003
-+#define YPPROG         100004
-+#define MOUNTPROG      100005
-+#define YPBINDPROG     100007
-+#define YPPASSWDPROG   100009
-+#define RQUOTAPROG     100011
-+
-+#define YPPROC_NULL    0
-+#define YPPROC_DOMAIN  1
-+#define YPPROC_DOMAIN_NONACK 2
-+#define YPPROC_MATCH   3
-+#define YPPROC_FIRST   4
-+#define YPPROC_NEXT    5
-+#define YPPROC_XFR     6
-+#define YPPROC_CLEAR   7
-+#define YPPROC_ALL     8
-+
-+#define YPBINDPROC_SETDOM      2
-+
- 
- #include "rpcbind.h"
-