Accepting request 794153 from Base:System

OBS-URL: https://build.opensuse.org/request/show/794153
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtirpc?expand=0&rev=54

0001-Add-authdes_seccreate-stub.patch

@@ -1,42 +0,0 @@
-From a86b4ff0c4b4e53df436f83c21a5fbf01568a301 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <pvorel@suse.cz>
-Date: Fri, 3 Jan 2020 09:55:28 -0500
-Subject: [PATCH 1/2] Add authdes_seccreate() stub
-
-bf8f0b82d added back authdes_create() and authdes_pk_create() interfaces
-also when authdes compiled out. Add also authdes_seccreate().
-
-Found by LTP rpc-tirpc test, which fails to link:
-
-/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: /tmp/ccFanCMm.o: in function `main':
-    testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/tirpc_authdes_seccreate.c:55: undefined reference to `authdes_seccreate'
-
-Fixes: bf8f0b82d ("Add back the authdes interfaces")
-
-Signed-off-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/rpc_soc.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index ac7d312..fde121d 100644
---- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -613,6 +613,13 @@ authdes_pk_create(servername, pkey, window, syncaddr, ckey)
- 	des_block *ckey;		/* optional conversation key to use */
- { return (NULL); }
- 
-+AUTH *
-+authdes_seccreate(const char *servername, const u_int win,
-+	const char *timehost, const des_block *ckey)
-+{
-+	return (NULL);
-+}
-+
- #endif
- 
- 
--- 
-2.24.0
-

0001-Avoid-multiple-definiton-with-gcc-fno-common.patch

@@ -1,47 +0,0 @@
-From daed7eedba73907730241c5262a5c16c7abedb6f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 21 Jan 2020 11:49:35 -0500
-Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
-
-GCC 10 enables -fno-common by default.
-
-Fixes: https://bugs.gentoo.org/705896
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
-[Upstream status: daed7ee Avoid multiple-definiton with gcc -fno-common]
----
- src/rpc_com.h | 3 +--
- src/svc.c     | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc_com.h b/src/rpc_com.h
-index 10bec79..76badef 100644
---- a/src/rpc_com.h
-+++ b/src/rpc_com.h
-@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
- void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
- 
- 
--SVCXPRT **__svc_xports;
--int __svc_maxrec;
-+extern int __svc_maxrec;
- 
- #ifdef __cplusplus
- }
-diff --git a/src/svc.c b/src/svc.c
-index b59467b..6db164b 100644
---- a/src/svc.c
-+++ b/src/svc.c
-@@ -57,6 +57,9 @@
- 
- #define max(a, b) (a > b ? a : b)
- 
-+static SVCXPRT **__svc_xports;
-+int __svc_maxrec;
-+
- /*
-  * The services list
-  * Each entry represents a set of procedures (an rpc program).
--- 
-2.24.1
-

libtirpc-1.2.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca
-size 513146

libtirpc-1.2.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc
+size 513150

libtirpc.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 15 10:32:08 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- Update to libtirpc 1.2.6
+  - Drop patches all patches backported from this release
+	(0001-Add-authdes_seccreate-stub.patch,
+	0001-Avoid-multiple-definiton-with-gcc-fno-common.patch)
+
 -------------------------------------------------------------------
 Wed Feb  5 14:08:52 UTC 2020 - Petr Vorel <pvorel@suse.cz>
 

libtirpc.spec

@@ -18,7 +18,7 @@
 
 Name:           libtirpc
 # src/crypt_client.c and tirpc/rpcsvc/crypt.x have the BSD advertising clause
-Version:        1.2.5
+Version:        1.2.6
 Release:        0
 Summary:        Transport Independent RPC Library
 License:        BSD-3-Clause
@@ -28,8 +28,6 @@ BuildRequires:  pkgconfig(krb5)
 URL:            https://sourceforge.net/projects/libtirpc/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch0:         0001-Add-authdes_seccreate-stub.patch
-Patch1:         0001-Avoid-multiple-definiton-with-gcc-fno-common.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libtirpc3 = %{version}-%{release}
 
@@ -74,8 +72,6 @@ TCP over IPv4.
 
 %prep
 %setup -q -n %name-%version
-%patch0 -p1
-%patch1 -p1
 
 %build
 sed -i -e 's|@includedir@/tirpc|@includedir@|g' libtirpc.pc.in