bump libtirpc to 1.0.1
v2 cover bump libtirpc to 1.0.1
From: Peter Rosin <[email protected]>
Hi!
I'd like to bump libtirpc to 1.0.1. However there is an api incompatibility introduced in 0.3.2 which requires a patch to rpcbind, which I took from upstream. The rpcbind patch make rpcbind work with either tirpc 0.3.2 or 1.0.1, so I added that patch first in the series even if it might seem backwards.
Note that I have not tested the rpcbind patch with more than a compile test. I know nothing about rpcbind.
That also goes for the changes to libtirpc patch 0007-Disable-DES-..., which removes DES support, since apparently musl and uclibc do not provide DES. I know nothing about musl and uclibc and have not tested if there are more newfangled DES things that needs to be removed...
Fixups since v1:
- Removed execute bit on one of the patches.
- Thomas found one more newfangled DES thing to remove in patch 0007.
- Rebased to the next branch.
Cheers,
Peter
Peter Rosin (2):
rpcbind: backport adjustment to changes in libtirpc 1.0.1
libtirpc: bump to version 1.0.1
...able-parts-of-TIRPC-requiring-NIS-support.patch | 14 +-- ...0007-Disable-DES-authentification-support.patch | 93 +++++++++++++++++--- ...d-missing-rwlock_unlocks-in-xprt_register.patch | 63 +++++++++++++ package/libtirpc/libtirpc.hash | 4 +- package/libtirpc/libtirpc.mk | 2 +- ...ly-Don-t-use-the-xp_auth-pointer-directly.patch | 42 +++++++++ 6 files changed, 199 insertions(+), 19 deletions(-) create mode 100644 package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch create mode 100644 package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
Signature · 1 line
1.7.10.4
PATCH v2 1/2 rpcbind: backport adjustment to changes in libtirpc 1.0.1
From: Peter Rosin <[email protected]>
--- ...ly-Don-t-use-the-xp_auth-pointer-directly.patch | 42 ++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson <[email protected]> +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Signed-off-by: Steve Dickson <[email protected]> +[peda at axentia.se: backport from upstream] +Signed-off-by: Peter Rosin <[email protected]> +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) + a.rmt_localvers = fi->versnum; + + xprt_set_caller(xprt, fi); ++#if defined(SVC_XP_AUTH) ++ SVC_XP_AUTH(xprt) = svc_auth_none; ++#else + xprt->xp_auth = &svc_auth_none; ++#endif + svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); ++#if !defined(SVC_XP_AUTH) + SVCAUTH_DESTROY(xprt->xp_auth); + xprt->xp_auth = NULL; ++#endif ++ + done: + if (buffer) + free(buffer); +-- +2.5.3 +
Signature · 1 line
1.7.10.4
PATCH v2 1/2 rpcbind: backport adjustment to changes in libtirpc 1.0.1
Dear Peter Rosin,
Quoted 7 lines · Peter Rosin
From: Peter Rosin <[email protected]>
Signed-off-by Peter Rosin <[email protected]>--- ...ly-Don-t-use-the-xp_auth-pointer-directly.patch | 42 ++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
Both patches applied to next, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 2/2 libtirpc: bump to version 1.0.1
In reply to Peter RosinFrom: Peter Rosin <[email protected]>
Adjust patch 0001 to trivial changes.
Adjust patch 0007 to remove new DES things.
Add patch 0008 directly from upstream to fix a late problem in the 1.0.1 release.
--- ...able-parts-of-TIRPC-requiring-NIS-support.patch | 14 +-- ...0007-Disable-DES-authentification-support.patch | 93 +++++++++++++++++--- ...d-missing-rwlock_unlocks-in-xprt_register.patch | 63 +++++++++++++ package/libtirpc/libtirpc.hash | 4 +- package/libtirpc/libtirpc.mk | 2 +- 5 files changed, 157 insertions(+), 19 deletions(-) create mode 100644 package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch
package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +8 -6
@@ -11,6 +11,8 @@ Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: "Yann E. MORIN" <[email protected]> [joerg.krause at embedded.rocks: update for 0.3.2] Signed-off-by: J?rg Krause <[email protected]> +[peda at axentia.se: update for 1.0.1] +Signed-off-by: Peter Rosin <[email protected]> --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -19,23 +21,23 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 6cc567a..9834f9a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -51,7 +51,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ +@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ + svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ - auth_time.c auth_des.c authdes_prot.c debug.c + auth_des.c authdes_prot.c debug.c ## 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,8 +68,8 @@ if GSS + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c +@@ -41,8 +41,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 += netname.c netnamer.c rpcdname.c rtime.c +#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -+#libtirpc_la_SOURCES += netname.c netnamer.c rtime.c ++#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in
package/libtirpc/0007-Disable-DES-authentification-support.patch +83 -10
135 lines not on this page · raw message
package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch new file +63 -0
63 lines not on this page · raw message
package/libtirpc/libtirpc.hash +2 -2
@@ -1,4 +1,4 @@ # From sourceforge's info on download page: -sha1 af9b74d0c4d1499a7b1a43e396e5b7d62180ea65 libtirpc-0.3.2.tar.bz2 +sha1 8da1636f98b5909c0d587e7534bc1e91f5c1a970 libtirpc-1.0.1.tar.bz2 # Locally computed -sha256 2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc libtirpc-0.3.2.tar.bz2 +sha256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e libtirpc-1.0.1.tar.bz2
package/libtirpc/libtirpc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 0.3.2 +LIBTIRPC_VERSION = 1.0.1 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3c
Signature · 1 line
1.7.10.4