diff -Nru libsrtp2-2.0.0+20170123/debian/changelog libsrtp2-2.0.0+20170123/debian/changelog --- libsrtp2-2.0.0+20170123/debian/changelog 2017-01-24 12:10:31.000000000 +0000 +++ libsrtp2-2.0.0+20170123/debian/changelog 2017-05-21 10:37:00.000000000 +0000 @@ -1,3 +1,32 @@ +libsrtp2 (2.0.0+20170123-5) unstable; urgency=medium + + * Add patch cherry-picked upstream to fix set shared library options + for gnu systems. + + -- Jonas Smedegaard Sun, 21 May 2017 12:37:00 +0200 + +libsrtp2 (2.0.0+20170123-4) unstable; urgency=medium + + * Re-release targeted unstable. + + -- Jonas Smedegaard Sun, 21 May 2017 11:06:41 +0200 + +libsrtp2 (2.0.0+20170123-3) experimental; urgency=medium + + * Fix DEP3 header in previous upstram cherry-picked patch. + * Add patch cherry-picked upstream to fix srtp.c/srtp_priv.h for big + endian machines. + Closes: Bug#857898. Thanks to Adrian Bunk. + + -- Jonas Smedegaard Sun, 21 May 2017 10:41:49 +0200 + +libsrtp2 (2.0.0+20170123-2) experimental; urgency=medium + + * Add patch chrry-picked upstream to fix return types of type int to + int32_t. + + -- Jonas Smedegaard Fri, 27 Jan 2017 15:05:51 +0100 + libsrtp2 (2.0.0+20170123-1) unstable; urgency=medium [ upstream ] diff -Nru libsrtp2-2.0.0+20170123/debian/patches/020170123~1aff438.patch libsrtp2-2.0.0+20170123/debian/patches/020170123~1aff438.patch --- libsrtp2-2.0.0+20170123/debian/patches/020170123~1aff438.patch 1970-01-01 00:00:00.000000000 +0000 +++ libsrtp2-2.0.0+20170123/debian/patches/020170123~1aff438.patch 2017-05-21 10:30:35.000000000 +0000 @@ -0,0 +1,70 @@ +Description: Return types of type int to int32_t + On platforms where int is less than 32 bits this has the potential to + overflow. Using the C99ish types for ints are also more in line with + what is being used elsewhere in the codebase (see integers.h). +Origin: upstream, https://github.com/cisco/libsrtp/commit/1aff438 +Author: Geir Istad +Forwarded: yes +Last-Update: 2017-01-27 + +--- a/crypto/include/integers.h ++++ b/crypto/include/integers.h +@@ -94,6 +94,9 @@ + #ifndef HAVE_UINT32_T + typedef unsigned int uint32_t; + #endif ++#ifndef HAVE_INT32_T ++typedef int int32_t; ++#endif + + + #if defined(NO_64BIT_MATH) && defined(HAVE_CONFIG_H) +--- a/crypto/include/rdbx.h ++++ b/crypto/include/rdbx.h +@@ -113,7 +113,7 @@ + * index to which s corresponds, and returns the difference between + * *guess and the locally stored synch info + */ +-int srtp_rdbx_estimate_index(const srtp_rdbx_t *rdbx, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s); ++int32_t srtp_rdbx_estimate_index(const srtp_rdbx_t *rdbx, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s); + + /* + * srtp_rdbx_check(rdbx, delta); +@@ -183,7 +183,7 @@ + * guess of the packet index to which s corresponds, and returns the + * difference between *guess and *local + */ +-int srtp_index_guess(const srtp_xtd_seq_num_t *local, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s); ++int32_t srtp_index_guess(const srtp_xtd_seq_num_t *local, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s); + + + #ifdef __cplusplus +--- a/crypto/replay/rdbx.c ++++ b/crypto/replay/rdbx.c +@@ -124,7 +124,7 @@ + * unsigned integer! + */ + +-int srtp_index_guess (const srtp_xtd_seq_num_t *local, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s) ++int32_t srtp_index_guess (const srtp_xtd_seq_num_t *local, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s) + { + #ifdef NO_64BIT_MATH + uint32_t local_roc = ((high32(*local) << 16) | +@@ -142,7 +142,7 @@ + uint32_t guess_roc = (uint32_t)(*guess >> 16); + uint16_t guess_seq = (uint16_t)*guess; + #endif +- int difference; ++ int32_t difference; + + if (local_seq < seq_num_median) { + if (s - local_seq > seq_num_median) { +@@ -313,7 +313,7 @@ + * index to which s corresponds, and returns the difference between + * *guess and the locally stored synch info + */ +-int srtp_rdbx_estimate_index (const srtp_rdbx_t *rdbx, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s) ++int32_t srtp_rdbx_estimate_index (const srtp_rdbx_t *rdbx, srtp_xtd_seq_num_t *guess, srtp_sequence_number_t s) + { + + /* diff -Nru libsrtp2-2.0.0+20170123/debian/patches/020170511~4de9585.patch libsrtp2-2.0.0+20170123/debian/patches/020170511~4de9585.patch --- libsrtp2-2.0.0+20170123/debian/patches/020170511~4de9585.patch 1970-01-01 00:00:00.000000000 +0000 +++ libsrtp2-2.0.0+20170123/debian/patches/020170511~4de9585.patch 2017-05-21 10:35:38.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Fix set shared library options for gnu systems + This will fix issues failing to complete builds because the libary + suffix variable is not set. +Origin: upstream, https://github.com/cisco/libsrtp/commit/4de9585 +Author: Geir Istad +Forwarded: yes +Bug: https://github.com/cisco/libsrtp/issues/229 +Last-Update: 2017-05-21 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -76,7 +76,7 @@ + endif + + SHAREDLIBVERSION = 1 +-ifeq (linux,$(findstring linux,@host@)) ++ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@))) + SHAREDLIB_DIR = $(libdir) + SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ + SHAREDLIBSUFFIXNOVER = so diff -Nru libsrtp2-2.0.0+20170123/debian/patches/020170511~c07609c.patch libsrtp2-2.0.0+20170123/debian/patches/020170511~c07609c.patch --- libsrtp2-2.0.0+20170123/debian/patches/020170511~c07609c.patch 1970-01-01 00:00:00.000000000 +0000 +++ libsrtp2-2.0.0+20170123/debian/patches/020170511~c07609c.patch 2017-05-21 10:30:35.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Fix srtp.c/srtp_priv.h for big endian machines + srtp.h was included in srtp.c before config.h was included. As a result + of this the WORDS_BIGENDIAN define was not set, and srtp_hdr_t would be + defined as per little endian implementation in srtp.c +Origin: upstream, https://github.com/cisco/libsrtp/commit/c07609c +Author: Geir Istad +Forwarded: yes +Bug: https://github.com/cisco/libsrtp/issues/229 +Bug-Debian: http://bugs.debian.org/857898 +Last-Update: 2017-05-21 + +--- a/include/srtp_priv.h ++++ b/include/srtp_priv.h +@@ -45,7 +45,9 @@ + #ifndef SRTP_PRIV_H + #define SRTP_PRIV_H + ++// Leave this as the top level import. Ensures the existence of defines + #include "config.h" ++ + #include "srtp.h" + #include "rdbx.h" + #include "rdb.h" +--- a/srtp/srtp.c ++++ b/srtp/srtp.c +@@ -42,7 +42,9 @@ + * + */ + +-#include "srtp.h" ++// Leave this as the top level import. Ensures the existence of defines ++#include "config.h" ++ + #include "srtp_priv.h" + #include "crypto_types.h" + #include "err.h" diff -Nru libsrtp2-2.0.0+20170123/debian/patches/series libsrtp2-2.0.0+20170123/debian/patches/series --- libsrtp2-2.0.0+20170123/debian/patches/series 2017-01-24 12:08:04.000000000 +0000 +++ libsrtp2-2.0.0+20170123/debian/patches/series 2017-05-21 10:35:32.000000000 +0000 @@ -1,3 +1,6 @@ +020170123~1aff438.patch +020170511~4de9585.patch +020170511~c07609c.patch 1004_make_runtest_more_verbose.patch 1005_fix_data_alignment.patch 1007_update_Doxyfile.patch