[Pkg-voip-commits] [asterisk] 03/34: Unfuzz patches enable_addons smsq_enable. Refresh and tighten all patches.

Jonas Smedegaard dr at jones.dk
Sun Mar 20 18:39: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 907e4a084929530332feb78edbf951301a5a9004
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 19 18:38:51 2016 +0100

    Unfuzz patches enable_addons smsq_enable. Refresh and tighten all patches.
---
 debian/patches/aelparse_enable.patch             |  2 -
 debian/patches/astdatadir                        |  2 +-
 debian/patches/astgenkey-security                |  2 +-
 debian/patches/configure-osarch                  |  2 +-
 debian/patches/dahdi_event_removed_dchan         | 14 ++-----
 debian/patches/enable_addons                     |  4 +-
 debian/patches/h323-extra-target                 |  2 +-
 debian/patches/h323-no-deps-on-asterisk          |  4 +-
 debian/patches/h323-workaround-openh323-segfault |  2 +-
 debian/patches/hack-multiple-app-voicemail       |  6 +--
 debian/patches/ilbc_disable                      |  2 +-
 debian/patches/make-clean-fixes                  |  4 +-
 debian/patches/menuselect_weakref                |  6 +--
 debian/patches/no_uname                          |  2 +-
 debian/patches/reenable                          |  1 +
 debian/patches/smsq_enable.patch                 |  2 +-
 debian/patches/sound_files                       |  2 +-
 debian/patches/systemd.patch                     | 50 +++++-------------------
 18 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/debian/patches/aelparse_enable.patch b/debian/patches/aelparse_enable.patch
index 9ab4cb7..0bceec4 100644
--- a/debian/patches/aelparse_enable.patch
+++ b/debian/patches/aelparse_enable.patch
@@ -1,7 +1,5 @@
 Enable the aelparse application.
 
-diff --git a/utils/utils.xml b/utils/utils.xml
-index 58d2932..79162f5 100644
 --- a/utils/utils.xml
 +++ b/utils/utils.xml
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/astdatadir b/debian/patches/astdatadir
index 48b8dfd..5e6c9f6 100644
--- a/debian/patches/astdatadir
+++ b/debian/patches/astdatadir
@@ -10,7 +10,7 @@ supports a separate datadir.
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -51,7 +51,7 @@ AC_SUBST([astlibdir],         ['${libdir
+@@ -51,7 +51,7 @@
  AC_SUBST([astmoddir],         ['${libdir}/asterisk/modules'])dnl
  AC_SUBST([astmandir],         ['${mandir}'])dnl
  AC_SUBST([astvarlibdir],      ['${localstatedir}/lib/asterisk'])dnl
diff --git a/debian/patches/astgenkey-security b/debian/patches/astgenkey-security
index eb9e5a5..9d1beb9 100644
--- a/debian/patches/astgenkey-security
+++ b/debian/patches/astgenkey-security
@@ -8,7 +8,7 @@ as a known minor issue.
 
 --- a/contrib/scripts/astgenkey
 +++ b/contrib/scripts/astgenkey
-@@ -47,7 +47,11 @@ done
+@@ -47,7 +47,11 @@
  rm -f ${KEY}.key ${KEY}.pub
  
  echo "Generating SSL key '$KEY': "
diff --git a/debian/patches/configure-osarch b/debian/patches/configure-osarch
index b985c3c..fb980e2 100644
--- a/debian/patches/configure-osarch
+++ b/debian/patches/configure-osarch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -178,7 +178,7 @@ case "${host_os}" in
+@@ -178,7 +178,7 @@
       OSARCH=cygwin
       PBX_WINARCH=1
       ;;
diff --git a/debian/patches/dahdi_event_removed_dchan b/debian/patches/dahdi_event_removed_dchan
index 883f30a..6093592 100644
--- a/debian/patches/dahdi_event_removed_dchan
+++ b/debian/patches/dahdi_event_removed_dchan
@@ -23,15 +23,9 @@ in squeeze, till further testing. Make sure it is disabled before uploading
 the package. This patch should not have any effect on system without such
 Astribanks, though.
 
----
- channels/chan_dahdi.c |   72 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 72 insertions(+), 0 deletions(-)
-
-diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
-index 2a256f2..b2af9dd 100644
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -1430,6 +1430,7 @@ static const struct ast_channel_tech dahdi_tech = {
+@@ -1430,6 +1430,7 @@
  struct dahdi_pvt *round_robin[32];
  
  #if defined(HAVE_PRI)
@@ -39,7 +33,7 @@ index 2a256f2..b2af9dd 100644
  static inline int pri_grab(struct dahdi_pvt *pvt, struct dahdi_pri *pri)
  {
  	int res;
-@@ -12706,6 +12707,8 @@ static void *pri_dchannel(void *vpri)
+@@ -12706,6 +12707,8 @@
  					} else if (x == DAHDI_EVENT_NOALARM) {
  						pri->dchanavail[which] |= DCHAN_NOTINALARM;
  						pri_restart(pri->dchans[which]);
@@ -48,7 +42,7 @@ index 2a256f2..b2af9dd 100644
  					}
  
  					ast_debug(1, "Got event %s (%d) on D-channel for span %d\n", event2str(x), x, pri->span);
-@@ -13934,6 +13937,74 @@ static char *handle_pri_show_spans(struct ast_cli_entry *e, int cmd, struct ast_
+@@ -13934,6 +13937,74 @@
  #endif	/* defined(HAVE_PRI) */
  
  #if defined(HAVE_PRI)
@@ -123,7 +117,7 @@ index 2a256f2..b2af9dd 100644
  static char *handle_pri_show_span(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
  {
  	int span;
-@@ -14053,6 +14124,7 @@ static struct ast_cli_entry dahdi_pri_cli[] = {
+@@ -14053,6 +14124,7 @@
  	AST_CLI_DEFINE(handle_pri_debug, "Enables PRI debugging on a span"),
  	AST_CLI_DEFINE(handle_pri_show_spans, "Displays PRI Information"),
  	AST_CLI_DEFINE(handle_pri_show_span, "Displays PRI Information"),
diff --git a/debian/patches/enable_addons b/debian/patches/enable_addons
index 518bd8c..b08ec7b 100644
--- a/debian/patches/enable_addons
+++ b/debian/patches/enable_addons
@@ -12,7 +12,7 @@ included. See contrib/scripts/get_mp3_source.sh in the source tree.
 
 --- a/addons/app_mysql.c
 +++ b/addons/app_mysql.c
-@@ -25,7 +25,6 @@
+@@ -34,7 +34,6 @@
  
  /*** MODULEINFO
  	<depend>mysqlclient</depend>
@@ -22,7 +22,7 @@ included. See contrib/scripts/get_mp3_source.sh in the source tree.
   ***/
 --- a/addons/chan_mobile.c
 +++ b/addons/chan_mobile.c
-@@ -27,7 +27,6 @@
+@@ -36,7 +36,6 @@
  
  /*** MODULEINFO
  	<depend>bluetooth</depend>
diff --git a/debian/patches/h323-extra-target b/debian/patches/h323-extra-target
index 25f1b67..4f27330 100644
--- a/debian/patches/h323-extra-target
+++ b/debian/patches/h323-extra-target
@@ -9,7 +9,7 @@ the main 'make' command.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -965,6 +965,9 @@ pdf: asterisk.pdf
+@@ -965,6 +965,9 @@
  asterisk.txt:
  	$(MAKE) -C doc/tex asterisk.txt
  
diff --git a/debian/patches/h323-no-deps-on-asterisk b/debian/patches/h323-no-deps-on-asterisk
index c8de46f..75cf09a 100644
--- a/debian/patches/h323-no-deps-on-asterisk
+++ b/debian/patches/h323-no-deps-on-asterisk
@@ -13,7 +13,7 @@ We are working around this, see patch h323-workaround-openh323-segfault.
 
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -153,13 +153,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -153,13 +153,6 @@
  AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
  OBJS:=$(sort $(OBJS))
  
@@ -27,7 +27,7 @@ We are working around this, see patch h323-workaround-openh323-segfault.
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
  MAIN_TGT:=asterisk.dll
  asterisk: cygload
-@@ -177,11 +170,7 @@ endif
+@@ -177,11 +170,7 @@
  $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
diff --git a/debian/patches/h323-workaround-openh323-segfault b/debian/patches/h323-workaround-openh323-segfault
index cb538e4..d0241f2 100644
--- a/debian/patches/h323-workaround-openh323-segfault
+++ b/debian/patches/h323-workaround-openh323-segfault
@@ -16,7 +16,7 @@ Should be removed when #438815 closes.
 
 --- a/main/loader.c
 +++ b/main/loader.c
-@@ -382,6 +382,12 @@ static struct ast_module *load_dynamic_m
+@@ -382,6 +382,12 @@
  	if (missing_so)
  		strcat(resource_being_loaded->resource, ".so");
  
diff --git a/debian/patches/hack-multiple-app-voicemail b/debian/patches/hack-multiple-app-voicemail
index a27f60d..705aeb8 100644
--- a/debian/patches/hack-multiple-app-voicemail
+++ b/debian/patches/hack-multiple-app-voicemail
@@ -18,7 +18,7 @@ upstream RPM packages include packages that are only somewhat cleaner.
 
 --- a/apps/Makefile
 +++ b/apps/Makefile
-@@ -15,6 +15,8 @@ MODULE_PREFIX=app
+@@ -15,6 +15,8 @@
  MENUSELECT_CATEGORY=APPS
  MENUSELECT_DESCRIPTION=Applications
  
@@ -27,7 +27,7 @@ upstream RPM packages include packages that are only somewhat cleaner.
  MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
  ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
    MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
-@@ -25,6 +27,25 @@ endif
+@@ -25,6 +27,25 @@
  
  all: _all
  
@@ -55,7 +55,7 @@ upstream RPM packages include packages that are only somewhat cleaner.
  clean::
 --- a/Makefile.moddir_rules
 +++ b/Makefile.moddir_rules
-@@ -37,7 +37,7 @@ include $(ASTTOPDIR)/Makefile.rules
+@@ -37,7 +37,7 @@
  # Use MODULE_EXCLUDE to specify additional modules to exclude.
  
  ifneq ($(MODULE_PREFIX),)
diff --git a/debian/patches/ilbc_disable b/debian/patches/ilbc_disable
index d0578e1..9137187 100644
--- a/debian/patches/ilbc_disable
+++ b/debian/patches/ilbc_disable
@@ -23,7 +23,7 @@ packaged into Debian, no reason to remove it.
  
 --- a/codecs/Makefile
 +++ b/codecs/Makefile
-@@ -27,7 +27,6 @@ LIBLPC10 := $(SUB_LPC10)/liblpc10.a
+@@ -27,7 +27,6 @@
  
  SUB_DIRS := \
  	$(SUB_GSM) \
diff --git a/debian/patches/make-clean-fixes b/debian/patches/make-clean-fixes
index 8db2211..be85b71 100644
--- a/debian/patches/make-clean-fixes
+++ b/debian/patches/make-clean-fixes
@@ -13,7 +13,7 @@ re-used in the future.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -442,7 +442,6 @@ dist-clean: distclean
+@@ -442,7 +442,6 @@
  
  distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
@@ -21,7 +21,7 @@ re-used in the future.
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
  	rm -f config.log config.status config.cache
-@@ -452,6 +451,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -452,6 +451,10 @@
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
diff --git a/debian/patches/menuselect_weakref b/debian/patches/menuselect_weakref
index bc2274f..b29638f 100644
--- a/debian/patches/menuselect_weakref
+++ b/debian/patches/menuselect_weakref
@@ -6,8 +6,6 @@ Asterisk relies on weakref symbols for optional dependencies. Their
 detection broke with gcc 4.6. This fixes their detection. Requires
 re-running autoconf in menuselect.
 
-diff --git a/acinclude.m4 b/acinclude.m4
-index 9410608..3517918 100644
 --- a/menuselect/acinclude.m4
 +++ b/menuselect/acinclude.m4
 @@ -1,35 +1,20 @@
@@ -49,11 +47,9 @@ index 9410608..3517918 100644
  CFLAGS="$saved_CFLAGS"
  ])
  
-diff --git a/configure.ac b/configure.ac
-index d04aeb7..d4472a5 100644
 --- a/menuselect/configure.ac
 +++ b/menuselect/configure.ac
-@@ -51,9 +51,8 @@ AC_ARG_ENABLE([debug],
+@@ -51,9 +51,8 @@
      esac])
  AC_SUBST(MENUSELECT_DEBUG)
  
diff --git a/debian/patches/no_uname b/debian/patches/no_uname
index 26e6f39..322de36 100644
--- a/debian/patches/no_uname
+++ b/debian/patches/no_uname
@@ -8,7 +8,7 @@ of autoconf is needed on BSD.
 
 --- a/bootstrap.sh
 +++ b/bootstrap.sh
-@@ -21,10 +21,6 @@ case `uname -sr` in
+@@ -21,10 +21,6 @@
  		export AUTOCONF_VERSION=2.63
  		export AUTOMAKE_VERSION=1.9
  		;;
diff --git a/debian/patches/reenable b/debian/patches/reenable
index dfa3ddf..e6d5690 100644
--- a/debian/patches/reenable
+++ b/debian/patches/reenable
@@ -1,5 +1,6 @@
 Description: reenable some drivers
 Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
 --- a/channels/chan_vpb.cc
 +++ b/channels/chan_vpb.cc
 @@ -49,7 +49,6 @@
diff --git a/debian/patches/smsq_enable.patch b/debian/patches/smsq_enable.patch
index 47102da..aa26feb 100644
--- a/debian/patches/smsq_enable.patch
+++ b/debian/patches/smsq_enable.patch
@@ -2,7 +2,7 @@ Enable the smsq application.
 
 --- a/utils/utils.xml
 +++ b/utils/utils.xml
-@@ -41,7 +41,7 @@
+@@ -37,7 +37,7 @@
  	<support_level>extended</support_level>
    </member>
    <member name="smsq">
diff --git a/debian/patches/sound_files b/debian/patches/sound_files
index f473992..db7c636 100644
--- a/debian/patches/sound_files
+++ b/debian/patches/sound_files
@@ -22,7 +22,7 @@ versioning).
  		</member>
  		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
  			<support_level>core</support_level>
-@@ -138,7 +137,6 @@
+@@ -219,7 +218,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 433a4ed..5e51322 100644
--- a/debian/patches/systemd.patch
+++ b/debian/patches/systemd.patch
@@ -3,10 +3,9 @@ Subject: A systemd service
 
 Do away with safe_asterisk. But try very hard to let live_ast work with
 it.
-Index: trunk/contrib/scripts/live_ast
-===================================================================
---- trunk/contrib/scripts/live_ast	(revision 407855)
-+++ trunk/contrib/scripts/live_ast	(working copy)
+
+--- a/contrib/scripts/live_ast
++++ b/contrib/scripts/live_ast
 @@ -175,6 +175,43 @@
    | sed  -e '/^#* \(Begin\|End\) Samples/d' >"$LIVE_CONF"
  }
@@ -59,10 +58,8 @@ Index: trunk/contrib/scripts/live_ast
    ;;
  conf-file)
    # Just regenerate live.conf from the sample if it does not already exist:
-Index: trunk/contrib/scripts/asterisk_cleanup
-===================================================================
---- trunk/contrib/scripts/asterisk_cleanup	(revision 0)
-+++ trunk/contrib/scripts/asterisk_cleanup	(revision 0)
+--- /dev/null
++++ b/contrib/scripts/asterisk_cleanup
 @@ -0,0 +1,18 @@
 +#!/bin/sh
 +
@@ -82,25 +79,8 @@ Index: trunk/contrib/scripts/asterisk_cleanup
 +	mkdir -p "${DUMPDROP}"
 +	mv ${RUNDIR}/core ${DUMPDROP}/core.`hostname`-$DATE &
 +fi
-
-Property changes on: contrib/scripts/asterisk_cleanup
-___________________________________________________________________
-Added: svn:executable
-   + *
-Added: svn:mime-type
-   + text/plain
-Added: svn:keywords
-   + Author Date Id Revision
-Added: svn:eol-style
-   + native
-
-svn: warning: cannot set LC_CTYPE locale
-svn: warning: environment variable LC_ALL is en_US.UTF-8
-svn: warning: please check that your locale name is correct
-Index: trunk/contrib/asterisk.service
-===================================================================
---- trunk/contrib/asterisk.service	(revision 0)
-+++ trunk/contrib/asterisk.service	(revision 0)
+--- /dev/null
++++ b/contrib/asterisk.service
 @@ -0,0 +1,49 @@
 +[Unit]
 +Description=Asterisk PBX
@@ -151,20 +131,8 @@ Index: trunk/contrib/asterisk.service
 +
 +[Install]
 +WantedBy=multi-user.target
-
-Property changes on: contrib/asterisk.service
-___________________________________________________________________
-Added: svn:mime-type
-   + text/plain
-Added: svn:keywords
-   + Author Date Id Revision
-Added: svn:eol-style
-   + native
-
-Index: trunk/Makefile
-===================================================================
---- trunk/Makefile	(revision 407855)
-+++ trunk/Makefile	(working copy)
+--- a/Makefile
++++ b/Makefile
 @@ -791,6 +791,8 @@
  
  config:

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

More information about the Pkg-voip-commits mailing list