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

Tzafrir Cohen tzafrir-guest at alioth.debian.org
Sun Mar 18 00:25:16 CET 2007 

Author: tzafrir-guest
Date: 2007-03-17 23:25:15 +0000 (Sat, 17 Mar 2007)
New Revision: 3239

Added:
   asterisk/branches/experimental/debian/dummyprogs/
   asterisk/branches/experimental/debian/dummyprogs/fetch
   asterisk/branches/experimental/debian/patches/h323_no_exit.dpatch
Removed:
   asterisk/branches/experimental/debian/patches/autoconf_h323.dpatch
   asterisk/branches/experimental/debian/patches/autoconf_order.dpatch
Modified:
   asterisk/branches/experimental/debian/changelog
   asterisk/branches/experimental/debian/control
   asterisk/branches/experimental/debian/patches/00list
   asterisk/branches/experimental/debian/rules
Log:
* Update to 1.4.1 . Install is broken now, though (problems with sound).
* 1.4.1 fixed h323 build issues.
* h323_no_exit.dpatch: Don't requires two rounds of building.
* Use system gsm (only requires an explicit --with-gsm)
* Allow chrooted building with no wget.


Modified: asterisk/branches/experimental/debian/changelog
===================================================================
--- asterisk/branches/experimental/debian/changelog	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/changelog	2007-03-17 23:25:15 UTC (rev 3239)
@@ -1,4 +1,4 @@
-asterisk (1:1.4.0~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:1.4.1~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * A package that builds.
@@ -9,8 +9,11 @@
   * Man pages are included in upstream now.
   * set ASTDATADIR=/usr/share/asterisk .
   * A bunch of other fils moved for 1.4 .
+  * Use system gsm (only requires an explicit --with-gsm)
+  * Allow chrooted building with no wget.
+  * h323_no_exit.dpatch: Don't requires two rounds of building.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 25 Dec 2006 04:17:41 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 18 Mar 2007 01:20:36 +0200
 
 asterisk (1:1.3.99~beta2.dfsg-1) UNRELEASED; urgency=low
 

Modified: asterisk/branches/experimental/debian/control
===================================================================
--- asterisk/branches/experimental/debian/control	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/control	2007-03-17 23:25:15 UTC (rev 3239)
@@ -4,13 +4,14 @@
 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>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.3), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng2, freetds-dev, libvorbis-dev, libsnmp9-dev
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev, dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp9-dev
 
 Package: asterisk
 Architecture: any
 Section: comm
 Depends: asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser (>= 3.63), asterisk-sounds-main (>= 1:1.0.2)
-Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
+Conflicts: asterisk-oh323 (<= 0.6.6pre3-3), asterisk-classic, asterisk-bristuff
+Replaces: asterisk-classic, asterisk-bristuff
 Suggests: gnomemeeting, ekiga, ohphone, kphone, asterisk-doc, asterisk-dev, asterisk-rate-engine
 Description: Open Source Private Branch Exchange (PBX)
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a

Added: asterisk/branches/experimental/debian/dummyprogs/fetch
===================================================================
--- asterisk/branches/experimental/debian/dummyprogs/fetch	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/dummyprogs/fetch	2007-03-17 23:25:15 UTC (rev 3239)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# a dummy script that can serve as 'fetch' to pass for autoconf tests
+# but always returns false to make sure it is never used.
+#
+# Note: the configure script will look for wget first. If you actually 
+# want to download sound tarballs or whatever at build time, make sure
+# you have wget installed, and this script should cause you no problems.
+
+exit 1


Property changes on: asterisk/branches/experimental/debian/dummyprogs/fetch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk/branches/experimental/debian/patches/00list
===================================================================
--- asterisk/branches/experimental/debian/patches/00list	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/patches/00list	2007-03-17 23:25:15 UTC (rev 3239)
@@ -1,9 +1,7 @@
-# ukcid probably conflicts with bristuff
 #ukcid
-#40_initgroups.dpatch
 #50_debian-libgsm.dpatch
 #95_conf_sample.dpatch
 ##sys_readline
-#vm_he
 pubkey_jnctn
 #nomarch
+h323_no_exit

Deleted: asterisk/branches/experimental/debian/patches/autoconf_h323.dpatch
===================================================================
--- asterisk/branches/experimental/debian/patches/autoconf_h323.dpatch	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/patches/autoconf_h323.dpatch	2007-03-17 23:25:15 UTC (rev 3239)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autoconf_h323.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: make autoconf properly detect pwlib and openh323 from debs.
-## DP: Upstream bug: http://bugs.digium.com/view.php?id=8699 .
-
- at DPATCH@
-diff -urNad asterisk-1.4.0~dfsg~/configure.ac asterisk-1.4.0~dfsg/configure.ac
---- asterisk-1.4.0~dfsg~/configure.ac	2006-12-18 18:55:46.000000000 +0200
-+++ asterisk-1.4.0~dfsg/configure.ac	2006-12-31 02:59:45.000000000 +0200
-@@ -719,7 +719,7 @@
- 	if test "${HAS_PWLIB:-unset}" != "unset"; then
- 		AST_CHECK_OPENH323_PLATFORM()
- 
--		PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"
-+		PLATFORM_PWLIB="pt"
- 
- 		AST_CHECK_PWLIB_BUILD([PWLib], [PWLIB],
- 			[Define if your system has the PWLib libraries.],
-@@ -743,7 +743,7 @@
- 	AST_CHECK_OPENH323()
- 	AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3])
- 	AST_CHECK_OPENH323_BUILD()
--	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-+	PLATFORM_OPENH323="openh323"
- 	AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
- 		[Define if your system has the OpenH323 libraries.],
- 		[#include "ptlib.h"

Deleted: asterisk/branches/experimental/debian/patches/autoconf_order.dpatch
===================================================================
--- asterisk/branches/experimental/debian/patches/autoconf_order.dpatch	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/patches/autoconf_order.dpatch	2007-03-17 23:25:15 UTC (rev 3239)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autconf_order.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix autoconf orderng. 
-## From http://svn.digium.com/view/asterisk?view=rev&rev=48960 . Should
-## part of 1.4.1 .
-
- at DPATCH@
---- asterisk-1.4.0/configure.ac   2006/12/25 06:42:15     48959
-+++ asterisk-1.4.0/configure.ac   2006/12/25 17:04:48     48960
-@@ -21,6 +21,9 @@
- AC_COPYRIGHT("Asterisk")
- AC_REVISION($Revision$)
- 
-+AC_GNU_SOURCE
-+AC_USE_SYSTEM_EXTENSIONS
-+
- case "${host_os}" in
-      freebsd*)
-      ac_default_prefix=/usr/local
-@@ -89,9 +92,6 @@
- fi
- AC_SUBST(PBX_OSREV)
- 
--# This needs to be before any macros that use the C compiler
--AC_GNU_SOURCE
--
- AH_TOP(
- #ifndef ASTERISK_AUTOCONFIG_H
- #define ASTERISK_AUTOCONFIG_H
-

Added: asterisk/branches/experimental/debian/patches/h323_no_exit.dpatch
===================================================================
--- asterisk/branches/experimental/debian/patches/h323_no_exit.dpatch	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/patches/h323_no_exit.dpatch	2007-03-17 23:25:15 UTC (rev 3239)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## h323_no_exit.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Prevent the need to run 'make' twice to build h323.
+
+ at DPATCH@
+diff -urNad asterisk-1.4.1~dfsg~/channels/Makefile asterisk-1.4.1~dfsg/channels/Makefile
+--- asterisk-1.4.1~dfsg~/channels/Makefile	2007-03-17 23:50:15.000000000 +0200
++++ asterisk-1.4.1~dfsg/channels/Makefile	2007-03-17 23:51:50.000000000 +0200
+@@ -36,10 +36,6 @@
+   H323LIB=-lh323_NetBSD_x86_r
+ endif
+ 
+-ifeq ($(wildcard h323/libchanh323.a),)
+-  CC_MODS:=$(filter-out chan_h323,$(CC_MODS))
+-endif
+-
+ ifndef OPENH323DIR
+   OPENH323DIR=$(HOME)/openh323
+ endif
+@@ -62,23 +58,10 @@
+ clean::
+ 	rm -f busy.h ringtone.h gentone
+ 	$(MAKE) -C misdn clean
+-
+-ifneq ($(wildcard h323/Makefile.ast),)
+-  include h323/Makefile.ast
+-H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
+-clean::
+ 	$(MAKE) -C h323 clean
+-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
++
++h323/libchanh323.a:
++	$(CMD_PREFIX) $(MAKE) -C $(@D) $(@F)
+ 
+ gentone: gentone.c
+ 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+@@ -98,7 +81,7 @@
+ chan_alsa.o: busy.h ringtone.h
+ 
+ ifeq ($(OSARCH),linux-gnu)
+-chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
++chan_h323.so: chan_h323.o h323/libchanh323.a
+ 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+ 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
+ else


Property changes on: asterisk/branches/experimental/debian/patches/h323_no_exit.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk/branches/experimental/debian/rules
===================================================================
--- asterisk/branches/experimental/debian/rules	2007-03-17 12:21:07 UTC (rev 3238)
+++ asterisk/branches/experimental/debian/rules	2007-03-17 23:25:15 UTC (rev 3239)
@@ -74,12 +74,32 @@
 	#cd ..)
 
 	#cd editline;./configure $(confflags)
-	./configure
 
+	# make sure we have 'fetch' . We need to have either wget or fetch
+	# on the system. However it is generally not a good idea to actually
+	# get remote tarballs at build time. So if nither wget nor fetch 
+	# happen to be installed, the configure script will find a dummy
+	# fetch script that always returns an error.
+	PATH=$$PATH:$(CURDIR)/debian/dummyprogs
+	export PATH
+
+	if [ ! -r configure.debian_sav ]; then cp -a configure configure.debian_sav; fi
+	./bootstrap.sh # also runs autoonf. TODO: currently not needed.
+	
+	# Without --with-gsm the internal gsm will be used
+	./configure --with-gsm
+
 menuselect.makeopts: config.status
 	$(MAKE) 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
+	touch channels/Makefile.ast
+
 build-arch: build-arch-stamp
 build-arch-stamp: menuselect.makeopts
 	dh_testdir
@@ -113,22 +133,19 @@
 	dh_testroot
 	
 	# Add here commands to clean up after the build process.
-	-test -d channels/h323 && $(MAKE) -C channels/h323 clean
-	-$(RM) -f channels/h323/libchanh323.a
 	-$(MAKE) clean
 	-$(RM) -rf debian/build
-	-$(RM) utils/streamplayer
-	#-$(RM) -f fxstest ztmonitor ztspeed zttest
-	-$(RM) -fR doc/api agi/eagi-test agi/eagi-sphinx-test
-	-$(RM) debian/asterisk.8.gz
-	-(test -d editline &&cd editline; \
-	if [ -f config.sub.old ]; then \
-	   mv config.sub.old config.sub; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	   mv config.guess.old config.guess; \
-	fi; \
-	cd ..)
+	#-$(RM) utils/streamplayer
+	#-$(RM) -fR doc/api agi/eagi-test agi/eagi-sphinx-test
+	#-(test -d editline &&cd editline; \
+	#if [ -f config.sub.old ]; then \
+	#   mv config.sub.old config.sub; \
+	#fi; \
+	#if [ -f config.guess.old ]; then \
+	#   mv config.guess.old config.guess; \
+	#fi; \
+	#cd ..)
+	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
 	-test -d configs && chmod -x configs/*.sample
 	-$(RM) -f build-arch-stamp build-indep-stamp config.status check-sounds menuselect.makeopts

More information about the Pkg-voip-commits mailing list