From 868d58656cb8c4c566a1b632d606cc2282dadf8e8f920315108db70849152437 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 30 Jan 2014 14:01:34 +0000 Subject: [PATCH] Accepting request 215477 from home:okir:branches:network - Fixed rpc broadcast handling (bnc#857324) Upgraded to upstream 0.2.1-rc4 as part of this, and rebased the patch set. OBS-URL: https://build.opensuse.org/request/show/215477 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=32 --- ...Fix-building-one-systems-w-out-nss.h.patch | 35 ++++++ ...-Rename-configure.in-to-configure.ac.patch | 109 ++++++++++++++++++ ...rpcuser-not-being-set-in-Makefile.am.patch | 17 +-- ...g-about-setgroups-being-implicitly-d.patch | 4 +- ...ve-obsolete-function-in6_fillscopeid.patch | 4 +- ...t-move-creation-of-COTS-sockets-clos.patch | 4 +- ...MERICHOST-in-init_transport-is-broke.patch | 4 +- ...t-part-of-init_transport-refactoring.patch | 4 +- ...ove-the-registration-code-into-a-sep.patch | 4 +- ...ehavior-when-specifying-the-h-option.patch | 4 +- ...-we-handle-the-h-option-in-init_tran.patch | 6 +- ...h => 0012-Support-systemd-activation.patch | 6 +- ...n-Fix-rpcbind.service-to-use-separat.patch | 6 +- ...md-redirect-syslog-calls-to-the-syst.patch | 6 +- ...md-activation-make-rpcbind-notify-sy.patch | 6 +- ... 0016-Notify-systemd-unconditionally.patch | 6 +- ...ig-file-into-rpcbind.service-and-use.patch | 4 +- ...ch => 0018-configure-check-for-nss.h.patch | 4 +- ...-clean-up-client-ping-create-destroy.patch | 4 +- ...uce-new-helper-function-ip_getclient.patch | 4 +- ...u-options-support-IPv6-addresses-too.patch | 4 +- ...ve-obsolete-function-clnt_com_create.patch | 4 +- ...rpcinfo-p-support-IPv6-addresses-too.patch | 4 +- ...e-obsolete-function-get_inet_address.patch | 4 +- rpcbind-0.2.1_git1b0fdf5.tar.bz2 | 3 - rpcbind-0.2.1_rc4.tar.bz2 | 3 + rpcbind.changes | 38 +++++- rpcbind.spec | 54 +++++---- 28 files changed, 271 insertions(+), 84 deletions(-) create mode 100644 0001-Fix-building-one-systems-w-out-nss.h.patch create mode 100644 0002-Rename-configure.in-to-configure.ac.patch rename 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch => 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch (52%) rename 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch => 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch (78%) rename 0002-Remove-obsolete-function-in6_fillscopeid.patch => 0005-Remove-obsolete-function-in6_fillscopeid.patch (94%) rename 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch => 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch (91%) rename 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch => 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch (91%) rename 0006-First-part-of-init_transport-refactoring.patch => 0008-First-part-of-init_transport-refactoring.patch (99%) rename 0007-init_transport-move-the-registration-code-into-a-sep.patch => 0009-init_transport-move-the-registration-code-into-a-sep.patch (98%) rename 0008-Fix-the-behavior-when-specifying-the-h-option.patch => 0010-Fix-the-behavior-when-specifying-the-h-option.patch (96%) rename 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch => 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch (94%) rename 0010-Support-systemd-activation.patch => 0012-Support-systemd-activation.patch (98%) rename 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch => 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch (94%) rename 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch => 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch (99%) rename 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch => 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch (85%) rename 0014-Notify-systemd-unconditionally.patch => 0016-Notify-systemd-unconditionally.patch (87%) rename 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch => 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch (83%) rename 0016-configure-check-for-nss.h.patch => 0018-configure-check-for-nss.h.patch (87%) rename 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch => 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch (96%) rename 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch => 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch (96%) rename 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch => 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch (93%) rename 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch => 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch (92%) rename 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch => 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch (91%) rename 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch => 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch (93%) delete mode 100644 rpcbind-0.2.1_git1b0fdf5.tar.bz2 create mode 100644 rpcbind-0.2.1_rc4.tar.bz2 diff --git a/0001-Fix-building-one-systems-w-out-nss.h.patch b/0001-Fix-building-one-systems-w-out-nss.h.patch new file mode 100644 index 0000000..787502b --- /dev/null +++ b/0001-Fix-building-one-systems-w-out-nss.h.patch @@ -0,0 +1,35 @@ +From c4814d539434391df4dfa61551e5e2e96947326d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 21 Feb 2013 10:39:33 -0500 +Subject: [PATCH 01/24] Fix building one systems w/out nss.h + +The nss.h header is glibc-specific, so use the existing HAVE_NSS_H define +to avoid including/using it when it is not available. + +URL: http://bugs.gentoo.org/458024 +Reported-by: Mark Reiche +Signed-off-by: Mike Frysinger +Signed-off-by: Steve Dickson +--- + src/rpcbind.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rpcbind.c b/src/rpcbind.c +index 9a0504d..83dbe93 100644 +--- a/src/rpcbind.c ++++ b/src/rpcbind.c +@@ -67,7 +67,11 @@ + #include + #include + #include ++#ifdef HAVE_NSS_H + #include ++#else ++static inline void __nss_configure_lookup(const char *db, const char *s) {} ++#endif + #include "rpcbind.h" + + /*#define RPCBIND_DEBUG*/ +-- +1.7.12.4 + diff --git a/0002-Rename-configure.in-to-configure.ac.patch b/0002-Rename-configure.in-to-configure.ac.patch new file mode 100644 index 0000000..d735860 --- /dev/null +++ b/0002-Rename-configure.in-to-configure.ac.patch @@ -0,0 +1,109 @@ +From 5618b2f89a752e8bacf9f7c847fd99484a9d3bbc Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 26 Mar 2013 10:59:42 -0400 +Subject: [PATCH 02/24] Rename configure.in to configure.ac + +Newer autotools wants this to end in .ac. + +Signed-off-by: Mike Frysinger +Signed-off-by: Steve Dickson +--- + configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ + configure.in | 39 --------------------------------------- + 2 files changed, 39 insertions(+), 39 deletions(-) + create mode 100644 configure.ac + delete mode 100644 configure.in + +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..2b67720 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,39 @@ ++AC_INIT(rpcbind, 0.2.0) ++ ++AM_INIT_AUTOMAKE ++AC_CONFIG_SRCDIR([src/rpcbind.c]) ++AC_PREFIX_DEFAULT(/usr) ++AC_PROG_CC ++ ++AC_ARG_ENABLE([libwrap], ++ AS_HELP_STRING([--enable-libwrap], [Enables host name checking through tcpd @<:@default=no@:>@])) ++AM_CONDITIONAL(LIBWRAP, test x$enable_libwrap = xyes) ++ ++AC_ARG_ENABLE([debug], ++ AS_HELP_STRING([--enable-debug], [Turns on rpcbind debugging @<:@default=no@:>@])) ++AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes) ++ ++AC_ARG_ENABLE([warmstarts], ++ AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@])) ++AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) ++ ++AC_ARG_WITH([statedir], ++ AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) ++ ,, [with_statedir=/tmp]) ++AC_SUBST([statedir], [$with_statedir]) ++ ++AC_ARG_WITH([rpcuser], ++ AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), ++ ,, [with_rpcuser=root]) ++AC_SUBST([rpcuser], [$with_rpcuser]) ++ ++PKG_CHECK_MODULES([TIRPC], [libtirpc]) ++ ++AS_IF([test x$enable_libwrap = xyes], [ ++ AC_CHECK_LIB([wrap], [hosts_access], , ++ AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) ++]) ++ ++AC_SEARCH_LIBS([pthread_create], [pthread]) ++ ++AC_OUTPUT([Makefile]) +diff --git a/configure.in b/configure.in +deleted file mode 100644 +index 2b67720..0000000 +--- a/configure.in ++++ /dev/null +@@ -1,39 +0,0 @@ +-AC_INIT(rpcbind, 0.2.0) +- +-AM_INIT_AUTOMAKE +-AC_CONFIG_SRCDIR([src/rpcbind.c]) +-AC_PREFIX_DEFAULT(/usr) +-AC_PROG_CC +- +-AC_ARG_ENABLE([libwrap], +- AS_HELP_STRING([--enable-libwrap], [Enables host name checking through tcpd @<:@default=no@:>@])) +-AM_CONDITIONAL(LIBWRAP, test x$enable_libwrap = xyes) +- +-AC_ARG_ENABLE([debug], +- AS_HELP_STRING([--enable-debug], [Turns on rpcbind debugging @<:@default=no@:>@])) +-AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes) +- +-AC_ARG_ENABLE([warmstarts], +- AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@])) +-AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) +- +-AC_ARG_WITH([statedir], +- AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) +- ,, [with_statedir=/tmp]) +-AC_SUBST([statedir], [$with_statedir]) +- +-AC_ARG_WITH([rpcuser], +- AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), +- ,, [with_rpcuser=root]) +-AC_SUBST([rpcuser], [$with_rpcuser]) +- +-PKG_CHECK_MODULES([TIRPC], [libtirpc]) +- +-AS_IF([test x$enable_libwrap = xyes], [ +- AC_CHECK_LIB([wrap], [hosts_access], , +- AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) +-]) +- +-AC_SEARCH_LIBS([pthread_create], [pthread]) +- +-AC_OUTPUT([Makefile]) +-- +1.7.12.4 + diff --git a/0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch b/0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch similarity index 52% rename from 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch rename to 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch index 5a3aa8f..e03fbbd 100644 --- a/0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch +++ b/0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch @@ -1,13 +1,14 @@ -From 921c65c2f9fb023124bccd74a009a1faf1fbd476 Mon Sep 17 00:00:00 2001 -From: Olaf Kirch -Date: Tue, 20 Aug 2013 09:31:03 +0200 -Subject: [PATCH 03/13] configure: fix the case when --with-rpcuser is not - given +From b3b031b07cc5909aaf964f9d4cf46f6097769320 Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Wed, 21 Aug 2013 14:40:22 -0400 +Subject: [PATCH 03/24] rpcbind: rpcuser not being set in Makefile.am -If --with-rpcuser is not given, we would compile the code with --DRPCBIND_USER='' which is clearly not intended +Commit 8d7a0708 cause a regression where the rpcuser id was not +being set, which in turn cause rpcbind to immediately exit. +This patch removes the extra ',' that was in the AC_ARG_WITH +statement in the configure.ac file. -Signed-off-by: Olaf Kirch +Signed-off-by: Steve Dickson --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch b/0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch similarity index 78% rename from 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch rename to 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch index 4c9d679..7dbae71 100644 --- a/0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch +++ b/0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch @@ -1,7 +1,7 @@ -From a45afd335e7e5965666ac5052a54b3981796b351 Mon Sep 17 00:00:00 2001 +From 2b08a74a9be128a46cefae87354e21e67f506bc0 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 11:43:13 +0200 -Subject: [PATCH 01/13] Silence a warning about setgroups() being implicitly +Subject: [PATCH 04/24] Silence a warning about setgroups() being implicitly defined Signed-off-by: Olaf Kirch diff --git a/0002-Remove-obsolete-function-in6_fillscopeid.patch b/0005-Remove-obsolete-function-in6_fillscopeid.patch similarity index 94% rename from 0002-Remove-obsolete-function-in6_fillscopeid.patch rename to 0005-Remove-obsolete-function-in6_fillscopeid.patch index 1cbd2e2..5db1f77 100644 --- a/0002-Remove-obsolete-function-in6_fillscopeid.patch +++ b/0005-Remove-obsolete-function-in6_fillscopeid.patch @@ -1,7 +1,7 @@ -From 6ec7d84694e560c7e1968b1ba02cbf69802da290 Mon Sep 17 00:00:00 2001 +From f474754a2dee2f0b53435b79800611eebcdff2ac Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 11:43:51 +0200 -Subject: [PATCH 02/13] Remove obsolete function in6_fillscopeid +Subject: [PATCH 05/24] Remove obsolete function in6_fillscopeid This seems to be an old remnant from the very early days of IPv6 when the kernel would include the ifindex in the link-local diff --git a/0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch b/0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch similarity index 91% rename from 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch rename to 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch index e4ccba8..42c8289 100644 --- a/0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch +++ b/0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch @@ -1,7 +1,7 @@ -From 77ccf636447cce013f84ee7b7b09f0fe3adcec87 Mon Sep 17 00:00:00 2001 +From 2dbc060dd45240216ae37217690f974f57a653f6 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 09:11:45 +0200 -Subject: [PATCH 04/13] In init_transport, move creation of COTS sockets +Subject: [PATCH 06/24] In init_transport, move creation of COTS sockets closer to where they are used Signed-off-by: Olaf Kirch diff --git a/0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch b/0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch similarity index 91% rename from 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch rename to 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch index 15e36e9..d524ca0 100644 --- a/0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch +++ b/0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch @@ -1,7 +1,7 @@ -From 369cc50768a9929ef0adf4b58987ce08cc3675b6 Mon Sep 17 00:00:00 2001 +From 18c451ad482debbe7dab00699f4df8b075cee112 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 09:12:49 +0200 -Subject: [PATCH 05/13] The use of AI_NUMERICHOST in init_transport() is +Subject: [PATCH 07/24] The use of AI_NUMERICHOST in init_transport() is broken. In its current form, when seeing a dotted quad or a numeric IPv6 address, diff --git a/0006-First-part-of-init_transport-refactoring.patch b/0008-First-part-of-init_transport-refactoring.patch similarity index 99% rename from 0006-First-part-of-init_transport-refactoring.patch rename to 0008-First-part-of-init_transport-refactoring.patch index c3fa620..ce0421d 100644 --- a/0006-First-part-of-init_transport-refactoring.patch +++ b/0008-First-part-of-init_transport-refactoring.patch @@ -1,7 +1,7 @@ -From 9cea37f331fe76a9690e93677999cc47f3f70631 Mon Sep 17 00:00:00 2001 +From 5388d9b484838437c364aed925f3f6acb021264d Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 09:26:37 +0200 -Subject: [PATCH 06/13] First part of init_transport refactoring +Subject: [PATCH 08/24] First part of init_transport refactoring This patch splits out the hostname resolution and socket creation/binding code into individual functions, and calls those from init_transport instead. diff --git a/0007-init_transport-move-the-registration-code-into-a-sep.patch b/0009-init_transport-move-the-registration-code-into-a-sep.patch similarity index 98% rename from 0007-init_transport-move-the-registration-code-into-a-sep.patch rename to 0009-init_transport-move-the-registration-code-into-a-sep.patch index 57e01ca..78baec6 100644 --- a/0007-init_transport-move-the-registration-code-into-a-sep.patch +++ b/0009-init_transport-move-the-registration-code-into-a-sep.patch @@ -1,7 +1,7 @@ -From a43a3b1ab5545d835af2867c343ee195a6256665 Mon Sep 17 00:00:00 2001 +From bf8bb37d6265f986fed55afc3f15b9e526da2226 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 09:49:15 +0200 -Subject: [PATCH 07/13] init_transport: move the registration code into a +Subject: [PATCH 09/24] init_transport: move the registration code into a separate function Signed-off-by: Olaf Kirch diff --git a/0008-Fix-the-behavior-when-specifying-the-h-option.patch b/0010-Fix-the-behavior-when-specifying-the-h-option.patch similarity index 96% rename from 0008-Fix-the-behavior-when-specifying-the-h-option.patch rename to 0010-Fix-the-behavior-when-specifying-the-h-option.patch index 672acca..08af324 100644 --- a/0008-Fix-the-behavior-when-specifying-the-h-option.patch +++ b/0010-Fix-the-behavior-when-specifying-the-h-option.patch @@ -1,7 +1,7 @@ -From 2a825515a2b6304e27f0e28fd5da562d44d6cbfe Mon Sep 17 00:00:00 2001 +From 774ccd8224f8a6b76fce4204d3084ffb8cc09e5f Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 09:58:51 +0200 -Subject: [PATCH 08/13] Fix the behavior when specifying the -h option +Subject: [PATCH 10/24] Fix the behavior when specifying the -h option Currently, when specifying the "-h" option, rpcbind will try to create sockets for all specified addresses, plus the loopback address. However, diff --git a/0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch b/0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch similarity index 94% rename from 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch rename to 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch index e86f19c..5176407 100644 --- a/0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch +++ b/0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch @@ -1,7 +1,7 @@ -From 734101ba29f0b169d72e8ec6de6d924922f1583c Mon Sep 17 00:00:00 2001 +From 038db9589e4cf64b0a7307132d08bfa4547d59b1 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 10:10:41 +0200 -Subject: [PATCH 09/13] Clean up the way we handle the -h option in +Subject: [PATCH 11/24] Clean up the way we handle the -h option in init_transport There's some odd realloc()ing going on, which is plain ugly. @@ -13,7 +13,7 @@ Signed-off-by: Olaf Kirch 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index c3679e2..1d59362 100644 +index c3679e2..3b753c6 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -632,52 +632,46 @@ init_transport(struct netconfig *nconf) diff --git a/0010-Support-systemd-activation.patch b/0012-Support-systemd-activation.patch similarity index 98% rename from 0010-Support-systemd-activation.patch rename to 0012-Support-systemd-activation.patch index d0ff04d..0ce4643 100644 --- a/0010-Support-systemd-activation.patch +++ b/0012-Support-systemd-activation.patch @@ -1,7 +1,7 @@ -From c3ec796dd8f177a3c6ab9b76de490dbfe2c86476 Mon Sep 17 00:00:00 2001 +From d92c22d7e8d476b7772ce4e3d8e23200d0048b45 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 11:26:42 +0200 -Subject: [PATCH 10/13] Support systemd activation. +Subject: [PATCH 12/24] Support systemd activation. This code is loosely based on previous work by Tom Gundersen . @@ -67,7 +67,7 @@ index 1cf42d3..a94933b 100644 AC_CHECK_LIB([wrap], [hosts_access], , AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 1d59362..32e6deb 100644 +index 3b753c6..baf1ac0 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -56,6 +56,9 @@ diff --git a/0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch b/0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch similarity index 94% rename from 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch rename to 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch index e99f45e..fb8dfc9 100644 --- a/0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch +++ b/0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch @@ -1,7 +1,7 @@ -From 994e57f91c58e9e88c9f793e948e8d3af6ff4528 Mon Sep 17 00:00:00 2001 +From 487918f173a899ce39b426ceeaa830d3c45fbd2d Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Tue, 20 Aug 2013 15:20:13 +0200 -Subject: [PATCH 11/13] socket-activation: Fix rpcbind.service to use separate +Subject: [PATCH 13/24] socket-activation: Fix rpcbind.service to use separate sockets systemd will, by default, pass a socket that provides both IPv4 and @@ -18,7 +18,7 @@ Signed-off-by: Jeff Mahoney 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 32e6deb..d2b25fa 100644 +index baf1ac0..aec0510 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -50,6 +50,7 @@ diff --git a/0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch b/0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch similarity index 99% rename from 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch rename to 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch index 3361975..0496449 100644 --- a/0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch +++ b/0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch @@ -1,7 +1,7 @@ -From 2eae383ebb716b27a6ac0aa2c0c2288f92b56b4e Mon Sep 17 00:00:00 2001 +From 3ac02ec367c314770774c4c9f82e8c2c75c7a28c Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 15:59:17 +0200 -Subject: [PATCH 12/13] When using systemd, redirect syslog() calls to the +Subject: [PATCH 14/24] When using systemd, redirect syslog() calls to the systemd journal Signed-off-by: Olaf Kirch @@ -123,7 +123,7 @@ index f6bd6bd..1a4ad84 100644 } pml->pml_map = pmap; diff --git a/src/rpcbind.c b/src/rpcbind.c -index d2b25fa..964c2d3 100644 +index aec0510..50c042c 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -59,18 +59,20 @@ diff --git a/0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch b/0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch similarity index 85% rename from 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch rename to 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch index bf252c0..75759ab 100644 --- a/0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch +++ b/0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch @@ -1,7 +1,7 @@ -From 417e4dc9a33711843a36c700fbc3ce1d7a823a0d Mon Sep 17 00:00:00 2001 +From 117cc8049b1dec667507f7824ccae3cd1d8b31fb Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 20 Aug 2013 16:01:59 +0200 -Subject: [PATCH 13/13] When using systemd activation, make rpcbind notify +Subject: [PATCH 15/24] When using systemd activation, make rpcbind notify system when ready to service requests Signed-off-by: Olaf Kirch @@ -11,7 +11,7 @@ Signed-off-by: Olaf Kirch 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 964c2d3..7fa6baf 100644 +index 50c042c..6d1f1a3 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -260,7 +260,10 @@ main(int argc, char *argv[]) diff --git a/0014-Notify-systemd-unconditionally.patch b/0016-Notify-systemd-unconditionally.patch similarity index 87% rename from 0014-Notify-systemd-unconditionally.patch rename to 0016-Notify-systemd-unconditionally.patch index 9aea558..ddc3463 100644 --- a/0014-Notify-systemd-unconditionally.patch +++ b/0016-Notify-systemd-unconditionally.patch @@ -1,7 +1,7 @@ -From 95d8dc18699638313a2b9bd3dcd3b84eaed432d8 Mon Sep 17 00:00:00 2001 +From 114b974116d44201a4dba6b7e9311f0ffb318ee3 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Fri, 10 Jan 2014 11:29:40 +0100 -Subject: [PATCH 14/14] Notify systemd unconditionally +Subject: [PATCH 16/24] Notify systemd unconditionally rpcbind may be started from systemd with or without socket activation. However, in both cases systemd would expect to be notified of successful @@ -16,7 +16,7 @@ Signed-off-by: Olaf Kirch 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 7fa6baf..8df2950 100644 +index 6d1f1a3..b070c32 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -260,9 +260,13 @@ main(int argc, char *argv[]) diff --git a/0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch b/0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch similarity index 83% rename from 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch rename to 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch index a52b3fa..6118eec 100644 --- a/0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch +++ b/0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch @@ -1,7 +1,7 @@ -From 565692c3c88c6e94f31fb511c374d5a9f3c31075 Mon Sep 17 00:00:00 2001 +From 343c55b1137efae9e7d469ec5b5972ca70f1cc80 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 14 Jan 2014 16:19:04 +0100 -Subject: [PATCH 15/15] Pull the sysconfig file into rpcbind.service and use +Subject: [PATCH 17/24] Pull the sysconfig file into rpcbind.service and use Signed-off-by: Olaf Kirch --- diff --git a/0016-configure-check-for-nss.h.patch b/0018-configure-check-for-nss.h.patch similarity index 87% rename from 0016-configure-check-for-nss.h.patch rename to 0018-configure-check-for-nss.h.patch index ae312c3..abd9cf6 100644 --- a/0016-configure-check-for-nss.h.patch +++ b/0018-configure-check-for-nss.h.patch @@ -1,7 +1,7 @@ -From 0be5e1d603226b3226e4204f67471788eacf475c Mon Sep 17 00:00:00 2001 +From 87b31d8406e6049fb4facfc483f4d8c9339d6f46 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Tue, 14 Jan 2014 16:40:55 +0100 -Subject: [PATCH 17/17] configure: check for +Subject: [PATCH 18/24] configure: check for There's code in rpcbind that tries to configure nss lookups so that it avoids NIS when resolving user names or service names. Unfortunately, this diff --git a/0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch b/0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch similarity index 96% rename from 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch rename to 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch index 1629491..361b801 100644 --- a/0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch +++ b/0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch @@ -1,7 +1,7 @@ -From c5033b0f86f3e6a45dcb6cc1d8b5700f1fbba0b8 Mon Sep 17 00:00:00 2001 +From 409c1b26b8134589d13768a37ebffd3ff7d031db Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 11:49:15 +0100 -Subject: [PATCH 18/23] rpcinfo ip_ping: clean up client ping/create/destroy +Subject: [PATCH 19/24] rpcinfo ip_ping: clean up client ping/create/destroy The code doing the actual RPC NULL calls and the handling of VERSMISMATCH was a bit convoluted. We would destroy and re-create diff --git a/0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch b/0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch similarity index 96% rename from 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch rename to 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch index 1b3c65a..a41e118 100644 --- a/0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch +++ b/0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch @@ -1,7 +1,7 @@ -From 0a3522bab588d8308769f8696e3e7bc9fe5eb5af Mon Sep 17 00:00:00 2001 +From 45e77bd50177044aad7812a613b03188d115f665 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 11:43:37 +0100 -Subject: [PATCH 19/23] rpcinfo: introduce new helper function ip_getclient +Subject: [PATCH 20/24] rpcinfo: introduce new helper function ip_getclient This function tries to obtain the address of a given host/program/version, using the specified protocol (one of udp or tcp), and create a client diff --git a/0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch b/0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch similarity index 93% rename from 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch rename to 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch index e388036..5e917ab 100644 --- a/0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch +++ b/0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch @@ -1,7 +1,7 @@ -From 00ad3e8c82610179177d02c5490c941907fcd109 Mon Sep 17 00:00:00 2001 +From feb828a6db505451e053e4f73332071d53a75c42 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 12:26:40 +0100 -Subject: [PATCH 20/23] rpcinfo: make -t/-u options support IPv6 addresses, +Subject: [PATCH 21/24] rpcinfo: make -t/-u options support IPv6 addresses, too Currently, rpcinfo supports two ways to test whether a given diff --git a/0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch b/0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch similarity index 92% rename from 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch rename to 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch index 622ca3b..9987d52 100644 --- a/0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch +++ b/0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch @@ -1,7 +1,7 @@ -From 59ac2533d7eb9e9f7faed968846d4b11cc2c3123 Mon Sep 17 00:00:00 2001 +From a7b8fdf863eca0d992597ff853fd95cb4e375358 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 12:51:29 +0100 -Subject: [PATCH 21/23] rpcinfo: remove obsolete function clnt_com_create +Subject: [PATCH 22/24] rpcinfo: remove obsolete function clnt_com_create Signed-off-by: Olaf Kirch --- diff --git a/0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch b/0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch similarity index 91% rename from 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch rename to 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch index 38b4261..502d453 100644 --- a/0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch +++ b/0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch @@ -1,7 +1,7 @@ -From b0921131b08c81c33498c6b0b91f8ddf55d73e2f Mon Sep 17 00:00:00 2001 +From efe7c73ea490f9cd184fa974f1a4d67bd93d8269 Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 13:08:18 +0100 -Subject: [PATCH 22/23] Make rpcinfo -p support IPv6 addresses, too +Subject: [PATCH 23/24] Make rpcinfo -p support IPv6 addresses, too While this is not strictly necessary (you can use "rpcinfo " instead), some older scripts may rely on rpcinfo to work with just about any hostname. diff --git a/0023-rpcinfo-remove-obsolete-function-get_inet_address.patch b/0024-rpcinfo-remove-obsolete-function-get_inet_address.patch similarity index 93% rename from 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch rename to 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch index b1be713..2e3ec22 100644 --- a/0023-rpcinfo-remove-obsolete-function-get_inet_address.patch +++ b/0024-rpcinfo-remove-obsolete-function-get_inet_address.patch @@ -1,7 +1,7 @@ -From f1190d2cb5331282e7b3dda7dcf08d9832d183dd Mon Sep 17 00:00:00 2001 +From c2d5de2c81e9d8d4cdaaafa2b7ae925c6e62c5ad Mon Sep 17 00:00:00 2001 From: Olaf Kirch Date: Mon, 20 Jan 2014 13:09:46 +0100 -Subject: [PATCH 23/23] rpcinfo: remove obsolete function get_inet_address +Subject: [PATCH 24/24] rpcinfo: remove obsolete function get_inet_address Signed-off-by: Olaf Kirch --- diff --git a/rpcbind-0.2.1_git1b0fdf5.tar.bz2 b/rpcbind-0.2.1_git1b0fdf5.tar.bz2 deleted file mode 100644 index 7aa38e9..0000000 --- a/rpcbind-0.2.1_git1b0fdf5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fde689ddaf775c092a10012281fa4b8fcbbcee77ccf1b0784feed45c523b604 -size 49282 diff --git a/rpcbind-0.2.1_rc4.tar.bz2 b/rpcbind-0.2.1_rc4.tar.bz2 new file mode 100644 index 0000000..ac1cd0a --- /dev/null +++ b/rpcbind-0.2.1_rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66c75f8a7400c4c8608d861a32fbce26facd424e98663c4669ad786977691e9d +size 457513 diff --git a/rpcbind.changes b/rpcbind.changes index 990c35f..9d0f2cf 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,5 +1,41 @@ ------------------------------------------------------------------- -Mon Jan 20 12:26:55 UTC 2014 - okir@suse.com +Thu Jan 23 16:58:25 UTC 2014 - okir@suse.com + +- Fixed rpc broadcast handling (bnc#857324) + Upgraded to upstream 0.2.1-rc4 as part of this, and rebased the + patch set. + + Added: + 0001-Fix-building-one-systems-w-out-nss.h.patch + 0002-Rename-configure.in-to-configure.ac.patch + 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch + Deleted (already upstream): + 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch + Renumbered (previous numbering shown below): + 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch + 0002-Remove-obsolete-function-in6_fillscopeid.patch + 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch + 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch + 0006-First-part-of-init_transport-refactoring.patch + 0007-init_transport-move-the-registration-code-into-a-sep.patch + 0008-Fix-the-behavior-when-specifying-the-h-option.patch + 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch + 0010-Support-systemd-activation.patch + 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch + 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch + 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch + 0014-Notify-systemd-unconditionally.patch + 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch + 0016-configure-check-for-nss.h.patch + 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch + 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch + 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch + 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch + 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch + 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch + +------------------------------------------------------------------- +Mon Jan 20 12:20:02 UTC 2014 - okir@suse.com - Make rpcinfo -p/-u/-t options support IPv6 (bnc# 859448) Added: diff --git a/rpcbind.spec b/rpcbind.spec index 340445c..3dfa95a 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -17,12 +17,12 @@ Name: rpcbind -Version: 0.2.1_git1b0fdf5 +Version: 0.2.1_rc4 Release: 0 Summary: Transport independent RPC portmapper License: BSD-4-Clause Group: Productivity/Networking/System -Url: http://git.infradead.org/users/steved/rpcbind.git +Url: git://git.infradead.org/users/steved/rpcbind.git Source: %{name}-%{version}.tar.bz2 Source2: sysconfig.rpcbind Source3: rpcbind.xml @@ -33,28 +33,32 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: tcpd-devel PreReq: %fillup_prereq -Patch0: 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch -Patch1: 0002-Remove-obsolete-function-in6_fillscopeid.patch -Patch2: 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch -Patch3: 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch -Patch4: 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch -Patch5: 0006-First-part-of-init_transport-refactoring.patch -Patch6: 0007-init_transport-move-the-registration-code-into-a-sep.patch -Patch7: 0008-Fix-the-behavior-when-specifying-the-h-option.patch -Patch8: 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch -Patch9: 0010-Support-systemd-activation.patch -Patch10: 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch -Patch11: 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch -Patch12: 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch -Patch13: 0014-Notify-systemd-unconditionally.patch -Patch14: 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch -Patch15: 0016-configure-check-for-nss.h.patch -Patch16: 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch -Patch17: 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch -Patch18: 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch -Patch19: 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch -Patch20: 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch -Patch21: 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch + +# The next three are from upstream, applied directly on top of rc4. +Patch0: 0001-Fix-building-one-systems-w-out-nss.h.patch +Patch1: 0002-Rename-configure.in-to-configure.ac.patch +Patch2: 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch +Patch3: 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch +Patch4: 0005-Remove-obsolete-function-in6_fillscopeid.patch +Patch5: 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch +Patch6: 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch +Patch7: 0008-First-part-of-init_transport-refactoring.patch +Patch8: 0009-init_transport-move-the-registration-code-into-a-sep.patch +Patch9: 0010-Fix-the-behavior-when-specifying-the-h-option.patch +Patch10: 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch +Patch11: 0012-Support-systemd-activation.patch +Patch12: 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch +Patch13: 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch +Patch14: 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch +Patch15: 0016-Notify-systemd-unconditionally.patch +Patch16: 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch +Patch17: 0018-configure-check-for-nss.h.patch +Patch18: 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch +Patch19: 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch +Patch20: 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch +Patch21: 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch +Patch22: 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch +Patch23: 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch %define statefile /var/lib/portmap.state BuildRequires: pkgconfig(systemd) @@ -100,6 +104,8 @@ cp %{SOURCE4} . %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 +%patch23 -p1 %build autoreconf -fiv