summaryrefslogtreecommitdiffstats
path: root/pki/base
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-11-07 02:07:44 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-11-07 02:07:44 +0000
commit551ac1bf0836ec7ee873be112fe2beb4fb799a5a (patch)
tree7c420ef1a92c8a4692b8eb53bbb8ad004c4d6fae /pki/base
parent8b7fac3f033143cd6bf53d94be8c398982a3af21 (diff)
downloadpki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.gz
pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.xz
pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.zip
Bugzilla Bug #533233 - Remove "pki*" scripts from pki-native-tools . . .
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@812 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base')
-rwxr-xr-xpki/base/ca/shared/conf/dtomcat559
-rw-r--r--pki/base/ca/shared/conf/tomcat5.conf55
-rwxr-xr-xpki/base/ca/shared/etc/init.d/httpd72
-rwxr-xr-xpki/base/common/scripts/pkicomplete4
-rwxr-xr-xpki/base/console/templates/pki_console_wrapper12
-rw-r--r--pki/base/java-tools/templates/pki_java_command_wrapper9
-rw-r--r--pki/base/java-tools/templates/pretty_print_cert_command_wrapper9
-rw-r--r--pki/base/java-tools/templates/pretty_print_crl_command_wrapper9
-rwxr-xr-xpki/base/kra/shared/conf/dtomcat559
-rw-r--r--pki/base/kra/shared/conf/tomcat5.conf55
-rwxr-xr-xpki/base/kra/shared/etc/init.d/httpd72
-rwxr-xr-xpki/base/manage/pki-install7
-rwxr-xr-xpki/base/manage/pki-uninstall7
-rwxr-xr-xpki/base/native-tools/setup_package78
-rw-r--r--pki/base/native-tools/templates/pki_instance_command_wrapper18
-rw-r--r--pki/base/native-tools/templates/pki_subsystem_command_wrapper9
-rwxr-xr-xpki/base/ocsp/shared/conf/dtomcat559
-rw-r--r--pki/base/ocsp/shared/conf/tomcat5.conf55
-rwxr-xr-xpki/base/ocsp/shared/etc/init.d/httpd72
-rwxr-xr-xpki/base/ra/apache/apachectl2
-rwxr-xr-xpki/base/ra/etc/init.d/httpd21
-rwxr-xr-xpki/base/ra/lib/perl/PKI/Base/Conf.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/AdminPanel.pm24
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm22
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/BasePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/CertInfo.pm4
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/Common.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/Config.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/DonePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/GlobalVar.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/Login.pm4
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/LoginPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/ModulePanel.pm4
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/Modutil.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/NamePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/SizePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm2
-rwxr-xr-xpki/base/ra/lib/perl/PKI/RA/wizard.pm4
-rwxr-xr-xpki/base/ra/lib/perl/Template/Velocity.pm2
-rwxr-xr-xpki/base/ra/scripts/nss_pcache44
-rwxr-xr-xpki/base/setup/pkicommon17
-rwxr-xr-xpki/base/setup/pkicreate6
-rwxr-xr-xpki/base/setup/pkihost6
-rwxr-xr-xpki/base/setup/pkiremove6
-rwxr-xr-xpki/base/silent/scripts/pkisilent15
-rwxr-xr-xpki/base/tks/shared/conf/dtomcat559
-rw-r--r--pki/base/tks/shared/conf/tomcat5.conf54
-rwxr-xr-xpki/base/tks/shared/etc/init.d/httpd72
-rwxr-xr-xpki/base/tps/apache/apachectl2
-rw-r--r--pki/base/tps/apache/pki_instance_command_wrapper19
-rw-r--r--pki/base/tps/apache/pki_subsystem_command_wrapper10
-rwxr-xr-xpki/base/tps/etc/init.d/httpd21
-rwxr-xr-xpki/base/tps/forms/esc/cgi-bin/sow/cfg.pl10
-rwxr-xr-xpki/base/tps/lib/perl/PKI/Base/Conf.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm24
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm22
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/BasePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/CertInfo.pm4
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/Common.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/Config.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm24
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/DonePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/Login.pm4
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm4
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/Modutil.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/NamePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/SizePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm2
-rwxr-xr-xpki/base/tps/lib/perl/PKI/TPS/wizard.pm4
-rwxr-xr-xpki/base/tps/lib/perl/Template/Velocity.pm2
-rwxr-xr-xpki/base/tps/scripts/nss_pcache45
-rwxr-xr-xpki/base/tps/setup_package22
105 files changed, 716 insertions, 693 deletions
diff --git a/pki/base/ca/shared/conf/dtomcat5 b/pki/base/ca/shared/conf/dtomcat5
index 3be90ea0d..3abe0606b 100755
--- a/pki/base/ca/shared/conf/dtomcat5
+++ b/pki/base/ca/shared/conf/dtomcat5
@@ -59,25 +59,16 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# OS specific support. $var _must_ be set to either true or false.
-OS=`pkiname`
+OS=`uname -s`
cygwin=false
os400=false
case "${OS}" in
@@ -231,32 +222,32 @@ elif [ ${OS} = "SunOS" ] ; then
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/commons-logging-api.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-impl.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-jmx.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/base.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/certsrv.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsbundle.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmscore.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsutil.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cstools.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
-
- if [ -d /usr/share/java/`pkiflavor`/ca ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ca/ca.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/base.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/certsrv.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+
+ if [ -d /usr/share/java/pki/ca ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/kra ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/kra/kra.jar
+ if [ -d /usr/share/java/pki/kra ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/ocsp ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ocsp/ocsp.jar
+ if [ -d /usr/share/java/pki/ocsp ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/tks ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/tks/tks.jar
+ if [ -d /usr/share/java/pki/tks ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
fi
fi
diff --git a/pki/base/ca/shared/conf/tomcat5.conf b/pki/base/ca/shared/conf/tomcat5.conf
index f82eafd8e..181fb12dc 100644
--- a/pki/base/ca/shared/conf/tomcat5.conf
+++ b/pki/base/ca/shared/conf/tomcat5.conf
@@ -1,18 +1,9 @@
# tomcat5 service configuration file
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this configuration file's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
@@ -53,21 +44,31 @@ SHUTDOWN_WAIT=30
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
# Just do not forget to export them :)
-PLATFORM=`pkiarch`
-
-if [ $PLATFORM = "i386" ]; then
- # 32-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "x86_64" ]; then
- # 64-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- JAVA_OPTS="-d64"
- export JAVA_OPTS
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+OS=`uname -s`
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; then
+ # 32-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "x86_64" ]; then
+ # 64-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
+elif [ $PLATFORM = "SunOS" ]; then
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ JAVA_OPTS="-d64"
+ export JAVA_OPTS
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
diff --git a/pki/base/ca/shared/etc/init.d/httpd b/pki/base/ca/shared/etc/init.d/httpd
index 4645c060d..6183fe792 100755
--- a/pki/base/ca/shared/etc/init.d/httpd
+++ b/pki/base/ca/shared/etc/init.d/httpd
@@ -71,25 +71,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
+OS=`uname -s`
+ARCHITECTURE=""
# This script must be run as root!
RV=0
@@ -98,11 +90,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
@@ -639,26 +637,26 @@ start()
CLASSPATH="$CLASSPATH":/usr/share/java/avalon-logkit.jar
CLASSPATH="$CLASSPATH":/usr/share/java/cmsutil.jar
CLASSPATH="$CLASSPATH":/usr/share/java/commons-logging.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/ldapjdk.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-factory.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-resources.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
- if [ `pkiarch` = "sparc" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/osutil.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/osutil.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/osutil.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/rhino.jar
CLASSPATH="$CLASSPATH":/usr/share/java/servletapi5.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/symkey.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/symkey.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/symkey.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/velocity.jar
CLASSPATH="$CLASSPATH":/usr/share/java/xalan-j2.jar
@@ -847,10 +845,10 @@ start()
### END LINUX-SPECIFIC FILE BUT SOLARIS-SPECIFIC LINK
### if [ ! -e /var/lib/tomcat5/common/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/ldapjdk.jar ]; then
@@ -861,13 +859,13 @@ start()
### naming-resources.jar
### if [ ! -e /var/lib/tomcat5/common/lib/nsutil.jar ]; then
- ### ln -s /usr/share/java/`pkiflavor`/nsutil.jar nsutil.jar
+ ### ln -s /usr/share/java/pki/nsutil.jar nsutil.jar
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/osutil.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/osutil.jar osutil.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/osutil.jar osutil.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/osutil.jar osutil.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/rhino.jar ]; then
@@ -881,10 +879,10 @@ start()
### END SOLARIS-SPECIFIC LINKS
### if [ ! -e /var/lib/tomcat5/common/lib/symkey.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/symkey.jar symkey.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/symkey.jar symkey.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/symkey.jar symkey.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/velocity.jar ]; then
@@ -959,10 +957,10 @@ start()
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-optional.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-storeconfig.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-cgi.renametojar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-default.jar
@@ -1022,10 +1020,10 @@ start()
### catalina-storeconfig.jar
### catalina.jar
### if [ ! -e /var/lib/tomcat5/server/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### servlets-cgi.renametojar
diff --git a/pki/base/common/scripts/pkicomplete b/pki/base/common/scripts/pkicomplete
index 083475ce4..bc9fa3a8d 100755
--- a/pki/base/common/scripts/pkicomplete
+++ b/pki/base/common/scripts/pkicomplete
@@ -70,9 +70,9 @@ if( ( $^O ne 'Windows_NT' ) && ( $^O ne 'MSWin32' ) ) {
# Compute "flavor" of Operating System
my $pki_flavor = "";
if( $^O eq "linux" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} elsif( $^O eq "solaris" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} else {
print( STDERR
"ERROR: Unsupported platform '$^O'!\n" );
diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper
index 3e78de2b6..467b31bc8 100755
--- a/pki/base/console/templates/pki_console_wrapper
+++ b/pki/base/console/templates/pki_console_wrapper
@@ -32,7 +32,7 @@ fi
## (1) Specify variables used by this script. ##
###############################################################################
-PRODUCT=`pkiflavor`
+PRODUCT="pki"
###############################################################################
@@ -77,10 +77,11 @@ invalid_architecture() {
## search order this command wrapper uses to find shared libraries. ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
+ARCHITECTURE=""
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
JAVA="java"
JAVA_OPTIONS=""
@@ -102,6 +103,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
JAVA_OPTIONS=""
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper
index 5fdf46622..d92bf3e6b 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper
@@ -64,10 +64,10 @@ invalid_architecture() {
## search order this command wrapper uses to find shared libraries. ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
JAVA="java"
JAVA_OPTIONS=""
@@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
JAVA_OPTIONS=""
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
index 9f014ceee..9caf5049d 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
@@ -64,10 +64,10 @@ invalid_architecture() {
## search order this command wrapper uses to find shared libraries. ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
JAVA="java"
JAVA_OPTIONS=""
@@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
JAVA_OPTIONS=""
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
index e8c82094a..ee91d7d2b 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
@@ -64,10 +64,10 @@ invalid_architecture() {
## search order this command wrapper uses to find shared libraries. ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
JAVA="java"
JAVA_OPTIONS=""
@@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
JAVA_OPTIONS=""
diff --git a/pki/base/kra/shared/conf/dtomcat5 b/pki/base/kra/shared/conf/dtomcat5
index 3be90ea0d..3abe0606b 100755
--- a/pki/base/kra/shared/conf/dtomcat5
+++ b/pki/base/kra/shared/conf/dtomcat5
@@ -59,25 +59,16 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# OS specific support. $var _must_ be set to either true or false.
-OS=`pkiname`
+OS=`uname -s`
cygwin=false
os400=false
case "${OS}" in
@@ -231,32 +222,32 @@ elif [ ${OS} = "SunOS" ] ; then
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/commons-logging-api.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-impl.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-jmx.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/base.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/certsrv.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsbundle.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmscore.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsutil.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cstools.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
-
- if [ -d /usr/share/java/`pkiflavor`/ca ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ca/ca.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/base.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/certsrv.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+
+ if [ -d /usr/share/java/pki/ca ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/kra ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/kra/kra.jar
+ if [ -d /usr/share/java/pki/kra ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/ocsp ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ocsp/ocsp.jar
+ if [ -d /usr/share/java/pki/ocsp ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/tks ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/tks/tks.jar
+ if [ -d /usr/share/java/pki/tks ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
fi
fi
diff --git a/pki/base/kra/shared/conf/tomcat5.conf b/pki/base/kra/shared/conf/tomcat5.conf
index f82eafd8e..181fb12dc 100644
--- a/pki/base/kra/shared/conf/tomcat5.conf
+++ b/pki/base/kra/shared/conf/tomcat5.conf
@@ -1,18 +1,9 @@
# tomcat5 service configuration file
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this configuration file's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
@@ -53,21 +44,31 @@ SHUTDOWN_WAIT=30
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
# Just do not forget to export them :)
-PLATFORM=`pkiarch`
-
-if [ $PLATFORM = "i386" ]; then
- # 32-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "x86_64" ]; then
- # 64-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- JAVA_OPTS="-d64"
- export JAVA_OPTS
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+OS=`uname -s`
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; then
+ # 32-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "x86_64" ]; then
+ # 64-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
+elif [ $PLATFORM = "SunOS" ]; then
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ JAVA_OPTS="-d64"
+ export JAVA_OPTS
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
diff --git a/pki/base/kra/shared/etc/init.d/httpd b/pki/base/kra/shared/etc/init.d/httpd
index 1bb6903bf..5fce4d026 100755
--- a/pki/base/kra/shared/etc/init.d/httpd
+++ b/pki/base/kra/shared/etc/init.d/httpd
@@ -71,25 +71,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
+OS=`uname -s`
+ARCHITECTURE=""
# This script must be run as root!
RV=0
@@ -98,11 +90,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
@@ -639,26 +637,26 @@ start()
CLASSPATH="$CLASSPATH":/usr/share/java/avalon-logkit.jar
CLASSPATH="$CLASSPATH":/usr/share/java/cmsutil.jar
CLASSPATH="$CLASSPATH":/usr/share/java/commons-logging.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/ldapjdk.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-factory.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-resources.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
- if [ `pkiarch` = "sparc" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/osutil.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/osutil.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/osutil.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/rhino.jar
CLASSPATH="$CLASSPATH":/usr/share/java/servletapi5.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/symkey.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/symkey.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/symkey.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/velocity.jar
CLASSPATH="$CLASSPATH":/usr/share/java/xalan-j2.jar
@@ -847,10 +845,10 @@ start()
### END LINUX-SPECIFIC FILE BUT SOLARIS-SPECIFIC LINK
### if [ ! -e /var/lib/tomcat5/common/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/ldapjdk.jar ]; then
@@ -861,13 +859,13 @@ start()
### naming-resources.jar
### if [ ! -e /var/lib/tomcat5/common/lib/nsutil.jar ]; then
- ### ln -s /usr/share/java/`pkiflavor`/nsutil.jar nsutil.jar
+ ### ln -s /usr/share/java/pki/nsutil.jar nsutil.jar
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/osutil.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/osutil.jar osutil.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/osutil.jar osutil.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/osutil.jar osutil.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/rhino.jar ]; then
@@ -881,10 +879,10 @@ start()
### END SOLARIS-SPECIFIC LINKS
### if [ ! -e /var/lib/tomcat5/common/lib/symkey.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/symkey.jar symkey.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/symkey.jar symkey.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/symkey.jar symkey.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/velocity.jar ]; then
@@ -959,10 +957,10 @@ start()
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-optional.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-storeconfig.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-cgi.renametojar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-default.jar
@@ -1022,10 +1020,10 @@ start()
### catalina-storeconfig.jar
### catalina.jar
### if [ ! -e /var/lib/tomcat5/server/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### servlets-cgi.renametojar
diff --git a/pki/base/manage/pki-install b/pki/base/manage/pki-install
index d69fc24f3..d6434946b 100755
--- a/pki/base/manage/pki-install
+++ b/pki/base/manage/pki-install
@@ -544,13 +544,18 @@ if( $^O eq "linux" ) {
"tps" => "$pki_prefix" . "$pki_flavor-tps" . "$pki_suffix"
);
} elsif( $^O eq "solaris" ) {
- $pki_architecture = "sparcv9";
+ $pki_architecture = `uname -p`;
$pki_flavor = "pki";
$pki_package_type = "pkg";
$pki_containers = "PKGs";
$presence_command = "pkginfo | grep -c ";
$install_command = "( echo \"all\"; yes ) | /usr/sbin/pkgadd -d ./";
+ if( ( $pki_architecture eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $pki_architecture = "sparcv9";
+ }
+
if( $pki_architecture eq "sparc" ) {
$pki_prefix = "RHAT";
$pki_suffix = "";
diff --git a/pki/base/manage/pki-uninstall b/pki/base/manage/pki-uninstall
index a7434c096..a7ba67067 100755
--- a/pki/base/manage/pki-uninstall
+++ b/pki/base/manage/pki-uninstall
@@ -522,11 +522,16 @@ if( $^O eq "linux" ) {
"$pki_prefix" . "dirsec-nspr" . "$pki_suffix"
);
} elsif( $^O eq "solaris" ) {
- $pki_architecture = "sparcv9";
+ $pki_architecture = `uname -p`;
$pki_flavor = "pki";
$presence_command = "pkginfo | grep -c ";
$uninstall_command = "yes | /usr/sbin/pkgrm ";
+ if( ( $pki_architecture eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $pki_architecture = "sparcv9";
+ }
+
if( $pki_architecture eq "sparc" ) {
$pki_prefix = "RHAT";
$pki_suffix = "";
diff --git a/pki/base/native-tools/setup_package b/pki/base/native-tools/setup_package
index 0207a80a5..1497eee7d 100755
--- a/pki/base/native-tools/setup_package
+++ b/pki/base/native-tools/setup_package
@@ -66,8 +66,9 @@ usage() {
}
# specify generic helper variables
-OS=`uname`
-if [ ${OS} = "Linux" ] ; then
+OS=`uname -s`
+ARCHITECTURE=""
+if [ "${OS}" = "Linux" ] ; then
if [ -e /etc/fedora-release ] ; then
USE_OPT_FORTITUDE="FALSE"
elif [ -e /etc/redhat-release ] ; then
@@ -81,8 +82,10 @@ if [ ${OS} = "Linux" ] ; then
usage "ERROR: Only Fedora and Red Hat '${OS}' are supported!"
exit 255
fi
-elif [ ${OS} = "SunOS" ] ; then
+ ARCHITECTURE=`uname -i`
+elif [ "${OS}" = "SunOS" ] ; then
USE_OPT_FORTITUDE="TRUE"
+ ARCHITECTURE=`uname -p`
else
usage "ERROR: Unsupported operating system '${OS}'!"
exit 255
@@ -91,34 +94,33 @@ fi
# Since "rpmbuild" fails to process "%ifarch" macros inside the
# "%install" section of a spec file, the actual hardware
# architecture will be determined at this point in time.
-ARCHITECTURE=`uname -i`
-if [ ${ARCHITECTURE} = "i386" ] ; then
+if [ "${ARCHITECTURE}" = "i386" ] ; then
LIB_DIR="lib"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "x86_64" ] ; then
+elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
LIB_DIR="lib64"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "ppc" ] ; then
+elif [ "${ARCHITECTURE}" = "ppc" ] ; then
LIB_DIR="lib"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "ppc64" ] ; then
+elif [ "${ARCHITECTURE}" = "ppc64" ] ; then
LIB_DIR="lib64"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "s390x" ] ; then
+elif [ "${ARCHITECTURE}" = "s390x" ] ; then
LIB_DIR="lib"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${OS} = "SunOS" ] &&
- [ ${ARCHITECTURE} = "sparc" ] ; then
+elif [ "${OS}" = "SunOS" ] &&
+ [ "${ARCHITECTURE}" = "sparc" ] ; then
# Note that "pkgbuild" successfully processes "%ifarch" macros
# inside the "%install" section of a spec file.
#
@@ -316,60 +318,6 @@ do
done
-# replace "uname -s" within various PKI scripts with "pkiname"
-echo "#!/bin/sh" > ${NATIVE_TOOLS_SCRIPTS}/pkiname
-echo >> ${NATIVE_TOOLS_SCRIPTS}/pkiname
-echo "echo `uname`" >> ${NATIVE_TOOLS_SCRIPTS}/pkiname
-chmod 00755 ${NATIVE_TOOLS_SCRIPTS}/pkiname
-
-
-# replace "uname -i" and "uname -p" within various PKI scripts with "pkiarch"
-echo "#!/bin/sh" > ${NATIVE_TOOLS_SCRIPTS}/pkiarch
-echo >> ${NATIVE_TOOLS_SCRIPTS}/pkiarch
-echo "echo ${ARCHITECTURE}" >> ${NATIVE_TOOLS_SCRIPTS}/pkiarch
-chmod 00755 ${NATIVE_TOOLS_SCRIPTS}/pkiarch
-
-
-# use "pkiflavor" to obtain the "pki" prefix within various PKI scripts
-echo "#!/bin/sh" > ${NATIVE_TOOLS_SCRIPTS}/pkiflavor
-echo >> ${NATIVE_TOOLS_SCRIPTS}/pkiflavor
-echo "echo ${NATIVE_TOOLS_PRODUCT_NAME}" >> ${NATIVE_TOOLS_SCRIPTS}/pkiflavor
-chmod 00755 ${NATIVE_TOOLS_SCRIPTS}/pkiflavor
-
-
-# use "pkiperl" to invoke the appropriate version of "Perl"
-echo "#!/bin/sh" > ${NATIVE_TOOLS_SCRIPTS}/pkiperl
-echo >> ${NATIVE_TOOLS_SCRIPTS}/pkiperl
-echo "${PERL_DIR} \${@}" >> ${NATIVE_TOOLS_SCRIPTS}/pkiperl
-chmod 00755 ${NATIVE_TOOLS_SCRIPTS}/pkiperl
-
-
-# obtain the PKI operating system distribution using "pkidist"
-echo "#!/bin/sh" > ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo "OS=\`uname\`" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo "if [ \${OS} = \"Linux\" ]; then" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " if [ -e /etc/fedora-release ]; then" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " DISTRIBUTION=\"fc\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " VERSION=\`cat /etc/fedora-release |sed 's/Fedora release \\(.*\\) .*/\1/'\`" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " printf \"\${DISTRIBUTION}\${VERSION}\n\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " elif [ -e /etc/redhat-release ]; then" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " DISTRIBUTION=\"el\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " VERSION=\`cat /etc/redhat-release |sed 's/Red Hat Enterprise Linux Server release \\(.*\\)\\..*/\1/'\`" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " printf \"\${DISTRIBUTION}\${VERSION}\n\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " else" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " printf \"undefined\n\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " fi" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo "elif [ \${OS} = \"SunOS\" ]; then" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " DISTRIBUTION=\"sol\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " VERSION=\`uname -r | cut -f2 -d .\`" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " printf \"\${DISTRIBUTION}\${VERSION}\n\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo "else" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo " printf \"undefined\n\"" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-echo "fi" >> ${NATIVE_TOOLS_SCRIPTS}/pkidist
-chmod 00755 ${NATIVE_TOOLS_SCRIPTS}/pkidist
-
-
###############################################################################
## (8) Create useful symbolic links as appropriate. ##
###############################################################################
diff --git a/pki/base/native-tools/templates/pki_instance_command_wrapper b/pki/base/native-tools/templates/pki_instance_command_wrapper
index 74bd9b25f..10f6c08f2 100644
--- a/pki/base/native-tools/templates/pki_instance_command_wrapper
+++ b/pki/base/native-tools/templates/pki_instance_command_wrapper
@@ -25,15 +25,6 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
###############################################################################
## (1) Specify variables used by this script. ##
@@ -82,10 +73,10 @@ invalid_architecture() {
## ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
if [ "${ARCHITECTURE}" = "i386" ] ; then
LD_LIBRARY_PATH=/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
@@ -121,6 +112,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
LD_LIBRARY_PATH=/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
diff --git a/pki/base/native-tools/templates/pki_subsystem_command_wrapper b/pki/base/native-tools/templates/pki_subsystem_command_wrapper
index a0b5a78ab..3bb93a801 100644
--- a/pki/base/native-tools/templates/pki_subsystem_command_wrapper
+++ b/pki/base/native-tools/templates/pki_subsystem_command_wrapper
@@ -72,10 +72,10 @@ invalid_architecture() {
## ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
if [ "${ARCHITECTURE}" = "i386" ] ; then
LD_LIBRARY_PATH=/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
@@ -107,6 +107,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
LD_LIBRARY_PATH=/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
diff --git a/pki/base/ocsp/shared/conf/dtomcat5 b/pki/base/ocsp/shared/conf/dtomcat5
index 3be90ea0d..3abe0606b 100755
--- a/pki/base/ocsp/shared/conf/dtomcat5
+++ b/pki/base/ocsp/shared/conf/dtomcat5
@@ -59,25 +59,16 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# OS specific support. $var _must_ be set to either true or false.
-OS=`pkiname`
+OS=`uname -s`
cygwin=false
os400=false
case "${OS}" in
@@ -231,32 +222,32 @@ elif [ ${OS} = "SunOS" ] ; then
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/commons-logging-api.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-impl.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-jmx.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/base.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/certsrv.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsbundle.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmscore.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsutil.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cstools.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
-
- if [ -d /usr/share/java/`pkiflavor`/ca ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ca/ca.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/base.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/certsrv.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+
+ if [ -d /usr/share/java/pki/ca ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/kra ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/kra/kra.jar
+ if [ -d /usr/share/java/pki/kra ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/ocsp ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ocsp/ocsp.jar
+ if [ -d /usr/share/java/pki/ocsp ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/tks ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/tks/tks.jar
+ if [ -d /usr/share/java/pki/tks ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
fi
fi
diff --git a/pki/base/ocsp/shared/conf/tomcat5.conf b/pki/base/ocsp/shared/conf/tomcat5.conf
index fa1831508..c17539431 100644
--- a/pki/base/ocsp/shared/conf/tomcat5.conf
+++ b/pki/base/ocsp/shared/conf/tomcat5.conf
@@ -5,19 +5,10 @@
#
# tomcat5 service configuration file
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this configuration file's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
@@ -58,21 +49,33 @@ SHUTDOWN_WAIT=30
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
# Just do not forget to export them :)
-PLATFORM=`pkiarch`
+OS=`uname -s`
+PLATFORM=""
-if [ $PLATFORM = "i386" ]; then
- # 32-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "x86_64" ]; then
- # 64-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- JAVA_OPTS="-d64"
- export JAVA_OPTS
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; then
+ # 32-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "x86_64" ]; then
+ # 64-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
+elif [ $OS = "SunOS" ]; then
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ JAVA_OPTS="-d64"
+ export JAVA_OPTS
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
diff --git a/pki/base/ocsp/shared/etc/init.d/httpd b/pki/base/ocsp/shared/etc/init.d/httpd
index c01e729b2..d900c9904 100755
--- a/pki/base/ocsp/shared/etc/init.d/httpd
+++ b/pki/base/ocsp/shared/etc/init.d/httpd
@@ -71,25 +71,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
+OS=`uname -s`
+ARCHITECTURE=""
# This script must be run as root!
RV=0
@@ -98,11 +90,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
@@ -639,26 +637,26 @@ start()
CLASSPATH="$CLASSPATH":/usr/share/java/avalon-logkit.jar
CLASSPATH="$CLASSPATH":/usr/share/java/cmsutil.jar
CLASSPATH="$CLASSPATH":/usr/share/java/commons-logging.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/ldapjdk.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-factory.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-resources.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
- if [ `pkiarch` = "sparc" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/osutil.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/osutil.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/osutil.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/rhino.jar
CLASSPATH="$CLASSPATH":/usr/share/java/servletapi5.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/symkey.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/symkey.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/symkey.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/velocity.jar
CLASSPATH="$CLASSPATH":/usr/share/java/xalan-j2.jar
@@ -847,10 +845,10 @@ start()
### END LINUX-SPECIFIC FILE BUT SOLARIS-SPECIFIC LINK
### if [ ! -e /var/lib/tomcat5/common/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/ldapjdk.jar ]; then
@@ -861,13 +859,13 @@ start()
### naming-resources.jar
### if [ ! -e /var/lib/tomcat5/common/lib/nsutil.jar ]; then
- ### ln -s /usr/share/java/`pkiflavor`/nsutil.jar nsutil.jar
+ ### ln -s /usr/share/java/pki/nsutil.jar nsutil.jar
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/osutil.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/osutil.jar osutil.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/osutil.jar osutil.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/osutil.jar osutil.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/rhino.jar ]; then
@@ -881,10 +879,10 @@ start()
### END SOLARIS-SPECIFIC LINKS
### if [ ! -e /var/lib/tomcat5/common/lib/symkey.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/symkey.jar symkey.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/symkey.jar symkey.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/symkey.jar symkey.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/velocity.jar ]; then
@@ -959,10 +957,10 @@ start()
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-optional.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-storeconfig.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-cgi.renametojar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-default.jar
@@ -1022,10 +1020,10 @@ start()
### catalina-storeconfig.jar
### catalina.jar
### if [ ! -e /var/lib/tomcat5/server/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### servlets-cgi.renametojar
diff --git a/pki/base/ra/apache/apachectl b/pki/base/ra/apache/apachectl
index d5474740e..7d9e24491 100755
--- a/pki/base/ra/apache/apachectl
+++ b/pki/base/ra/apache/apachectl
@@ -27,7 +27,7 @@ LD_LIBRARY_PATH=[SECURITY_LIBRARIES]:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# see if httpd is linked with the openldap libraries - we need to override them
-OS=`pkiname`
+OS=`uname -s`
if [ $OS = "Linux" ]; then
hasopenldap=0
diff --git a/pki/base/ra/etc/init.d/httpd b/pki/base/ra/etc/init.d/httpd
index 40b551086..4f18cd136 100755
--- a/pki/base/ra/etc/init.d/httpd
+++ b/pki/base/ra/etc/init.d/httpd
@@ -38,26 +38,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
SUBSYSTEM_TYPE=[SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
+ARCHITECTURE=""
# Time to wait in seconds, before killing process
#
@@ -73,11 +64,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
diff --git a/pki/base/ra/lib/perl/PKI/Base/Conf.pm b/pki/base/ra/lib/perl/PKI/Base/Conf.pm
index 7783eb8c6..895ab28a3 100755
--- a/pki/base/ra/lib/perl/PKI/Base/Conf.pm
+++ b/pki/base/ra/lib/perl/PKI/Base/Conf.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
index 4c30859c1..656dc2d5e 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
index e08032913..6cf1c69c4 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -168,16 +168,24 @@ sub update
my $tmp = "/tmp/addAgents-$$.ldif";
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
my $mozldap_path = "/usr/lib/mozldap";
- my $arch = `pkiarch`;
- $arch =~ s/\n//g;
- if ($arch eq "x86_64") {
- $mozldap_path = "/usr/lib64/mozldap";
- } elsif ($arch eq "sparcv9") {
- $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ my $arch = "";
+ if ($^O eq "linux") {
+ $arch = `uname -i`;
+ $arch =~ s/\n//g;
+ if ($arch eq "x86_64") {
+ $mozldap_path = "/usr/lib64/mozldap";
+ }
+ } elsif ($^O eq "solaris") {
+ $arch=`uname -p`;
+ $arch =~ s/\n//g;
+ if( ( $arch eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ }
}
# $admincert =~ s/\//\\\//g;
diff --git a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
index 257b925ae..1ada5ad54 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm
index 9442035a6..0be17a388 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -90,12 +90,20 @@ sub update
# try to do a ldapsearch
my $tmp = "/tmp/file$$";
my $mozldap_path = "/usr/lib/mozldap";
- my $arch = `pkiarch`;
- $arch =~ s/\n//g;
- if ($arch eq "x86_64") {
- $mozldap_path = "/usr/lib64/mozldap";
- } elsif ($arch eq "sparcv9") {
- $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ my $arch = "";
+ if ($^O eq "linux") {
+ $arch = `uname -i`;
+ $arch =~ s/\n//g;
+ if ($arch eq "x86_64") {
+ $mozldap_path = "/usr/lib64/mozldap";
+ }
+ } elsif ($^O eq "solaris") {
+ $arch=`uname -p`;
+ $arch =~ s/\n//g;
+ if( ( $arch eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ }
}
&PKI::RA::Wizard::debug_log("AuthDBPanel: invoking $mozldap_path/ldapsearch");
my $status = system("$mozldap_path/ldapsearch -h '$host' " .
diff --git a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm b/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm
index 09b1d4b74..5cb4d7697 100755
--- a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
index d06e3daca..7e20e222d 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm b/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm
index e4cc6328f..d1a8c3817 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -90,7 +90,7 @@ sub get_nickname
&PKI::RA::Wizard::debug_log("CertInfo: get_nickname");
my $nickname = $::config->get("preop.cert.$self->{tag}.nickname");
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
if ($nickname ne "") {
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
index c7eee3884..cf58d2327 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm b/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
index ab58610ec..51eb1d400 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/Common.pm b/pki/base/ra/lib/perl/PKI/RA/Common.pm
index 40b0bd6b2..8deab8c6c 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Common.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/Common.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/Config.pm b/pki/base/ra/lib/perl/PKI/RA/Config.pm
index 6dab970bd..f1ace5b03 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Config.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/Config.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
index 87e85dc5c..bf74890cc 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
index ed39cec0f..095ed5879 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
index 924fe0cb9..fadd7727c 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm b/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
index fe37de723..e469e51f8 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
index 5d209e065..46c8a2902 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
index 6c691eeb4..7789aaaba 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
index 87af739dd..c76f35c98 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm b/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm
index bf7fae600..388a41349 100755
--- a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm b/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
index 80cbd523f..4ab51f1b7 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/pki/base/ra/lib/perl/PKI/RA/Login.pm
index efd88827c..875df1a31 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Login.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/Login.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ package PKI::RA::Login;
$PKI::RA::Login::VERSION = '1.00';
# read configuration file
-my $flavor = `pkiflavor`;
+my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm b/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm
index 211127401..66f40acfe 100755
--- a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm b/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm
index 955c054bf..87ce056bc 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ sub new {
$self->{"update"} = \&update;
$self->{"panelvars"} = \&display;
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm b/pki/base/ra/lib/perl/PKI/RA/Modutil.pm
index 017978ba4..82c66e87d 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/Modutil.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm b/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
index 221f93263..124d2f4b8 100755
--- a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm b/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
index 75fba5c42..51c22cd24 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
index 857f3a976..eb2631a9b 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm b/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm
index 3a1ba77d6..f55dc41e9 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm b/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
index 4a0869420..3d946bca0 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm b/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
index 6a4f6b16e..ddf1124a9 100755
--- a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm b/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
index 43935530c..c88c138be 100755
--- a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/lib/perl/PKI/RA/wizard.pm b/pki/base/ra/lib/perl/PKI/RA/wizard.pm
index f6038de48..ecfe6dd3c 100755
--- a/pki/base/ra/lib/perl/PKI/RA/wizard.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/wizard.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -89,7 +89,7 @@ package PKI::RA::Wizard;
$PKI::RA::Wizard::VERSION = '1.00';
# read configuration file
-my $flavor = `pkiflavor`;
+my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/ra/lib/perl/Template/Velocity.pm b/pki/base/ra/lib/perl/Template/Velocity.pm
index cbfe8a588..848de65fd 100755
--- a/pki/base/ra/lib/perl/Template/Velocity.pm
+++ b/pki/base/ra/lib/perl/Template/Velocity.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/ra/scripts/nss_pcache b/pki/base/ra/scripts/nss_pcache
index 3e67881b9..bf978b48b 100755
--- a/pki/base/ra/scripts/nss_pcache
+++ b/pki/base/ra/scripts/nss_pcache
@@ -30,28 +30,36 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-PLATFORM=`pkiarch`
+OS=`uname -s`
-if [ $PLATFORM = "i386" ]; 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
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; 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
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
-DIST=`pkidist`
FORTITUDE_DIR=/usr/sbin
-if [ $DIST = "el4" ]; then
- FORTITUDE_DIR=/opt/fortitude/bin
-elif [ $DIST = "sol9" ]; then
+if [ $OS = "SunOS" ]; then
FORTITUDE_DIR=/opt/fortitude/bin
fi
diff --git a/pki/base/setup/pkicommon b/pki/base/setup/pkicommon
index 88fc92a3d..4f71d8139 100755
--- a/pki/base/setup/pkicommon
+++ b/pki/base/setup/pkicommon
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -101,10 +101,10 @@ $default_modutil_command = "";
my $is_IPv6 = 0;
# Compute "hardware platform" of Operating System
-$default_hardware_platform = `pkiarch`;
-$default_hardware_platform =~ s/\s+$//g;
-chomp( $default_hardware_platform );
if( $^O eq "linux" ) {
+ $default_hardware_platform = `uname -i`;
+ $default_hardware_platform =~ s/\s+$//g;
+ chomp( $default_hardware_platform );
if( $default_hardware_platform eq "i386" ) {
# 32-bit Linux
$default_system_binaries = "/bin";
@@ -137,6 +137,15 @@ if( $^O eq "linux" ) {
$hostname = hostname;
}
} elsif( $^O eq "solaris" ) {
+ $default_hardware_platform = `uname -p`;
+ $default_hardware_platform =~ s/\s+$//g;
+ chomp( $default_hardware_platform );
+
+ if( ( $default_hardware_platform eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $default_hardware_platform = "sparcv9";
+ }
+
if( $default_hardware_platform eq "sparc" ) {
# 32-bit Solaris
$default_system_binaries = "/bin";
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate
index 23c33eaaf..9cab383f7 100755
--- a/pki/base/setup/pkicreate
+++ b/pki/base/setup/pkicreate
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -120,9 +120,9 @@ my $ARGS = ( $#ARGV + 1 );
# Compute "flavor" of Operating System
my $pki_flavor = "";
if( $^O eq "linux" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} elsif( $^O eq "solaris" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} else {
print( STDERR
"ERROR: Unsupported platform '$^O'!\n" );
diff --git a/pki/base/setup/pkihost b/pki/base/setup/pkihost
index 50cd6d820..058d42db1 100755
--- a/pki/base/setup/pkihost
+++ b/pki/base/setup/pkihost
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -86,9 +86,9 @@ my $ARGS = ( $#ARGV + 1 );
# Compute "flavor" of Operating System
my $pki_flavor = "";
if( $^O eq "linux" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} elsif( $^O eq "solaris" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} else {
print( STDERR
"ERROR: Unsupported platform '$^O'!\n" );
diff --git a/pki/base/setup/pkiremove b/pki/base/setup/pkiremove
index ca9d5c461..74393cc2c 100755
--- a/pki/base/setup/pkiremove
+++ b/pki/base/setup/pkiremove
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
@@ -93,9 +93,9 @@ my $ARGS = ( $#ARGV + 1 );
# Compute "flavor" of Operating System
my $pki_flavor = "";
if( $^O eq "linux" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} elsif( $^O eq "solaris" ) {
- $pki_flavor = `pkiflavor`;
+ $pki_flavor = "pki";
} else {
print( STDERR
"ERROR: Unsupported platform '$^O'!\n" );
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent
index 812cd4d78..63db49dcd 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/pki/base/silent/scripts/pkisilent
@@ -53,14 +53,15 @@ sub invalid_architecture()
## search order this command uses to find shared libraries. ##
###############################################################################
-my $OS=`pkiname`;
-my $ARCHITECTURE=`pkiarch`;
+my $OS=`uname -s`;
+my $ARCHITECTURE="";
chop($OS);
-chop($ARCHITECTURE);
if($OS eq "Linux")
{
+ $ARCHITECTURE=`uname -i`;
+ chop($ARCHITECTURE);
if($ARCHITECTURE eq "i386")
{
$libpath="/usr/lib";
@@ -95,6 +96,14 @@ if($OS eq "Linux")
}
elsif (${OS} eq "SunOS")
{
+ $ARCHITECTURE=`uname -p`;
+ chop($ARCHITECTURE);
+
+ if( ( ${ARCHITECTURE} eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $ARCHITECTURE="sparcv9";
+ }
+
if (${ARCHITECTURE} eq "sparc")
{
$libpath="/usr/lib";
diff --git a/pki/base/tks/shared/conf/dtomcat5 b/pki/base/tks/shared/conf/dtomcat5
index 3be90ea0d..3abe0606b 100755
--- a/pki/base/tks/shared/conf/dtomcat5
+++ b/pki/base/tks/shared/conf/dtomcat5
@@ -59,25 +59,16 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# OS specific support. $var _must_ be set to either true or false.
-OS=`pkiname`
+OS=`uname -s`
cygwin=false
os400=false
case "${OS}" in
@@ -231,32 +222,32 @@ elif [ ${OS} = "SunOS" ] ; then
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/commons-logging-api.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-impl.jar
CLASSPATH="$CLASSPATH":/usr/share/java/mx4j/mx4j-jmx.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/base.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/certsrv.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cms72_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsbundle.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmscore.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cmsutil.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/cstools.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/mcc70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nmclf70_en.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
-
- if [ -d /usr/share/java/`pkiflavor`/ca ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ca/ca.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/base.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/certsrv.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cms72_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsbundle.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmscore.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cmsutil.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/cstools.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/mcc70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nmclf70_en.jar
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+
+ if [ -d /usr/share/java/pki/ca ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ca/ca.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/kra ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/kra/kra.jar
+ if [ -d /usr/share/java/pki/kra ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/kra/kra.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/ocsp ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/ocsp/ocsp.jar
+ if [ -d /usr/share/java/pki/ocsp ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/ocsp/ocsp.jar
fi
- if [ -d /usr/share/java/`pkiflavor`/tks ]; then
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/tks/tks.jar
+ if [ -d /usr/share/java/pki/tks ]; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/tks/tks.jar
fi
fi
diff --git a/pki/base/tks/shared/conf/tomcat5.conf b/pki/base/tks/shared/conf/tomcat5.conf
index fa1831508..ea1cd1906 100644
--- a/pki/base/tks/shared/conf/tomcat5.conf
+++ b/pki/base/tks/shared/conf/tomcat5.conf
@@ -5,19 +5,10 @@
#
# tomcat5 service configuration file
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this configuration file's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
@@ -58,21 +49,32 @@ SHUTDOWN_WAIT=30
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
# Just do not forget to export them :)
-PLATFORM=`pkiarch`
+OS=`uname -s`
-if [ $PLATFORM = "i386" ]; then
- # 32-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "x86_64" ]; then
- # 64-bit Linux
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- JAVA_OPTS="-d64"
- export JAVA_OPTS
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; then
+ # 32-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "x86_64" ]; then
+ # 64-bit Linux
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/dirsec:/usr/lib64:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
+elif [ $OS = "SunOS" ]; then
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/dirsec:/usr/lib
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ JAVA_OPTS="-d64"
+ export JAVA_OPTS
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
diff --git a/pki/base/tks/shared/etc/init.d/httpd b/pki/base/tks/shared/etc/init.d/httpd
index cdc5d1943..17e9a985a 100755
--- a/pki/base/tks/shared/etc/init.d/httpd
+++ b/pki/base/tks/shared/etc/init.d/httpd
@@ -71,25 +71,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
PKI_SUBSYSTEM_TYPE=[PKI_SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${PKI_SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${PKI_SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${PKI_SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
+OS=`uname -s`
+ARCHITECTURE=""
# This script must be run as root!
RV=0
@@ -98,11 +90,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
@@ -639,26 +637,26 @@ start()
CLASSPATH="$CLASSPATH":/usr/share/java/avalon-logkit.jar
CLASSPATH="$CLASSPATH":/usr/share/java/cmsutil.jar
CLASSPATH="$CLASSPATH":/usr/share/java/commons-logging.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/ldapjdk.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-factory.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/common/lib/naming-resources.jar
- CLASSPATH="$CLASSPATH":/usr/share/java/`pkiflavor`/nsutil.jar
- if [ `pkiarch` = "sparc" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/share/java/pki/nsutil.jar
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/osutil.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/osutil.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/osutil.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/rhino.jar
CLASSPATH="$CLASSPATH":/usr/share/java/servletapi5.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/symkey.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/symkey.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/symkey.jar
fi
CLASSPATH="$CLASSPATH":/usr/share/java/velocity.jar
CLASSPATH="$CLASSPATH":/usr/share/java/xalan-j2.jar
@@ -847,10 +845,10 @@ start()
### END LINUX-SPECIFIC FILE BUT SOLARIS-SPECIFIC LINK
### if [ ! -e /var/lib/tomcat5/common/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/ldapjdk.jar ]; then
@@ -861,13 +859,13 @@ start()
### naming-resources.jar
### if [ ! -e /var/lib/tomcat5/common/lib/nsutil.jar ]; then
- ### ln -s /usr/share/java/`pkiflavor`/nsutil.jar nsutil.jar
+ ### ln -s /usr/share/java/pki/nsutil.jar nsutil.jar
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/osutil.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/osutil.jar osutil.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/osutil.jar osutil.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/osutil.jar osutil.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/rhino.jar ]; then
@@ -881,10 +879,10 @@ start()
### END SOLARIS-SPECIFIC LINKS
### if [ ! -e /var/lib/tomcat5/common/lib/symkey.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/symkey.jar symkey.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/symkey.jar symkey.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/symkey.jar symkey.jar
### fi
### fi
### if [ ! -e /var/lib/tomcat5/common/lib/velocity.jar ]; then
@@ -959,10 +957,10 @@ start()
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-optional.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina-storeconfig.jar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/catalina.jar
- if [ `pkiarch` = "sparc" ] ; then
+ if [ "$ARCHITECTURE" = "sparc" ] ; then
CLASSPATH="$CLASSPATH":/usr/lib/java/dirsec/jss4.jar
- elif [ `pkiarch` = "sparcv9" ] ; then
- CLASSPATH="$CLASSPATH":/usr/lib/`pkiarch`/java/dirsec/jss4.jar
+ elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ CLASSPATH="$CLASSPATH":/usr/lib/sparcv9/java/dirsec/jss4.jar
fi
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-cgi.renametojar
CLASSPATH="$CLASSPATH":/var/lib/tomcat5/server/lib/servlets-default.jar
@@ -1022,10 +1020,10 @@ start()
### catalina-storeconfig.jar
### catalina.jar
### if [ ! -e /var/lib/tomcat5/server/lib/jss4.jar ]; then
- ### if [ `pkiarch` = "sparc" ] ; then
+ ### if [ "$ARCHITECTURE" = "sparc" ] ; then
### ln -s /usr/lib/java/dirsec/jss4.jar jss4.jar
- ### elif [ `pkiarch` = "sparcv9" ] ; then
- ### ln -s /usr/lib/`pkiarch`/java/dirsec/jss4.jar jss4.jar
+ ### elif [ "$ARCHITECTURE" = "sparcv9" ] ; then
+ ### ln -s /usr/lib/sparcv9/java/dirsec/jss4.jar jss4.jar
### fi
### fi
### servlets-cgi.renametojar
diff --git a/pki/base/tps/apache/apachectl b/pki/base/tps/apache/apachectl
index fc054e7e7..827512ef3 100755
--- a/pki/base/tps/apache/apachectl
+++ b/pki/base/tps/apache/apachectl
@@ -32,7 +32,7 @@ LD_LIBRARY_PATH=[SECURITY_LIBRARIES]:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# see if httpd is linked with the openldap libraries - we need to override them
-OS=`pkiname`
+OS=`uname -s`
if [ $OS = "Linux" ]; then
hasopenldap=0
diff --git a/pki/base/tps/apache/pki_instance_command_wrapper b/pki/base/tps/apache/pki_instance_command_wrapper
index 061526f69..913b37e4a 100644
--- a/pki/base/tps/apache/pki_instance_command_wrapper
+++ b/pki/base/tps/apache/pki_instance_command_wrapper
@@ -26,15 +26,6 @@ if [ $? -ne 0 ] ; then
echo "Cannot invoke '$0' from non-existent directory!"
exit 255
fi
-
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
###############################################################################
@@ -84,10 +75,11 @@ invalid_architecture() {
## ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
+ARCHITECTURE=""
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
if [ "${ARCHITECTURE}" = "i386" ] ; then
LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
@@ -126,6 +118,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
diff --git a/pki/base/tps/apache/pki_subsystem_command_wrapper b/pki/base/tps/apache/pki_subsystem_command_wrapper
index a8f4344b7..19cbf9dd9 100644
--- a/pki/base/tps/apache/pki_subsystem_command_wrapper
+++ b/pki/base/tps/apache/pki_subsystem_command_wrapper
@@ -74,10 +74,11 @@ invalid_architecture() {
## ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
+ARCHITECTURE=""
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
if [ "${ARCHITECTURE}" = "i386" ] ; then
LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
@@ -112,6 +113,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
LD_LIBRARY_PATH=/usr/lib/java:/usr/lib:/lib
LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
diff --git a/pki/base/tps/etc/init.d/httpd b/pki/base/tps/etc/init.d/httpd
index cdd6a1ed0..e0a273009 100755
--- a/pki/base/tps/etc/init.d/httpd
+++ b/pki/base/tps/etc/init.d/httpd
@@ -41,26 +41,17 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-# Check to insure that at least one PKI subsystem
-# currently resides on this system.
-if [ ! -x /usr/bin/pkiarch ] ||
- [ ! -x /usr/bin/pkiflavor ] ||
- [ ! -x /usr/bin/pkiname ]; then
- echo "This machine is missing all PKI subsystems!"
- exit 255
-fi
-
# Check to insure that this script's associated PKI
# subsystem currently resides on this system.
SUBSYSTEM_TYPE=[SUBSYSTEM_TYPE]
-if [ ! -d /usr/share/`pkiflavor`/${SUBSYSTEM_TYPE} ] ; then
+if [ ! -d /usr/share/pki/${SUBSYSTEM_TYPE} ] ; then
echo "This machine is missing the '${SUBSYSTEM_TYPE}' subsystem!"
exit 255
fi
# Obtain the operating system upon which this script is being executed
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
+ARCHITECTURE=""
# Time to wait in seconds, before killing process
#
@@ -76,11 +67,17 @@ if [ ${OS} = "Linux" ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -i`
elif [ ${OS} = "SunOS" ] ; then
if [ `/usr/xpg4/bin/id -u` -ne 0 ] ; then
echo "Must be 'root' to execute '$0'!"
exit 1
fi
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
else
echo "Unsupported OS '${OS}'!"
exit 1
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl b/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
index 86246d933..efdac3b50 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
@@ -25,15 +25,21 @@
#
my $default_hardware_platform="";
my $ldapsearch="";
-$default_hardware_platform=`pkiarch`;
-chomp($default_hardware_platform);
if( $^O eq "linux" ) {
+ $default_hardware_platform=`uname -i`;
+ chomp($default_hardware_platform);
if( $default_hardware_platform eq "i386" ) {
$ldapsearch = "/usr/lib/mozldap/ldapsearch";
} elsif( $default_hardware_platform eq "x86_64" ) {
$ldapsearch = "/usr/lib64/mozldap/ldapsearch";
}
} elsif( $^O eq "solaris" ) {
+ $default_hardware_platform=`uname -p`;
+ chomp($default_hardware_platform);
+ if( ( $default_hardware_platform eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $default_hardware_platform="sparcv9";
+ }
if( $default_hardware_platform eq "sparc" ) {
$ldapsearch = "/usr/lib/mozldap6/ldapsearch";
} elsif( $default_hardware_platform eq "sparcv9" ) {
diff --git a/pki/base/tps/lib/perl/PKI/Base/Conf.pm b/pki/base/tps/lib/perl/PKI/Base/Conf.pm
index 7783eb8c6..895ab28a3 100755
--- a/pki/base/tps/lib/perl/PKI/Base/Conf.pm
+++ b/pki/base/tps/lib/perl/PKI/Base/Conf.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
index e9a23af2a..caaf6c65f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
index e75123e20..47af31018 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -166,16 +166,24 @@ sub update
my $tmp = "/tmp/addAgents-$$.ldif";
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
my $mozldap_path = "/usr/lib/mozldap";
- my $arch = `pkiarch`;
- $arch =~ s/\n//g;
- if ($arch eq "x86_64") {
- $mozldap_path = "/usr/lib64/mozldap";
- } elsif ($arch eq "sparcv9") {
- $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ my $arch = "";
+ if ($^O eq "linux") {
+ $arch = `uname -i`;
+ $arch =~ s/\n//g;
+ if ($arch eq "x86_64") {
+ $mozldap_path = "/usr/lib64/mozldap";
+ }
+ } elsif ($^O eq "solaris") {
+ $arch=`uname -p`;
+ $arch =~ s/\n//g;
+ if( ( $arch eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ }
}
$admincert =~ s/\//\\\//g;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
index 7e8586dce..a5130caa1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
index 690264578..734029bce 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -89,12 +89,20 @@ sub update
# try to do a ldapsearch
my $tmp = "/tmp/file$$";
my $mozldap_path = "/usr/lib/mozldap";
- my $arch = `pkiarch`;
- $arch =~ s/\n//g;
- if ($arch eq "x86_64") {
- $mozldap_path = "/usr/lib64/mozldap";
- } elsif ($arch eq "sparcv9") {
- $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ my $arch = "";
+ if ($^O eq "linux") {
+ $arch = `uname -i`;
+ $arch =~ s/\n//g;
+ if ($arch eq "x86_64") {
+ $mozldap_path = "/usr/lib64/mozldap";
+ }
+ } elsif ($^O eq "solaris") {
+ $arch=`uname -p`;
+ $arch =~ s/\n//g;
+ if( ( $arch eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ }
}
&PKI::TPS::Wizard::debug_log("AuthDBPanel: invoking $mozldap_path/ldapsearch");
my $status = system("$mozldap_path/ldapsearch -h '$host' " .
diff --git a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
index 7b5e2a1b5..eecf99ff5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
index f91aaecc8..f17bb2bce 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm b/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
index 957b1ba56..da5377d4f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -89,7 +89,7 @@ sub get_nickname
&PKI::TPS::Wizard::debug_log("CertInfo: get_nickname");
my $nickname = $::config->get("preop.cert.$self->{tag}.nickname");
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
if ($nickname ne "") {
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
index 259bc3b30..200ef8d74 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
index f003ecc06..fb5d9ccda 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Common.pm b/pki/base/tps/lib/perl/PKI/TPS/Common.pm
index f5d481041..d8686b6f1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Common.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Common.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Config.pm b/pki/base/tps/lib/perl/PKI/TPS/Config.pm
index 9972660e9..7195dccd9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Config.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Config.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
index 36d2c4d32..5d36d3da3 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
index 4c39d1821..06697a8c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
index 19e70d063..f4eb27c23 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
index 95c0a1f61..c4fc7a8f8 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -116,16 +116,24 @@ sub update
$objectclass = "organizationalUnit";
}
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
my $mozldap_path = "/usr/lib/mozldap";
- my $arch = `pkiarch`;
- $arch =~ s/\n//g;
- if ($arch eq "x86_64") {
- $mozldap_path = "/usr/lib64/mozldap";
- } elsif ($arch eq "sparcv9") {
- $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ my $arch = "";
+ if ($^O eq "linux") {
+ $arch = `uname -i`;
+ $arch =~ s/\n//g;
+ if ($arch eq "x86_64") {
+ $mozldap_path = "/usr/lib64/mozldap";
+ }
+ } elsif ($^O eq "solaris") {
+ $arch=`uname -p`;
+ $arch =~ s/\n//g;
+ if( ( $arch eq "sparc" ) &&
+ ( -d "/usr/lib/sparcv9/" ) ) {
+ $mozldap_path = "/usr/lib/sparcv9/mozldap6";
+ }
}
# creating database
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
index 910b94510..3a86ab0bd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 74d45984a..8b6a6ed67 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index a4d7091c4..af5d05c53 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm b/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
index 7348aab68..73e7b831a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index 2c6ac9a51..268f595eb 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Login.pm b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
index 1f67f866d..01aa01f42 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Login.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -91,7 +91,7 @@ package PKI::TPS::Login;
$PKI::TPS::Login::VERSION = '1.00';
# read configuration file
-my $flavor = `pkiflavor`;
+my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
index c57e61779..d6592d46e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
index 668165d2f..6f3510fef 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ sub new {
$self->{"update"} = \&update;
$self->{"panelvars"} = \&display;
- my $flavor = `pkiflavor`;
+ my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm b/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
index 02d4bcad3..49c248c2e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
index 476ff75db..bed56791d 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
index c96609d23..f2faee2c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index c422a8bcc..382072c2b 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
index 3f21404f8..1ffda171a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
index 24307e9d2..d0dc438c0 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 3788b4b8a..62068ff2f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
index 032357b4a..a1c77e7cd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
index a21b1d97e..328820e63 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
@@ -90,7 +90,7 @@ package PKI::TPS::Wizard;
$PKI::TPS::Wizard::VERSION = '1.00';
# read configuration file
-my $flavor = `pkiflavor`;
+my $flavor = "pki";
$flavor =~ s/\n//g;
my $pkiroot = $ENV{PKI_ROOT};
diff --git a/pki/base/tps/lib/perl/Template/Velocity.pm b/pki/base/tps/lib/perl/Template/Velocity.pm
index d276a75ce..ea5eb6d72 100755
--- a/pki/base/tps/lib/perl/Template/Velocity.pm
+++ b/pki/base/tps/lib/perl/Template/Velocity.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/pkiperl
+#!/usr/bin/perl
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or
diff --git a/pki/base/tps/scripts/nss_pcache b/pki/base/tps/scripts/nss_pcache
index 7877d2073..f87d7bbf6 100755
--- a/pki/base/tps/scripts/nss_pcache
+++ b/pki/base/tps/scripts/nss_pcache
@@ -29,28 +29,37 @@ if [ $? -ne 0 ] ; then
exit 255
fi
-PLATFORM=`pkiarch`
+OS=`uname -s`
+PLATFORM=""
-if [ $PLATFORM = "i386" ]; 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
-elif [ $PLATFORM = "sparc" ]; then
- # 32-bit Solaris
- LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
-elif [ $PLATFORM = "sparcv9" ]; then
- # 64-bit Solaris
- LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+if [ $OS = "Linux" ]; then
+ PLATFORM=`uname -i`
+ if [ $PLATFORM = "i386" ]; 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
+ PLATFORM=`uname -p`
+ if [ "${PLATFORM}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ PLATFORM="sparcv9"
+ fi
+ if [ $PLATFORM = "sparc" ]; then
+ # 32-bit Solaris
+ LD_LIBRARY_PATH=/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+ elif [ $PLATFORM = "sparcv9" ]; then
+ # 64-bit Solaris
+ LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:/usr/lib/sparcv9:/usr/lib/dirsec:/usr/lib:$LD_LIBRARY_PATH
+ fi
+ export LD_LIBRARY_PATH
fi
-export LD_LIBRARY_PATH
-DIST=`pkidist`
FORTITUDE_DIR=/usr/sbin
-if [ $DIST = "el4" ]; then
- FORTITUDE_DIR=/opt/fortitude/bin
-elif [ $DIST = "sol9" ]; then
+if [ $OS = "SunOS" ]; then
FORTITUDE_DIR=/opt/fortitude/bin
fi
diff --git a/pki/base/tps/setup_package b/pki/base/tps/setup_package
index bd3c52f55..ea8728760 100755
--- a/pki/base/tps/setup_package
+++ b/pki/base/tps/setup_package
@@ -69,7 +69,8 @@ usage() {
# specify generic helper variables
OS=`uname`
-if [ ${OS} = "Linux" ] ; then
+ARCHITECTURE=""
+if [ "${OS}" = "Linux" ] ; then
if [ -e /etc/fedora-release ] ; then
USE_OPT_FORTITUDE="FALSE"
elif [ -e /etc/redhat-release ] ; then
@@ -83,8 +84,10 @@ if [ ${OS} = "Linux" ] ; then
usage "ERROR: Only Fedora and Red Hat '${OS}' are supported!"
exit 255
fi
-elif [ ${OS} = "SunOS" ] ; then
+ ARCHITECTURE=`uname -i`
+elif [ "${OS}" = "SunOS" ] ; then
USE_OPT_FORTITUDE="TRUE"
+ ARCHITECTURE=`uname -p`
else
usage "ERROR: Unsupported operating system '${OS}'!"
exit 255
@@ -93,30 +96,29 @@ fi
# Since "rpmbuild" fails to process "%ifarch" macros inside the
# "%install" section of a spec file, the actual hardware
# architecture will be determined at this point in time.
-ARCHITECTURE=`uname -i`
-if [ ${ARCHITECTURE} = "i386" ] ; then
+if [ "${ARCHITECTURE}" = "i386" ] ; then
LIB_DIR="lib"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "x86_64" ] ; then
+elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
LIB_DIR="lib64"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "ppc" ] ; then
+elif [ "${ARCHITECTURE}" = "ppc" ] ; then
LIB_DIR="lib"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "ppc64" ] ; then
+elif [ "${ARCHITECTURE}" = "ppc64" ] ; then
LIB_DIR="lib64"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${ARCHITECTURE} = "s390x" ] ; then
+elif [ "${ARCHITECTURE}" = "s390x" ] ; then
LIB_DIR="lib"
PERL_DIR="/usr/bin/perl"
SCRIPTS_DIR="bin"
WRAPPER_DIR="bin"
-elif [ ${OS} = "SunOS" ] &&
- [ ${ARCHITECTURE} = "sparc" ] ; then
+elif [ "${OS}" = "SunOS" ] &&
+ [ "${ARCHITECTURE}" = "sparc" ] ; then
# Note that "pkgbuild" successfully processes "%ifarch" macros
# inside the "%install" section of a spec file.
#