commit 4705a5bc8f28f9c0d290655aceb8edcb5c25818a
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 19 18:57:17 2013 +0200
- updated to 0.2.1
- rmoved patches applied upstream
rpcbind-SO_REUSEADDR.patch | 47 ------------------------------
rpcbind-libwrap.patch | 20 ++++++-------
rpcbind-nofork.patch | 72 ----------------------------------------------
rpcbind-syslog.patch | 20 +++++++------
rpcbind-usage.patch | 31 --------------------
rpcbind.spec | 19 ++++--------
6 files changed, 27 insertions(+), 182 deletions(-)
---
diff --git a/rpcbind.spec b/rpcbind.spec
index ad25098..7935291 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,12 +1,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: 0.2.0
-Release: 8
+Version: 0.2.1
+Release: 1
License: GPL
Group: Daemons
-Source0: http://dl.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
-# Source0-md5: 1a77ddb1aaea8099ab19c351eeb26316
+Source0:
http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
+# Source0-md5: 0a5f9c2142af814c55d957aaab3bcc68
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.service
@@ -14,9 +14,6 @@ Source4: %{name}.socket
Patch0: %{name}-libwrap.patch
Patch1: %{name}-syslog.patch
Patch2: %{name}-sunrpc.patch
-Patch3: %{name}-usage.patch
-Patch4: %{name}-SO_REUSEADDR.patch
-Patch5: %{name}-nofork.patch
Patch6: %{name}-tcp-addrs.patch
# http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php
URL: http://sourceforge.net/projects/rpcbind/
@@ -56,15 +53,11 @@ wywołania RPC na serwerze na tej maszynie.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%patch6 -p1
%build
%{__libtoolize}
%{__aclocal}
-%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
@@ -79,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
$RPM_BUILD_ROOT{%{_mandir}/man8,%{_var}/lib/%{name},%{systemdunitdir}}
-install src/rpcbind $RPM_BUILD_ROOT/sbin
-install src/rpcinfo $RPM_BUILD_ROOT%{_sbindir}
+install rpcbind $RPM_BUILD_ROOT/sbin
+install rpcinfo $RPM_BUILD_ROOT%{_sbindir}
install man/{rpcbind,rpcinfo}.8 $RPM_BUILD_ROOT%{_mandir}/man8
diff --git a/rpcbind-SO_REUSEADDR.patch b/rpcbind-SO_REUSEADDR.patch
deleted file mode 100644
index a755dc3..0000000
--- a/rpcbind-SO_REUSEADDR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit 68556dc512493868960b367406e04d7169c003a8
-Author: Jeff Layton <[email protected]>
-Date: Tue Jun 22 17:33:14 2010 -0400
-
- nd: set SO_REUSEADDR on NC_TPI_COTS listening sockets
-
- I previously sent this patch to the libtirpc-devel list but got no
- response. Resending with wider distribution...
-
- If we don't set SO_REUSEADDR, then if there are any sockets on this port
- in TIME_WAIT state when rpcbind is restarted then that will prevent the
- bind() call from succeeding.
-
- Details of the problem are here:
-
- https://bugzilla.redhat.com/show_bug.cgi?id=597356
-
- Signed-off-by: Jeff Layton <[email protected]>
- Signed-off-by: Steve Dickson <[email protected]>
-
-diff --git a/src/rpcbind.c b/src/rpcbind.c
-index ddf2cfc..c8f0d9f 100644
---- a/src/rpcbind.c
-+++ b/src/rpcbind.c
-@@ -276,6 +276,7 @@ init_transport(struct netconfig *nconf)
- int addrlen = 0;
- int nhostsbak;
- int checkbind;
-+ int on = 1;
- struct sockaddr *sa = NULL;
- u_int32_t host_addr[4]; /* IPv4 or IPv6 */
- struct sockaddr_un sun;
-@@ -493,6 +494,14 @@ init_transport(struct netconfig *nconf)
- }
- oldmask = umask(S_IXUSR|S_IXGRP|S_IXOTH);
- __rpc_fd2sockinfo(fd, &si);
-+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on,
-+ sizeof(on)) != 0) {
-+ syslog(LOG_ERR, "cannot set SO_REUSEADDR on %s",
-+ nconf->nc_netid);
-+ if (res != NULL)
-+ freeaddrinfo(res);
-+ return 1;
-+ }
- if (bind(fd, sa, addrlen) < 0) {
- syslog(LOG_ERR, "cannot bind %s: %m", nconf->nc_netid);
- if (res != NULL)
diff --git a/rpcbind-libwrap.patch b/rpcbind-libwrap.patch
index 62aa39c..ef5262c 100644
--- a/rpcbind-libwrap.patch
+++ b/rpcbind-libwrap.patch
@@ -1,19 +1,19 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -9,6 +9,7 @@
if LIBWRAP
- INCLUDES += -DLIBWRAP
+ AM_CPPFLAGS += -DLIBWRAP
+WRAPLIB = -lwrap
endif
bin_PROGRAMS = rpcbind rpcinfo
@@ -24,7 +28,7 @@
- rpcinfo_LDADD = $(LIB_TIRPC)
+ src/security.c \
+ src/util.c \
+ src/warmstart.c
+-rpcbind_LDADD = $(TIRPC_LIBS)
++rpcbind_LDADD = $(TIRPC_LIBS) $(WRAPLIB)
-
--rpcbind_LDFLAGS = -lpthread -ltirpc
-+rpcbind_LDFLAGS = -lpthread -ltirpc $(WRAPLIB)
- rpcbind_LDADD = $(LIB_TIRPC)
- AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
- -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
+ rpcinfo_SOURCES = src/rpcinfo.c
+ rpcinfo_LDADD = $(TIRPC_LIBS)
diff --git a/rpcbind-nofork.patch b/rpcbind-nofork.patch
deleted file mode 100644
index b0b5960..0000000
--- a/rpcbind-nofork.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-commit eb36cf198795b09c1ba796044fc99fa40c5a2b33
-Author: Steve Dickson <[email protected]>
-Date: Tue Jul 13 15:52:18 2010 -0400
-
- rpcbind: add no-fork mode
-
- Signed-off-by: Lennart Poettering <[email protected]>
- Signed-off-by: Steve Dickson <[email protected]>
-
-diff --git a/man/rpcbind.8 b/man/rpcbind.8
-index 32806d4..c5b8fb7 100644
---- a/man/rpcbind.8
-+++ b/man/rpcbind.8
-@@ -82,6 +82,8 @@ during operation, and will abort on certain errors if
- is also specified.
- With this option, the name-to-address translation consistency
- checks are shown in detail.
-+.It Fl f
-+Do not fork and become a background process.
- .It Fl h
- Specify specific IP addresses to bind to for UDP requests.
- This option
-diff --git a/src/rpcbind.c b/src/rpcbind.c
-index c8f0d9f..63023e1 100644
---- a/src/rpcbind.c
-+++ b/src/rpcbind.c
-@@ -77,6 +77,7 @@
-
- int debugging = 0; /* Tell me what's going on */
- int doabort = 0; /* When debugging, do an abort on errors */
-+int dofork = 1; /* fork? */
-
- rpcblist_ptr list_rbl; /* A list of version 3/4 rpcbind services */
-
-@@ -213,8 +214,8 @@ main(int argc, char *argv[])
- printf("\n");
- }
- #endif
-- } else {
-- if (daemon(0, 0))
-+ } else if (dofork) {
-+ if (daemon(0, 0))
- err(1, "fork failed");
- }
-
-@@ -740,7 +741,7 @@ parseargs(int argc, char *argv[])
- {
- int c;
- oldstyle_local = 1;
-- while ((c = getopt(argc, argv, "adh:ilsw")) != -1) {
-+ while ((c = getopt(argc, argv, "adh:ilswf")) != -1) {
- switch (c) {
- case 'a':
- doabort = 1; /* when debugging, do an abort on */
-@@ -767,13 +768,16 @@ parseargs(int argc, char *argv[])
- case 's':
- runasdaemon = 1;
- break;
-+ case 'f':
-+ dofork = 0;
-+ break;
- #ifdef WARMSTART
- case 'w':
- warmstart = 1;
- break;
- #endif
- default: /* error */
-- fprintf(stderr, "usage: rpcbind [-adhilsw]\n");
-+ fprintf(stderr, "usage: rpcbind [-adhilswf]\n");
- exit (1);
- }
- }
diff --git a/rpcbind-syslog.patch b/rpcbind-syslog.patch
index aa2f7ad..9c12db7 100644
--- a/rpcbind-syslog.patch
+++ b/rpcbind-syslog.patch
@@ -1,9 +1,11 @@
---- rpcbind-0.1.4/src/Makefile.am~ 2007-05-08 15:43:10.000000000 +0200
-+++ rpcbind-0.1.4/src/Makefile.am 2007-05-08 15:44:52.000000000 +0200
-@@ -30,5 +30,5 @@
- rpcbind_LDFLAGS = -lpthread -ltirpc $(WRAPLIB)
- rpcbind_LDADD = $(LIB_TIRPC)
- AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
-- -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
-+ -DFACILITY=LOG_AUTH -DSEVERITY=LOG_INFO
-
+--- 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 @@
+ AM_CPPFLAGS = \
+ -DCHECK_LOCAL \
+ -DPORTMAP \
+- -DFACILITY=LOG_MAIL \
++ -DFACILITY=LOG_AUTH \
+ -DSEVERITY=LOG_INFO \
+ -DINET6 \
+ -DRPCBIND_STATEDIR="\"$(statedir)\"" \
diff --git a/rpcbind-usage.patch b/rpcbind-usage.patch
deleted file mode 100644
index f476686..0000000
--- a/rpcbind-usage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit c5e04d3ef1b4d9a24741dc865aaa55b07fe3c89f
-Author: Steve Dickson <[email protected]>
-Date: Thu Jun 25 08:41:29 2009 -0400
-
- Corrected the usage info to match what the rpcbind man
- page says.
-
- Signed-off-by: Steve Dickson <[email protected]>
-
-diff --git a/src/rpcbind.c b/src/rpcbind.c
-index 525ffba..ddf2cfc 100644
---- a/src/rpcbind.c
-+++ b/src/rpcbind.c
-@@ -731,7 +731,7 @@ parseargs(int argc, char *argv[])
- {
- int c;
- oldstyle_local = 1;
-- while ((c = getopt(argc, argv, "dwah:ils")) != -1) {
-+ while ((c = getopt(argc, argv, "adh:ilsw")) != -1) {
- switch (c) {
- case 'a':
- doabort = 1; /* when debugging, do an abort on */
-@@ -764,7 +764,7 @@ parseargs(int argc, char *argv[])
- break;
- #endif
- default: /* error */
-- fprintf(stderr, "usage: rpcbind [-Idwils]\n");
-+ fprintf(stderr, "usage: rpcbind [-adhilsw]\n");
- exit (1);
- }
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpcbind.git/commitdiff/4705a5bc8f28f9c0d290655aceb8edcb5c25818a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
