[Pkg-voip-commits] r2311 - in asterisk/branches/sarge/debian: . patches

Tzafrir Cohen tzafrir-guest at costa.debian.org
Sat Aug 26 01:16:19 UTC 2006


Author: tzafrir-guest
Date: 2006-08-26 01:16:15 +0000 (Sat, 26 Aug 2006)
New Revision: 2311

Modified:
   asterisk/branches/sarge/debian/asterisk-bristuff.install
   asterisk/branches/sarge/debian/asterisk-classic.install
   asterisk/branches/sarge/debian/asterisk-doc.examples
   asterisk/branches/sarge/debian/asterisk_fix
   asterisk/branches/sarge/debian/changelog
   asterisk/branches/sarge/debian/control
   asterisk/branches/sarge/debian/examples
   asterisk/branches/sarge/debian/patches/sys_readline.dpatch
   asterisk/branches/sarge/debian/rules
Log:
Syning from trunk.
* Remove build-dep on gtk-1.2 .
* Fix description of pakage asterisk.
* Update sys_readline.dpatch .
* asterisk_fix: 
  Install it.
  - More strict permissions.
  - Remove tracing.
  - Only create homedir of asterisk user if necessary.
  - Cleanup.
* Also install config examples to the main package.
* Install some extra config examples to the -doc package.
* Install IAXy firmware files.


Modified: asterisk/branches/sarge/debian/asterisk-bristuff.install
===================================================================
--- asterisk/branches/sarge/debian/asterisk-bristuff.install	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/asterisk-bristuff.install	2006-08-26 01:16:15 UTC (rev 2311)
@@ -2,4 +2,4 @@
 bristuff/usr/sbin		usr/
 bristuff/usr/share/man		usr/share/
 bristuff/var/lib/asterisk	var/lib/
-contrib/firmware/iax/*.bin	usr/share/asterisk/firmware/iax/
+usr/share/asterisk/firmware/iax/

Modified: asterisk/branches/sarge/debian/asterisk-classic.install
===================================================================
--- asterisk/branches/sarge/debian/asterisk-classic.install	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/asterisk-classic.install	2006-08-26 01:16:15 UTC (rev 2311)
@@ -1,4 +1,4 @@
 usr/lib/asterisk
 usr/sbin
 var/lib/asterisk
-contrib/firmware/iax/*.bin	usr/share/asterisk/firmware/iax
+usr/share/asterisk/firmware/iax

Modified: asterisk/branches/sarge/debian/asterisk-doc.examples
===================================================================
--- asterisk/branches/sarge/debian/asterisk-doc.examples	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/asterisk-doc.examples	2006-08-26 01:16:15 UTC (rev 2311)
@@ -1,2 +1,4 @@
+sample.call
 configs/*
 muted.conf.sample
+agi/agi-test.agi

Modified: asterisk/branches/sarge/debian/asterisk_fix
===================================================================
--- asterisk/branches/sarge/debian/asterisk_fix	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/asterisk_fix	2006-08-26 01:16:15 UTC (rev 2311)
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#! /bin/sh
 
 if getent passwd asterisk >/dev/null ;then
 	# Some halfbaked Sarge versions needed their home dir fixed:
@@ -7,8 +7,14 @@
 		usermod -d /var/lib/asterisk asterisk
         fi
 else
-        adduser --system --group --home /var/lib/asterisk \
-		--gecos "Asterisk PBX daemon" asterisk
+	adduser_extra_opts=""
+	# Cosmetic noise reduction
+	if [ -d "/var/lib/asterisk" ]; then
+    		adduser_extra_opts="--no-create-home"
+	fi
+	adduser --system --group --home /var/lib/asterisk \
+	    $adduser_extra_opts \
+        	--gecos "Asterisk PBX daemon" asterisk		
 fi
 
 for group in dialout audio; do
@@ -17,37 +23,61 @@
 	fi
 done
 
-test -d /var/log/asterisk || mkdir -p /var/log/asterisk
-test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk
-test -d /etc/asterisk || mkdir -p /etc/asterisk
-test -d /var/spool/asterisk/ || mkdir -p /var/spool/asterisk/
-chown -R asterisk.asterisk \
-        /var/log/asterisk \
-        /var/run/asterisk \
-        /var/spool/asterisk \
-        /var/lib/asterisk \
+# Make sure all (possibly) used dirs exist and is owned by asterisk
+
+# /var/run/asterisk is not yet handled by init.d :-(
+# (/var/run/asterisk is handled in sysV script /etc/init.d/asterisk)
+
+dirs="
+        /var/log/asterisk
+        /var/spool/asterisk
+        /var/lib/asterisk
+	/var/run/asterisk
         /etc/asterisk
+"
 
+subdirs="
+        /var/log/asterisk/cdr-csv
+        /var/log/asterisk/cdr-custom
+        /var/spool/asterisk/dictate
+        /var/spool/asterisk/meetme
+        /var/spool/asterisk/monitor
+        /var/spool/asterisk/monitor
+        /var/spool/asterisk/system
+        /var/spool/asterisk/tmp
+        /var/spool/asterisk/voicemail
+"
+
+for dir in $subdirs $dirs; do
+        mkdir -p "$dir"
+done
+
+for dir in $dirs; do
+        chown -R asterisk: "$dir"
+done
+
+
+###################################
+# this part should be reviewed, but it's basically trial and error
+# code i wrote to make freepbx work. better solutions are welcomed.
+
 # files need to be RW by the group
 # dirs need to a+rx
-#chmod -R 0664 /etc/asterisk/
-#find /etc/asterisk/ -type d | xargs chmod a+rx
-#chmod +t /etc/asterisk/
+chmod -R 0660 /etc/asterisk/
+find /etc/asterisk/ -type d | xargs chmod ug+rx
 
+#chmod g+s /etc/asterisk/
+
 # this is needed because othewise sqlite cannot write to the DB
 #chmod -R 0660 /var/lib/asterisk/
 
 ####################################
-# TODO:
-#
-# the real setup should be :
-#   if asterisk is not running - start it (restart can deal with that)
-#   otherwise reload. 
-#   reload may fail, but start should not (it will be run on fist install only)
-#
-# Some changes are not fixed by a reload: e.g: adding/removing modules.
-# However a restart disconnects all calls in the pbx
-#
-# for simplicity, we just restart it by force right now.
-# may fail if the package asterisk is not yet configured.
-invoke-rc.d asterisk restart || true 
+# If asterisk in running, reload it
+# otherwise start it
+if [ -f "/etc/init.d/asterisk" ];then
+	if [ -f /var/run/asterisk/asterisk.pid ];then
+	    invoke-rc.d asterisk reload || exit $?
+	else
+	    invoke-rc.d asterisk start || exit $?
+	fi
+fi

Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/changelog	2006-08-26 01:16:15 UTC (rev 2311)
@@ -2,6 +2,19 @@
 
   * Unofficial pkg-voip Sarge backport
 
+  [ Kilian Krause ]
+  * Add iaxy.bin to asterisk debs to have working IAX support.
+  * asterisk_fix is included on the main asterisk package
+    (Closes: Bug#287025, Bug#360233, Bug#381861)
+  * Various fixes to asterisk_fix
+
+  [ Mark Purcell ]
+  * Remove Build-Depends: libgtk1.2-dev (only for asterisk-gtk)
+  * export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+  * asterisk-{classic-bristuff} Depends: asterisk
+  * asterisk_fix needs to fix /var/run/asterisk
+  * Move doc/asterisk -> asterisk-doc package
+
  -- Kilian Krause <kilian at debian.org>  Thu,  3 Aug 2006 12:04:00 +0200
 
 asterisk (1:1.2.10.dfsg-2) unstable; urgency=high

Modified: asterisk/branches/sarge/debian/control
===================================================================
--- asterisk/branches/sarge/debian/control	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/control	2006-08-26 01:16:15 UTC (rev 2311)
@@ -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, 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.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-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.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1)
 
 Package: asterisk
 Architecture: all
@@ -12,7 +12,7 @@
 Depends: asterisk-classic (= ${Source-Version})|asterisk-bristuff (= ${Source-Version}), adduser (>= 3.63)
 Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
 Suggests: gnomemeeting, ekiga, ohphone, kphone, asterisk-doc, asterisk-dev, asterisk-rate-engine
-Description: Open Source Private Branch Exchange (PBX) - dummy package
+Description: Open Source Private Branch Exchange (PBX)
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
  and Internet and telephony applications at the top.

Modified: asterisk/branches/sarge/debian/examples
===================================================================
--- asterisk/branches/sarge/debian/examples	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/examples	2006-08-26 01:16:15 UTC (rev 2311)
@@ -1,3 +1,4 @@
 sample.call
+configs/*
+muted.conf.sample
 agi/agi-test.agi
-*.cgi

Modified: asterisk/branches/sarge/debian/patches/sys_readline.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/sys_readline.dpatch	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/patches/sys_readline.dpatch	2006-08-26 01:16:15 UTC (rev 2311)
@@ -5,9 +5,9 @@
 ## DP: Use readline for the CLI. partially works.
 
 @DPATCH@
-diff -urNad asterisk-1.2.7.1.dfsg/asterisk.c /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/asterisk.c
---- asterisk-1.2.7.1.dfsg/asterisk.c	2006-05-16 10:34:54.818659487 +0300
-+++ /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/asterisk.c	2006-05-16 10:37:29.595033197 +0300
+diff -urNad asterisk-1.2.9.1.dfsg/asterisk.c /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/asterisk.c
+--- asterisk-1.2.9.1.dfsg/asterisk.c	2006-08-11 10:31:42.000000000 +0300
++++ /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/asterisk.c	2006-08-11 10:28:15.000000000 +0300
 @@ -114,7 +114,12 @@
  #include "asterisk/file.h"
  #include "asterisk/io.h"
@@ -21,7 +21,7 @@
  #include "asterisk/config.h"
  #include "asterisk/version.h"
  #include "asterisk/linkedlists.h"
-@@ -198,8 +203,12 @@
+@@ -198,17 +203,23 @@
  time_t ast_startuptime;
  time_t ast_lastreloadtime;
  
@@ -34,7 +34,18 @@
  static char *remotehostname;
  
  struct console consoles[AST_MAX_CONNECTS];
-@@ -717,6 +726,15 @@
+ 
+ char defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE;
+ 
++#ifndef SYS_READLINE
+ static int ast_el_add_history(char *);
+ static int ast_el_read_history(char *);
+ static int ast_el_write_history(char *);
++#endif /* SYS_READLINE */
+ 
+ char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH];
+ char ast_config_AST_CONFIG_FILE[AST_CONFIG_MAX_PATH];
+@@ -719,6 +730,15 @@
  		ast_log(LOG_WARNING, "Unable to create socket: %s\n", strerror(errno));
  		return 0;
  	}
@@ -50,7 +61,7 @@
  	memset(&sunaddr, 0, sizeof(sunaddr));
  	sunaddr.sun_family = AF_LOCAL;
  	ast_copy_string(sunaddr.sun_path, (char *)ast_config_AST_SOCKET, sizeof(sunaddr.sun_path));
-@@ -889,11 +907,15 @@
+@@ -891,11 +911,15 @@
  		if (getenv("HOME")) 
  			snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
  		if (!ast_strlen_zero(filename))
@@ -66,7 +77,7 @@
  	}
  	if (option_verbose)
  		ast_verbose("Executing last minute cleanups\n");
-@@ -1001,7 +1023,11 @@
+@@ -1003,7 +1027,11 @@
  	fflush(stdout);
  	/* Called when readline data is available */
  	if (s && !ast_all_zeros(s))
@@ -78,7 +89,7 @@
  	/* Give the console access to the shell */
  	if (s) {
  		/* The real handler for bang */
-@@ -1021,7 +1047,11 @@
+@@ -1023,7 +1051,11 @@
  	int ret = 0;
  	/* Called when readline data is available */
  	if (s && !ast_all_zeros(s))
@@ -90,7 +101,7 @@
  	/* Give the console access to the shell */
  	if (s) {
  		/* The real handler for bang */
-@@ -1253,7 +1283,76 @@
+@@ -1255,7 +1287,73 @@
  #endif /* ! LOW_MEMORY */
  };
  
@@ -144,9 +155,6 @@
 +	/* Let's assume we always get complete lines in read-s */
 +	fputc('\r', rl_outstream); /* to beginning of line... */
 +	/* suppress an excessive linefeed: */
-+	if (buf[res-1] == '\n') {
-+		buf[res-1] = '\0';
-+	}
 +	fputs(buf, rl_outstream);     /* The text itself         */
 +	if (option_exec)
 +		return 0;
@@ -167,7 +175,7 @@
  {
  	int num_read=0;
  	int lastpos=0;
-@@ -1332,13 +1431,15 @@
+@@ -1334,13 +1432,15 @@
  	return (0);
  }
  
@@ -184,15 +192,53 @@
  	if ((pfmt = getenv("ASTERISK_PROMPT"))) {
  		char *t = pfmt, *p = prompt;
  		memset(prompt, 0, sizeof(prompt));
-@@ -1477,6 +1578,7 @@
+@@ -1479,6 +1579,45 @@
  	return(prompt);	
  }
  
-+#ifndef SYS_READLINE
++#ifdef SYS_READLINE
++#define AST_RL_COMPL_BUFLEN (2048)
++static char* ast_rl_completion_function(const char *text, int state)
++{
++	char buf[AST_RL_COMPL_BUFLEN];
++	int len, res;
++	char *resbuf;
++
++	//fprintf(stderr, "\nINPUT:  %3d, \"%s\"\n", state, text);
++	if (! option_remote )
++		return ast_cli_generator(rl_line_buffer, (char*)text, state);
++
++	/* option_remote is set */
++	snprintf(buf, sizeof(buf),"_command complete \"%s\" \"%s\" %d", 
++			rl_line_buffer, text, state); 
++	//fprintf(stderr, "\nSEND:        \"%s\"\n", buf);
++	fdprint(ast_consock, buf);
++	res = read(ast_consock, buf, sizeof(buf));
++	if (res <= 0) {
++		//fprintf(stderr,"\nREAD ERROR: %d, (%d: %s)\n",
++		//		res, errno, strerror(errno));
++		return NULL;
++        }
++	buf[res] = '\0';
++	if (! strncmp(buf,"NULL\n",5))
++		return NULL;
++	if (buf[0] == '\0')
++		return NULL;
++	//fprintf(stderr, "\nGOT:    %3d, \"%s\"\n", res, buf);
++	
++	/* buf now contains the result word */
++	len = strlen(buf)+1;
++	resbuf = malloc(len);
++	if (!resbuf)
++		return NULL;
++	ast_copy_string(resbuf, buf, len);
++	return resbuf;
++}
++#else /* SYS_READLINE */
  static char **ast_el_strtoarr(char *buf)
  {
  	char **match_list = NULL, *retstr;
-@@ -1754,6 +1856,20 @@
+@@ -1756,6 +1895,23 @@
  
  	return ret;
  }
@@ -204,8 +250,11 @@
 +	/* ignore races for the moment */
 +	if (!initilized) {
 +		rl_initialize();
-+		rl_set_prompt(cli_prompt());
++		//rl_set_prompt(cli_prompt());
++		rl_readline_name = cli_prompt();
 +		rl_event_hook = ast_rl_event_hook;
++		//rl_attempted_completion_function = ast_rl_completion_function;
++		rl_completion_entry_function = ast_rl_completion_function;
 +		//fprintf(stderr, "===INITILIZING READLINE==[%s]====\n", cli_prompt());
 +		initilized = 1;
 +	}
@@ -213,7 +262,7 @@
  
  static void ast_remotecontrol(char * data)
  {
-@@ -1768,7 +1884,7 @@
+@@ -1770,7 +1926,7 @@
  	char *stringp=NULL;
  
  	char *ebuf;
@@ -222,7 +271,7 @@
  
  	read(ast_consock, buf, sizeof(buf));
  	if (data)
-@@ -1793,6 +1909,9 @@
+@@ -1795,6 +1951,9 @@
  	remotehostname = hostname;
  	if (getenv("HOME")) 
  		snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
@@ -232,7 +281,7 @@
  	if (el_hist == NULL || el == NULL)
  		ast_el_initialize();
  
-@@ -1800,7 +1919,8 @@
+@@ -1802,7 +1961,8 @@
  
  	if (!ast_strlen_zero(filename))
  		ast_el_read_history(filename);
@@ -241,30 +290,29 @@
 +	
  	if (option_exec && data) {  /* hack to print output then exit if asterisk -rx is used */
  		char tempchar;
- 		struct pollfd fds[0];
-@@ -1808,12 +1928,21 @@
- 		fds[0].events = POLLIN;
- 		fds[0].revents = 0;
- 		while(poll(fds, 1, 100) > 0) {
-+#ifdef SYS_READLINE
-+			//ast_rl_read_char(&tempchar);
-+			ast_rl_event_hook();
-+#else
+ #ifdef __Darwin__
+@@ -1814,12 +1974,20 @@
  			ast_el_read_char(el, &tempchar);
-+#endif
  		}
+ #else
++#ifdef SYS_READLINE
++		while (!ast_rl_read_char(&tempchar));
++#else /* SYS_READLINE */
+ 		while (!ast_el_read_char(el, &tempchar));
++#endif /* SYS_READLINE */
+ #endif
  		return;
  	}
  	for(;;) {
 +#ifdef SYS_READLINE
 +		ebuf = readline(cli_prompt());
-+#else
++#else /* SYS_READLINE */
  		ebuf = (char *)el_gets(el, &num);
-+#endif
++#endif /* SYS_READLINE */
  
  		if (!ast_strlen_zero(ebuf)) {
  			if (ebuf[strlen(ebuf)-1] == '\n')
-@@ -2023,7 +2152,7 @@
+@@ -2029,7 +2197,7 @@
  	int x;
  	FILE *f;
  	sigset_t sigs;
@@ -273,7 +321,7 @@
  	int is_child_of_nonroot=0;
  	char *buf;
  	char *runuser=NULL, *rungroup=NULL;
-@@ -2221,6 +2350,10 @@
+@@ -2227,6 +2395,10 @@
  			ast_log(LOG_WARNING, "Unable to initialize supplementary group list for %s\n", runuser);
  			exit(1);
  		}
@@ -284,7 +332,7 @@
  		if (setuid(pw->pw_uid)) {
  			ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", (int)pw->pw_uid, runuser);
  			exit(1);
-@@ -2254,11 +2387,15 @@
+@@ -2260,11 +2432,15 @@
  	
  
  	if (option_console) {
@@ -300,7 +348,7 @@
  	}
  
  	if (ast_tryconnect()) {
-@@ -2435,7 +2573,8 @@
+@@ -2442,7 +2619,8 @@
  		set_title(title);
  
  		for (;;) {
@@ -310,9 +358,9 @@
  			if (buf) {
  				if (buf[strlen(buf)-1] == '\n')
  					buf[strlen(buf)-1] = '\0';
-diff -urNad asterisk-1.2.7.1.dfsg/cli.c /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/cli.c
---- asterisk-1.2.7.1.dfsg/cli.c	2006-05-16 10:34:54.045457773 +0300
-+++ /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/cli.c	2006-05-16 10:34:55.592861462 +0300
+diff -urNad asterisk-1.2.9.1.dfsg/cli.c /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/cli.c
+--- asterisk-1.2.9.1.dfsg/cli.c	2006-08-11 10:31:41.000000000 +0300
++++ /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/cli.c	2006-08-11 10:31:45.000000000 +0300
 @@ -44,7 +44,15 @@
  #include "asterisk/utils.h"
  #include "asterisk/lock.h"
@@ -329,10 +377,10 @@
  /* For module directory */
  #include "asterisk/version.h"
  
-diff -urNad asterisk-1.2.7.1.dfsg/Makefile /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/Makefile
---- asterisk-1.2.7.1.dfsg/Makefile	2006-05-16 10:34:54.818659487 +0300
-+++ /tmp/dpep.yLtN9f/asterisk-1.2.7.1.dfsg/Makefile	2006-05-16 10:34:55.850928786 +0300
-@@ -307,7 +307,11 @@
+diff -urNad asterisk-1.2.9.1.dfsg/Makefile /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/Makefile
+--- asterisk-1.2.9.1.dfsg/Makefile	2006-08-11 10:31:42.000000000 +0300
++++ /tmp/dpep.eom8T2/asterisk-1.2.9.1.dfsg/Makefile	2006-08-11 10:31:45.000000000 +0300
+@@ -306,7 +306,11 @@
  
  endif # WITHOUT_ZAPTEL
  
@@ -345,7 +393,7 @@
  
  ifneq ($(wildcard .version),)
    ASTERISKVERSION:=$(shell cat .version)
-@@ -515,7 +519,7 @@
+@@ -511,7 +515,7 @@
  cygwin_a:
  	$(MAKE) -C cygwin all
  

Modified: asterisk/branches/sarge/debian/rules
===================================================================
--- asterisk/branches/sarge/debian/rules	2006-08-25 16:22:37 UTC (rev 2310)
+++ asterisk/branches/sarge/debian/rules	2006-08-26 01:16:15 UTC (rev 2311)
@@ -17,7 +17,7 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-export PROC := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 
 MAKEFLAGS = OPTIMIZE=-O2 MAKECMDGOALS=dont-optimize
 
@@ -159,7 +159,14 @@
 	# in the sample configs:
 	cp -a debian/ast_config/* $(CURDIR)/debian/tmp/etc/asterisk
 	
-	# bristuf
+	mkdir -p $(CURDIR)/debian/asterisk/usr/share/asterisk/bin
+	cp debian/asterisk_fix $(CURDIR)/debian/asterisk/usr/share/asterisk/bin
+	chmod +x $(CURDIR)/debian/asterisk/usr/share/asterisk/bin/asterisk_fix
+	
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
+	cp contrib/firmware/iax/*.bin $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
+	
+	# bristuff
 	$(MAKE) -C $(BRISTUFF_DIR) DESTDIR=$(CURDIR)/debian/tmp/bristuff install
 	mkdir -p $(CURDIR)/debian/tmp/bristuff/etc/default/
 	cp debian/asterisk.default $(CURDIR)/debian/tmp/bristuff/etc/default/asterisk




More information about the Pkg-voip-commits mailing list