[Pkg-voip-commits] r847 - in asterisk/trunk/debian: . patches

Tzafrir Cohen tzafrir-guest at costa.debian.org
Thu Oct 13 18:21:58 UTC 2005 

Author: tzafrir-guest
Date: 2005-10-13 18:21:58 +0000 (Thu, 13 Oct 2005)
New Revision: 847

Added:
   asterisk/trunk/debian/patches/Makefile_install_no1234.dpatch
   asterisk/trunk/debian/patches/option_detach_12.dpatch
   asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
   asterisk/trunk/debian/patches/system_libgsm.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/patches/defaults_debian.dpatch
   asterisk/trunk/debian/postinst
Log:
* fixed libpri build-dep. What about gtk 1.2, libtonezone?
* postinst: '| ! grep' generated syntax error. Using my version
* rewrote the patch for using a system copy of gsm. Submitted to the Mantis
* option_detach_12.dpatch: adds the option -D to asterisk to detach even when 
                           -v and/or -d is used
* pubkey_jnctn.dpatch: The RSA public key of Junction Networks. 
                       Is it a good idea for our package to include extra keys?
* postgresql supports still not working
* Makefile_install_no1234.dpatch: don't create mailbox 1234 by default
* default_debian.dpatch: hopefully now works


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/changelog	2005-10-13 18:21:58 UTC (rev 847)
@@ -1,5 +1,13 @@
-asterisk (1:1.2.0-beta1.dfsg-1) experimental; urgency=low
+asterisk (1:1.1.9.0beta1.dfsg.1-2) experimental; urgency=low
 
+  * recreated system_libgsm patch, http://bugs.digium.com/view.php?id=5434
+  * Added public key from Junction Networks (pubkey_jnctn.dpatch). 
+    Any other keys for IAX providers we can add?
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 13 Oct 2005 01:09:56 +0200
+
+asterisk (1:1.1.9.0beta1.dfsg.1-1) experimental; urgency=low
+
   * updating to a beta of Asterisk 1.2
   * added defaults_debian.dpatch to set pathes
   * BuildDepends on graphviz
@@ -8,7 +16,7 @@
   * What about h323?
   * deleted from patches/00list a number of patches that should not go in
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun,  2 Oct 2005 01:05:26 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 09 Oct 2005 04:16:31 +0200
 
 asterisk (1:1.0.9.dfsg-6) UNRELEASED; urgency=low
 

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/control	2005-10-13 18:21:58 UTC (rev 847)
@@ -4,7 +4,7 @@
 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, libgtk1.2-dev | libgtk-dev, libreadline4-dev | libreadline-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.0.6-1), doxygen, bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.0.6-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.0.6-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev | libgtk-dev, libreadline4-dev | libreadline-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.0.6-1), doxygen, bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.1.9-0), dpatch (>= 2.0.10), zaptel-source (>= 1:1.0.6-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
 
 Package: asterisk
 Architecture: any
@@ -48,20 +48,6 @@
  depend on the many openh323 dependencies. For now asterisk-oh323 replaces this
  version until chan_h323 does support the current OpenH323 version again.
 
-# Deprecating gtk-console
-#Package: asterisk-gtk-console
-#Architecture: any
-#Recommends: asterisk
-#Replaces: asterisk (<= 1.0.2-1)
-#Section: comm
-#Depends: ${shlibs:Depends}
-#Description: gtk based console for asterisk
-# This package provides a limited GTK based console for the Asterisk Open Source
-# PBX system.
-# .
-# It was separated out into its own package to avoid having the main package 
-# depend on xlibs and gtk-1.2
-#
 Package: asterisk-doc
 Recommends: asterisk
 Conflicts: asterisk (<=0.1.12-3)

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/00list	2005-10-13 18:21:58 UTC (rev 847)
@@ -1,17 +1,23 @@
 defaults_debian
-# depends on defaults_debian:
+Makefile_install_no1234
+# Depends on defaults_debian:
 Makefile_datafiles
 #bristuff-0.2.0-RC8j.dpatch
+option_detach_12
 #10_DPIC.dpatch
 #20_Makefile.dpatch
 #25_subdirs_Makefiles.dpatch
 #30_ast-data-dir.dpatch
 40_initgroups.dpatch
+system_libgsm
 #50_debian-libgsm.dpatch
+# needs to be resorected:
 #60_debian-libopenh323.dpatch
+# app_sql_postgres seems "obsolete" and not used by default:
 #70_debian-libpe-fe.dpatch
-#95_conf_sample.dpatch
+95_conf_sample.dpatch
 #98_fpm-sounds.dpatch
 ##08_debian-zaptel.dpatch
 #chan-modem.dpatch
 #app_queue.memleakfix.dpatch
+pubkey_jnctn

Added: asterisk/trunk/debian/patches/Makefile_install_no1234.dpatch
===================================================================
--- asterisk/trunk/debian/patches/Makefile_install_no1234.dpatch	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/Makefile_install_no1234.dpatch	2005-10-13 18:21:58 UTC (rev 847)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_install_no1234.dpatch by  <tzafrir at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.0.dfsg.1-0beta1/Makefile /tmp/dpep.dngaXR/asterisk-1.2.0.dfsg.1-0beta1/Makefile
+--- asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-08-26 22:55:11.000000000 +0300
++++ /tmp/dpep.dngaXR/asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-09-21 08:02:49.859994381 +0300
+@@ -683,15 +683,6 @@
+ 		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ 	done
+ 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+-	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
+-	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
+-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+-	done
+-	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
+-	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
+-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+-	done
+ 
+ webvmail:
+ 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )


Property changes on: asterisk/trunk/debian/patches/Makefile_install_no1234.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk/trunk/debian/patches/defaults_debian.dpatch
===================================================================
--- asterisk/trunk/debian/patches/defaults_debian.dpatch	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/defaults_debian.dpatch	2005-10-13 18:21:58 UTC (rev 847)
@@ -5,23 +5,74 @@
 ## DP: set default pathes to the ones used in Debian.
 
 @DPATCH@
-diff -urNad asterisk-1.2.0.dfsg.1-0beta1/build_tools/make_defaults_h /tmp/dpep.viz85Q/asterisk-1.2.0.dfsg.1-0beta1/build_tools/make_defaults_h
---- asterisk-1.2.0.dfsg.1-0beta1/build_tools/make_defaults_h	2005-10-01 18:56:13.676119820 +0300
-+++ /tmp/dpep.viz85Q/asterisk-1.2.0.dfsg.1-0beta1/build_tools/make_defaults_h	2005-10-01 18:56:36.973313564 +0300
-@@ -19,7 +19,8 @@
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/asterisk.c /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/asterisk.c
+--- asterisk-1.1.9.0beta1.dfsg.1/asterisk.c	2005-10-12 20:29:38.380606212 +0200
++++ /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/asterisk.c	2005-10-12 20:29:51.346029139 +0200
+@@ -141,6 +141,7 @@
+ char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
++char ast_config_AST_SHARE_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+@@ -1696,6 +1697,7 @@
+ 	ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR, sizeof(ast_config_AST_VAR_DIR));
+  	snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
+ 	ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR, sizeof(ast_config_AST_VAR_DIR));
++	ast_copy_string(ast_config_AST_SHARE_DIR, AST_VAR_DIR, sizeof(ast_config_AST_SHARE_DIR));
+ 	ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));
+ 	ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR, sizeof(ast_config_AST_AGI_DIR));
+ 	ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
+@@ -1731,6 +1733,8 @@
+ 		} else if (!strcasecmp(v->name, "astvarlibdir")) {
+ 			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
+ 			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
++		} else if (!strcasecmp(v->name, "astsharedir")) {
++			ast_copy_string(ast_config_AST_SHARE_DIR, v->value, sizeof(ast_config_AST_SHARE_DIR));
+ 		} else if (!strcasecmp(v->name, "astlogdir")) {
+ 			ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
+ 		} else if (!strcasecmp(v->name, "astagidir")) {
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/build_tools/make_defaults_h /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/build_tools/make_defaults_h
+--- asterisk-1.1.9.0beta1.dfsg.1/build_tools/make_defaults_h	2005-10-12 20:29:38.381606091 +0200
++++ /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/build_tools/make_defaults_h	2005-10-12 20:29:51.347029017 +0200
+@@ -19,7 +19,7 @@
  
  #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
  
 -#define AST_SOUNDS     "${INSTALL_PATH}${ASTVARLIBDIR}/sounds"
 -#define AST_IMAGES     "${INSTALL_PATH}${ASTVARLIBDIR}/images"
+-
 +#define AST_SHARE_DIR    "${INSTALL_PATH}${ASTSHAREDIR}"
 +#define AST_SOUNDS     "${INSTALL_PATH}${ASTSHAREDIR}/sounds"
 +#define AST_IMAGES     "${INSTALL_PATH}${ASTSHAREDIR}/images"
+ END
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/file.c /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/file.c
+--- asterisk-1.1.9.0beta1.dfsg.1/file.c	2005-10-12 20:29:38.383605847 +0200
++++ /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/file.c	2005-10-12 20:29:51.363027071 +0200
+@@ -301,7 +301,7 @@
+ 	} else {
+ 		char tmp[AST_CONFIG_MAX_PATH] = "";
  
- END
-diff -urNad asterisk-1.2.0.dfsg.1-0beta1/Makefile /tmp/dpep.viz85Q/asterisk-1.2.0.dfsg.1-0beta1/Makefile
---- asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-10-01 18:56:13.678119579 +0300
-+++ /tmp/dpep.viz85Q/asterisk-1.2.0.dfsg.1-0beta1/Makefile	2005-10-01 19:00:42.208500707 +0300
+-		snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR, "sounds");
++		snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_SHARE_DIR, "sounds");
+ 		fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
+ 		fn = malloc(fnsize);
+ 		if (fn)
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/include/asterisk.h /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/include/asterisk.h
+--- asterisk-1.1.9.0beta1.dfsg.1/include/asterisk.h	2005-08-23 04:30:22.000000000 +0300
++++ /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/include/asterisk.h	2005-10-12 20:30:48.222111315 +0200
+@@ -25,6 +25,7 @@
+ extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
++extern char ast_config_AST_SHARE_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
+ extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/Makefile /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/Makefile
+--- asterisk-1.1.9.0beta1.dfsg.1/Makefile	2005-10-12 20:29:38.384605726 +0200
++++ /tmp/dpep.cGGohN/asterisk-1.1.9.0beta1.dfsg.1/Makefile	2005-10-12 20:29:51.364026949 +0200
 @@ -94,6 +94,7 @@
  
  ifneq (${OSARCH},SunOS)

Added: asterisk/trunk/debian/patches/option_detach_12.dpatch
===================================================================
--- asterisk/trunk/debian/patches/option_detach_12.dpatch	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/option_detach_12.dpatch	2005-10-13 18:21:58 UTC (rev 847)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## option_detach_12.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: when running asterisk -D: detach, even if -v or -d was given.
+## DP: Version for Asterisk 1.2
+
+ at DPATCH@
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/asterisk.c /tmp/dpep.w7uc6I/asterisk-1.1.9.0beta1.dfsg.1/asterisk.c
+--- asterisk-1.1.9.0beta1.dfsg.1/asterisk.c	2005-10-12 20:45:02.487260265 +0200
++++ /tmp/dpep.w7uc6I/asterisk-1.1.9.0beta1.dfsg.1/asterisk.c	2005-10-12 20:45:52.091130067 +0200
+@@ -85,6 +85,7 @@
+ int option_debug=0;
+ int option_exec_includes=0;
+ int option_nofork=0;
++int option_daemonize=0;
+ int option_quiet=0;
+ int option_console=0;
+ int option_highpriority=0;
+@@ -1660,6 +1661,7 @@
+ 	printf("   -G <group>      Run as a group other than the caller\n");
+ 	printf("   -U <user>       Run as a user other than the caller\n");
+ 	printf("   -c              Provide console CLI\n");
++	printf("   -D              Daemonize even if -v or -d were given\n");
+ 	printf("   -d              Enable extra debugging\n");
+ 	printf("   -f              Do not fork\n");
+ 	printf("   -g              Dump core in case of a crash\n");
+@@ -1860,7 +1862,7 @@
+ 	}
+ 	*/
+ 	/* Check for options */
+-	while((c=getopt(argc, argv, "tThfdvVqprRgcinx:U:G:C:M:")) != -1) {
++	while((c=getopt(argc, argv, "tThfdDvVqprRgcinx:U:G:C:M:")) != -1) {
+ 		switch(c) {
+ 		case 'd':
+ 			option_debug++;
+@@ -1870,6 +1872,9 @@
+ 			option_console++;
+ 			option_nofork++;
+ 			break;
++		case 'D':
++			option_daemonize++;
++			break;
+ 		case 'f':
+ 			option_nofork++;
+ 			break;
+@@ -2037,7 +2042,9 @@
+ 	} else
+ 		ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno));
+ 
+-	if (!option_verbose && !option_debug && !option_nofork && !option_console) {
++	if (option_daemonize ||
++		(!option_verbose && !option_debug && !option_nofork && !option_console)
++	) {
+ 		daemon(0,0);
+ 		/* Blindly re-write pid file since we are forking */
+ 		unlink((char *)ast_config_AST_PID);


Property changes on: asterisk/trunk/debian/patches/option_detach_12.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
===================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2005-10-13 18:21:58 UTC (rev 847)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pubkey_jnctn.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Public key for Junction Networks. From http://www.jnctn.net/jnctn.pub
+## DP: at Wed, 12 Oct 2005 23:35:06 +0200
+## DP: See also http://www.junctionnetworks.com/Asterisk-config.htm
+
+ at DPATCH@
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub /tmp/dpep.mnlLru/asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub
+--- asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub	1970-01-01 02:00:00.000000000 +0200
++++ /tmp/dpep.mnlLru/asterisk-1.1.9.0beta1.dfsg.1/keys/jnctn.pub	2005-10-12 23:35:32.236727110 +0200
+@@ -0,0 +1,6 @@
++-----BEGIN PUBLIC KEY-----
++MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWaDv4190BpeL5K+Yuq5Q7+vPs
++FVrkibbIp+Io1gCQ6CGZJbR0kUZvTdf58bBdG0zqf6azFN8XPaNz9PVLDl+KgHwU
++3Ilu//eX8ph8Wu+Oxs/ymi/hzKm+Cd6aty94zYuqiegc0KdrjvU5TLQAkIQpiB6k
++CvuIm0R0XXQjj3R7LwIDAQAB
++-----END PUBLIC KEY-----


Property changes on: asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: asterisk/trunk/debian/patches/system_libgsm.dpatch
===================================================================
--- asterisk/trunk/debian/patches/system_libgsm.dpatch	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/patches/system_libgsm.dpatch	2005-10-13 18:21:58 UTC (rev 847)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## system_libgsm.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use the system copy of libgsm, if availble.
+
+ at DPATCH@
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c
+--- asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c	2005-10-12 22:13:37.563900650 +0200
++++ /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/codec_gsm.c	2005-10-12 22:13:50.495196931 +0200
+@@ -33,7 +33,7 @@
+ #include "asterisk/logger.h"
+ #include "asterisk/channel.h"
+ 
+-#include "gsm/inc/gsm.h"
++#include <gsm/gsm.h>
+ #include "../formats/msgsm.h"
+ 
+ /* Sample frame data */
+diff -urNad asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile
+--- asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile	2005-10-12 22:13:37.578898674 +0200
++++ /tmp/dpep.29zUE5/asterisk-1.1.9.0beta1.dfsg.1/codecs/Makefile	2005-10-12 22:18:53.182433117 +0200
+@@ -26,10 +26,19 @@
+ CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex")
+ CFLAGS+=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h ] && echo "-I$(CROSS_COMPILE_TARGET)/usr/include/speex")
+ 
++LIBGSM_PATH:=/usr/local/include /usr/include
++LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))
++ifneq (,$(LIBGSM_SYSTEM_HEADERS))
++LIBGSM=-lgsm
++LIBGSMT=
++else
++LIBGSM=gsm/lib/libgsm.a
++LIBGSMT=$(LIBGSM)
++CFLAGS+=-I.
++endif
++
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+-LIBGSM=gsm/lib/libgsm.a
+-LIBGSMT=gsm/lib/libgsm.a
+ LIBLPC10=lpc10/liblpc10.a
+ LIBSPEEX=$(shell [ -f $(CROSS_COMPILE_TARGET)/usr/local/lib/libspeex.a ] && echo "-L$(CROSS_COMPILE_TARGET)/usr/local/lib")
+ LIBSPEEX+=-lspeex -lm


Property changes on: asterisk/trunk/debian/patches/system_libgsm.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk/trunk/debian/postinst
===================================================================
--- asterisk/trunk/debian/postinst	2005-10-13 17:28:25 UTC (rev 846)
+++ asterisk/trunk/debian/postinst	2005-10-13 18:21:58 UTC (rev 847)
@@ -23,7 +23,7 @@
 		adduser asterisk audio 
 		adduser asterisk dialout
 	fi
-	if (getent group dialout | grep -q asterisk); then
+	if (groups asterisk | grep -w -q -v asterisk); then
 		adduser asterisk dialout
 	fi

More information about the Pkg-voip-commits mailing list