From 87891902c3033b474f7aa97863341ccf47022cc7 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mon, 18 Aug 2014 12:04:07 -0400
Subject: [PATCH] Updated to the latest rc release: rpcbind-0_2_2-rc1

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 .gitignore              |  2 ++
 rpcbind-0.2.2-rc1.patch | 34 ++++++++++++++++++++++++++++++++++
 rpcbind.spec            |  7 +++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 rpcbind-0.2.2-rc1.patch

diff --git a/.gitignore b/.gitignore
index 8d43eb4..d6a7155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 rpcbind-0.2.0.tar.bz2
 *.rpm
 /rpcbind-0.2.1.tar.bz2
+rpcbind-0.2.0
+rpcbind-0.2.1
diff --git a/rpcbind-0.2.2-rc1.patch b/rpcbind-0.2.2-rc1.patch
new file mode 100644
index 0000000..da78d03
--- /dev/null
+++ b/rpcbind-0.2.2-rc1.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 747a8bf..39181f0 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/src/util.c b/src/util.c
+index 9a5fb69..7d56479 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -101,12 +101,14 @@ static void
+ in6_fillscopeid(struct sockaddr_in6 *sin6)
+ {
+ 	u_int16_t ifindex;
++	u_int16_t *addr;
+ 
+         if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
+-		ifindex = ntohs(*(u_int16_t *)&sin6->sin6_addr.s6_addr[2]);
++		addr = (u_int16_t *)&sin6->sin6_addr.s6_addr[2];
++		ifindex = ntohs(*addr);
+ 		if (sin6->sin6_scope_id == 0 && ifindex != 0) {
+ 			sin6->sin6_scope_id = ifindex;
+-			*(u_int16_t *)&sin6->sin6_addr.s6_addr[2] = 0;
++			*addr = 0;
+ 		}
+ 	}
+ }
diff --git a/rpcbind.spec b/rpcbind.spec
index 7806cf0..ff9234d 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.1
-Release:        0.4%{?dist}
+Release:        1.0%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -24,7 +24,7 @@ Requires(postun): systemd-units coreutils
 Provides: portmap = %{version}-%{release}
 Obsoletes: portmap <= 4.0-65.3
 
-Patch001: rpcbind-0.2.1-rpcuser.patch
+Patch001: rpcbind-0.2.2-rc1.patch
 
 %description
 The rpcbind utility is a server that converts RPC program numbers into
@@ -134,6 +134,9 @@ fi
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Mon Aug 18 2014 Steve Dickson <steved@redhat.com> - 0.2.1-1.0
+- Updated to the latest rc release: rpcbind-0_2_2-rc1
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-0.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild