diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch b/nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch deleted file mode 100644 index c8955ea57dc0..000000000000 --- a/nixpkgs/pkgs/tools/system/rsyslog/fix-gnutls-detection.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 588b4ca7412326abd51a5b2060eafbc04611e419 Mon Sep 17 00:00:00 2001 -From: Radovan Sroka <rsroka@redhat.com> -Date: Tue, 11 Aug 2015 17:09:15 +0200 -Subject: [PATCH] Fix detection of the GnuTLS package - -This commit fixes a number of issues that cropped up from these changes: -23c5b3e replace deprecated GnuTLS functions with newer ones if available -88f0651 bugfix: ommysql did not work when gnutls was enabled -ce560b6 build system: Failure action in AC_CHECK_LIB check for - -The solution is based on the assumption that the call to AC_CHECK_LIB() -was added purely to satisfy the subsequent calls to AC_CHECK_FUNCS(). -23c5b3e had the unintentional result of libgnutls being added to LIBS -and linked to undesired components. -The next commit removed libgnutls from LIBS which made the following -calls to AC_CHECK_FUNCS() nonfunctional. -Another commit made the processing not stop upon detecting a missing -component which, again, makes the calls to AC_CHECK_FUNCS() malfunction. - -The solution is to get rid of AC_CHECK_LIB() and temporarily override -LIBS for use by AC_CHECK_FUNCS(). ---- - configure.ac | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6f82f0c..ba3f791 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -763,18 +763,13 @@ AC_ARG_ENABLE(gnutls, - if test "x$enable_gnutls" = "xyes"; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0) - AC_DEFINE([ENABLE_GNUTLS], [1], [Indicator that GnuTLS is present]) -- AC_CHECK_LIB( -- [gnutls], -- [gnutls_global_init], -- [ -- AC_DEFINE(HAVE_LIB_GNUTLS, 1, [gnutls is available]) -- ], -- [AC_MSG_WARN([gnutls_global_init function missing or not detected])], -- [] -- ) -+ save_libs=$LIBS -+ LIBS="$LIBS $GNUTLS_LIBS" - AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,) - AC_CHECK_FUNCS(gnutls_certificate_type_set_priority,,) -+ LIBS=$save_libs - fi -+ - AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes) - - # libgcrypt support -@@ -1655,7 +1650,6 @@ else - AC_MSG_NOTICE([Not running from git source]) - fi - -- - AM_CONDITIONAL(ENABLE_GENERATE_MAN_PAGES, test x$have_to_generate_man_pages = xyes) - - # rst2man |