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: 19-Oct-2006 07:45:15
Branch: HEAD Handle: 2006101906451301
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.2.12.1 -> 1.2.13
Summary:
Revision Changes Path
1.20 +47 -47 openpkg-src/asterisk/asterisk.patch
1.27 +3 -3 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 13 Oct 2006 20:56:30 -0000
1.19
+++ openpkg-src/asterisk/asterisk.patch 19 Oct 2006 05:45:13 -0000
1.20
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-09-06 22:09:10 +0200
-+++ Makefile 2006-10-13 22:45:33 +0200
++++ Makefile 2006-10-19 07:38:26 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -191,7 +191,7 @@
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-10-13 22:45:33 +0200
++++ agi/Makefile 2006-10-19 07:38:26 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -205,7 +205,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-10-13 22:45:33 +0200
++++ app_conference/Makefile 2006-10-19 07:38:26 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -287,7 +287,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-10-13 22:45:33 +0200
++++ app_conference/app_conference.h 2006-10-19 07:38:26 +0200
@@ -33,6 +33,7 @@
#include <asterisk/channel.h>
#include <asterisk/file.h>
@@ -311,7 +311,7 @@
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-10-13 22:45:33 +0200
++++ app_conference/conference.c 2006-10-19 07:38:26 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -340,7 +340,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile 2006-10-13 22:45:33 +0200
++++ apps/Makefile 2006-10-19 07:38:26 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -362,9 +362,9 @@
ifeq (${OSARCH},CYGWIN)
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-10-13 22:45:33 +0200
+Index: asterisk-addons-1.2.5/Makefile
+--- asterisk-addons-1.2.5/Makefile.orig 2005-12-02 00:14:28 +0100
++++ asterisk-addons-1.2.5/Makefile 2006-10-19 07:38:26 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -388,7 +388,7 @@
Index: asterisk-sounds-1.2.1/Makefile
--- asterisk-sounds-1.2.1/Makefile.orig 2005-12-02 00:20:51 +0100
-+++ asterisk-sounds-1.2.1/Makefile 2006-10-13 22:45:55 +0200
++++ asterisk-sounds-1.2.1/Makefile 2006-10-19 07:38:26 +0200
@@ -66,7 +66,7 @@
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
for x in sounds/letters/*.gsm; do \
@@ -444,8 +444,8 @@
echo "No description for $$x"; \
exit 1; \
Index: asterisk.c
---- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-10-13 22:45:33 +0200
+--- asterisk.c.orig 2006-09-26 22:49:21 +0200
++++ asterisk.c 2006-10-19 07:38:26 +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));
@@ -459,7 +459,7 @@
ast_copy_string(ast_config_AST_LOG_DIR, v->value,
sizeof(ast_config_AST_LOG_DIR));
Index: build_tools/make_build_h
--- build_tools/make_build_h.orig 2006-03-03 18:13:37 +0100
-+++ build_tools/make_build_h 2006-10-13 22:45:33 +0200
++++ build_tools/make_build_h 2006-10-19 07:38:26 +0200
@@ -4,7 +4,11 @@
MACHINE=`uname -m`
OS=`uname -s`
@@ -474,7 +474,7 @@
fi
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-10-13 22:45:33 +0200
++++ build_tools/make_defaults_h 2006-10-19 07:38:26 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
@@ -485,8 +485,8 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
---- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-10-13 22:45:33 +0200
+--- cdr/Makefile.orig 2006-09-21 18:18:19 +0200
++++ cdr/Makefile 2006-10-19 07:38:26 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -502,7 +502,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-10-13 22:45:33 +0200
++++ channels/Makefile 2006-10-19 07:38:26 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -516,7 +516,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-10-13 22:45:33 +0200
++++ channels/chan_h323.c 2006-10-19 07:38:26 +0200
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@@ -526,9 +526,9 @@
#include <sys/signal.h>
#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-10-13 22:45:33 +0200
-@@ -2606,7 +2606,7 @@
+--- channels/chan_iax2.c.orig 2006-10-13 18:18:08 +0200
++++ channels/chan_iax2.c 2006-10-19 07:38:26 +0200
+@@ -2607,7 +2607,7 @@
struct ast_variable *var;
struct ast_variable *tmp;
struct iax2_peer *peer=NULL;
@@ -537,7 +537,7 @@
int dynamic=0;
if (peername)
-@@ -2647,8 +2647,10 @@
+@@ -2648,8 +2648,10 @@
break;
}
} else if (!strcasecmp(tmp->name, "regseconds")) {
@@ -551,9 +551,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-09-09 14:14:03 +0200
-+++ channels/chan_sip.c 2006-10-13 22:45:33 +0200
-@@ -12250,7 +12250,7 @@
+--- channels/chan_sip.c.orig 2006-10-17 22:37:17 +0200
++++ channels/chan_sip.c 2006-10-19 07:38:26 +0200
+@@ -12298,7 +12298,7 @@
int obproxyfound=0;
int found=0;
int format=0; /* Ama flags */
@@ -562,7 +562,7 @@
char *varname = NULL, *varval = NULL;
struct ast_variable *tmpvar = NULL;
struct ast_flags peerflags = {(0)};
-@@ -12333,8 +12333,10 @@
+@@ -12381,8 +12381,10 @@
}
if (realtime && !strcasecmp(v->name, "regseconds")) {
@@ -576,8 +576,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-30 20:59:44 +0200
-+++ channels/chan_skinny.c 2006-10-13 22:45:33 +0200
+--- channels/chan_skinny.c.orig 2006-10-17 19:50:36 +0200
++++ channels/chan_skinny.c 2006-10-19 07:38:26 +0200
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@@ -589,7 +589,7 @@
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-10-13 22:45:33 +0200
++++ codecs/Makefile 2006-10-19 07:38:26 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -642,7 +642,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-10-13 22:45:33 +0200
++++ codecs/gsm/src/short_term.c 2006-10-19 07:38:26 +0200
@@ -373,7 +373,6 @@
word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
@@ -653,7 +653,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-10-13 22:45:33 +0200
++++ codecs/lpc10/analys.c 2006-10-19 07:38:26 +0200
@@ -32,7 +32,7 @@
#include "f2c.h"
@@ -665,7 +665,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-10-13 22:45:33 +0200
++++ dns.c 2006-10-19 07:38:26 +0200
@@ -194,9 +194,7 @@
int res, ret = -1;
@@ -678,7 +678,7 @@
#else
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-10-13 22:45:33 +0200
++++ formats/Makefile 2006-10-19 07:38:26 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -692,7 +692,7 @@
Index: formats/msgsm.h
--- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100
-+++ formats/msgsm.h 2006-10-13 22:45:33 +0200
++++ formats/msgsm.h 2006-10-19 07:38:26 +0200
@@ -562,6 +562,7 @@
xmc[46] = sr & 0x7; sr >>= 3;
xmc[47] = sr & 0x7; sr >>= 3;
@@ -702,8 +702,8 @@
sr |= (uword)*c++ << 2;
xmc[50] = sr & 0x7; sr >>= 3;
Index: frame.c
---- frame.c.orig 2006-07-31 06:06:16 +0200
-+++ frame.c 2006-10-13 22:45:33 +0200
+--- frame.c.orig 2006-09-28 20:00:30 +0200
++++ frame.c 2006-10-19 07:38:26 +0200
@@ -1055,7 +1055,7 @@
{
switch(buf & TYPE_MASK) {
@@ -715,7 +715,7 @@
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-10-13 22:45:33 +0200
++++ funcs/Makefile 2006-10-19 07:38:26 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -729,7 +729,7 @@
Index: funcs/func_strings.c
--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100
-+++ funcs/func_strings.c 2006-10-13 22:45:33 +0200
++++ funcs/func_strings.c 2006-10-19 07:38:26 +0200
@@ -169,7 +169,7 @@
epochi = tv.tv_sec;
}
@@ -741,7 +741,7 @@
format = "%c";
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-10-13 22:45:33 +0200
++++ pbx/Makefile 2006-10-19 07:38:26 +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
@@ -755,7 +755,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-10-13 22:45:33 +0200
++++ res/Makefile 2006-10-19 07:38:26 +0200
@@ -36,10 +36,8 @@
endif
endif
@@ -770,8 +770,8 @@
ifeq (${OSARCH},CYGWIN)
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-10-13 22:45:33 +0200
+--- res/res_features.c.orig 2006-09-28 20:00:30 +0200
++++ res/res_features.c 2006-10-19 07:38:26 +0200
@@ -505,13 +505,13 @@
if (touch_monitor) {
len = strlen(touch_monitor) + 50;
@@ -790,7 +790,7 @@
for( x = 0; x < strlen(args); x++)
Index: rtp.c
--- rtp.c.orig 2006-09-01 19:35:06 +0200
-+++ rtp.c 2006-10-13 22:45:33 +0200
++++ rtp.c 2006-10-19 07:38:26 +0200
@@ -962,8 +962,10 @@
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;
@@ -805,7 +805,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-10-13 22:45:33 +0200
++++ say.c 2006-10-19 07:38:26 +0200
@@ -3133,7 +3133,7 @@
time_t beg_today;
@@ -996,8 +996,8 @@
/* In any case, it saves not having to do
ast_mktime() */
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-10-13 22:45:33 +0200
+--- utils.c.orig 2006-10-12 20:31:26 +0200
++++ utils.c 2006-10-19 07:38:26 +0200
@@ -63,6 +63,8 @@
/* duh? ERANGE value copied from web... */
#define ERANGE 34
@@ -1009,7 +1009,7 @@
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-10-13 22:45:33 +0200
++++ utils/Makefile 2006-10-19 07:38:26 +0200
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 15 Oct 2006 13:32:06 -0000
1.26
+++ openpkg-src/asterisk/asterisk.spec 19 Oct 2006 05:45:14 -0000
1.27
@@ -23,8 +23,8 @@
##
# package version
-%define V_asterisk 1.2.12.1
-%define V_asterisk_addons 1.2.4
+%define V_asterisk 1.2.13
+%define V_asterisk_addons 1.2.5
%define V_asterisk_sounds 1.2.1
%define V_app_conference 20051216
%define V_asterisk_perl 0.09
@@ -40,7 +40,7 @@
Group: VoIP
License: GPL
Version: %{V_asterisk}
-Release: 20061015
+Release: 20061019
# package options
%option with_zaptel no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
