[Pkg-voip-commits] [asterisk] 04/08: Refresh/unfuzz patches

[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 46ca3f743346cb4d092f152b73459b4111a8c840
Author: Bernhard Schmidt <berni at debian.org>
Date:   Wed Oct 26 12:49:11 2016 +0200

    Refresh/unfuzz patches
---
 debian/patches/amr.patch              | 16 ++++++++--------
 debian/patches/ffmpeg-detection.patch |  6 +++---
 debian/patches/radcli-detection.patch |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/amr.patch b/debian/patches/amr.patch
index bfb9b10..33de8c1 100644
--- a/debian/patches/amr.patch
+++ b/debian/patches/amr.patch
@@ -533,7 +533,7 @@ Last-Update: 2016-08-29
  AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd])
  
  # BKTR is used for backtrace support on platforms that do not
-@@ -1375,6 +1378,10 @@
+@@ -1369,6 +1372,10 @@
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -568,8 +568,8 @@ Last-Update: 2016-08-29
 +#endif /* _AST_FORMAT_AMR_H */
 --- a/include/asterisk/format_cache.h
 +++ b/include/asterisk/format_cache.h
-@@ -224,6 +224,16 @@
- extern struct ast_format *ast_format_none;
+@@ -232,6 +232,16 @@
+ extern struct ast_format *ast_format_silk24;
  
  /*!
 + * \brief Built-in cached AMR format.
@@ -587,8 +587,8 @@ Last-Update: 2016-08-29
   * \retval 0 success
 --- a/main/codec_builtin.c
 +++ b/main/codec_builtin.c
-@@ -780,6 +780,54 @@
- 	.type = AST_MEDIA_TYPE_TEXT,
+@@ -839,6 +839,54 @@
+ 	.samples_count = silk_samples
  };
  
 +static int amr_samples(struct ast_frame *frame)
@@ -642,7 +642,7 @@ Last-Update: 2016-08-29
  #define CODEC_REGISTER_AND_CACHE(codec) \
  	({ \
  		int __res_ ## __LINE__ = 0; \
-@@ -812,6 +860,8 @@
+@@ -871,6 +919,8 @@
  {
  	int res = 0;
  
@@ -670,7 +670,7 @@ Last-Update: 2016-08-29
   * \brief Built-in cached t140 format.
   */
  struct ast_format *ast_format_t140;
-@@ -292,6 +302,8 @@
+@@ -300,6 +310,8 @@
  	ao2_cleanup(formats);
  	formats = NULL;
  
@@ -679,7 +679,7 @@ Last-Update: 2016-08-29
  	ao2_replace(ast_format_g723, NULL);
  	ao2_replace(ast_format_ulaw, NULL);
  	ao2_replace(ast_format_alaw, NULL);
-@@ -404,6 +416,10 @@
+@@ -416,6 +428,10 @@
  		ao2_replace(ast_format_g719, format);
  	} else if (!strcmp(name, "opus")) {
  		ao2_replace(ast_format_opus, format);
diff --git a/debian/patches/ffmpeg-detection.patch b/debian/patches/ffmpeg-detection.patch
index cfd0455..f79117d 100644
--- a/debian/patches/ffmpeg-detection.patch
+++ b/debian/patches/ffmpeg-detection.patch
@@ -11,16 +11,16 @@ Last-Update: 2016-04-02
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -420,7 +420,7 @@
+@@ -419,7 +419,7 @@
+ AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_SRTP], [OpenSSL SRTP Extension Support], [CRYPTO], [crypto])
  AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_EC], [OpenSSL Elliptic Curve Support], [CRYPTO], [crypto])
- AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_ECDH_AUTO], [OpenSSL Auto ECDH Support], [CRYPTO], [crypto])
  AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
 -AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
 +AST_EXT_LIB_SETUP([FFMPEG], [FFmpeg (avcodec and swscale)], [ffmpeg])
  AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
  AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
  AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
-@@ -2561,7 +2561,18 @@
+@@ -2550,7 +2550,18 @@
  
  AST_EXT_TOOL_CHECK([SDL], [sdl-config])
  AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
diff --git a/debian/patches/radcli-detection.patch b/debian/patches/radcli-detection.patch
index 38b7434..a8d38fb 100644
--- a/debian/patches/radcli-detection.patch
+++ b/debian/patches/radcli-detection.patch
@@ -4,7 +4,7 @@ Last-Update: 2016-05-18
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2328,11 +2328,16 @@
+@@ -2322,11 +2322,16 @@
  
  # Accept either RADIUS client library, their APIs are fully compatible,
  # just different header filenames and different SONAMEs

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