[Pkg-voip-commits] r6379 - in /asterisk/branches/experimental/debian: ./ patches/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun Nov 2 17:04:07 UTC 2008 

Author: tzafrir-guest
Date: Sun Nov  2 17:04:07 2008
New Revision: 6379

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6379
Log:
* Experimental 1.6.x branch.
* Remove bristuff for now.
* Also drop zap-fix-deadlock and zap-fix-cause34 that are in bristuff code.
* And likewise the example agi/xagi-test.c .
* Drop patch silence-buildsum-warning - a legitimate change for 1.6.x .
* Refresh patch debian-banner.
* Slightly rework patch hack-multiple-app-voicemail
* Drop patch h323 fixes as they fails and I don't fully understand them.
* drop patch func_devstate: was backport from 1.6.
* drop patch feature-bridge: was backport from 1.6.
* Drop vpb-handle-nocards that is not needed anymore.
* Dropping misdn_FOP for now as it fails to apply.
* Refreshed patch zap-fix-timing-source
* Patch disable_moh: Disable MOH file through the XML spec.
* Don't do ant makeopts manipulation in the rules, as makeopts gets 
  regenerated when running 'make install', rendering build-*-stamp 
  useless.

Added:
    asterisk/branches/experimental/debian/TODO.Debian
    asterisk/branches/experimental/debian/patches/disable_moh
Removed:
    asterisk/branches/experimental/debian/patches/feature-bridge
    asterisk/branches/experimental/debian/patches/func_devstate
    asterisk/branches/experimental/debian/patches/vpb-handle-nocards
Modified:
    asterisk/branches/experimental/debian/asterisk-config.examples
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/patches/debian-banner
    asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/patches/zap-fix-timing-source
    asterisk/branches/experimental/debian/rules

Added: asterisk/branches/experimental/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/TODO.Debian?rev=6379&op=file
==============================================================================
--- asterisk/branches/experimental/debian/TODO.Debian (added)
+++ asterisk/branches/experimental/debian/TODO.Debian Sun Nov  2 17:04:07 2008
@@ -1,0 +1,2 @@
+* chan_h323/openh323 linking. See comment in patch h323-no-deps-on-asterisk
+* Another round of getting patches upstream.

Modified: asterisk/branches/experimental/debian/asterisk-config.examples
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk-config.examples?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk-config.examples (original)
+++ asterisk/branches/experimental/debian/asterisk-config.examples Sun Nov  2 17:04:07 2008
@@ -2,5 +2,4 @@
 agi/agi-test.agi
 agi/eagi-test.c
 agi/eagi-sphinx-test.c
-agi/xagi-test.c
 agi/fastagi-test

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Sun Nov  2 17:04:07 2008
@@ -1,3 +1,25 @@
+asterisk (1:1.6.0.1~dfsg-1) UNRELEASED; urgency=low
+
+  * Experimental 1.6.x branch.
+  * Remove bristuff for now.
+  * Also drop zap-fix-deadlock and zap-fix-cause34 that are in bristuff code.
+  * And likewise the example agi/xagi-test.c .
+  * Drop patch silence-buildsum-warning - a legitimate change for 1.6.x .
+  * Refresh patch debian-banner.
+  * Slightly rework patch hack-multiple-app-voicemail
+  * Drop patch h323 fixes as they fails and I don't fully understand them.
+  * drop patch func_devstate: was backport from 1.6.
+  * drop patch feature-bridge: was backport from 1.6.
+  * Drop vpb-handle-nocards that is not needed anymore.
+  * Dropping misdn_FOP for now as it fails to apply.
+  * Refreshed patch zap-fix-timing-source
+  * Patch disable_moh: Disable MOH file through the XML spec.
+  * Don't do ant makeopts manipulation in the rules, as makeopts gets 
+    regenerated when running 'make install', rendering build-*-stamp 
+    useless.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 02 Nov 2008 12:40:49 +0200
+
 asterisk (1:1.4.21.2~dfsg-3) UNRELEASED; urgency=low
 
   * Bumped Standards-Version to 3.8.0.

Modified: asterisk/branches/experimental/debian/patches/debian-banner
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/debian-banner?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/debian-banner (original)
+++ asterisk/branches/experimental/debian/patches/debian-banner Sun Nov  2 17:04:07 2008
@@ -3,13 +3,13 @@
 
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -151,6 +151,9 @@ int daemon(int, int);  /* defined in lib
- 	ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
- 	ast_verbose("License version 2 and other licenses; you are welcome to redistribute it under\n"); \
- 	ast_verbose("certain conditions. Type 'core show license' for details.\n"); \
-+	ast_verbose("=========================================================================\n"); \
-+	ast_verbose("This package has been modified for the Debian GNU/Linux distribution\n"); \
-+	ast_verbose("Please report all bugs to http://bugs.debian.org/asterisk\n"); \
- 	ast_verbose("=========================================================================\n")
+@@ -142,6 +142,9 @@ int daemon(int, int);  /* defined in lib
+                 "This is free software, with components licensed under the GNU General Public\n" \
+                 "License version 2 and other licenses; you are welcome to redistribute it under\n" \
+                 "certain conditions. Type 'core show license' for details.\n" \
++                "=========================================================================\n" \
++		"This package has been modified for the Debian GNU/Linux distribution\n" \
++		"Please report all bugs to http://bugs.debian.org/asterisk\n" \
+                 "=========================================================================\n", ast_get_version()) \
  
  /*! \defgroup main_options Main Configuration Options

Added: asterisk/branches/experimental/debian/patches/disable_moh
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/disable_moh?rev=6379&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/disable_moh (added)
+++ asterisk/branches/experimental/debian/patches/disable_moh Sun Nov  2 17:04:07 2008
@@ -1,0 +1,15 @@
+Make the FreePlay on-hold music not enabled by-default. 
+This implies that it is disabled. This is needed as we remove it
+from the tarball of Debian due to license issues.
+
+  Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+--- a/sounds/sounds.xml
++++ b/sounds/sounds.xml
+@@ -45,7 +45,6 @@
+ 	</category>
+ 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+ 		<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
+-			<defaultenabled>yes</defaultenabled>
+ 		</member>
+ 		<member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+ 		</member>

Modified: asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail Sun Nov  2 17:04:07 2008
@@ -14,41 +14,33 @@
 
 --- a/apps/Makefile
 +++ b/apps/Makefile
-@@ -18,6 +18,16 @@ ALL_C_MODS:=$(patsubst %.c,%,$(wildcard 
- ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard app_*.cc))
+@@ -15,6 +15,8 @@ MODULE_PREFIX=app
+ MENUSELECT_CATEGORY=APPS
+ MENUSELECT_DESCRIPTION=Applications
  
- C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS))
-+ifeq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
-+C_MODS+=app_voicemail_imap
-+MENUSELECT_DEPENDS_app_voicemail_imap+=IMAP_TK SSL
-+MENUSELECT_DEPENDS_app_directory_imap+=IMAP_TK SSL
-+endif
-+ifeq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
-+C_MODS+=app_voicemail_odbc app_directory_odbc
-+MENUSELECT_DEPENDS_app_voicemail_odbc+=UNIXODBC LTDL
-+MENUSELECT_DEPENDS_app_directory_odbc+=UNIXODBC LTDL
-+endif
- CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS))
- 
- LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
-@@ -28,6 +38,8 @@ ifneq ($(findstring apps,$(MENUSELECT_EM
- endif
- 
++MODS_C_ADDITIONAL=app_directory_odbc app_voicemail_imap app_voicemail_odbc
++
  MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
-+MENUSELECT_OPTS_app_directory_imap:=$(MENUSELECT_OPTS_app_voicemail)
-+MENUSELECT_OPTS_app_directory_odbc:=$(MENUSELECT_OPTS_app_voicemail)
  ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
- MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
- MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
-@@ -44,4 +56,17 @@ endif
+   MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
+@@ -27,6 +29,28 @@ endif
  
  all: _all
  
-+app_voicemail_%.c:
-+	ln -s app_voicemail.c $@
++add_depends_cmd = sed -i -e '/^\/\*\*\* MODULEINFO/a\\t<depend>$(1)<\/depend>'
++app_voicemail_imap.c: app_voicemail.c
++	cp $< $@
++	$(call add_depends_cmd,imap_tk) $@
++	$(call add_depends_cmd,ssl) $@
++app_voicemail_odbc.c: app_voicemail.c
++	cp $< $@
++	$(call add_depends_cmd,unixodbc) $@
++	$(call add_depends_cmd,ltdl) $@
 +
-+app_directory_%.c:
-+	ln -s app_directory.c $@
++app_directory_odbc.c: app_directory.c
++	cp $< $@
++	$(call add_depends_cmd,unixodbc) $@
++	$(call add_depends_cmd,ltdl) $@
 +
 +clean::
 +	rm -f app_voicemail_*.c
@@ -58,3 +50,16 @@
 +app_directory_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
 +
  include $(ASTTOPDIR)/Makefile.moddir_rules
+ 
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+--- a/Makefile.moddir_rules
++++ b/Makefile.moddir_rules
+@@ -43,7 +43,7 @@ include $(ASTTOPDIR)/Makefile.rules
+ # Use MODULE_EXCLUDE to specify additional modules to exclude.
+ 
+ ifneq ($(MODULE_PREFIX),)
+-    ALL_C_MODS:=
++    ALL_C_MODS:=$(MODS_C_ADDITIONAL)
+     ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
+     ALL_CC_MODS:=
+     ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Sun Nov  2 17:04:07 2008
@@ -2,87 +2,21 @@
 allow-tilde-destdir
 
 debian-banner
-silence-buildsum-warning
 hack-multiple-app-voicemail
 astvarrundir
 make-clean-fixes
 safe_asterisk-config
 safe_asterisk-nobg
-h323-no-deps-on-asterisk
-h323-workaround-openh323-segfault
+# Remed-out for now. Should be fixed later on:
+#h323-no-deps-on-asterisk
+#h323-workaround-openh323-segfault
 
 astgenkey-security
 apptest_sleep
 
 ### new features
 pubkey_jnctn
-func_devstate
-
-# for chan_vpb
-vpb-handle-nocards
-
-# for chan_misdn (even though it's not enabled yet)
-misdn_FOP
-
-### bristuff
-bristuff/bristuff-notice
-
-bristuff/configurable-AST_SYSTEM_NAME
-
-# standalone changes/applications
-# - they don't break the API
-# - they don't need other API changes
-bristuff/xagi
-bristuff/misc-app-segfault
-bristuff/misc-app-pickup
-bristuff/misc-app-devstate
-bristuff/misc-res-watchdog
-bristuff/misc-manager-dbdel
-bristuff/misc-res-esel
-
-# small non-API-breaking bug fixes
-bristuff/chan-iax2-hangup-cause
-bristuff/isdn-fixes
-bristuff/app-meetme-avoid-overflows
-bristuff/answer-before-say
-
-# app_dial adding of options 
-bristuff/app-dial-priority-202
-bristuff/app-dial-etc
-bristuff/app-dial-R-noinband
-bristuff/app-dial-c-callback
-
-bristuff/zapata_num_spans
-
-# use /usr/include/bristuffed/libpri.h - /usr/lib/libpri-bristuffed.so.1.0
-use-libpri-bristuffed
-# euroISDN, BRI support
-bristuff/zapata-bri+euroisdn
-
-bristuff/ast-send-message
-
-# don't split these up!
-bristuff/ast_monitor_start-targetscript
-bristuff/ast-device-state-CID
-bristuff/uniqueid-10-channel-ops-uniqueid
-bristuff/uniqueid-20-monitor
-bristuff/uniqueid-30-app-chanspy
-bristuff/uniqueid-40-manager
-
-# these depend on the uniqueid changes; the following are a set
-bristuff/feature-autoanswer
-bristuff/feature-holdedcalls
-
-#bristuff/zapata_euroisdn_holded
-
-# GSM support; it needs the above patch applied first, unfortunately.
-bristuff/zapata-gsm
-
-# bridging app backported from 1.6
-# it needs the above feature patches applied first.
-feature-bridge
 
 # bugfixes on top of everything
 zap-fix-timing-source
-zap-fix-deadlock
-zap-fix-cause34
+disable_moh

Modified: asterisk/branches/experimental/debian/patches/zap-fix-timing-source
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/zap-fix-timing-source?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/zap-fix-timing-source (original)
+++ asterisk/branches/experimental/debian/patches/zap-fix-timing-source Sun Nov  2 17:04:07 2008
@@ -5,13 +5,14 @@
 
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -2985,8 +2985,8 @@ int main(int argc, char *argv[])
- 					"\n\t2. You only have to load Zaptel drivers if you want to take advantage of Zaptel services.  One option is to unload zaptel modules if you don't need them."
- 					"\n\t3. If you need Zaptel services, you must correctly configure Zaptel."
+@@ -3288,9 +3288,8 @@ int main(int argc, char *argv[])
+ 					"\n\t2. You only have to load DAHDI drivers if you want to take advantage of DAHDI services.  One option is to unload DAHDI modules if you don't need them."
+ 					"\n\t3. If you need DAHDI services, you must correctly configure DAHDI."
  				};
--				ast_log(LOG_ERROR, "%s\n", zaptel_timer_error);
+-				ast_log(LOG_ERROR, "%s\n", dahdi_timer_error);
+-				usleep(100);
 -				exit(1);
-+				ast_log(LOG_WARNING, "%s\n", zaptel_timer_error);
++				ast_log(LOG_WARNING, "%s\n", dahdi_timer_error);
 +				ast_log(LOG_WARNING, "However, on Debian we don't quit that easily. See http://bugs.debian.org/491310\n");
  			}
  			close(fd);

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=6379&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Sun Nov  2 17:04:07 2008
@@ -89,22 +89,10 @@
 		--with-h323=/usr/share/openh323/ 
 
 
-menuselect.makeopts: config.status
-	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) menuselect.makeopts
-	sed -i -e '/^MENUSELECT_MOH=/d' menuselect.makeopts
-
-	# some voodoo in order to get chan_h323 built, and make it in one
-	# build pass:
-	# enable chan_h323 (not enabled by default). Note that modules listed
-	# in MENUSELECT_CHANNEL are ones to disable:
-	sed -i -e '/MENUSELECT_CHANNELS=/s/chan_h323//' menuselect.makeopts
-	cat menuselect.makedeps
-	cat menuselect.makeopts
-
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: menuselect.makeopts
+build-arch-stamp: config.status
 	dh_testdir
 
 	# Add here command to compile/build the package.
@@ -117,7 +105,7 @@
 	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: menuselect.makeopts 
+build-indep-stamp: config.status
 	dh_testdir
 
 	# Add here command to compile/build the arch indep package.

More information about the Pkg-voip-commits mailing list