From 88d609af69d179307455a13077ddc0af498b843a Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Sun, 14 Oct 2012 12:29:40 -0400
Subject: [PATCH] Fixed typo causing rpcbind to run as root (bz 734598)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 rpcbind-0.2.0-rpcuser.patch | 24 ++++++++++++++++++++++++
 rpcbind.spec                |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 rpcbind-0.2.0-rpcuser.patch

diff --git a/rpcbind-0.2.0-rpcuser.patch b/rpcbind-0.2.0-rpcuser.patch
new file mode 100644
index 0000000..b8a0e00
--- /dev/null
+++ b/rpcbind-0.2.0-rpcuser.patch
@@ -0,0 +1,24 @@
+commit e81d689a6a8605cfc3b90a62a357705e180f532c
+Author: Steve Dickson <steved@redhat.com>
+Date:   Sun Oct 14 12:20:04 2012 -0400
+
+    Fixed typo in Makefile.am which cause rpcbind to run as root
+    
+    Commit 8d7a0708 introduce a regression that cause rpcbind
+    to run as root instead of the user define by RPCBIND_USER
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/Makefile.am b/Makefile.am
+index 9fa608e..d10c906 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
+ 	-DSEVERITY=LOG_INFO \
+ 	-DINET6 \
+ 	-DRPCBIND_STATEDIR="\"$(statedir)\"" \
+-	-DRPCUSER="\"$(rpcuser)\"" \
++	-DRPCBIND_USER="\"$(rpcuser)\"" \
+ 	-D_GNU_SOURCE \
+ 	$(TIRPC_CFLAGS)
+ 
diff --git a/rpcbind.spec b/rpcbind.spec
index 9b481bc..17d8e81 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -12,6 +12,7 @@ Source1: rpcbind.service
 Source2: rpcbind.socket
 
 Patch001: rpcbind-0_2_1-rc3.patch
+Patch002: rpcbind-0.2.0-rpcuser.patch
 
 Requires: glibc-common setup
 Conflicts: man-pages < 2.43-12
@@ -33,6 +34,7 @@ RPC calls on a server on that machine.
 %prep
 %setup -q
 %patch001 -p1
+%patch002 -p1
 
 %build
 %ifarch s390 s390x
@@ -130,6 +132,9 @@ fi
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Sun Oct 14 2012 Steve Dickson <steved@redhat.com> - 0.2.0-18
+- Fixed typo causing rpcbind to run as root (bz 734598)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild