From 4443f3b4bb7f2fbd7d7df3bafb2c7eac51cd74c3 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 18 May 2014 22:32:45 -0400
Subject: [PATCH] Update to libtirpc and rpcbind

---
 stage3/hv-install-1 |  4 ++--
 stage3/pkg/libtirpc |  7 +++++--
 stage3/pkg/rpcbind  | 10 ++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 48c5838..a358784 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -10,7 +10,7 @@ ipkg -m noac ${BASHCOMPLETION}
 ipkg ${WHICH}
 ipkg -m acnb ${REISERFSPROGS}
 ipkg -m acnb ${POPT}
-CFLAGS="${CFLAGS} -fPIC" ipkg -m acnb ${LIBTIRPC}
+ipkg -m acnb ${LIBTIRPC} "--disable-static --disable-gssapi"
 ipkg ${PAM}
 ipkg ${SHADOW}
 ipkg -m noac ${OPENSSL}
@@ -47,7 +47,7 @@ ipkg -m acnb ${HTOP}
 
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
-ipkg -m acnb ${RPCBIND} "--bindir=/sbin"
+ipkg -m acnb ${RPCBIND} "--bindir=/sbin --with-rpcuser=root"
 LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} " \
     --disable-nfsv4 \
     --disable-nfsv41 \
diff --git a/stage3/pkg/libtirpc b/stage3/pkg/libtirpc
index 1bd59f5..d8f79d0 100644
--- a/stage3/pkg/libtirpc
+++ b/stage3/pkg/libtirpc
@@ -2,6 +2,9 @@
 
 hvconfig_pre()
 {
+    # WARNING: THIS SHOULD be replaced by --enable-obsolete-rpc in glibc installation...
+    # Then remove package ${RPCNIS_HEADERS}.......
+
     # Glibc-2.14 and later do not install NIS and RPC related headers by
     # default. If needed, install them here:
     if [ ! -r /usr/include/rpc/rpc.h ]; then
@@ -9,8 +12,8 @@ hvconfig_pre()
     fi
 
     # Need autoreconf after applying patch
-    cd /tmp/${PACKAGE}
-    autoreconf
+    cd ${LFS_TMP}/${PACKAGE}
+    autoreconf -i
 }
 
 hvbuild_post()
diff --git a/stage3/pkg/rpcbind b/stage3/pkg/rpcbind
index 71a0b02..1c6c0bb 100644
--- a/stage3/pkg/rpcbind
+++ b/stage3/pkg/rpcbind
@@ -1,9 +1,15 @@
 #!/bin/bash
 
-hvbuild_post()
+hvconfig_pre()
 {
-    sed -i -e 's/^sunrpc/rpcbind/' /etc/services
+    cd ${LFS_TMP}/${PACKAGE}
+
+    sed -i '/servname/s:rpcbind:sunrpc:' src/rpcbind.c
+    sed -i '/error = getaddrinfo/s:rpcbind:sunrpc:' src/rpcinfo.c
+}
 
+hvbuild_post()
+{
     install -v -m740 ${SCRDIR}/bootscripts/rpcbind /etc/rc.d/init.d
     bootscript_add_rc3 rpcbind 10 75
 }
-- 
2.20.1