[PKG-IRC-Maintainers] Bug#529823: tagging, adding patch

[Andreas Metzler]

forwarded 529823 http://www.inspircd.org/bugtrack/view_bug.php?bug_id=864
bts tags 529823 fixed-upstream patch
thanks

Patch attached, unfuzzed upstream change to apply against 1.1.22.

r11400 | danieldg | 2009-06-03 06:05:58 +0200 (Mit, 03. Jun 2009) | 1 line

Use pkg-config to search for gnutls rather than the now-removed
libgnutls-config

cu andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
-------------- next part --------------
#!/bin/sh -e
## 03_use_pkg-config_gnutls.dpatch
##
## DP: Use pkg-config to find gnutls.
## DP: Cherry picked from upstream.

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
diff -urbB inspircd-1.1.22+dfsg.orig/configure inspircd-1.1.22+dfsg/configure
--- inspircd-1.1.22+dfsg.orig/configure	2008-11-30 22:10:12.000000000 +0100
+++ inspircd-1.1.22+dfsg/configure	2009-06-20 09:02:41.000000000 +0200
@@ -135,7 +135,7 @@
 {
 	$config{LIBRARY_DIR} = $opt_library_dir;
 }
-chomp($config{HAS_GNUTLS}   = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
+chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
 chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);		# Openssl version
 chomp($gnutls_ver = $config{HAS_GNUTLS});
 chomp($openssl_ver = $config{HAS_OPENSSL});
diff -urbB inspircd-1.1.22+dfsg.orig/src/modules/extra/m_ssl_gnutls.cpp inspircd-1.1.22+dfsg/src/modules/extra/m_ssl_gnutls.cpp
--- inspircd-1.1.22+dfsg.orig/src/modules/extra/m_ssl_gnutls.cpp	2008-09-26 12:52:27.000000000 +0200
+++ inspircd-1.1.22+dfsg/src/modules/extra/m_ssl_gnutls.cpp	2009-06-20 08:57:55.000000000 +0200
@@ -32,8 +32,8 @@
 #endif
 
 /* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: exec("libgnutls-config --cflags") */
-/* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */
+/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */
+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */
 /* $ModDep: transport.h */