mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-10 04:00:28 +00:00
Code Issues Projects Releases Wiki Activity

rpcbind: 1.2.7 -> 1.2.8

Browse Source 
Refresh patches
- rpcbind_add_option_to_fix_port_number.patch
- 0001-systemd-use-EnvironmentFile.patch

(From OE-Core rev: dd4182a2697707491c61bd0b8c40ad063bed9a24)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2025-08-27 13:18:50 +08:00
committed by Richard Purdie
parent 7001bdc3d7
commit 6185117653
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
+14 -8
View File
@@ -1,19 +1,20 @@
From da528d5d60137f13202102b53cf178aba45849a5 Mon Sep 17 00:00:00 2001
From 87a9931e4aa97d7b6eb3b25f26444e30e45e3e41 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Sun, 6 Oct 2019 00:05:54 +0200
Date: Wed, 27 Aug 2025 11:30:48 +0800
Subject: [PATCH] systemd: use EnvironmentFile
Use OE specific environment file.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 2 ++
systemd/rpcbind.service.in | 1 +
2 files changed, 3 insertions(+)
systemd/rpcbind.service.in | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8f4cef3..4705413 100644
index 6ede0af..d1ae5e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,5 +86,7 @@ AC_CHECK_HEADERS([nss.h])
@@ -25,14 +26,19 @@ index 8f4cef3..4705413 100644
AC_OUTPUT([Makefile systemd/rpcbind.service systemd/rpcbind.socket])
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
index c892ca8..e0511bd 100644
index 771b944..5992098 100644
--- a/systemd/rpcbind.service.in
+++ b/systemd/rpcbind.service.in
@@ -12,6 +12,7 @@ Wants=rpcbind.target
[Service]
@@ -23,9 +23,9 @@ ProtectControlGroups=true
RestrictRealtime=true
Type=notify
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
-EnvironmentFile=-/etc/rpcbind.conf
-EnvironmentFile=-/etc/default/rpcbind
-EnvironmentFile=-/etc/sysconfig/rpcbind
+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
+EnvironmentFile=-@_sysconfdir@/default/rpcbind
+EnvironmentFile=-@_sysconfdir@/sysconfig/rpcbind
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
[Install]
meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
+16 -15
View File
@@ -1,6 +1,6 @@
From 76f8598fd20727908e760cbb497dd6a17eda4af5 Mon Sep 17 00:00:00 2001
From 285c193dc94b53763ac8d6f91229eaab37d45fc6 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Wed, 17 Sep 2014 13:22:14 +0800
Date: Wed, 27 Aug 2025 11:24:53 +0800
Subject: [PATCH] add option to make users able to use fixed port number
Upstream-Status: Submitted [https://sourceforge.net/p/rpcbind/discussion/716839/thread/32af721d/]
@@ -8,6 +8,7 @@ Upstream-Status: Submitted [https://sourceforge.net/p/rpcbind/discussion/716839/
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
man/rpcbind.8 | 4 +++-
src/rpcb_svc_com.c | 17 +++++++++++++++++
@@ -15,15 +16,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/man/rpcbind.8 b/man/rpcbind.8
index fbf0ace..66f7c08 100644
index 15b70f9..4a6ffbc 100644
--- a/man/rpcbind.8
+++ b/man/rpcbind.8
@@ -11,7 +11,7 @@
.Nd universal addresses to RPC program number mapper
.Sh SYNOPSIS
.Nm
-.Op Fl adhiLls
+.Op Fl adhpiLls
-.Op Fl adfhilsvw
+.Op Fl adfhpilsvw
.Sh DESCRIPTION
The
.Nm
@@ -86,10 +87,10 @@ index 1743dad..07a1c75 100644
if (xprt == NULL) {
if (debugging)
diff --git a/src/rpcbind.c b/src/rpcbind.c
index 25d8a90..36a95b9 100644
index bf7b499..7268907 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -111,6 +111,7 @@ int runasdaemon = 0;
@@ -112,6 +112,7 @@ int runasdaemon = 0;
int insecure = 0;
int oldstyle_local = 0;
int verboselog = 0;
@@ -97,16 +98,16 @@ index 25d8a90..36a95b9 100644
char **hosts = NULL;
int nhosts = 0;
@@ -884,7 +885,7 @@ parseargs(int argc, char *argv[])
@@ -959,7 +960,7 @@ parseargs(int argc, char *argv[])
{
int c;
oldstyle_local = 1;
- while ((c = getopt(argc, argv, "adh:ilswf")) != -1) {
+ while ((c = getopt(argc, argv, "adh:p:ilswf")) != -1) {
- while ((c = getopt(argc, argv, "adfh:ilsvw")) != -1) {
+ while ((c = getopt(argc, argv, "adfh:p:ilsvw")) != -1) {
switch (c) {
case 'a':
doabort = 1; /* when debugging, do an abort on */
@@ -902,6 +903,9 @@ parseargs(int argc, char *argv[])
@@ -977,6 +978,9 @@ parseargs(int argc, char *argv[])
if (hosts[nhosts - 1] == NULL)
errx(1, "Out of memory");
break;
@@ -116,15 +117,15 @@ index 25d8a90..36a95b9 100644
case 'i':
insecure = 1;
break;
@@ -920,7 +924,7 @@ parseargs(int argc, char *argv[])
@@ -999,7 +1003,7 @@ parseargs(int argc, char *argv[])
break;
#endif
default: /* error */
- fprintf(stderr, "usage: rpcbind [-adhilswf]\n");
+ fprintf(stderr, "usage: rpcbind [-adhpilswf]\n");
- fprintf(stderr, "usage: rpcbind [-adfhilsvw]\n");
+ fprintf(stderr, "usage: rpcbind [-adfhpilsvw]\n");
exit (1);
}
}
--
2.25.1
2.34.1
meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb → meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
+1 -1
View File
@@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://rpcbind_add_option_to_fix_port_number.patch \
file://0001-systemd-use-EnvironmentFile.patch \
"
SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e"
SRC_URI[sha256sum] = "964132c389918e8964d7334936b6dd10ef025b300c6b29e693ba0f29550e3de5"
inherit autotools update-rc.d systemd pkgconfig update-alternatives sourceforge-releases