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: 09-Sep-2006 19:35:53 Branch: HEAD Handle: 2006090918355300 Modified files: openpkg-src/asterisk asterisk.patch Log: fix one more potential segfault situation related to ast_localtime usage Summary: Revision Changes Path 1.10 +48 -36 openpkg-src/asterisk/asterisk.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.patch ============================================================================ $ cvs diff -u -r1.9 -r1.10 asterisk.patch --- openpkg-src/asterisk/asterisk.patch 8 Sep 2006 06:59:15 -0000 1.9 +++ openpkg-src/asterisk/asterisk.patch 9 Sep 2006 17:35:53 -0000 1.10 @@ -1,6 +1,6 @@ Index: Makefile ---- Makefile.orig 2006-06-29 21:23:18 +0200 -+++ Makefile 2006-09-08 08:39:22 +0200 +--- Makefile.orig 2006-09-06 22:09:10 +0200 ++++ Makefile 2006-09-09 19:28:53 +0200 @@ -110,35 +110,19 @@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE @@ -112,7 +112,7 @@ endif Index: agi/Makefile --- agi/Makefile.orig 2006-03-28 22:22:05 +0200 -+++ agi/Makefile 2006-09-08 08:39:22 +0200 ++++ agi/Makefile 2006-09-09 19:28:53 +0200 @@ -20,9 +20,7 @@ LIBS=-lsocket -lnsl ../strcompat.o endif @@ -126,7 +126,7 @@ Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/Makefile 2006-09-08 08:39:22 +0200 ++++ app_conference/Makefile 2006-09-09 19:28:53 +0200 @@ -20,10 +20,10 @@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules @@ -186,7 +186,7 @@ # cp conf.conf /etc/asterisk/ Index: app_conference/conference.c --- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/conference.c 2006-09-08 08:43:40 +0200 ++++ app_conference/conference.c 2006-09-09 19:28:53 +0200 @@ -568,7 +568,6 @@ conf->memberlist = NULL ; @@ -215,7 +215,7 @@ Index: apps/Makefile --- apps/Makefile.orig 2006-04-30 15:38:22 +0200 -+++ apps/Makefile 2006-09-08 08:39:22 +0200 ++++ apps/Makefile 2006-09-09 19:28:53 +0200 @@ -54,16 +54,11 @@ APPS+=app_osplookup.so endif @@ -239,7 +239,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-08 08:39:22 +0200 ++++ asterisk-addons-1.2.4/Makefile 2006-09-09 19:28:53 +0200 @@ -27,17 +27,9 @@ # # MySQL stuff... Autoconf anyone?? @@ -263,7 +263,7 @@ Index: asterisk.c --- asterisk.c.orig 2006-08-22 00:34:26 +0200 -+++ asterisk.c 2006-09-08 08:39:22 +0200 ++++ asterisk.c 2006-09-09 19:28:53 +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)); @@ -277,7 +277,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-08 08:39:22 +0200 ++++ build_tools/make_defaults_h 2006-09-09 19:28:53 +0200 @@ -14,7 +14,7 @@ #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}" #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}" @@ -289,7 +289,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-08 08:39:22 +0200 ++++ cdr/Makefile 2006-09-09 19:28:53 +0200 @@ -20,10 +20,8 @@ CFLAGS+=-fPIC endif @@ -305,7 +305,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-08 08:39:22 +0200 ++++ channels/Makefile 2006-09-09 19:28:53 +0200 @@ -21,9 +21,7 @@ #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so endif @@ -318,8 +318,8 @@ ifeq (${OSARCH},OpenBSD) PTLIB=-lpt_OpenBSD_x86_r Index: channels/chan_h323.c ---- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200 -+++ channels/chan_h323.c 2006-09-08 08:39:22 +0200 +--- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200 ++++ channels/chan_h323.c 2006-09-09 19:28:53 +0200 @@ -31,6 +31,7 @@ * \ingroup channel_drivers */ @@ -329,8 +329,8 @@ #include <sys/signal.h> #include <sys/param.h> Index: channels/chan_iax2.c ---- channels/chan_iax2.c.orig 2006-08-05 07:08:50 +0200 -+++ channels/chan_iax2.c 2006-09-08 08:39:22 +0200 +--- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200 ++++ channels/chan_iax2.c 2006-09-09 19:28:53 +0200 @@ -2606,7 +2606,7 @@ struct ast_variable *var; struct ast_variable *tmp; @@ -354,9 +354,9 @@ inet_aton(tmp->value, &(peer->addr.sin_addr)); } else if (!strcasecmp(tmp->name, "port")) { Index: channels/chan_sip.c ---- channels/chan_sip.c.orig 2006-08-20 06:49:48 +0200 -+++ channels/chan_sip.c 2006-09-08 08:39:22 +0200 -@@ -12232,7 +12232,7 @@ +--- channels/chan_sip.c.orig 2006-09-04 17:46:07 +0200 ++++ channels/chan_sip.c 2006-09-09 19:28:53 +0200 +@@ -12252,7 +12252,7 @@ int obproxyfound=0; int found=0; int format=0; /* Ama flags */ @@ -365,7 +365,7 @@ char *varname = NULL, *varval = NULL; struct ast_variable *tmpvar = NULL; struct ast_flags peerflags = {(0)}; -@@ -12315,8 +12315,10 @@ +@@ -12335,8 +12335,10 @@ } if (realtime && !strcasecmp(v->name, "regseconds")) { @@ -379,8 +379,8 @@ inet_aton(v->value, &(peer->addr.sin_addr)); } else if (realtime && !strcasecmp(v->name, "name")) Index: channels/chan_skinny.c ---- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200 -+++ channels/chan_skinny.c 2006-09-08 08:39:22 +0200 +--- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200 ++++ channels/chan_skinny.c 2006-09-09 19:28:53 +0200 @@ -99,7 +99,7 @@ #define htolel(x) (x) #define htoles(x) (x) @@ -392,7 +392,7 @@ (((x) & 0x00ff) << 8)) Index: codecs/Makefile --- codecs/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ codecs/Makefile 2006-09-08 08:39:22 +0200 ++++ codecs/Makefile 2006-09-09 19:28:53 +0200 @@ -28,45 +28,16 @@ LIBG723B=g723.1b/libg723b.a endif @@ -445,7 +445,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-08 08:39:22 +0200 ++++ codecs/gsm/src/short_term.c 2006-09-09 19:28:53 +0200 @@ -373,7 +373,6 @@ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; @@ -456,7 +456,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-08 08:39:22 +0200 ++++ codecs/lpc10/analys.c 2006-09-09 19:28:53 +0200 @@ -32,7 +32,7 @@ #include "f2c.h" @@ -468,7 +468,7 @@ /*:ref: preemp_ 14 5 6 6 4 6 6 */ Index: formats/Makefile --- formats/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ formats/Makefile 2006-09-08 08:39:22 +0200 ++++ formats/Makefile 2006-09-09 19:28:53 +0200 @@ -29,9 +29,7 @@ FORMAT_LIBS+=format_ogg_vorbis.so endif @@ -482,7 +482,7 @@ Index: formats/msgsm.h --- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100 -+++ formats/msgsm.h 2006-09-08 08:39:22 +0200 ++++ formats/msgsm.h 2006-09-09 19:28:53 +0200 @@ -562,6 +562,7 @@ xmc[46] = sr & 0x7; sr >>= 3; xmc[47] = sr & 0x7; sr >>= 3; @@ -493,7 +493,7 @@ xmc[50] = sr & 0x7; sr >>= 3; Index: frame.c --- frame.c.orig 2006-07-31 06:06:16 +0200 -+++ frame.c 2006-09-08 08:39:22 +0200 ++++ frame.c 2006-09-09 19:28:53 +0200 @@ -1055,7 +1055,7 @@ { switch(buf & TYPE_MASK) { @@ -505,7 +505,7 @@ return 4; Index: funcs/Makefile --- funcs/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ funcs/Makefile 2006-09-08 08:39:22 +0200 ++++ funcs/Makefile 2006-09-09 19:28:53 +0200 @@ -40,9 +40,7 @@ CFLAGS+=-fPIC endif @@ -517,9 +517,21 @@ all: $(FUNCS) +Index: funcs/func_strings.c +--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100 ++++ funcs/func_strings.c 2006-09-09 19:30:57 +0200 +@@ -169,7 +169,7 @@ + epochi = tv.tv_sec; + } + +- ast_localtime(&epochi, &time, timezone); ++ { time_t t = (time_t)epochi; ast_localtime(&t, &time, timezone); } + + if (!format) { + format = "%c"; Index: pbx/Makefile --- pbx/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ pbx/Makefile 2006-09-08 08:39:22 +0200 ++++ pbx/Makefile 2006-09-09 19:28:53 +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 @@ -533,7 +545,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-08 08:39:22 +0200 ++++ res/Makefile 2006-09-09 19:28:53 +0200 @@ -36,10 +36,8 @@ endif endif @@ -549,7 +561,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-08 08:39:22 +0200 ++++ res/res_features.c 2006-09-09 19:28:53 +0200 @@ -505,13 +505,13 @@ if (touch_monitor) { len = strlen(touch_monitor) + 50; @@ -567,8 +579,8 @@ for( x = 0; x < strlen(args); x++) Index: rtp.c ---- rtp.c.orig 2006-07-13 20:44:17 +0200 -+++ rtp.c 2006-09-08 08:39:22 +0200 +--- rtp.c.orig 2006-09-01 19:35:06 +0200 ++++ rtp.c 2006-09-09 19:28:53 +0200 @@ -962,8 +962,10 @@ rtp->us.sin_port = htons(x); rtp->us.sin_addr = addr; @@ -583,7 +595,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-08 08:39:22 +0200 ++++ say.c 2006-09-09 19:28:53 +0200 @@ -3133,7 +3133,7 @@ time_t beg_today; @@ -775,7 +787,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-08 08:39:22 +0200 ++++ utils.c 2006-09-09 19:28:53 +0200 @@ -58,7 +58,10 @@ static char base64[64]; static char b2a[256]; @@ -790,7 +802,7 @@ #define ERANGE 34 Index: utils/Makefile --- utils/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ utils/Makefile 2006-09-08 08:39:22 +0200 ++++ utils/Makefile 2006-09-09 19:28:53 +0200 @@ -16,17 +16,15 @@ # CFLAGS+=-DNO_AST_MM @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org