[Git][pkg-voip-team/asterisk][master] 2 commits: fix silently broken patch systemd; closes: bug#985314, thanks to Sergio Durigan Junior

Jonas Smedegaard (@js) gitlab at salsa.debian.org
Wed Jan 19 17:38:31 GMT 2022 


Jonas Smedegaard pushed to branch master at Debian VoIP Packaging Team / asterisk


Commits:
8928ca10 by Jonas Smedegaard at 2022-01-19T18:36:05+01:00
fix silently broken patch systemd; closes: bug#985314, thanks to Sergio Durigan Junior

- - - - -
c8baa4fb by Jonas Smedegaard at 2022-01-19T18:37:31+01:00
unfuzz patches, with shortening quilt options

- - - - -


8 changed files:

- debian/patches/AST-2021-008-16.diff
- debian/patches/AST-2021-009-16.diff
- debian/patches/amr.patch
- debian/patches/app_mp3_force_16bits.patch
- debian/patches/astdatadir
- debian/patches/build-reproducibly
- debian/patches/ffmpeg-detection.patch
- debian/patches/systemd.patch


Changes:

=====================================
debian/patches/AST-2021-008-16.diff
=====================================
@@ -16,8 +16,6 @@ ASTERISK-29392 #close
 Change-Id: Ifa869a90dafe33eed8fd9463574fe6f1c0ad3eb1
 ---
 
-diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
-index 3d8cd72..b43cf14 100644
 --- a/channels/chan_iax2.c
 +++ b/channels/chan_iax2.c
 @@ -4132,6 +4132,7 @@
@@ -51,7 +49,7 @@ index 3d8cd72..b43cf14 100644
  		case JB_DROP:
  			iax2_frame_free(frame.data);
  			break;
-@@ -6451,8 +6451,14 @@
+@@ -6442,8 +6442,14 @@
  		f->frametype = fh->type;
  		if (f->frametype == AST_FRAME_VIDEO) {
  			f->subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40) | ((fh->csub >> 6) & 0x1));
@@ -66,7 +64,7 @@ index 3d8cd72..b43cf14 100644
  		} else {
  			f->subclass.integer = uncompress_subclass(fh->csub);
  		}
-@@ -9929,8 +9935,8 @@
+@@ -9915,8 +9921,8 @@
  		} else if (iaxs[fr->callno]->voiceformat == 0) {
  			ast_log(LOG_WARNING, "Received trunked frame before first full voice frame\n");
  			iax2_vnak(fr->callno);
@@ -77,7 +75,7 @@ index 3d8cd72..b43cf14 100644
  			f.datalen = len;
  			if (f.datalen >= 0) {
  				if (f.datalen)
-@@ -10173,11 +10179,17 @@
+@@ -10159,11 +10165,17 @@
  		f.frametype = fh->type;
  		if (f.frametype == AST_FRAME_VIDEO) {
  			f.subclass.format = ast_format_compatibility_bitfield2format(uncompress_subclass(fh->csub & ~0x40));
@@ -95,7 +93,7 @@ index 3d8cd72..b43cf14 100644
  		} else {
  			f.subclass.integer = uncompress_subclass(fh->csub);
  		}
-@@ -11795,6 +11807,11 @@
+@@ -11781,6 +11793,11 @@
  				f.subclass.frame_ending = 1;
  			}
  			f.subclass.format = ast_format_compatibility_bitfield2format(iaxs[fr->callno]->videoformat);
@@ -107,7 +105,7 @@ index 3d8cd72..b43cf14 100644
  		} else {
  			ast_log(LOG_WARNING, "Received mini frame before first full video frame\n");
  			iax2_vnak(fr->callno);
-@@ -11816,9 +11833,14 @@
+@@ -11802,9 +11819,14 @@
  	} else {
  		/* A mini frame */
  		f.frametype = AST_FRAME_VOICE;


=====================================
debian/patches/AST-2021-009-16.diff
=====================================
@@ -12,9 +12,6 @@ ASTERISK-29415 #close
 Change-Id: I105dacdcd130ea7fdd4cf2010ccf35b5eaf1432d
 ---
 
-diff --git a/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch b/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch
-new file mode 100644
-index 0000000..81781f2
 --- /dev/null
 +++ b/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch
 @@ -0,0 +1,166 @@
@@ -184,9 +181,6 @@ index 0000000..81781f2
 + 	if (listener->tls_setting.on_accept_fail_cb) {
 + 	    pjsip_tls_on_accept_fail_param param;
 + 	    pj_bzero(&param, sizeof(param));
-diff --git a/third-party/pjproject/patches/0111-ssl-premature-destroy.patch b/third-party/pjproject/patches/0111-ssl-premature-destroy.patch
-new file mode 100644
-index 0000000..9de2915
 --- /dev/null
 +++ b/third-party/pjproject/patches/0111-ssl-premature-destroy.patch
 @@ -0,0 +1,136 @@


=====================================
debian/patches/amr.patch
=====================================
@@ -523,7 +523,7 @@ Last-Update: 2016-08-29
 +}
 --- a/configure.ac
 +++ b/configure.ac
-@@ -465,6 +465,9 @@
+@@ -471,6 +471,9 @@
  # to make things easier for the users.
  
  AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
@@ -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
-@@ -1548,6 +1551,10 @@
+@@ -1555,6 +1558,10 @@
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_pcm_open], [alsa/asoundlib.h])
  
@@ -692,7 +692,7 @@ Last-Update: 2016-08-29
  	} else if (!strcmp(name, "png")) {
 --- a/main/rtp_engine.c
 +++ b/main/rtp_engine.c
-@@ -3623,6 +3623,9 @@
+@@ -3683,6 +3683,9 @@
  	set_next_mime_type(ast_format_vp8, 0,  "video", "VP8", 90000);
  	set_next_mime_type(ast_format_vp9, 0, "video", "VP9", 90000);
  
@@ -702,7 +702,7 @@ Last-Update: 2016-08-29
  	/* Define the static rtp payload mappings */
  	add_static_payload(0, ast_format_ulaw, 0);
  	#ifdef USE_DEPRECATED_G726
-@@ -3684,6 +3687,9 @@
+@@ -3744,6 +3747,9 @@
  	add_static_payload(127, ast_format_slin96, 0);
  	/* payload types above 127 are not valid */
  
@@ -714,7 +714,7 @@ Last-Update: 2016-08-29
  	debug_category_rtcp_id = ast_debug_category_register(AST_LOG_CATEGORY_RTCP);
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -129,6 +129,13 @@
+@@ -130,6 +130,13 @@
  ALSA_INCLUDE=@ALSA_INCLUDE@
  ALSA_LIB=@ALSA_LIB@
  


=====================================
debian/patches/app_mp3_force_16bits.patch
=====================================
@@ -15,11 +15,9 @@ Change-Id: I88c7740118b5af4e895bd8b765b68ed5c11fc816
  apps/app_mp3.c | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/apps/app_mp3.c b/apps/app_mp3.c
-index 8d049da07dc..842224025a1 100644
 --- a/apps/app_mp3.c
 +++ b/apps/app_mp3.c
-@@ -100,37 +100,37 @@ static int mp3play(const char *filename, unsigned int sampling_rate, int fd)
+@@ -100,37 +100,37 @@
  	    char buffer_size_str[8];
  	    snprintf(buffer_size_str, 8, "%u", (int) 0.5*2*sampling_rate/1000); // 0.5 seconds for a live stream
  		/* Most commonly installed in /usr/local/bin */


=====================================
debian/patches/astdatadir
=====================================
@@ -10,7 +10,7 @@ Last-Update: 2016-03-19
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  AC_SUBST([astmoddir],         ['${libdir}/asterisk/modules'])dnl
  AC_SUBST([astmandir],         ['${mandir}'])dnl
  AC_SUBST([astvarlibdir],      ['${localstatedir}/lib/asterisk'])dnl


=====================================
debian/patches/build-reproducibly
=====================================
@@ -17,7 +17,7 @@
   * build.h
 --- a/Makefile
 +++ b/Makefile
-@@ -488,7 +488,7 @@
+@@ -489,7 +489,7 @@
  	@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
  	@for x in $(MOD_SUBDIRS); do \
  		printf "$$x " ; \


=====================================
debian/patches/ffmpeg-detection.patch
=====================================
@@ -11,7 +11,7 @@ Last-Update: 2016-04-02
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -483,7 +483,7 @@
+@@ -489,7 +489,7 @@
  AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_SRTP], [OpenSSL SRTP Extension Support], [CRYPTO], [crypto])
  AST_EXT_LIB_SETUP_OPTIONAL([OPENSSL_BIO_METHOD], [OpenSSL BIO Method Support], [CRYPTO], [crypto])
  AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
@@ -20,7 +20,7 @@ Last-Update: 2016-04-02
  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])
-@@ -2816,7 +2816,18 @@
+@@ -2825,7 +2825,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}])


=====================================
debian/patches/systemd.patch
=====================================
@@ -81,7 +81,7 @@ Last-Update: 2016-04-02
 +fi
 --- /dev/null
 +++ b/contrib/asterisk.service
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,55 @@
 +[Unit]
 +Description=Asterisk PBX
 +Documentation=man:asterisk(8)
@@ -139,7 +139,7 @@ Last-Update: 2016-04-02
 +WantedBy=multi-user.target
 --- a/Makefile
 +++ b/Makefile
-@@ -916,6 +916,8 @@
+@@ -918,6 +918,8 @@
  	rm -f contrib/scripts/asterisk.logrotate.tmp
  
  config:



View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/-/compare/dc6601ca808c1b727d01fa5791adc7740a967b37...c8baa4fbf6ed1b8c3b307c1647ea11674eea1bfd

-- 
View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/-/compare/dc6601ca808c1b727d01fa5791adc7740a967b37...c8baa4fbf6ed1b8c3b307c1647ea11674eea1bfd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-voip-maintainers/attachments/20220119/544f8e07/attachment-0001.htm>

More information about the Pkg-voip-maintainers mailing list