diff options
Diffstat (limited to 'pki/base')
-rw-r--r-- | pki/base/ca/src/CMakeLists.txt | 6 | ||||
-rw-r--r-- | pki/base/common/src/CMakeLists.txt | 14 | ||||
-rw-r--r-- | pki/base/console/src/CMakeLists.txt | 20 | ||||
-rwxr-xr-x | pki/base/console/templates/pki_console_wrapper | 5 | ||||
-rw-r--r-- | pki/base/java-tools/src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | pki/base/java-tools/templates/pki_java_command_wrapper.in | 10 | ||||
-rw-r--r-- | pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in | 10 | ||||
-rw-r--r-- | pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in | 10 | ||||
-rw-r--r-- | pki/base/kra/src/CMakeLists.txt | 10 | ||||
-rw-r--r-- | pki/base/ocsp/src/CMakeLists.txt | 10 | ||||
-rwxr-xr-x | pki/base/setup/pkicommon.pm | 8 | ||||
-rw-r--r-- | pki/base/silent/src/CMakeLists.txt | 6 | ||||
-rw-r--r-- | pki/base/symkey/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt | 2 | ||||
-rw-r--r-- | pki/base/tks/src/CMakeLists.txt | 10 | ||||
-rw-r--r-- | pki/base/util/src/CMakeLists.txt | 10 |
16 files changed, 89 insertions, 52 deletions
diff --git a/pki/base/ca/src/CMakeLists.txt b/pki/base/ca/src/CMakeLists.txt index 54dde47a8..2adda5467 100644 --- a/pki/base/ca/src/CMakeLists.txt +++ b/pki/base/ca/src/CMakeLists.txt @@ -9,19 +9,19 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt index 2df82b8bb..12e401d8f 100644 --- a/pki/base/common/src/CMakeLists.txt +++ b/pki/base/common/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(SERVLET_JAR NAMES servlet.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -36,7 +36,7 @@ find_file(VELOCITY_JAR NAMES velocity.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -44,7 +44,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -52,7 +52,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt index dd6b9261c..b8a897757 100644 --- a/pki/base/console/src/CMakeLists.txt +++ b/pki/base/console/src/CMakeLists.txt @@ -5,7 +5,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -15,7 +15,7 @@ find_file(BASE_JAR NAMES idm-console-base.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -23,7 +23,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -31,7 +31,7 @@ find_file(MMC_JAR NAMES idm-console-mcc.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -39,7 +39,7 @@ find_file(MMC_EN_JAR NAMES idm-console-mcc_en.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -47,7 +47,7 @@ find_file(NMCLF_JAR NAMES idm-console-nmclf.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -55,17 +55,17 @@ find_file(NMCLF_EN_JAR NAMES idm-console-nmclf_en.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -73,7 +73,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/console/templates/pki_console_wrapper b/pki/base/console/templates/pki_console_wrapper index feaf87d72..eec4725b6 100755 --- a/pki/base/console/templates/pki_console_wrapper +++ b/pki/base/console/templates/pki_console_wrapper @@ -140,6 +140,11 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # Fedora 16+ + CP=/usr/lib64/java/jss4.jar +fi CP=/usr/share/java/ldapjdk.jar:${CP} CP=/usr/share/java/idm-console-nmclf.jar:${CP} CP=/usr/share/java/idm-console-nmclf_en.jar:${CP} diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index 678671e7f..90fe31ae4 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) 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 3c804de3f..4136eeebb 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper.in +++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # 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/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.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 ce54ed024..fe0262c8c 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 @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # 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/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.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 38f46856e..333983a47 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 @@ -130,8 +130,18 @@ fi CP=/usr/lib/java/jss4.jar CP=/usr/lib/java/dirsec/jss4.jar:${CP} +if [ "${OS}" = "Linux" ] && + [ "${ARCHITECTURE}" = "x86_64" ] ; then + # 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/ldapjdk.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP} CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP} diff --git a/pki/base/kra/src/CMakeLists.txt b/pki/base/kra/src/CMakeLists.txt index 9879fbae7..a023c00b2 100644 --- a/pki/base/kra/src/CMakeLists.txt +++ b/pki/base/kra/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/ocsp/src/CMakeLists.txt b/pki/base/ocsp/src/CMakeLists.txt index 5e14d079f..f7cb01405 100644 --- a/pki/base/ocsp/src/CMakeLists.txt +++ b/pki/base/ocsp/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/setup/pkicommon.pm b/pki/base/setup/pkicommon.pm index 51db599f4..218c28866 100755 --- a/pki/base/setup/pkicommon.pm +++ b/pki/base/setup/pkicommon.pm @@ -31,7 +31,7 @@ our @EXPORT = qw( $verbose $dry_run $hostname $default_hardware_platform $default_system_binaries $default_lockdir $default_system_libraries $default_system_user_binaries $default_system_user_libraries - $default_java_path $default_pki_java_path $default_system_jni_java_path @default_jar_path + $default_java_path $default_pki_java_path $default_x86_64_jni_java_path $default_system_jni_java_path @default_jar_path $default_security_libraries $default_certutil_command $default_ldapmodify_command $default_modutil_command $default_dir_permissions $default_exe_permissions $default_file_permissions @@ -170,6 +170,7 @@ our $default_system_user_binaries = undef; our $default_system_user_libraries = undef; our $default_java_path = undef; our $default_pki_java_path = undef; +our $default_x86_64_jni_java_path = undef; our $default_system_jni_java_path = undef; our @default_jar_path = undef; our $default_security_libraries = undef; @@ -207,6 +208,7 @@ if ($^O eq "linux") { $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; $default_system_jni_java_path = "/usr/lib/java"; + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -215,14 +217,14 @@ if ($^O eq "linux") { $default_system_user_libraries = "/usr/lib64"; $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; + $default_x86_64_jni_java_path = "/usr/lib64/java"; $default_system_jni_java_path = "/usr/lib/java"; + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_x86_64_jni_java_path, $default_system_jni_java_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; } - @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path); - # Retrieve hostname if (defined($ENV{'PKI_HOSTNAME'})) { # IPv6: Retrieve hostname from environment variable diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt index d7bfc6b1d..4a3ab4a77 100644 --- a/pki/base/silent/src/CMakeLists.txt +++ b/pki/base/silent/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/symkey/src/CMakeLists.txt b/pki/base/symkey/src/CMakeLists.txt index be5dc2fa4..599a7cb5a 100644 --- a/pki/base/symkey/src/CMakeLists.txt +++ b/pki/base/symkey/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) diff --git a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt index 75b848d41..47d40a3f1 100644 --- a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt +++ b/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt @@ -41,7 +41,7 @@ add_custom_command( ${symkey_library_HDRS} COMMAND ${JAVA_HEADER} - -classpath ${SYMKEY_JAVA_OBJECT_DIR}:/usr/lib/java/jss4.jar + -classpath ${SYMKEY_JAVA_OBJECT_DIR}:${JAVA_LIB_INSTALL_DIR}/jss4.jar -jni -d ${CMAKE_CURRENT_BINARY_DIR} com.netscape.symkey.SessionKey ) diff --git a/pki/base/tks/src/CMakeLists.txt b/pki/base/tks/src/CMakeLists.txt index 5ec7101bc..caeda0185 100644 --- a/pki/base/tks/src/CMakeLists.txt +++ b/pki/base/tks/src/CMakeLists.txt @@ -33,7 +33,7 @@ find_file(PKI_NSUTIL_JAR NAMES pki-nsutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java/pki ) @@ -47,26 +47,26 @@ find_file(LDAPJDK_JAR ) -# '/usr/lib/java' jars +# '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) find_file(SYMKEY_JAR NAMES symkey.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} ) diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index a7f0f4e6d..8894cf220 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -4,7 +4,7 @@ find_file(JSS_JAR NAMES jss4.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -12,7 +12,7 @@ find_file(LDAPJDK_JAR NAMES ldapjdk.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -20,7 +20,7 @@ find_file(OSUTIL_JAR NAMES osutil.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -28,7 +28,7 @@ find_file(XALAN_JAR NAMES xalan-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) @@ -36,7 +36,7 @@ find_file(XERCES_JAR NAMES xerces-j2.jar PATHS - /usr/lib/java + ${JAVA_LIB_INSTALL_DIR} /usr/share/java ) |