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: 23-Dec-2006 11:47:28
Branch: HEAD Handle: 2006122310472700
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
move subst into %build section and add IAX library
Summary:
Revision Changes Path
1.23 +88 -33 openpkg-src/asterisk/asterisk.patch
1.31 +39 -14 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 16 Dec 2006 11:30:21 -0000
1.22
+++ openpkg-src/asterisk/asterisk.patch 23 Dec 2006 10:47:27 -0000
1.23
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-12-11 22:55:43 +0100
-+++ Makefile 2006-12-16 12:07:50 +0100
++++ Makefile 2006-12-23 11:34:46 +0100
@@ -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-12-16 12:07:50 +0100
++++ agi/Makefile 2006-12-23 11:34:46 +0100
@@ -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-12-16 12:07:50 +0100
++++ app_conference/Makefile 2006-12-23 11:34:46 +0100
@@ -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-12-16 12:07:50 +0100
++++ app_conference/app_conference.h 2006-12-23 11:34:46 +0100
@@ -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-12-16 12:07:50 +0100
++++ app_conference/conference.c 2006-12-23 11:34:46 +0100
@@ -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-12-16 12:07:50 +0100
++++ apps/Makefile 2006-12-23 11:34:46 +0100
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -364,7 +364,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
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-12-16 12:07:50 +0100
++++ asterisk-addons-1.2.5/Makefile 2006-12-23 11:34:46 +0100
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -386,9 +386,17 @@
OSARCH=$(shell uname -s)
+Index: asterisk-perl-0.09/Makefile.PL
+--- asterisk-perl-0.09/Makefile.PL.orig 2006-12-23 11:35:36 +0100
++++ asterisk-perl-0.09/Makefile.PL 2006-12-23 11:35:36 +0100
+@@ -14,3 +14,4 @@
+ },
+ );
+
++
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-12-16 12:07:50 +0100
++++ asterisk-sounds-1.2.1/Makefile 2006-12-23 11:34:46 +0100
@@ -66,7 +66,7 @@
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
for x in sounds/letters/*.gsm; do \
@@ -445,7 +453,7 @@
exit 1; \
Index: asterisk.c
--- asterisk.c.orig 2006-10-27 19:36:07 +0200
-+++ asterisk.c 2006-12-16 12:07:50 +0100
++++ asterisk.c 2006-12-23 11:34:46 +0100
@@ -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 +467,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-12-16 12:07:50 +0100
++++ build_tools/make_build_h 2006-12-23 11:34:46 +0100
@@ -4,7 +4,11 @@
MACHINE=`uname -m`
OS=`uname -s`
@@ -474,7 +482,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-12-16 12:07:50 +0100
++++ build_tools/make_defaults_h 2006-12-23 11:34:46 +0100
@@ -14,7 +14,7 @@
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
@@ -486,7 +494,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-11-16 21:29:28 +0100
-+++ cdr/Makefile 2006-12-16 12:07:50 +0100
++++ cdr/Makefile 2006-12-23 11:34:46 +0100
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -502,7 +510,7 @@
#This works for even old (2.96) versions of gcc and provides a small boost
either way.
Index: chan_capi_1_6_1/Makefile
--- chan_capi_1_6_1/Makefile.orig 2006-06-21 17:06:35 +0200
-+++ chan_capi_1_6_1/Makefile 2006-12-16 12:07:50 +0100
++++ chan_capi_1_6_1/Makefile 2006-12-23 11:34:46 +0100
@@ -10,38 +10,14 @@
INSTALL_PREFIX=
@@ -556,7 +564,7 @@
CFLAGS+=-Wformat
Index: channels/Makefile
--- channels/Makefile.orig 2006-08-17 23:57:19 +0200
-+++ channels/Makefile 2006-12-16 12:07:50 +0100
++++ channels/Makefile 2006-12-23 11:34:46 +0100
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -570,7 +578,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-12-16 12:07:50 +0100
++++ channels/chan_h323.c 2006-12-23 11:34:46 +0100
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@@ -581,7 +589,7 @@
#include <sys/param.h>
Index: channels/chan_iax2.c
--- channels/chan_iax2.c.orig 2006-12-09 16:45:37 +0100
-+++ channels/chan_iax2.c 2006-12-16 12:07:50 +0100
++++ channels/chan_iax2.c 2006-12-23 11:34:46 +0100
@@ -2608,7 +2608,7 @@
struct ast_variable *var;
struct ast_variable *tmp;
@@ -606,7 +614,7 @@
} else if (!strcasecmp(tmp->name, "port")) {
Index: channels/chan_sip.c
--- channels/chan_sip.c.orig 2006-12-06 16:42:41 +0100
-+++ channels/chan_sip.c 2006-12-16 12:07:50 +0100
++++ channels/chan_sip.c 2006-12-23 11:34:46 +0100
@@ -12341,7 +12341,7 @@
int obproxyfound=0;
int found=0;
@@ -631,7 +639,7 @@
} else if (realtime && !strcasecmp(v->name, "name"))
Index: channels/chan_skinny.c
--- channels/chan_skinny.c.orig 2006-10-26 19:08:40 +0200
-+++ channels/chan_skinny.c 2006-12-16 12:07:50 +0100
++++ channels/chan_skinny.c 2006-12-23 11:34:46 +0100
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@@ -643,7 +651,7 @@
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-12-16 12:07:50 +0100
++++ codecs/Makefile 2006-12-23 11:34:46 +0100
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -696,7 +704,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-12-16 12:07:50 +0100
++++ codecs/gsm/src/short_term.c 2006-12-23 11:34:46 +0100
@@ -373,7 +373,6 @@
word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
@@ -707,7 +715,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-12-16 12:07:50 +0100
++++ codecs/lpc10/analys.c 2006-12-23 11:34:46 +0100
@@ -32,7 +32,7 @@
#include "f2c.h"
@@ -719,7 +727,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-12-16 12:07:50 +0100
++++ dns.c 2006-12-23 11:34:46 +0100
@@ -194,9 +194,7 @@
int res, ret = -1;
@@ -732,7 +740,7 @@
#else
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-12-16 12:07:50 +0100
++++ formats/Makefile 2006-12-23 11:34:46 +0100
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -746,7 +754,7 @@
Index: formats/msgsm.h
--- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100
-+++ formats/msgsm.h 2006-12-16 12:07:50 +0100
++++ formats/msgsm.h 2006-12-23 11:34:46 +0100
@@ -562,6 +562,7 @@
xmc[46] = sr & 0x7; sr >>= 3;
xmc[47] = sr & 0x7; sr >>= 3;
@@ -757,7 +765,7 @@
xmc[50] = sr & 0x7; sr >>= 3;
Index: frame.c
--- frame.c.orig 2006-11-20 20:50:21 +0100
-+++ frame.c 2006-12-16 12:07:50 +0100
++++ frame.c 2006-12-23 11:34:46 +0100
@@ -1059,7 +1059,7 @@
{
switch(buf & TYPE_MASK) {
@@ -769,7 +777,7 @@
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-12-16 12:07:50 +0100
++++ funcs/Makefile 2006-12-23 11:34:46 +0100
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -783,7 +791,7 @@
Index: funcs/func_strings.c
--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100
-+++ funcs/func_strings.c 2006-12-16 12:07:50 +0100
++++ funcs/func_strings.c 2006-12-23 11:34:46 +0100
@@ -169,7 +169,7 @@
epochi = tv.tv_sec;
}
@@ -793,9 +801,56 @@
if (!format) {
format = "%c";
+Index: iax-0.2.2/src/Makefile.in
+--- iax-0.2.2/src/Makefile.in.orig 2001-11-13 18:45:14 +0100
++++ iax-0.2.2/src/Makefile.in 2006-12-23 11:39:21 +0100
+@@ -71,7 +71,7 @@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+-CFLAGS = -g -Wall -Wstrict-prototypes -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT
$(UCFLAGS)
++CFLAGS = -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS)
+
+ pkgdir = $(libdir)
+ pkg_LTLIBRARIES = libiax.la
+@@ -304,12 +304,11 @@
+
+
+ install:
+- mkdir -p $(includedir)/iax
+- install -m 644 md5.h $(includedir)/iax
+- install -m 644 frame.h $(includedir)/iax
+- install -m 644 iax.h $(includedir)/iax
+- install -m 644 iax-client.h $(includedir)/iax
+- /sbin/ldconfig
++ mkdir -p $(DESTDIR)$(includedir)/iax
++ install -m 644 md5.h $(DESTDIR)$(includedir)/iax
++ install -m 644 frame.h $(DESTDIR)$(includedir)/iax
++ install -m 644 iax.h $(DESTDIR)$(includedir)/iax
++ install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: iax-0.2.2/src/iax.c
+--- iax-0.2.2/src/iax.c.orig 2001-11-07 00:10:41 +0100
++++ iax-0.2.2/src/iax.c 2006-12-23 11:34:46 +0100
+@@ -33,13 +33,11 @@
+ #include <sys/time.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-12-16 12:07:50 +0100
++++ pbx/Makefile 2006-12-23 11:34:46 +0100
@@ -14,9 +14,7 @@
PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so
pbx_realtime.so \
pbx_ael.so
@@ -809,7 +864,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-12-16 12:07:50 +0100
++++ res/Makefile 2006-12-23 11:34:46 +0100
@@ -36,10 +36,8 @@
endif
endif
@@ -825,7 +880,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: res/res_features.c
--- res/res_features.c.orig 2006-11-30 20:04:11 +0100
-+++ res/res_features.c 2006-12-16 12:07:50 +0100
++++ res/res_features.c 2006-12-23 11:34:46 +0100
@@ -505,13 +505,13 @@
if (touch_monitor) {
len = strlen(touch_monitor) + 50;
@@ -844,7 +899,7 @@
for( x = 0; x < strlen(args); x++)
Index: say.c
--- say.c.orig 2005-11-29 19:24:39 +0100
-+++ say.c 2006-12-16 12:07:50 +0100
++++ say.c 2006-12-23 11:34:46 +0100
@@ -3133,7 +3133,7 @@
time_t beg_today;
@@ -1036,7 +1091,7 @@
beg_today = now.tv_sec - (tmnow.tm_hour * 3600)
- (tmnow.tm_min * 60) - (tmnow.tm_sec);
Index: utils.c
--- utils.c.orig 2006-10-31 07:18:36 +0100
-+++ utils.c 2006-12-16 12:07:50 +0100
++++ utils.c 2006-12-23 11:34:46 +0100
@@ -63,6 +63,8 @@
/* duh? ERANGE value copied from web... */
#define ERANGE 34
@@ -1048,7 +1103,7 @@
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-12-16 12:07:50 +0100
++++ utils/Makefile 2006-12-23 11:34:46 +0100
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 23 Dec 2006 10:14:46 -0000
1.30
+++ openpkg-src/asterisk/asterisk.spec 23 Dec 2006 10:47:27 -0000
1.31
@@ -26,6 +26,7 @@
%define V_asterisk 1.2.14
%define V_asterisk_addons 1.2.5
%define V_asterisk_sounds 1.2.1
+%define V_asterisk_libiax 0.2.2
%define V_app_conference 20051216
%define V_asterisk_perl 0.09
%define V_chan_capi 1_6_1
@@ -52,11 +53,12 @@
Source0:
ftp://ftp.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
Source1:
ftp://ftp.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
Source2:
ftp://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-%{V_asterisk_sounds}.tar.gz
-Source3:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/asterisk/app_conference-%{V_app_conference}.tar.gz
-Source4:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
-Source5:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
-Source6: asterisk.txt
-Source7: rc.asterisk
+Source3: ftp://ftp.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
+Source4:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/asterisk/app_conference-%{V_app_conference}.tar.gz
+Source5:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
+Source6:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
+Source7: asterisk.txt
+Source8: rc.asterisk
Patch0: asterisk.patch
# build information
@@ -108,6 +110,11 @@
url = ftp://ftp.digium.com/pub/asterisk/releases/
regex = asterisk-sounds-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
+ prog asterisk:libiax = {
+ version = %{V_asterisk_libiax}
+ url = ftp://ftp.digium.com/pub/libiax/
+ regex = iax-(\d+\.\d+(\.\d+)+)\.tar\.gz
+ }
prog asterisk:agi = {
version = %{V_asterisk_perl}
url = http://asterisk.gnuinter.net/files/
@@ -126,16 +133,8 @@
%setup -q -D -T -a 3
%setup -q -D -T -a 4
%setup -q -D -T -a 5
+ %setup -q -D -T -a 6
%patch -p0
-%if "%{with_mp3}" == "yes"
- mpg123="%{l_prefix}/bin/mpg123"
-%else
- mpg123="`which false`"
-%endif
- %{l_shtool} subst \
- -e "s;/usr/local/bin/mpg123;$mpg123;" \
- -e "s;/usr/bin/mpg123;$mpg123;" \
- res/res_musiconhold.c apps/app_mp3.c
%build
# sanity check
@@ -165,6 +164,17 @@
esac
%endif
+ # re-configure music-on-hold to find mpg123
+%if "%{with_mp3}" == "yes"
+ mpg123="%{l_prefix}/bin/mpg123"
+%else
+ mpg123="`which false`"
+%endif
+ %{l_shtool} subst \
+ -e "s;/usr/local/bin/mpg123;$mpg123;" \
+ -e "s;/usr/bin/mpg123;$mpg123;" \
+ res/res_musiconhold.c apps/app_mp3.c
+
# build program
%{l_make} %{l_mflags} \
%if "%{with_zaptel}" == "no"
@@ -185,6 +195,16 @@
) || exit $?
%endif
+ # build libiax
+ ( cd iax-%{V_asterisk_libiax}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+
# build Perl API
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl}
configure build
@@ -222,6 +242,11 @@
) || exit $?
%endif
+ # install libiax
+ ( cd iax-%{V_asterisk_libiax}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
+
# install Perl API
%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl} install
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
