From 8da79f75c9041b6391f7e100b690e4297c356d0a Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Fri, 29 May 2015 12:17:31 -0600
Subject: Remove x86 architecture limitations

- PKI Trac Ticket #1392 - Remove i686/x86_64 architecture
---
 base/tps-client/apache/pki_instance_command_wrapper | 21 ---------------------
 .../tps-client/apache/pki_subsystem_command_wrapper | 19 -------------------
 base/tps-client/scripts/nss_pcache                  | 12 +-----------
 3 files changed, 1 insertion(+), 51 deletions(-)

(limited to 'base/tps-client')

diff --git a/base/tps-client/apache/pki_instance_command_wrapper b/base/tps-client/apache/pki_instance_command_wrapper
index 8ecef8075..45ce79503 100644
--- a/base/tps-client/apache/pki_instance_command_wrapper
+++ b/base/tps-client/apache/pki_instance_command_wrapper
@@ -81,32 +81,11 @@ ARCHITECTURE=""
 if [ "${OS}" = "Linux" ] ; then
 	ARCHITECTURE=`arch`
 	if [ "${ARCHITECTURE}" = "i686" ] ; then
-		LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/var/lib/${INSTANCE}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/java/dirsec:${LD_LIBRARY_PATH}
-		export LD_LIBRARY_PATH
-
 		PATH=/usr/lib/${PRODUCT}:/bin
 		PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${PATH}
 		PATH=/var/lib/${INSTANCE}:${PATH}
 		export PATH
 	elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
-		LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/var/lib/${INSTANCE}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/java/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/java:/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/java/dirsec:${LD_LIBRARY_PATH}
-		export LD_LIBRARY_PATH
-
 		PATH=/usr/lib/${PRODUCT}
 		PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${PATH}
 		PATH=/var/lib/${INSTANCE}:${PATH}
diff --git a/base/tps-client/apache/pki_subsystem_command_wrapper b/base/tps-client/apache/pki_subsystem_command_wrapper
index 4285b767a..9a995c117 100644
--- a/base/tps-client/apache/pki_subsystem_command_wrapper
+++ b/base/tps-client/apache/pki_subsystem_command_wrapper
@@ -80,29 +80,10 @@ ARCHITECTURE=""
 if [ "${OS}" = "Linux" ] ; then
 	ARCHITECTURE=`arch`
 	if [ "${ARCHITECTURE}" = "i686" ] ; then
-		LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/java/dirsec:${LD_LIBRARY_PATH}
-		export LD_LIBRARY_PATH
-
 		PATH=/usr/lib/${PRODUCT}:/bin
 		PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${PATH}
 		export PATH
 	elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
-		LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib/java/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/java:/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/${PRODUCT}/${SUBSYSTEM}:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/dirsec:${LD_LIBRARY_PATH}
-		LD_LIBRARY_PATH=/usr/lib64/java/dirsec:${LD_LIBRARY_PATH}
-		export LD_LIBRARY_PATH
-
 		PATH=/usr/lib/${PRODUCT}
 		PATH=/usr/lib/${PRODUCT}/${SUBSYSTEM}:${PATH}
 		PATH=/usr/lib64/${PRODUCT}:/bin:${PATH}
diff --git a/base/tps-client/scripts/nss_pcache b/base/tps-client/scripts/nss_pcache
index 5295abb84..6c4b21e93 100755
--- a/base/tps-client/scripts/nss_pcache
+++ b/base/tps-client/scripts/nss_pcache
@@ -32,17 +32,7 @@ fi
 OS=`uname -s`
 PLATFORM=""
 
-if [ $OS = "Linux" ]; then
-	PLATFORM=`arch`
-	if [ $PLATFORM = "i686" ]; then
-		# 32-bit Linux
-		LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
-	elif [ $PLATFORM = "x86_64" ]; then
-		# 64-bit Linux
-		LD_LIBRARY_PATH=/usr/lib64/dirsec:/usr/lib64:/usr/lib:$LD_LIBRARY_PATH
-	fi 
-	export LD_LIBRARY_PATH
-elif [ $OS = "SunOS" ]; then
+if [ $OS = "SunOS" ]; then
 	PLATFORM=`uname -p`
 	if	[ "${PLATFORM}" = "sparc" ] &&
 		[ -d "/usr/lib/sparcv9/" ] ; then
-- 
cgit