rpcbind: bump version 0.2.3

PATCH New Aurélien Chabot 3 participants 7 messages Jul 19, 2015 – Jul 27, 2015

lore

Share & tools

lore

Aurélien Chabot

author

2015-07-19 21:02 UTC #0 lore raw

PATCH 1/2 rpcbind: bump version 0.2.3

Refreshed patch:
0001-Remove-yellow-pages-support.patch

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/0001-Remove-yellow-pages-support.patch | 16 ++++++++--------
 package/rpcbind/rpcbind.hash                           |  2 +-
 package/rpcbind/rpcbind.mk                             |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

package/rpcbind/0001-Remove-yellow-pages-support.patch +8 -8

index e35828f..314e32e 100644
@@ -1,4 +1,4 @@
-From 249e25c5cc675c212ca4e4a3342bff8f59285b1a Mon Sep 17 00:00:00 2001
+From 226b9c57ff403b407dbf1ff8a615da455a4cbd23 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Sat, 10 Nov 2012 22:03:43 +0100
 Subject: [PATCH] Remove yellow pages support

@@ -13,20 +13,20 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
  1 file changed, 18 deletions(-)
 
 diff --git a/src/security.c b/src/security.c
-index d272f74..8d5863c 100644
+index 0c9453f..abc81bb 100644
 --- a/src/security.c
 +++ b/src/security.c
-@@ -23,9 +23,6 @@
+@@ -24,9 +24,6 @@
  #include <rpcsvc/mount.h>
  #include <rpcsvc/rquota.h>
  #include <rpcsvc/nfs_prot.h>
 -#include <rpcsvc/yp.h>
 -#include <rpcsvc/ypclnt.h>
 -#include <rpcsvc/yppasswd.h>
- 
- #include "rpcbind.h"
- 
-@@ -308,24 +305,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused*
+ #else
+ # define MOUNTPROC_MNT	1
+ # define MOUNTPROC_UMNT	3
+@@ -325,24 +322,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused*
  		    args->rmt_proc != MOUNTPROC_UMNT)
  			break;
  		goto deny;

@@ -52,5 +52,5 @@ index d272f74..8d5863c 100644
  		break;
  	}
 -- 
-2.0.0
+2.4.5

package/rpcbind/rpcbind.hash +1 -1

index 830ef55..5c9ecd1 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e  rpcbind-0.2.1.tar.bz2
+sha256 9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b  rpcbind-0.2.3.tar.bz2

package/rpcbind/rpcbind.mk +2 -1

index b85d88e..d879de1 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPCBIND_VERSION = 0.2.1
+RPCBIND_VERSION = 0.2.3
 RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
 RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c

@@ -14,6 +14,7 @@ RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
+RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
 
 define RPCBIND_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \

Signature · 1 line

2.4.6

Aurélien Chabot

author

2015-07-19 21:02 UTC #1 lore raw

PATCH 2/2 rpcbind: add systemd support

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/rpcbind.mk      | 18 +++++++++++++++++-
 package/rpcbind/rpcbind.service | 10 ++++++++++
 package/rpcbind/rpcbind.socket  |  8 ++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/rpcbind/rpcbind.service
 create mode 100644 package/rpcbind/rpcbind.socket

package/rpcbind/rpcbind.mk +17 -1

index d879de1..5396480 100644
@@ -14,11 +14,27 @@ RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
-RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+	RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+else
+	RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
+define RPCBIND_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service
+	$(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \
+		$(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket
+endef
 
 define RPCBIND_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
 		$(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
+
 $(eval $(autotools-package))

package/rpcbind/rpcbind.service new file +10 -0

new file mode 100644
index 0000000..b7a32a1
@@ -0,0 +1,10 @@
+[Unit]
+Description=RPC bind service
+Requires=rpcbind.socket
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/rpcbind
+
+[Install]
+Also=rpcbind.socket

package/rpcbind/rpcbind.socket new file +8 -0

new file mode 100644
index 0000000..d63c1d9
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target

Signature · 1 line

2.4.6

Maxime Hadjinlian

2015-07-26 22:01 UTC #2 lore raw

PATCH 2/2 rpcbind: add systemd support

Hi Aur?lien, all

Quoted 64 lines · Aur?lien Chabot

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/rpcbind.mk      | 18 +++++++++++++++++-
 package/rpcbind/rpcbind.service | 10 ++++++++++
 package/rpcbind/rpcbind.socket  |  8 ++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/rpcbind/rpcbind.service
 create mode 100644 package/rpcbind/rpcbind.socket

package/rpcbind/rpcbind.mk +17 -1

index d879de1..5396480 100644
@@ -14,11 +14,27 @@ RPCBIND_CONF_ENV += \
        CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
-RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+       RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+else
+       RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
+define RPCBIND_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \
+               $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service
+       $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \
+               $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
+       ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \
+               $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket
+endef
 
 define RPCBIND_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
                $(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
+
 $(eval $(autotools-package))

package/rpcbind/rpcbind.service new file +10 -0

new file mode 100644
index 0000000..b7a32a1
@@ -0,0 +1,10 @@
+[Unit]
+Description=RPC bind service
+Requires=rpcbind.socket
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/rpcbind
+
+[Install]
+Also=rpcbind.socket

package/rpcbind/rpcbind.socket new file +0 -0

new file mode 100644
index 0000000..d63c1d9

package/rpcbind/rpcbind.socket line 8

Quoted 8 lines

package/rpcbind/rpcbind.socket new file +8 -0

@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target

Did you took them from Arch Linux ? It doesn't really matter, just nice to add a note if you took them from their repo. Also, there was some modification on rpcbind, and your patch doesn't apply anymore, nothing that can't be fixed though.

Acked-by Maxime Hadjinlian <[email protected]>

Quoted 7 lines

--
2.4.6
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Aurélien Chabot

author

2015-07-27 19:37 UTC #3 lore raw

PATCH 2/2 rpcbind: add systemd support

Quoted 69 lines · Maxime Hadjinlian

Hi Aur?lien, all

Quoted 14 lines · Aur?lien Chabot

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/rpcbind.mk      | 18 +++++++++++++++++-
 package/rpcbind/rpcbind.service | 10 ++++++++++
 package/rpcbind/rpcbind.socket  |  8 ++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/rpcbind/rpcbind.service
 create mode 100644 package/rpcbind/rpcbind.socket

package/rpcbind/rpcbind.mk +0 -0

index d879de1..5396480 100644

package/rpcbind/rpcbind.mk RPCBIND_CONF_ENV += \ · line 19

Quoted 7 lines

package/rpcbind/rpcbind.mk +3 -1

@@ -14,11 +14,27 @@ RPCBIND_CONF_ENV += \
        CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
-RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+       RPCBIND_CONF_OPTS +=

--with-systemdsystemunitdir=/usr/lib/systemd/system

package/rpcbind/rpcbind.mk RPCBIND_CONF_ENV += \ · line 39

Quoted 12 lines

package/rpcbind/rpcbind.mk +12 -0

+else
+       RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
+define RPCBIND_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \
+               $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service
+       $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \
+               $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
+       ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \
+

$(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket

Review

Quoted 10 lines

package/rpcbind/rpcbind.mk +2 -0

+endef
 
 define RPCBIND_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
                $(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
+
 $(eval $(autotools-package))

(quoted diff) +0 -0

b/package/rpcbind/rpcbind.service

Review

Quoted 16 lines

new file mode 100644
index 0000000..b7a32a1
package/rpcbind/rpcbind.service new file +10 -0
@@ -0,0 +1,10 @@
+[Unit]
+Description=RPC bind service
+Requires=rpcbind.socket
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/rpcbind
+
+[Install]
+Also=rpcbind.socket
(quoted diff) +0 -0

b/package/rpcbind/rpcbind.socket

Quoted 16 lines

package/rpcbind/rpcbind.socket line 8
Quoted 13 lines
new file mode 100644
index 0000000..d63c1d9
package/rpcbind/rpcbind.socket new file +8 -0
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target
Did you took them from Arch Linux ? It doesn't really matter, just nice to add a note if you took them from their repo.

Yes, I took them from ArchLinux. I'll put a note on the commit message.

Quoted 3 lines

Also, there was some modification on rpcbind, and your patch doesn't apply anymore, nothing that can't be fixed though.

I'll do a new revision of the patch ASAP.

Quoted 10 lines

Acked-by Maxime Hadjinlian <[email protected]>
Quoted 7 lines
--
2.4.6
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150727/ce632bdd/attachment.html>

Aurélien Chabot

author

2015-07-27 21:27 UTC #4 lore raw

PATCH 1/1 rpcbind: add systemd support

In reply to Aurélien Chabot

Service and socket files come from ArchLinux.

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/rpcbind.mk      | 18 +++++++++++++++++-
 package/rpcbind/rpcbind.service | 10 ++++++++++
 package/rpcbind/rpcbind.socket  |  8 ++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/rpcbind/rpcbind.service
 create mode 100644 package/rpcbind/rpcbind.socket

package/rpcbind/rpcbind.mk +17 -1

index 1e28af9..97c5bbb 100644
@@ -14,11 +14,27 @@ RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
 RPCBIND_DEPENDENCIES += libtirpc host-pkgconf
 RPCBIND_CONF_OPTS += --with-rpcuser=root
-RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+	RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+else
+	RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+endif
+
+define RPCBIND_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service
+	$(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \
+		$(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket
+endef
 
 define RPCBIND_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
 		$(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
+
 $(eval $(autotools-package))

package/rpcbind/rpcbind.service new file +10 -0

new file mode 100644
index 0000000..b7a32a1
@@ -0,0 +1,10 @@
+[Unit]
+Description=RPC bind service
+Requires=rpcbind.socket
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/rpcbind
+
+[Install]
+Also=rpcbind.socket

package/rpcbind/rpcbind.socket new file +8 -0

new file mode 100644
index 0000000..d63c1d9
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPCbind Server Activation Socket
+
+[Socket]
+ListenStream=/var/run/rpcbind.sock
+
+[Install]
+WantedBy=sockets.target

Signature · 1 line

2.4.6

Thomas Petazzoni

2015-07-27 21:46 UTC #5 lore raw

PATCH 2/2 rpcbind: add systemd support

In reply to Aurélien Chabot

Dear Aur?lien Chabot,

Quoted 8 lines · Aur?lien Chabot

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/rpcbind.mk      | 18 +++++++++++++++++-
 package/rpcbind/rpcbind.service | 10 ++++++++++
 package/rpcbind/rpcbind.socket  |  8 ++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 package/rpcbind/rpcbind.service
 create mode 100644 package/rpcbind/rpcbind.socket

I've applied after:

[Thomas:
- fix indentation
- indicate source of systemd files.]

The indentation was wrong on:

+ifeq ($(BR2_INIT_SYSTEMD),y)
+ RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+else
+ RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no
+endif

The RPCBIND_CONF_OPTS lines should not be indented. That's just a pure Buildroot convention, of course.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2015-07-19 21:18 UTC #6 lore raw

PATCH 1/2 rpcbind: bump version 0.2.3

In reply to Aurélien Chabot

Dear Aur?lien Chabot,

Quoted 9 lines · Aur?lien Chabot

Refreshed patch:
0001-Remove-yellow-pages-support.patch

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/rpcbind/0001-Remove-yellow-pages-support.patch | 16 ++++++++--------
 package/rpcbind/rpcbind.hash                           |  2 +-
 package/rpcbind/rpcbind.mk                             |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com