[arch-commits] Commit in rpcbind/trunk (2 files)

[Andreas Radke]

    Date: Friday, November 6, 2015 @ 19:38:28
  Author: andyrtr
Revision: 250152

upgpkg: rpcbind 0.2.3-3

libtirpc 1.0.1 rebuild

Added:
  rpcbind/trunk/do_not_use_the_xp_auth_pointer_directly.diff
Modified:
  rpcbind/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |    7 +++-
 do_not_use_the_xp_auth_pointer_directly.diff |   40 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-06 18:31:29 UTC (rev 250151)
+++ PKGBUILD	2015-11-06 18:38:28 UTC (rev 250152)
@@ -4,7 +4,7 @@
 
 pkgname=rpcbind
 pkgver=0.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64)
 backup=('etc/conf.d/rpcbind')
@@ -16,6 +16,7 @@
 # see also http://git.infradead.org/users/steved/rpcbind.git
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         bug-940191.patch
+        do_not_use_the_xp_auth_pointer_directly.diff
         rpcbind-sunrpc.patch
         rpcbind.service
         rpcbind.socket
@@ -23,6 +24,7 @@
 install=rpcbind.install
 sha1sums=('e79974a99d09b6d6fff9d86bf00225dc33723ce2'
           '717e2700510b1b40f452eddb929a7be00df4292b'
+          '3fa6138b6a559b5b3a5610686ec1de045a0b8d1d'
           '1b997ce76f9727efc8c72fc5f97189591c9a60e2'
           '3534c7bcdecebda90182fe2328a16137353cb1ad'
           'c52f8396cd05181b788fbdf74898730343c03c9a'
@@ -37,6 +39,9 @@
   # https://bugs.archlinux.org/task/46341
   # http://seclists.org/oss-sec/2015/q3/581
   patch -Np1 -i ../bug-940191.patch
+  
+  # upstream fix for libtirpc 1.0.1
+  patch -Np1 -i ../do_not_use_the_xp_auth_pointer_directly.diff
 }
 
 build() {

Added: do_not_use_the_xp_auth_pointer_directly.diff
===================================================================
--- do_not_use_the_xp_auth_pointer_directly.diff	                        (rev 0)
+++ do_not_use_the_xp_auth_pointer_directly.diff	2015-11-06 18:38:28 UTC (rev 250152)
@@ -0,0 +1,40 @@
+From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved at redhat.com>
+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 <steved at redhat.com>
+---
+ 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);
+-- 
+1.8.2.1
+