summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/rpcbind/Makefile11
-rw-r--r--package/rpcbind/files/rpcbind.init4
-rw-r--r--package/rpcbind/patches/patch-src_security_c50
3 files changed, 8 insertions, 57 deletions
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index ec4604c58..b0c175a04 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.4
-PKG_RELEASE:= 2
-PKG_HASH:= 074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66
+PKG_VERSION:= 1.2.6
+PKG_RELEASE:= 1
+PKG_HASH:= 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de
PKG_DESCR:= converts rpc program numbers into universal addresses
PKG_SECTION:= net/misc
PKG_DEPENDS:= libtirpc
@@ -27,8 +27,9 @@ CONFIGURE_ARGS+= --disable-libwrap \
rpcbind-install:
$(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcbind \
- $(IDIR_RPCBIND)/usr/bin
+ $(INSTALL_DIR) $(IDIR_RPCBIND)/usr/sbin
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/rpcbind \
+ $(IDIR_RPCBIND)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/bin/rpcinfo \
$(IDIR_RPCBIND)/usr/bin
diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init
index 42c527c90..efc957fd3 100644
--- a/package/rpcbind/files/rpcbind.init
+++ b/package/rpcbind/files/rpcbind.init
@@ -11,10 +11,10 @@ autostart)
exec sh $0 start
;;
start)
- /usr/bin/rpcbind
+ /usr/sbin/rpcbind
;;
stop)
- kill $(pgrep -f /usr/bin/rpcbind)
+ kill $(pgrep -f /usr/sbin/rpcbind)
;;
restart)
sh $0 stop
diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
deleted file mode 100644
index c183919c9..000000000
--- a/package/rpcbind/patches/patch-src_security_c
+++ /dev/null
@@ -1,50 +0,0 @@
---- rpcbind-0.2.4.orig/src/security.c 2016-11-28 21:47:28.000000000 +0100
-+++ rpcbind-0.2.4/src/security.c 2016-12-31 16:11:48.723119783 +0100
-@@ -22,14 +22,6 @@
- /*
- * XXX for special case checks in check_callit.
- */
--#ifdef HAVE_RPCSVC_MOUNT_H
--#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>
--#else
- # define MOUNTPROC_MNT 1
- # define MOUNTPROC_UMNT 3
- # define NFS_PROGRAM 100003
-@@ -44,7 +36,6 @@
- # define YPPROC_FIRST 4
- # define YPPROC_NEXT 5
- # define YPPROC_ALL 8
--#endif
-
- #include "rpcbind.h"
-
-@@ -327,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt
- args->rmt_proc != MOUNTPROC_UMNT)
- break;
- goto deny;
-- case YPBINDPROG:
-- if (args->rmt_proc != YPBINDPROC_SETDOM)
-- break;
-- /* FALLTHROUGH */
-- case YPPASSWDPROG:
- case NFS_PROGRAM:
- case RQUOTAPROG:
- goto deny;
-- case YPPROG:
-- switch (args->rmt_proc) {
-- case YPPROC_ALL:
-- case YPPROC_MATCH:
-- case YPPROC_FIRST:
-- case YPPROC_NEXT:
-- goto deny;
-- default:
-- break;
-- }
- default:
- break;
- }