Эх сурвалжийг харах

update nfs-utils, libtirpc and rpcbind

Waldemar Brodkorb 3 сар өмнө
parent
commit
93cdd1008c

+ 4 - 2
package/libtirpc/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		1.3.6
+PKG_VERSION:=		1.3.7
 PKG_RELEASE:=		1
-PKG_HASH:=		bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508
+PKG_HASH:=		b47d3ac19d3549e54a05d0019a6c400674da716123858cfdb6d3bdd70a66c702
 PKG_DESCR:=		transport independent rpc library
 PKG_SECTION:=		libs/net
 PKG_URL:=		http://sourceforge.net/projects/libtirpc/
@@ -25,6 +25,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CFLAGS+=		-DGQ
 MAKE_ENV+=		V=1
 HOST_CPPFLAGS+=		-I/usr/include/tirpc
 
@@ -40,6 +41,7 @@ CFG:=			.ipv6
 else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
+CONFIGURE_ARGS+=	--enable-rpcdb
 
 libtirpc-install:
 	${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc

+ 0 - 11
package/libtirpc/patches/patch-src_auth_none_c

@@ -1,11 +0,0 @@
---- libtirpc-1.3.6.orig/src/auth_none.c	2024-10-17 09:50:55.000000000 +0200
-+++ libtirpc-1.3.6/src/auth_none.c	2025-04-30 13:30:55.736451017 +0200
-@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *,
- static bool_t authnone_refresh (AUTH *, void *);
- static void authnone_destroy (AUTH *);
- 
--extern bool_t xdr_opaque_auth();
-+extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
- 
- static struct auth_ops *authnone_ops();
- 

+ 0 - 20
package/libtirpc/patches/patch-src_auth_time_c

@@ -1,20 +0,0 @@
---- libtirpc-1.3.6.orig/src/auth_time.c	2024-10-17 09:50:55.000000000 +0200
-+++ libtirpc-1.3.6/src/auth_time.c	2025-04-30 13:33:25.507704020 +0200
-@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, ua
- 	char			ut[64], ipuaddr[64];
- 	endpoint		teps[32];
- 	nis_server		tsrv;
--	void			(*oldsig)() = NULL; /* old alarm handler */
-+	void			(*oldsig)(int) = NULL; /* old alarm handler */
- 	struct sockaddr_in	sin;
- 	int			s = RPC_ANYSOCK;
- 	socklen_t len;
-@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, ua
- 		} else {
- 			int res;
- 
--			oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
-+			oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler);
- 			saw_alarm = 0; /* global tracking the alarm */
- 			alarm(20); /* only wait 20 seconds */
- 			res = connect(s, (struct sockaddr *)&sin, sizeof(sin));

+ 0 - 11
package/libtirpc/patches/patch-src_clnt_bcast_c

@@ -1,11 +0,0 @@
---- libtirpc-1.3.4.orig/src/clnt_bcast.c	2023-10-07 09:54:42.000000000 +0200
-+++ libtirpc-1.3.4/src/clnt_bcast.c	2024-02-08 16:26:57.298094444 +0100
-@@ -40,7 +40,7 @@
-  */
- #include <sys/socket.h>
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include "queue.h"
- 
- #include <net/if.h>
- #include <netinet/in.h>

+ 0 - 11
package/libtirpc/patches/patch-src_clnt_fd_locks_h

@@ -1,11 +0,0 @@
---- libtirpc-1.3.4.orig/src/clnt_fd_locks.h	2023-10-07 09:54:42.000000000 +0200
-+++ libtirpc-1.3.4/src/clnt_fd_locks.h	2024-02-08 16:25:34.795598116 +0100
-@@ -30,7 +30,7 @@
- #ifndef _CLNT_FD_LOCKS_H
- #define _CLNT_FD_LOCKS_H
- 
--#include <sys/queue.h>
-+#include "queue.h"
- #include <errno.h>
- #include <reentrant.h>
- #include <rpc/xdr.h>

+ 0 - 11
package/libtirpc/patches/patch-src_getpublickey_c

@@ -1,11 +0,0 @@
---- libtirpc-1.3.6.orig/src/getpublickey.c	2024-10-17 09:50:55.000000000 +0200
-+++ libtirpc-1.3.6/src/getpublickey.c	2025-04-30 13:30:55.736451017 +0200
-@@ -52,7 +52,7 @@
- /*
-  * Hack to let ypserv/rpc.nisd use AUTH_DES.
-  */
--int (*__getpublickey_LOCAL)() = 0;
-+int (*__getpublickey_LOCAL)(const char *, char *) = 0;
- 
- /*
-  * Get somebody's public key

+ 0 - 15
package/libtirpc/patches/patch-src_key_call_c

@@ -1,15 +0,0 @@
---- libtirpc-1.3.6.orig/src/key_call.c	2024-10-17 09:50:55.000000000 +0200
-+++ libtirpc-1.3.6/src/key_call.c	2025-04-30 13:33:25.507704020 +0200
-@@ -72,9 +72,9 @@
-  * implementations of these functions, and to call those in key_call().
-  */
- 
--cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
--cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
--des_block *(*__key_gendes_LOCAL)() = 0;
-+cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0;
-+cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0;
-+des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0;
- 
- static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
- 

+ 0 - 13
package/libtirpc/patches/patch-src_svc_auth_none_c

@@ -1,13 +0,0 @@
---- libtirpc-1.3.6.orig/src/svc_auth_none.c	2024-10-17 09:50:55.000000000 +0200
-+++ libtirpc-1.3.6/src/svc_auth_none.c	2025-04-30 13:30:55.736451017 +0200
-@@ -37,8 +37,8 @@
- 
- #include <rpc/rpc.h>
- 
--static bool_t	svcauth_none_destroy();
--static bool_t   svcauth_none_wrap();
-+static bool_t	svcauth_none_destroy(SVCAUTH *);
-+static bool_t   svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *);
- 
- struct svc_auth_ops svc_auth_none_ops = {
- 	svcauth_none_wrap,

+ 3 - 5
package/nfs-utils/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		2.8.4
+PKG_VERSION:=		2.8.5
 PKG_RELEASE:=		1
-PKG_HASH:=		30b109638f54e506ecdf60075972df626a4906ea3692fe04e323d56a483ae324
+PKG_HASH:=		b13ca4a9df44186bdbe107514b22732d4243f785f95daf2fb86afc1edba15bbb
 PKG_DESCR:=		network filesystem utilities
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		keyutils libtirpc rpcbind libmount libuuid libevent sqlite
@@ -16,7 +16,7 @@ PKG_BUILDDEP:=		libnl readline
 PKG_KDEPENDS:=		nfs-fs
 PKG_NEEDS:=		threads
 PKG_URL:=		http://sourceforge.net/projects/nfs
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
+PKG_SITES:=		https://www.kernel.org/pub/linux/utils/nfs-utils/$(PKG_VERSION)/
 
 PKG_CFLINE_NFS_UTILS:=	select ADK_PACKAGE_LIBTIRPC_WITH_GSS if ADK_PACKAGE_NFS_UTILS_V4
 
@@ -33,8 +33,6 @@ PKGCD_V4:=		nfs version 4
 PKGCB_V4:=		libevent libnfsidmap krb5 libgssglue librpcsecgss
 PKGCS_V4:=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 2 - 2
package/rpcbind/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		rpcbind
-PKG_VERSION:=		1.2.7
+PKG_VERSION:=		1.2.8
 PKG_RELEASE:=		1
-PKG_HASH:=		f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e
+PKG_HASH:=		964132c389918e8964d7334936b6dd10ef025b300c6b29e693ba0f29550e3de5
 PKG_DESCR:=		converts rpc program numbers into universal addresses
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libtirpc