Drop guile bindings. See <https://gitlab.com/gnutls/guile/>.

Signed-off-by: Simon Josefsson <simon@josefsson.org>

.github/workflows/macos.yml

@@ -26,7 +26,7 @@ jobs:
         run: ./bootstrap
       - name: configure
         run: |
-          CC=clang ./configure --disable-full-test-suite --disable-valgrind-tests --disable-doc --disable-guile --disable-dependency-tracking
+          CC=clang ./configure --disable-full-test-suite --disable-valgrind-tests --disable-doc --disable-dependency-tracking
       - name: make
         run: |
           make -j$(sysctl -n hw.ncpu) || make -j$(sysctl -n hw.ncpu) V=1

.gitignore

@@ -96,7 +96,6 @@ doc/gnutls.epub
 doc/gnutls-extra-api.texi
 doc/gnutls.fn
 doc/gnutls.fns
-doc/gnutls-guile.html
 doc/gnutls.html
 doc/gnutls.info*
 doc/gnutls.ky
@@ -177,13 +176,11 @@ doc/sbuf-api.texi
 doc/scripts/Makefile
 doc/scripts/Makefile.in
 doc/socket-api.texi
-doc/stamp-1
 doc/stamp_enums
 doc/stamp_functions
 doc/stamp_invoke
 doc/stamp-vti
 doc/tpm-api.texi
-doc/version-guile.texi
 doc/version.texi
 doc/x509-api.texi
 extra/includes/Makefile
@@ -202,18 +199,6 @@ GnuTLS-*-coverage/
 gnutls-*.tar.*
 gtk-doc.m4
 gtk-doc.make
-guile/Makefile
-guile/Makefile.in
-guile/modules/gnutls/extra.go
-guile/modules/gnutls.go
-guile/modules/gnutls.scm
-guile/modules/Makefile
-guile/modules/Makefile.in
-guile/src/guile-gnutls-v-2.la
-guile/src/Makefile
-guile/src/Makefile.in
-guile/tests/Makefile
-guile/tests/Makefile.in
 INSTALL
 ldd.sh
 lib/accelerated/aarch64/libaarch64.la

.gitlab-ci.yml

@@ -183,13 +183,8 @@ doc-dist.Fedora:
   needs:
     - fedora/bootstrap
   script:
-    - GUILE=/usr/bin/guile2.2
-    - GUILD=/usr/bin/guild2.2
-    - guile_snarf=/usr/bin/guile-snarf2.2
-    - export GUILE GUILD guile_snarf
     - CFLAGS="-std=c99 -O2 -g" dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --enable-gtk-doc --disable-maintainer-mode --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS -C doc stamp-vti
-    - make -j$BUILDJOBS -C doc stamp-1
     - make -j$BUILDJOBS -C doc stamp_enums
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS -C doc gnutls.html
@@ -212,7 +207,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
     - export LSAN_OPTIONS=suppressions=$(pwd)/devel/lsan.supp
     - export CFLAGS="-std=c99 -O1 -g -Wno-cpp -Werror -fno-omit-frame-pointer -fsanitize=undefined,bool,alignment,null,enum,bounds-strict,address,leak,nonnull-attribute -fno-sanitize-recover=all -fsanitize-address-use-after-scope"
     - export CXXFLAGS="$CFLAGS"
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --with-pkcs12-iter-count=10000
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --with-pkcs12-iter-count=10000
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
     # Use $BUILDJOBS since the fuzzers should use mainly CPU (no blocking I/O)
@@ -223,7 +218,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x8
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x20
     - make -j$CHECKJOBS check -C tests
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --with-pkcs12-iter-count=10000 --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --with-pkcs12-iter-count=10000 --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
     - make clean
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
@@ -247,7 +242,7 @@ UB+ASAN-Werror-aggressive.Fedora.x86_64.gcc:
     - export LSAN_OPTIONS=suppressions=$(pwd)/devel/lsan.supp
     - export CFLAGS="-std=c99 -O1 -g -Wno-cpp -Werror -fno-omit-frame-pointer -fsanitize=undefined,bool,alignment,null,enum,bounds-strict,address,leak,nonnull-attribute -fno-sanitize-recover=all -fsanitize-address-use-after-scope -DAGGRESSIVE_REALLOC"
     - export CXXFLAGS="$CFLAGS"
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --with-pkcs12-iter-count=10000
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --with-pkcs12-iter-count=10000
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
     # Use $BUILDJOBS since the fuzzers should use mainly CPU (no blocking I/O)
@@ -258,7 +253,7 @@ UB+ASAN-Werror-aggressive.Fedora.x86_64.gcc:
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x8
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x20
     - make -j$CHECKJOBS check -C tests
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --with-pkcs12-iter-count=10000 --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --with-pkcs12-iter-count=10000 --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
     - make clean
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
@@ -283,7 +278,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc-aggressive:
     - export LSAN_OPTIONS=suppressions=$(pwd)/devel/lsan.supp
     - export CFLAGS="-std=c99 -O1 -g -Wno-cpp -Werror -fno-omit-frame-pointer -fsanitize=undefined,bool,alignment,null,enum,bounds-strict,address,leak,nonnull-attribute -fno-sanitize-recover=all -fsanitize-address-use-after-scope -DAGGRESSIVE_REALLOC"
     - export CXXFLAGS="$CFLAGS"
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --disable-hardware-acceleration
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --disable-hardware-acceleration
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
     # Use $BUILDJOBS since the fuzzers should use mainly CPU (no blocking I/O)
@@ -294,7 +289,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc-aggressive:
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x8
     - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x20
     - make -j$CHECKJOBS check -C tests
-    - dash ./configure --cache-file $CCACHE_FILE --disable-guile --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
+    - dash ./configure --cache-file $CCACHE_FILE --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
     - make clean
     - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
     - make -j$BUILDJOBS
@@ -322,7 +317,7 @@ fedora-notools/build:
   needs:
     - fedora/bootstrap
   script:
-    - dash ./configure --cache-file $CCACHE_FILE --disable-gcc-warnings --disable-full-test-suite --disable-doc --disable-guile --disable-tools --enable-tests --with-pkcs12-iter-count=10000
+    - dash ./configure --cache-file $CCACHE_FILE --disable-gcc-warnings --disable-full-test-suite --disable-doc --disable-tools --enable-tests --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them
     - make -j$BUILDJOBS check TESTS=""
@@ -353,7 +348,6 @@ fedora-minimal/build:
       --disable-ssl3-support --disable-ssl2-support --disable-doc --enable-openssl-compatibility
       --disable-gcc-warnings --with-system-priority-file=""
       --disable-gost
-      --disable-guile
       --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them
@@ -404,7 +398,7 @@ fedora-SSL-3.0/build:
     - fedora/bootstrap
   script:
     - update-crypto-policies --set LEGACY
-    - dash ./configure --disable-tls13-interop --disable-gcc-warnings --cache-file $CCACHE_FILE --enable-sha1-support --enable-ssl3-support --enable-seccomp-tests --disable-doc --disable-guile --disable-strict-der-time --with-pkcs12-iter-count=10000
+    - dash ./configure --disable-tls13-interop --disable-gcc-warnings --cache-file $CCACHE_FILE --enable-sha1-support --enable-ssl3-support --enable-seccomp-tests --disable-doc --disable-strict-der-time --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them
     - make -j$BUILDJOBS check TESTS=""
@@ -425,7 +419,7 @@ fedora-FIPS140-2/build:
   needs:
     - fedora/bootstrap
   script:
-    - dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-non-suiteb-curves --enable-fips140-mode --disable-doc --disable-full-test-suite --disable-guile --with-pkcs12-iter-count=10000
+    - dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-non-suiteb-curves --enable-fips140-mode --disable-doc --disable-full-test-suite --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them
     - GNUTLS_FORCE_FIPS_MODE=1 make -j$BUILDJOBS check TESTS=""
@@ -448,7 +442,7 @@ fedora-ktls/build:
   needs:
     - fedora/bootstrap
   script:
-    - dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-non-suiteb-curves --enable-ktls --disable-doc --disable-full-test-suite --disable-guile --with-pkcs12-iter-count=10000
+    - dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-non-suiteb-curves --enable-ktls --disable-doc --disable-full-test-suite --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them
     - make -j$BUILDJOBS check TESTS=""
@@ -484,7 +478,7 @@ fedora-ktls/test:
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS install
     - popd
-    - PKG_CONFIG_PATH=${PWD}/nettle-git/$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --disable-guile --with-pkcs12-iter-count=10000
+    - PKG_CONFIG_PATH=${PWD}/nettle-git/$NETTLE_DIR/lib64/pkgconfig dash ./configure --disable-gcc-warnings --disable-doc --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS check TESTS=""
 
@@ -535,7 +529,7 @@ fedora-threadsan/build:
     - fedora/bootstrap
   script:
     - CFLAGS="-fsanitize=thread -g -O2" CXXFLAGS=$CFLAGS
-      dash ./configure --disable-gcc-warnings --disable-doc --cache-file $CCACHE_FILE --disable-non-suiteb-curves --disable-guile --enable-fips140-mode --disable-full-test-suite --with-pkcs12-iter-count=10000
+      dash ./configure --disable-gcc-warnings --disable-doc --cache-file $CCACHE_FILE --disable-non-suiteb-curves --enable-fips140-mode --disable-full-test-suite --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS -C tests check SUBDIRS=. TESTS="" TSAN_OPTIONS="suppressions=$(pwd)/devel/tsan.supp" GNUTLS_SKIP_FIPS_INTEGRITY_CHECKS=1 GNUTLS_FORCE_FIPS_MODE=1
 
@@ -558,7 +552,7 @@ fedora-static-analyzers/build:
     - fedora/bootstrap
   #TODO originally, before_script was set to "/bin/true".. is there a reason not to create the cache?
   script:
-    - scan-build ./configure --cache-file $CCACHE_FILE --disable-doc --disable-guile --enable-fips140-mode --with-pkcs12-iter-count=10000
+    - scan-build ./configure --cache-file $CCACHE_FILE --disable-doc --enable-fips140-mode --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS syntax-check gnulib_dir=$GNULIB_SRCDIR
     - make -j$BUILDJOBS -C gl
     - scan-build --status-bugs -o scan-build-lib make -j$BUILDJOBS -C lib
@@ -592,13 +586,8 @@ fedora-static-analyzers/test:
 #    - .fedora
 #  script:
 #    - SUBMODULE_NOFETCH=1 ./bootstrap
-#    - GUILE=/usr/bin/guile2.2
-#    - GUILD=/usr/bin/guild2.2
-#    - guile_snarf=/usr/bin/guile-snarf2.2
-#    - export GUILE GUILD guile_snarf
 #    - CFLAGS="-std=c99 -O2 -g" dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --enable-gtk-doc --disable-maintainer-mode
 #    - make -j$BUILDJOBS -C doc stamp-vti
-#    - make -j$BUILDJOBS -C doc stamp-1
 #    - make -j$BUILDJOBS -C doc stamp_enums
 #    - make -j$BUILDJOBS
 #    - make -j$BUILDJOBS -C doc gnutls.html
@@ -635,10 +624,6 @@ fedora-abicoverage/build:
   needs:
     - fedora/bootstrap
   script:
-    - GUILE=/usr/bin/guile2.2
-    - GUILD=/usr/bin/guild2.2
-    - guile_snarf=/usr/bin/guile-snarf2.2
-    - export GUILE GUILD guile_snarf
     - CFLAGS="-g -Og" dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE  --prefix=/usr --libdir=/usr/lib64 --enable-code-coverage --disable-maintainer-mode --disable-doc --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS check TESTS=""
@@ -688,7 +673,7 @@ debian/build:
   needs:
     - debian/bootstrap
   script:
-    - dash ./configure --enable-oldgnutls-interop --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-doc --disable-guile --with-pkcs12-iter-count=10000 LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now'
+    - dash ./configure --enable-oldgnutls-interop --disable-gcc-warnings --cache-file $CCACHE_FILE --disable-doc --with-pkcs12-iter-count=10000 LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now'
     - make -j$BUILDJOBS
     - make -j$BUILDJOBS check TESTS=""
 
@@ -716,7 +701,7 @@ debian/test:
     # Debian's softhsm package is not multiarch yet. Missing softhsm libraries
     # for the target will cause the test suite to fail when p11-kit is enabled.
     - dash ./configure --build=$build --host=$host --disable-gcc-warnings
-        --cache-file $CCACHE_FILE --disable-doc --disable-guile
+        --cache-file $CCACHE_FILE --disable-doc
         --without-p11-kit --disable-full-test-suite
         --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
@@ -810,7 +795,7 @@ debian-cross/aarch64-linux-gnu/test:
   script:
 #    - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
 #    - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
-    - dash ./configure --disable-gcc-warnings --host=${arch_name}-w64-mingw32 --target=${arch_name}-w64-mingw32 --cache-file $CCACHE_FILE --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --disable-non-suiteb-curves --disable-full-test-suite --disable-doc --with-pkcs12-iter-count=10000
+    - dash ./configure --disable-gcc-warnings --host=${arch_name}-w64-mingw32 --target=${arch_name}-w64-mingw32 --cache-file $CCACHE_FILE --with-included-libtasn1 --disable-nls --with-included-unistring --disable-non-suiteb-curves --disable-full-test-suite --disable-doc --with-pkcs12-iter-count=10000
     - mingw${arch_bits}-make -j$BUILDJOBS
     # https://bugzilla.redhat.com/show_bug.cgi?id=2049401
     - mingw${arch_bits}-make -j$BUILDJOBS -C $PWD/tests check TESTS=""

.packit.yaml

@@ -15,7 +15,6 @@ actions:
   post-upstream-clone:
     - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls.spec"
     - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls-3.2.7-rpath.patch"
-    - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls-3.6.7-no-now-guile.patch"
   get-current-version:
     - "git describe --abbrev=0"
   create-archive:

CONTRIBUTING.md

@@ -427,29 +427,6 @@ driver is provided as `devel/git-abidiff-gnutls`. See the comment in the
 file for the instruction.
 
 
-# Guile bindings:
-
- Parts of the Guile bindings, such as types (aka. "SMOBs"), enum values,
-constants, are automatically generated.  This is handled by the modules
-under `guile/modules/gnutls/build/'; these modules are only used at
-build-time and are not installed.
-
-The Scheme variables they generate (e.g., constants, type predicates,
-etc.) are exported to user programs through `gnutls.scm' and
-`gnutls/extra.scm', both of which are installed.
-
-For instance, when adding/removing/renaming enumerates or constants,
-two things must be done:
-
- 1. Update the enum list in `build/enums.scm' (currently dependencies
-    are not tracked, so you have to run "make clean all" in `guile/'
-    after).
-
- 2. Update the export list of `gnutls.scm' (or `extra.scm').
-
-Note that, for constants and enums, "schemefied" names are used, as
-noted under the "Guile API Conventions" node of the manual.
-
 # Automated testing
 
  GnuTLS primarily relies on gitlab-ci which is configured in .gitlab-ci.yml

Makefile.am

@@ -23,9 +23,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-doc \
 	--enable-gtk-doc \
 	--disable-valgrind-tests \
-	--with-guile-site-dir='$$(datarootdir)/guile/site/$$(GUILE_EFFECTIVE_VERSION)' \
-	--with-guile-site-ccache-dir='$$(libdir)/guile/$$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-	--with-guile-extension-dir='$$(libdir)/guile/$$(GUILE_EFFECTIVE_VERSION)/extensions' \
 	AUTOGEN=false
 
 SUBDIRS = gl lib extra
@@ -45,10 +42,6 @@ if ENABLE_TESTS
 SUBDIRS += tests fuzz
 endif
 
-if HAVE_GUILE
-SUBDIRS += guile
-endif
-
 if ENABLE_MANPAGES
 SUBDIRS += doc/manpages
 endif
@@ -189,7 +182,6 @@ files-update:
 	@echo "******************************************************************************************"
 
 dist-hook:
-	$(PKG_CONFIG) --atleast-version=2.2.0 guile-2.2
 	if test -d "$(top_srcdir)/devel";then \
 		$(MAKE) -C $(top_srcdir) symbol-check && \
 		$(MAKE) -C $(top_srcdir) abi-check-latest; \

NEWS

@@ -7,6 +7,10 @@ See the end for copying conditions.
 
 * Version 3.8.0 (unreleased ????-??-??)
 
+** guile: Guile-bindings removed.
+They have been extracted into a separate project to reduce complexity
+and to simplify maintenance, see <https://gitlab.com/gnutls/guile/>.
+
 ** libgnutls: GNUTLS_NO_STATUS_REQUEST flag and %NO_STATUS_REQUEST
    priority modifier have been added to allow disabling of the
    status_request TLS extension in the client side.

README.md

@@ -33,7 +33,6 @@ We require several tools to check out and build the software, including:
 * [Git](https://git-scm.com/)
 * [Perl](https://www.cpan.org/)
 * [Nettle](https://www.lysator.liu.se/~nisse/nettle/)
-* [Guile](https://www.gnu.org/software/guile/)
 * [p11-kit](https://p11-glue.github.io/p11-glue/p11-kit.html)
 * [gperf](https://www.gnu.org/software/gperf/)
 * [libtasn1](https://www.gnu.org/software/libtasn1/) (optional)
@@ -60,7 +59,7 @@ Debian/Ubuntu:
 ```
 apt-get install -y dash git-core autoconf libtool gettext autopoint
 apt-get install -y automake python3 nettle-dev libp11-kit-dev libtspi-dev libunistring-dev
-apt-get install -y guile-2.2-dev libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf
+apt-get install -y libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf
 apt-get install -y libtss2-dev libunbound-dev dns-root-data bison gtk-doc-tools
 apt-get install -y texinfo texlive texlive-generic-recommended texlive-extra-utils
 ```
@@ -72,7 +71,7 @@ Fedora/RHEL:
 ```
 yum install -y dash git autoconf libtool gettext-devel automake patch
 yum install -y nettle-devel p11-kit-devel libunistring-devel
-yum install -y tpm2-tss-devel trousers-devel guile22-devel libtasn1-devel libidn2-devel gawk gperf
+yum install -y tpm2-tss-devel trousers-devel libtasn1-devel libidn2-devel gawk gperf
 yum install -y libtasn1-tools unbound-devel bison gtk-doc texinfo texlive
 ```