summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-27 23:58:23 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-27 23:58:23 +0000
commit67a6e5bcc496c297fa32932f1fb7d68831b557da (patch)
tree54c8764f0f6ab538f6767326b4404f430851680f
parent1d5e1d194e8f2ae5b609f17a38d8adf3043ac864 (diff)
downloadpki-67a6e5bcc496c297fa32932f1fb7d68831b557da.tar.gz
pki-67a6e5bcc496c297fa32932f1fb7d68831b557da.tar.xz
pki-67a6e5bcc496c297fa32932f1fb7d68831b557da.zip
Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from OpenLDAP
instead of the Mozldap (CMake diffs et. al.) git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1787 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/CMakeLists.txt38
-rw-r--r--pki/base/tps/CMakeLists.txt36
-rw-r--r--pki/base/tps/doc/CS.cfg.in4
-rw-r--r--pki/base/tps/setup/registry_instance5
-rw-r--r--pki/base/tps/src/CMakeLists.txt9
-rw-r--r--pki/base/tps/src/authentication/CMakeLists.txt13
-rw-r--r--pki/base/tps/src/modules/tokendb/CMakeLists.txt4
-rw-r--r--pki/base/tps/src/modules/tps/CMakeLists.txt4
-rw-r--r--pki/base/tps/src/tus/CMakeLists.txt13
-rw-r--r--pki/base/tps/tools/raclient/CMakeLists.txt4
-rw-r--r--pki/dogtag/tps/pki-tps.spec4
-rw-r--r--pki/specs/pki-tps.spec50
12 files changed, 85 insertions, 99 deletions
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt
index c46d5128..11fbf73a 100644
--- a/pki/CMakeLists.txt
+++ b/pki/CMakeLists.txt
@@ -36,38 +36,6 @@ elseif (BUILD_PKI_CONSOLE)
set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE)
elseif (BUILD_PKI_MIGRATE)
set(APPLICATION_FLAVOR_PKI_MIGRATE TRUE)
-elseif (BUILD_IPA_PKI)
- set(APPLICATION_FLAVOR_IPA_PKI_THEME TRUE)
- set(APPLICATION_FLAVOR_PKI_CORE TRUE)
-elseif (BUILD_DOGTAG_PKI)
- set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE)
- set(APPLICATION_FLAVOR_PKI_CORE TRUE)
- set(APPLICATION_FLAVOR_PKI_KRA TRUE)
- set(APPLICATION_FLAVOR_PKI_OCSP TRUE)
- set(APPLICATION_FLAVOR_PKI_RA TRUE)
- set(APPLICATION_FLAVOR_PKI_TKS TRUE)
- set(APPLICATION_FLAVOR_PKI_TPS TRUE)
- set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE)
-elseif (BUILD_REDHAT_PKI)
- set(APPLICATION_FLAVOR_REDHAT_PKI_THEME TRUE)
- set(APPLICATION_FLAVOR_PKI_CORE TRUE)
- set(APPLICATION_FLAVOR_PKI_KRA TRUE)
- set(APPLICATION_FLAVOR_PKI_OCSP TRUE)
- set(APPLICATION_FLAVOR_PKI_RA TRUE)
- set(APPLICATION_FLAVOR_PKI_TKS TRUE)
- set(APPLICATION_FLAVOR_PKI_TPS TRUE)
- set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE)
- set(APPLICATION_FLAVOR_PKI_MIGRATE TRUE)
-else ()
- # By default, build Dogtag PKI
- set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE)
- set(APPLICATION_FLAVOR_PKI_CORE TRUE)
- set(APPLICATION_FLAVOR_PKI_KRA TRUE)
- set(APPLICATION_FLAVOR_PKI_OCSP TRUE)
- set(APPLICATION_FLAVOR_PKI_RA TRUE)
- set(APPLICATION_FLAVOR_PKI_TKS TRUE)
- set(APPLICATION_FLAVOR_PKI_TPS TRUE)
- set(APPLICATION_FLAVOR_PKI_CONSOLE TRUE)
endif ()
set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
@@ -114,15 +82,15 @@ if (APPLICATION_FLAVOR_PKI_CORE OR
find_package(JNI REQUIRED)
endif ()
-# ONLY required for PKI_CORE
-if (APPLICATION_FLAVOR_PKI_CORE)
+# ONLY required for PKI_CORE or PKI_TPS
+if (APPLICATION_FLAVOR_PKI_CORE OR
+ APPLICATION_FLAVOR_PKI_TPS)
find_package(Ldap REQUIRED)
endif ()
# ONLY required for PKI_TPS
if (APPLICATION_FLAVOR_PKI_TPS)
find_package(APR REQUIRED)
- find_package(MozLDAP REQUIRED)
find_package(Svrcore REQUIRED)
endif ()
diff --git a/pki/base/tps/CMakeLists.txt b/pki/base/tps/CMakeLists.txt
index c7e3aad8..cefe11cd 100644
--- a/pki/base/tps/CMakeLists.txt
+++ b/pki/base/tps/CMakeLists.txt
@@ -1,5 +1,41 @@
project(tps CXX)
+# NOTE: TPS utilizes internal libraries located under '%{_libdir}/tps'.
+#
+# One method of resolving this issue is the use of RPATH as
+# described in 'http://www.cmake.org/Wiki/CMake_RPATH_handling'.
+#
+# While Fedora allows the use of RPATH for this purpose as documented
+# in the section entitled 'Rpath_for_Internal_Libraries' in the URL
+# called 'http://fedoraproject.org/wiki/Packaging/Guidelines',
+# the RPM '%cmake' macro overrides use of RPATH on Fedora and RHEL.
+#
+# To resolve this issue on Fedora and RHEL, one of the following
+# methods may be utilized:
+#
+# (1) Uncomment the 'SET(CMAKE_SKIP_RPATH FALSE)' line below, or
+# (2) Implement the files described in the section entitled
+# 'Alternatives to Rpath' in the URL called
+# 'http://fedoraproject.org/wiki/Packaging/Guidelines'.
+
+# use, i.e. don't skip the full RPATH
+# (overrides '%cmake' macro setting of true)
+#SET(CMAKE_SKIP_RPATH FALSE)
+
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# the RPATH to be used when installing
+SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}/tps")
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
add_subdirectory(src)
add_subdirectory(tools)
diff --git a/pki/base/tps/doc/CS.cfg.in b/pki/base/tps/doc/CS.cfg.in
index db3aecc9..2bbf8107 100644
--- a/pki/base/tps/doc/CS.cfg.in
+++ b/pki/base/tps/doc/CS.cfg.in
@@ -288,7 +288,7 @@ auth.instance._041=# where
auth.instance._042=# <n> - authentication connection ID
auth.instance._043=#########################################
auth.instance.0.type=LDAP_Authentication
-auth.instance.0.libraryName=[SYSTEM_USER_LIBRARIES]/[LIB_PREFIX]ldapauth[OBJ_EXT]
+auth.instance.0.libraryName=[SYSTEM_USER_LIBRARIES]/tps/[LIB_PREFIX]ldapauth[OBJ_EXT]
auth.instance.0.libraryFactory=GetAuthentication
auth.instance.0.authId=ldap1
auth.instance.0.hostport=[LDAP_HOST]:[LDAP_PORT]
@@ -309,7 +309,7 @@ auth.instance.0.ui.id.PASSWORD.name.en=LDAP Password
auth.instance.0.ui.id.UID.description.en=LDAP User ID
auth.instance.0.ui.id.PASSWORD.description.en=LDAP Password
auth.instance.1.type=LDAP_Authentication
-auth.instance.1.libraryName=[SYSTEM_USER_LIBRARIES]/[LIB_PREFIX]ldapauth[OBJ_EXT]
+auth.instance.1.libraryName=[SYSTEM_USER_LIBRARIES]/tps/[LIB_PREFIX]ldapauth[OBJ_EXT]
auth.instance.1.libraryFactory=GetAuthentication
auth.instance.1.authId=ldap2
auth.instance.1.bindDN=cn=Directory Manager
diff --git a/pki/base/tps/setup/registry_instance b/pki/base/tps/setup/registry_instance
index e02f1901..cb1c4b34 100644
--- a/pki/base/tps/setup/registry_instance
+++ b/pki/base/tps/setup/registry_instance
@@ -99,19 +99,18 @@ export httpd
pki_logs_directory=${PKI_SERVER_ROOT}/logs
export pki_logs_directory
-# see if httpd is linked with the openldap libraries - we need to override them
+# see if httpd is linked with the openldap libraries - we need to override
+# their use of OpenSSL
if [ ${OS} = "Linux" ]; then
hasopenldap=0
/usr/bin/ldd ${httpd} 2>&1 | grep libldap- > /dev/null 2>&1 && hasopenldap=1
if [ ${hasopenldap} -eq 1 ] ; then
- LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so"
LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libssl3.so:${LD_PRELOAD}"
export LD_PRELOAD
fi
elif [ ${OS} = "SunOS" ]; then
- LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so"
LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/dirsec/libssl3.so:${LD_PRELOAD_64}"
export LD_PRELOAD_64
fi
diff --git a/pki/base/tps/src/CMakeLists.txt b/pki/base/tps/src/CMakeLists.txt
index ae1301b0..5f588663 100644
--- a/pki/base/tps/src/CMakeLists.txt
+++ b/pki/base/tps/src/CMakeLists.txt
@@ -1,8 +1,5 @@
project(tps_library CXX)
-set(TPS_LIBRARY_VERSION ${APPLICATION_VERSION})
-set(TPS_LIBRARY_SOVERSION 9)
-
set(TPS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
add_subdirectory(tus)
@@ -21,7 +18,7 @@ set(TPS_PRIVATE_INCLUDE_DIRS
${NSPR_INCLUDE_DIRS}
${APR_INCLUDE_DIRS}
${SVRCORE_INCLUDE_DIRS}
- ${MOZLDAP_INCLUDE_DIRS}
+ ${LDAP_INCLUDE_DIRS}
)
set(TPS_SHARED_LIBRARY
@@ -34,7 +31,7 @@ set(TPS_LINK_LIBRARIES
${NSS_LIBRARIES}
${APR_LIBRARIES}
${SVRCORE_LIBRARIES}
- ${MOZLDAP_LIBRARIES}
+ ${LDAP_LIBRARIES}
${TOKENDB_SHARED_LIBRARY}
)
@@ -143,7 +140,7 @@ set_target_properties(
install(
TARGETS
${TPS_SHARED_LIBRARY}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/tps
)
add_subdirectory(authentication)
diff --git a/pki/base/tps/src/authentication/CMakeLists.txt b/pki/base/tps/src/authentication/CMakeLists.txt
index 25cb4720..ba8ca07d 100644
--- a/pki/base/tps/src/authentication/CMakeLists.txt
+++ b/pki/base/tps/src/authentication/CMakeLists.txt
@@ -1,8 +1,5 @@
project(ldapauth_library CXX)
-set(LDAPAUTH_LIBRARY_VERSION ${APPLICATION_VERSION})
-set(LDAPAUTH_LIBRARY_SOVERSION 9)
-
set(LDAPAUTH_PUBLIC_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -16,7 +13,7 @@ set(LDAPAUTH_PRIVATE_INCLUDE_DIRS
${NSPR_INCLUDE_DIRS}
${NSS_INCLUDE_DIRS}
${SVRCORE_INCLUDE_DIRS}
- ${MOZLDAP_INCLUDE_DIRS}
+ ${LDAP_INCLUDE_DIRS}
)
set(LDAPAUTH_SHARED_LIBRARY
@@ -28,7 +25,7 @@ set(LDAPAUTH_LINK_LIBRARIES
${NSPR_LIBRARIES}
${NSS_LIBRARIES}
${SVRCORE_LIBRARIES}
- ${MOZLDAP_LIBRARIES}
+ ${LDAP_LIBRARIES}
${TOKENDB_SHARED_LIBRARY}
${TPS_SHARED_LIBRARY}
)
@@ -44,10 +41,6 @@ target_link_libraries(${LDAPAUTH_SHARED_LIBRARY} ${LDAPAUTH_LINK_LIBRARIES})
set_target_properties(${LDAPAUTH_SHARED_LIBRARY}
PROPERTIES
- VERSION
- ${LDAPAUTH_LIBRARY_VERSION}
- SOVERSION
- ${LDAPAUTH_LIBRARY_SOVERSION}
OUTPUT_NAME
ldapauth
)
@@ -55,5 +48,5 @@ set_target_properties(${LDAPAUTH_SHARED_LIBRARY}
install(
TARGETS
${LDAPAUTH_SHARED_LIBRARY}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/tps
)
diff --git a/pki/base/tps/src/modules/tokendb/CMakeLists.txt b/pki/base/tps/src/modules/tokendb/CMakeLists.txt
index c152d80e..7b6edae9 100644
--- a/pki/base/tps/src/modules/tokendb/CMakeLists.txt
+++ b/pki/base/tps/src/modules/tokendb/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TOKENDB_PRIVATE_INCLUDE_DIRS
${NSS_INCLUDE_DIRS}
${APR_INCLUDE_DIRS}
${SVRCORE_INCLUDE_DIRS}
- ${MOZLDAP_INCLUDE_DIRS}
+ ${LDAP_INCLUDE_DIRS}
)
set(TOKENDB_MODULE
@@ -21,7 +21,7 @@ set(TOKENDB_LINK_LIBRARIES
${NSS_LIBRARIES}
${APR_LIBRARIES}
${SVRCORE_LIBRARIES}
- ${MOZLDAP_LIBRARIES}
+ ${LDAP_LIBRARIES}
)
set(tokendb_module_SRCS
diff --git a/pki/base/tps/src/modules/tps/CMakeLists.txt b/pki/base/tps/src/modules/tps/CMakeLists.txt
index 069c87f8..275d8b30 100644
--- a/pki/base/tps/src/modules/tps/CMakeLists.txt
+++ b/pki/base/tps/src/modules/tps/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TPS_PRIVATE_INCLUDE_DIRS
${NSS_INCLUDE_DIRS}
${APR_INCLUDE_DIRS}
${SVRCORE_INCLUDE_DIRS}
- ${MOZLDAP_INCLUDE_DIRS}
+ ${LDAP_INCLUDE_DIRS}
)
set(TPS_MODULE
@@ -21,7 +21,7 @@ set(TPS_LINK_LIBRARIES
${NSS_LIBRARIES}
${APR_LIBRARIES}
${SVRCORE_LIBRARIES}
- ${MOZLDAP_LIBRARIES}
+ ${LDAP_LIBRARIES}
${TOKENDB_SHARED_LIBRARY}
${TPS_SHARED_LIBRARY}
)
diff --git a/pki/base/tps/src/tus/CMakeLists.txt b/pki/base/tps/src/tus/CMakeLists.txt
index 7cff9d73..3148d9e5 100644
--- a/pki/base/tps/src/tus/CMakeLists.txt
+++ b/pki/base/tps/src/tus/CMakeLists.txt
@@ -1,8 +1,5 @@
project(tokendb_library C)
-set(TOKENDB_LIBRARY_VERSION ${APPLICATION_VERSION})
-set(TOKENDB_LIBRARY_SOVERSION 9)
-
set(TOKENDB_PUBLIC_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -16,7 +13,7 @@ set(TOKENDB_PRIVATE_INCLUDE_DIRS
${NSPR_INCLUDE_DIRS}
${NSS_INCLUDE_DIRS}
${SVRCORE_INCLUDE_DIRS}
- ${MOZLDAP_INCLUDE_DIRS}
+ ${LDAP_INCLUDE_DIRS}
)
set(TOKENDB_SHARED_LIBRARY
@@ -28,7 +25,7 @@ set(TOKENDB_LINK_LIBRARIES
${NSPR_LIBRARIES}
${NSS_LIBRARIES}
${SVRCORE_LIBRARIES}
- ${MOZLDAP_LIBRARIES}
+ ${LDAP_LIBRARIES}
)
set(tokendb_library_SRCS
@@ -42,10 +39,6 @@ target_link_libraries(${TOKENDB_SHARED_LIBRARY} ${TOKENDB_LINK_LIBRARIES})
set_target_properties(${TOKENDB_SHARED_LIBRARY}
PROPERTIES
- VERSION
- ${TOKENDB_LIBRARY_VERSION}
- SOVERSION
- ${TOKENDB_LIBRARY_SOVERSION}
OUTPUT_NAME
tokendb
)
@@ -53,5 +46,5 @@ set_target_properties(${TOKENDB_SHARED_LIBRARY}
install(
TARGETS
${TOKENDB_SHARED_LIBRARY}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/tps
)
diff --git a/pki/base/tps/tools/raclient/CMakeLists.txt b/pki/base/tps/tools/raclient/CMakeLists.txt
index 9f4020b3..8f01b34d 100644
--- a/pki/base/tps/tools/raclient/CMakeLists.txt
+++ b/pki/base/tps/tools/raclient/CMakeLists.txt
@@ -33,8 +33,8 @@ install(
TARGETS
${TPS_EXECUTABLE}
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/tps
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/tps
)
install(
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index e6f465cd..202328f6 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -160,6 +160,10 @@ cd %{buildroot}%{_datadir}/pki/tps/conf
mv CS.cfg.in CS.cfg
sed -i 's/^preop.product.version=.*$/preop.product.version=%{version}/' %{buildroot}%{_datadir}/pki/tps/conf/CS.cfg
+# fix location of ldapauth shared object in primary configuration file
+sed -i 's/^auth.instance.0.libraryName=.*$/auth.instance.0.libraryName=[SYSTEM_USER_LIBRARIES]\/[LIB_PREFIX]ldapauth[OBJ_EXT]/' %{buildroot}%{_datadir}/pki/tps/conf/CS.cfg
+sed -i 's/^auth.instance.1.libraryName=.*$/auth.instance.1.libraryName=[SYSTEM_USER_LIBRARIES]\/[LIB_PREFIX]ldapauth[OBJ_EXT]/' %{buildroot}%{_datadir}/pki/tps/conf/CS.cfg
+
# rename config.desktop.in --> config.desktop
cd %{buildroot}%{_datadir}/pki/tps/setup
mv config.desktop.in config.desktop
diff --git a/pki/specs/pki-tps.spec b/pki/specs/pki-tps.spec
index ec080b2c..eae999dd 100644
--- a/pki/specs/pki-tps.spec
+++ b/pki/specs/pki-tps.spec
@@ -12,8 +12,8 @@ BuildRequires: cmake
BuildRequires: apr-devel
BuildRequires: apr-util-devel
BuildRequires: cyrus-sasl-devel
-BuildRequires: httpd-devel >= 2.2.3
-BuildRequires: mozldap-devel
+BuildRequires: httpd-devel
+BuildRequires: openldap-devel
BuildRequires: nspr-devel
BuildRequires: nss-devel
BuildRequires: pcre-devel
@@ -21,10 +21,10 @@ BuildRequires: svrcore-devel
BuildRequires: zlib
BuildRequires: zlib-devel
-Requires: mod_nss >= 1.0.8
-Requires: mod_perl >= 1.99_16
-Requires: mod_revocator >= 1.0.3
-Requires: mozldap >= 6.0.2
+Requires: mod_nss
+Requires: mod_perl
+Requires: mod_revocator
+Requires: openldap-clients
Requires: pki-native-tools
Requires: pki-selinux
Requires: pki-setup
@@ -78,17 +78,6 @@ following "Mutually-Exclusive" PKI Theme packages: \
%description %{overview}
-%package devel
-Group: Development/Libraries
-Summary: Dogtag Certificate System - Token Processing System Library Symlinks
-
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains symlinks to the Certificate System (CS)
-Token Processing System (TPS) library files required to link executables.
-
-
==================================
|| ABOUT "CERTIFICATE SYSTEM" ||
==================================
@@ -135,12 +124,23 @@ cd build
cd build
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
+chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/demo/*.cgi
+chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/home/*.cgi
+chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/so/*.cgi
+chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/sow/*.cgi
+chmod 755 %{buildroot}%{_datadir}/pki/tps/cgi-bin/sow/cfg.pl
+
# This should be done in CMAKE
cd %{buildroot}/%{_datadir}/pki/tps/docroot
%{__ln_s} tokendb tus
-
-%pre
+# Internal libraries for 'tps' are present in:
+#
+# * '/usr/lib/tps' (i386)
+# * '/usr/lib64/tps' (x86_64)
+#
+mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/tps > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
%post
@@ -166,9 +166,10 @@ fi
%defattr(-,root,root,-)
%doc base/tps/LICENSE
%{_initrddir}/pki-tpsd
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/tps-%{_arch}.conf
%{_bindir}/tpsclient
%{_libdir}/httpd/modules/*
-%{_libdir}/lib*
+%{_libdir}/tps/
%dir %{_datadir}/pki/tps
%{_datadir}/pki/tps/applets/
%{_datadir}/pki/tps/cgi-bin/
@@ -182,13 +183,6 @@ fi
%dir %{_localstatedir}/run/pki/tps
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libldapauth.so
-%{_libdir}/libtokendb.so
-%{_libdir}/libtps.so
-
-
%changelog
* Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0
@@ -256,6 +250,8 @@ fi
and CA
- Bugzilla Bug #669055 - TPS server does not re-start when signedAudit
logging is turned ON
+- Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from
+ OpenLDAP instead of the Mozldap
* Wed Aug 04 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.2-1
- Bugzilla Bug #601299 - tps installation does not update security domain