88e2511e21
This update addresses the following security advisories: GNUTLS-SA-2017-3 (aka CVE-2017-7869) and GNUTLS-SA-2017-4. See <https://gnutls.org/security.html> and <https://gnutls.org/news.html>. * gnu/packages/patches/gnutls-skip-pkgconfig-test.patch, gnu/packages/patches/gnutls-skip-trust-store-test.patch: New files. * gnu/local.mk (dist_patch_DATA): Register patches. * gnu/packages/tls.scm (gnutls)[replacement]: New field. (gnutls-3.5.13): New variable. (gnutls/guile-2.2)[replacement]: New field. Set #f. [source]: Inherit from GNUTLS-3.5.13.
25 lines
1,008 B
Diff
25 lines
1,008 B
Diff
FIXME: The static test fails with an error such as:
|
|
|
|
/tmp/guix-build-gnutls-3.5.13.drv-0/ccOnGPmc.o: In function `main':
|
|
c.29617.tmp.c:(.text+0x5): undefined reference to `gnutls_global_init'
|
|
collect2: error: ld returned 1 exit status
|
|
FAIL pkgconfig.sh (exit status: 1)
|
|
|
|
diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh
|
|
index 6bd4e62f9..05aab8278 100755
|
|
--- a/tests/pkgconfig.sh
|
|
+++ b/tests/pkgconfig.sh
|
|
@@ -57,11 +57,7 @@ echo "Trying dynamic linking with:"
|
|
echo " * flags: $(${PKGCONFIG} --libs gnutls)"
|
|
echo " * common: ${COMMON}"
|
|
echo " * lib: ${CFLAGS}"
|
|
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
|
|
-
|
|
-echo ""
|
|
-echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)"
|
|
-cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
|
|
+gcc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON}
|
|
|
|
rm -f ${TMPFILE} ${TMPFILE_O}
|
|
|