From e5b640e2fefaa2af2581e6fd9dec4101d645d43ce48d57527baf075c895cce15 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 3 Aug 2017 08:16:24 +0000
Subject: [PATCH] Accepting request 513172 from
 home:Andreas_Schwab:glibc:rebuild

- decls.patch: fix missing declarations
- explicit_bzero.patch: use explicit_bzero if available

OBS-URL: https://build.opensuse.org/request/show/513172
OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=59
---
 decls.patch          | 12 ++++++++++++
 explicit_bzero.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 libtirpc.changes     |  6 ++++++
 libtirpc.spec        |  4 ++++
 4 files changed, 62 insertions(+)
 create mode 100644 decls.patch
 create mode 100644 explicit_bzero.patch

diff --git a/decls.patch b/decls.patch
new file mode 100644
index 0000000..b948b78
--- /dev/null
+++ b/decls.patch
@@ -0,0 +1,12 @@
+Index: libtirpc-1.0.1/src/xdr_sizeof.c
+===================================================================
+--- libtirpc-1.0.1.orig/src/xdr_sizeof.c
++++ libtirpc-1.0.1/src/xdr_sizeof.c
+@@ -39,6 +39,7 @@
+ #include <rpc/xdr.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include "un-namespace.h"
+ 
+ /* ARGSUSED */
diff --git a/explicit_bzero.patch b/explicit_bzero.patch
new file mode 100644
index 0000000..ae40a93
--- /dev/null
+++ b/explicit_bzero.patch
@@ -0,0 +1,40 @@
+Index: libtirpc-1.0.1/configure.ac
+===================================================================
+--- libtirpc-1.0.1.orig/configure.ac
++++ libtirpc-1.0.1/configure.ac
+@@ -86,7 +86,7 @@ AC_HEADER_DIRENT
+ AC_PREFIX_DEFAULT(/usr)
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h features.h gssapi/gssapi_ext.h])
+ AC_CHECK_LIB([pthread], [pthread_create])
+-AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
++AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent explicit_bzero])
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
+ AC_OUTPUT(libtirpc.pc)
+Index: libtirpc-1.0.1/src/des_impl.c
+===================================================================
+--- libtirpc-1.0.1.orig/src/des_impl.c
++++ libtirpc-1.0.1/src/des_impl.c
+@@ -9,6 +9,10 @@
+ #include <sys/types.h>
+ #include <rpc/des.h>
+ 
++#if HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ 
+ static const uint32_t des_SPtrans[8][64] =
+ {
+@@ -588,7 +592,11 @@ _des_crypt (char *buf, unsigned len, str
+     }
+   tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
+   tbuf[0] = tbuf[1] = 0;
++#ifdef HAVE_EXPLICIT_BZERO
++  explicit_bzero (schedule, sizeof (schedule));
++#else
+   __bzero (schedule, sizeof (schedule));
++#endif
+ 
+   return (1);
+ }
diff --git a/libtirpc.changes b/libtirpc.changes
index 7845b74..d22befd 100644
--- a/libtirpc.changes
+++ b/libtirpc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  5 13:22:53 UTC 2017 - schwab@suse.de
+
+- decls.patch: fix missing declarations
+- explicit_bzero.patch: use explicit_bzero if available
+
 -------------------------------------------------------------------
 Mon Mar 14 15:17:59 CET 2016 - kukuk@suse.de
 
diff --git a/libtirpc.spec b/libtirpc.spec
index 0cfb331..05e63b7 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -51,6 +51,8 @@ Patch15:        015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch
 Patch25:        patch6_7.diff
 # Patch37 is only needed on openSUSE >= 13.1, SLE >= 12
 Patch37:        libtirpc-new-path-rpcbindsock.patch
+Patch38:        decls.patch
+Patch39:        explicit_bzero.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libtirpc3 = %{version}-%{release}
 
@@ -112,6 +114,8 @@ TCP over IPv4
 %if 0%{suse_version} >= 1310
 %patch37 -p1
 %endif
+%patch38 -p1
+%patch39 -p1
 
 %build
 autoreconf -fiv