diff options
Diffstat (limited to 'base')
34 files changed, 45 insertions, 57 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 310a3e3c8..c0de97171 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -21,7 +21,10 @@ if (APPLICATION_FLAVOR_PKI_CORE) add_subdirectory(javadoc) endif(WITH_JAVADOC) - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION ${APPLICATION_VERSION}) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/VERSION + ${CMAKE_CURRENT_BINARY_DIR}/VERSION + ) install( FILES diff --git a/base/VERSION b/base/VERSION new file mode 100644 index 000000000..066f31138 --- /dev/null +++ b/base/VERSION @@ -0,0 +1,3 @@ +Name: pki +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/ca/setup/CMakeLists.txt b/base/ca/setup/CMakeLists.txt index f5f069cdb..d2a1399e6 100644 --- a/base/ca/setup/CMakeLists.txt +++ b/base/ca/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES registry_instance diff --git a/base/ca/shared/conf/CMakeLists.txt b/base/ca/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/ca/shared/conf/CMakeLists.txt +++ b/base/ca/shared/conf/CMakeLists.txt @@ -1,7 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) -set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR}) -set(MINOR_VERSION ${APPLICATION_VERSION_MINOR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in index 4d148945c..94a3e5b49 100644 --- a/base/ca/shared/conf/CS.cfg.in +++ b/base/ca/shared/conf/CS.cfg.in @@ -18,7 +18,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID] installDate=[INSTALL_TIME] preop.wizard.name=CA Setup Wizard preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.name=CA preop.system.fullname=Certificate Authority proxy.securePort=[PKI_PROXY_SECURE_PORT] @@ -734,7 +734,7 @@ cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cms.passwordlist=internaldb,replicationdb cms.password.ignore.publishing.failure=true -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ cmsgateway._000=## cmsgateway._001=## In the event that all Admin Certificates have been lost cmsgateway._002=## for a given instance, perform the following steps to diff --git a/base/ca/src/pki-ca.mf b/base/ca/src/pki-ca.mf index 056f7bc08..ae5a8975f 100644 --- a/base/ca/src/pki-ca.mf +++ b/base/ca/src/pki-ca.mf @@ -1,2 +1,3 @@ Name: pki-ca -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/common/src/pki-certsrv.mf b/base/common/src/pki-certsrv.mf index fe2ed1ffe..0614e4d8c 100644 --- a/base/common/src/pki-certsrv.mf +++ b/base/common/src/pki-certsrv.mf @@ -1,2 +1,3 @@ Name: pki-certsrv -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/common/src/pki-cms.mf b/base/common/src/pki-cms.mf index 2c6f8010f..4810f3fb0 100644 --- a/base/common/src/pki-cms.mf +++ b/base/common/src/pki-cms.mf @@ -1,2 +1,3 @@ Name: pki-cms -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/common/src/pki-cmsbundle.mf b/base/common/src/pki-cmsbundle.mf index 84d6f0e7a..ee384386e 100644 --- a/base/common/src/pki-cmsbundle.mf +++ b/base/common/src/pki-cmsbundle.mf @@ -1,2 +1,3 @@ Name: pki-cmsbundle -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/common/src/pki-cmscore.mf b/base/common/src/pki-cmscore.mf index 1b1a03f50..c23d7b299 100644 --- a/base/common/src/pki-cmscore.mf +++ b/base/common/src/pki-cmscore.mf @@ -1,2 +1,3 @@ Name: pki-cmscore -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/common/src/pki-tomcat.mf b/base/common/src/pki-tomcat.mf index a6e4889b8..ca8d3bf1b 100644 --- a/base/common/src/pki-tomcat.mf +++ b/base/common/src/pki-tomcat.mf @@ -1,2 +1,3 @@ Name: pki-tomcat -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/console/src/pki-console.mf b/base/console/src/pki-console.mf index 91ec08905..4f7799ad3 100644 --- a/base/console/src/pki-console.mf +++ b/base/console/src/pki-console.mf @@ -1,2 +1,3 @@ Name: pki-console -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/java-tools/src/pki-tools.mf b/base/java-tools/src/pki-tools.mf index 3cf1821aa..712f450c0 100644 --- a/base/java-tools/src/pki-tools.mf +++ b/base/java-tools/src/pki-tools.mf @@ -1,2 +1,3 @@ Name: pki-tools -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/kra/setup/CMakeLists.txt b/base/kra/setup/CMakeLists.txt index f5f069cdb..d2a1399e6 100644 --- a/base/kra/setup/CMakeLists.txt +++ b/base/kra/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES registry_instance diff --git a/base/kra/shared/conf/CMakeLists.txt b/base/kra/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/kra/shared/conf/CMakeLists.txt +++ b/base/kra/shared/conf/CMakeLists.txt @@ -1,7 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) -set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR}) -set(MINOR_VERSION ${APPLICATION_VERSION_MINOR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in index c2655fc75..28653a958 100644 --- a/base/kra/shared/conf/CS.cfg.in +++ b/base/kra/shared/conf/CS.cfg.in @@ -17,7 +17,7 @@ pkiremove.cert.subsystem.nickname=subsystemCert cert-[PKI_INSTANCE_ID] installDate=[INSTALL_TIME] preop.wizard.name=DRM Setup Wizard preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.name=DRM preop.system.fullname=Data Recovery Manager proxy.securePort=[PKI_PROXY_SECURE_PORT] @@ -175,7 +175,7 @@ cmc.lraPopWitness.verify.allow=true cmc.revokeCert.verify=true cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ dbs.enableSerialManagement=false dbs.beginRequestNumber=1 dbs.endRequestNumber=10000000 diff --git a/base/kra/src/pki-kra.mf b/base/kra/src/pki-kra.mf index 3234421e7..dba4e6c7c 100644 --- a/base/kra/src/pki-kra.mf +++ b/base/kra/src/pki-kra.mf @@ -1,2 +1,3 @@ Name: pki-kra -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/ocsp/setup/CMakeLists.txt b/base/ocsp/setup/CMakeLists.txt index f5f069cdb..d2a1399e6 100644 --- a/base/ocsp/setup/CMakeLists.txt +++ b/base/ocsp/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES registry_instance diff --git a/base/ocsp/shared/conf/CMakeLists.txt b/base/ocsp/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/ocsp/shared/conf/CMakeLists.txt +++ b/base/ocsp/shared/conf/CMakeLists.txt @@ -1,7 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) -set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR}) -set(MINOR_VERSION ${APPLICATION_VERSION_MINOR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in index 0910d6672..79448104e 100644 --- a/base/ocsp/shared/conf/CS.cfg.in +++ b/base/ocsp/shared/conf/CS.cfg.in @@ -25,7 +25,7 @@ preop.admincert.profile=caAdminCert preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445 preop.wizard.name=OCSP Setup Wizard preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.name=OCSP preop.system.fullname=OCSP Responder proxy.securePort=[PKI_PROXY_SECURE_PORT] @@ -159,7 +159,7 @@ cmc.lraPopWitness.verify.allow=true cmc.revokeCert.verify=true cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ dbs.ldap=internaldb dbs.newSchemaEntryAdded=true debug.append=true diff --git a/base/ocsp/src/pki-ocsp.mf b/base/ocsp/src/pki-ocsp.mf index 999e7d992..1f436c998 100644 --- a/base/ocsp/src/pki-ocsp.mf +++ b/base/ocsp/src/pki-ocsp.mf @@ -1,2 +1,3 @@ Name: pki-ocsp -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/ra/doc/CMakeLists.txt b/base/ra/doc/CMakeLists.txt index 4cebbe1c9..419289d03 100644 --- a/base/ra/doc/CMakeLists.txt +++ b/base/ra/doc/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/ra/doc/CS.cfg.in b/base/ra/doc/CS.cfg.in index 0581e3a78..702dda90b 100644 --- a/base/ra/doc/CS.cfg.in +++ b/base/ra/doc/CS.cfg.in @@ -190,7 +190,7 @@ conn.ca1.timeout=100 conn.ca1.SSLOn=true conn.ca1.keepAlive=true preop.pin=[PKI_RANDOM_NUMBER] -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.cert._000=######################################### preop.cert._001=# Installation configuration "preop" certs parameters preop.cert._002=######################################### diff --git a/base/ra/setup/CMakeLists.txt b/base/ra/setup/CMakeLists.txt index 4f9784507..0e81ca150 100644 --- a/base/ra/setup/CMakeLists.txt +++ b/base/ra/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES pkidaemon_registry diff --git a/base/silent/src/pki-silent.mf b/base/silent/src/pki-silent.mf index 5b66b7ffc..13c91de27 100644 --- a/base/silent/src/pki-silent.mf +++ b/base/silent/src/pki-silent.mf @@ -1,2 +1,3 @@ Name: pki-silent -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/tks/setup/CMakeLists.txt b/base/tks/setup/CMakeLists.txt index f5f069cdb..d2a1399e6 100644 --- a/base/tks/setup/CMakeLists.txt +++ b/base/tks/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES registry_instance diff --git a/base/tks/shared/conf/CMakeLists.txt b/base/tks/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/tks/shared/conf/CMakeLists.txt +++ b/base/tks/shared/conf/CMakeLists.txt @@ -1,7 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) -set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR}) -set(MINOR_VERSION ${APPLICATION_VERSION_MINOR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in index f641e026f..7f11c4b18 100644 --- a/base/tks/shared/conf/CS.cfg.in +++ b/base/tks/shared/conf/CS.cfg.in @@ -25,7 +25,7 @@ preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445 preop.wizard.name=TKS Setup Wizard preop.system.name=TKS preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.fullname=Token Key Service proxy.securePort=[PKI_PROXY_SECURE_PORT] proxy.unsecurePort=[PKI_PROXY_UNSECURE_PORT] @@ -152,7 +152,7 @@ cmc.lraPopWitness.verify.allow=true cmc.revokeCert.verify=true cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ dbs.ldap=internaldb dbs.newSchemaEntryAdded=true debug.append=true diff --git a/base/tks/src/pki-tks.mf b/base/tks/src/pki-tks.mf index a9f3a3e50..38d85b998 100644 --- a/base/tks/src/pki-tks.mf +++ b/base/tks/src/pki-tks.mf @@ -1,2 +1,3 @@ Name: pki-tks -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/tps/doc/CMakeLists.txt b/base/tps/doc/CMakeLists.txt index 4cebbe1c9..419289d03 100644 --- a/base/tps/doc/CMakeLists.txt +++ b/base/tps/doc/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/tps/doc/CS.cfg.in b/base/tps/doc/CS.cfg.in index 64dadc6a6..93e53fdde 100644 --- a/base/tps/doc/CS.cfg.in +++ b/base/tps/doc/CS.cfg.in @@ -362,7 +362,7 @@ channel.defKeyIndex=0 # * channel.appletMemorySize=5000 # preop.pin=[PKI_RANDOM_NUMBER] -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.cert._000=######################################### preop.cert._001=# Installation configuration "preop" certs parameters preop.cert._002=######################################### diff --git a/base/tps/setup/CMakeLists.txt b/base/tps/setup/CMakeLists.txt index 4f9784507..0e81ca150 100644 --- a/base/tps/setup/CMakeLists.txt +++ b/base/tps/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES pkidaemon_registry diff --git a/base/util/src/pki-cmsutil.mf b/base/util/src/pki-cmsutil.mf index 87382b9aa..dace8f426 100644 --- a/base/util/src/pki-cmsutil.mf +++ b/base/util/src/pki-cmsutil.mf @@ -1,2 +1,3 @@ Name: pki-cmsutil -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} diff --git a/base/util/src/pki-nsutil.mf b/base/util/src/pki-nsutil.mf index 272200d67..483d46756 100644 --- a/base/util/src/pki-nsutil.mf +++ b/base/util/src/pki-nsutil.mf @@ -1,2 +1,3 @@ Name: pki-nsutil -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} |