[Pkg-voip-commits] [asterisk] 03/04: Unfuzz patches.

Sat Apr 2 12:24:19 UTC 2016

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

js pushed a commit to branch master
in repository asterisk.

commit e64c0a2ac3ed812d09e92b725ca282dd410dc2ad
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 2 12:59:18 2016 +0200

    Unfuzz patches.
---
 debian/patches/amr.patch              |  9 ++++-----
 debian/patches/ffmpeg-detection.patch |  6 +++---
 debian/patches/hurd_osarch.patch      | 10 +++++-----
 debian/patches/hurd_path_max.patch    | 10 ++++------
 debian/patches/opus.patch             |  6 +++---
 debian/patches/sound_files            |  4 ++--
 debian/patches/systemd.patch          |  4 ++--
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/debian/patches/amr.patch b/debian/patches/amr.patch
index a5fd787..3e304ae 100644
--- a/debian/patches/amr.patch
+++ b/debian/patches/amr.patch
@@ -22,10 +22,8 @@ Description: Add AMR and AMR-WB codec modules supporting transcoding
  [InterSpeech 2011](http://research.nokia.com/files/public/%5B16%5D_InterSpeech2011_Voice_Quality_Characterization_of_IETF_Opus_Codec.pdf).
  Further
  [examples…](http://www.voiceage.com/Audio-Samples-Listening-Room.html)
-
 Origin: https://github.com/traud/asterisk-amr
 Author: Alexander Traud <pabstraud at compuserve.com>
-Last-Update: 2016-03-21
 License: Unlicense
  This is free and unencumbered software released into the public domain.
  .
@@ -51,6 +49,7 @@ License: Unlicense
  OTHER DEALINGS IN THE SOFTWARE.
  .
  For more information, please refer to <http://unlicense.org/>
+Last-Update: 2016-04-02
 
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
@@ -524,7 +523,7 @@ License: Unlicense
 +}
 --- a/configure.ac
 +++ b/configure.ac
-@@ -400,6 +400,9 @@
+@@ -401,6 +401,9 @@
  # to make things easier for the users.
  
  AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
@@ -534,7 +533,7 @@ License: Unlicense
  AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd])
  
  # BKTR is used for backtrace support on platforms that do not
-@@ -1284,6 +1287,10 @@
+@@ -1375,6 +1378,10 @@
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -763,7 +762,7 @@ License: Unlicense
  }
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -119,6 +119,13 @@
+@@ -120,6 +120,13 @@
  ALSA_INCLUDE=@ALSA_INCLUDE@
  ALSA_LIB=@ALSA_LIB@
  
diff --git a/debian/patches/ffmpeg-detection.patch b/debian/patches/ffmpeg-detection.patch
index 169e311..2837f1d 100644
--- a/debian/patches/ffmpeg-detection.patch
+++ b/debian/patches/ffmpeg-detection.patch
@@ -7,11 +7,11 @@ Description: Modernize autotools FFmpeg linking
  "libavcodec" and "libswscale", the family members currently used.
 Author: Jonas Smedegaard <dr at jones.dk>
 Bug-Debian: http://bugs.debian.org/531728
-Last-Update: 2016-03-21
+Last-Update: 2016-04-02
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -419,7 +419,7 @@
+@@ -420,7 +420,7 @@
  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])
@@ -20,7 +20,7 @@ Last-Update: 2016-03-21
  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])
-@@ -2448,7 +2448,18 @@
+@@ -2556,7 +2556,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/hurd_osarch.patch b/debian/patches/hurd_osarch.patch
index 9ada32e..033136d 100644
--- a/debian/patches/hurd_osarch.patch
+++ b/debian/patches/hurd_osarch.patch
@@ -1,8 +1,8 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: Makefile, netsock: support HURD as well
+Description: support HURD as well
+ HURD is also GNU and should be considered as such.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 Bug-Debian: https://bugs.debian.org/784551
-
-HURD is also GNU and should be considered as such.
+Last-Update: 2016-04-02
 
 --- a/main/netsock.c
 +++ b/main/netsock.c
@@ -17,7 +17,7 @@ HURD is also GNU and should be considered as such.
  #endif
 --- a/Makefile
 +++ b/Makefile
-@@ -819,7 +819,7 @@ install-logrotate:
+@@ -825,7 +825,7 @@
  	rm -f contrib/scripts/asterisk.logrotate.tmp
  
  config:
diff --git a/debian/patches/hurd_path_max.patch b/debian/patches/hurd_path_max.patch
index e970070..9a2da23 100644
--- a/debian/patches/hurd_path_max.patch
+++ b/debian/patches/hurd_path_max.patch
@@ -1,13 +1,11 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: set PATH_MAX if not set (HURD)
+Description: set PATH_MAX if not set (HURD)
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 Bug-Debian: https://bugs.debian.org/784551
-
-In the HURD, PATH_MAX is not set. Asterisk has many buffers with the
-size of PATH_MAX. However it 
+Last-Update: 2016-04-02
 
 --- a/include/asterisk.h
 +++ b/include/asterisk.h
-@@ -293,4 +293,8 @@ struct ast_sched_context;
+@@ -313,4 +313,8 @@
  #define __stringify_1(x)	#x
  #define __stringify(x)		__stringify_1(x)
  
diff --git a/debian/patches/opus.patch b/debian/patches/opus.patch
index 2addeaa..fbfdd8e 100644
--- a/debian/patches/opus.patch
+++ b/debian/patches/opus.patch
@@ -3,11 +3,11 @@ Origin: https://github.com/seanbright/asterisk-opus
 Author: Lorenzo Miniero <lorenzo at meetecho.com>
 Forwarded: yes
 Bug-Debian: http://bugs.debian.org/786972
-Last-Update: 2016-03-19
+Last-Update: 2016-04-02
 
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -40,6 +40,7 @@
+@@ -43,6 +43,7 @@
  AST_LIBS+=$(URIPARSER_LIB)
  AST_LIBS+=$(UUID_LIB)
  AST_LIBS+=$(CRYPT_LIB)
@@ -15,7 +15,7 @@ Last-Update: 2016-03-19
  AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
  
  ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
-@@ -160,6 +161,7 @@
+@@ -163,6 +164,7 @@
  bucket.o: _ASTCFLAGS+=$(URIPARSER_INCLUDE)
  crypt.o: _ASTCFLAGS+=$(CRYPT_INCLUDE)
  uuid.o: _ASTCFLAGS+=$(UUID_INCLUDE)
diff --git a/debian/patches/sound_files b/debian/patches/sound_files
index 6514069..966ecef 100644
--- a/debian/patches/sound_files
+++ b/debian/patches/sound_files
@@ -9,7 +9,7 @@ Description: Avoid downloading extra sound files
  versioning).
 Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Forwarded: no
-Last-Update: 2016-03-19
+Last-Update: 2016-04-02
 
 --- a/sounds/sounds.xml
 +++ b/sounds/sounds.xml
@@ -21,7 +21,7 @@ Last-Update: 2016-03-19
  		</member>
  		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
  			<support_level>core</support_level>
-@@ -219,7 +218,6 @@
+@@ -246,7 +245,6 @@
  	</category>
  	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
  		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
diff --git a/debian/patches/systemd.patch b/debian/patches/systemd.patch
index b669b3b..feed585 100644
--- a/debian/patches/systemd.patch
+++ b/debian/patches/systemd.patch
@@ -2,7 +2,7 @@ Description: A systemd service
  Do away with safe_asterisk. But try very hard to let live_ast work with
  it.
 Author: Tzafrir Cohen <tzafrir at debian.org>
-Last-Update: 2016-03-19
+Last-Update: 2016-04-02
 
 --- a/contrib/scripts/live_ast
 +++ b/contrib/scripts/live_ast
@@ -133,7 +133,7 @@ Last-Update: 2016-03-19
 +WantedBy=multi-user.target
 --- a/Makefile
 +++ b/Makefile
-@@ -791,6 +791,8 @@
+@@ -826,6 +826,8 @@
  
  config:
  	@if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \

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

