From aa8a847da6705ea807135c802a725697b373fac7 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Wed, 22 Feb 2012 01:15:56 -0600
Subject: [PATCH] Removed dependency on OSUtil.

The OSUtil is no longer used by the code. It has been removed from
build scripts and tools.

Ticket #90
---
 pki/.classpath                                     |    1 -
 pki/base/CMakeLists.txt                            |    1 -
 pki/base/ca/src/CMakeLists.txt                     |   11 ++---------
 pki/base/common/src/CMakeLists.txt                 |   18 +++++-------------
 pki/base/common/test/CMakeLists.txt                |    6 +++---
 pki/base/console/src/CMakeLists.txt                |    9 ---------
 pki/base/java-tools/src/CMakeLists.txt             |   12 ++----------
 .../templates/pki_java_command_wrapper.in          |   10 ----------
 .../templates/pretty_print_cert_command_wrapper.in |   10 ----------
 .../templates/pretty_print_crl_command_wrapper.in  |   10 ----------
 pki/base/kra/src/CMakeLists.txt                    |   11 ++---------
 pki/base/ocsp/src/CMakeLists.txt                   |   11 ++---------
 pki/base/scripts/pkicheck                          |    2 +-
 pki/base/setup/pkicreate                           |   14 --------------
 pki/base/silent/scripts/pkisilent                  |   14 ++++----------
 pki/base/silent/src/CMakeLists.txt                 |    4 ++--
 pki/base/tks/src/CMakeLists.txt                    |   11 ++---------
 pki/base/util/src/CMakeLists.txt                   |   13 ++-----------
 pki/base/util/test/CMakeLists.txt                  |    6 +++---
 pki/scripts/prepare_dogtag_pki                     |    5 +----
 pki/scripts/remove_pki_components                  |    9 +--------
 pki/specs/dogtag-pki.spec                          |    7 +++----
 pki/specs/pki-core.spec                            |    9 +++------
 pki/tools/jar/README.jar-tools                     |   10 ++++------
 24 files changed, 42 insertions(+), 172 deletions(-)

diff --git a/pki/.classpath b/pki/.classpath
index 1dca83c73647f52fd6bfd5ef73fba98638b8a49c..48aa45698a4e35710e852123d3e180a36155c7c5 100644
--- a/pki/.classpath
+++ b/pki/.classpath
@@ -20,7 +20,6 @@
 	<classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/idm-console-nmclf.jar"/>
 	<classpathentry kind="lib" path="/usr/lib64/java/jss4.jar"/>
-	<classpathentry kind="lib" path="/usr/lib64/java/osutil.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/velocity.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/servlet.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/xerces-j2.jar"/>
diff --git a/pki/base/CMakeLists.txt b/pki/base/CMakeLists.txt
index b5ea9b9fb0383f85a729e4cc6db6da3fe998b1f2..8a40e4247f38a82c5eac9d34a5fb96075af6ddcd 100644
--- a/pki/base/CMakeLists.txt
+++ b/pki/base/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(base)
 
 # The order is important!
-#   add_subdirectory(osutil)
 if (APPLICATION_FLAVOR_PKI_CORE)
     add_subdirectory(test)
     add_subdirectory(setup)
diff --git a/pki/base/ca/src/CMakeLists.txt b/pki/base/ca/src/CMakeLists.txt
index 188b954939f60b6868144171ba5b02c53219dae8..12436f301c2476c46baddadcd955764ef78acd0f 100644
--- a/pki/base/ca/src/CMakeLists.txt
+++ b/pki/base/ca/src/CMakeLists.txt
@@ -17,13 +17,6 @@ find_file(JSS_JAR
         ${JAVA_LIB_INSTALL_DIR}
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -49,7 +42,7 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
 # set version
@@ -58,7 +51,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-ca.jar
 add_jar(pki-ca ${pki-ca_java_SRCS})
-add_dependencies(pki-ca osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+add_dependencies(pki-ca symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
 install_jar(pki-ca ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CA_JAR ${pki-ca_JAR_FILE} CACHE INTERNAL "pki-ca jar file")
 
diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt
index 3f599ee133827ac4d3f046ae7d03be3309804e9b..62d30740df830353f4a6d1ae795793d0d6a3b9b1 100644
--- a/pki/base/common/src/CMakeLists.txt
+++ b/pki/base/common/src/CMakeLists.txt
@@ -16,14 +16,6 @@ find_file(LDAPJDK_JAR
         /usr/share/java
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-        /usr/share/java
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -1038,21 +1030,21 @@ set(pki-cmsbundle_RCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-certsrv
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/certsrv)
 add_jar(pki-certsrv ${pki-certsrv_java_SRCS})
-add_dependencies(pki-certsrv osutil pki-nsutil pki-cmsutil)
+add_dependencies(pki-certsrv pki-nsutil pki-cmsutil)
 install_jar(pki-certsrv ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CERTSRV_JAR ${pki-certsrv_JAR_FILE} CACHE INTERNAL "pki-certsrv jar file")
 
 # build pki-cms
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cms)
 add_jar(pki-cms ${pki-cms_java_SRCS})
-add_dependencies(pki-cms osutil pki-nsutil pki-cmsutil pki-certsrv)
+add_dependencies(pki-cms pki-nsutil pki-cmsutil pki-certsrv)
 install_jar(pki-cms ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CMS_JAR ${pki-cms_JAR_FILE} CACHE INTERNAL "pki-cms jar file")
 
@@ -1070,12 +1062,12 @@ add_dependencies(pki-common-${APPLICATION_VERSION}_javadoc pki-cms pki-certsrv)
 # build pki-cmscore
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmscore)
 add_jar(pki-cmscore ${pki-cmscore_java_SRCS})
-add_dependencies(pki-cmscore osutil pki-nsutil pki-cmsutil pki-certsrv pki-cms)
+add_dependencies(pki-cmscore pki-nsutil pki-cmsutil pki-certsrv pki-cms)
 install_jar(pki-cmscore ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CMSCORE_JAR ${pki-cmscore_JAR_FILE} CACHE INTERNAL "pki-cmscore jar file")
 
 # build pki-cmsbundle
 add_jar(pki-cmsbundle ${pki-cmsbundle_RCS})
-add_dependencies(pki-cmsbundle osutil pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+add_dependencies(pki-cmsbundle pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
 install_jar(pki-cmsbundle ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CMSBUNDLE_JAR ${pki-cmsbundle_JAR_FILE} CACHE INTERNAL "pki-cmsbundle jar file")
diff --git a/pki/base/common/test/CMakeLists.txt b/pki/base/common/test/CMakeLists.txt
index 4d266683da8599a0af7320522e03a822a2939e9f..2f7b4fa4eb601c1da736cc1b43596a03eda39e1f 100644
--- a/pki/base/common/test/CMakeLists.txt
+++ b/pki/base/common/test/CMakeLists.txt
@@ -57,7 +57,7 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} ${PKI_CMSBUNDLE_JAR}
     ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR} ${XALAN_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
     ${PKI_TEST_JAR} ${JUNIT_JAR}
 )
 
@@ -69,7 +69,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape)
 add_jar(pki-common-test ${pki-common-test_SRCS})
 add_dependencies(pki-common-test
-    osutil pki-nsutil pki-cmsutil
+    pki-nsutil pki-cmsutil
     pki-certsrv pki-cms pki-cmscore pki-cmsbundle
     pki-test
 )
@@ -83,7 +83,7 @@ add_junit_test(test-pki-common
         ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
         ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR} ${PKI_CMSBUNDLE_JAR}
         ${LDAPJDK_JAR} ${SERVLET_JAR} ${VELOCITY_JAR}
-        ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
+        ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
         ${PKI_TEST_JAR} ${JUNIT_JAR}
     TESTS
         com.netscape.certsrv.authentication.AuthTokenTest
diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt
index 3d88ccedabc5fdf6b86103931fd2c8a8e7e9b378..b164a33a07019415e5d7ca51903b957d81e76227 100644
--- a/pki/base/console/src/CMakeLists.txt
+++ b/pki/base/console/src/CMakeLists.txt
@@ -69,14 +69,6 @@ find_file(JSS_JAR
         /usr/share/java
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-        /usr/share/java
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -655,7 +647,6 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR}
     ${PKI_NSUTIL_JAR}
     ${JSS_JAR}
-    ${OSUTIL_JAR}
     ${COMMONS_CODEC_JAR})
 
 
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt
index 17c6f6b682d237f547f982383d228e3409d00b27..0411a54c75ea0bd1a84aa571aa20a164ba9f43db 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/pki/base/java-tools/src/CMakeLists.txt
@@ -8,14 +8,6 @@ find_file(JSS_JAR
         /usr/share/java
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-        /usr/share/java
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -67,13 +59,13 @@ set(pki-tools_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${XALAN_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-tools
 add_jar(pki-tools ${pki-tools_java_SRCS})
-add_dependencies(pki-tools osutil pki-nsutil pki-cmsutil)
+add_dependencies(pki-tools pki-nsutil pki-cmsutil)
 install(
     FILES
         com/netscape/cmstools/DRMTool.cfg
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in
index b097409458eb1792da298a064aff3e7652ee49d1..b0d40616176f6bd77f6df0a1ac30b90f846eae2d 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in
@@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/jss4.jar
 fi
-CP=/usr/lib/java/osutil.jar:${CP}
-CP=/usr/lib/java/dirsec/osutil.jar:${CP}
-if [ "${OS}" = "Linux" ] &&
-   [ "${ARCHITECTURE}" = "x86_64" ] ; then
-    # Fedora 16+
-    CP=/usr/lib64/java/osutil.jar:${CP}
-fi
 CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index ec1f2a9f8ec7857037c9f22c956ff685fdec9589..7f333135743a63b60b11b67021f045c6cdd3a31d 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/jss4.jar
 fi
-CP=/usr/lib/java/osutil.jar:${CP}
-CP=/usr/lib/java/dirsec/osutil.jar:${CP}
-if [ "${OS}" = "Linux" ] &&
-   [ "${ARCHITECTURE}" = "x86_64" ] ; then
-    # Fedora 16+
-    CP=/usr/lib64/java/osutil.jar:${CP}
-fi
 CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
index 2fb27f699240695ca33bfe38b1577b3a3b248611..95a5595034a82bfac048e3ba8881bc66ce41d0f5 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
@@ -74,15 +74,12 @@ if [ "${OS}" = "Linux" ] ; then
     if [ "${ARCHITECTURE}" = "i386" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
         LD_LIBRARY_PATH=/usr/lib:/lib
         LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
         LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
         export LD_LIBRARY_PATH
     else
         invalid_architecture "${ARCHITECTURE}"
@@ -135,13 +132,6 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/jss4.jar
 fi
-CP=/usr/lib/java/osutil.jar:${CP}
-CP=/usr/lib/java/dirsec/osutil.jar:${CP}
-if [ "${OS}" = "Linux" ] &&
-   [ "${ARCHITECTURE}" = "x86_64" ] ; then
-    # Fedora 16+
-    CP=/usr/lib64/java/osutil.jar:${CP}
-fi
 CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
diff --git a/pki/base/kra/src/CMakeLists.txt b/pki/base/kra/src/CMakeLists.txt
index 5e1b067825a7873f951daf785966a17f2c9bfdb5..df7e1929b01e6f9165d2eee4baa11ed39672fc1b 100644
--- a/pki/base/kra/src/CMakeLists.txt
+++ b/pki/base/kra/src/CMakeLists.txt
@@ -55,13 +55,6 @@ find_file(JSS_JAR
         ${JAVA_LIB_INSTALL_DIR}
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -101,7 +94,7 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
 # set version
@@ -110,7 +103,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-kra.jar
 add_jar(pki-kra ${pki-kra_java_SRCS})
-add_dependencies(pki-kra osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+add_dependencies(pki-kra symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
 install_jar(pki-kra ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_KRA_JAR ${pki-kra_JAR_FILE} CACHE INTERNAL "pki-kra jar file")
 
diff --git a/pki/base/ocsp/src/CMakeLists.txt b/pki/base/ocsp/src/CMakeLists.txt
index ad16cebab495b658dd7d9fb5a7067ed1c68877fa..0992eeaee7df9a43730399a6b35830b10666f6d5 100644
--- a/pki/base/ocsp/src/CMakeLists.txt
+++ b/pki/base/ocsp/src/CMakeLists.txt
@@ -55,13 +55,6 @@ find_file(JSS_JAR
         ${JAVA_LIB_INSTALL_DIR}
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -91,7 +84,7 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
 # set version
@@ -100,7 +93,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-ocsp.jar
 add_jar(pki-ocsp ${pki-ocsp_java_SRCS})
-add_dependencies(pki-ocsp osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+add_dependencies(pki-ocsp symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
 install_jar(pki-ocsp ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_OCSP_JAR ${pki-ocsp_JAR_FILE} CACHE INTERNAL "pki-ocsp jar file")
 
diff --git a/pki/base/scripts/pkicheck b/pki/base/scripts/pkicheck
index 6722e26bfb7adaa6f296bf64696bdbd0b1651b72..3ff548d3d24765ac724d76a13e4803e3c64e3a60 100755
--- a/pki/base/scripts/pkicheck
+++ b/pki/base/scripts/pkicheck
@@ -9,5 +9,5 @@ if [ "${PKI_OS}" != "Linux" ]; then
 fi
 
 # For now, check for symkey (legacy package)
-rpm -qa | egrep -i pki-\|osutil\|symkey | sort | cat -n
+rpm -qa | egrep -i pki-\|symkey | sort | cat -n
 
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate
index ea9ed9da72151bf4baddccc954d4c0262a80cf4f..e8e1b12cb496ca1484826bd635df1ac562945fe6 100755
--- a/pki/base/setup/pkicreate
+++ b/pki/base/setup/pkicreate
@@ -180,7 +180,6 @@ my $commons_logging_jar_base_name = undef;                 # CA, KRA, OCSP, TKS
 my $jss_jar_base_name             = "jss4.jar";            # CA, KRA, OCSP, TKS
 my $ldapjdk_jar_base_name         = "ldapjdk.jar";         # CA, KRA, OCSP, TKS
 my $pki_nsutil_jar_base_name      = "pki-nsutil.jar";      # CA, KRA, OCSP, TKS
-my $osutil_jar_base_name          = "osutil.jar";          # CA, KRA, OCSP, TKS
 my $commons_codec_jar_base_name   = "commons-codec.jar";   # CA, KRA, OCSP, TKS
 my $symkey_jar_base_name          = "symkey.jar";          # CA, KRA, OCSP, TKS
 my $tomcatjss_jar_base_name       = "tomcatjss.jar";       # CA, KRA, OCSP, TKS
@@ -501,8 +500,6 @@ my $ldapjdk_jar_file_path                        = undef;  # CA, KRA, OCSP, TKS
 my $ldapjdk_jar_symlink_path                     = undef;  # CA, KRA, OCSP, TKS
 my $pki_nsutil_jar_file_path                     = undef;  # CA, KRA, OCSP, TKS
 my $pki_nsutil_jar_symlink_path                  = undef;  # CA, KRA, OCSP, TKS
-my $osutil_jar_file_path                         = undef;  # CA, KRA, OCSP, TKS
-my $osutil_jar_symlink_path                      = undef;  # CA, KRA, OCSP, TKS
 my $commons_codec_jar_file_path                  = undef;  # CA, KRA, OCSP, TKS
 my $commons_codec_jar_symlink_path               = undef;  # CA, KRA, OCSP, TKS
 my $symkey_jar_file_path                         = undef;  # CA, KRA, OCSP, TKS
@@ -1836,11 +1833,6 @@ sub initialize_subdirectory_paths
             return 0;
         }
 
-        if (!defined($osutil_jar_file_path = find_jar($osutil_jar_base_name))) {
-            emit("could not find jar: $osutil_jar_base_name", "error");
-            return 0;
-        }
-
         if (!defined($commons_codec_jar_file_path = find_jar($commons_codec_jar_base_name))) {
             emit("could not find jar: $commons_codec_jar_base_name", "error");
             return 0;
@@ -1952,8 +1944,6 @@ sub initialize_subdirectory_paths
                                            . "/" . $ldapjdk_jar_base_name;
         $pki_nsutil_jar_symlink_path       = $webinf_lib_instance_path
                                            . "/" . $pki_nsutil_jar_base_name;
-        $osutil_jar_symlink_path           = $webinf_lib_instance_path
-                                           . "/" . $osutil_jar_base_name;
         $commons_codec_jar_symlink_path    = $webinf_lib_instance_path
                                            . "/" . $commons_codec_jar_base_name;
         $symkey_jar_symlink_path           = $webinf_lib_instance_path
@@ -2971,10 +2961,6 @@ sub process_pki_files_and_symlinks
         return 0 if !create_symlink($pki_nsutil_jar_symlink_path, $pki_nsutil_jar_file_path,
                                     $pki_user, $pki_group);
 
-        # create instance symlink to "osutil.jar"
-        return 0 if !create_symlink($osutil_jar_symlink_path, $osutil_jar_file_path,
-                                    $pki_user, $pki_group);
-
         # create instance symlink to "commons_codec.jar"
         return 0 if !create_symlink($commons_codec_jar_symlink_path, $commons_codec_jar_file_path,
                                     $pki_user, $pki_group);
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent
index 46e6805c2399e9c62767d841f6a91be0cc58e977..5d62b1ce493497cb383661324ff71c654e618652 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/pki/base/silent/scripts/pkisilent
@@ -51,16 +51,13 @@ chop( $ARCHITECTURE );
 if( $ARCHITECTURE eq "i386" ) {
     $libpath="/usr/lib";
 
-    $ENV{LD_LIBRARY_PATH} = "/usr/lib/osutil:"
-                          . "/usr/lib/jss:"
+    $ENV{LD_LIBRARY_PATH} = "/usr/lib/jss:"
                           . "/usr/lib:/lib";
 } elsif($ARCHITECTURE eq "x86_64") {
     $libpath="/usr/lib64";
 
-    $ENV{LD_LIBRARY_PATH} = "/usr/lib64/osutil:"
-                          . "/usr/lib64/jss:"
+    $ENV{LD_LIBRARY_PATH} = "/usr/lib64/jss:"
                           . "/usr/lib64:/lib64:"
-                          . "/usr/lib/osutil:"
                           . "/usr/lib/jss:"
                           . "/usr/lib:/lib";
 } else {
@@ -90,13 +87,10 @@ $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-silent.jar:"
 if( $ARCHITECTURE eq "x86_64" ) {
     $ENV{CLASSPATH} = $ENV{CLASSPATH}
                     . "/usr/lib64/java/jss4.jar:"
-                    . "/usr/lib/java/jss4.jar:"
-                    . "/usr/lib64/java/osutil.jar:"
-                    . "/usr/lib/java/osutil.jar";
+                    . "/usr/lib/java/jss4.jar:";
 } else {
     $ENV{CLASSPATH} = $ENV{CLASSPATH}
-                    . "/usr/lib/java/jss4.jar:"
-                    . "/usr/lib/java/osutil.jar";
+                    . "/usr/lib/java/jss4.jar:";
 }
 
 
diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt
index dc1b8ebe34947a404f30af3a7284e18ab8c3d6a2..f5ed283fed2f30d915dcedef63c2b7232ce910ff 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/pki/base/silent/src/CMakeLists.txt
@@ -75,11 +75,11 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 add_jar(pki-silent ${pki-silent_java_SRCS})
-add_dependencies(pki-silent osutil symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms)
+add_dependencies(pki-silent symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms)
 install_jar(pki-silent ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_SILENT_JAR ${pki-silent_JAR_FILE} CACHE INTERNAL "pki-silent jar file")
diff --git a/pki/base/tks/src/CMakeLists.txt b/pki/base/tks/src/CMakeLists.txt
index 2542c951c00dff574133db120088bb6dcf31f909..852ad7bf40e4e93cf382c2370cf5359a3c818e21 100644
--- a/pki/base/tks/src/CMakeLists.txt
+++ b/pki/base/tks/src/CMakeLists.txt
@@ -55,13 +55,6 @@ find_file(JSS_JAR
         ${JAVA_LIB_INSTALL_DIR}
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -88,7 +81,7 @@ set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
     ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
     ${LDAPJDK_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})
 
 
 # set version
@@ -97,7 +90,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-tks.jar
 add_jar(pki-tks ${pki-tks_java_SRCS})
-add_dependencies(pki-tks osutil symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
+add_dependencies(pki-tks symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore)
 install_jar(pki-tks ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_TKS_JAR ${pki-tks_JAR_FILE} CACHE INTERNAL "pki-tks jar file")
 
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt
index 0c78ac3b79216a76de62fc0f9c4436c8e13b69f7..a9c95837f1f1aaaed7e44e1fdcb624baf355da4b 100644
--- a/pki/base/util/src/CMakeLists.txt
+++ b/pki/base/util/src/CMakeLists.txt
@@ -16,14 +16,6 @@ find_file(LDAPJDK_JAR
         /usr/share/java
 )
 
-find_file(OSUTIL_JAR
-    NAMES
-        osutil.jar
-    PATHS
-        ${JAVA_LIB_INSTALL_DIR}
-        /usr/share/java
-)
-
 find_file(COMMONS_CODEC_JAR
     NAMES
         commons-codec.jar
@@ -339,21 +331,20 @@ set(pki-cmsutil_java_SRCS
 
 set(CMAKE_JAVA_INCLUDE_PATH
     ${LDAPJDK_JAR} ${XALAN_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR})
+    ${JSS_JAR} ${COMMONS_CODEC_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
 # build pki-nsutil
 set(CMAKE_JAR_CLASSES_PREFIX netscape)
 add_jar(pki-nsutil ${pki-nsutil_java_SRCS})
-add_dependencies(pki-nsutil osutil)
 install_jar(pki-nsutil ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_NSUTIL_JAR ${pki-nsutil_JAR_FILE} CACHE INTERNAL "pki-nsutil jar file")
 
 # build pki-cmsutil
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmsutil)
 add_jar(pki-cmsutil ${pki-cmsutil_java_SRCS})
-add_dependencies(pki-cmsutil osutil pki-nsutil)
+add_dependencies(pki-cmsutil pki-nsutil)
 install_jar(pki-cmsutil ${JAVA_JAR_INSTALL_DIR}/pki)
 set(PKI_CMSUTIL_JAR ${pki-cmsutil_JAR_FILE} CACHE INTERNAL "pki-cmsutil jar file")
 
diff --git a/pki/base/util/test/CMakeLists.txt b/pki/base/util/test/CMakeLists.txt
index 042731f3b01c5fee5439082678ad64049e32606a..592f3dbbb807a004a9655429fad4a9f2e494a9ad 100644
--- a/pki/base/util/test/CMakeLists.txt
+++ b/pki/base/util/test/CMakeLists.txt
@@ -19,7 +19,7 @@ set(pki-util-test_SRCS
 
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
-    ${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${XALAN_JAR} ${XERCES_JAR}
+    ${JSS_JAR} ${LDAPJDK_JAR} ${COMMONS_CODEC_JAR} ${XALAN_JAR} ${XERCES_JAR}
     ${PKI_TEST_JAR} ${JUNIT_JAR}
 )
 
@@ -30,7 +30,7 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 # TODO: build test only when the test is invoked
 set(CMAKE_JAR_CLASSES_PREFIX com/netscape)
 add_jar(pki-util-test ${pki-util-test_SRCS})
-add_dependencies(pki-util-test osutil pki-nsutil pki-cmsutil pki-test)
+add_dependencies(pki-util-test pki-nsutil pki-cmsutil pki-test)
 
 # create test target
 # do not include xalan and xerces in class path
@@ -39,7 +39,7 @@ add_junit_test(test-pki-util
     CLASSPATH
         ${pki-util-test_JAR_FILE}
         ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
-        ${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR}
+        ${JSS_JAR} ${LDAPJDK_JAR} ${COMMONS_CODEC_JAR}
         ${PKI_TEST_JAR} ${JUNIT_JAR}
     TESTS
         com.netscape.security.util.BMPStringTest
diff --git a/pki/scripts/prepare_dogtag_pki b/pki/scripts/prepare_dogtag_pki
index 485148d45575820aadd5773c0d0bd07155acab0c..0b0f8148e2a6bfedc7ec71cdd1611ad49952a48a 100755
--- a/pki/scripts/prepare_dogtag_pki
+++ b/pki/scripts/prepare_dogtag_pki
@@ -246,9 +246,6 @@ OPENLDAP="openldap"
 OPENLDAP_CLIENTS="openldap-clients"
 OPENLDAP_DEVEL="openldap-devel"
 
-# Operating System Utilities
-OSUTIL="osutil"
-
 # Perl Modules
 PERL_CRYPT_SSLEAY="perl-Crypt-SSLeay"
 PERL_DBD_SQLITE="perl-DBD-SQLite"
@@ -294,7 +291,7 @@ XML_COMMONS_APIS="xml-commons-apis"
 XML_COMMONS_RESOLVER="xml-commons-resolver"
 
 # Create a catch-all variable for PKI Support Packages
-PKI_SUPPORT_PACKAGES="${APR} ${APR_DEVEL} ${APR_UTIL} ${APR_UTIL_DEVEL} ${EXPAT} ${EXPAT_DEVEL} ${HTTPD} ${HTTPD_DEVEL} ${HTTPD_TOOLS} ${PCRE} ${PCRE_DEVEL} ${TOMCAT6} ${TOMCAT6_LIB} ${APACHE_COMMONS_LANG} ${APACHE_COMMONS_LANG} ${APACHE_COMMONS_LOGGING} ${APACHE_COMMONS_CODEC} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_DBCP} ${JAKARTA_COMMONS_POOL} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${TOMCATJSS} ${MOD_NSS} ${MOD_PERL} ${MOD_REVOCATOR} ${IDM_CONSOLE_FRAMEWORK} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${LDAPJDK} ${OPENLDAP} ${OPENLDAP_CLIENTS} ${OPENLDAP_DEVEL} ${OSUTIL} ${PERL_CRYPT_SSLEAY} ${PERL_DBD_SQLITE} ${PERL_DBI} ${PERL_HTML_PARSER} ${PERL_HTML_TAGSET} ${PERL_LIBWWW_PERL} ${PERL_MOZILLA_LDAP} ${PERL_PARSE_RECDESCENT} ${PERL_URI} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_PARSER} ${PERL_XML_SAX} ${PERL_XML_SIMPLE} ${ESC} ${SVRCORE} ${SVRCORE_DEVEL} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED} ${SQLITE} ${SQLITE_DEVEL} ${VELOCITY} ${BCEL} ${JAKARTA_ORO} ${JDOM} ${LOG4J} ${REGEXP} ${WERKEN_XPATH} ${XALAN_J2} ${XERCES_J2} ${XML_COMMONS_APIS} ${XML_COMMONS_RESOLVER}"
+PKI_SUPPORT_PACKAGES="${APR} ${APR_DEVEL} ${APR_UTIL} ${APR_UTIL_DEVEL} ${EXPAT} ${EXPAT_DEVEL} ${HTTPD} ${HTTPD_DEVEL} ${HTTPD_TOOLS} ${PCRE} ${PCRE_DEVEL} ${TOMCAT6} ${TOMCAT6_LIB} ${APACHE_COMMONS_LANG} ${APACHE_COMMONS_LANG} ${APACHE_COMMONS_LOGGING} ${APACHE_COMMONS_CODEC} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_DBCP} ${JAKARTA_COMMONS_POOL} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${TOMCATJSS} ${MOD_NSS} ${MOD_PERL} ${MOD_REVOCATOR} ${IDM_CONSOLE_FRAMEWORK} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${LDAPJDK} ${OPENLDAP} ${OPENLDAP_CLIENTS} ${OPENLDAP_DEVEL} ${PERL_CRYPT_SSLEAY} ${PERL_DBD_SQLITE} ${PERL_DBI} ${PERL_HTML_PARSER} ${PERL_HTML_TAGSET} ${PERL_LIBWWW_PERL} ${PERL_MOZILLA_LDAP} ${PERL_PARSE_RECDESCENT} ${PERL_URI} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_PARSER} ${PERL_XML_SAX} ${PERL_XML_SIMPLE} ${ESC} ${SVRCORE} ${SVRCORE_DEVEL} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED} ${SQLITE} ${SQLITE_DEVEL} ${VELOCITY} ${BCEL} ${JAKARTA_ORO} ${JDOM} ${LOG4J} ${REGEXP} ${WERKEN_XPATH} ${XALAN_J2} ${XERCES_J2} ${XML_COMMONS_APIS} ${XML_COMMONS_RESOLVER}"
 
 ###########################################
 # Establish PKI Installation Dependencies #
diff --git a/pki/scripts/remove_pki_components b/pki/scripts/remove_pki_components
index 80569749c9e6afc04409cc7d58145292377d6375..63dab7c00c24050c8f1e008b9b705fbb9c9826ac 100755
--- a/pki/scripts/remove_pki_components
+++ b/pki/scripts/remove_pki_components
@@ -108,14 +108,7 @@ 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)
+    # (2) check for symkey (legacy package)
     `rpm -q --quiet symkey`
     SYMKEY_PRESENCE=$?
     if [ "${SYMKEY_PRESENCE}" = "0" ] ; then
diff --git a/pki/specs/dogtag-pki.spec b/pki/specs/dogtag-pki.spec
index 6e929ee0db61e094d7b2d4567bf7c46a06e313f6..8a2b2a0242d0c610d6354d470d58f0432f4c7191 100644
--- a/pki/specs/dogtag-pki.spec
+++ b/pki/specs/dogtag-pki.spec
@@ -21,7 +21,6 @@ BuildArch:        noarch
 %define dogtag_pki_theme_version   10.0.0
 %define esc_version                1.1.0
 %define jss_version                4.2.6-21
-%define osutil_version             2.0.2
 %define pki_core_version           10.0.0
 %define pki_kra_version            10.0.0
 %define pki_ocsp_version           10.0.0
@@ -35,7 +34,6 @@ BuildArch:        noarch
 %define dogtag_pki_theme_version   10.0.0
 %define esc_version                1.1.0
 %define jss_version                4.2.6-19.1
-%define osutil_version             2.0.2
 %define pki_core_version           10.0.0
 %define pki_kra_version            10.0.0
 %define pki_ocsp_version           10.0.0
@@ -48,7 +46,6 @@ BuildArch:        noarch
 %define dogtag_pki_theme_version   10.0.0
 %define esc_version                1.1.0
 %define jss_version                4.2.6-17
-%define osutil_version             2.0.0
 %define pki_core_version           10.0.0
 %define pki_kra_version            10.0.0
 %define pki_ocsp_version           10.0.0
@@ -66,7 +63,6 @@ Requires:         apache-commons-codec
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
 Requires:         jss >= %{jss_version}
-Requires:         osutil >= %{osutil_version}
 Requires:         tomcatjss >= %{tomcatjss_version}
 
 # Make certain that this 'meta' package requires the latest version(s)
@@ -189,6 +185,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Wed Feb 22 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.3.a1
+- Removed dependency on OSUtil.
+
 * Wed Feb 22 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
 - Added dependency on Apache Commons Codec.
 
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index e5fead45461288e59391dbedcd77e88f529c4ef5..bfbebefbc34c40b497e99b36b3e904dbe7efbc03 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -42,7 +42,6 @@ BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.2.6-19.1
 BuildRequires:    junit4
-BuildRequires:    osutil >= 2.0.2
 BuildRequires:    systemd-units
 BuildRequires:    tomcatjss >= 6.0.2
 %else
@@ -50,13 +49,11 @@ BuildRequires:    tomcatjss >= 6.0.2
 BuildRequires:    jpackage-utils
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    junit4
-BuildRequires:    osutil >= 2.0.1
 BuildRequires:    tomcatjss >= 6.0.0
 %else
 BuildRequires:    jpackage-utils
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    junit4
-BuildRequires:    osutil
 BuildRequires:    tomcatjss >= 2.0.0
 %endif
 %endif
@@ -219,16 +216,13 @@ Requires:         apache-commons-codec
 %if 0%{?fedora} >= 16
 Requires:         jpackage-utils >= 0:1.7.5-10
 Requires:         jss >= 4.2.6-19.1
-Requires:         osutil >= 2.0.2
 %else
 %if 0%{?fedora} >= 15
 Requires:         jpackage-utils
 Requires:         jss >= 4.2.6-17
-Requires:         osutil >= 2.0.1
 %else
 Requires:         jpackage-utils
 Requires:         jss >= 4.2.6-17
-Requires:         osutil
 %endif
 %endif
 
@@ -1218,6 +1212,9 @@ fi
 
 
 %changelog
+* Wed Feb 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.a1
+- Removed dependency on OSUtil.
+
 * Wed Feb 23 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.a1
 - Added dependency on Apache Commons Codec.
 
diff --git a/pki/tools/jar/README.jar-tools b/pki/tools/jar/README.jar-tools
index df927c86cec6d15654980781e3c597b8efb654f9..e165fd8bd4a24be6ef2f80aa64d551aced29fe64 100644
--- a/pki/tools/jar/README.jar-tools
+++ b/pki/tools/jar/README.jar-tools
@@ -225,9 +225,8 @@ $ jar-query -s -r -d /usr/share/java/pki -x libgcj `cat ~/pkicore-imports`
 The summary is listed below:
 
 Summary:
-22 Unique Jar's
+21 Unique Jar's
      /usr/lib/jss/jss4-4.2.6.jar
-     /usr/lib/osutil/osutil-2.0.0.jar
      /usr/share/java/commons-codec.jar
      /usr/lib/symkey/symkey-9.0.0.jar
      /usr/share/java/jakarta-taglibs-core-1.1.1.jar
@@ -248,11 +247,10 @@ Summary:
      /usr/share/java/xerces-j2-2.9.0.jar
      /usr/share/java/xml-commons-apis-1.4.01.jar
      /usr/share/java/xml-commons-apis-ext-1.4.01.jar
-16 Unique RPM's
+15 Unique RPM's
      jakarta-taglibs-standard
      jss
      ldapjdk
-     osutil
      apache-commons-codec
      pki-common
      pki-console
@@ -266,13 +264,13 @@ Summary:
      xerces-j2
      xml-commons-apis
 
-What this is telling us is that there are 22 jars which provide all
+What this is telling us is that there are 21 jars which provide all
 the classes needed to satisfy the import statements. However there may
 be some duplicates in the list. Also because of wildcard import
 statements some classes and hence jars may have been included which
 are not actually utilized in the code.
 
-Those 22 jars are provided by the 16 RPM's listed. Once again there
+Those 21 jars are provided by the 15 RPM's listed. Once again there
 may be some class duplication and/or unnecessary RPM's due to
 wildcarding. But this gives a very small manageable list to manually
 pick through and make our choices. For example, one thing we can
-- 
1.7.7.4

