Skip to content

Commit

Permalink
Replaced BtoA/AtoB with Apache codec.
Browse files Browse the repository at this point in the history 
The OSUtil's BtoA() and AtoB() have been replaced by Base64
codec from Apache Commons library. The codec is configured to
use 64-byte line width as defined in RFC 1421.

Ticket #90
  • Loading branch information
@edewata
edewata committed Feb 24, 2012
1 parent 970e366 commit ed31fc4
Show file tree
Hide file tree
Showing 22 changed files with 115 additions and 25 deletions.
10 changes: 5 additions & 5 deletions pki/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<classpathentry kind="lib" path="/usr/share/candlepin/lib/jaxrs-api-2.2.1.GA.jar"/>
<classpathentry kind="lib" path="/usr/share/candlepin/lib/resteasy-jaxrs-2.2.1.GA.jar"/>
<classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/>
<classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/>
<classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/>
<classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/>
<classpathentry kind="lib" path="/usr/share/candlepin/lib/jaxb-impl-2.1.12.jar"/>
<classpathentry kind="lib" path="/usr/share/candlepin/lib/resteasy-jaxb-provider-2.2.1.GA.jar"/>
<classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/>
<classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/>
<classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/>
<classpathentry kind="lib" path="/usr/share/candlepin/lib/jaxb-impl-2.1.12.jar"/>
<classpathentry kind="lib" path="/usr/share/candlepin/lib/resteasy-jaxb-provider-2.2.1.GA.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
9 changes: 8 additions & 1 deletion pki/base/ca/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ find_file(OSUTIL_JAR
${JAVA_LIB_INSTALL_DIR}
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)


# identify java sources
set(pki-ca_java_SRCS
Expand All @@ -42,7 +49,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} ${SYMKEY_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})


# set version
Expand Down
9 changes: 8 additions & 1 deletion pki/base/common/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ find_file(OSUTIL_JAR
/usr/share/java
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(SERVLET_JAR
NAMES
servlet.jar
Expand Down Expand Up @@ -1032,7 +1039,7 @@ 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} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR} ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR})

set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})

Expand Down
4 changes: 2 additions & 2 deletions pki/base/common/test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} ${SYMKEY_JAR}
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
${PKI_TEST_JAR} ${JUNIT_JAR}
)

Expand All @@ -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} ${SYMKEY_JAR}
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR}
${PKI_TEST_JAR} ${JUNIT_JAR}
TESTS
com.netscape.certsrv.authentication.AuthTokenTest
Expand Down
10 changes: 9 additions & 1 deletion pki/base/console/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ find_file(OSUTIL_JAR
/usr/share/java
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)


# identify java sources
set(pki-console_java_SRCS
Expand Down Expand Up @@ -648,7 +655,8 @@ set(CMAKE_JAVA_INCLUDE_PATH
${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR}
${PKI_NSUTIL_JAR}
${JSS_JAR}
${OSUTIL_JAR})
${OSUTIL_JAR}
${COMMONS_CODEC_JAR})


# set version
Expand Down
9 changes: 8 additions & 1 deletion pki/base/java-tools/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ find_file(OSUTIL_JAR
/usr/share/java
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(XALAN_JAR
NAMES
xalan-j2.jar
Expand Down Expand Up @@ -60,7 +67,7 @@ set(pki-tools_java_SRCS
set(CMAKE_JAVA_INCLUDE_PATH
${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
${XALAN_JAR} ${XERCES_JAR}
${JSS_JAR} ${OSUTIL_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR})

set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})

Expand Down
1 change: 1 addition & 0 deletions pki/base/java-tools/templates/pki_java_command_wrapper.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
# 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}
CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
Expand Down
1 change: 1 addition & 0 deletions pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
# 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}
CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
Expand Down
1 change: 1 addition & 0 deletions pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
# 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}
CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
Expand Down
9 changes: 8 additions & 1 deletion pki/base/kra/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ find_file(OSUTIL_JAR
${JAVA_LIB_INSTALL_DIR}
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(SYMKEY_JAR
NAMES
symkey.jar
Expand Down Expand Up @@ -94,7 +101,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} ${SYMKEY_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})


# set version
Expand Down
9 changes: 8 additions & 1 deletion pki/base/ocsp/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ find_file(OSUTIL_JAR
${JAVA_LIB_INSTALL_DIR}
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(SYMKEY_JAR
NAMES
symkey.jar
Expand All @@ -84,7 +91,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} ${SYMKEY_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})


# set version
Expand Down
14 changes: 14 additions & 0 deletions pki/base/setup/pkicreate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ 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
my $velocity_jar_base_name = "velocity.jar"; # CA, KRA, OCSP, TKS
Expand Down Expand Up @@ -502,6 +503,8 @@ 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
my $symkey_jar_symlink_path = undef; # CA, KRA, OCSP, TKS
my $tomcatjss_jar_file_path = undef; # CA, KRA, OCSP, TKS
Expand Down Expand Up @@ -1838,6 +1841,11 @@ sub initialize_subdirectory_paths
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;
}

if (!defined($pki_subsystem_jar_file_path = find_jar($pki_subsystem_jar_base_name))) {
emit("could not find jar: $pki_subsystem_jar_base_name", "error");
return 0;
Expand Down Expand Up @@ -1946,6 +1954,8 @@ sub initialize_subdirectory_paths
. "/" . $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
. "/" . $symkey_jar_base_name;
$pki_subsystem_jar_symlink_path = $webinf_lib_instance_path
Expand Down Expand Up @@ -2965,6 +2975,10 @@ sub process_pki_files_and_symlinks
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);

# create instance symlink to "${subsystem_type}.jar"
return 0 if !create_symlink($pki_subsystem_jar_symlink_path, $pki_subsystem_jar_file_path,
$pki_user, $pki_group);
Expand Down
1 change: 1 addition & 0 deletions pki/base/silent/scripts/pkisilent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-silent.jar:"
. "/usr/share/java/${PRODUCT}/pki-cmsutil.jar:"
. "/usr/share/java/${PRODUCT}/pki-tools.jar:"
. "/usr/share/java/ldapjdk.jar:"
. "/usr/share/java/commons-codec.jar:"
. "/usr/share/java/xerces-j2.jar:"
. "/usr/share/java/xml-commons-apis.jar:"
. "/usr/share/java/xml-commons-resolver.jar:";
Expand Down
2 changes: 1 addition & 1 deletion pki/base/silent/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ 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} ${SYMKEY_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})

set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})

Expand Down
9 changes: 8 additions & 1 deletion pki/base/tks/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ find_file(OSUTIL_JAR
${JAVA_LIB_INSTALL_DIR}
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(SYMKEY_JAR
NAMES
symkey.jar
Expand All @@ -81,7 +88,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} ${SYMKEY_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${SYMKEY_JAR})


# set version
Expand Down
9 changes: 8 additions & 1 deletion pki/base/util/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ find_file(OSUTIL_JAR
/usr/share/java
)

find_file(COMMONS_CODEC_JAR
NAMES
commons-codec.jar
PATHS
/usr/share/java
)

find_file(XALAN_JAR
NAMES
xalan-j2.jar
Expand Down Expand Up @@ -332,7 +339,7 @@ set(pki-cmsutil_java_SRCS

set(CMAKE_JAVA_INCLUDE_PATH
${LDAPJDK_JAR} ${XALAN_JAR} ${XERCES_JAR}
${JSS_JAR} ${OSUTIL_JAR})
${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR})

set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})

Expand Down
6 changes: 4 additions & 2 deletions pki/base/util/src/com/netscape/cmsutil/util/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cmsutil.util;

import org.apache.commons.codec.binary.Base64;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -263,12 +265,12 @@ public static String[] getStringArrayFromVector(Vector<String> v) {
}

public static String base64encode(byte[] bytes) {
String string = com.netscape.osutil.OSUtil.BtoA(bytes);
String string = new Base64(64).encodeToString(bytes);
return string;
}

public static byte[] base64decode(String string) {
byte[] bytes = com.netscape.osutil.OSUtil.AtoB(string);
byte[] bytes = Base64.decodeBase64(string);
return bytes;
}
}
4 changes: 2 additions & 2 deletions pki/base/util/test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} ${XALAN_JAR} ${XERCES_JAR}
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR} ${XALAN_JAR} ${XERCES_JAR}
${PKI_TEST_JAR} ${JUNIT_JAR}
)

Expand All @@ -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}
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR}
${PKI_TEST_JAR} ${JUNIT_JAR}
TESTS
com.netscape.security.util.BMPStringTest
Expand Down
3 changes: 2 additions & 1 deletion pki/scripts/prepare_dogtag_pki
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ else
APACHE_COMMONS_LANG="jakarta-commons-lang"
APACHE_COMMONS_LOGGING="jakarta-commons-logging"
fi
APACHE_COMMONS_CODEC="apache-commons-codec"
JAKARTA_COMMONS_COLLECTIONS="jakarta-commons-collections"
JAKARTA_COMMONS_DBCP="jakarta-commons-dbcp"
JAKARTA_COMMONS_POOL="jakarta-commons-pool"
Expand Down Expand Up @@ -293,7 +294,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} ${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} ${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}"

###########################################
# Establish PKI Installation Dependencies #
Expand Down
5 changes: 5 additions & 0 deletions pki/specs/dogtag-pki.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ BuildArch: noarch
%endif
%endif

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}
Expand Down Expand Up @@ -187,6 +189,9 @@ rm -rf %{buildroot}
%doc README

%changelog
* Wed Feb 22 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
- Added dependency on Apache Commons Codec.

* Wed Feb 1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
- Updated package version number

Expand Down

0 comments on commit ed31fc4

Please sign in to comment.