Remove libdnssec

diff --git a/Doxyfile.in b/Doxyfile.in
index 51f724b3dd52a86674da5cff6b4f1f40da539039..2e42167d07407dbbcb8e2ce027105230525021a3 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -865,7 +865,6 @@ WARN_LOGFILE           = doc/html/doxygen.warn
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = doc/doxygen/Doxy.page.h \
-                         src/libdnssec \
                          src/libknot \
                          src/libzscanner \
                          src/knot/include

diff --git a/Makefile.am b/Makefile.am
index 2250c776532c6e837ab80904ecc56b0be44739b9..8a33b9e22eadec7ba811d592620196edb9cb3de3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ CODE_COVERAGE_HTML = coverage.html
 CODE_COVERAGE_DIRS =           \
        src/contrib             \
        src/knot                \
-       src/libdnssec           \
        src/libknot             \
        src/libzscanner
 

diff --git a/configure.ac b/configure.ac
index 6b7aef8d4689fd7756ae210fd7f103336ef79124..331772011d07add18af7ded4755d92376ce53cdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ AC_CANONICAL_HOST
 # Update library versions
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 KNOT_LIB_VERSION([libknot],    16, 0, 0)
-KNOT_LIB_VERSION([libdnssec],  10, 0, 0)
 KNOT_LIB_VERSION([libzscanner], 5, 0, 0)
 
 AC_SUBST([KNOT_VERSION_MAJOR], knot_VERSION_MAJOR)
@@ -25,7 +24,6 @@ AC_SUBST([KNOT_VERSION_MINOR], knot_VERSION_MINOR)
 AC_SUBST([KNOT_VERSION_PATCH], knot_VERSION_PATCH)
 
 AC_CONFIG_FILES([src/libknot/version.h
-                 src/libdnssec/version.h
                  src/libzscanner/version.h])
 
 # Automatically update release date based on NEWS
@@ -68,7 +66,6 @@ PKG_PROG_PKG_CONFIG
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
 AC_CONFIG_FILES([src/knotd.pc
                  src/libknot.pc
-                 src/libdnssec.pc
                  src/libzscanner.pc
                  ])
 

diff --git a/doc/doxygen/Doxy.page.h b/doc/doxygen/Doxy.page.h
index ec7f41b1d8f9e123605afe2434d749877e495f3e..a9afbb40ef1c24fedca0959630e20ad3b57f8667 100644 (file)
--- a/doc/doxygen/Doxy.page.h
+++ b/doc/doxygen/Doxy.page.h
@@ -10,13 +10,12 @@
 
 \par Modules
 - \subpage libknot-page
-- \subpage libdnssec-page
 - \subpage libzscanner-page
 - \subpage knotd-page
 
 \copyright Licensed under the terms of
- [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.txt)
- version 3 or later.
+ [GNU General Public License](https://spdx.org/licenses/GPL-2.0-or-later.html)
+ version 2 or later.
 
 
 \page libknot-page libknot - General DNS library
@@ -35,6 +34,20 @@
  - \ref xdp       — XDP interface
  - \ref yparser   — Simple YAML parser
 
+ - \ref binary    — Universal binary data container
+ - \ref crypto    — Cryptographic backend
+ - \ref digest    — Data hashing operations
+ - \ref error     — Error codes and error reporting
+ - \ref key       — DNSSEC key manipulation
+ - \ref keyid     — DNSSEC key ID manipulation
+ - \ref keystore  — DNSSEC private key store
+ - \ref keytag    — DNSSEC key tag computation
+ - \ref nsec      — NSEC and NSEC3 operations
+ - \ref pem       — PEM key format operations
+ - \ref random    — Pseudo-random number generation
+ - \ref sign      — DNSSEC signing and verification
+ - \ref tsig      — TSIG signing
+
 \defgroup ctl        ctl
 \defgroup db         db
 \defgroup dname      dname
@@ -48,37 +61,19 @@
 \defgroup xdp        xdp
 \defgroup yparser    yparser
 
-
-\page libdnssec-page libdnssec - DNSSEC library
-
-\section libdnssec-content Sections
- - \ref binary   — Universal binary data container
- - \ref crypto   — Cryptographic backend
- - \ref digest   — Data hashing operations
- - \ref error    — Error codes and error reporting
- - \ref key      — DNSSEC key manipulation
- - \ref keyid    — DNSSEC key ID manipulation
- - \ref keystore — DNSSEC private key store
- - \ref keytag   — DNSSEC key tag computation
- - \ref nsec     — NSEC and NSEC3 operations
- - \ref pem      — PEM key format operations
- - \ref random   — Pseudo-random number generation
- - \ref sign     — DNSSEC signing and verification
- - \ref tsig     — TSIG signing
-
-\defgroup binary   binary
-\defgroup crypto   crypto
-\defgroup digest   digest
-\defgroup error    error
-\defgroup key      key
-\defgroup keyid    keyid
-\defgroup keystore keystore
-\defgroup keytag   keytag
-\defgroup nsec     nsec
-\defgroup pem      pem
-\defgroup random   random
-\defgroup sign     sign
-\defgroup tsig     tsig
+\defgroup binary     binary
+\defgroup crypto     crypto
+\defgroup digest     digest
+\defgroup error      error
+\defgroup key        key
+\defgroup keyid      keyid
+\defgroup keystore   keystore
+\defgroup keytag     keytag
+\defgroup nsec       nsec
+\defgroup pem        pem
+\defgroup random     random
+\defgroup sign       sign
+\defgroup tsig       tsig
 
 
 \page libzscanner-page libzscanner - DNS zone file parser

diff --git a/src/knot/Makefile.inc b/src/knot/Makefile.inc
index e04dc44463aacaa3d7bebc43b64e922711ec949a..d32f7df02c512417c448a67630e63965ebd5758e 100644 (file)
--- a/src/knot/Makefile.inc
+++ b/src/knot/Makefile.inc
@@ -4,7 +4,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(libkqueue_CFLAGS) \
                        -DKNOTD_MOD_STATIC
 libknotd_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^knotd_'
 libknotd_la_LIBADD   = $(dlopen_LIBS) $(libkqueue_LIBS) $(pthread_LIBS)
-libknotd_LIBS        = libknotd.la libknot.la libdnssec.la libzscanner.la \
+libknotd_LIBS        = libknotd.la libknot.la libzscanner.la \
                        $(libcontrib_LIBS) $(liburcu_LIBS) $(lmdb_LIBS) \
                        $(systemd_LIBS) $(libdbus_LIBS) $(gnutls_LIBS) \
                        $(hiredis_LIBS)

diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc
index 1f11282bef5496d1f1108ba7a1fbedc226821886..3c4c790a1c2c07cabc1bbde1bf6b74600a564f69 100644 (file)
--- a/src/utils/Makefile.inc
+++ b/src/utils/Makefile.inc
@@ -11,7 +11,7 @@ libknotus_la_CPPFLAGS = $(embedded_libngtcp2_CFLAGS) \
                         $(lmdb_CFLAGS)
 libknotus_la_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAG_EXCLUDE_LIBS)
 libknotus_la_LIBADD   = $(libidn2_LIBS) $(libidn_LIBS) $(libnghttp2_LIBS) $(libngtcp2_LIBS)
-libknotus_LIBS        = libknotus.la libknot.la libdnssec.la $(libcontrib_LIBS) \
+libknotus_LIBS        = libknotus.la libknot.la $(libcontrib_LIBS) \
                         $(gnutls_LIBS) $(libedit_LIBS)
 
 if EMBEDDED_LIBNGTCP2
@@ -85,7 +85,7 @@ kdig_LDADD             = $(libknotus_LIBS)
 khost_CPPFLAGS         = $(libknotus_la_CPPFLAGS)
 khost_LDADD            = $(libknotus_LIBS)
 knsec3hash_CPPFLAGS    = $(libknotus_la_CPPFLAGS)
-knsec3hash_LDADD       = libknot.la libdnssec.la $(libcontrib_LIBS)
+knsec3hash_LDADD       = libknot.la $(libcontrib_LIBS)
 knsupdate_CPPFLAGS     = $(libknotus_la_CPPFLAGS)
 knsupdate_LDADD        = $(libknotus_LIBS) libzscanner.la
 

diff --git a/tests-fuzz/Makefile.am b/tests-fuzz/Makefile.am
index 20ff9b5f35395cb3f367598b33b16d6976ad10c7..9147c71b83061cb49875fd7dbe9de4273064f38c 100644 (file)
--- a/tests-fuzz/Makefile.am
+++ b/tests-fuzz/Makefile.am
@@ -37,7 +37,6 @@ knotd_stdio_CPPFLAGS =                                \
 knotd_stdio_LDADD = \
        $(top_builddir)/src/libknotd.la         \
        $(top_builddir)/src/libknot.la          \
-       $(top_builddir)/src/libdnssec.la        \
        $(top_builddir)/src/libcontrib.la       \
        $(top_builddir)/src/libzscanner.la      \
        $(cap_ng_LIBS)                          \
@@ -61,7 +60,6 @@ fuzz_packet_SOURCES    = fuzz_packet.c
 fuzz_packet_CPPFLAGS   = $(AM_CPPFLAGS)
 fuzz_packet_LDADD      = \
        $(top_builddir)/src/libknot.la          \
-       $(top_builddir)/src/libdnssec.la        \
        $(top_builddir)/src/libcontrib.la       \
        $(lmdb_LIBS)
 
@@ -74,7 +72,6 @@ fuzz_dname_to_str_SOURCES  = fuzz_dname_to_str.c
 fuzz_dname_to_str_CPPFLAGS = $(AM_CPPFLAGS)
 fuzz_dname_to_str_LDADD    = \
        $(top_builddir)/src/libknot.la          \
-       $(top_builddir)/src/libdnssec.la        \
        $(top_builddir)/src/libcontrib.la       \
        $(lmdb_LIBS)
 
@@ -82,7 +79,6 @@ fuzz_dname_from_str_SOURCES  = fuzz_dname_from_str.c
 fuzz_dname_from_str_CPPFLAGS = $(AM_CPPFLAGS)
 fuzz_dname_from_str_LDADD    = \
        $(top_builddir)/src/libknot.la          \
-       $(top_builddir)/src/libdnssec.la        \
        $(top_builddir)/src/libcontrib.la       \
        $(lmdb_LIBS)