Next/20220329/v3

.clang-format

@@ -1,5 +1,5 @@
 # Suricata settings as per
-#   doc/devguide/codebase/code-style.rst
+#   doc/userguide/devguide/codebase/code-style.rst
 #
 # This file is set up for clang 9. For the settings available, see
 #   https://releases.llvm.org/9.0.0/tools/clang/docs/ClangFormatStyleOptions.html

.github/workflows/builds.yml

@@ -1115,7 +1115,6 @@ jobs:
                 libjansson-dev \
                 libpython2.7 \
                 make \
-                mscgen \
                 parallel \
                 python3-yaml \
                 rustc \
@@ -1157,7 +1156,6 @@ jobs:
       - run: make dist
       - name: Checking that documentation was built
         run: |
-          test -e doc/devguide/devguide.pdf
           test -e doc/userguide/userguide.pdf
           test -e doc/userguide/suricata.1
       - name: Extracting suricata-verify

.readthedocs.yaml

@@ -7,7 +7,3 @@ python:
   # Use an empty install section to avoid RTD from picking up a non-python
   # requirements.txt file.
   install: []
-
-build:
-  apt_packages:
-    - mscgen

Makefile.am

@@ -6,7 +6,8 @@ EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \
              threshold.config \
              $(SURICATA_UPDATE_DIR) \
 	     lua \
-	     acsite.m4
+	     acsite.m4 \
+	     scripts/generate-images.sh
 SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib etc python ebpf \
           $(SURICATA_UPDATE_DIR)
 

configure.ac

@@ -2168,18 +2168,6 @@ fi
         AC_DEFINE([CLS],[64],[L1 cache line size])
     fi
 
-# mscgen for devguide images
-    AC_PATH_PROG([HAVE_MSCGEN], mscgen, "no")
-    if test "$HAVE_MSCGEN" = "no"; then
-        enable_mscgen=no
-        echo "WARNING! mscgen package not installed."
-        echo "    Devguide images won't be generated!"
-        echo "    Get mscgen package:"
-        echo "    https://www.mcternan.me.uk/mscgen/"
-        echo "    or install it from your distribution"
-    fi
-    AM_CONDITIONAL([HAVE_MSCGEN], [test "x$enable_mscgen" != "xno" ])
-
 # sphinx for documentation
     AC_PATH_PROG(HAVE_SPHINXBUILD, sphinx-build, "no")
     if test "$HAVE_SPHINXBUILD" = "no"; then
@@ -2534,7 +2522,7 @@ AM_CONDITIONAL([BUILD_SHARED_LIBRARY], [test "x$enable_shared" = "xyes"] && [tes
 
 AC_CONFIG_FILES(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/derive/Cargo.toml rust/.cargo/config)
 AC_CONFIG_FILES(qa/Makefile qa/coccinelle/Makefile)
-AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile doc/devguide/Makefile)
+AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile)
 AC_CONFIG_FILES(contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile)
 AC_CONFIG_FILES(suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service)
 AC_CONFIG_FILES(python/Makefile python/suricata/config/defaults.py)

doc/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = userguide devguide
+SUBDIRS = userguide
 
 EXTRA_DIST = \
 AUTHORS \