Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2058 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

12 files changed, 0 insertions, 1998 deletions

diff --git a/pki/dogtag/scripts/build_ca b/pki/dogtag/scripts/build_ca
deleted file mode 100755
index ceb4fb6d6..000000000
--- a/pki/dogtag/scripts/build_ca
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory three levels
-# above this shell script prior to executing it so
-# that all of its output is written to this directory
-cd `dirname $0`/../../..
-
-# Retrieve the name of this base directory
-PKI_PWD=`pwd`
-
-# Establish the release directory
-PKI_RELEASE_ROOT="${PKI_PWD}/release"
-
-# Establish the name of the machine
-PKI_HOSTNAME=`hostname`
-
-# Set pre-defined variables
-PKI_DIR="pki"
-PKI_SRC_DIR="base"
-ROOT_UID=0
-
-# This script may ONLY be run on Linux!
-PKI_OS=`uname`
-if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "on a 'Linux' machine!\n"
-    exit 255
-fi
-
-# Set Dogtag variables
-PKI_FLAVOR="dogtag"
-PKI_UI_DIR="${PKI_DIR}/${PKI_FLAVOR}"
-PKI_BUILD_SCRIPT_DIR="${PKI_PWD}/${PKI_UI_DIR}"
-PKI_BUILD_SCRIPT="build_dogtag"
-
-# Set packaging variables
-YUM_EXE="/usr/bin/yum"
-YUM_EXE_OPTIONS="-y --nogpgcheck install"
-RPM_DIR="dist/rpmpkg/RPMS/*/"
-RPM_EXT="-[0-9]*.rpm"
-
-# Set sudo variables
-PKI_SUDO="/usr/bin/sudo"
-PKI_SUDOERS="/etc/sudoers"
-
-# Set user identity variables
-PKI_EUID=`/usr/bin/id -u`
-PKI_UID=`/usr/bin/id -ur`
-PKI_USERNAME=`/usr/bin/id -un`
-
-# Make sure that this script is NOT being run as root!
-if [ ${PKI_UID} -eq ${ROOT_UID} ] ||
-   [ ${PKI_EUID} -eq ${ROOT_UID} ]; then
-    printf "The '$0' script may NOT be run as root!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudo' executable
-if [ ! -x "${PKI_SUDO}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDO}' executable\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudoers' file
-if [ ! -e "${PKI_SUDOERS}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDOERS}' file\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the required sudoers command
-PKI_SUDOERS_COMMAND="(root) NOPASSWD: ${YUM_EXE}"
-PKI_SUDOERS_LINE="${PKI_USERNAME}  ALL = NOPASSWD: ${YUM_EXE}"
-printf "Checking if '${PKI_USERNAME}' has the appropriate '${PKI_SUDO}' permissions . . .\n"
-printf "[NOTE:  A password prompt may appear requiring ${PKI_USERNAME}'s password.]\n"
-`${PKI_SUDO} -l | grep "${PKI_SUDOERS_COMMAND}" > /dev/null 2>&1`
-if [ $? -ne 0 ]; then
-    printf "The '$0' script requires that the\n"
-    printf "'${PKI_SUDOERS}' file MUST contain this line:\n\n"
-    printf "    '${PKI_SUDOERS_LINE}'\n\n"
-    exit 255
-fi
-
-# Establish release subdirectories
-PKI_RELEASE_DIR="${PKI_RELEASE_ROOT}/${PKI_DIR}/${PKI_SRC_DIR}"
-PKI_RELEASE_UI_DIR="${PKI_RELEASE_ROOT}/${PKI_UI_DIR}"
-
-# Establish common PKI package names
-OSUTIL=osutil${RPM_EXT}
-PKI_SYMKEY=pki-symkey${RPM_EXT}
-PKI_NATIVE_TOOLS=pki-native-tools${RPM_EXT}
-PKI_UTIL=pki-util${RPM_EXT}
-PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT}
-PKI_SETUP=pki-setup${RPM_EXT}
-PKI_JAVA_TOOLS=pki-java-tools${RPM_EXT}
-PKI_JAVA_TOOLS_JAVADOC=pki-java-tools-javadoc${RPM_EXT}
-PKI_COMMON_UI=${PKI_FLAVOR}-pki-common-ui${RPM_EXT}
-PKI_COMMON=pki-common${RPM_EXT}
-PKI_COMMON_JAVADOC=pki-common-javadoc${RPM_EXT}
-PKI_SELINUX=pki-selinux${RPM_EXT}
-PKI_SILENT=pki-silent${RPM_EXT}
-
-# Establish PKI subsystem package names
-PKI_CA_UI=${PKI_FLAVOR}-pki-ca-ui${RPM_EXT}
-PKI_CA=pki-ca${RPM_EXT}
-
-# Establish optional PKI package names
-PKI_CONSOLE_UI=${PKI_FLAVOR}-pki-console-ui${RPM_EXT}
-PKI_CONSOLE=pki-console${RPM_EXT}
-
-# Always start with a new release root directory
-rm -rf ${PKI_RELEASE_ROOT}
-mkdir -p ${PKI_RELEASE_ROOT}
-
-# Build and install 'osutil' packages
-${PKI_BUILD_SCRIPT_DIR}/osutil/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/osutil/${RPM_DIR}/${OSUTIL}
-
-# Build and install 'pki-symkey' packages
-${PKI_BUILD_SCRIPT_DIR}/symkey/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${PKI_SYMKEY}
-
-# Build and install 'pki-native-tools' packages
-${PKI_BUILD_SCRIPT_DIR}/native-tools/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/native-tools/${RPM_DIR}/${PKI_NATIVE_TOOLS}
-
-# Build and install 'pki-util' packages
-${PKI_BUILD_SCRIPT_DIR}/util/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/util/${RPM_DIR}/${PKI_UTIL}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/util/${RPM_DIR}/${PKI_UTIL_JAVADOC}
-
-# Build and install 'pki-setup' packages
-${PKI_BUILD_SCRIPT_DIR}/setup/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/setup/${RPM_DIR}/${PKI_SETUP}
-
-# Build and install 'pki-java-tools' packages
-${PKI_BUILD_SCRIPT_DIR}/java-tools/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/java-tools/${RPM_DIR}/${PKI_JAVA_TOOLS}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/java-tools/${RPM_DIR}/${PKI_JAVA_TOOLS_JAVADOC}
-
-# Build and install 'pki-common-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/common-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/common-ui/${RPM_DIR}/${PKI_COMMON_UI}
-
-# Build and install 'pki-common' packages
-${PKI_BUILD_SCRIPT_DIR}/common/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/common/${RPM_DIR}/${PKI_COMMON}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/common/${RPM_DIR}/${PKI_COMMON_JAVADOC}
-
-# Build and install 'pki-selinux' packages
-${PKI_BUILD_SCRIPT_DIR}/selinux/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/selinux/${RPM_DIR}/${PKI_SELINUX}
-
-# Build and install 'pki-silent' packages
-${PKI_BUILD_SCRIPT_DIR}/silent/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/silent/${RPM_DIR}/${PKI_SILENT}
-
-# Build and install 'pki-ca-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/ca-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/ca-ui/${RPM_DIR}/${PKI_CA_UI}
-
-# Build and install 'pki-ca' packages
-${PKI_BUILD_SCRIPT_DIR}/ca/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/ca/${RPM_DIR}/${PKI_CA}
-
-# Build and install 'pki-console-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/console-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/console-ui/${RPM_DIR}/${PKI_CONSOLE_UI}
-
-# Build and install 'pki-console' packages
-${PKI_BUILD_SCRIPT_DIR}/console/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/console/${RPM_DIR}/${PKI_CONSOLE}
-
diff --git a/pki/dogtag/scripts/build_pki b/pki/dogtag/scripts/build_pki
deleted file mode 100755
index d1194a9d1..000000000
--- a/pki/dogtag/scripts/build_pki
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory three levels
-# above this shell script prior to executing it so
-# that all of its output is written to this directory
-cd `dirname $0`/../../..
-
-# Retrieve the name of this base directory
-PKI_PWD=`pwd`
-
-# Establish the release directory
-PKI_RELEASE_ROOT="${PKI_PWD}/release"
-
-# Establish the name of the machine
-PKI_HOSTNAME=`hostname`
-
-# Set pre-defined variables
-PKI_DIR="pki"
-PKI_SRC_DIR="base"
-ROOT_UID=0
-
-# This script may ONLY be run on Linux!
-PKI_OS=`uname`
-if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "on a 'Linux' machine!\n"
-    exit 255
-fi
-
-# Set Dogtag variables
-PKI_FLAVOR="dogtag"
-PKI_UI_DIR="${PKI_DIR}/${PKI_FLAVOR}"
-PKI_BUILD_SCRIPT_DIR="${PKI_PWD}/${PKI_UI_DIR}"
-PKI_BUILD_SCRIPT="build_dogtag"
-
-# Set packaging variables
-YUM_EXE="/usr/bin/yum"
-YUM_EXE_OPTIONS="-y --nogpgcheck install"
-RPM_DIR="dist/rpmpkg/RPMS/*/"
-RPM_EXT="-[0-9]*.rpm"
-
-# Set sudo variables
-PKI_SUDO="/usr/bin/sudo"
-PKI_SUDOERS="/etc/sudoers"
-
-# Set user identity variables
-PKI_EUID=`/usr/bin/id -u`
-PKI_UID=`/usr/bin/id -ur`
-PKI_USERNAME=`/usr/bin/id -un`
-
-# Make sure that this script is NOT being run as root!
-if [ ${PKI_UID} -eq ${ROOT_UID} ] ||
-   [ ${PKI_EUID} -eq ${ROOT_UID} ]; then
-    printf "The '$0' script may NOT be run as root!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudo' executable
-if [ ! -x "${PKI_SUDO}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDO}' executable\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudoers' file
-if [ ! -e "${PKI_SUDOERS}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDOERS}' file\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the required sudoers command
-PKI_SUDOERS_COMMAND="(root) NOPASSWD: ${YUM_EXE}"
-PKI_SUDOERS_LINE="${PKI_USERNAME}  ALL = NOPASSWD: ${YUM_EXE}"
-printf "Checking if '${PKI_USERNAME}' has the appropriate '${PKI_SUDO}' permissions . . .\n"
-printf "[NOTE:  A password prompt may appear requiring ${PKI_USERNAME}'s password.]\n"
-`${PKI_SUDO} -l | grep "${PKI_SUDOERS_COMMAND}" > /dev/null 2>&1`
-if [ $? -ne 0 ]; then
-    printf "The '$0' script requires that the\n"
-    printf "'${PKI_SUDOERS}' file MUST contain this line:\n\n"
-    printf "    '${PKI_SUDOERS_LINE}'\n\n"
-    exit 255
-fi
-
-# Establish release subdirectories
-PKI_RELEASE_DIR="${PKI_RELEASE_ROOT}/${PKI_DIR}/${PKI_SRC_DIR}"
-PKI_RELEASE_UI_DIR="${PKI_RELEASE_ROOT}/${PKI_UI_DIR}"
-
-# Establish common PKI package names
-OSUTIL=osutil${RPM_EXT}
-PKI_SYMKEY=pki-symkey${RPM_EXT}
-PKI_NATIVE_TOOLS=pki-native-tools${RPM_EXT}
-PKI_UTIL=pki-util${RPM_EXT}
-PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT}
-PKI_SETUP=pki-setup${RPM_EXT}
-PKI_JAVA_TOOLS=pki-java-tools${RPM_EXT}
-PKI_JAVA_TOOLS_JAVADOC=pki-java-tools-javadoc${RPM_EXT}
-PKI_COMMON_UI=${PKI_FLAVOR}-pki-common-ui${RPM_EXT}
-PKI_COMMON=pki-common${RPM_EXT}
-PKI_COMMON_JAVADOC=pki-common-javadoc${RPM_EXT}
-PKI_CONSOLE_UI=${PKI_FLAVOR}-pki-console-ui${RPM_EXT}
-PKI_CONSOLE=pki-console${RPM_EXT}
-PKI_SELINUX=pki-selinux${RPM_EXT}
-PKI_SILENT=pki-silent${RPM_EXT}
-
-# Establish PKI subsystem package names
-PKI_CA_UI=${PKI_FLAVOR}-pki-ca-ui${RPM_EXT}
-PKI_CA=pki-ca${RPM_EXT}
-PKI_KRA_UI=${PKI_FLAVOR}-pki-kra-ui${RPM_EXT}
-PKI_KRA=pki-kra${RPM_EXT}
-PKI_OCSP_UI=${PKI_FLAVOR}-pki-ocsp-ui${RPM_EXT}
-PKI_OCSP=pki-ocsp${RPM_EXT}
-PKI_TKS_UI=${PKI_FLAVOR}-pki-tks-ui${RPM_EXT}
-PKI_TKS=pki-tks${RPM_EXT}
-PKI_RA_UI=${PKI_FLAVOR}-pki-ra-ui${RPM_EXT}
-PKI_RA=pki-ra${RPM_EXT}
-PKI_TPS_UI=${PKI_FLAVOR}-pki-tps-ui${RPM_EXT}
-PKI_TPS=pki-tps${RPM_EXT}
-
-# Establish optional PKI package names
-## PKI_MANAGE=pki-manage${RPM_EXT}
-## PKI_MIGRATE=pki-migrate${RPM_EXT}
-
-# Always start with a new release root directory
-rm -rf ${PKI_RELEASE_ROOT}
-mkdir -p ${PKI_RELEASE_ROOT}
-
-# Build and install 'osutil' packages
-${PKI_BUILD_SCRIPT_DIR}/osutil/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/osutil/${RPM_DIR}/${OSUTIL}
-
-# Build and install 'pki-symkey' packages
-${PKI_BUILD_SCRIPT_DIR}/symkey/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${PKI_SYMKEY}
-
-# Build and install 'pki-native-tools' packages
-${PKI_BUILD_SCRIPT_DIR}/native-tools/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/native-tools/${RPM_DIR}/${PKI_NATIVE_TOOLS}
-
-# Build and install 'pki-util' packages
-${PKI_BUILD_SCRIPT_DIR}/util/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/util/${RPM_DIR}/${PKI_UTIL}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/util/${RPM_DIR}/${PKI_UTIL_JAVADOC}
-
-# Build and install 'pki-setup' packages
-${PKI_BUILD_SCRIPT_DIR}/setup/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/setup/${RPM_DIR}/${PKI_SETUP}
-
-# Build and install 'pki-java-tools' packages
-${PKI_BUILD_SCRIPT_DIR}/java-tools/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/java-tools/${RPM_DIR}/${PKI_JAVA_TOOLS}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/java-tools/${RPM_DIR}/${PKI_JAVA_TOOLS_JAVADOC}
-
-# Build and install 'pki-common-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/common-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/common-ui/${RPM_DIR}/${PKI_COMMON_UI}
-
-# Build and install 'pki-common' packages
-${PKI_BUILD_SCRIPT_DIR}/common/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/common/${RPM_DIR}/${PKI_COMMON}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/common/${RPM_DIR}/${PKI_COMMON_JAVADOC}
-
-# Build and install 'pki-console-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/console-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/console-ui/${RPM_DIR}/${PKI_CONSOLE_UI}
-
-# Build and install 'pki-console' packages
-${PKI_BUILD_SCRIPT_DIR}/console/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/console/${RPM_DIR}/${PKI_CONSOLE}
-
-# Build and install 'pki-selinux' packages
-${PKI_BUILD_SCRIPT_DIR}/selinux/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/selinux/${RPM_DIR}/${PKI_SELINUX}
-
-# Build and install 'pki-silent' packages
-${PKI_BUILD_SCRIPT_DIR}/silent/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/silent/${RPM_DIR}/${PKI_SILENT}
-
-# Build and install 'pki-ca-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/ca-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/ca-ui/${RPM_DIR}/${PKI_CA_UI}
-
-# Build and install 'pki-ca' packages
-${PKI_BUILD_SCRIPT_DIR}/ca/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/ca/${RPM_DIR}/${PKI_CA}
-
-# Build and install 'pki-kra-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/kra-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/kra-ui/${RPM_DIR}/${PKI_KRA_UI}
-
-# Build and install 'pki-kra' packages
-${PKI_BUILD_SCRIPT_DIR}/kra/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/kra/${RPM_DIR}/${PKI_KRA}
-
-# Build and install 'pki-ocsp-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/ocsp-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/ocsp-ui/${RPM_DIR}/${PKI_OCSP_UI}
-
-# Build and install 'pki-ocsp' packages
-${PKI_BUILD_SCRIPT_DIR}/ocsp/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/ocsp/${RPM_DIR}/${PKI_OCSP}
-
-# Build and install 'pki-tks-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/tks-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/tks-ui/${RPM_DIR}/${PKI_TKS_UI}
-
-# Build and install 'pki-tks' packages
-${PKI_BUILD_SCRIPT_DIR}/tks/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/tks/${RPM_DIR}/${PKI_TKS}
-
-# Build and install 'pki-ra-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/ra-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/ra-ui/${RPM_DIR}/${PKI_RA_UI}
-
-# Build and install 'pki-ra' packages
-${PKI_BUILD_SCRIPT_DIR}/ra/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/ra/${RPM_DIR}/${PKI_RA}
-
-# Build and install 'pki-tps-ui' packages
-${PKI_BUILD_SCRIPT_DIR}/tps-ui/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_UI_DIR}/tps-ui/${RPM_DIR}/${PKI_TPS_UI}
-
-# Build and install 'pki-tps' packages
-${PKI_BUILD_SCRIPT_DIR}/tps/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/tps/${RPM_DIR}/${PKI_TPS}
-
-# Build and install 'pki-manage' packages
-## ${PKI_BUILD_SCRIPT_DIR}/manage/${PKI_BUILD_SCRIPT}
-## ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/manage/${RPM_DIR}/${PKI_MANAGE}
-
-# Build and install 'pki-migrate' packages
-## ${PKI_BUILD_SCRIPT_DIR}/migrate/${PKI_BUILD_SCRIPT}
-## ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/migrate/${RPM_DIR}/${PKI_MIGRATE}
-
diff --git a/pki/dogtag/scripts/create_pki_yum_repos b/pki/dogtag/scripts/create_pki_yum_repos
deleted file mode 100755
index 95cf500fb..000000000
--- a/pki/dogtag/scripts/create_pki_yum_repos
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# This script may ONLY be run on Linux!
-PKI_OS=`uname`
-if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "on a 'Linux' machine!\n"
-    exit 255
-fi
-
-# Always switch into the base directory three levels
-# above this shell script prior to executing it so
-# that all of its output is written to this directory
-cd `dirname $0`/../../..
-
-# Retrieve the name of this base directory
-PKI_PWD=`pwd`
-
-# Establish the release directory
-PKI_RELEASE_ROOT="${PKI_PWD}/release"
-
-# This script is only executable from the directory
-# containing the "./release" directory!
-if [ ! -d ./release ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "from the directory containing './release'!\n"
-    exit 255
-fi
-
-printf "Removing any 'RPMS/' and 'SRPMS/' directories . . . "
-if [ -d RPMS ]; then
-    rm -rf RPMS
-fi
-if [ -d SRPMS ]; then
-    rm -rf SRPMS
-fi
-printf "done.\n\n"
-
-printf "Creating new 'RPMS/' and 'SRPMS/' directories . . . "
-mkdir RPMS SRPMS
-printf "done.\n\n"
-
-printf "Copying all 'RPMS' and 'SRPMS' into the 'RPMS/' directory . . . "
-cd ./release
-find . -name "*.rpm" | xargs -n1 -I{} cp -p {} ../RPMS
-cd ..
-printf "done.\n\n"
-
-printf "Moving all 'SRPMS' into the 'SRPMS/' directory . . . "
-mv ./RPMS/*.src.rpm ./SRPMS
-printf "done.\n\n"
-
-if [ -x /usr/bin/createrepo ]; then
-	printf "Attempting to create a yum repo in the 'RPMS/' directory . . .\n"
-	/usr/bin/createrepo ./RPMS
-	printf "done.\n\n"
-
-	printf "Attempting to create a yum repo in the 'SRPMS/' directory . . .\n"
-	/usr/bin/createrepo ./SRPMS
-	printf "done.\n\n"
-fi
-
-printf "Counting all 'RPMS' . . . "
-RPM_COUNT=`ls -1 ./RPMS/*.rpm | wc -l`
-printf "done.\n\n"
-
-printf "Counting all 'SRPMS' . . . "
-SRPM_COUNT=`ls -1 ./SRPMS/*.rpm | wc -l`
-printf "done.\n\n"
-
-printf "TOTAL:  RPMS  = ${RPM_COUNT}\n"
-printf "        SRPMS = ${SRPM_COUNT}\n\n"
-
diff --git a/pki/dogtag/scripts/ds_remove_cgi_32 b/pki/dogtag/scripts/ds_remove_cgi_32
deleted file mode 100755
index 8759499d0..000000000
--- a/pki/dogtag/scripts/ds_remove_cgi_32
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env perl
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-use lib qw(/usr/lib/dirsrv/perl);
-
-use strict;
-
-use File::Basename;
-use File::Path;
-use CGI qw(:cgi :oldstyle_urls);
-use Inf;
-###use AdminUtil;
-use Util;
-use FileConn;
-use Resource;
-
-# remove_tree($centry, $key, $instname, [$isparent, [$dontremove]])
-#     $centry: entry to look for the path to be removed
-#     $key: key to look for the path in the entry
-#     $instname: instance name "slapd-<ID>" to check the path
-#     $isparent: specify 1 to remove from the parent dir
-#     $dontremove: pattern not to be removed (e.g., ".db$")
-sub remove_tree
-{
-    my $centry = shift;
-    my $key = shift;
-    my $instname = shift;
-    my $isparent = shift;
-    my $dontremove = shift;
-
-    foreach my $path ( @{$centry->{$key}} )
-    {
-        my $rmdir = "";
-        my $rc = 0;
-        if ( 1 == $isparent )
-        {
-            $rmdir = dirname($path);
-        }
-        else
-        {
-            $rmdir = $path;
-        }
-        if ( -d $rmdir && $rmdir =~ /$instname/ )
-        {
-            if ( "" eq "$dontremove" )
-            {
-                $rc = rmtree($rmdir);
-                if ( 0 == $rc )
-                {
-                    print "Content-type: text/plain\n\n";
-                    print "NMC_ErrInfo: $rmdir was not removed.\n";
-                    print STDERR "Warning: $rmdir was not removed.\n";
-                }
-            }
-            else
-            {
-                # Skip the dontremove files
-                $rc = opendir(DIR, $rmdir);
-                if ($rc)
-                {
-                    while (defined(my $file = readdir(DIR)))
-                    {
-                        next if ( "$file" =~ /$dontremove/ );
-                        next if ( "$file" eq "." );
-                        next if ( "$file" eq ".." );
-                        my $rmfile = $rmdir . "/" . $file;
-                        my $rc0 = rmtree($rmfile);
-                        if ( 0 == $rc0 )
-                        {
-                            print "Content-type: text/plain\n\n";
-                            print "NMC_ErrInfo: $rmfile was not removed.\n";
-                            print STDERR "Warning: $rmfile was not removed.\n";
-                        }
-                    }
-                    closedir(DIR);
-                }
-                my $newrmdir = $rmdir . ".removed";
-                my $rc1 = 1;
-                if ( -d $newrmdir )
-                {
-                    $rc1 = rmtree($newrmdir);
-                    if ( 0 == $rc1 )
-                    {
-                        print "Content-type: text/plain\n\n";
-                        print "NMC_ErrInfo: $newrmdir was not removed.\n";
-                        print STDERR "Warning: $newrmdir was not removed.\n";
-                    }
-                }
-                if ( 0 < $rc1 )
-                {
-                    rename($rmdir, $newrmdir);
-                }
-            }
-        }
-    }
-}
-
-sub remove_pidfile
-{
-    my ($type, $instdir, $instname) = @_;
-
-    my $pattern = "^" . $type . ".*=";
-    my $pidline = `grep $pattern $instdir/start-slapd`;
-    chomp($pidline);
-    my ($key, $pidfile) = split(/=/, $pidline);
-    if ( -e $pidfile && $pidfile =~ /$instname/ )
-    {
-        unlink($pidfile);
-    }
-}
-
-###my $res = new Resource("/usr/share/dirsrv/properties/ds_remove.res",
-###                       "/usr/share/dirsrv/properties/setup-ds-admin.res",
-###                       "/usr/share/dirsrv/properties/setup-ds.res");
-
-# parse the input parameters
-my $query = new CGI;
-
-# call ds_newinst as a GET (GET or POST works, GET is simpler)
-$ENV{REQUEST_METHOD} = "GET";
-$ENV{QUERY_STRING} = $query->query_string();
-
-my $instname = $query->param('InstanceName');
-my ($slapd, $inst) = split(/-/, $instname, 2);
-my $configdir = "/etc/dirsrv/slapd-$inst";
-if ( ! -d $configdir )
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: $configdir does not exist\n";
-    print "NMC_Status: 1\n";
-    print STDERR "Error: $configdir does not exist\n";
-    exit 1;
-}
-###my @errs;
-###my $inf = createInfFromConfig($configdir, $inst, \@errs);
-###if (@errs)
-###{
-###    print "Content-type: text/plain\n\n";
-###    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
-###    print "NMC_Status: 1\n";
-###    print STDERR "Error: ", $res->getText(@errs), "\n";
-###    exit 1;
-###}
-
-### add the parmeters necessary to configure this DS to be managed
-### by the console and to be registered with the config DS - these
-### are usually passed in via the CGI params, or use reasonable
-### default values
-###my $admConf = getAdmConf("/etc/dirsrv/admin-serv");
-###$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
-###    $admConf->{ldapurl};
-###$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
-###    $admConf->{AdminDomain};
-
-# read the config file to find out the paths
-my $dseldif = "/etc/dirsrv/$instname/dse.ldif";
-my $conn = new FileConn($dseldif);
-
-my $dn = "cn=config";
-my $entry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$entry)
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
-    print "NMC_Status: 1\n";
-    print STDERR "Error: Search $dn in $dseldif failed: $entry\n";
-    exit 1;
-}
-
-### Unregister the server from the configuration ds
-### get config ds url from input or admconf
-### get admin id from input or admconf
-### must get admin password from input (PASSWORD_PIPE?)
-### get admin domain
-### config ds info
-###if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
-###{
-###    print "Content-type: text/plain\n\n";
-###    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
-###    print "NMC_Status: 1\n";
-###    print STDERR "Error:", $res->getText(@errs), "\n";
-###    exit 1;
-###}
-
-$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
-my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$dbentry)
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
-    print "NMC_Status: 1\n";
-    print "Error: Search $dn in $dseldif failed: $dbentry\n";
-    exit 1;
-}
-$conn->close();
-
-# stop the server
-my $instdir = "";
-foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
-{
-    if ( -d $path )
-    {
-        my $prog = $path . "/stop-slapd";
-        if (-x $prog) {
-            $? = 0;
-            # run the CGI
-            my $output = `$prog 2>&1`;
-            my $status = $?;
-            if ($status) {
-                # Ignore the stop failure
-                print "Content-type: text/plain\n\n";
-                print "NMC_ErrInfo: Could not stop directory server: $output\n";
-                print STDERR "Warning: Could not stop directory server: $output\n";
-            }
-            $instdir = $path;    # need to use it later...
-        } else {
-            print "Content-type: text/plain\n\n";
-            print "NMC_ErrInfo: The program $prog does not exist\n";
-            print "NMC_Status: 1\n";
-            print STDERR "Error: The program $prog does not exist\n";
-            exit 1;
-        }
-    }
-}
-    
-# remove physical dirs/files
-remove_tree($dbentry, "nsslapd-directory", $instname, 1);
-remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
-remove_tree($entry, "nsslapd-lockdir", $instname);
-remove_tree($entry, "nsslapd-tmpdir", $instname);
-remove_tree($entry, "nsslapd-bakdir", $instname, 1);
-remove_tree($entry, "nsslapd-errorlog", $instname, 1);
-
-# instance dir
-if ( -d $instdir && $instdir =~ /$instname/ )
-{
-    # clean up pid files (if any)
-    remove_pidfile("STARTPIDFILE", $instdir, $instname);
-    remove_pidfile("PIDFILE", $instdir, $instname);
-
-  #  if ( 1 == isConfigDS($instname, "/etc/dirsrv/admin-serv") )
-  #  {
-  #      # if it is the Config DS, adm.conf and local.conf needs to be removed.
-  #      unlink("/etc/dirsrv/admin-serv/adm.conf");
-  #      unlink("/etc/dirsrv/admin-serv/local.conf");
-  #  }
-
-    my $rc = rmtree($instdir);
-    if ( 0 == $rc )
-    {
-        print "Content-type: text/plain\n\n";
-        print "NMC_ErrInfo: $instdir was not removed.\n";
-        print STDERR "Warning: $instdir was not removed.\n";
-    }
-}
-# Finally, config dir
-remove_tree($entry, "nsslapd-schemadir", $instname, 1, "\.db\$");
-
-# if we got here, report success
-print "Content-type: text/plain\n\n";
-print "NMC_Status: 0\n";
-exit 0;
diff --git a/pki/dogtag/scripts/ds_remove_cgi_64 b/pki/dogtag/scripts/ds_remove_cgi_64
deleted file mode 100755
index 73bcc8a34..000000000
--- a/pki/dogtag/scripts/ds_remove_cgi_64
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env perl
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-use lib qw(/usr/lib64/dirsrv/perl);
-
-use strict;
-
-use File::Basename;
-use File::Path;
-use CGI qw(:cgi :oldstyle_urls);
-use Inf;
-###use AdminUtil;
-use Util;
-use FileConn;
-use Resource;
-
-# remove_tree($centry, $key, $instname, [$isparent, [$dontremove]])
-#     $centry: entry to look for the path to be removed
-#     $key: key to look for the path in the entry
-#     $instname: instance name "slapd-<ID>" to check the path
-#     $isparent: specify 1 to remove from the parent dir
-#     $dontremove: pattern not to be removed (e.g., ".db$")
-sub remove_tree
-{
-    my $centry = shift;
-    my $key = shift;
-    my $instname = shift;
-    my $isparent = shift;
-    my $dontremove = shift;
-
-    foreach my $path ( @{$centry->{$key}} )
-    {
-        my $rmdir = "";
-        my $rc = 0;
-        if ( 1 == $isparent )
-        {
-            $rmdir = dirname($path);
-        }
-        else
-        {
-            $rmdir = $path;
-        }
-        if ( -d $rmdir && $rmdir =~ /$instname/ )
-        {
-            if ( "" eq "$dontremove" )
-            {
-                $rc = rmtree($rmdir);
-                if ( 0 == $rc )
-                {
-                    print "Content-type: text/plain\n\n";
-                    print "NMC_ErrInfo: $rmdir was not removed.\n";
-                    print STDERR "Warning: $rmdir was not removed.\n";
-                }
-            }
-            else
-            {
-                # Skip the dontremove files
-                $rc = opendir(DIR, $rmdir);
-                if ($rc)
-                {
-                    while (defined(my $file = readdir(DIR)))
-                    {
-                        next if ( "$file" =~ /$dontremove/ );
-                        next if ( "$file" eq "." );
-                        next if ( "$file" eq ".." );
-                        my $rmfile = $rmdir . "/" . $file;
-                        my $rc0 = rmtree($rmfile);
-                        if ( 0 == $rc0 )
-                        {
-                            print "Content-type: text/plain\n\n";
-                            print "NMC_ErrInfo: $rmfile was not removed.\n";
-                            print STDERR "Warning: $rmfile was not removed.\n";
-                        }
-                    }
-                    closedir(DIR);
-                }
-                my $newrmdir = $rmdir . ".removed";
-                my $rc1 = 1;
-                if ( -d $newrmdir )
-                {
-                    $rc1 = rmtree($newrmdir);
-                    if ( 0 == $rc1 )
-                    {
-                        print "Content-type: text/plain\n\n";
-                        print "NMC_ErrInfo: $newrmdir was not removed.\n";
-                        print STDERR "Warning: $newrmdir was not removed.\n";
-                    }
-                }
-                if ( 0 < $rc1 )
-                {
-                    rename($rmdir, $newrmdir);
-                }
-            }
-        }
-    }
-}
-
-sub remove_pidfile
-{
-    my ($type, $instdir, $instname) = @_;
-
-    my $pattern = "^" . $type . ".*=";
-    my $pidline = `grep $pattern $instdir/start-slapd`;
-    chomp($pidline);
-    my ($key, $pidfile) = split(/=/, $pidline);
-    if ( -e $pidfile && $pidfile =~ /$instname/ )
-    {
-        unlink($pidfile);
-    }
-}
-
-###my $res = new Resource("/usr/share/dirsrv/properties/ds_remove.res",
-###                       "/usr/share/dirsrv/properties/setup-ds-admin.res",
-###                       "/usr/share/dirsrv/properties/setup-ds.res");
-
-# parse the input parameters
-my $query = new CGI;
-
-# call ds_newinst as a GET (GET or POST works, GET is simpler)
-$ENV{REQUEST_METHOD} = "GET";
-$ENV{QUERY_STRING} = $query->query_string();
-
-my $instname = $query->param('InstanceName');
-my ($slapd, $inst) = split(/-/, $instname, 2);
-my $configdir = "/etc/dirsrv/slapd-$inst";
-if ( ! -d $configdir )
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: $configdir does not exist\n";
-    print "NMC_Status: 1\n";
-    print STDERR "Error: $configdir does not exist\n";
-    exit 1;
-}
-###my @errs;
-###my $inf = createInfFromConfig($configdir, $inst, \@errs);
-###if (@errs)
-###{
-###    print "Content-type: text/plain\n\n";
-###    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
-###    print "NMC_Status: 1\n";
-###    print STDERR "Error: ", $res->getText(@errs), "\n";
-###    exit 1;
-###}
-
-### add the parmeters necessary to configure this DS to be managed
-### by the console and to be registered with the config DS - these
-### are usually passed in via the CGI params, or use reasonable
-### default values
-###my $admConf = getAdmConf("/etc/dirsrv/admin-serv");
-###$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
-###    $admConf->{ldapurl};
-###$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
-###    $admConf->{AdminDomain};
-
-# read the config file to find out the paths
-my $dseldif = "/etc/dirsrv/$instname/dse.ldif";
-my $conn = new FileConn($dseldif);
-
-my $dn = "cn=config";
-my $entry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$entry)
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: Search $dn in $dseldif failed: $entry\n";
-    print "NMC_Status: 1\n";
-    print STDERR "Error: Search $dn in $dseldif failed: $entry\n";
-    exit 1;
-}
-
-### Unregister the server from the configuration ds
-### get config ds url from input or admconf
-### get admin id from input or admconf
-### must get admin password from input (PASSWORD_PIPE?)
-### get admin domain
-### config ds info
-###if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
-###{
-###    print "Content-type: text/plain\n\n";
-###    print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
-###    print "NMC_Status: 1\n";
-###    print STDERR "Error:", $res->getText(@errs), "\n";
-###    exit 1;
-###}
-
-$dn = "cn=config,cn=ldbm database,cn=plugins,cn=config";
-my $dbentry = $conn->search($dn, "base", "(cn=*)", 0);
-if (!$dbentry)
-{
-    print "Content-type: text/plain\n\n";
-    print "NMC_ErrInfo: Search $dn in $dseldif failed: $dbentry\n";
-    print "NMC_Status: 1\n";
-    print "Error: Search $dn in $dseldif failed: $dbentry\n";
-    exit 1;
-}
-$conn->close();
-
-# stop the server
-my $instdir = "";
-foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
-{
-    if ( -d $path )
-    {
-        my $prog = $path . "/stop-slapd";
-        if (-x $prog) {
-            $? = 0;
-            # run the CGI
-            my $output = `$prog 2>&1`;
-            my $status = $?;
-            if ($status) {
-                # Ignore the stop failure
-                print "Content-type: text/plain\n\n";
-                print "NMC_ErrInfo: Could not stop directory server: $output\n";
-                print STDERR "Warning: Could not stop directory server: $output\n";
-            }
-            $instdir = $path;    # need to use it later...
-        } else {
-            print "Content-type: text/plain\n\n";
-            print "NMC_ErrInfo: The program $prog does not exist\n";
-            print "NMC_Status: 1\n";
-            print STDERR "Error: The program $prog does not exist\n";
-            exit 1;
-        }
-    }
-}
-    
-# remove physical dirs/files
-remove_tree($dbentry, "nsslapd-directory", $instname, 1);
-remove_tree($dbentry, "nsslapd-db-logdirectory", $instname, 1);
-remove_tree($entry, "nsslapd-lockdir", $instname);
-remove_tree($entry, "nsslapd-tmpdir", $instname);
-remove_tree($entry, "nsslapd-bakdir", $instname, 1);
-remove_tree($entry, "nsslapd-errorlog", $instname, 1);
-
-# instance dir
-if ( -d $instdir && $instdir =~ /$instname/ )
-{
-    # clean up pid files (if any)
-    remove_pidfile("STARTPIDFILE", $instdir, $instname);
-    remove_pidfile("PIDFILE", $instdir, $instname);
-
-  #  if ( 1 == isConfigDS($instname, "/etc/dirsrv/admin-serv") )
-  #  {
-  #      # if it is the Config DS, adm.conf and local.conf needs to be removed.
-  #      unlink("/etc/dirsrv/admin-serv/adm.conf");
-  #      unlink("/etc/dirsrv/admin-serv/local.conf");
-  #  }
-
-    my $rc = rmtree($instdir);
-    if ( 0 == $rc )
-    {
-        print "Content-type: text/plain\n\n";
-        print "NMC_ErrInfo: $instdir was not removed.\n";
-        print STDERR "Warning: $instdir was not removed.\n";
-    }
-}
-# Finally, config dir
-remove_tree($entry, "nsslapd-schemadir", $instname, 1, "\.db\$");
-
-# if we got here, report success
-print "Content-type: text/plain\n\n";
-print "NMC_Status: 0\n";
-exit 0;
diff --git a/pki/dogtag/scripts/install_default_ca_instance b/pki/dogtag/scripts/install_default_ca_instance
deleted file mode 100755
index 6ca5fb62c..000000000
--- a/pki/dogtag/scripts/install_default_ca_instance
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##  Always switch into this base directory
-##  prior to script execution so that all
-##  of its output is written to this directory
-
-cd `dirname $0`
-
-
-##
-##  This script MUST be run as root!
-##
-
-ROOTUID=0
-
-OS=`uname`
-if [ "${OS}" = "Linux" ] ; then
-    MY_EUID=`/usr/bin/id -u`
-    MY_UID=`/usr/bin/id -ur`
-    USERNAME=`/usr/bin/id -un`
-else
-    printf "ERROR:  Unsupported operating system '${OS}'!\n"
-    exit 255
-fi
-
-if [ "${MY_UID}"  != "${ROOTUID}" ] &&
-   [ "${MY_EUID}" != "${ROOTUID}" ] ; then
-    printf "ERROR:  The '$0' script must be run as root!\n"
-    exit 255
-fi
-
-
-
-##
-##  Define DEFAULT CA Instance
-##
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-ca          \
-          -subsystem_type=ca                 \
-          -agent_secure_port=9443            \
-          -ee_secure_port=9444               \
-          -admin_secure_port=9445            \
-          -unsecure_port=9180                \
-          -tomcat_server_port=9701           \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-ca         \
-          -redirect logs=/var/log/pki-ca     \
-          -verbose
-
diff --git a/pki/dogtag/scripts/install_default_pki_instances b/pki/dogtag/scripts/install_default_pki_instances
deleted file mode 100755
index 1c27c79b0..000000000
--- a/pki/dogtag/scripts/install_default_pki_instances
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##  Always switch into this base directory
-##  prior to script execution so that all
-##  of its output is written to this directory
-
-cd `dirname $0`
-
-
-##
-##  This script MUST be run as root!
-##
-
-ROOTUID=0
-
-OS=`uname`
-if [ "${OS}" = "Linux" ] ; then
-    MY_EUID=`/usr/bin/id -u`
-    MY_UID=`/usr/bin/id -ur`
-    USERNAME=`/usr/bin/id -un`
-else
-    printf "ERROR:  Unsupported operating system '${OS}'!\n"
-    exit 255
-fi
-
-if [ "${MY_UID}"  != "${ROOTUID}" ] &&
-   [ "${MY_EUID}" != "${ROOTUID}" ] ; then
-    printf "ERROR:  The '$0' script must be run as root!\n"
-    exit 255
-fi
-
-
-
-##
-##  Define DEFAULT PKI Instances
-##
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-ca          \
-          -subsystem_type=ca                 \
-          -agent_secure_port=9443            \
-          -ee_secure_port=9444               \
-          -admin_secure_port=9445            \
-          -unsecure_port=9180                \
-          -tomcat_server_port=9701           \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-ca         \
-          -redirect logs=/var/log/pki-ca     \
-          -verbose
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-kra         \
-          -subsystem_type=kra                \
-          -agent_secure_port=10443           \
-          -ee_secure_port=10444              \
-          -admin_secure_port=10445           \
-          -unsecure_port=10180               \
-          -tomcat_server_port=10701          \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-kra        \
-          -redirect logs=/var/log/pki-kra    \
-          -verbose
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-ocsp        \
-          -subsystem_type=ocsp               \
-          -agent_secure_port=11443           \
-          -ee_secure_port=11444              \
-          -admin_secure_port=11445           \
-          -unsecure_port=11180               \
-          -tomcat_server_port=11701          \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-ocsp       \
-          -redirect logs=/var/log/pki-ocsp   \
-          -verbose
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-tks         \
-          -subsystem_type=tks                \
-          -agent_secure_port=13443           \
-          -ee_secure_port=13444              \
-          -admin_secure_port=13445           \
-          -unsecure_port=13180               \
-          -tomcat_server_port=13701          \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-tks        \
-          -redirect logs=/var/log/pki-tks    \
-          -verbose
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-ra          \
-          -subsystem_type=ra                 \
-          -secure_port=12889                 \
-          -non_clientauth_secure_port=12890  \
-          -unsecure_port=12888               \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-ra         \
-          -redirect logs=/var/log/pki-ra     \
-          -verbose
-
-pkicreate -pki_instance_root=/var/lib        \
-          -pki_instance_name=pki-tps         \
-          -subsystem_type=tps                \
-          -secure_port=7889                  \
-          -non_clientauth_secure_port=7890   \
-          -unsecure_port=7888                \
-          -user=pkiuser                      \
-          -group=pkiuser                     \
-          -redirect conf=/etc/pki-tps        \
-          -redirect logs=/var/log/pki-tps    \
-          -verbose
-
diff --git a/pki/dogtag/scripts/prepare_ca b/pki/dogtag/scripts/prepare_ca
deleted file mode 100755
index 8d9018aa2..000000000
--- a/pki/dogtag/scripts/prepare_ca
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the name of this base directory
-PKI_PWD=`pwd`
-
-# Establish the name of the machine
-PKI_HOSTNAME=`hostname`
-
-# Set pre-defined variables
-ROOT_UID=0
-
-# This script may ONLY be run on Linux!
-PKI_OS=`uname`
-if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "on a 'Linux' machine!\n"
-    exit 255
-fi
-
-# For Fedora machines, compute the FEDORA_VERSION
-if [ -e /etc/fedora-release ]; then
-    FEDORA_VERSION=`rpm -qf --qf='%{VERSION}' /etc/fedora-release | tr -d [A-Z] | tr -d [a-z]`
-else
-    # For now, just give FEDORA_VERSION a bogus value if not using Fedora.
-    FEDORA_VERSION=9999
-fi
-
-# Set Linux variables
-PKI_PLATFORM="LINUX"
-PKI_UPDATE="/usr/bin/yum"
-PKI_UPDATE_OPTIONS="-y install"
-PKI_UPDATE_DIR=""
-
-# Set sudo variables
-PKI_SUDO="/usr/bin/sudo"
-PKI_SUDOERS="/etc/sudoers"
-
-# Set user identity variables
-PKI_EUID=`/usr/bin/id -u`
-PKI_UID=`/usr/bin/id -ur`
-PKI_USERNAME=`/usr/bin/id -un`
-
-# Make sure that this script is NOT being run as root!
-if [ ${PKI_UID} -eq ${ROOT_UID} ] ||
-   [ ${PKI_EUID} -eq ${ROOT_UID} ]; then
-    printf "The '$0' script may NOT be run as root!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudo' executable
-if [ ! -x "${PKI_SUDO}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDO}' executable\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudoers' file
-if [ ! -e "${PKI_SUDOERS}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDOERS}' file\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the required sudoers command
-PKI_SUDOERS_COMMAND="(root) NOPASSWD: ${RPM_EXE}"
-PKI_SUDOERS_LINE="${PKI_USERNAME}  ALL = NOPASSWD: ${RPM_EXE}"
-printf "Checking if '${PKI_USERNAME}' has the appropriate '${PKI_SUDO}' permissions . . .\n"
-printf "[NOTE:  A password prompt may appear requiring ${PKI_USERNAME}'s password.]\n"
-`${PKI_SUDO} -l | grep "${PKI_SUDOERS_COMMAND}" > /dev/null 2>&1`
-if [ $? -ne 0 ]; then
-    printf "The '$0' script requires that the\n"
-    printf "'${PKI_SUDOERS}' file MUST contain this line:\n\n"
-    printf "    '${PKI_SUDOERS_LINE}'\n\n"
-    exit 255
-fi
-
-# Establish PKI support package names
-NSPR=nspr
-NSPR_DEVEL=nspr-devel
-NSS=nss
-NSS_DEVEL=nss-devel
-NSS_TOOLS=nss-tools
-JSS=jss
-JSS_JAVADOC=jss-javadoc
-SVRCORE=svrcore
-SVRCORE_DEVEL=svrcore-devel
-CYRUS_SASL=cyrus-sasl
-CYRUS_SASL_DEVEL=cyrus-sasl-devel
-OPENLDAP=openldap
-OPENLDAP_DEVEL=openldap-devel
-OPENLDAP_CLIENTS=openldap-clients
-PERL=perl
-PERL_LIBWWW_PERL=perl-libwww-perl
-PERL_XML_SIMPLE=perl-XML-Simple
-JPACKAGE_UTILS=jpackage-utils
-JAKARTA_COMMONS_LOGGING=jakarta-commons-logging
-TOMCAT5_SERVLET_2_4_API=tomcat5-servlet-2.4-api
-JAKARTA_COMMONS_COLLECTIONS=jakarta-commons-collections
-JAKARTA_COMMONS_BEANUTILS=jakarta-commons-beanutils
-JAKARTA_COMMONS_DIGESTER=jakarta-commons-digester
-ORO=oro
-CLASSPATHX_JAF=classpathx-jaf
-LDAPJDK=ldapjdk
-JAKARTA_COMMONS_POOL=jakarta-commons-pool
-JAKARTA_COMMONS_FILEUPLOAD=jakarta-commons-fileupload
-XML_COMMONS=xml-commons
-XML_COMMONS_APIS=xml-commons-apis
-REGEXP=regexp
-BCEL=bcel
-JAKARTA_COMMONS_DBCP=jakarta-commons-dbcp
-TOMCAT5_JASPER=tomcat5-jasper
-JAKARTA_COMMONS_DISCOVERY=jakarta-commons-discovery
-JAKARTA_COMMONS_HTTPCLIENT3=jakarta-commons-httpclient3
-JMS=jms
-JAKARTA_COMMONS_LAUNCHER=jakarta-commons-launcher
-JAKARTA_COMMONS_EL=jakarta-commons-el
-JAKARTA_COMMONS_DAEMON=jakarta-commons-daemon
-if [ ${FEDORA_VERSION} -eq 6 ]; then
-    # Required by Fedora Core 6
-    GNU_CRYPTO_SASL_JDK1_4=gnu-crypto-sasl-jdk1.4
-else
-    GNU_CRYPTO_SASL_JDK1_4=
-fi
-CLASSPATHX_MAIL=classpathx-mail
-XERCES_J2=xerces-j2
-XALAN_J2=xalan-j2
-LOG4J=log4j
-XML_COMMONS_RESOLVER=xml-commons-resolver
-AVALON_LOGKIT=avalon-logkit
-AVALON_FRAMEWORK=avalon-framework
-JDOM=jdom
-WERKEN_XPATH=werken-xpath
-VELOCITY=velocity
-ANT=ant
-WSDL4J=wsdl4j
-AXIS=axis
-MX4J=mx4j
-GERONIMO_SPECS=geronimo-specs
-JAKARTA_COMMONS_MODELER=jakarta-commons-modeler
-IDM_CONSOLE_FRAMEWORK=idm-console-framework
-TOMCAT5=tomcat5
-TOMCATJSS=tomcatjss
-MAKE=make
-M4=m4
-POLICYCOREUTILS=policycoreutils
-SELINUX_POLICY_DEVEL=selinux-policy-devel
-SELINUX_POLICY_TARGETED=selinux-policy-targeted
-
-# Build and install PKI support packages
-${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${OPENLDAP} ${OPENLDAP_DEVEL} ${OPENLDAP_CLIENTS} ${PERL} ${PERL_LIBWWW_PERL} ${PERL_XML_SIMPLE} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED}
-
diff --git a/pki/dogtag/scripts/prepare_pki b/pki/dogtag/scripts/prepare_pki
deleted file mode 100755
index 6027e44dd..000000000
--- a/pki/dogtag/scripts/prepare_pki
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the name of this base directory
-PKI_PWD=`pwd`
-
-# Establish the name of the machine
-PKI_HOSTNAME=`hostname`
-
-# Set pre-defined variables
-ROOT_UID=0
-
-# This script may ONLY be run on Linux!
-PKI_OS=`uname`
-if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '$0' script is ONLY executable\n"
-    printf "on a 'Linux' machine!\n"
-    exit 255
-fi
-
-# For Fedora machines, compute the FEDORA_VERSION
-if [ -e /etc/fedora-release ]; then
-    FEDORA_VERSION=`rpm -qf --qf='%{VERSION}' /etc/fedora-release | tr -d [A-Z] | tr -d [a-z]`
-else
-    # For now, just give FEDORA_VERSION a bogus value if not using Fedora.
-    FEDORA_VERSION=9999
-fi
-
-# Set Linux variables
-PKI_PLATFORM="LINUX"
-PKI_UPDATE="/usr/bin/yum"
-PKI_UPDATE_OPTIONS="-y install"
-PKI_UPDATE_DIR=""
-
-# Set sudo variables
-PKI_SUDO="/usr/bin/sudo"
-PKI_SUDOERS="/etc/sudoers"
-
-# Set user identity variables
-PKI_EUID=`/usr/bin/id -u`
-PKI_UID=`/usr/bin/id -ur`
-PKI_USERNAME=`/usr/bin/id -un`
-
-# Make sure that this script is NOT being run as root!
-if [ ${PKI_UID} -eq ${ROOT_UID} ] ||
-   [ ${PKI_EUID} -eq ${ROOT_UID} ]; then
-    printf "The '$0' script may NOT be run as root!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudo' executable
-if [ ! -x "${PKI_SUDO}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDO}' executable\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the 'sudoers' file
-if [ ! -e "${PKI_SUDOERS}" ]; then
-    printf "The '$0' script requires the '${PKI_SUDOERS}' file\n"
-    printf "to be available on '${PKI_HOSTNAME}'!\n"
-    exit 255
-fi
-
-# Check for the presence of the required sudoers command
-PKI_SUDOERS_COMMAND="(root) NOPASSWD: ${RPM_EXE}"
-PKI_SUDOERS_LINE="${PKI_USERNAME}  ALL = NOPASSWD: ${RPM_EXE}"
-printf "Checking if '${PKI_USERNAME}' has the appropriate '${PKI_SUDO}' permissions . . .\n"
-printf "[NOTE:  A password prompt may appear requiring ${PKI_USERNAME}'s password.]\n"
-`${PKI_SUDO} -l | grep "${PKI_SUDOERS_COMMAND}" > /dev/null 2>&1`
-if [ $? -ne 0 ]; then
-    printf "The '$0' script requires that the\n"
-    printf "'${PKI_SUDOERS}' file MUST contain this line:\n\n"
-    printf "    '${PKI_SUDOERS_LINE}'\n\n"
-    exit 255
-fi
-
-# Establish PKI support package names
-NSPR=nspr
-NSPR_DEVEL=nspr-devel
-NSS=nss
-NSS_DEVEL=nss-devel
-NSS_TOOLS=nss-tools
-JSS=jss
-JSS_JAVADOC=jss-javadoc
-SVRCORE=svrcore
-SVRCORE_DEVEL=svrcore-devel
-CYRUS_SASL=cyrus-sasl
-CYRUS_SASL_DEVEL=cyrus-sasl-devel
-OPENLDAP=openldap
-OPENLDAP_DEVEL=openldap-devel
-OPENLDAP_CLIENTS=openldap-tools
-PERL=perl
-APR=apr
-PCRE=pcre
-EXPAT=expat
-APR_UTIL=apr-util
-HTTPD=httpd
-MOD_NSS=mod_nss
-MOD_PERL=mod_perl
-PERL_PARSE_RECDESCENT=perl-Parse-RecDescent
-PERL_HTML_TAGSET=perl-HTML-Tagset
-PERL_HTML_PARSER=perl-HTML-Parser
-PERL_URI=perl-URI
-PERL_LIBWWW_PERL=perl-libwww-perl
-PERL_XML_PARSER=perl-XML-Parser
-PERL_XML_SIMPLE=perl-XML-Simple
-PERL_XML_NAMESPACESUPPORT=perl-XML-NamespaceSupport
-PERL_XML_SAX=perl-XML-SAX
-JPACKAGE_UTILS=jpackage-utils
-JAKARTA_COMMONS_LOGGING=jakarta-commons-logging
-TOMCAT5_SERVLET_2_4_API=tomcat5-servlet-2.4-api
-JAKARTA_COMMONS_COLLECTIONS=jakarta-commons-collections
-JAKARTA_COMMONS_BEANUTILS=jakarta-commons-beanutils
-JAKARTA_COMMONS_DIGESTER=jakarta-commons-digester
-ORO=oro
-CLASSPATHX_JAF=classpathx-jaf
-LDAPJDK=ldapjdk
-JAKARTA_COMMONS_POOL=jakarta-commons-pool
-JAKARTA_COMMONS_FILEUPLOAD=jakarta-commons-fileupload
-XML_COMMONS=xml-commons
-XML_COMMONS_APIS=xml-commons-apis
-REGEXP=regexp
-BCEL=bcel
-JAKARTA_COMMONS_DBCP=jakarta-commons-dbcp
-TOMCAT5_JASPER=tomcat5-jasper
-JAKARTA_COMMONS_DISCOVERY=jakarta-commons-discovery
-JAKARTA_COMMONS_HTTPCLIENT3=jakarta-commons-httpclient3
-JMS=jms
-JAKARTA_COMMONS_LAUNCHER=jakarta-commons-launcher
-JAKARTA_COMMONS_EL=jakarta-commons-el
-JAKARTA_COMMONS_DAEMON=jakarta-commons-daemon
-if [ ${FEDORA_VERSION} -eq 6 ]; then
-    # Required by Fedora Core 6
-    GNU_CRYPTO_SASL_JDK1_4=gnu-crypto-sasl-jdk1.4
-else
-    GNU_CRYPTO_SASL_JDK1_4=
-fi
-CLASSPATHX_MAIL=classpathx-mail
-XERCES_J2=xerces-j2
-XALAN_J2=xalan-j2
-LOG4J=log4j
-XML_COMMONS_RESOLVER=xml-commons-resolver
-AVALON_LOGKIT=avalon-logkit
-AVALON_FRAMEWORK=avalon-framework
-JDOM=jdom
-WERKEN_XPATH=werken-xpath
-VELOCITY=velocity
-ANT=ant
-WSDL4J=wsdl4j
-AXIS=axis
-MX4J=mx4j
-GERONIMO_SPECS=geronimo-specs
-JAKARTA_COMMONS_MODELER=jakarta-commons-modeler
-IDM_CONSOLE_FRAMEWORK=idm-console-framework
-TOMCAT5=tomcat5
-TOMCATJSS=tomcatjss
-MAKE=make
-M4=m4
-POLICYCOREUTILS=policycoreutils
-SELINUX_POLICY_DEVEL=selinux-policy-devel
-SELINUX_POLICY_TARGETED=selinux-policy-targeted
-READLINE=readline
-READLINE_DEVEL=readline-devel
-NCURSES=ncurses
-NCURSES_DEVEL=ncurses-devel
-TCL=tcl
-TCL_DEVEL=tcl-devel
-SQLITE=sqlite
-SQLITE_DEVEL=sqlite-devel
-PERL_DBI=perl-DBI
-PERL_DBD_SQLITE=perl-DBD-SQLite
-PCRE_DEVEL=pcre-devel
-EXPAT_DEVEL=expat-devel
-APR_DEVEL=apr-devel
-APR_UTIL_DEVEL=apr-util-devel
-HTTPD_DEVEL=httpd-devel
-
-# Build and install PKI support packages
-${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${OPENLDAP} ${OPENLDAP_DEVEL} ${OPENLDAP_CLIENTS} ${PERL} ${APR} ${PCRE} ${EXPAT} ${APR_UTIL} ${HTTPD} ${MOD_NSS} ${MOD_PERL} ${PERL_PARSE_RECDESCENT} ${PERL_HTML_TAGSET} ${PERL_HTML_PARSER} ${PERL_URI} ${PERL_LIBWWW_PERL} ${PERL_XML_PARSER} ${PERL_XML_SIMPLE} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_SAX} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED} ${READLINE} ${READLINE_DEVEL} ${NCURSES} ${NCURSES_DEVEL} ${TCL} ${TCL_DEVEL} ${SQLITE} ${SQLITE_DEVEL} ${PERL_DBI} ${PERL_DBD_SQLITE} ${PCRE_DEVEL} ${EXPAT_DEVEL} ${APR_DEVEL} ${APR_UTIL_DEVEL} ${HTTPD_DEVEL}
-
diff --git a/pki/dogtag/scripts/remove_default_pki_instances b/pki/dogtag/scripts/remove_default_pki_instances
deleted file mode 100755
index 3ec355f1f..000000000
--- a/pki/dogtag/scripts/remove_default_pki_instances
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-##  BEGIN COPYRIGHT BLOCK
-##  (C) 2008 Red Hat, Inc.
-##  All rights reserved.
-##  END COPYRIGHT BLOCK
-
-##  Always switch into this base directory
-##  prior to script execution so that all
-##  of its output is written to this directory
-
-cd `dirname $0`
-
-
-##
-##  This script MUST be run as root!
-##
-
-ROOTUID=0
-
-OS=`uname`
-if [ "${OS}" = "Linux" ] ; then
-    MY_EUID=`/usr/bin/id -u`
-    MY_UID=`/usr/bin/id -ur`
-    USERNAME=`/usr/bin/id -un`
-else
-    printf "ERROR:  Unsupported operating system '${OS}'!\n"
-    exit 255
-fi
-
-if [ "${MY_UID}"  != "${ROOTUID}" ] &&
-   [ "${MY_EUID}" != "${ROOTUID}" ] ; then
-    printf "ERROR:  The '$0' script must be run as root!\n"
-    exit 255
-fi
-
-
-
-##
-##  Define DEFAULT PKI Instances
-##
-
-PKI_DIR="/var/lib"
-
-PKI_CA="pki-ca"
-PKI_DRM="pki-kra"
-PKI_OCSP="pki-ocsp"
-PKI_TKS="pki-tks"
-PKI_RA="pki-ra"
-PKI_TPS="pki-tps"
-
-##
-## NOTE:  Always remove "${PKI_CA}" last, as it will most
-##        likely host the default Security Domain!
-##
-PKI_INSTANCES="${PKI_TPS} ${PKI_RA} ${PKI_TKS} ${PKI_OCSP} ${PKI_DRM} ${PKI_CA}"
-
-
-
-##
-##  Ask user if is is okay to remove ALL DEFAULT PKI instances
-##
-
-printf "REMINDER:  PKI instances contain user's PKI data, and consist of\n"
-printf "           DEFAULT PKI instances and CUSTOMIZED PKI instances.\n\n"
-printf "           DEFAULT PKI instances are automatically created whenever\n"
-printf "           one of the PKI subsystems are installed UNLESS that\n"
-printf "           particular PKI subsystem's DEFAULT PKI instance\n"
-printf "           already exists.\n\n"
-printf "           DEFAULT PKI instances consist of the following:\n\n"
-printf "               CA   - ${PKI_DIR}/${PKI_CA}\n"
-printf "               DRM  - ${PKI_DIR}/${PKI_DRM}\n"
-printf "               OCSP - ${PKI_DIR}/${PKI_OCSP}\n"
-printf "               RA   - ${PKI_DIR}/${PKI_RA}\n"
-printf "               TKS  - ${PKI_DIR}/${PKI_TKS}\n"
-printf "               TPS  - ${PKI_DIR}/${PKI_TPS}\n\n"
-while :
-do
-    printf "This script REMOVES ALL DEFAULT PKI instances!  "
-    printf "Is this okay?  [yn]  "
-    read ANSWER
-    printf "\n"
-    if [ "${ANSWER}" = "Y" ] ||
-       [ "${ANSWER}" = "y" ] ; then
-        printf "\n"
-        break
-    elif [ "${ANSWER}" = "N" ] ||
-         [ "${ANSWER}" = "n" ] ; then
-        printf "\n"
-        printf "No DEFAULT PKI instances will be removed.\n\n"
-        exit 255
-    else
-        continue
-    fi
-done
-
-
-
-##
-##  Remove ALL DEFAULT PKI Instances present . . .
-##
-
-INSTANCES=0
-for INSTANCE in ${PKI_INSTANCES} ; do
-    if [ -d "${PKI_DIR}/${INSTANCE}" ] ; then
-        INSTANCES=`expr $INSTANCES + 1`
-        pkiremove -pki_instance_root=${PKI_DIR} -pki_instance_name=${INSTANCE} -force
-    fi
-done
-
-if [ ${INSTANCES} -eq 0 ] ; then
-    printf "No DEFAULT PKI instances need to be removed.\n\n"
-fi
-
-exit 0
-
diff --git a/pki/dogtag/scripts/remove_ds_instance b/pki/dogtag/scripts/remove_ds_instance
deleted file mode 100755
index d81326c63..000000000
--- a/pki/dogtag/scripts/remove_ds_instance
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh 
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-
-##  Always switch into this base directory
-##  prior to script execution so that all
-##  of its output is written to this directory
-
-cd `dirname $0`
-
-
-##
-##  This script MUST be run as root!
-##
-
-ROOTUID=0
-
-OS=`uname`
-if [ "${OS}" = "Linux" ] ; then
-    MY_EUID=`/usr/bin/id -u`
-    MY_UID=`/usr/bin/id -ur`
-    USERNAME=`/usr/bin/id -un`
-else
-    printf "ERROR:  Unsupported operating system '${OS}'!\n"
-    exit 255
-fi
-
-if [ "${MY_UID}"  != "${ROOTUID}" ] &&
-   [ "${MY_EUID}" != "${ROOTUID}" ] ; then
-    printf "ERROR:  The '$0' script must be run as root!\n"
-    exit 255
-fi
-
-
-##  First, check for the existence of a directory server on this machine.
-if [ ! -e /etc/init.d/dirsrv ]; then
-    printf "The Directory Server package does NOT exist on this machine!\n"
-    exit 255
-fi
-
-
-##  Second, check for the existence of a directory server administration server 
-##  on this machine.
-if [ -e /usr/sbin/ds_removal ]    &&
-   [ -d /usr/lib/dirsrv/cgi-bin ] ||
-   [ -d /usr/lib64/dirsrv/cgi-bin ]; then
-    printf "This machine contains a Directory Server Administration\n" 
-    printf "Server which means that Directory Server instances may\n"
-    printf "have been registered with the Administration Server.\n\n"
-    while :
-    do
-        printf "Do you wish to use the '/usr/sbin/ds_removal' tool\n"
-        printf "instead of '$0'?  [yn]  "
-        read ANSWER
-        printf "\n"
-        if [ "${ANSWER}" = "Y" ] ||
-           [ "${ANSWER}" = "y" ] ; then
-            printf "\n"
-            printf "Please RUN the '/usr/sbin/ds_removal' tool to remove\n"
-            printf "the desired DS instance instead of '$0'.\n\n"
-            exit 255
-        elif [ "${ANSWER}" = "N" ] ||
-             [ "${ANSWER}" = "n" ] ; then
-            printf "\n"
-            break
-        else
-            continue
-        fi
-    done
-fi
-
-
-Usage()
-{
-    printf "Usage:  $0 -s server_id\n"
-    printf "        server_id:  Directory server identifier; slapd-<server_id>\n"
-}
-
-error=""
-server_id=""
-ds_server=""
-ds_remove_cgi=""
-
-while [ "$1" != "" ]
-do
-    if [ "$1" = "-s" ]; then
-        shift
-        server_id=$1
-        shift
-    elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" ]; then
-        Usage
-        exit 0
-    else
-        printf "ERROR:  Option '$1' is not supported!\n"
-        Usage
-        exit 1
-    fi
-done
-
-if [ "$server_id" = "" ]; then
-    error="Directory Server identifier is missing!"
-else
-    if [ -d "/usr/lib/dirsrv/slapd-${server_id}" ]; then
-        ds_server="/usr/lib/dirsrv/slapd-${server_id}"
-        ds_remove_cgi="./ds_remove_cgi_32"
-    elif [ -d "/usr/lib64/dirsrv/slapd-${server_id}" ]; then
-        ds_server="/usr/lib64/dirsrv/slapd-${server_id}"
-        ds_remove_cgi="./ds_remove_cgi_64"
-    else
-        error="Directory server identifier 'slapd-${server_id}' does not exist!"
-    fi
-fi
-
-if [ "$error" != "" ]; then
-    printf "ERROR:  ${error}\n"
-    Usage
-    exit 1
-fi
-
-QUERY_STRING="InstanceName=slapd-${server_id}"; export QUERY_STRING
-REQUEST_METHOD=GET; export REQUEST_METHOD
-
-if [ -c /dev/null ]; then
-    NULL=/dev/null
-else
-    NULL=/tmp/ds_remove.out
-fi
-
-${ds_remove_cgi} > $NULL << EOF
-EOF
-
-if [ -d "${ds_server}" ]; then
-    printf "FAILED to remove '${ds_server}'!\n"
-else
-    printf "Successfully removed '${ds_server}'!\n"
-    printf "NOTE:  Copies of your security databases have been saved\n"
-    printf "       in '/etc/dirsrv/slapd-${server_id}.removed'!\n"
-fi
-
-exit $?
-
diff --git a/pki/dogtag/scripts/remove_pki_components b/pki/dogtag/scripts/remove_pki_components
deleted file mode 100755
index 80569749c..000000000
--- a/pki/dogtag/scripts/remove_pki_components
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-##  BEGIN COPYRIGHT BLOCK
-##  (C) 2008 Red Hat, Inc.
-##  All rights reserved.
-##  END COPYRIGHT BLOCK
-
-##  Always switch into this base directory
-##  prior to script execution so that all
-##  of its output is written to this directory
-
-cd `dirname $0`
-
-
-##
-##  This script MUST be run as root!
-##
-
-ROOTUID=0
-
-OS=`uname`
-if [ "${OS}" = "Linux" ] ; then
-    MY_EUID=`/usr/bin/id -u`
-    MY_UID=`/usr/bin/id -ur`
-    USERNAME=`/usr/bin/id -un`
-else
-    printf "ERROR:  Unsupported operating system '${OS}'!\n"
-    exit 255
-fi
-
-if [ "${MY_UID}"  != "${ROOTUID}" ] &&
-   [ "${MY_EUID}" != "${ROOTUID}" ] ; then
-    printf "ERROR:  The '$0' script must be run as root!\n"
-    exit 255
-fi
-
-
-
-##
-##  Define DEFAULT PKI Instances
-##
-
-PKI_DIR="/var/lib"
-
-PKI_CA="pki-ca"
-PKI_DRM="pki-kra"
-PKI_OCSP="pki-ocsp"
-PKI_TKS="pki-tks"
-PKI_RA="pki-ra"
-PKI_TPS="pki-tps"
-
-
-
-##
-##  Ask user if any PKI instances need to be removed
-##
-
-printf "REMINDER:  PKI instances contain user's PKI data, and consist of\n"
-printf "           DEFAULT PKI instances and CUSTOMIZED PKI instances.\n\n"
-printf "           DEFAULT PKI instances are automatically created whenever\n"
-printf "           one of the PKI subsystems are installed UNLESS that\n"
-printf "           particular PKI subsystem's DEFAULT PKI instance\n"
-printf "           already exists.\n\n"
-printf "           DEFAULT PKI instances consist of the following:\n\n"
-printf "               CA   - ${PKI_DIR}/${PKI_CA}\n"
-printf "               DRM  - ${PKI_DIR}/${PKI_DRM}\n"
-printf "               OCSP - ${PKI_DIR}/${PKI_OCSP}\n"
-printf "               RA   - ${PKI_DIR}/${PKI_RA}\n"
-printf "               TKS  - ${PKI_DIR}/${PKI_TKS}\n"
-printf "               TPS  - ${PKI_DIR}/${PKI_TPS}\n\n"
-printf "           Please use the 'remove_default_pki_instances' script\n"
-printf "           to remove ALL of these DEFAULT PKI instances, OR\n"
-printf "           use the 'pkiremove' utility to remove INDIVIDUAL\n"
-printf "           DEFAULT PKI instances.\n\n"
-printf "           CUSTOMIZED PKI instances may be named anything and\n"
-printf "           may be located anywhere.  Please use the 'pkiremove'\n"
-printf "           utility to remove any CUSTOMIZED PKI instances.\n\n"
-printf "           IMPORTANT:  NEITHER CUSTOMIZED PKI instances,\n"
-printf "                       NOR DEFAULT PKI instances will be\n"
-printf "                       REMOVED by this script!\n\n"
-while :
-do
-    printf "Do any DEFAULT or CUSTOMIZED PKI instances need to be removed\n"
-    printf "PRIOR to uninstalling ALL of the PKI components?  [yn]  "
-    read ANSWER
-    printf "\n"
-    if [ "${ANSWER}" = "Y" ] ||
-       [ "${ANSWER}" = "y" ] ; then
-        printf "\n"
-        printf "Please REMOVE the desired CUSTOMIZED and/or DEFAULT\n"
-        printf "PKI instances PRIOR to re-running this script.\n\n"
-        exit 255
-    elif [ "${ANSWER}" = "N" ] ||
-         [ "${ANSWER}" = "n" ] ; then
-        printf "\n"
-        break
-    else
-        continue
-    fi
-done
-
-
-
-##
-##  Check for PKI components present on this operating system
-##
-
-printf "Processing PKI components present on system . . . "
-    # (1) grab all PKI components
-    PKI_COMPONENTS=`rpm -qa --queryformat '%{NAME}\n' | grep pki`
-
-    # (2) check for osutil
-    `rpm -q --quiet osutil`
-    OSUTIL_PRESENCE=$?
-    if [ "${OSUTIL_PRESENCE}" = "0" ] ; then
-        PKI_COMPONENTS="${PKI_COMPONENTS} osutil"
-    fi
-
-    # (3) check for symkey (legacy package)
-    `rpm -q --quiet symkey`
-    SYMKEY_PRESENCE=$?
-    if [ "${SYMKEY_PRESENCE}" = "0" ] ; then
-        PKI_COMPONENTS="${PKI_COMPONENTS} symkey"
-    fi
-printf "done.\n\n"
-
-
-
-##
-##  Place the PKI components into a list
-##
-
-PKI_COMPONENT_LIST=""
-for COMPONENT in ${PKI_COMPONENTS} ; do
-    if [ "${PKI_COMPONENT_LIST}" = "" ] ; then
-        PKI_COMPONENT_LIST="${COMPONENT}"
-    else
-        PKI_COMPONENT_LIST="${PKI_COMPONENT_LIST} ${COMPONENT}"
-    fi
-done
-
-
-
-##
-##  Remove ALL PKI components in the list
-##
-
-if [ "${PKI_COMPONENT_LIST}" != "" ] ; then
-    printf "Removing the following PKI packages:\n"
-    printf "    ${PKI_COMPONENT_LIST}\n\n"
-    rpm -ev ${PKI_COMPONENT_LIST}
-    printf "\n"
-else
-    printf "No PKI packages need to be removed.\n\n"
-fi
-
-exit 0
-