From 4e81a60637b2e16019da2ee1564e84849fc05895 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 20 Nov 2014 13:01:13 +0100 Subject: [PATCH] MT#9617 Support compilation on Debian/jessie Fix peer-outdater linking against libglib and use gnutls_certificate_verify_peers2 instead of gnutls_certificate_verify_peers Thanks: Richard Fuchs for the initial patch --- .../fix_MT9617_debian_jessie_support.patch | 61 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 62 insertions(+) create mode 100644 debian/patches/fix_MT9617_debian_jessie_support.patch diff --git a/debian/patches/fix_MT9617_debian_jessie_support.patch b/debian/patches/fix_MT9617_debian_jessie_support.patch new file mode 100644 index 0000000..20da228 --- /dev/null +++ b/debian/patches/fix_MT9617_debian_jessie_support.patch @@ -0,0 +1,61 @@ +--- a/contrib/drbd-outdate-peer/Makefile.am ++++ b/contrib/drbd-outdate-peer/Makefile.am +@@ -39,7 +39,7 @@ + $(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB) + + drbd_peer_outdater_SOURCES = drbd-peer-outdater.c +-drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la ++drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) + + + +--- a/contrib/drbd-outdate-peer/Makefile.in ++++ b/contrib/drbd-outdate-peer/Makefile.in +@@ -383,7 +383,7 @@ + + + drbd_peer_outdater_SOURCES = drbd-peer-outdater.c +-drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la ++drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) + subdir = contrib/drbd-outdate-peer + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +--- a/lib/plugins/quorum/quorumd.c ++++ b/lib/plugins/quorum/quorumd.c +@@ -354,8 +354,9 @@ + const gnutls_datum *cert_list; + int ret; + gnutls_x509_crt cert; ++ unsigned int status; + +- ret = gnutls_certificate_verify_peers (session); ++ ret = gnutls_certificate_verify_peers2 (session, &status); + + if (ret < 0) + { +--- a/membership/quorumd/quorumd.c ++++ b/membership/quorumd/quorumd.c +@@ -479,8 +479,9 @@ + char dn[MAX_DN_LEN]; + size_t dn_len = MAX_DN_LEN; + gnutls_x509_crt cert; ++ unsigned int status; + +- ret = gnutls_certificate_verify_peers(session); ++ ret = gnutls_certificate_verify_peers2(session, &status); + + if (ret < 0) + { +--- a/membership/quorumd/quorumdtest.c ++++ b/membership/quorumd/quorumdtest.c +@@ -163,8 +163,9 @@ + const gnutls_datum *cert_list; + int ret; + gnutls_x509_crt cert; ++ unsigned int status; + +- ret = gnutls_certificate_verify_peers (session); ++ ret = gnutls_certificate_verify_peers2 (session, &status); + + if (ret < 0) + { diff --git a/debian/patches/series b/debian/patches/series index 7a92e55..c752566 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ fix_MT7335.patch fix-ftbfs-lp1188428.patch fix_MT7335_lex.patch fix_MT7335_poderror_ldirectord.patch +fix_MT9617_debian_jessie_support.patch