Skip to content

Commit 9d78094

Browse files
committed
Remove: Drop the old feed sync scripts
The old shell based feed sync scripts got replaced by the Python tool in a separate repository.
1 parent 32ee1a6 commit 9d78094

5 files changed

+4
-760
lines changed

CMakeLists.txt

+1-26
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ endif (NOT CMAKE_BUILD_TYPE)
3737

3838
OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
3939
OPTION (DEBUG_FUNCTION_NAMES "Print function names on entry and exit" OFF)
40-
# the shell based scripts got replaced by https://github.com/greenbone/greenbone-feed-sync/
41-
OPTION (INSTALL_OLD_SYNC_SCRIPTS "Install shell based feed sync scripts" OFF)
42-
if (INSTALL_OLD_SYNC_SCRIPTS)
43-
message (DEPRECATION "The version of greenbone-feed-sync included in gvmd is deprecated in favor of the newer Python version (https://github.com/greenbone/greenbone-feed-sync/) and will be removed in the next major version.")
44-
endif (INSTALL_OLD_SYNC_SCRIPTS)
4540

4641
## Retrieve git revision (at configure time)
4742
include (GetGit)
@@ -69,7 +64,7 @@ if (PROJECT_DEV_VERSION)
6964
set (PROJECT_VERSION_SUFFIX "~dev${PROJECT_DEV_VERSION}")
7065
endif (PROJECT_DEV_VERSION)
7166

72-
set (PROJECT_VERSION_STRING
67+
set (PROJECT_VERSION_STRING
7368
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_SUFFIX}${GIT_REVISION}")
7469

7570
## CPack configuration
@@ -276,9 +271,6 @@ configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-cert
276271
configure_file (VERSION.in VERSION)
277272
configure_file (src/gvmd_log_conf.cmake_in src/gvmd_log.conf)
278273
configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY)
279-
configure_file (tools/greenbone-feed-sync.in tools/greenbone-feed-sync @ONLY)
280-
configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY)
281-
configure_file (tools/greenbone-certdata-sync.in tools/greenbone-certdata-sync @ONLY)
282274
configure_file (tools/gvm-manage-certs.in tools/gvm-manage-certs @ONLY)
283275

284276
## Code coverage
@@ -436,23 +428,6 @@ install (FILES tools/cert_bund_getbyname.xsl tools/dfn_cert_getbyname.xsl
436428
DESTINATION ${GVM_CERT_RES_DIR}
437429
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
438430

439-
if (INSTALL_OLD_SYNC_SCRIPTS)
440-
install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-feed-sync
441-
DESTINATION ${SBINDIR}
442-
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
443-
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
444-
445-
install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
446-
DESTINATION ${SBINDIR}
447-
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
448-
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
449-
450-
install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
451-
DESTINATION ${SBINDIR}
452-
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
453-
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
454-
endif (INSTALL_OLD_SYNC_SCRIPTS)
455-
456431
install (FILES ${CMAKE_SOURCE_DIR}/tools/gvm-lsc-deb-creator
457432
${CMAKE_SOURCE_DIR}/tools/gvm-lsc-exe-creator
458433
${CMAKE_SOURCE_DIR}/tools/gvm-lsc-rpm-creator

INSTALL.md

+3-27
Original file line numberDiff line numberDiff line change
@@ -275,33 +275,9 @@ The UUIDs of all created users can be found using
275275
The `gvmd Data`, `SCAP` and `CERT` Feeds should be kept up-to-date by calling the
276276
`greenbone-feed-sync` script regularly (e.g. via a cron entry).
277277
278-
There are currently two synchronization methods available: The older
279-
shell-based one included in the gvmd repository and a newer Python-based one
280-
that also handles the VT synchronization.
281-
282-
### Python-based sync tool
283-
284-
The currently recommended way of synchronizing the gvmd data feeds is the
285-
Python tool "greenbone-feed-sync", which can be found at
286-
https://github.com/greenbone/greenbone-feed-sync together with instruction
287-
for its installation and usage.
288-
289-
When upgrading to the new synchronization tool, the old script should be
290-
removed to avoid conflicts as both are named "greenbone-feed-sync".
291-
292-
### Legacy shell script
293-
294-
The legacy feed sync script is deprecated and will be removed in the next major
295-
release of gvmd.
296-
297-
Therefore, installation of it is now disabled by default but can be enabled for
298-
backward compatibility with the CMake option `-DINSTALL_OLD_SYNC_SCRIPTS=ON`.
299-
300-
The legacy script has to be run for each type of data:
301-
302-
greenbone-feed-sync --type GVMD_DATA
303-
greenbone-feed-sync --type SCAP
304-
greenbone-feed-sync --type CERT
278+
The currently recommended way of synchronizing the feeds is the Python tool
279+
**greenbone-feed-sync**, which can be found at [https://github.com/greenbone/greenbone-feed-sync](https://github.com/greenbone/greenbone-feed-sync)
280+
together with instruction for its installation and usage.
305281
306282
Please note: The `CERT` feed sync depends on data provided by the `SCAP` feed
307283
and should be called after syncing the latter.

tools/greenbone-certdata-sync.in

-24
This file was deleted.

0 commit comments

Comments
 (0)