[Pkg-voip-commits] r6899 - in /asterisk/trunk/debian: TODO.Debian changelog patches/dahdi-fxsks-hookstate patches/h323-make-fix patches/series rules
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Sun Mar 22 01:22:05 UTC 2009
Author: tzafrir-guest
Date: Sun Mar 22 01:22:05 2009
New Revision: 6899
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6899
Log:
* Patch dahdi-fxsks-hookstate: Fix FXO dialout issue.
* Patch h323-make-fix: No, we should not need to run 'make' twice.
Added:
asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
asterisk/trunk/debian/patches/h323-make-fix
Modified:
asterisk/trunk/debian/TODO.Debian
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/rules
Modified: asterisk/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/TODO.Debian?rev=6899&op=diff
==============================================================================
--- asterisk/trunk/debian/TODO.Debian (original)
+++ asterisk/trunk/debian/TODO.Debian Sun Mar 22 01:22:05 2009
@@ -1,11 +1,10 @@
* chan_h323/openh323 linking. See comment in patch h323-no-deps-on-asterisk
-* Another round of getting patches upstream.
* The asterisk canary dies on startup. An issue of permissions?
-* Fix the libpri dependencies.
* Package libresample? Used in codec_resample and app_jack.
The library itself is part of the code of audacity. The code from
Digium inlcudes a small patch to build it PIC, which is required for
using it with Asterisk modules.
-* Depend on osptk? Do we add another thing that depends on openssl?
* Some man pages to write.
* Remove the TeX sources from the package asterisk-doc .
+* Package sound files properly. Maybe in a separate package altogether?
+ See also patch make-clean-fixes.
Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=6899&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Mar 22 01:22:05 2009
@@ -30,6 +30,9 @@
* Patch zap-fix-timing-source removed: Problem fixed.
* Build-Depends on libopenais-dev (for res_ais.so)
* Build-Depends on libosptk3-dev (for app_osplookup.so)
+ * Patch dahdi-fxsks-hookstate: Fix FXO dialout issue.
+ * Patch h323-make-fix: No, we should not need to run 'make' twice.
+
[ Mark Purcell ]
* Update debian/watch
@@ -37,7 +40,7 @@
[ Victor Seva ]
* Drop patch misdn_FOP. Applied upstream (r112521 branches/1.6.0/).
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Sat, 21 Mar 2009 01:27:50 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Sun, 22 Mar 2009 03:16:53 +0200
asterisk (1:1.4.21.2~dfsg-3) UNRELEASED; urgency=low
Added: asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi-fxsks-hookstate?rev=6899&op=file
==============================================================================
--- asterisk/trunk/debian/patches/dahdi-fxsks-hookstate (added)
+++ asterisk/trunk/debian/patches/dahdi-fxsks-hookstate Sun Mar 22 01:22:05 2009
@@ -1,0 +1,31 @@
+Allow FXO channels to send out calls even before someone calls in through
+them.
+
+This rxisoffhook does not work. Before 1.6.0 it was wrapped in a #ifdef
+DAHDI_CHECK_HOOKSTATE (or rather: ZAP_CHECK_HOOKSTATE). In 1.6 it is
+accidentally enabled by default.
+
+On DAHDI (the kernel) this field is not properly initialized at startup.
+And thus it will only work after an incoming ring.
+
+Upstream issue: http://bugs.digium.com/view.php?id=14577
+
+--- a/channels/chan_dahdi.c
++++ b/channels/chan_dahdi.c
+@@ -9295,12 +9295,16 @@ static inline int available(struct dahdi
+ /* When "onhook" that means no battery on the line, and thus
+ it is out of service..., if it's on a TDM card... If it's a channel
+ bank, there is no telling... */
++#ifdef DAHDI_CHECK_HOOKSTATE
+ if (par.rxbits > -1)
+ return 1;
+ if (par.rxisoffhook)
+ return 1;
+ else
+ return 0;
++#else
++ return 1;
++#endif
+ } else if (par.rxisoffhook) {
+ ast_debug(1, "Channel %d off hook, can't use\n", p->channel);
+ /* Not available when the other end is off hook */
Added: asterisk/trunk/debian/patches/h323-make-fix
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-make-fix?rev=6899&op=file
==============================================================================
--- asterisk/trunk/debian/patches/h323-make-fix (added)
+++ asterisk/trunk/debian/patches/h323-make-fix Sun Mar 22 01:22:05 2009
@@ -1,0 +1,46 @@
+No. We should not need to run 'make' twice
+
+http://bugs.digium.com/view.php?id=14715
+
+--- a/channels/Makefile
++++ b/channels/Makefile
+@@ -57,25 +57,14 @@ ifneq ($(findstring $(OSARCH), mingw32 c
+ LIBS+= -lres_monitor.so -lres_features.so
+ endif
+
+-clean::
+- $(MAKE) -C misdn clean
+-
+ ifneq ($(wildcard h323/Makefile.ast),)
+ include h323/Makefile.ast
++endif
+ H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
++
+ clean::
++ $(MAKE) -C misdn clean
+ if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi
+-else
+-h323/libchanh323.a h323/Makefile.ast:
+- $(CMD_PREFIX) $(MAKE) -C h323
+- $(CMD_PREFIX) rm -f ../main/asterisk
+- $(CMD_PREFIX) echo "***************************************************************"
+- $(CMD_PREFIX) echo
+- $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
+- $(CMD_PREFIX) echo
+- $(CMD_PREFIX) echo "***************************************************************"
+- $(CMD_PREFIX) exit 1
+-endif
+
+ dist-clean::
+ rm -f h323/Makefile
+@@ -106,4 +95,10 @@ chan_usbradio.o: ./xpmr/xpmr.c ./xpmr/xp
+
+ chan_usbradio.so: LIBS+=-lusb -lasound
+
++h323/Makefile.ast:
++ $(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
++
++h323/libchanh323.a:
++ $(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a
++
+
Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=6899&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sun Mar 22 01:22:05 2009
@@ -20,3 +20,5 @@
# bugfixes on top of everything
disable_moh
libtonezone_libm
+dahdi-fxsks-hookstate
+h323-make-fix
Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=6899&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sun Mar 22 01:22:05 2009
@@ -96,12 +96,7 @@
build-arch-stamp: config.status
dh_testdir
- # Add here command to compile/build the package.
- $(FETCH_ENV) $(MAKE) $(BUILDFLAGS) || true
-
- # Build a second time to pick up h323 :-(
$(FETCH_ENV) $(MAKE) $(BUILDFLAGS)
-
touch $@
More information about the Pkg-voip-commits
mailing list