Bug 788787 added junit dependency plus integrated KRA OCSP and TKS

5 files changed, 3 insertions, 579 deletions

diff --git a/pki/scripts/build_dogtag_pki b/pki/scripts/build_dogtag_pki
index c79eeb714..7e0de05fc 100755
--- a/pki/scripts/build_dogtag_pki
+++ b/pki/scripts/build_dogtag_pki
@@ -104,10 +104,7 @@ fi
 PKI_COMPOSE_SCRIPTS_DIR="${PKI_PWD}/${PKI_DIR}/${PKI_SCRIPTS_DIR}"
 COMPOSE_DOGTAG_PKI_THEME_PACKAGES="compose_dogtag_pki_theme_packages"
 COMPOSE_PKI_CORE_PACKAGES="compose_pki_core_packages"
-COMPOSE_PKI_KRA_PACKAGES="compose_pki_kra_packages"
-COMPOSE_PKI_OCSP_PACKAGES="compose_pki_ocsp_packages"
 COMPOSE_PKI_RA_PACKAGES="compose_pki_ra_packages"
-COMPOSE_PKI_TKS_PACKAGES="compose_pki_tks_packages"
 COMPOSE_PKI_TPS_PACKAGES="compose_pki_tps_packages"
 COMPOSE_PKI_CONSOLE_PACKAGES="compose_pki_console_packages"
 
@@ -115,10 +112,7 @@ COMPOSE_PKI_CONSOLE_PACKAGES="compose_pki_console_packages"
 PKI_PACKAGES_DIR="${PKI_PWD}/packages"
 PKI_DOGTAG_THEME_PACKAGES_DIR="${PKI_PWD}/packages.dogtag_theme"
 PKI_CORE_PACKAGES_DIR="${PKI_PWD}/packages.core"
-PKI_KRA_PACKAGES_DIR="${PKI_PWD}/packages.kra"
-PKI_OCSP_PACKAGES_DIR="${PKI_PWD}/packages.ocsp"
 PKI_RA_PACKAGES_DIR="${PKI_PWD}/packages.ra"
-PKI_TKS_PACKAGES_DIR="${PKI_PWD}/packages.tks"
 PKI_TPS_PACKAGES_DIR="${PKI_PWD}/packages.tps"
 PKI_CONSOLE_PACKAGES_DIR="${PKI_PWD}/packages.console"
 
@@ -144,20 +138,14 @@ PKI_COMMON=pki-common${RPM_EXT}
 PKI_COMMON_JAVADOC=pki-common-javadoc${RPM_EXT}
 PKI_SELINUX=pki-selinux${RPM_EXT}
 PKI_CA=pki-ca${RPM_EXT}
-PKI_SILENT=pki-silent${RPM_EXT}
-
-# Establish PKI kra package names
 PKI_KRA=pki-kra${RPM_EXT}
-
-# Establish PKI ocsp package names
 PKI_OCSP=pki-ocsp${RPM_EXT}
+PKI_TKS=pki-tks${RPM_EXT}
+PKI_SILENT=pki-silent${RPM_EXT}
 
 # Establish PKI ra package names
 PKI_RA=pki-ra${RPM_EXT}
 
-# Establish PKI tks package names
-PKI_TKS=pki-tks${RPM_EXT}
-
 # Establish PKI tps package names
 PKI_TPS=pki-tps${RPM_EXT}
 
@@ -168,10 +156,7 @@ PKI_CONSOLE=pki-console${RPM_EXT}
 rm -rf ${PKI_PACKAGES_DIR}
 rm -rf ${PKI_DOGTAG_THEME_PACKAGES_DIR}
 rm -rf ${PKI_CORE_PACKAGES_DIR}
-rm -rf ${PKI_KRA_PACKAGES_DIR}
-rm -rf ${PKI_OCSP_PACKAGES_DIR}
 rm -rf ${PKI_RA_PACKAGES_DIR}
-rm -rf ${PKI_TKS_PACKAGES_DIR}
 rm -rf ${PKI_TPS_PACKAGES_DIR}
 rm -rf ${PKI_CONSOLE_PACKAGES_DIR}
 
@@ -192,20 +177,6 @@ cp -p ${NOARCH}/*.rpm ${PKI_ARCH}/*.rpm ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${CO
 cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
 ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SETUP} ${PKI_SYMKEY} ${PKI_NATIVE_TOOLS} ${PKI_UTIL} ${PKI_UTIL_JAVADOC} ${PKI_JAVA_TOOLS} ${PKI_JAVA_TOOLS_JAVADOC} ${PKI_COMMON} ${PKI_COMMON_JAVADOC} ${PKI_SELINUX} ${PKI_CA} ${PKI_SILENT}
 
-# Compose and install 'pki-kra' packages
-cd ${PKI_PWD}
-${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_KRA_PACKAGES} rpms
-mv ${PKI_PACKAGES_DIR} ${PKI_KRA_PACKAGES_DIR}
-cd ${PKI_KRA_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_KRA}
-
-# Compose and install 'pki-ocsp' packages
-cd ${PKI_PWD}
-${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_OCSP_PACKAGES} rpms
-mv ${PKI_PACKAGES_DIR} ${PKI_OCSP_PACKAGES_DIR}
-cd ${PKI_OCSP_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_OCSP}
-
 # Compose and install 'pki-ra' packages
 cd ${PKI_PWD}
 ${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_RA_PACKAGES} rpms
@@ -213,13 +184,6 @@ mv ${PKI_PACKAGES_DIR} ${PKI_RA_PACKAGES_DIR}
 cd ${PKI_RA_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
 ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RA}
 
-# Compose and install 'pki-tks' packages
-cd ${PKI_PWD}
-${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_TKS_PACKAGES} rpms
-mv ${PKI_PACKAGES_DIR} ${PKI_TKS_PACKAGES_DIR}
-cd ${PKI_TKS_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_TKS}
-
 # Compose and install 'pki-tps' packages
 cd ${PKI_PWD}
 ${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_TPS_PACKAGES} rpms
diff --git a/pki/scripts/compose_pki_core_packages b/pki/scripts/compose_pki_core_packages
index d84d41da7..2af796054 100755
--- a/pki/scripts/compose_pki_core_packages
+++ b/pki/scripts/compose_pki_core_packages
@@ -39,7 +39,7 @@ PKI_CORE_VERSION="10.0.0.a1"
 ##
 
 PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec"
-PKI_COMPONENT_LIST="test setup symkey native-tools util java-tools common selinux ca silent"
+PKI_COMPONENT_LIST="test setup symkey native-tools util java-tools common selinux ca kra ocsp tks silent"
 
 
 ##
diff --git a/pki/scripts/compose_pki_kra_packages b/pki/scripts/compose_pki_kra_packages
deleted file mode 100755
index dc4ad1919..000000000
--- a/pki/scripts/compose_pki_kra_packages
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
-
-
-## 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 'pki-kra' name and version information
-##
-
-PKI_KRA="pki-kra"
-PKI_KRA_VERSION="10.0.0.a1"
-
-
-##
-## Establish the SOURCE files/directories of the 'pki-kra' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_KRA}.spec"
-PKI_COMPONENT_LIST="test kra"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-kra' source/spec files
-##
-
-PKI_PACKAGES="${PKI_PWD}/packages"
-PKI_KRA_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_KRA_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_KRA_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_KRA_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_KRA_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_KRA_TARBALL="${PKI_KRA}-${PKI_KRA_VERSION}.tar.gz"
-PKI_KRA_SPEC_FILE="${PKI_KRA_SPECS_DIR}/${PKI_KRA}.spec"
-PKI_KRA_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_KRA}"
-PKI_KRA_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_KRA}.spec"
-
-PKI_KRA_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_KRA_DIR="${PKI_KRA_STAGING_DIR}/${PKI_KRA}-${PKI_KRA_VERSION}"
-PKI_KRA_BASE_DIR="${PKI_KRA_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-kra' package directories
-##
-
-mkdir -p ${PKI_KRA_BUILD_DIR}
-mkdir -p ${PKI_KRA_RPMS_DIR}
-mkdir -p ${PKI_KRA_SOURCES_DIR}
-mkdir -p ${PKI_KRA_SPECS_DIR}
-mkdir -p ${PKI_KRA_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-kra' package files
-##
-
-rm -rf ${PKI_KRA_BUILD_DIR}/${PKI_KRA}-${PKI_KRA_VERSION}
-rm -f  ${PKI_KRA_RPMS_DIR}/${PKI_KRA}-${PKI_KRA_VERSION}*.rpm
-rm -f  ${PKI_KRA_SOURCES_DIR}/${PKI_KRA_TARBALL}
-rm -f  ${PKI_KRA_SPEC_FILE}
-rm -f  ${PKI_KRA_SRPMS_DIR}/${PKI_KRA}-${PKI_KRA_VERSION}*.rpm
-
-
-##
-## Copy a new 'pki-kra' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${PKI_KRA_SPECS_DIR}
-
-
-if [ ${USE_PATCH_FILES} -eq 1 ] ; then
-	Retrieve_Source_Tarball_and_Patches ${PKI_SPECS_FILE} ${PKI_PATCHES_DIR} ${PKI_KRA_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'pki-kra' staging directory
-	##
-
-	rm -rf ${PKI_KRA_STAGING_DIR}
-
-
-	##
-	## To generate the 'pki-kra' tarball, construct a staging area
-	## consisting of the 'pki-kra' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${PKI_KRA_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${PKI_KRA_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_KRA_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${PKI_KRA_BASE_DIR}
-	cd ${PKI_BASE_DIR}
-	cp -p ${PKI_BASE_MANIFEST} ${PKI_KRA_BASE_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_KRA_BASE_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'pki-kra' tarball
-	##
-
-	mkdir -p ${PKI_KRA_SOURCES_DIR}
-	cd ${PKI_KRA_STAGING_DIR}
-	gtar -zcvf ${PKI_KRA_TARBALL}    \
-		"${PKI_KRA}-${PKI_KRA_VERSION}" > /dev/null 2>&1
-	mv ${PKI_KRA_TARBALL} ${PKI_KRA_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${PKI_KRA_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'pki-kra' package script
-##
-
-rm -rf ${PKI_KRA_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${PKI_KRA_PACKAGE_SCRIPT}
-printf "${PKI_KRA_PACKAGE_COMMAND}\n\n" >> ${PKI_KRA_PACKAGE_SCRIPT}
-chmod 775 ${PKI_KRA_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_KRA} | tee package_${PKI_KRA}.log 2>&1
-
diff --git a/pki/scripts/compose_pki_ocsp_packages b/pki/scripts/compose_pki_ocsp_packages
deleted file mode 100755
index 257578f9f..000000000
--- a/pki/scripts/compose_pki_ocsp_packages
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
-
-
-## 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 'pki-ocsp' name and version information
-##
-
-PKI_OCSP="pki-ocsp"
-PKI_OCSP_VERSION="10.0.0.a1"
-
-
-##
-## Establish the SOURCE files/directories of the 'pki-ocsp' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_OCSP}.spec"
-PKI_COMPONENT_LIST="test ocsp"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-ocsp' source/spec files
-##
-
-PKI_PACKAGES="${PKI_PWD}/packages"
-PKI_OCSP_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_OCSP_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_OCSP_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_OCSP_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_OCSP_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_OCSP_TARBALL="${PKI_OCSP}-${PKI_OCSP_VERSION}.tar.gz"
-PKI_OCSP_SPEC_FILE="${PKI_OCSP_SPECS_DIR}/${PKI_OCSP}.spec"
-PKI_OCSP_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_OCSP}"
-PKI_OCSP_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_OCSP}.spec"
-
-PKI_OCSP_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_OCSP_DIR="${PKI_OCSP_STAGING_DIR}/${PKI_OCSP}-${PKI_OCSP_VERSION}"
-PKI_OCSP_BASE_DIR="${PKI_OCSP_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-ocsp' package directories
-##
-
-mkdir -p ${PKI_OCSP_BUILD_DIR}
-mkdir -p ${PKI_OCSP_RPMS_DIR}
-mkdir -p ${PKI_OCSP_SOURCES_DIR}
-mkdir -p ${PKI_OCSP_SPECS_DIR}
-mkdir -p ${PKI_OCSP_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-ocsp' package files
-##
-
-rm -rf ${PKI_OCSP_BUILD_DIR}/${PKI_OCSP}-${PKI_OCSP_VERSION}
-rm -f  ${PKI_OCSP_RPMS_DIR}/${PKI_OCSP}-${PKI_OCSP_VERSION}*.rpm
-rm -f  ${PKI_OCSP_SOURCES_DIR}/${PKI_OCSP_TARBALL}
-rm -f  ${PKI_OCSP_SPEC_FILE}
-rm -f  ${PKI_OCSP_SRPMS_DIR}/${PKI_OCSP}-${PKI_OCSP_VERSION}*.rpm
-
-
-##
-## Copy a new 'pki-ocsp' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${PKI_OCSP_SPECS_DIR}
-
-
-if [ ${USE_PATCH_FILES} -eq 1 ] ; then
-	Retrieve_Source_Tarball_and_Patches ${PKI_SPECS_FILE} ${PKI_PATCHES_DIR} ${PKI_OCSP_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'pki-ocsp' staging directory
-	##
-
-	rm -rf ${PKI_OCSP_STAGING_DIR}
-
-
-	##
-	## To generate the 'pki-ocsp' tarball, construct a staging area
-	## consisting of the 'pki-ocsp' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${PKI_OCSP_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${PKI_OCSP_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_OCSP_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${PKI_OCSP_BASE_DIR}
-	cd ${PKI_BASE_DIR}
-	cp -p ${PKI_BASE_MANIFEST} ${PKI_OCSP_BASE_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_OCSP_BASE_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'pki-ocsp' tarball
-	##
-
-	mkdir -p ${PKI_OCSP_SOURCES_DIR}
-	cd ${PKI_OCSP_STAGING_DIR}
-	gtar -zcvf ${PKI_OCSP_TARBALL}    \
-		"${PKI_OCSP}-${PKI_OCSP_VERSION}" > /dev/null 2>&1
-	mv ${PKI_OCSP_TARBALL} ${PKI_OCSP_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${PKI_OCSP_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'pki-ocsp' package script
-##
-
-rm -rf ${PKI_OCSP_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${PKI_OCSP_PACKAGE_SCRIPT}
-printf "${PKI_OCSP_PACKAGE_COMMAND}\n\n" >> ${PKI_OCSP_PACKAGE_SCRIPT}
-chmod 775 ${PKI_OCSP_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_OCSP} | tee package_${PKI_OCSP}.log 2>&1
-
diff --git a/pki/scripts/compose_pki_tks_packages b/pki/scripts/compose_pki_tks_packages
deleted file mode 100755
index 001774e94..000000000
--- a/pki/scripts/compose_pki_tks_packages
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
-
-
-## 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 'pki-tks' name and version information
-##
-
-PKI_TKS="pki-tks"
-PKI_TKS_VERSION="10.0.0.a1"
-
-
-##
-## Establish the SOURCE files/directories of the 'pki-tks' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TKS}.spec"
-PKI_COMPONENT_LIST="test tks"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-tks' source/spec files
-##
-
-PKI_PACKAGES="${PKI_PWD}/packages"
-PKI_TKS_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_TKS_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_TKS_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_TKS_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_TKS_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_TKS_TARBALL="${PKI_TKS}-${PKI_TKS_VERSION}.tar.gz"
-PKI_TKS_SPEC_FILE="${PKI_TKS_SPECS_DIR}/${PKI_TKS}.spec"
-PKI_TKS_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TKS}"
-PKI_TKS_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TKS}.spec"
-
-PKI_TKS_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_TKS_DIR="${PKI_TKS_STAGING_DIR}/${PKI_TKS}-${PKI_TKS_VERSION}"
-PKI_TKS_BASE_DIR="${PKI_TKS_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-tks' package directories
-##
-
-mkdir -p ${PKI_TKS_BUILD_DIR}
-mkdir -p ${PKI_TKS_RPMS_DIR}
-mkdir -p ${PKI_TKS_SOURCES_DIR}
-mkdir -p ${PKI_TKS_SPECS_DIR}
-mkdir -p ${PKI_TKS_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-tks' package files
-##
-
-rm -rf ${PKI_TKS_BUILD_DIR}/${PKI_TKS}-${PKI_TKS_VERSION}
-rm -f  ${PKI_TKS_RPMS_DIR}/${PKI_TKS}-${PKI_TKS_VERSION}*.rpm
-rm -f  ${PKI_TKS_SOURCES_DIR}/${PKI_TKS_TARBALL}
-rm -f  ${PKI_TKS_SPEC_FILE}
-rm -f  ${PKI_TKS_SRPMS_DIR}/${PKI_TKS}-${PKI_TKS_VERSION}*.rpm
-
-
-##
-## Copy a new 'pki-tks' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${PKI_TKS_SPECS_DIR}
-
-
-if [ ${USE_PATCH_FILES} -eq 1 ] ; then
-	Retrieve_Source_Tarball_and_Patches ${PKI_SPECS_FILE} ${PKI_PATCHES_DIR} ${PKI_TKS_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'pki-tks' staging directory
-	##
-
-	rm -rf ${PKI_TKS_STAGING_DIR}
-
-
-	##
-	## To generate the 'pki-tks' tarball, construct a staging area
-	## consisting of the 'pki-tks' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${PKI_TKS_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${PKI_TKS_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_TKS_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${PKI_TKS_BASE_DIR}
-	cd ${PKI_BASE_DIR}
-	cp -p ${PKI_BASE_MANIFEST} ${PKI_TKS_BASE_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_TKS_BASE_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'pki-tks' tarball
-	##
-
-	mkdir -p ${PKI_TKS_SOURCES_DIR}
-	cd ${PKI_TKS_STAGING_DIR}
-	gtar -zcvf ${PKI_TKS_TARBALL}    \
-		"${PKI_TKS}-${PKI_TKS_VERSION}" > /dev/null 2>&1
-	mv ${PKI_TKS_TARBALL} ${PKI_TKS_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${PKI_TKS_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'pki-tks' package script
-##
-
-rm -rf ${PKI_TKS_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${PKI_TKS_PACKAGE_SCRIPT}
-printf "${PKI_TKS_PACKAGE_COMMAND}\n\n" >> ${PKI_TKS_PACKAGE_SCRIPT}
-chmod 775 ${PKI_TKS_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_TKS} | tee package_${PKI_TKS}.log 2>&1
-