- rediffed

diff --git a/libtirpc-link.patch b/libtirpc-link.patch
index 922cbe39e920f3068d420e402ce43d9001fc286e..802f228e42c3a4847678e6c92ad0ad8a6c41809f 100644 (file)
--- a/libtirpc-link.patch
+++ b/libtirpc-link.patch
@@ -1,6 +1,17 @@
---- libtirpc-1.2.6/src/Makefile.am.orig        2020-08-18 17:58:23.751237296 +0200
-+++ libtirpc-1.2.6/src/Makefile.am     2020-08-18 18:18:31.174696123 +0200
-@@ -12,8 +12,9 @@
+diff -urNp -x '*.orig' libtirpc-1.3.1.org/libtirpc.pc.in libtirpc-1.3.1/libtirpc.pc.in
+--- libtirpc-1.3.1.org/libtirpc.pc.in  2020-12-01 16:06:57.000000000 +0100
++++ libtirpc-1.3.1/libtirpc.pc.in      2021-03-21 21:46:55.788370390 +0100
+@@ -8,5 +8,5 @@ Description: Transport Independent RPC L
+ Requires:
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ltirpc
+-Libs.private: -lpthread
++Libs.private: -lpthread @GSSAPI_LIBS@
+ Cflags: -I${includedir}/tirpc
+diff -urNp -x '*.orig' libtirpc-1.3.1.org/src/Makefile.am libtirpc-1.3.1/src/Makefile.am
+--- libtirpc-1.3.1.org/src/Makefile.am 2020-12-01 16:06:57.000000000 +0100
++++ libtirpc-1.3.1/src/Makefile.am     2021-03-21 21:46:55.788370390 +0100
+@@ -12,8 +12,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/tirpc -inc
  
  lib_LTLIBRARIES = libtirpc.la
  
@@ -9,9 +20,9 @@
  libtirpc_la_LDFLAGS += -version-info @LT_VERSION_INFO@
 +libtirpc_la_LIBADD = -lpthread
  
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
-         clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
-@@ -42,7 +42,7 @@
+ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
+         binddynport.c bindresvport.c \
+@@ -41,7 +42,7 @@ endif
  if GSS
      libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \
                           rpc_gss_utils.c
@@ -20,12 +31,3 @@
      libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS)
  endif
  
---- libtirpc-1.3.1.orig/libtirpc.pc.in 2020-12-01 15:06:57.000000000 +0000
-+++ libtirpc-1.3.1/libtirpc.pc.in      2020-12-06 23:28:58.851720446 +0000
-@@ -8,5 +8,5 @@
- Requires:
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -ltirpc
--Libs.private: -lpthread
-+Libs.private: -lpthread @GSSAPI_LIBS@
- Cflags: -I${includedir}/tirpc