diff --git a/debian/patches/series b/debian/patches/series index 3049fd231..e8e6d2e7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,8 +4,6 @@ # # upsream fixes from master upstream/pv-new-function-pv_evalx-dst-fmt.patch -upstream/tls-proper-check-of-libssl-versions-used-for-compila.patch -upstream/textops-filter_body-remove-previous-r-n-that-belongs.patch # ## no_lib64_on_64_bits.patch diff --git a/debian/patches/upstream/textops-filter_body-remove-previous-r-n-that-belongs.patch b/debian/patches/upstream/textops-filter_body-remove-previous-r-n-that-belongs.patch deleted file mode 100644 index a790ab083..000000000 --- a/debian/patches/upstream/textops-filter_body-remove-previous-r-n-that-belongs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c5dca6096785296c89acbfa4b2f7a7fd8a16d9a2 Mon Sep 17 00:00:00 2001 -From: Victor Seva -Date: Fri, 10 Jun 2016 16:47:02 +0200 -Subject: [PATCH] textops: filter_body() remove previous \r\n that belongs to - the boundary - -we were removing only '--boundary\r\n' but we must remove '\r\n--boundary\r\n' ---- - modules/textops/textops.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/textops/textops.c b/modules/textops/textops.c -index 400b836..99a4da8 100644 ---- a/modules/textops/textops.c -+++ b/modules/textops/textops.c -@@ -973,7 +973,8 @@ static int filter_body_f(struct sip_msg* msg, char* _content_type, - if (find_line_start(boundary.s, boundary.len, &start, - &len)) - { -- if (del_lump(msg, start - msg->buf, len, 0) == 0) -+ /* we need to remove \r\n too */ -+ if (del_lump(msg, (start-2) - msg->buf, len+2, 0) == 0) - { - LM_ERR("deleting lump <%.*s> failed\n", len, start); - goto err; --- -2.8.1 - diff --git a/debian/patches/upstream/tls-proper-check-of-libssl-versions-used-for-compila.patch b/debian/patches/upstream/tls-proper-check-of-libssl-versions-used-for-compila.patch deleted file mode 100644 index 6a3758564..000000000 --- a/debian/patches/upstream/tls-proper-check-of-libssl-versions-used-for-compila.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c38b4c7345a6806f48a0cdb07841e10bc962e1bf Mon Sep 17 00:00:00 2001 -From: Daniel-Constantin Mierla -Date: Tue, 7 Jun 2016 15:21:06 +0200 -Subject: [PATCH] tls: proper check of libssl versions used for compilation and - available on system - -- shift out the last 12bits, being the patch version and status (see man - SSLeay) -- reported by Victor Seva, GH #662 ---- - modules/tls/tls_init.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c -index d7f3cef..e0bbb0b 100644 ---- a/modules/tls/tls_init.c -+++ b/modules/tls/tls_init.c -@@ -545,8 +545,10 @@ int init_tls_h(void) - #endif - ssl_version=SSLeay(); - /* check if version have the same major minor and fix level -- * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) */ -- if ((ssl_version>>8)!=(OPENSSL_VERSION_NUMBER>>8)){ -+ * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) -+ * - values is represented as 0xMMNNFFPPS: major minor fix patch status -+ * 0x00090705f == 0.9.7e release */ -+ if ((ssl_version>>12)!=(OPENSSL_VERSION_NUMBER>>12)){ - LOG(L_CRIT, "ERROR: tls: init_tls_h: installed openssl library " - "version is too different from the library the Kamailio tls module " - "was compiled with: installed \"%s\" (0x%08lx), compiled " --- -2.8.1 -