From 6ff620f811c2e2e86c40d6e9519c4203a728a527 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 24 Sep 2016 14:46:19 +0200 Subject: [PATCH] patches/: Removed patches that are now included upstream. --- debian/changelog | 3 + debian/patches/bts832577-gcry-control.patch | 93 --------------------- debian/patches/gcc6.patch | 13 --- debian/patches/series | 2 - 4 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 debian/patches/bts832577-gcry-control.patch delete mode 100644 debian/patches/gcc6.patch diff --git a/debian/changelog b/debian/changelog index 5278413..bddfd60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ collectd (5.6.0-1) UNRELEASED; urgency=medium - Build-depend on libxen-dev [amd64 arm64 armhf i386]: Needed by the new xencpu plugin. - Build-depend on riemann-c-client: Now needed by the riemann plugin. + * debian/patches: + - Removed bts832577-gcry-control.patch; included upstream. + - Removed gcc6.patch; included upstream. -- Sebastian Harl Sat, 24 Sep 2016 11:59:37 +0200 diff --git a/debian/patches/bts832577-gcry-control.patch b/debian/patches/bts832577-gcry-control.patch deleted file mode 100644 index b4e324a..0000000 --- a/debian/patches/bts832577-gcry-control.patch +++ /dev/null @@ -1,93 +0,0 @@ -Description: network plugin: Don't abort() if gcrypt initialization failed. -Author: Sebastian Harl -Origin: upstream, - commit:a3000cbe3a12163148a28c818269bbdabda1cf5c -Bug-Debian: https://bugs.debian.org/832577 -Last-Update: 2016-07-28 - -diff a/src/network.c b/src/network.c ---- a/src/network.c -+++ b/src/network.c -@@ -498,7 +498,7 @@ - } /* }}} int network_dispatch_notification */ - - #if HAVE_LIBGCRYPT --static void network_init_gcrypt (void) /* {{{ */ -+static int network_init_gcrypt (void) /* {{{ */ - { - gcry_error_t err; - -@@ -506,7 +506,7 @@ - * Because you can't know in a library whether another library has - * already initialized the library */ - if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P)) -- return; -+ return (0); - - /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html - * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS -@@ -520,7 +520,7 @@ - if (err) - { - ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err)); -- abort (); -+ return (-1); - } - # endif - -@@ -530,11 +530,12 @@ - if (err) - { - ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err)); -- abort (); -+ return (-1); - } - - gcry_control (GCRYCTL_INITIALIZATION_FINISHED); --} /* }}} void network_init_gcrypt */ -+ return (0); -+} /* }}} int network_init_gcrypt */ - - static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */ - const void *iv, size_t iv_size, const char *username) -@@ -2077,7 +2078,12 @@ - { - if (se->data.client.security_level > SECURITY_LEVEL_NONE) - { -- network_init_gcrypt (); -+ if (network_init_gcrypt () < 0) -+ { -+ ERROR ("network plugin: Cannot configure client socket with " -+ "security: Failed to initialize crypto library."); -+ return (-1); -+ } - - if ((se->data.client.username == NULL) - || (se->data.client.password == NULL)) -@@ -2097,7 +2103,12 @@ - { - if (se->data.server.security_level > SECURITY_LEVEL_NONE) - { -- network_init_gcrypt (); -+ if (network_init_gcrypt () < 0) -+ { -+ ERROR ("network plugin: Cannot configure server socket with " -+ "security: Failed to initialize crypto library."); -+ return (-1); -+ } - - if (se->data.server.auth_file == NULL) - { -@@ -3548,7 +3559,11 @@ - have_init = 1; - - #if HAVE_LIBGCRYPT -- network_init_gcrypt (); -+ if (network_init_gcrypt () < 0) -+ { -+ ERROR ("network plugin: Failed to initialize crypto library."); -+ return (-1); -+ } - #endif - - if (network_config_stats != 0) diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch deleted file mode 100644 index 4cae581..0000000 --- a/debian/patches/gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Sebastian Harl -Description: Fix GCC 6 issues. ---- a/src/write_kafka.c -+++ b/src/write_kafka.c -@@ -472,7 +472,7 @@ - } - if (conf != NULL) - rd_kafka_conf_destroy(conf); -- return (0); -+ return (0); - errout: - if (conf != NULL) - rd_kafka_conf_destroy(conf); diff --git a/debian/patches/series b/debian/patches/series index 38ab83f..7039a9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ -bts832577-gcry-control.patch configure_find_lc_all.patch rrd_filter_path.patch collection_conf_path.patch myplugin_includes.patch -gcc6.patch -- 2.30.2