Control: tags 905272 patch

On 2018-08-05, Andreas Metzler wrote:
> On 2018-08-02 Renge <mei...@bitcoinshell.mooo.com> wrote:
>> The guile-gnutls package is absent, yet it is still included in the
>> gnutls distribution.
>> Would it be packaged again?
>
> Hello,
>
> no I do not expect so, reasons for removal were never fixed. (Build
> errors, test suite error. Possibly caused by bugs in GNU guile itself.)

The old packages were built with guile-2.0, and guile-2.2 is now in
Debian. With the attached patch re-enabling guile-gnutls built against
guile 2.2, it builds and passes the test suite for me:

make[6]: Entering directory '/<<PKGBUILDDIR>>/b4deb/guile'
PASS: tests/errors.scm
PASS: tests/pkcs-import-export.scm
PASS: tests/anonymous-auth.scm
PASS: tests/session-record-port.scm
PASS: tests/x509-certificates.scm
PASS: tests/priorities.scm
PASS: tests/srp-base64.scm
PASS: tests/x509-auth.scm
============================================================================
Testsuite summary for GnuTLS 3.6.7
============================================================================
# TOTAL: 8
# PASS:  8
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[6]: Leaving directory '/<<PKGBUILDDIR>>/b4deb/guile'


Would you consider re-enabling at least in experimental to test if the
issues have since been fixed?


live well,
  vagrant

From e0e9fe872603ddf8329dbf811c0403860e965d63 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@debian.org>
Date: Thu, 16 May 2019 04:37:42 -0700
Subject: [PATCH] Add back guile-gnutls. - Add guile-2.2-dev to Build-Depends.

---
 debian/control              | 27 ++++++++++++++++++++++++++-
 debian/guile-gnutls.install |  2 ++
 debian/rules                |  9 +++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 debian/guile-gnutls.install

diff --git a/debian/control b/debian/control
index f56e2b8..63ead65 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
  datefudge <!nocheck>,
  debhelper-compat (=11),
  freebsd-net-tools [kfreebsd-i386 kfreebsd-amd64] <!nocheck>,
+ guile-2.2-dev,
  libcmocka-dev <!nocheck>,
  libgmp-dev (>= 2:6),
  libidn2-dev,
@@ -56,7 +57,7 @@ Depends:
  libtasn1-6-dev,
  nettle-dev (>= 3.4.1~rc1),
  ${misc:Depends}
-Suggests: gnutls-bin, gnutls-doc
+Suggests: gnutls-doc, gnutls-bin, guile-gnutls
 Conflicts: gnutls-dev
 Replaces: gnutls-dev
 Multi-Arch: same
@@ -149,6 +150,30 @@ Description: GNU TLS library - documentation and examples
  .
  This package contains all the GnuTLS documentation.
 
+Package: guile-gnutls
+# everything except ia64 - Field must be single line, unfolded!
+Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390 s390x sparc hurd-i386
+Section: lisp
+Depends: ${misc:Depends},${shlibs:Depends}, guile-2.2
+Description: GNU TLS library - GNU Guile bindings
+ GnuTLS is a portable library which implements the Transport Layer
+ Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 and Datagram
+ Transport Layer Security (DTLS 1.0, 1.2) protocols.
+ .
+ GnuTLS features support for:
+  - TLS extensions: server name indication, max record size, opaque PRF
+    input, etc.
+  - authentication using the SRP protocol.
+  - authentication using both X.509 certificates and OpenPGP keys.
+  - TLS Pre-Shared-Keys (PSK) extension.
+  - Inner Application (TLS/IA) extension.
+  - X.509 and OpenPGP certificate handling.
+  - X.509 Proxy Certificates (RFC 3820).
+  - all the strong encryption algorithms (including SHA-256/384/512 and
+    Camellia (RFC 4132)).
+ .
+ This package contains the GNU Guile 2.2 modules.
+
 Package: libgnutlsxx28
 Architecture: any
 Depends:
diff --git a/debian/guile-gnutls.install b/debian/guile-gnutls.install
new file mode 100644
index 0000000..e9cea96
--- /dev/null
+++ b/debian/guile-gnutls.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/guile/*/guile-gnutls*.so*
+debian/tmp/usr/share/guile/site
diff --git a/debian/rules b/debian/rules
index 8c7300c..b6e231b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,15 @@ endif
 AMCONFBUILDINDEP := $(shell if dh_listpackages | grep -q gnutls-doc ; \
 	then echo "--enable-gtk-doc" ; \
 	else echo "--disable-gtk-doc --disable-doc"; fi)
+AMCONFBUILDGUILE := $(shell if dh_listpackages | grep -q guile-gnutls ; \
+	then \
+	echo " --enable-guile --with-guile-site-dir=/usr/share/guile/site" ;\
+	else echo " --disable-guile" ; fi)
 
 CONFIGUREARGS = \
 	--enable-ld-version-script --enable-cxx \
 	--disable-rpath \
-	--enable-libdane --without-tpm --disable-guile \
+	--enable-libdane --without-tpm \
 	--enable-openssl-compatibility \
 	--disable-silent-rules \
 	--with-unbound-root-key-file=/usr/share/dns/root.key \
@@ -31,6 +35,7 @@ CONFIGUREARGS = \
 	--with-packager=Debian \
 	--with-packager-bug-reports=http://bugs.debian.org/ \
 	--with-packager-version=$(DEB_VERSION) \
+	$(AMCONFBUILDGUILE)
 
 BDIR = -O--builddirectory=b4deb
 
@@ -47,7 +52,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs $(BDIR) -p libgnutls-dane0  -V 'libgnutls-dane0 (>= 3.6.5-0)' \
 		-- -c4
 	dh_makeshlibs $(BDIR) -p libgnutls-openssl27 -V 'libgnutls-openssl27 (>= 3.6.5-0)'
-	dh_makeshlibs $(BDIR) --remaining-packages
+	dh_makeshlibs $(BDIR) --remaining-packages -Xguile/2.2/guile-gnutls-v-2.so
 
 
 # pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to