main/rpcbind: use 'rpc' as user, fix startup

5 files changed, 50 insertions, 7 deletions

diff --git a/main/rpcbind/APKBUILD b/main/rpcbind/APKBUILD
index 46a1a6e89f..f99eaaac0e 100644
--- a/main/rpcbind/APKBUILD
+++ b/main/rpcbind/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rpcbind
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="portmap replacement which supports RPC over various protocols"
 url="http://rpcbind.sourceforge.net"
 arch="all"
 license="custom"
 depends=
-makedepends="libtirpc-dev"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+makedepends="libtirpc-dev autoconf automake"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	0002-uclibc-rpcsvc-defines.patch
+	rpcbind-0.2.1-rpcuser.patch
 	rpcbind.initd
 	rpcbind.confd"
 
@@ -22,6 +24,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	autoreconf -fisv || return 1
 }
 
 build() {
@@ -31,6 +34,10 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--bindir=/sbin \
+		--enable-warmstarts \
+		--with-statedir=/var/lib/rpcbind \
+		--with-rpcuser=rpc \
+		--enable-debug \
 		|| return 1
 	make || return 1
 }
@@ -44,13 +51,16 @@ package() {
 }
 md5sums="0a5f9c2142af814c55d957aaab3bcc68  rpcbind-0.2.1.tar.bz2
 944234c5ef6902d25bd6dfc95f979ed6  0002-uclibc-rpcsvc-defines.patch
+05a4f6558dbfe4c69574ff3a8fee250d  rpcbind-0.2.1-rpcuser.patch
 381a2722c69b4597af532381f1ffeae0  rpcbind.initd
-1ad5c8dcf432c8f23ba740f4c32a7c60  rpcbind.confd"
+2517c71cdb08f133b0d50055a44c56de  rpcbind.confd"
 sha256sums="da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e  rpcbind-0.2.1.tar.bz2
 a1970cbe4bcc4704dba49e4a2c5be5105a631d9067c4d5cb5b073e62b5d90c65  0002-uclibc-rpcsvc-defines.patch
+ba5d2f25b9c06b057da97418fd479b511e1d16dc7f300173383c33904f1890bd  rpcbind-0.2.1-rpcuser.patch
 674d5af3957c81ff4bd97811d88e064b75f742c351b63c51c397d3779fb57604  rpcbind.initd
-38bb95aefc38d843d0890d9c15affd28f19f2133c17f463396c62970e7e2dffc  rpcbind.confd"
+55bcd47a4d0f194f09e6abb13695853459f869b54ce09ef051e55efcd8ad3903  rpcbind.confd"
 sha512sums="5ec1e25c64ad3cd80fc2f14ced64a331afbe896fb3da54c812e3c4a78a69df181f607492762fe852732cc0ac9bd87ee118760b9e7fad2b3f028d581fecc93849  rpcbind-0.2.1.tar.bz2
 8750c9b2b44daf42f35ec1c72c52497872724cd40951f7f3d34ca60cab9e291eb00f3b2d0ca9b0985c0877a80f8279a35f14a1ecf64a991e8650af5221a094f6  0002-uclibc-rpcsvc-defines.patch
+f9836d2a0d4fa11a9033bdf654637645e977d27e01e6fe232f67d92e9c6ffb4124d9191101148cb9cf4df2672b020f5cfebc5f3d54fd5e592c6283ebc29f9833  rpcbind-0.2.1-rpcuser.patch
 9fb26b3a496c616a36f85a3af5580fb364bf404ae040ba8719d30dbdea0ea906cf07e1bc1b4c5f6e4b95b121bbd5b5c687ae17cf26617b2b2981ff7e3ef6d83b  rpcbind.initd
-f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044  rpcbind.confd"
+0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3  rpcbind.confd"
diff --git a/main/rpcbind/rpcbind-0.2.1-rpcuser.patch b/main/rpcbind/rpcbind-0.2.1-rpcuser.patch
new file mode 100644
index 0000000000..426f997e7f
--- /dev/null
+++ b/main/rpcbind/rpcbind-0.2.1-rpcuser.patch
@@ -0,0 +1,26 @@
+commit b3b031b07cc5909aaf964f9d4cf46f6097769320
+Author: Steve Dickson <steved@redhat.com>
+Date:   Wed Aug 21 14:40:22 2013 -0400
+
+    rpcbind: rpcuser not being set in Makefile.am
+    
+    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: Steve Dickson <steved@redhat.com>
+
+diff --git a/configure.ac b/configure.ac
+index 2b67720..1cf42d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@ AC_ARG_WITH([statedir],
+ AC_SUBST([statedir], [$with_statedir])
+ 
+ AC_ARG_WITH([rpcuser],
+-  AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]),
++  AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@])
+   ,, [with_rpcuser=root])
+ AC_SUBST([rpcuser], [$with_rpcuser])
+  
diff --git a/main/rpcbind/rpcbind.confd b/main/rpcbind/rpcbind.confd
index ddc09172d1..973320202a 100644
--- a/main/rpcbind/rpcbind.confd
+++ b/main/rpcbind/rpcbind.confd
@@ -1,4 +1,5 @@
 # /etc/conf.d/rpcbind
- 
+
 # Options for `rpcbind`.
-#RPCBIND_OPTS="-l"
+RPCBIND_OPTS="-w"
+
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
new file mode 100644
index 0000000000..8db3128626
--- /dev/null
+++ b/main/rpcbind/rpcbind.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup -S rpc 2>/dev/null
+adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc rpc 2>/dev/null
+exit 0
diff --git a/main/rpcbind/rpcbind.pre-upgrade b/main/rpcbind/rpcbind.pre-upgrade
new file mode 120000
index 0000000000..1ba8b0c77f
--- /dev/null
+++ b/main/rpcbind/rpcbind.pre-upgrade
@@ -0,0 +1 @@
+rpcbind.pre-install
\ No newline at end of file