[Pkg-voip-commits] [pjproject] 04/10: Drop security 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 pjproject.

commit 22e2e4685ebb45c5ff26d1e55a0d80ac9183b926
Author: Bernhard Schmidt <berni at debian.org>
Date:   Thu Oct 5 22:59:05 2017 +0200

    Drop security patches applied upstream
---
 ...ero-length-multipart-body-parts-correctly.patch | 35 ----------------------
 ...43-transaction-key-buffer-is-large-enough.patch | 23 --------------
 debian/patches/series                              |  2 --
 3 files changed, 60 deletions(-)

diff --git a/debian/patches/asterisk/0019-Parse-zero-length-multipart-body-parts-correctly.patch b/debian/patches/asterisk/0019-Parse-zero-length-multipart-body-parts-correctly.patch
deleted file mode 100644
index 929444f..0000000
--- a/debian/patches/asterisk/0019-Parse-zero-length-multipart-body-parts-correctly.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Mark Michelson <mmichelson at digium.com>
-Date: Thu, 13 Apr 2017 16:59:40 -0500
-Subject: Parse zero-length multipart body parts correctly.
-
-The calculation of end_body could result in a negative length being
-passed to multipart_body_parse_part().
----
- pjsip/src/pjsip/sip_multipart.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
---- a/pjsip/src/pjsip/sip_multipart.c
-+++ b/pjsip/src/pjsip/sip_multipart.c
-@@ -646,13 +646,15 @@
- 
- 	end_body = curptr;
- 
--	/* The newline preceeding the delimiter is conceptually part of
--	 * the delimiter, so trim it from the body.
--	 */
--	if (*(end_body-1) == '\n')
--	    --end_body;
--	if (*(end_body-1) == '\r')
--	    --end_body;
-+	if (end_body > start_body) {
-+	    /* The newline preceeding the delimiter is conceptually part of
-+	     * the delimiter, so trim it from the body.
-+	     */
-+	    if (*(end_body-1) == '\n')
-+		--end_body;
-+	    if (*(end_body-1) == '\r')
-+		 --end_body;
-+	}
- 
- 	/* Now that we have determined the part's boundary, parse it
- 	 * to get the header and body part of the part.
diff --git a/debian/patches/asterisk/0020-Ensure-2543-transaction-key-buffer-is-large-enough.patch b/debian/patches/asterisk/0020-Ensure-2543-transaction-key-buffer-is-large-enough.patch
deleted file mode 100644
index bef0ca3..0000000
--- a/debian/patches/asterisk/0020-Ensure-2543-transaction-key-buffer-is-large-enough.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Mark Michelson <mmichelson at digium.com>
-Date: Thu, 13 Apr 2017 16:20:07 -0500
-Subject: Ensure 2543 transaction key buffer is large enough.
-
-The CSeq method length needs to be factored into the allocated buffer
-length. Otherwise, the buffer may not be large enough to accommodate the
-entire key.
----
- pjsip/src/pjsip/sip_transaction.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/pjsip/src/pjsip/sip_transaction.c
-+++ b/pjsip/src/pjsip/sip_transaction.c
-@@ -288,7 +288,8 @@
-     host = &rdata->msg_info.via->sent_by.host;
- 
-     /* Calculate length required. */
--    len_required = 9 +			    /* CSeq number */
-+    len_required = method->name.slen +	    /* Method */
-+		   9 +			    /* CSeq number */
- 		   rdata->msg_info.from->tag.slen +   /* From tag. */
- 		   rdata->msg_info.cid->id.slen +    /* Call-ID */
- 		   host->slen +		    /* Via host. */
diff --git a/debian/patches/series b/debian/patches/series
index bfe91e9..4a8585e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@
 0004-Enable-building-python-bindings.patch
 0005-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
 0007-add-v5-suffix-to-soname-of-libpjsua2-2.patch
-asterisk/0019-Parse-zero-length-multipart-body-parts-correctly.patch
-asterisk/0020-Ensure-2543-transaction-key-buffer-is-large-enough.patch

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