[Pkg-voip-commits] [asterisk] 03/07: Drop patches applied upstream

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch master
in repository asterisk.

commit 91e05f36cc7ace60fbb83909e2f46cafbd3851b5
Author: Bernhard Schmidt <berni at debian.org>
Date:   Thu Nov 9 23:35:09 2017 +0100

    Drop patches applied upstream
---
 debian/patches/gmime-3.0.patch     | 98 --------------------------------------
 debian/patches/libsrtp-2.1.x.patch | 35 --------------
 debian/patches/series              |  3 --
 3 files changed, 136 deletions(-)

diff --git a/debian/patches/gmime-3.0.patch b/debian/patches/gmime-3.0.patch
deleted file mode 100644
index 8e1fa52..0000000
--- a/debian/patches/gmime-3.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 38dbc708e74c4f1dee2c30b47070255a2116b2ce Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Thu, 3 Aug 2017 14:13:01 -0400
-Subject: [PATCH] Support GMIME 3.0
-
-Support building the Asterisk httpd with version 3.0 of gmime as
-well as earlier versions of that library.
-
-ASTERISK-27173
-
-Change-Id: I7e13dd05a3083ccb0df2dabf83110223f6a9fa8f
----
- configure           |  2 +-
- configure.ac        |  2 +-
- res/res_http_post.c | 19 +++++++++++++++++--
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 7618f1d37e..36a567d7a2 100755
---- a/configure
-+++ b/configure
-@@ -33250,7 +33250,7 @@ fi
-     fi
- fi
- 
--for ver in 2.0 2.2 2.4 2.6; do
-+for ver in 2.0 2.2 2.4 2.6 3.0; do
- 
-    if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
- 
-diff --git a/configure.ac b/configure.ac
-index f40403e31d..cea7c29745 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2492,7 +2492,7 @@ then
-     fi
- fi
- 
--for ver in 2.0 2.2 2.4 2.6; do
-+for ver in 2.0 2.2 2.4 2.6 3.0; do
- 	AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver)
- 	if test "$PBX_GMIME" = 1; then
- 		break;
-diff --git a/res/res_http_post.c b/res/res_http_post.c
-index 2ee792af93..3e1ed03f65 100644
---- a/res/res_http_post.c
-+++ b/res/res_http_post.c
-@@ -57,6 +57,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
- #ifdef GMIME_TYPE_CONTENT_TYPE
- #define AST_GMIME_VER_24
- #endif
-+#if GMIME_MAJOR_VERSION >= 3
-+#define AST_GMIME_VER_30
-+#endif
- 
- /* just a little structure to hold callback info for gmime */
- struct mime_cbinfo {
-@@ -86,7 +89,11 @@ static void post_raw(GMimePart *part, const char *post_dir, const char *fn)
- 
- 	stream = g_mime_stream_fs_new(fd);
- 
-+#ifdef AST_GMIME_VER_30
-+	content = g_mime_part_get_content(part);
-+#else
- 	content = g_mime_part_get_content_object(part);
-+#endif
- 	g_mime_data_wrapper_write_to_stream(content, stream);
- 	g_mime_stream_flush(stream);
- 
-@@ -109,7 +116,11 @@ static GMimeMessage *parse_message(FILE *f)
- 	
- 	g_object_unref(stream);
- 
--	message = g_mime_parser_construct_message(parser);
-+	message = g_mime_parser_construct_message(parser
-+#ifdef AST_GMIME_VER_30
-+			, NULL
-+#endif
-+	);
- 
- 	g_object_unref(parser);
- 
-@@ -488,7 +499,11 @@ static int reload(void)
- 
- static int load_module(void)
- {
--	g_mime_init(0);
-+	g_mime_init(
-+#ifndef AST_GMIME_VER_30
-+			0
-+#endif
-+	);
- 
- 	__ast_http_post_load(0);
- 
--- 
-2.11.0
-
diff --git a/debian/patches/libsrtp-2.1.x.patch b/debian/patches/libsrtp-2.1.x.patch
deleted file mode 100644
index c0097f1..0000000
--- a/debian/patches/libsrtp-2.1.x.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 13aa1241c32f300fdf809fedcfd3f1974f54a022 Mon Sep 17 00:00:00 2001
-From: Alexander Traud <pabstraud at compuserve.com>
-Date: Wed, 6 Sep 2017 10:15:26 +0200
-Subject: [PATCH] res_srtp: Add support for libsrtp2.1.
-
-Asterisk is able to use libSRTP 2.0.x. However since libSRTP 2.1.x, the macro
-SRTP_AES_ICM got renamed to SRTP_AES_ICM_128. Beside to still compile with
-previous versions of libSRTP, this change allows libSRTP 2.1.x as well.
-
-ASTERISK-27253 #close
-
-Change-Id: I2e6eb3c3bc844fee8a624060a2eb6f182dc70315
----
- res/srtp/srtp_compat.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h
-index 4ab39f318f..bf42082445 100644
---- a/res/srtp/srtp_compat.h
-+++ b/res/srtp/srtp_compat.h
-@@ -5,7 +5,11 @@
- 
- #define crypto_policy_t srtp_crypto_policy_t
- 
-+#if defined(SRTP_AES_ICM_128)
-+#define AES_128_ICM SRTP_AES_ICM_128
-+#else
- #define AES_128_ICM SRTP_AES_ICM
-+#endif
- #define HMAC_SHA1 SRTP_HMAC_SHA1
- 
- #define err_status_t srtp_err_status_t
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 5900d09..244b0f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,3 @@ radcli-detection.patch
 
 pjsip_unresolved_symbol.patch
 build-reproducibly
-
-libsrtp-2.1.x.patch
-gmime-3.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git