Accepting request 893559 from home:pevik:branches:network
- Update to rpcbind 1.2.6 - Remove 0031-rpcbind-manpage.patch (accepted upstream in commit 4bedcee) - Drop pmap_set.c (installed as pmap_set2): bnc#446388 is from 2008, for openSUSE 11. - Refresh 0001-change-lockingdir-to-run.patch - Replace %setup with %autosetup OBS-URL: https://build.opensuse.org/request/show/893559 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=94
This commit is contained in:
Git OBS Bridge
parent
ea5a6501f9
commit
3a69582139
@ -11,7 +11,7 @@ diff --git a/src/rpcbind.c b/src/rpcbind.c
|
||||
index cc848b1..65054ff 100644
|
||||
--- a/src/rpcbind.c
|
||||
+++ b/src/rpcbind.c
|
||||
@@ -106,7 +106,7 @@ char *nss_modules = "files";
|
||||
@@ -105,7 +105,7 @@ char *nss_modules = "files";
|
||||
/* who to suid to if -s is given */
|
||||
#define RUN_AS "daemon"
|
||||
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
De-emphasize the -h option and refer people to systemd instead
|
||||
|
||||
---
|
||||
man/rpcbind.8 | 34 ++++++++++++++--------------------
|
||||
1 file changed, 14 insertions(+), 20 deletions(-)
|
||||
|
||||
Index: rpcbind-0.2.1_rc4/man/rpcbind.8
|
||||
===================================================================
|
||||
--- rpcbind-0.2.1_rc4.orig/man/rpcbind.8
|
||||
+++ rpcbind-0.2.1_rc4/man/rpcbind.8
|
||||
@@ -86,27 +86,21 @@ checks are shown in detail.
|
||||
Do not fork and become a background process.
|
||||
.It Fl h
|
||||
Specify specific IP addresses to bind to for UDP requests.
|
||||
-This option
|
||||
-may be specified multiple times and is typically necessary when running
|
||||
-on a multi-homed host.
|
||||
-If no
|
||||
-.Fl h
|
||||
-option is specified,
|
||||
-.Nm
|
||||
-will bind to
|
||||
-.Dv INADDR_ANY ,
|
||||
-which could lead to problems on a multi-homed host due to
|
||||
+This option may be specified multiple times and can be used to
|
||||
+restrict the interfaces rpcbind will respond to.
|
||||
+Note that when
|
||||
.Nm
|
||||
-returning a UDP packet from a different IP address than it was
|
||||
-sent to.
|
||||
-Note that when specifying IP addresses with
|
||||
-.Fl h ,
|
||||
-.Nm
|
||||
-will automatically add
|
||||
-.Li 127.0.0.1
|
||||
-and if IPv6 is enabled,
|
||||
-.Li ::1
|
||||
-to the list.
|
||||
+is controlled via systemd's socket activation,
|
||||
+the
|
||||
+.Fl h
|
||||
+option is ignored. In this case, you need to edit
|
||||
+the
|
||||
+.Nm ListenStream
|
||||
+and
|
||||
+.Nm ListenDgram
|
||||
+definitions in
|
||||
+.Nm /usr/lib/systemd/system/rpcbind.socket
|
||||
+instead.
|
||||
.It Fl i
|
||||
.Dq Insecure
|
||||
mode.
|
||||
63
pmap_set.c
63
pmap_set.c
@ -1,63 +0,0 @@
|
||||
/*
|
||||
* pmap_set - set portmapper table from data produced by pmap_dump
|
||||
*
|
||||
* Author: Wietse Venema (wietse@wzv.win.tue.nl), dept. of Mathematics and
|
||||
* Computing Science, Eindhoven University of Technology, The Netherlands.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef SYSV40
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
#include <rpc/rpc.h>
|
||||
#include <rpc/pmap_clnt.h>
|
||||
|
||||
static int
|
||||
parse_line(char *buf, u_long *prog, u_long *vers,
|
||||
int *prot, unsigned *port);
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
char buf[BUFSIZ];
|
||||
u_long prog;
|
||||
u_long vers;
|
||||
int prot;
|
||||
unsigned port;
|
||||
|
||||
while (fgets(buf, sizeof(buf), stdin)) {
|
||||
if (parse_line(buf, &prog, &vers, &prot, &port) == 0) {
|
||||
fprintf(stderr, "%s: malformed line: %s", argv[0], buf);
|
||||
return (1);
|
||||
}
|
||||
if (pmap_set(prog, vers, prot, (unsigned short) port) == 0)
|
||||
fprintf(stderr, "not registered: %s", buf);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* parse_line - convert line to numbers */
|
||||
|
||||
static int
|
||||
parse_line(char *buf, u_long *prog, u_long *vers,
|
||||
int *prot, unsigned *port)
|
||||
{
|
||||
char proto_name[256];
|
||||
|
||||
if (sscanf(buf, "%lu %lu %255s %u", prog, vers, proto_name, port) != 4) {
|
||||
return (0);
|
||||
}
|
||||
if (strcmp(proto_name, "tcp") == 0) {
|
||||
*prot = IPPROTO_TCP;
|
||||
return (1);
|
||||
}
|
||||
if (strcmp(proto_name, "udp") == 0) {
|
||||
*prot = IPPROTO_UDP;
|
||||
return (1);
|
||||
}
|
||||
if (sscanf(proto_name, "%d", prot) == 1) {
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a
|
||||
size 123502
|
||||
BIN
rpcbind-1.2.6.tar.bz2
(Stored with Git LFS)
Normal file
BIN
rpcbind-1.2.6.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 17 07:06:12 UTC 2021 - Petr Vorel <pvorel@suse.cz>
|
||||
|
||||
- Update to rpcbind 1.2.6
|
||||
- Remove 0031-rpcbind-manpage.patch (accepted upstream in commit 4bedcee)
|
||||
- Drop pmap_set.c (installed as pmap_set2): bnc#446388 is from 2008, for
|
||||
openSUSE 11.
|
||||
- Refresh 0001-change-lockingdir-to-run.patch
|
||||
- Replace %setup with %autosetup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 13 08:40:08 UTC 2021 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
|
||||
14
rpcbind.spec
14
rpcbind.spec
@ -21,7 +21,7 @@
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
Name: rpcbind
|
||||
Version: 1.2.5
|
||||
Version: 1.2.6
|
||||
Release: 0
|
||||
Summary: Transport independent RPC portmapper
|
||||
# Git-Web: http://git.linux-nfs.org/?p=steved/rpcbind.git;a=summary
|
||||
@ -30,11 +30,9 @@ Group: Productivity/Networking/System
|
||||
URL: http://rpcbind.sourceforge.net
|
||||
Source: https://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source2: sysconfig.rpcbind
|
||||
Source4: pmap_set.c
|
||||
Source5: rpc-user.conf
|
||||
Patch1: 0001-systemd-unit-files.patch
|
||||
Patch2: 0001-change-lockingdir-to-run.patch
|
||||
Patch31: 0031-rpcbind-manpage.patch
|
||||
BuildRequires: libtirpc-devel >= 1.0.1
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
@ -58,11 +56,7 @@ UDP over IPv6. Moreover, rpcbind provides additional functions in
|
||||
regards to portmap.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
cp %{SOURCE4} .
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch31 -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
@ -80,7 +74,6 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
||||
--with-nss-modules="files usrfiles"
|
||||
|
||||
make %{?_smp_mflags}
|
||||
gcc -I/usr/include/tirpc -pie -fpie -fwhole-program -Wl,-z,relro,-z,now %{optflags} pmap_set.c -o pmap_set -ltirpc
|
||||
%sysusers_generate_pre %{SOURCE5} rpc
|
||||
|
||||
%install
|
||||
@ -91,8 +84,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/
|
||||
# sysusers.d config
|
||||
mkdir -p %{buildroot}%{_sysusersdir}
|
||||
install -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
|
||||
#
|
||||
install -m 755 pmap_set %{buildroot}/sbin/pmap_set2
|
||||
# create symlink for rcrpcbind
|
||||
mkdir -p %{buildroot}/%{_sbindir}
|
||||
ln -s service %{buildroot}/%{_sbindir}/rc%{name}
|
||||
@ -114,7 +105,6 @@ ln -s /bin/rpcinfo %{buildroot}/sbin/rpcinfo
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS README
|
||||
/sbin/pmap_set2
|
||||
/sbin/%{name}
|
||||
/bin/rpcinfo
|
||||
/sbin/rpcinfo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user