- updated to 1.2.6

diff --git a/rpcbind-libwrap.patch b/rpcbind-libwrap.patch
index cd5d0ea3265c35171ed88553499352d1c4590f1a..90fe51f349be9172575ed0e972419a3d1fdd106a 100644 (file)
--- a/rpcbind-libwrap.patch
+++ b/rpcbind-libwrap.patch
@@ -1,14 +1,14 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,6 +9,7 @@
+--- rpcbind-1.2.6/Makefile.am.orig     2021-05-10 19:10:19.000000000 +0200
++++ rpcbind-1.2.6/Makefile.am  2022-05-07 20:57:22.589949965 +0200
+@@ -27,6 +27,7 @@ endif
  
  if LIBWRAP
  AM_CPPFLAGS +=        -DLIBWRAP
 +WRAPLIB =     -lwrap
  endif
  
- bin_PROGRAMS = rpcbind rpcinfo
-@@ -24,7 +28,7 @@
+ if RMTCALLS
+@@ -49,7 +50,7 @@ rpcbind_SOURCES = \
        src/util.c \
        src/warmstart.c \
        src/xlog.c

diff --git a/rpcbind-nss.h.patch b/rpcbind-nss.h.patch
index 808aa10847912d1795acdf5830f2b8a28c10b821..8ff04766fa3e14743b9768dace131e0cea9f8706 100644 (file)
--- a/rpcbind-nss.h.patch
+++ b/rpcbind-nss.h.patch
@@ -1,6 +1,6 @@
---- rpcbind-0.2.1/src/rpcbind.c~       2013-09-16 14:22:37.567231241 +0200
-+++ rpcbind-0.2.1/src/rpcbind.c        2013-09-16 14:31:27.464077535 +0200
-@@ -67,11 +67,7 @@
+--- rpcbind-1.2.6/src/rpcbind.c.orig   2022-05-07 20:58:58.669429458 +0200
++++ rpcbind-1.2.6/src/rpcbind.c        2022-05-07 20:59:40.185871211 +0200
+@@ -71,11 +71,7 @@
  #include <pwd.h>
  #include <string.h>
  #include <errno.h>
@@ -10,5 +10,5 @@
 -static inline void __nss_configure_lookup(const char *db, const char *s) {}
 -#endif
  #include "rpcbind.h"
+ #include "xlog.h"
  
- /*#define RPCBIND_DEBUG*/

diff --git a/rpcbind-sunrpc.patch b/rpcbind-sunrpc.patch
index 3bbd8a3c2f0f802f1fbf2a5825aeb0473cc647b2..9a6d27b583ff69a5ae1fd0bccde09459c91ca594 100644 (file)
--- a/rpcbind-sunrpc.patch
+++ b/rpcbind-sunrpc.patch
@@ -1,6 +1,6 @@
---- rpcbind-0.1.7/src/rpcbind.c.orig   2008-11-19 14:17:34.000000000 +0100
-+++ rpcbind-0.1.7/src/rpcbind.c        2010-01-07 13:03:37.416632894 +0100
-@@ -114,7 +114,7 @@
+--- rpcbind-1.2.6/src/rpcbind.c.orig   2022-05-07 20:58:18.116315820 +0200
++++ rpcbind-1.2.6/src/rpcbind.c        2022-05-07 20:58:43.826176537 +0200
+@@ -132,7 +132,7 @@ char *tcptrans;            /* Name of TCP transpor
  char *udp_uaddr;      /* Universal UDP address */
  char *tcp_uaddr;      /* Universal TCP address */
  #endif
@@ -8,7 +8,7 @@
 +static char servname[] = "sunrpc";
  static char superuser[] = "superuser";
  
- int main __P((int, char *[]));
+ int main(int, char *[]);
 --- rpcbind-0.1.7/src/rpcinfo.c~       2010-01-08 16:14:24.592156602 +0000
 +++ rpcbind-0.1.7/src/rpcinfo.c        2010-01-08 16:14:31.578838609 +0000
 @@ -1842,7 +1842,7 @@

diff --git a/rpcbind-syslog.patch b/rpcbind-syslog.patch
index 9c12db732487b4200ffb0da634446b9341250245..4b7436d0c9cbaac6e521907c3fda672ddfb7bae4 100644 (file)
--- a/rpcbind-syslog.patch
+++ b/rpcbind-syslog.patch
@@ -1,6 +1,6 @@
---- rpcbind-0.1.4/Makefile.am~ 2007-05-08 15:43:10.000000000 +0200
-+++ rpcbind-0.1.4/Makefile.am  2007-05-08 15:44:52.000000000 +0200
-@@ -1,6 +1,6 @@
+--- rpcbind-1.2.6/Makefile.am.orig     2022-05-07 20:57:41.029850068 +0200
++++ rpcbind-1.2.6/Makefile.am  2022-05-07 20:58:03.886392910 +0200
+@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
  AM_CPPFLAGS = \
        -DCHECK_LOCAL \
        -DPORTMAP \

diff --git a/rpcbind.spec b/rpcbind.spec
index 730aceb15cdc5707b159be96d32d08e027b910ce..afe7bcf77d47fa8d146e7840c9b54752be8d8a39 100644 (file)
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -5,12 +5,12 @@
 Summary:       Universal addresses to RPC program number mapper
 Summary(pl.UTF-8):     Demon odwzorowujący adresy uniwersalne na numery programów RPC
 Name:          rpcbind
-Version:       1.2.5
+Version:       1.2.6
 Release:       1
 License:       BSD
 Group:         Daemons
-Source0:       http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
-# Source0-md5: ed46f09b9c0fa2d49015f6431bc5ea7b
+Source0:       https://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
+# Source0-md5: 2d84ebbb7d6fb1fc3566d2d4b37f214b
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-libwrap.patch
@@ -36,8 +36,8 @@ Requires:     rc-scripts >= 0.4.1.6
 Requires:      systemd-units >= 0.38
 Provides:      portmap = 8.0
 Provides:      user(rpc)
-Obsoletes:     portmap
-Obsoletes:     rpcbind-systemd
+Obsoletes:     portmap < 6.1
+Obsoletes:     rpcbind-systemd < 0.2.0-5
 Conflicts:     clusternfs < 3.0-0.rc2.3
 Conflicts:     flixengine < 8.0.8.2-1
 Conflicts:     nfs-utils < 1.1.0-0.rc2.1