OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Sep-2006 20:03:34
Branch: HEAD Handle: 2006091719033301
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec asterisk.txt
Log:
do not warn about signed/unsigned mismatches as Asterisk has too many
of them (and they do not really hurt here); add a zapata.conf
configuration file to make Asterisk happy if built with Zaptel support
Summary:
Revision Changes Path
1.18 +41 -35 openpkg-src/asterisk/asterisk.patch
1.16 +3 -0 openpkg-src/asterisk/asterisk.spec
1.15 +7 -0 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 16 Sep 2006 21:39:20 -0000
1.17
+++ openpkg-src/asterisk/asterisk.patch 17 Sep 2006 18:03:33 -0000
1.18
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-16 17:39:39 +0200
++++ Makefile 2006-09-17 19:59:40 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -75,7 +75,13 @@
ID=/usr/xpg4/bin/id
LN=/usr/xpg4/bin/ln
INSTALL=ginstall
-@@ -232,7 +215,15 @@
+@@ -227,12 +210,21 @@
+
+ INCLUDE+=-Iinclude -I../include
+ ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
#-DMAKE_VALGRIND_HAPPY
++ASTCFLAGS+=-Wno-sign-compare -Wno-pointer-sign
+ ASTCFLAGS+=$(OPTIMIZE)
+ ASTOBJ=-o asterisk
ifeq ($(findstring BSD,$(OSARCH)),BSD)
PROC=$(shell uname -m)
@@ -92,7 +98,7 @@
endif
ifneq ($(PROC),ultrasparc)
-@@ -252,29 +243,9 @@
+@@ -252,29 +244,9 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -124,7 +130,7 @@
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
-@@ -289,7 +260,7 @@
+@@ -289,7 +261,7 @@
ifeq ($(OSARCH),SunOS)
ASTCFLAGS+=-Wcast-align -DSOLARIS
@@ -133,7 +139,7 @@
ifeq ($(OSCPU),sun4u)
OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc
endif
-@@ -341,9 +312,9 @@
+@@ -341,9 +313,9 @@
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
@@ -148,7 +154,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-16 17:38:48 +0200
++++ agi/Makefile 2006-09-17 19:59:20 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -162,7 +168,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-16 17:38:48 +0200
++++ app_conference/Makefile 2006-09-17 19:59:20 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -234,7 +240,7 @@
# cp conf.conf /etc/asterisk/
Index: app_conference/app_conference.h
--- app_conference/app_conference.h.orig 2005-12-16 23:31:58 +0100
-+++ app_conference/app_conference.h 2006-09-16 17:38:48 +0200
++++ app_conference/app_conference.h 2006-09-17 19:59:20 +0200
@@ -33,6 +33,7 @@
#include <asterisk/channel.h>
#include <asterisk/file.h>
@@ -258,7 +264,7 @@
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-16 17:38:48 +0200
++++ app_conference/conference.c 2006-09-17 19:59:20 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -287,7 +293,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile 2006-09-16 17:38:48 +0200
++++ apps/Makefile 2006-09-17 19:59:20 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -311,7 +317,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: asterisk-addons-1.2.4/Makefile
--- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100
-+++ asterisk-addons-1.2.4/Makefile 2006-09-16 17:38:48 +0200
++++ asterisk-addons-1.2.4/Makefile 2006-09-17 19:59:20 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -335,7 +341,7 @@
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-16 17:38:48 +0200
++++ asterisk.c 2006-09-17 19:59:20 +0200
@@ -1902,9 +1902,9 @@
} else if (!strcasecmp(v->name, "astspooldir")) {
ast_copy_string(ast_config_AST_SPOOL_DIR, v->value,
sizeof(ast_config_AST_SPOOL_DIR));
@@ -349,7 +355,7 @@
ast_copy_string(ast_config_AST_LOG_DIR, v->value,
sizeof(ast_config_AST_LOG_DIR));
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200
-+++ build_tools/make_defaults_h 2006-09-16 17:38:48 +0200
++++ build_tools/make_defaults_h 2006-09-17 19:59:20 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
@@ -361,7 +367,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-16 17:38:48 +0200
++++ cdr/Makefile 2006-09-17 19:59:20 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -377,7 +383,7 @@
#This works for even old (2.96) versions of gcc and provides a small boost
either way.
Index: channels/Makefile
--- channels/Makefile.orig 2006-08-17 23:57:19 +0200
-+++ channels/Makefile 2006-09-16 17:38:48 +0200
++++ channels/Makefile 2006-09-17 19:59:20 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -391,7 +397,7 @@
PTLIB=-lpt_OpenBSD_x86_r
Index: channels/chan_h323.c
--- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200
-+++ channels/chan_h323.c 2006-09-16 17:38:48 +0200
++++ channels/chan_h323.c 2006-09-17 19:59:20 +0200
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@@ -402,7 +408,7 @@
#include <sys/param.h>
Index: channels/chan_iax2.c
--- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200
-+++ channels/chan_iax2.c 2006-09-16 17:38:48 +0200
++++ channels/chan_iax2.c 2006-09-17 19:59:20 +0200
@@ -2606,7 +2606,7 @@
struct ast_variable *var;
struct ast_variable *tmp;
@@ -427,7 +433,7 @@
} else if (!strcasecmp(tmp->name, "port")) {
Index: channels/chan_sip.c
--- channels/chan_sip.c.orig 2006-09-09 14:14:03 +0200
-+++ channels/chan_sip.c 2006-09-16 17:38:48 +0200
++++ channels/chan_sip.c 2006-09-17 19:59:20 +0200
@@ -12250,7 +12250,7 @@
int obproxyfound=0;
int found=0;
@@ -452,7 +458,7 @@
} else if (realtime && !strcasecmp(v->name, "name"))
Index: channels/chan_skinny.c
--- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200
-+++ channels/chan_skinny.c 2006-09-16 17:38:48 +0200
++++ channels/chan_skinny.c 2006-09-17 19:59:20 +0200
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@@ -464,7 +470,7 @@
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-09-16 17:38:48 +0200
++++ codecs/Makefile 2006-09-17 19:59:20 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -517,7 +523,7 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
Index: codecs/gsm/src/short_term.c
--- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100
-+++ codecs/gsm/src/short_term.c 2006-09-16 17:38:48 +0200
++++ codecs/gsm/src/short_term.c 2006-09-17 19:59:20 +0200
@@ -373,7 +373,6 @@
word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
@@ -528,7 +534,7 @@
# define FILTER (* (S->fast \
Index: codecs/lpc10/analys.c
--- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100
-+++ codecs/lpc10/analys.c 2006-09-16 17:38:48 +0200
++++ codecs/lpc10/analys.c 2006-09-17 19:59:20 +0200
@@ -32,7 +32,7 @@
#include "f2c.h"
@@ -540,7 +546,7 @@
/*:ref: preemp_ 14 5 6 6 4 6 6 */
Index: dns.c
--- dns.c.orig 2005-11-29 19:24:39 +0100
-+++ dns.c 2006-09-16 17:38:48 +0200
++++ dns.c 2006-09-17 19:59:20 +0200
@@ -194,9 +194,7 @@
int res, ret = -1;
@@ -553,7 +559,7 @@
#else
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-09-16 17:38:48 +0200
++++ formats/Makefile 2006-09-17 19:59:20 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -567,7 +573,7 @@
Index: formats/msgsm.h
--- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100
-+++ formats/msgsm.h 2006-09-16 17:38:48 +0200
++++ formats/msgsm.h 2006-09-17 19:59:20 +0200
@@ -562,6 +562,7 @@
xmc[46] = sr & 0x7; sr >>= 3;
xmc[47] = sr & 0x7; sr >>= 3;
@@ -578,7 +584,7 @@
xmc[50] = sr & 0x7; sr >>= 3;
Index: frame.c
--- frame.c.orig 2006-07-31 06:06:16 +0200
-+++ frame.c 2006-09-16 17:38:48 +0200
++++ frame.c 2006-09-17 19:59:20 +0200
@@ -1055,7 +1055,7 @@
{
switch(buf & TYPE_MASK) {
@@ -590,7 +596,7 @@
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-09-16 17:38:48 +0200
++++ funcs/Makefile 2006-09-17 19:59:20 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -604,7 +610,7 @@
Index: funcs/func_strings.c
--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100
-+++ funcs/func_strings.c 2006-09-16 17:38:48 +0200
++++ funcs/func_strings.c 2006-09-17 19:59:20 +0200
@@ -169,7 +169,7 @@
epochi = tv.tv_sec;
}
@@ -616,7 +622,7 @@
format = "%c";
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-09-16 17:38:48 +0200
++++ pbx/Makefile 2006-09-17 19:59:20 +0200
@@ -14,9 +14,7 @@
PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so
pbx_realtime.so \
pbx_ael.so
@@ -630,7 +636,7 @@
#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null
2>/dev/null && echo "pbx_gtkconsole.so")
Index: res/Makefile
--- res/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ res/Makefile 2006-09-16 17:38:48 +0200
++++ res/Makefile 2006-09-17 19:59:20 +0200
@@ -36,10 +36,8 @@
endif
endif
@@ -646,7 +652,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: res/res_features.c
--- res/res_features.c.orig 2006-08-02 01:07:06 +0200
-+++ res/res_features.c 2006-09-16 17:38:48 +0200
++++ res/res_features.c 2006-09-17 19:59:20 +0200
@@ -505,13 +505,13 @@
if (touch_monitor) {
len = strlen(touch_monitor) + 50;
@@ -665,7 +671,7 @@
for( x = 0; x < strlen(args); x++)
Index: rtp.c
--- rtp.c.orig 2006-09-01 19:35:06 +0200
-+++ rtp.c 2006-09-16 17:38:48 +0200
++++ rtp.c 2006-09-17 19:59:20 +0200
@@ -962,8 +962,10 @@
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;
@@ -680,7 +686,7 @@
(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
Index: say.c
--- say.c.orig 2005-11-29 19:24:39 +0100
-+++ say.c 2006-09-16 17:38:48 +0200
++++ say.c 2006-09-17 19:59:20 +0200
@@ -3133,7 +3133,7 @@
time_t beg_today;
@@ -872,7 +878,7 @@
beg_today = now.tv_sec - (tmnow.tm_hour * 3600)
- (tmnow.tm_min * 60) - (tmnow.tm_sec);
Index: utils.c
--- utils.c.orig 2006-07-12 15:54:10 +0200
-+++ utils.c 2006-09-16 17:38:48 +0200
++++ utils.c 2006-09-17 19:59:20 +0200
@@ -63,6 +63,8 @@
/* duh? ERANGE value copied from web... */
#define ERANGE 34
@@ -884,7 +890,7 @@
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-09-16 17:38:48 +0200
++++ utils/Makefile 2006-09-17 19:59:20 +0200
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 17 Sep 2006 07:38:03 -0000
1.15
+++ openpkg-src/asterisk/asterisk.spec 17 Sep 2006 18:03:33 -0000
1.16
@@ -205,6 +205,9 @@
# install default configuration
for name in `grep "^<file" %{SOURCE asterisk.txt} | sed -e
's;^.*name=";;' -e 's;".*$;;'`; do
+%if "%{with_zaptel}" == "no"
+ [ ".$name" = ".zapata.conf" ] && continue
+%endif
(echo ""; cat %{SOURCE asterisk.txt}; echo "") |\
sed -e "1,/^<file name=\"$name\">/d" -e "/<\/file>/,\$d" >$name
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.14 -r1.15 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 17 Sep 2006 17:53:08 -0000 1.14
+++ openpkg-src/asterisk/asterisk.txt 17 Sep 2006 18:03:34 -0000 1.15
@@ -460,3 +460,10 @@
genericplc = true
</file>
+<file name="zapata.conf">
+;;
+;; zapata.conf -- Asterisk Zap channel configuration
+;;
+
+; (an empty configuration is ok, but required even for dummy Zaptel
support)
+</file>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
