[Pkg-voip-commits] r4668 - in /asterisk/trunk/debian: ast_config/modules.conf backports/etch.xorcom changelog control patches/hack-multiple-app-voicemail patches/series rules

paravoid at alioth.debian.org paravoid at alioth.debian.org
Fri Oct 5 07:15:31 UTC 2007 

Author: paravoid
Date: Fri Oct  5 07:15:31 2007
New Revision: 4668

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4668
Log:
* Re-enable IMAP support and enable ODBC support; this time they are
  provided as app_voicemail_imap.so and _odbc.so so that they don't break
  existing setups.

Added:
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail
Modified:
    asterisk/trunk/debian/ast_config/modules.conf
    asterisk/trunk/debian/backports/etch.xorcom
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/ast_config/modules.conf
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/ast_config/modules.conf?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/ast_config/modules.conf (original)
+++ asterisk/trunk/debian/ast_config/modules.conf Fri Oct  5 07:15:31 2007
@@ -53,6 +53,12 @@
 ;
 noload => cdr_sqlite.so
 ;
+; These conflict with app_voicemail.so/app_directory.so and each other
+; These are for IMAP and ODBC storage for Voicemail
+noload => app_directory_odbc.so
+noload => app_voicemail_odbc.so
+noload => app_voicemail_imap.so
+;
 ; Module names listed in "global" section will have symbols globally
 ; exported to modules loaded after them.
 ;

Modified: asterisk/trunk/debian/backports/etch.xorcom
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/backports/etch.xorcom?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/backports/etch.xorcom (original)
+++ asterisk/trunk/debian/backports/etch.xorcom Fri Oct  5 07:15:31 2007
@@ -3,14 +3,11 @@
 # Hook for extra backport changes of the xorcom buildd.
 #
 
-# Disable script for now:
-exit 0
-
 # Remove libc-client2006 and explicit imap support:
 sed -i -e 's#^\(Build-Depends:.*\)libc-client2006[^\ ]* \(.*\)$#\1 \2#' debian/control
 # from --configure:
 sed -i -e '/--with-imap/d' debian/rules
-# from the editing of menuselect.makeopts:
-sed -i -e '/MENUSELECT_OPTS_app_voicemail/d' debian/rules
+# disable patch that enables building of app_voicemail_{imap,odbc}.so
+sed -i -e '/hack-multiple-app-voicemail/d' debian/patches/series
 
 exit 0

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Oct  5 07:15:31 2007
@@ -16,8 +16,11 @@
     present since etch (sarge is not supported as a backport target anymore).
   * Backport a patch from trunk so that Asterisk can set the IP ToS bits when
     it is run as a simple user (as we do).
-
- -- Faidon Liambotis <paravoid at debian.org>  Fri, 05 Oct 2007 06:11:27 +0300
+  * Re-enable IMAP support and enable ODBC support; this time they are
+    provided as app_voicemail_imap.so and _odbc.so so that they don't break
+    existing setups.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Fri, 05 Oct 2007 10:14:46 +0300
 
 asterisk (1:1.4.11~dfsg-4) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Fri Oct  5 07:15:31 2007
@@ -3,7 +3,7 @@
 Section: comm
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 5), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1-1), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-openssl-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp-dev, libcap-dev
+Build-Depends: debhelper (>= 5), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1-1), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-openssl-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp-dev, libcap-dev, libc-client2006j2-dev
 Standards-Version: 3.7.2
 Homepage: http://www.asterisk.org/
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/trunk/

Added: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=4668&op=file
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (added)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Fri Oct  5 07:15:31 2007
@@ -1,0 +1,60 @@
+This is a very ugly hack on upstream's Makefiles to allow building multiple
+variants of app_voicemail. Three variants are created:
+  * app_voicemail.so: plain old filesystem storage that doesn't break existing
+    setups
+  * app_voicemail_imap.so: IMAP storage
+  * app_voicemail_odbc.so: ODBC storage (and app_directory_odbc.so)
+All these conflict with each other and Asterisk will refuse to load them
+concurrently.
+They are marked noload on our default autoload configuration.
+
+A bug should be opened with upstream so that we can discuss the matter.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.12~dfsg.orig/apps/Makefile
++++ asterisk-1.4.12~dfsg/apps/Makefile
+@@ -12,6 +12,16 @@
+ -include ../menuselect.makeopts ../menuselect.makedeps
+ 
+ C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
++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),$(patsubst %.cc,%,$(wildcard app_*.cc)))
+ 
+ LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+@@ -22,6 +32,8 @@ ifneq ($(findstring apps,$(MENUSELECT_EM
+ endif
+ 
+ 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)
+@@ -38,4 +50,17 @@ endif
+ 
+ all: _all
+ 
++app_voicemail_%.c:
++	ln -s app_voicemail.c $@
++
++app_directory_%.c:
++	ln -s app_directory.c $@
++
++clean::
++	rm -f app_voicemail_*.c
++
++app_voicemail_imap.o: ASTCFLAGS+=-DIMAP_STORAGE
++app_voicemail_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
++app_directory_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
++
+ include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Fri Oct  5 07:15:31 2007
@@ -1,5 +1,6 @@
 # upstream fixes
 configure-libc-client
+hack-multiple-app-voicemail
 astvarrundir
 make-clean-fixes
 safe_asterisk-nobg

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=4668&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Fri Oct  5 07:15:31 2007
@@ -75,6 +75,7 @@
 		--infodir=\$${prefix}/share/info \
 		--with-cap \
 		--with-gsm \
+		--with-imap=/usr/include \
 		--with-pwlib=/usr/share/pwlib/include/ \
 		--with-h323=/usr/share/openh323/

More information about the Pkg-voip-commits mailing list