commit e81f2c6e584e90a8cbf764f94aa2f6227fdf346f
Author: Jakub Bogusz <[email protected]>
Date: Sat Oct 5 21:22:31 2024 +0200
- updated to 1.2.7
rpcbind-systemd.patch | 15 ++++++++-------
rpcbind-tcp-addrs.patch | 34 ++++++++++++++++++++--------------
rpcbind.spec | 6 +++---
3 files changed, 31 insertions(+), 24 deletions(-)
---
diff --git a/rpcbind.spec b/rpcbind.spec
index 93e03d5..51e3a25 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -6,12 +6,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.6
-Release: 2
+Version: 1.2.7
+Release: 1
License: BSD
Group: Daemons
Source0:
https://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
-# Source0-md5: 2d84ebbb7d6fb1fc3566d2d4b37f214b
+# Source0-md5: acd444ed322eb458fbd395ec69c4e083
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: %{name}-libwrap.patch
diff --git a/rpcbind-systemd.patch b/rpcbind-systemd.patch
index e875bea..abc2f31 100644
--- a/rpcbind-systemd.patch
+++ b/rpcbind-systemd.patch
@@ -1,6 +1,6 @@
---- rpcbind-1.2.5/systemd/rpcbind.service.in.orig 2018-08-26
11:29:00.657170237 +0200
-+++ rpcbind-1.2.5/systemd/rpcbind.service.in 2018-08-26 21:41:05.066750909
+0200
-@@ -8,11 +8,13 @@
+--- rpcbind-1.2.7/systemd/rpcbind.service.in.orig 2024-10-05
21:00:04.616741208 +0200
++++ rpcbind-1.2.7/systemd/rpcbind.service.in 2024-10-05 21:00:47.903173372
+0200
+@@ -8,11 +8,13 @@ RequiresMountsFor=@statedir@
# rpcbind.socket, no matter how this unit is started.
Requires=rpcbind.socket
Wants=rpcbind.target
@@ -10,18 +10,19 @@
Type=notify
-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
+EnvironmentFile=-/etc/sysconfig/rpcbind
- ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
[Install]
WantedBy=multi-user.target
+Also=rpcbind.socket
---- rpcbind-0.2.4/systemd/rpcbind.socket.orig 2016-11-28 21:47:28.000000000
+0100
-+++ rpcbind-0.2.4/systemd/rpcbind.socket 2018-04-11 19:43:27.366604185
+0200
-@@ -5,14 +5,14 @@
+--- rpcbind-1.2.7/systemd/rpcbind.socket.orig 2024-10-05 21:01:05.846409499
+0200
++++ rpcbind-1.2.7/systemd/rpcbind.socket 2024-10-05 21:02:11.329388080
+0200
+@@ -5,15 +5,14 @@ Wants=rpcbind.target
Before=rpcbind.target
[Socket]
-ListenStream=/run/rpcbind.sock
+-#ListenStream=@/run/rpcbind.sock
+ListenStream=/var/run/rpcbind.sock
# RPC netconfig can't handle ipv6/ipv4 dual sockets
diff --git a/rpcbind-tcp-addrs.patch b/rpcbind-tcp-addrs.patch
index 0edc59b..48fe9f4 100644
--- a/rpcbind-tcp-addrs.patch
+++ b/rpcbind-tcp-addrs.patch
@@ -1,7 +1,6 @@
-diff -ur rpcbind-0.2.3.orig/src/rpcbind.c rpcbind-0.2.3/src/rpcbind.c
---- rpcbind-0.2.3.orig/src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200
-+++ rpcbind-0.2.3/src/rpcbind.c 2016-09-04 11:30:23.340410259 +0200
-@@ -340,7 +340,7 @@
+--- rpcbind-1.2.7/src/rpcbind.c.orig 2024-10-05 21:02:24.365984122 +0200
++++ rpcbind-1.2.7/src/rpcbind.c 2024-10-05 21:07:07.604449687 +0200
+@@ -341,7 +341,7 @@ init_transport(struct netconfig *nconf)
int status; /* bound checking ? */
int aicode;
int addrlen = 0;
@@ -10,7 +9,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
int checkbind;
int on = 1;
struct sockaddr *sa = NULL;
-@@ -456,8 +456,6 @@
+@@ -458,8 +458,6 @@ init_transport(struct netconfig *nconf)
hints.ai_family = si.si_af;
hints.ai_socktype = si.si_socktype;
hints.ai_protocol = si.si_proto;
@@ -19,7 +18,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
/*
* If no hosts were specified, just bind to INADDR_ANY.
Otherwise
* make sure 127.0.0.1 is added to the list.
-@@ -475,21 +473,15 @@
+@@ -477,21 +475,15 @@ init_transport(struct netconfig *nconf)
} else
return 1;
}
@@ -50,7 +49,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
hints.ai_flags &= ~AI_NUMERICHOST;
switch (hints.ai_family) {
-@@ -518,7 +510,7 @@
+@@ -520,7 +512,7 @@ init_transport(struct netconfig *nconf)
host_addr) == 1)
continue;
}
@@ -59,7 +58,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
default:
break;
}
-@@ -541,103 +533,37 @@
+@@ -543,105 +535,41 @@ init_transport(struct netconfig *nconf)
}
addrlen = res->ai_addrlen;
sa = (struct sockaddr *)res->ai_addr;
@@ -68,8 +67,10 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
- syslog(LOG_ERR, "cannot bind %s on %s: %m",
- (hosts[nhostsbak] == NULL) ? "*" :
- hosts[nhostsbak], nconf->nc_netid);
-- if (res != NULL)
+- if (res != NULL) {
- freeaddrinfo(res);
+- res = NULL;
+- }
- continue;
- } else
- checkbind++;
@@ -164,27 +165,32 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
+ sizeof(on)) != 0) {
+ syslog(LOG_ERR, "cannot set SO_REUSEADDR on %s",
+ nconf->nc_netid);
-+ if (res != NULL)
++ if (res != NULL) {
+ freeaddrinfo(res);
++ res = NULL;
++ }
+ continue;
+ }
}
if (bind(fd, sa, addrlen) < 0) {
- syslog(LOG_ERR, "cannot bind %s: %m", nconf->nc_netid);
+- if (res != NULL)
+ syslog(LOG_ERR, "cannot bind %s on %s: %m",
+ (hosts && hosts[nhostsbak]) ? hosts[nhostsbak]
: "*",
+ nconf->nc_netid);
- if (res != NULL)
++ if (res != NULL) {
freeaddrinfo(res);
- return 1;
- }
++ res = NULL;
++ }
+ continue;
+ } else
+ checkbind++;
(void) umask(oldmask);
/* Copy the address */
-@@ -656,7 +582,7 @@
+@@ -660,7 +586,7 @@ init_transport(struct netconfig *nconf)
/* for debugging print out our universal address */
char *uaddr;
struct netbuf nb;
@@ -193,7 +199,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
nb.buf = sa;
switch( sa->sa_family){
-@@ -675,7 +601,8 @@
+@@ -679,7 +605,8 @@ init_transport(struct netconfig *nconf)
}
#endif
@@ -203,7 +209,7 @@ diff -ur rpcbind-0.2.3.orig/src/rpcbind.c
rpcbind-0.2.3/src/rpcbind.c
my_xprt = (SVCXPRT *)svc_tli_create(fd, nconf, &taddr,
RPC_MAXDATASIZE, RPC_MAXDATASIZE);
if (my_xprt == (SVCXPRT *)NULL) {
-@@ -740,6 +667,8 @@
+@@ -744,6 +671,8 @@ got_socket:
/* Also add version 2 stuff to rpcbind list */
rbllist_add(PMAPPROG, PMAPVERS, nconf, &taddr.addr);
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpcbind.git/commitdiff/e81f2c6e584e90a8cbf764f94aa2f6227fdf346f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
