Skip to content

Commit

Permalink
Drop DRMTool
Browse files Browse the repository at this point in the history
The DRMTool command, its config file, and its manual page are
actually just links to their counterparts in KRATool. Some of
those links are actually broken, but rpminspect is only
generating warnings instead of failing. Since the tool has
long been deprecated the tool and the links can be dropped.
  • Loading branch information
edewata committed Jun 20, 2023
1 parent 5d04775 commit 030a9c2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 55 deletions.
32 changes: 0 additions & 32 deletions base/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,9 @@ install(
${JAVA_JAR_INSTALL_DIR}/pki
)

# Create compatibility symlink for DRMTool.cfg -> KRATool.cfg

add_custom_target(pki-DRMTool-cfg-link ALL
COMMENT "Creating link for DRMTool.cfg")

add_custom_command(
TARGET pki-DRMTool-cfg-link
COMMAND ln -sf ../../../..${JAVA_JAR_INSTALL_DIR}/pki/tools/KRATool.cfg ${CMAKE_CURRENT_BINARY_DIR}/DRMTool.cfg
)

install(
FILES
src/main/resources/KRATool.cfg
${CMAKE_CURRENT_BINARY_DIR}/DRMTool.cfg
DESTINATION
${SHARE_INSTALL_PREFIX}/pki/tools
)
Expand Down Expand Up @@ -123,34 +112,13 @@ install(
WORLD_READ
)

# Create compatibility symlink for DRMTool.1.gz -> KRATool.1.gz

add_custom_target(pki-DRMTool-man-link ALL
COMMENT "Creating link for DRMTool man page")

add_custom_command(
TARGET pki-DRMTool-man-link
COMMAND ln -sf ../..${MAN_INSTALL_DIR}/man1/KRATool.1.gz ${CMAKE_CURRENT_BINARY_DIR}/DRMTool.1.gz
)

install(
DIRECTORY
examples/
DESTINATION
${DATA_INSTALL_DIR}/tools/examples/
)

install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/DRMTool.1.gz
DESTINATION
${MAN_INSTALL_DIR}/man1
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ
WORLD_READ
)

install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/bin/pki
Expand Down
21 changes: 0 additions & 21 deletions base/tools/templates/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,6 @@ foreach(PKI_COMMAND ${PKI_COMMANDS})
)
endforeach(PKI_COMMAND)

# Create compatibility symlink for DRMTool -> KRATool

add_custom_target(pki-DRMTool-link ALL
COMMENT "Creating link for DRMTool")

add_custom_command(
TARGET pki-DRMTool-link
COMMAND ln -sf ../..${BIN_INSTALL_DIR}/KRATool DRMTool
)

install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/DRMTool
DESTINATION
${BIN_INSTALL_DIR}
PERMISSIONS
OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pretty_print_cert_command_wrapper.in ${CMAKE_CURRENT_BINARY_DIR}/PrettyPrintCert @ONLY)

install(
Expand Down
5 changes: 5 additions & 0 deletions docs/changes/v11.5.0/Tools-Changes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ configuration file.

The `sslget` command has been deprecated.
Use `pki` CLI or the `curl` command instead.

== Drop DRMTool ==

The `DRMTool` command is no longer available.
Use `KRATool` command instead.
2 changes: 0 additions & 2 deletions pki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,6 @@ fi
%{_bindir}/CMCRevoke
%{_bindir}/CMCSharedToken
%{_bindir}/CRMFPopClient
%{_bindir}/DRMTool
%{_bindir}/ExtJoiner
%{_bindir}/GenExtKeyUsage
%{_bindir}/GenIssuerAltNameExt
Expand All @@ -1051,7 +1050,6 @@ fi
%{_mandir}/man1/CMCRequest.1.gz
%{_mandir}/man1/CMCSharedToken.1.gz
%{_mandir}/man1/CMCResponse.1.gz
%{_mandir}/man1/DRMTool.1.gz
%{_mandir}/man1/KRATool.1.gz
%{_mandir}/man1/PrettyPrintCert.1.gz
%{_mandir}/man1/PrettyPrintCrl.1.gz
Expand Down

0 comments on commit 030a9c2

Please sign in to comment.