Browse Source

fix compile, reported by joern, update to latest upstream

Waldemar Brodkorb 11 years ago
parent
commit
30d2c58211

+ 4 - 5
package/rpcbind/Makefile

@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		rpcbind
-PKG_VERSION:=		0.2.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		1a77ddb1aaea8099ab19c351eeb26316
+PKG_VERSION:=		0.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0a5f9c2142af814c55d957aaab3bcc68
 PKG_DESCR:=		converts RPC program numbers into universal addresses
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libtirpc
-PKG_BUILDDEP:=		libtirpc autotool
+PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://sourceforge.net/projects/rpcbind/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rpcbind/}
 
@@ -22,7 +22,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RPCBIND,rpcbind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/tirpc
 CONFIGURE_ARGS+=	--disable-libwrap
 

+ 0 - 10
package/rpcbind/patches/patch-src_Makefile_am

@@ -1,10 +0,0 @@
---- rpcbind-0.2.0.orig/src/Makefile.am	2009-05-29 15:38:22.000000000 +0200
-+++ rpcbind-0.2.0/src/Makefile.am	2013-10-29 15:53:05.000000000 +0100
-@@ -29,6 +29,6 @@ rpcinfo_LDADD   =       $(LIB_TIRPC)
- 
- rpcbind_LDFLAGS = -lpthread -ltirpc
- rpcbind_LDADD = $(LIB_TIRPC)
--AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
-+AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
-                        -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
-      

+ 0 - 14
package/rpcbind/patches/patch-src_rpcbind_c

@@ -1,14 +0,0 @@
---- rpcbind-0.2.0.orig/src/rpcbind.c	2009-05-29 15:38:22.000000000 +0200
-+++ rpcbind-0.2.0/src/rpcbind.c	2010-02-06 01:54:03.194325296 +0100
-@@ -67,7 +67,11 @@
- #include <pwd.h>
- #include <string.h>
- #include <errno.h>
-+#if defined(__UCLIBC__)
-+#define __nss_configure_lookup(x,y)
-+#else
- #include <nss.h>
-+#endif 
- #include "config.h"
- #include "rpcbind.h"
- 

+ 3 - 3
package/rpcbind/patches/patch-src_security_c

@@ -1,5 +1,5 @@
---- rpcbind-0.2.0.orig/src/security.c	2009-05-29 15:38:22.000000000 +0200
-+++ rpcbind-0.2.0/src/security.c	2010-02-27 19:57:02.000000000 +0100
+--- 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.
@@ -10,7 +10,6 @@
 -#include <rpcsvc/yp.h>
 -#include <rpcsvc/ypclnt.h>
 -#include <rpcsvc/yppasswd.h>
-+
 +#define MOUNTPROC_MNT 1
 +#define MOUNTPROC_UMNT 3
 +
@@ -32,6 +31,7 @@
 +#define YPPROC_ALL     8
 +
 +#define YPBINDPROC_SETDOM      2
++
  
  #include "rpcbind.h"