[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 20-Dec-2009 11:34:21
Branch: HEAD Handle: 2009122010342000
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.1.11 -> 1.6.2.0
Summary:
RevisionChanges Path
1.53+69 -58 openpkg-src/asterisk/asterisk.patch
1.109 +4 -4 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.52 -r1.53 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 30 Aug 2009 20:29:00 -
1.52
+++ openpkg-src/asterisk/asterisk.patch 20 Dec 2009 10:34:20 -
1.53
@@ -1,7 +1,7 @@
Index: Makefile
Makefile.orig2009-08-04 16:54:45 +0200
-+++ Makefile 2009-08-30 22:11:17 +0200
-@@ -116,42 +116,20 @@
+--- Makefile.orig2009-11-03 21:01:30 +0100
Makefile 2009-12-20 11:05:32 +0100
+@@ -126,42 +126,19 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -26,9 +26,10 @@
ASTSBINDIR=$(sbindir)
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTSPOOLDIR=$(localstatedir)/spool
+ ASTLOGDIR=$(localstatedir)/log
- ASTVARRUNDIR=$(localstatedir)/run
++ ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
-ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
@@ -38,7 +39,6 @@
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTDBDIR=$(ASTVARLIBDIR)
-endif
-+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTDBDIR=$(localstatedir)/db
ASTKEYDIR=$(ASTVARLIBDIR)
-endif
@@ -48,7 +48,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -251,12 +229,6 @@
+@@ -261,12 +238,6 @@
_ASTCFLAGS+=-fsigned-char
endif
@@ -61,10 +61,10 @@
ifeq ($(OSARCH),NetBSD)
_ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -525,8 +497,7 @@
- if [ -n "$(OLDHEADERS)" ]; then \
- rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+@@ -566,8 +537,7 @@
fi
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
-mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-08-30 22:11:23 +0200
-+++ apps/app_backticks.c 2009-08-30 22:08:00 +0200
+--- /dev/null2009-12-20 11:05:01 +0100
apps/app_backticks.c 2009-12-20 11:01:03 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.53 $")
+
+#include
+#include
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2009-08-10 21:30:55 +0200
-+++ apps/app_meetme.c2009-08-30 22:08:00 +0200
-@@ -163,6 +163,7 @@
+--- apps/app_meetme.c.orig 2009-11-05 23:13:45 +0100
apps/app_meetme.c2009-12-20 11:01:03 +0100
+@@ -522,6 +522,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
@@ -215,7 +215,7 @@
};
enum {
-@@ -172,6 +173,7 @@
+@@ -531,6 +532,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -204,6 +206,7 @@
+@@ -563,6 +565,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1876,6 +1879,12 @@
+@@ -2211,6 +2214,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[P
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Aug-2009 22:29:01
Branch: HEAD Handle: 200908302129
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.1.4 -> 1.6.1.5
Summary:
RevisionChanges Path
1.52+42 -42 openpkg-src/asterisk/asterisk.patch
1.101 +3 -3 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.51 -r1.52 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 16 Aug 2009 15:57:36 -
1.51
+++ openpkg-src/asterisk/asterisk.patch 30 Aug 2009 20:29:00 -
1.52
@@ -1,7 +1,7 @@
Index: Makefile
Makefile.orig2009-02-24 21:44:50 +0100
-+++ Makefile 2009-08-05 20:40:23 +0200
-@@ -122,42 +122,20 @@
+--- Makefile.orig2009-08-04 16:54:45 +0200
Makefile 2009-08-30 22:11:17 +0200
+@@ -116,42 +116,20 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -48,20 +48,20 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -258,12 +236,6 @@
- ASTCFLAGS+=-fsigned-char
+@@ -251,12 +229,6 @@
+ _ASTCFLAGS+=-fsigned-char
endif
-ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo
"-D_THREAD_SAFE"; fi)
+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo
"-D_THREAD_SAFE"; fi)
-endif
-
ifeq ($(OSARCH),NetBSD)
- ASTCFLAGS+=-pthread -I/usr/pkg/include
+ _ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -534,8 +506,7 @@
+@@ -525,8 +497,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-08-05 20:40:27 +0200
-+++ apps/app_backticks.c 2009-08-05 20:40:23 +0200
+--- /dev/null2009-08-30 22:11:23 +0200
apps/app_backticks.c 2009-08-30 22:08:00 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.51 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $")
+
+#include
+#include
@@ -205,8 +205,8 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100
-+++ apps/app_meetme.c2009-08-05 20:40:23 +0200
+--- apps/app_meetme.c.orig 2009-08-10 21:30:55 +0200
apps/app_meetme.c2009-08-30 22:08:00 +0200
@@ -163,6 +163,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2009-08-05 20:40:23 +0200
build_tools/make_defaults_h 2009-08-30 22:08:00 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-11-20 19:23:03 +0100
-+++ cdr/cdr_custom.c 2009-08-05 20:40:23 +0200
cdr/cdr_custom.c 2009-08-30 22:08:00 +0200
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value,
sizeof(format) - 1);
@@ -277,10 +277,10 @@
ast_log(LOG_NOTICE, "Sorry, only one
mapping is supported at this time, mapping '%s' will be ignored at line %d.\n",
var->next->name, var->next->lineno);
break;
Index: cdr/cdr_sqlite3_custom.c
cdr/cdr_sqlite3_custom.c.orig2009-03-02 18:19:41 +0100
-+++ cdr/cdr_sqlite3_custom.c 2009-08-05 20:40:23 +0200
-@@ -322,7 +322,7 @@
- return AST_MODULE_LOAD_DECLINE;
+--- cdr/cd
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 16-Aug-2009 17:57:36
Branch: HEAD Handle: 2009081616573600
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
modifying package: asterisk-1.6.1.4 20090811 -> 20090816
Summary:
RevisionChanges Path
1.51+16 -16 openpkg-src/asterisk/asterisk.patch
1.100 +2 -2 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.50 -r1.51 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Aug 2009 18:54:14 -
1.50
+++ openpkg-src/asterisk/asterisk.patch 16 Aug 2009 15:57:36 -
1.51
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.50 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.51 $")
+
+#include
+#include
@@ -288,9 +288,9 @@
res = sqlite3_open(filename, &db);
if (res != SQLITE_OK) {
ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
-Index: chan_capi-1.1.3/Makefile
chan_capi-1.1.3/Makefile.orig2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.3/Makefile 2009-08-05 20:40:23 +0200
+Index: chan_capi-1.1.4/Makefile
+--- chan_capi-1.1.4/Makefile.orig2009-07-23 16:11:08 +0200
chan_capi-1.1.4/Makefile 2009-08-05 20:40:23 +0200
@@ -90,6 +90,9 @@
CFLAGS+=-O6
CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
@@ -301,9 +301,9 @@
LIBS=-ldl -lpthread -lm
CC=gcc
-Index: chan_capi-1.1.3/chan_capi20.h
chan_capi-1.1.3/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
-+++ chan_capi-1.1.3/chan_capi20.h2009-08-05 20:40:23 +0200
+Index: chan_capi-1.1.4/chan_capi20.h
+--- chan_capi-1.1.4/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
chan_capi-1.1.4/chan_capi20.h2009-08-05 20:40:23 +0200
@@ -8,6 +8,8 @@
#undef CAPI_OS_HINT
@@ -322,9 +322,9 @@
#ifndef HEADER_CID
#define HEADER_CID(x) ((x)->adr.adrNCCI)
#endif
-Index: chan_capi-1.1.3/chan_capi_utils.c
chan_capi-1.1.3/chan_capi_utils.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.3/chan_capi_utils.c2009-08-05 20:41:26 +0200
+Index: chan_capi-1.1.4/chan_capi_utils.c
+--- chan_capi-1.1.4/chan_capi_utils.c.orig 2009-07-23 16:11:08 +0200
chan_capi-1.1.4/chan_capi_utils.c2009-08-05 20:41:26 +0200
@@ -1087,6 +1087,9 @@
{
MESSAGE_EXCHANGE_ERROR error;
@@ -335,9 +335,9 @@
unsigned char manbuf[CAPI_MANUFACTURER_LEN];
_cmsg CMSG;
-Index: chan_capi-1.1.3/libcapi20/capi20.c
chan_capi-1.1.3/libcapi20/capi20.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.3/libcapi20/capi20.c 2009-08-05 20:40:23 +0200
+Index: chan_capi-1.1.4/libcapi20/capi20.c
+--- chan_capi-1.1.4/libcapi20/capi20.c.orig 2009-07-23 16:11:08 +0200
chan_capi-1.1.4/libcapi20/capi20.c 2009-08-05 20:40:23 +0200
@@ -19,8 +19,10 @@
#include
#include
@@ -647,9 +647,9 @@
}
/*
* functions added to the CAPI2.0 spec
-Index: chan_capi-1.1.3/libcapi20/convert.c
chan_capi-1.1.3/libcapi20/convert.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.3/libcapi20/convert.c 2009-08-05 20:40:23 +0200
+Index: chan_capi-1.1.4/libcapi20/convert.c
+--- chan_capi-1.1.4/libcapi20/convert.c.orig 2009-07-23 16:11:08 +0200
chan_capi-1.1.4/libcapi20/convert.c 2009-08-05 20:40:23 +0200
@@ -11,7 +11,14 @@
#include
#include
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.99 -r1.100 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec11 Aug 2009 18:27:11 -
1.99
+++ openpkg-src/asterisk/asterisk.spec16 Aug 2009 15:57:36 -
1.100
@@ -28,7 +28,7 @@
%define V_asterisk_sounds_core_en 1.4.15
%define V_asterisk_sounds_core_de current
%define V_asterisk_sounds_extra_en 1.4.9
-%define V_chan_capi1.1.3
+%define V_chan_capi1.1.4
# package information
Name: asterisk
@@ -41,7 +41,7 @@
Group:VoIP
License: GPL
Version: %{V_opkg}
-Release: 20090811
+Release: 20090816
# package options
%option with_d
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 05-Aug-2009 20:54:14
Branch: HEAD Handle: 2009080519541400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
modifying package: asterisk-1.6.1.2 20090801 -> 20090805
Summary:
RevisionChanges Path
1.50+66 -53 openpkg-src/asterisk/asterisk.patch
1.98+2 -2 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.49 -r1.50 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 25 Jul 2009 08:33:53 -
1.49
+++ openpkg-src/asterisk/asterisk.patch 5 Aug 2009 18:54:14 -
1.50
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2009-02-24 21:44:50 +0100
-+++ Makefile 2009-05-04 12:48:53 +0200
Makefile 2009-08-05 20:40:23 +0200
@@ -122,42 +122,20 @@
# Define standard directories for various platforms
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-05-04 12:48:56 +0200
-+++ apps/app_backticks.c 2009-05-04 12:48:53 +0200
+--- /dev/null2009-08-05 20:40:27 +0200
apps/app_backticks.c 2009-08-05 20:40:23 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.49 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.50 $")
+
+#include
+#include
@@ -206,7 +206,7 @@
+
Index: apps/app_meetme.c
--- apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100
-+++ apps/app_meetme.c2009-05-04 12:48:53 +0200
apps/app_meetme.c2009-08-05 20:40:23 +0200
@@ -163,6 +163,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2009-05-04 12:48:53 +0200
build_tools/make_defaults_h 2009-08-05 20:40:23 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-11-20 19:23:03 +0100
-+++ cdr/cdr_custom.c 2009-05-04 12:48:53 +0200
cdr/cdr_custom.c 2009-08-05 20:40:23 +0200
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value,
sizeof(format) - 1);
@@ -278,7 +278,7 @@
break;
Index: cdr/cdr_sqlite3_custom.c
--- cdr/cdr_sqlite3_custom.c.orig2009-03-02 18:19:41 +0100
-+++ cdr/cdr_sqlite3_custom.c 2009-05-04 12:48:53 +0200
cdr/cdr_sqlite3_custom.c 2009-08-05 20:40:23 +0200
@@ -322,7 +322,7 @@
return AST_MODULE_LOAD_DECLINE;
@@ -288,9 +288,9 @@
res = sqlite3_open(filename, &db);
if (res != SQLITE_OK) {
ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
-Index: chan_capi-1.1.2/Makefile
chan_capi-1.1.2/Makefile.orig2009-01-17 18:36:50 +0100
-+++ chan_capi-1.1.2/Makefile 2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/Makefile
+--- chan_capi-1.1.3/Makefile.orig2009-07-23 16:11:08 +0200
chan_capi-1.1.3/Makefile 2009-08-05 20:40:23 +0200
@@ -90,6 +90,9 @@
CFLAGS+=-O6
CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
@@ -301,9 +301,9 @@
LIBS=-ldl -lpthread -lm
CC=gcc
-Index: chan_capi-1.1.2/chan_capi20.h
chan_capi-1.1.2/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
-+++ chan_capi-1.1.2/chan_capi20.h2009-05-04 12:48:53 +0200
+Index: chan_capi-1.1.3/chan_capi20.h
+--- chan_capi-1.1.3/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
chan_capi-1.1.3/chan_capi20.h2009-08-05 20:40:23 +0200
@@ -8,6 +8,8 @@
#undef CAPI_OS_HINT
@@ -322,9 +322,22 @@
#ifndef HEADER_CID
#define HEADER_CID(x) ((x)->adr.adrNCCI)
#endif
-Index: chan_capi-1.1.2/libcapi20/capi20.c
chan_capi-1.1.2/libcapi20/capi20.c.orig 2008-12-31 17
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jul-2009 10:33:54
Branch: HEAD Handle: 2009072509335301
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
modifying package: asterisk-1.6.1.1 20090606 -> 20090725
Summary:
RevisionChanges Path
1.49+1 -13 openpkg-src/asterisk/asterisk.patch
1.96+2 -2 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.48 -r1.49 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 4 May 2009 12:08:45 -
1.48
+++ openpkg-src/asterisk/asterisk.patch 25 Jul 2009 08:33:53 -
1.49
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.48 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.49 $")
+
+#include
+#include
@@ -252,18 +252,6 @@
}
ast_mutex_lock(&conf->playlock);
-Index: asterisk-addons-1.6.1.0/Makefile
asterisk-addons-1.6.1.0/Makefile.orig2008-11-06 18:44:05 +0100
-+++ asterisk-addons-1.6.1.0/Makefile 2009-05-04 12:48:53 +0200
-@@ -185,7 +185,7 @@
-
- install-xmldoc: doc/addons-en_US.xml
- @echo "Installing XML documentation"
--@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
-+@$(INSTALL) -m 644 doc/addons-*.xml
$(DESTDIR)$(ASTDATADIR)/documentation
-
- cleantest:
-
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
+++ build_tools/make_defaults_h 2009-05-04 12:48:53 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.95 -r1.96 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec6 Jun 2009 20:42:52 -
1.95
+++ openpkg-src/asterisk/asterisk.spec25 Jul 2009 08:33:54 -
1.96
@@ -24,7 +24,7 @@
# package version
%define V_opkg 1.6.1.1
%define V_asterisk 1.6.1.1
-%define V_asterisk_addons 1.6.1.0
+%define V_asterisk_addons 1.6.1.1
%define V_asterisk_sounds_core_en 1.4.15
%define V_asterisk_sounds_core_de current
%define V_asterisk_sounds_extra_en 1.4.9
@@ -41,7 +41,7 @@
Group:VoIP
License: GPL
Version: %{V_opkg}
-Release: 20090606
+Release: 20090725
# package options
%option with_dahdi no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 04-May-2009 14:08:45
Branch: HEAD Handle: 2009050413084500
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.9 -> 1.6.1.0
Summary:
RevisionChanges Path
1.48+77 -76 openpkg-src/asterisk/asterisk.patch
1.94+19 -15 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.47 -r1.48 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 3 Apr 2009 07:53:24 -
1.47
+++ openpkg-src/asterisk/asterisk.patch 4 May 2009 12:08:45 -
1.48
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2008-12-03 01:53:56 +0100
-+++ Makefile 2009-04-03 09:41:24 +0200
+--- Makefile.orig2009-02-24 21:44:50 +0100
Makefile 2009-05-04 12:48:53 +0200
@@ -122,42 +122,20 @@
# Define standard directories for various platforms
@@ -48,7 +48,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -250,12 +228,6 @@
+@@ -258,12 +236,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -526,8 +498,7 @@
+@@ -534,8 +506,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-04-03 09:41:48 +0200
-+++ apps/app_backticks.c 2009-04-03 09:41:24 +0200
+--- /dev/null2009-05-04 12:48:56 +0200
apps/app_backticks.c 2009-05-04 12:48:53 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.47 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.48 $")
+
+#include
+#include
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2009-03-03 00:38:23 +0100
-+++ apps/app_meetme.c2009-04-03 09:41:24 +0200
-@@ -165,6 +165,7 @@
+--- apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100
apps/app_meetme.c2009-05-04 12:48:53 +0200
+@@ -163,6 +163,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
@@ -215,7 +215,7 @@
};
enum {
-@@ -174,6 +175,7 @@
+@@ -172,6 +173,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -206,6 +208,7 @@
+@@ -204,6 +206,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1832,6 +1835,12 @@
+@@ -1876,6 +1879,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1848,6 +1857,7 @@
+@@ -1892,6 +1901,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -252,9 +252,21 @@
}
ast_mutex_lock(&conf->playlock);
+Index: asterisk-addons-1.6.1.0/Makefile
+--- asterisk-addons-1.6.1.0/Makefile.orig2008-11-06 18:44:05 +0100
asterisk-addons-1.6.1.0/Makefile 2009-05-04 12:48:53 +0200
+@@ -185,7 +185,7 @@
+
+ install-xmldoc: doc/addons-en_US.xml
+ @echo "Installing XML documentation"
+-@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
++@$(INSTALL) -m 644 doc/addons-*.xml
$(DESTDIR)$(ASTDATADIR)/documentation
+
+ cleantest:
+
Index: build_tools/make_defaults_h
--- build_tools/make_defaul
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 03-Apr-2009 09:53:25
Branch: HEAD Handle: 2009040308532400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.6 -> 1.6.0.8
Summary:
RevisionChanges Path
1.47+173 -173 openpkg-src/asterisk/asterisk.patch
1.91+3 -3 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.46 -r1.47 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 28 Mar 2009 19:14:52 -
1.46
+++ openpkg-src/asterisk/asterisk.patch 3 Apr 2009 07:53:24 -
1.47
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-12-03 01:53:56 +0100
-+++ Makefile 2009-02-23 22:08:08 +0100
Makefile 2009-04-03 09:41:24 +0200
@@ -122,42 +122,20 @@
# Define standard directories for various platforms
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-02-23 22:11:56 +0100
-+++ apps/app_backticks.c 2009-02-23 22:08:08 +0100
+--- /dev/null2009-04-03 09:41:48 +0200
apps/app_backticks.c 2009-04-03 09:41:24 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.46 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.47 $")
+
+#include
+#include
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2009-01-22 17:53:12 +0100
-+++ apps/app_meetme.c2009-02-23 22:11:46 +0100
-@@ -163,6 +163,7 @@
+--- apps/app_meetme.c.orig 2009-03-03 00:38:23 +0100
apps/app_meetme.c2009-04-03 09:41:24 +0200
+@@ -165,6 +165,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
@@ -215,7 +215,7 @@
};
enum {
-@@ -172,6 +173,7 @@
+@@ -174,6 +175,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -203,6 +205,7 @@
+@@ -206,6 +208,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1830,6 +1833,12 @@
+@@ -1832,6 +1835,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1846,6 +1855,7 @@
+@@ -1848,6 +1857,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2009-02-23 22:08:08 +0100
build_tools/make_defaults_h 2009-04-03 09:41:24 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-03-25 23:52:24 +0100
-+++ cdr/cdr_custom.c 2009-02-23 22:08:08 +0100
cdr/cdr_custom.c 2009-04-03 09:41:24 +0200
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value,
sizeof(format) - 1);
@@ -277,9 +277,9 @@
ast_log(LOG_NOTICE, "Sorry, only one
mapping is supported at this time, mapping '%s' will be ignored at line %d.\n",
var->next->name, var->next->lineno);
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 28-Mar-2009 20:14:53
Branch: HEAD Handle: 2009032819145200
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
modifying package: asterisk-1.6.0.6 20090223 -> 20090328
Summary:
RevisionChanges Path
1.46+365 -1 openpkg-src/asterisk/asterisk.patch
1.90+15 -21 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.45 -r1.46 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 23 Feb 2009 21:47:43 -
1.45
+++ openpkg-src/asterisk/asterisk.patch 28 Mar 2009 19:14:52 -
1.46
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.45 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.46 $")
+
+#include
+#include
@@ -441,3 +441,367 @@
+Index: chan_capi-1.1.2/Makefile
+--- chan_capi-1.1.2/Makefile.orig2009-01-17 18:36:50 +0100
chan_capi-1.1.2/Makefile 2009-03-28 18:27:10 +0100
+@@ -90,6 +90,9 @@
+ CFLAGS+=-O6
+ CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
++ifeq (${USE_OWN_LIBCAPI},yes)
++CFLAGS+=-DUSE_OWN_LIBCAPI
++endif
+
+ LIBS=-ldl -lpthread -lm
+ CC=gcc
+Index: chan_capi-1.1.2/chan_capi20.h
+--- chan_capi-1.1.2/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
chan_capi-1.1.2/chan_capi20.h2009-03-28 18:28:02 +0100
+@@ -8,6 +8,8 @@
+
+ #undef CAPI_OS_HINT
+
++#ifndef USE_OWN_LIBCAPI
++
+ #if (defined(__FreeBSD__) || defined(__OpenBSD__) || \
+ defined(__NetBSD__) || defined(__APPLE__))
+
+@@ -29,6 +31,8 @@
+ #include
+ #endif /* BSD */
+
++#endif
++
+ #ifndef HEADER_CID
+ #define HEADER_CID(x) ((x)->adr.adrNCCI)
+ #endif
+Index: chan_capi-1.1.2/libcapi20/capi20.c
+--- chan_capi-1.1.2/libcapi20/capi20.c.orig 2008-12-31 17:29:36 +0100
chan_capi-1.1.2/libcapi20/capi20.c 2009-03-28 19:25:29 +0100
+@@ -19,8 +19,10 @@
+ #include
+ #include
+ #include
++#ifdef __linux__
+ #define _LINUX_LIST_H
+ #include
++#endif
+
+ #include
+ #include
+@@ -46,17 +48,23 @@
+
+ #define SEND_BUFSIZ (128+2048)
+
++#if 0
+ static char capidevname[] = "/dev/capi20";
+ static char capidevnamenew[] = "/dev/isdn/capi20";
++#endif
+
+ static int capi_fd = -1;
++#if 0
+ static capi_ioctl_structioctl_data;
++#endif
+
+ static int remote_capi;
++#if 0
+ static char *globalconfigfilename = "/etc/capi20.conf";
+ static char *userconfigfilename = ".capi20rc";
+ static unsigned short int port;
+ static char hostname[1024];
++#endif
+ static int tracelevel;
+ static char *tracefile;
+
+@@ -75,17 +83,21 @@
+ #define RCAPI_AUTH_USER_REQ CAPICMD(0xff, 0x00)
+ #define RCAPI_AUTH_USER_CONFCAPICMD(0xff, 0x01)
+
++#if 0
+ static char *skip_whitespace(char *s)
+ {
+ while (*s && isspace(*s)) s++;
+ return s;
+ }
++#endif
+
++#if 0
+ static char *skip_nonwhitespace(char *s)
+ {
+ while (*s && !isspace(*s)) s++;
+ return s;
+ }
++#endif
+
+ static unsigned char get_byte(unsigned char **p)
+ {
+@@ -93,10 +105,12 @@
+ return((unsigned char)*(*p - 1));
+ }
+
++#if 0
+ static unsigned short get_word(unsigned char **p)
+ {
+ return(get_byte(p) | (get_byte(p) << 8));
+ }
++#endif
+
+ static unsigned short get_netword(unsigned char **p)
+ {
+@@ -142,6 +156,7 @@
+ * read config file
+ */
+
++#if 0
+ static int read_config(void)
+ {
+ FILE *fp = NULL;
+@@ -195,11 +210,13 @@
+ fclose(fp);
+ return(1);
+ }
++#endif
+
+ /*
+ * socket function
+ */
+
++#if 0
+ static int open_socket(void)
+ {
+ int fd;
+@@ -223,6 +240,7 @@
+ close(fd);
+ return(-1);
+ }
++#endif
+
+ static int socket_read(int fd, unsigned char *buf, int l)
+ {
+@@ -316,6 +334,8 @@
+ if (capi_fd >= 0)
+ return CapiNoError;
+
++#if 0
++
+ /*- open managment link -*/
+ if (read_config() && (remote_capi)) {
+ capi_fd = open_socket();
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 23-Feb-2009 22:47:44
Branch: HEAD Handle: 2009022321474300
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.5 -> 1.6.0.6
Summary:
RevisionChanges Path
1.45+35 -35 openpkg-src/asterisk/asterisk.patch
1.89+3 -3 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.44 -r1.45 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 8 Jan 2009 20:14:40 -
1.44
+++ openpkg-src/asterisk/asterisk.patch 23 Feb 2009 21:47:43 -
1.45
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-12-03 01:53:56 +0100
-+++ Makefile 2009-01-08 08:25:58 +0100
Makefile 2009-02-23 22:08:08 +0100
@@ -122,42 +122,20 @@
# Define standard directories for various platforms
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2009-01-08 20:47:46 +0100
-+++ apps/app_backticks.c 2009-01-08 08:25:58 +0100
+--- /dev/null2009-02-23 22:11:56 +0100
apps/app_backticks.c 2009-02-23 22:08:08 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.44 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.45 $")
+
+#include
+#include
@@ -205,17 +205,17 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2008-12-03 00:10:07 +0100
-+++ apps/app_meetme.c2009-01-08 08:25:58 +0100
-@@ -161,6 +161,7 @@
- CONFFLAG_KICK_CONTINUE = (1 << 28),
- CONFFLAG_DURATION_STOP = (1 << 29),
+--- apps/app_meetme.c.orig 2009-01-22 17:53:12 +0100
apps/app_meetme.c2009-02-23 22:11:46 +0100
+@@ -163,6 +163,7 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
+ /*! Do not write any audio to this channel until the state is up. */
+ CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
+CONFFLAG_USERNAME = (1 << 31),
};
enum {
-@@ -170,6 +171,7 @@
+@@ -172,6 +173,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -201,6 +203,7 @@
+@@ -203,6 +205,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1817,6 +1820,12 @@
+@@ -1830,6 +1833,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1833,6 +1842,7 @@
+@@ -1846,6 +1855,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2009-01-08 08:25:58 +0100
build_tools/make_defaults_h 2009-02-23 22:08:08 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-03-25 23:52:24 +0100
-+++ cdr/cdr_custom.c 2009-01-08 08:25:58 +0100
cdr/cdr_custom.c 2009-02-23 22:08:08 +0100
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value,
sizeof(format) - 1);
@@ -278,7 +278,7 @@
break;
Index: cdr/cdr_sqlite3_custom.c
--- cdr/cdr_sqlite3_custom.c.orig
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 08-Jan-2009 21:14:40
Branch: HEAD Handle: 2009010820144000
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.2 -> 1.6.0.3
Summary:
RevisionChanges Path
1.44+40 -60 openpkg-src/asterisk/asterisk.patch
1.85+3 -3 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.43 -r1.44 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 14 Dec 2008 10:35:25 -
1.43
+++ openpkg-src/asterisk/asterisk.patch 8 Jan 2009 20:14:40 -
1.44
@@ -1,7 +1,7 @@
Index: Makefile
Makefile.orig2008-08-26 20:12:08 +0200
-+++ Makefile 2008-09-05 20:50:40 +0200
-@@ -121,42 +121,20 @@
+--- Makefile.orig2008-12-03 01:53:56 +0100
Makefile 2009-01-08 08:25:58 +0100
+@@ -122,42 +122,20 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -48,7 +48,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -245,12 +223,6 @@
+@@ -250,12 +228,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -522,8 +494,7 @@
+@@ -526,8 +498,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2008-09-05 20:51:23 +0200
-+++ apps/app_backticks.c 2008-09-05 20:50:40 +0200
+--- /dev/null2009-01-08 20:47:46 +0100
apps/app_backticks.c 2009-01-08 08:25:58 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.44 $")
+
+#include
+#include
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2008-07-30 00:29:11 +0200
-+++ apps/app_meetme.c2008-09-05 20:50:40 +0200
-@@ -160,6 +160,7 @@
+--- apps/app_meetme.c.orig 2008-12-03 00:10:07 +0100
apps/app_meetme.c2009-01-08 08:25:58 +0100
+@@ -161,6 +161,7 @@
CONFFLAG_KICK_CONTINUE = (1 << 28),
CONFFLAG_DURATION_STOP = (1 << 29),
CONFFLAG_DURATION_LIMIT = (1 << 30),
@@ -215,7 +215,7 @@
};
enum {
-@@ -169,6 +170,7 @@
+@@ -170,6 +171,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -200,6 +202,7 @@
+@@ -201,6 +203,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1698,6 +1701,12 @@
+@@ -1817,6 +1820,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1714,6 +1723,7 @@
+@@ -1833,6 +1842,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2008-09-05 20:50:40 +0200
build_tools/make_defaults_h 2009-01-08 08:25:58 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-03-25 23:52:24 +010
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 14-Dec-2008 11:35:26
Branch: HEAD Handle: 2008121410352500
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.1 -> 1.6.0.2
Summary:
RevisionChanges Path
1.43+21 -1 openpkg-src/asterisk/asterisk.patch
1.84+4 -4 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.42 -r1.43 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2008 19:05:54 -
1.42
+++ openpkg-src/asterisk/asterisk.patch 14 Dec 2008 10:35:25 -
1.43
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.42 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $")
+
+#include
+#include
@@ -441,3 +441,23 @@
+Index: main/manager.c
+--- main/manager.c.orig 2008-12-01 17:04:31 +0100
main/manager.c 2008-07-31 23:58:26 +0200
+@@ -1728,15 +1719,7 @@
+ }
+
+ if (varname[strlen(varname) - 1] == ')') {
+-if (!c) {
+-c = ast_channel_alloc(0, 0, "", "", "", "", "", 0,
"Bogus/%p", SENTINEL);
+-if (c) {
+-ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
+-ast_channel_free(c);
+-} else
+-ast_log(LOG_ERROR, "Unable to allocate bogus
channel for variable substitution. Function results may be blank.\n");
+-} else
+-ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
++ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
+ varval = workspace;
+ } else {
+ pbx_retrieve_variable(c, varname, &varval, workspace,
sizeof(workspace), NULL);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.83 -r1.84 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec10 Oct 2008 17:08:51 -
1.83
+++ openpkg-src/asterisk/asterisk.spec14 Dec 2008 10:35:25 -
1.84
@@ -22,9 +22,9 @@
##
# package version
-%define V_opkg 1.6.0.1
-%define V_asterisk 1.6.0.1
-%define V_asterisk_addons 1.6.0
+%define V_opkg 1.6.0.2
+%define V_asterisk 1.6.0.2
+%define V_asterisk_addons 1.6.0.1
%define V_asterisk_sounds_core_en 1.4.13
%define V_asterisk_sounds_core_de 20080705
%define V_asterisk_sounds_extra_en 1.4.8
@@ -41,7 +41,7 @@
Group:VoIP
License: GPL
Version: %{V_opkg}
-Release: 20081010
+Release: 20081214
# package options
%option with_dahdi no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 05-Sep-2008 21:05:54
Branch: HEAD Handle: 2008090520055400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0b9 -> 1.6.0rc4
Summary:
RevisionChanges Path
1.42+56 -64 openpkg-src/asterisk/asterisk.patch
1.76+4 -4 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.41 -r1.42 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 4 Jul 2008 17:52:47 -
1.41
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2008 19:05:54 -
1.42
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2008-04-18 22:02:05 +0200
-+++ Makefile 2008-05-07 08:25:13 +0200
+--- Makefile.orig2008-08-26 20:12:08 +0200
Makefile 2008-09-05 20:50:40 +0200
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -526,8 +498,7 @@
+@@ -522,8 +494,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2008-05-07 08:38:19 +0200
-+++ apps/app_backticks.c 2008-05-07 08:25:13 +0200
+--- /dev/null2008-09-05 20:51:23 +0200
apps/app_backticks.c 2008-09-05 20:50:40 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.41 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.42 $")
+
+#include
+#include
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
apps/app_meetme.c.orig 2008-04-13 16:38:35 +0200
-+++ apps/app_meetme.c2008-05-07 08:40:11 +0200
-@@ -159,6 +159,7 @@
+--- apps/app_meetme.c.orig 2008-07-30 00:29:11 +0200
apps/app_meetme.c2008-09-05 20:50:40 +0200
+@@ -160,6 +160,7 @@
CONFFLAG_KICK_CONTINUE = (1 << 28),
CONFFLAG_DURATION_STOP = (1 << 29),
CONFFLAG_DURATION_LIMIT = (1 << 30),
@@ -215,7 +215,7 @@
};
enum {
-@@ -168,6 +169,7 @@
+@@ -169,6 +170,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -199,6 +201,7 @@
+@@ -200,6 +202,7 @@
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
@@ -231,7 +231,7 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1697,6 +1700,12 @@
+@@ -1698,6 +1701,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1713,6 +1722,7 @@
+@@ -1714,6 +1723,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -254,7 +254,7 @@
ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2008-05-07 08:25:13 +0200
build_tools/make_defaults_h 2008-09-05 20:50:40 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2008-03-25 23:52:24 +0100
-+++ cdr/cdr_custom.c 2008-05-07 08:25:13 +0200
cdr/cdr_custom.c 2008-09-05 20:50:40 +0200
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_st
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 04-Jul-2008 19:52:47
Branch: HEAD Handle: 2008070418524700
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
fix building against GMIME 2.3.x
Summary:
RevisionChanges Path
1.41+20 -1 openpkg-src/asterisk/asterisk.patch
1.74+3 -0 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.40 -r1.41 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 7 May 2008 07:06:56 -
1.40
+++ openpkg-src/asterisk/asterisk.patch 4 Jul 2008 17:52:47 -
1.41
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.40 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.41 $")
+
+#include
+#include
@@ -430,3 +430,22 @@
+Index: main/http.c
+--- main/http.c.orig 2008-04-24 00:54:41 +0200
main/http.c 2008-07-04 19:41:01 +0200
+@@ -417,14 +417,8 @@
+ ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
+ return;
+ } else if (GMIME_IS_MULTIPART(part)) {
+-GList *l;
+-
+ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying
to process subparts\n");
+-l = GMIME_MULTIPART (part)->subparts;
+-while (l) {
+-process_message_callback(l->data, cbinfo);
+-l = l->next;
+-}
++g_mime_multipart_foreach(GMIME_MULTIPART(part),
process_message_callback, cbinfo);
+ } else if (GMIME_IS_PART(part)) {
+ const char *filename;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.73 -r1.74 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec4 Jul 2008 07:25:14 -
1.73
+++ openpkg-src/asterisk/asterisk.spec4 Jul 2008 17:52:47 -
1.74
@@ -219,6 +219,8 @@
-e 's;lua5.1/lua.h;lua/lua.h;' \
-e 's;ffmpeg/avcodec.h;libavcodec/avcodec.h;' \
configure
+( echo "ac_cv_prog_CONFIG_GMIME='pkg-config gmime-2.4'"
+) >config.cache
cflags="%{l_cflags -O}"
cppflags="%{l_cppflags ncurses lua .}"
ldflags="%{l_ldflags}"
@@ -242,6 +244,7 @@
LDFLAGS="$ldflags" \
LIBS="$libs" \
./configure \
+--cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 07-May-2008 09:06:58
Branch: HEAD Handle: 2008050708065600
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0b6 -> 1.6.0b8
Summary:
RevisionChanges Path
1.40+71 -70 openpkg-src/asterisk/asterisk.patch
1.71+5 -5 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.39 -r1.40 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 25 Mar 2008 21:04:30 -
1.39
+++ openpkg-src/asterisk/asterisk.patch 7 May 2008 07:06:56 -
1.40
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2008-03-18 16:58:50 +0100
-+++ Makefile 2008-03-24 20:45:38 +0100
+--- Makefile.orig2008-04-18 22:02:05 +0200
Makefile 2008-05-07 08:25:13 +0200
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -524,8 +496,7 @@
+@@ -526,8 +498,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2008-03-24 20:46:16 +0100
-+++ apps/app_backticks.c 2008-03-24 20:45:38 +0100
+--- /dev/null2008-05-07 08:38:19 +0200
apps/app_backticks.c 2008-05-07 08:25:13 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.39 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.40 $")
+
+#include
+#include
@@ -204,9 +204,57 @@
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
+Index: apps/app_meetme.c
+--- apps/app_meetme.c.orig 2008-04-13 16:38:35 +0200
apps/app_meetme.c2008-05-07 08:40:11 +0200
+@@ -159,6 +159,7 @@
+ CONFFLAG_KICK_CONTINUE = (1 << 28),
+ CONFFLAG_DURATION_STOP = (1 << 29),
+ CONFFLAG_DURATION_LIMIT = (1 << 30),
++CONFFLAG_USERNAME = (1 << 31),
+ };
+
+ enum {
+@@ -168,6 +169,7 @@
+ OPT_ARG_DURATION_LIMIT = 3,
+ OPT_ARG_MOH_CLASS = 4,
+ OPT_ARG_ARRAY_SIZE = 5,
++OPT_ARG_USERNAME = 6,
+ };
+
+ AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
+@@ -199,6 +201,7 @@
+ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
+ AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
+ AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
++AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
+ END_OPTIONS );
+
+ static const char *app = "MeetMe";
+@@ -1697,6 +1700,12 @@
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
+ char destdir[PATH_MAX];
+
++if ( (confflags & CONFFLAG_USERNAME)
++&& !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
++&& ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL))
++snprintf(destdir, sizeof(destdir), "%s",
optargs[OPT_ARG_USERNAME]);
++else {
++
+ snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
+
+ if (ast_mkdir(destdir, 0777) != 0) {
+@@ -1713,6 +1722,7 @@
+ res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
+ if (res == -1)
+ goto outrun;
++}
+ }
+
+ ast_mutex_lock(&conf->playlock);
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2008-03-24 20:45:38 +0100
build_tools/make_defaults_h 2008-05-07 08:25:13 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -217,8 +265,8 @@
#define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
cdr/cdr_custom.c.orig2007-11-21 00:16:15 +0100
-+++ cdr/cdr_custom.c 2008-03-24 20:45:38 +0100
+--- cdr/cdr_custom.c.orig2008-03-25 23:52:24 +0100
+
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 25-Mar-2008 22:04:31
Branch: HEAD Handle: 2008032521043001
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
add initial cut for a MeetMe addition to pass an audio file containing
the user name (conference introduction)
Summary:
RevisionChanges Path
1.39+48 -1 openpkg-src/asterisk/asterisk.patch
1.70+1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.38 -r1.39 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 24 Mar 2008 20:11:27 -
1.38
+++ openpkg-src/asterisk/asterisk.patch 25 Mar 2008 21:04:30 -
1.39
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.38 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.39 $")
+
+#include
+#include
@@ -382,3 +382,50 @@
+Index: apps/app_meetme.c
+--- apps/app_meetme.c.orig 2008-03-18 16:58:50 +0100
apps/app_meetme.c2008-03-25 21:41:52 +0100
+@@ -159,6 +159,7 @@
+ CONFFLAG_KICK_CONTINUE = (1 << 28),
+ CONFFLAG_DURATION_STOP = (1 << 29),
+ CONFFLAG_DURATION_LIMIT = (1 << 30),
++CONFFLAG_USERNAME = (1 << 31),
+ };
+
+ enum {
+@@ -168,6 +169,7 @@
+ OPT_ARG_DURATION_LIMIT = 3,
+ OPT_ARG_MOH_CLASS = 4,
+ OPT_ARG_ARRAY_SIZE = 5,
++OPT_ARG_USERNAME = 6,
+ };
+
+ AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
+@@ -199,6 +201,7 @@
+ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
+ AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
+ AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
++AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
+ END_OPTIONS );
+
+ static const char *app = "MeetMe";
+@@ -1695,6 +1698,11 @@
+ ast_mutex_unlock(&conf->playlock);
+
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
++if ( (confflags & CONFFLAG_USERNAME)
++&& !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
++&& ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL))
++snprintf(user->namerecloc, sizeof(user->namerecloc), "%s",
optargs[OPT_ARG_USERNAME]);
++else {
+ snprintf(user->namerecloc, sizeof(user->namerecloc),
+ "%s/meetme/meetme-username-%s-%d",
ast_config_AST_SPOOL_DIR,
+ conf->confno, user->user_no);
+@@ -1704,6 +1712,7 @@
+ res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
+ if (res == -1)
+ goto outrun;
++}
+ }
+
+ ast_mutex_lock(&conf->playlock);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.69 -r1.70 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec24 Mar 2008 20:11:27 -
1.69
+++ openpkg-src/asterisk/asterisk.spec25 Mar 2008 21:04:31 -
1.70
@@ -40,7 +40,7 @@
Group:VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080324
+Release: 20080325
# package options
%option with_zaptel no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 24-Mar-2008 21:11:28
Branch: HEAD Handle: 2008032420112700
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
move AGI directory; add some SIP notify settings and use lower case
extension
Summary:
RevisionChanges Path
1.38+26 -14 openpkg-src/asterisk/asterisk.patch
1.69+5 -3 openpkg-src/asterisk/asterisk.spec
1.46+6 -1 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.37 -r1.38 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 23 Mar 2008 10:41:00 -
1.37
+++ openpkg-src/asterisk/asterisk.patch 24 Mar 2008 20:11:27 -
1.38
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-03-18 16:58:50 +0100
-+++ Makefile 2008-03-23 11:34:24 +0100
Makefile 2008-03-24 20:45:38 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
/dev/null2008-03-23 11:34:42 +0100
-+++ apps/app_backticks.c 2008-03-23 11:34:24 +0100
+--- /dev/null2008-03-24 20:46:16 +0100
apps/app_backticks.c 2008-03-24 20:45:38 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.37 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.38 $")
+
+#include
+#include
@@ -206,7 +206,7 @@
+
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h 2008-03-23 11:35:27 +0100
build_tools/make_defaults_h 2008-03-24 20:45:38 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID"${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -218,7 +218,7 @@
#define DEFAULT_KEY_DIR"${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig2007-11-21 00:16:15 +0100
-+++ cdr/cdr_custom.c 2008-03-23 11:34:24 +0100
cdr/cdr_custom.c 2008-03-24 20:45:38 +0100
@@ -78,7 +78,7 @@
ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value,
sizeof(format) - 1);
@@ -230,7 +230,7 @@
break;
Index: cdr/cdr_sqlite3_custom.c
--- cdr/cdr_sqlite3_custom.c.orig2008-03-18 16:58:50 +0100
-+++ cdr/cdr_sqlite3_custom.c 2008-03-23 11:34:24 +0100
cdr/cdr_sqlite3_custom.c 2008-03-24 20:45:38 +0100
@@ -317,7 +317,7 @@
return AST_MODULE_LOAD_DECLINE;
@@ -242,7 +242,7 @@
ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-23 11:34:24 +0100
channels/console_video.h 2008-03-24 20:45:38 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -257,7 +257,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-03-18 16:50:53 +0100
-+++ configure2008-03-23 11:34:24 +0100
configure2008-03-24 20:45:38 +0100
@@ -4026,12 +4026,6 @@
# note- does not work on FreeBSD
@@ -273,7 +273,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
Index: include/asterisk/module.h
--- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100
-+++ include/asterisk/module.h2008-03-23 11:34:24 +0100
include/asterisk/module.h2008-03-24 20:45:38 +0100
@@ -271,7 +271,7 @@
/* forward declare this pointer in modules, so that macro/function
calls that need it can get it, since it will actually be declared
@@ -285,7 +285,7 @@
#define __MODULE_INFO_SECTION
Index: main/Makefile
--- main/Makefile.orig 2008-03-17 23:24:46 +0100
-+++ main/Makefile2008-03-23 11:34:24 +0100
main/Makefile2008-03-24 20:45:38 +0100
@@ -82,10 +82,7 @@
endif
@@ -298,9 +298,21 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+Index: main/file.c
+--- main/file.c.orig 2008-03-07 01:25:48 +0100
main/file.c 2008-0
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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-Mar-2008 11:41:01
Branch: HEAD Handle: 2008032310410001
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
unify the AstDB filenames and regen the patch to be in sort order
Summary:
RevisionChanges Path
1.37+155 -143 openpkg-src/asterisk/asterisk.patch
1.67+6 -7 openpkg-src/asterisk/asterisk.spec
1.40+2 -0 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.36 -r1.37 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 22 Mar 2008 18:37:24 -
1.36
+++ openpkg-src/asterisk/asterisk.patch 23 Mar 2008 10:41:00 -
1.37
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-03-18 16:58:50 +0100
-+++ Makefile 2008-03-22 17:34:52 +0100
Makefile 2008-03-23 11:34:24 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -71,9 +71,154 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+Index: apps/app_backticks.c
+--- /dev/null2008-03-23 11:34:42 +0100
apps/app_backticks.c 2008-03-23 11:34:24 +0100
+@@ -0,0 +1,129 @@
++
++#include "asterisk.h"
++
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.37 $")
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++
++static char *app = "BackTicks";
++static char *synopsis = "Execute a shell command and save the result as a
variable.";
++static char *desc = " Backticks(|)\n\n"
++"Be sure to include a full path to the command!\n";
++
++static char *do_backticks(char *command, char *buf, size_t len)
++{
++int fds[2], pid = 0;
++char *ret = NULL;
++
++memset(buf, 0, len);
++if (pipe(fds)) {
++ast_log(LOG_WARNING, "Pipe/Exec failed\n");
++} else {
++pid = fork();
++if (pid < 0) {
++ast_log(LOG_WARNING, "Fork failed\n");
++close(fds[0]);
++close(fds[1]);
++} else if (pid) {
++/* parent */
++close(fds[1]);
++read(fds[0], buf, len);
++close(fds[0]);
++ret = buf;
++} else {
++/* child */
++char *argv[255] = {0};
++int argc = 0;
++char *p;
++char *mycmd = ast_strdupa(command);
++close(fds[0]);
++dup2(fds[1], STDOUT_FILENO);
++argv[argc++] = mycmd;
++do {
++if ((p = strchr(mycmd, ' '))) {
++*p = '\0';
++mycmd = ++p;
++argv[argc++] = mycmd;
++}
++} while (p != NULL);
++close(fds[1]);
++execv(argv[0], argv);
++ast_log(LOG_ERROR, "exec of %s failed\n", argv[0]);
++exit(0);
++}
++}
++return ret;
++}
++
++static int backticks_exec(struct ast_channel *chan, void *data)
++{
++int res = 0;
++const char *usage = "Usage: Backticks(|)";
++char buf[1024], *argv[2], *mydata;
++int argc = 0;
++
++if (!data) {
++ast_log(LOG_WARNING, "%s\n", usage);
++return -1;
++}
++ast_autoservice_start(chan);
++if (!(mydata = ast_strdupa(data))) {
++ast_log(LOG_ERROR, "Memory Error!\n");
++res = -1;
++} else {
++if((argc = ast_app_separate_args(mydata, '|', argv, sizeof(argv) /
sizeof(argv[0]))) < 2) {
++ast_log(LOG_WARNING, "%s\n", usage);
++res = -1;
++}
++if (do_backticks(argv[1], buf, sizeof(buf)))
++pbx_builtin_setvar_helper(chan, argv[0], buf);
++else {
++ast_log(LOG_WARNING, "No Data!\n");
++res = -1;
++}
++}
++ast_autoservice_stop(chan);
++return res;
++}
++
++static int function_backticks(struct ast_channel *chan, const char *cmd,
char *data, char *buf, size_t len)
++{
++if (!do_backticks(data, buf, len)) {
++ast_log(LOG_WARNING, "No Data!\n");
++
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 22-Mar-2008 16:58:07
Branch: HEAD Handle: 2008032215580600
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
add HTTP upload support (via gmime) to AMI and add CDR support
Summary:
RevisionChanges Path
1.35+60 -26 openpkg-src/asterisk/asterisk.patch
1.62+7 -2 openpkg-src/asterisk/asterisk.spec
1.36+82 -9 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.34 -r1.35 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 20 Mar 2008 19:40:26 -
1.34
+++ openpkg-src/asterisk/asterisk.patch 22 Mar 2008 15:58:06 -
1.35
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-18 22:06:58 +0100
+--- Makefile.orig2008-03-18 16:58:50 +0100
Makefile 2008-03-22 16:56:21 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -61,9 +61,43 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
+@@ -524,8 +496,7 @@
+ if [ -n "$(OLDHEADERS)" ]; then \
+ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+ fi
+-mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+-mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
++mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+Index: cdr/cdr_custom.c
+--- cdr/cdr_custom.c.orig2007-11-21 00:16:15 +0100
cdr/cdr_custom.c 2008-03-22 16:56:03 +0100
+@@ -78,7 +78,7 @@
+ ast_log(LOG_WARNING, "Format string too
long, will be truncated, at line %d\n", var->lineno);
+ ast_copy_string(format, var->value,
sizeof(format) - 1);
+ strcat(format,"\n");
+-snprintf(master, sizeof(master),"%s/%s/%s",
ast_config_AST_LOG_DIR, name, var->name);
++snprintf(master, sizeof(master),"%s/cdr/%s",
ast_config_AST_LOG_DIR, var->name);
+ if (var->next) {
+ ast_log(LOG_NOTICE, "Sorry, only one
mapping is supported at this time, mapping '%s' will be ignored at line %d.\n",
var->next->name, var->next->lineno);
+ break;
+Index: cdr/cdr_sqlite3_custom.c
+--- cdr/cdr_sqlite3_custom.c.orig2008-03-18 16:58:50 +0100
cdr/cdr_sqlite3_custom.c 2008-03-22 16:56:03 +0100
+@@ -317,7 +317,7 @@
+ return AST_MODULE_LOAD_DECLINE;
+
+ /* is the database there? */
+-snprintf(filename, sizeof(filename), "%s/master.db",
ast_config_AST_LOG_DIR);
++snprintf(filename, sizeof(filename), "%s/cdr/master.db",
ast_config_AST_LOG_DIR);
+ res = sqlite3_open(filename, &db);
+ if (res != SQLITE_OK) {
+ ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-18 22:06:58 +0100
channels/console_video.h 2008-03-22 16:56:03 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -77,9 +111,9 @@
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
configure.orig 2008-02-23 00:56:55 +0100
-+++ configure2008-03-18 22:06:58 +0100
-@@ -4049,12 +4049,6 @@
+--- configure.orig 2008-03-18 16:50:53 +0100
configure2008-03-22 16:56:03 +0100
+@@ -4026,12 +4026,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -92,9 +126,21 @@
*)
ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then
+Index: include/asterisk/module.h
+--- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100
include/asterisk/module.h2008-03-22 16:56:03 +0100
+@@ -271,7 +271,7 @@
+ /* forward declare this pointer in modules, so that macro/function
+calls that need it can get it, since it will actually be declared
+and populated at the end of the module's source file... */
+-const static __attribute__((unused)) struct ast_mod
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 20-Mar-2008 20:21:17
Branch: HEAD Handle: 2008032019211600
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
libiax is now packaged in asterisk-libiax
Summary:
RevisionChanges Path
1.33+0 -47 openpkg-src/asterisk/asterisk.patch
1.56+5 -29 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.32 -r1.33 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 19 Mar 2008 20:18:27 -
1.32
+++ openpkg-src/asterisk/asterisk.patch 20 Mar 2008 19:21:16 -
1.33
@@ -100,53 +100,6 @@
*)
ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then
-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.in2008-03-18 22:06:58 +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 2008-03-18 22:06:58 +0100
-@@ -33,13 +33,11 @@
- #include
- #include
- #include
--#include
- #include
- #include
- #include
- #include
- #include
--#include
- #include
- #include
- #include
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
+++ main/Makefile2008-03-18 22:06:58 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.55 -r1.56 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec20 Mar 2008 19:07:33 -
1.55
+++ openpkg-src/asterisk/asterisk.spec20 Mar 2008 19:21:16 -
1.56
@@ -27,7 +27,6 @@
%define V_asterisk_addons 1.6.0-beta2
%define V_asterisk_sounds_core 1.4.10
%define V_asterisk_sounds_extra 1.4.7
-%define V_asterisk_libiax 0.2.2
%define V_asterisk_perl 0.10
%define V_chan_capi 1_6_1
@@ -63,17 +62,16 @@
Source1:
http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
Source2:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core}.tar.gz
Source3:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra}.tar.gz
-Source4:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.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
+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
Patch0: asterisk.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep, config
+BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: zlib, curl
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 20-Mar-2008 20:40:27
Branch: HEAD Handle: 2008032019402600
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
the Perl AGI module is now packaged as perl-asterisk
Summary:
RevisionChanges Path
1.34+0 -8 openpkg-src/asterisk/asterisk.patch
1.58+4 -26 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.33 -r1.34 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 20 Mar 2008 19:21:16 -
1.33
+++ openpkg-src/asterisk/asterisk.patch 20 Mar 2008 19:40:26 -
1.34
@@ -61,14 +61,6 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-Index: asterisk-perl-0.10/Makefile.PL
asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-18 22:06:58 +0100
-@@ -14,3 +14,4 @@
-},
- );
-
-+
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
+++ channels/console_video.h 2008-03-18 22:06:58 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.57 -r1.58 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec20 Mar 2008 19:25:05 -
1.57
+++ openpkg-src/asterisk/asterisk.spec20 Mar 2008 19:40:26 -
1.58
@@ -27,7 +27,6 @@
%define V_asterisk_addons 1.6.0-beta2
%define V_asterisk_sounds_core 1.4.10
%define V_asterisk_sounds_extra 1.4.7
-%define V_asterisk_perl 0.10
%define V_chan_capi 1_6_1
# package information
@@ -62,10 +61,9 @@
Source1:
http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
Source2:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core}.tar.gz
Source3:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra}.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
+Source4:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
+Source5: asterisk.txt
+Source6: rc.asterisk
Patch0: asterisk.patch
# build information
@@ -75,8 +73,6 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: zlib, curl, openssl, ncurses, speex, popt
PreReq: zlib, curl, openssl, ncurses, speex, popt
-BuildPreReq: perl, perl-openpkg
-PreReq: perl
%if "%{with_ogg}" == "yes"
BuildPreReq: vorbis-libs
PreReq: vorbis-libs
@@ -156,11 +152,6 @@
url =
http://downloads.digium.com/pub/telephony/sounds/releases/
regex = asterisk-extra-sounds-en-alaw-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
-prog asterisk:agi = {
-version = %{V_asterisk_perl}
-url = http://asterisk.gnuinter.net/files/
-regex = asterisk-perl-(__VER__)\.tar\.gz
-}
prog asterisk:chan_capi = {
version = %{V_chan_capi}
url = http://www.turbocat.net/~hselasky/capi4pbx/releases/
@@ -171,7 +162,6 @@
%setup -q -n asterisk-%{V_asterisk}
%setup -q -n asterisk-%{V_asterisk} -D -T -a 1
%setup -q -n asterisk-%{V_asterisk} -D -T -a 4
-%setup -q -n asterisk-%{V_asterisk} -D -T -a 5
%patch -p0
cp %{SOURCE2} %{SOURCE3} sounds/
%{l_shtool} subst \
@@ -374,10 +364,6 @@
) || exit $?
%endif
-# build Perl API
-%{l_prefix}/bin/perl-openpkg prepare
-%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl}
configure build
-
%install
# install program
rm -rf $RPM_BUILD_ROOT
@@ -399,14 +385,6 @@
) || exit $?
%endif
-# 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} \
--e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
-asterisk-perl-
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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-Mar-2008 21:18:28
Branch: HEAD Handle: 2008031920182700
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
finally get Zaptel support working
Summary:
RevisionChanges Path
1.32+12 -4 openpkg-src/asterisk/asterisk.patch
1.52+13 -5 openpkg-src/asterisk/asterisk.spec
1.31+11 -14 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.31 -r1.32 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 19 Mar 2008 08:37:59 -
1.31
+++ openpkg-src/asterisk/asterisk.patch 19 Mar 2008 20:18:27 -
1.32
@@ -174,9 +174,17 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-18 22:07:33 +0100
-@@ -612,9 +612,9 @@
+--- menuselect-tree.orig 2008-03-18 18:05:36 +0100
menuselect-tree 2008-03-19 21:04:40 +0100
+@@ -262,7 +262,6 @@
+
+
+ res_smdi
+-zaptel_vldtmf
+ zaptel
+ tonezone
+ pri
+@@ -616,9 +615,9 @@
@@ -187,7 +195,7 @@
-@@ -666,6 +666,7 @@
+@@ -676,6 +675,7 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.51 -r1.52 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec19 Mar 2008 17:16:44 -
1.51
+++ openpkg-src/asterisk/asterisk.spec19 Mar 2008 20:18:27 -
1.52
@@ -248,6 +248,9 @@
-e 's;lua5.1/lua.h;lua/lua.h;' \
-e 's;ffmpeg/avcodec.h;libavcodec/avcodec.h;' \
configure
+cflags="%{l_cflags -O}"
+cppflags="%{l_cppflags ncurses lua .}"
+ldflags="%{l_ldflags}"
libs=""
%if "%{with_ogg}" == "yes"
libs="$libs -logg -lm"
@@ -258,10 +261,14 @@
%if "%{with_ldap}" == "yes"
libs="$libs -lldap -llber -lssl -lcrypto"
%endif
+%if "%{with_zaptel}" == "yes"
+cppflags="$cppflags -I$zaptel_prefix/include"
+ldflags="$ldflags -L$zaptel_prefix/lib"
+%endif
CC="%{l_cc}" \
-CFLAGS="%{l_cflags -O}" \
-CPPFLAGS="%{l_cppflags ncurses lua .}" \
-LDFLAGS="%{l_ldflags}" \
+CFLAGS="$cflags" \
+CPPFLAGS="$cppflags" \
+LDFLAGS="$ldflags" \
LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
@@ -300,8 +307,10 @@
%endif
%if "%{with_zaptel}" == "yes"
--with-zaptel=$zaptel_prefix \
+--with-tonezone=$zaptel_prefix \
%else
--without-zaptel \
+--without-tonezone \
%endif
%if "%{with_avcodec}" == "yes"
--with-avcodec=%{l_prefix} \
@@ -339,14 +348,13 @@
--without-osptk \
--without-pri \
--without-suppserv \
---without-tonezone \
--without-vpb \
--without-sdl \
--without-x11 \
--without-gtk \
--without-gtk2
%{l_make} %{l_mflags} \
-CC="%{l_cc} %{l_cflags -O} -I. -I./include -I../include
-I../../include %{l_cppflags ncurses lua .}"
+CC="%{l_cc} $cflags -I. -I./include -I../include -I../../include
$cppflags"
# build addon modules
( cd asterisk-addons-*
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
$ cvs diff -u -r1.30 -r1.31 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 19 Mar 2008 15:12:27 - 1.30
+++ openpkg-src/asterisk/asterisk.txt 19 Mar 2008 20:18:27 - 1.31
@@ -46,18 +46,12 @@
[modules]
autoload = yes
noload = chan_iax2.so; not yet wished
-noload = chan_agent.so ; not yet wished
noload = chan_mgcp.so; not yet wished
noload = chan_skinny.so ; not yet wished
-noload = pbx_dundi.so; not yet wished
-noload = app_queue.so; not yet wished
-noload = cdr_custom.so ; not yet wished
-noload = pbx_ael.so ; not yet wished
-noload = res_phoneprov.so; not yet wished
-noload = res_smdi.so ; not yet wishe
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 18-Mar-2008 23:04:58
Branch: HEAD Handle: 2008031822045700
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
use ALAW format only as the GSM sound would be downloaded and it of
lower quality anyway
Summary:
RevisionChanges Path
1.30+34 -34 openpkg-src/asterisk/asterisk.patch
1.48+8 -9 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.29 -r1.30 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 18 Mar 2008 20:58:14 -
1.29
+++ openpkg-src/asterisk/asterisk.patch 18 Mar 2008 22:04:57 -
1.30
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-17 09:31:15 +0100
Makefile 2008-03-18 22:06:58 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -63,7 +63,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-17 09:31:15 +0100
appconference-2.0.1/Makefile 2008-03-18 22:06:58 +0100
@@ -18,11 +18,11 @@
#
@@ -90,7 +90,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-17 09:31:15 +0100
appconference-2.0.1/app_conference.h 2008-03-18 22:06:58 +0100
@@ -44,6 +44,7 @@
#include
@@ -101,7 +101,7 @@
#include
Index: asterisk-perl-0.10/Makefile.PL
--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-17 09:31:15 +0100
asterisk-perl-0.10/Makefile.PL 2008-03-18 22:06:58 +0100
@@ -14,3 +14,4 @@
},
);
@@ -109,7 +109,7 @@
+
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-17 09:31:15 +0100
channels/console_video.h 2008-03-18 22:06:58 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -124,7 +124,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-02-23 00:56:55 +0100
-+++ configure2008-03-17 09:31:15 +0100
configure2008-03-18 22:06:58 +0100
@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
@@ -140,7 +140,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
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.in2008-03-17 09:31:15 +0100
iax-0.2.2/src/Makefile.in2008-03-18 22:06:58 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -170,7 +170,7 @@
# 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 2008-03-17 09:31:15 +0100
iax-0.2.2/src/iax.c 2008-03-18 22:06:58 +0100
@@ -33,13 +33,11 @@
#include
#include
@@ -187,7 +187,7 @@
#include
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
-+++ main/Makefile2008-03-17 09:31:15 +0100
main/Makefile2008-03-18 22:06:58 +0100
@@ -82,10 +82,7 @@
endif
@@ -200,58 +200,58 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+Index: main/tcptls.c
+--- main/tcptls.c.orig 2008-02-06 00:00:15 +0100
main/tcptls.c2008-03-18 22:06:58 +0100
+@@ -189,6 +189,7 @@
+ if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
+ if (SSL_CTX_load_verify_locations(cfg->ssl_ctx,
S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
+ ast_verb(0, "SSL CA file(%s)/path(%s) error\n",
cfg->cafile, cfg->capath);
++SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
+ }
+
+ ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
--- menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-17 09:31:31 +0100
-@@ -612,6 +612,7 @@
menuselect-tree 2008-03-1
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 18-Mar-2008 21:58:14
Branch: HEAD Handle: 2008031820581400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
try to let Asterisk pass out the CA certificate if possible
Summary:
RevisionChanges Path
1.29+11 -0 openpkg-src/asterisk/asterisk.patch
1.47+1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.28 -r1.29 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 17 Mar 2008 09:08:11 -
1.28
+++ openpkg-src/asterisk/asterisk.patch 18 Mar 2008 20:58:14 -
1.29
@@ -244,3 +244,14 @@
+Index: main/tcptls.c
+--- main/tcptls.c.orig 2008-02-06 00:00:15 +0100
main/tcptls.c2008-03-18 21:29:51 +0100
+@@ -189,6 +189,7 @@
+ if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
+ if (SSL_CTX_load_verify_locations(cfg->ssl_ctx,
S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
+ ast_verb(0, "SSL CA file(%s)/path(%s) error\n",
cfg->cafile, cfg->capath);
++SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
+ }
+
+ ast_verb(0, "SSL certificate ok\n");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.46 -r1.47 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec17 Mar 2008 09:33:24 -
1.46
+++ openpkg-src/asterisk/asterisk.spec18 Mar 2008 20:58:14 -
1.47
@@ -43,7 +43,7 @@
Group:VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080317
+Release: 20080318
# package options
%option with_zaptel no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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-Mar-2008 10:08:11
Branch: HEAD Handle: 2008031709081100
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
provide sounds in both GSM (low quality) and ALAW (higher quality)
format
Summary:
RevisionChanges Path
1.28+44 -11 openpkg-src/asterisk/asterisk.patch
1.45+13 -12 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.27 -r1.28 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 9 Mar 2008 20:28:30 -
1.27
+++ openpkg-src/asterisk/asterisk.patch 17 Mar 2008 09:08:11 -
1.28
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-09 20:35:44 +0100
Makefile 2008-03-17 09:31:15 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -63,7 +63,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-09 21:22:16 +0100
appconference-2.0.1/Makefile 2008-03-17 09:31:15 +0100
@@ -18,11 +18,11 @@
#
@@ -90,7 +90,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-09 20:33:38 +0100
appconference-2.0.1/app_conference.h 2008-03-17 09:31:15 +0100
@@ -44,6 +44,7 @@
#include
@@ -101,7 +101,7 @@
#include
Index: asterisk-perl-0.10/Makefile.PL
--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-09 20:33:38 +0100
asterisk-perl-0.10/Makefile.PL 2008-03-17 09:31:15 +0100
@@ -14,3 +14,4 @@
},
);
@@ -109,7 +109,7 @@
+
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-09 20:33:38 +0100
channels/console_video.h 2008-03-17 09:31:15 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -124,7 +124,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-02-23 00:56:55 +0100
-+++ configure2008-03-09 20:33:38 +0100
configure2008-03-17 09:31:15 +0100
@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
@@ -140,7 +140,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
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.in2008-03-09 20:33:38 +0100
iax-0.2.2/src/Makefile.in2008-03-17 09:31:15 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -170,7 +170,7 @@
# 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 2008-03-09 20:33:38 +0100
iax-0.2.2/src/iax.c 2008-03-17 09:31:15 +0100
@@ -33,13 +33,11 @@
#include
#include
@@ -187,7 +187,7 @@
#include
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
-+++ main/Makefile2008-03-09 20:33:38 +0100
main/Makefile2008-03-17 09:31:15 +0100
@@ -82,10 +82,7 @@
endif
@@ -202,9 +202,42 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: menuselect-tree
--- menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-09 20:33:38 +0100
-@@ -668,6 +668,7 @@
menuselect-tree 2008-03-17 09:31:31 +0100
+@@ -612,6 +612,7 @@
+
+
+
++yes
+
+
+ yes
+@@ -666,8 +667,10 @@
+
+
++yes
+
+
++yes
+
+
+
+Index: sounds/sounds.xml
+--- sounds/sounds.xml.orig 2006-10-25 19:12:59 +0200
sounds/sounds.xml2008-03-17 09:31:41 +0100
+@@ -4,6 +4,7 @@
+
+
+
++
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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-Mar-2008 21:15:20
Branch: HEAD Handle: 2008030920151901
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
provide more clean out-of-the-box configuration
Summary:
RevisionChanges Path
1.26+58 -11 openpkg-src/asterisk/asterisk.patch
1.42+6 -3 openpkg-src/asterisk/asterisk.spec
1.22+28 -1 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.25 -r1.26 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 9 Mar 2008 12:41:04 -
1.25
+++ openpkg-src/asterisk/asterisk.patch 9 Mar 2008 20:15:19 -
1.26
@@ -1,7 +1,54 @@
Index: Makefile
--- Makefile.orig2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-09 13:27:48 +0100
-@@ -245,12 +245,6 @@
Makefile 2008-03-09 20:35:44 +0100
+@@ -121,42 +121,20 @@
+
+ # Define standard directories for various platforms
+ # These apply if they are not redefined in asterisk.conf
+-ifeq ($(OSARCH),SunOS)
+- ASTETCDIR=/var/etc/asterisk
+- ASTLIBDIR=/opt/asterisk/lib
+- ASTVARLIBDIR=/var/opt/asterisk
+- ASTDBDIR=$(ASTVARLIBDIR)
+- ASTKEYDIR=$(ASTVARLIBDIR)
+- ASTSPOOLDIR=/var/spool/asterisk
+- ASTLOGDIR=/var/log/asterisk
+- ASTHEADERDIR=/opt/asterisk/include
+- ASTBINDIR=/opt/asterisk/bin
+- ASTSBINDIR=/opt/asterisk/sbin
+- ASTVARRUNDIR=/var/run/asterisk
+- ASTMANDIR=/opt/asterisk/man
+-else
+ ASTETCDIR=$(sysconfdir)/asterisk
+ ASTLIBDIR=$(libdir)/asterisk
+ ASTHEADERDIR=$(includedir)/asterisk
+ ASTBINDIR=$(bindir)
+ ASTSBINDIR=$(sbindir)
+- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+- ASTLOGDIR=$(localstatedir)/log/asterisk
++ ASTSPOOLDIR=$(localstatedir)/spool
++ ASTLOGDIR=$(localstatedir)/log
+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTMANDIR=$(mandir)
+-ifneq ($(findstring BSD,$(OSARCH)),)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run/asterisk
+- ASTDBDIR=$(localstatedir)/db/asterisk
+-else
+- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+- ASTDBDIR=$(ASTVARLIBDIR)
+-endif
++ ASTVARRUNDIR=$(localstatedir)/run
++ ASTDBDIR=$(localstatedir)/db
+ ASTKEYDIR=$(ASTVARLIBDIR)
+-endif
+-ifeq ($(ASTDATADIR),)
+ ASTDATADIR:=$(ASTVARLIBDIR)
+-endif
+
+ # Asterisk.conf is located in ASTETCDIR or by using the -C flag
+ # when starting Asterisk
+@@ -245,12 +223,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -16,7 +63,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-09 13:27:48 +0100
appconference-2.0.1/Makefile 2008-03-09 20:33:38 +0100
@@ -18,9 +18,9 @@
#
@@ -40,7 +87,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-09 13:27:48 +0100
appconference-2.0.1/app_conference.h 2008-03-09 20:33:38 +0100
@@ -44,6 +44,7 @@
#include
@@ -51,7 +98,7 @@
#include
Index: asterisk-perl-0.10/Makefile.PL
--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-09 13:27:48 +0100
asterisk-perl-0.10/Makefile.PL 2008-03-09 20:33:38 +0100
@@ -14,3 +14,4 @@
},
);
@@ -59,7 +106,7 @@
+
Index: channels/console_video.h
--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-09 13:27:48 +0100
channels/console_video.h 2008-03-09 20:33:38 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -74,7 +121,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-02-23 00:56:55 +0100
-+++ configure2008-03-09 13:27:48 +0100
configure2008-03-09 20:33:38 +0100
@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
@@ -90,7 +137,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
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.in2008-03-09 13:27:48
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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-Mar-2008 13:41:04
Branch: HEAD Handle: 2008030912410400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrade to beta 5 and the Asterisk 1.4 sounds, including the extra
sounds
Summary:
RevisionChanges Path
1.25+39 -28 openpkg-src/asterisk/asterisk.patch
1.37+37 -33 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.24 -r1.25 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 9 Mar 2008 09:11:32 -
1.24
+++ openpkg-src/asterisk/asterisk.patch 9 Mar 2008 12:41:04 -
1.25
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2008-01-29 18:22:47 +0100
-+++ Makefile 2008-03-08 19:36:45 +0100
+--- Makefile.orig2008-02-26 21:19:03 +0100
Makefile 2008-03-09 13:27:48 +0100
@@ -245,12 +245,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -16,7 +16,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-08 21:10:48 +0100
appconference-2.0.1/Makefile 2008-03-09 13:27:48 +0100
@@ -18,9 +18,9 @@
#
@@ -40,7 +40,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-08 19:36:45 +0100
appconference-2.0.1/app_conference.h 2008-03-09 13:27:48 +0100
@@ -44,6 +44,7 @@
#include
@@ -50,17 +50,32 @@
#include
#include
Index: asterisk-perl-0.10/Makefile.PL
asterisk-perl-0.10/Makefile.PL.orig 2008-03-08 19:41:19 +0100
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-08 19:41:19 +0100
+--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
asterisk-perl-0.10/Makefile.PL 2008-03-09 13:27:48 +0100
@@ -14,3 +14,4 @@
},
);
+
+Index: channels/console_video.h
+--- channels/console_video.h.orig2008-01-09 19:03:40 +0100
channels/console_video.h 2008-03-09 13:27:48 +0100
+@@ -28,10 +28,7 @@
+ "console {device}"
+ #else
+
+-#include
+-#ifndef OLD_FFMPEG
+-#include /* requires a recent ffmpeg */
+-#endif
++#include
+
+ #define CONSOLE_VIDEO_CMDS \
+ "console {videodevice|videocodec" \
Index: configure
configure.orig 2008-02-19 18:33:55 +0100
-+++ configure2008-03-08 19:36:45 +0100
-@@ -4043,12 +4043,6 @@
+--- configure.orig 2008-02-23 00:56:55 +0100
configure2008-03-09 13:27:48 +0100
+@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -75,7 +90,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
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.in2008-03-08 19:36:45 +0100
iax-0.2.2/src/Makefile.in2008-03-09 13:27:48 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -105,7 +120,7 @@
# 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 2008-03-08 19:36:45 +0100
iax-0.2.2/src/iax.c 2008-03-09 13:27:48 +0100
@@ -33,13 +33,11 @@
#include
#include
@@ -121,8 +136,8 @@
#include
#include
Index: main/Makefile
main/Makefile.orig 2008-01-29 18:44:05 +0100
-+++ main/Makefile2008-03-08 19:36:45 +0100
+--- main/Makefile.orig 2008-02-28 01:11:31 +0100
main/Makefile2008-03-09 13:27:48 +0100
@@ -82,10 +82,7 @@
endif
@@ -135,18 +150,14 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-Index: channels/console_video.h
channels/console_video.h.orig2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-08 23:06:34 +0100
-@@ -28,10 +28,7 @@
- "console {device}"
- #else
-
--#include
--#ifndef OLD_FFMPEG
--#include /* requires a recent ffmpeg */
--#endif
-+#include
-
- #define CONSOLE_VIDEO_CMDS \
- "console {videodevice|videocodec
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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/asteriskasterisk.patch asterisk.spec
Log:
move subst into %build section and add IAX library
Summary:
RevisionChanges 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 -
1.22
+++ openpkg-src/asterisk/asterisk.patch 23 Dec 2006 10:47:27 -
1.23
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-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.orig2006-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
#include
@@ -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/Makefile2006-12-16 12:07:50 +0100
apps/Makefile2006-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.orig2006-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.or
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 16-Dec-2006 12:30:22
Branch: HEAD Handle: 2006121611302100
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.2.13 -> 1.2.14
Summary:
RevisionChanges Path
1.22+48 -63 openpkg-src/asterisk/asterisk.patch
1.29+2 -2 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.21 -r1.22 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 22 Oct 2006 13:13:00 -
1.21
+++ openpkg-src/asterisk/asterisk.patch 16 Dec 2006 11:30:21 -
1.22
@@ -1,6 +1,6 @@
Index: Makefile
Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-10-22 14:07:55 +0200
+--- Makefile.orig2006-12-11 22:55:43 +0100
Makefile 2006-12-16 12:07:50 +0100
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -157,7 +157,7 @@
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
-@@ -702,31 +674,6 @@
+@@ -711,31 +683,6 @@
fi
install: all datafiles bininstall install-subdirs
@@ -191,7 +191,7 @@
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-10-22 14:07:55 +0200
agi/Makefile 2006-12-16 12:07:50 +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-10-22 14:07:55 +0200
app_conference/Makefile 2006-12-16 12:07:50 +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-10-22 14:07:55 +0200
app_conference/app_conference.h 2006-12-16 12:07:50 +0100
@@ -33,6 +33,7 @@
#include
#include
@@ -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-22 14:07:55 +0200
app_conference/conference.c 2006-12-16 12:07:50 +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/Makefile2006-10-22 14:07:55 +0200
apps/Makefile2006-12-16 12:07:50 +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-10-22 14:07:55 +0200
asterisk-addons-1.2.5/Makefile 2006-12-16 12:07:50 +0100
@@ -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-22 14:07:55 +0200
asterisk-sounds-1.2.1/Makefile 2006-12-16 12:07:50 +0100
@@ -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-09-26 22:49:21 +0200
-+++ asterisk.c 2006-10-22 14:07:55 +0200
+--- asterisk.c.orig 2006-10-27 19:36:07 +0200
asterisk.c 2006-12-16 12:07:50 +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 +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.orig2006-03-03 18:13:37 +0100
-+++ build_tools/make_build_h 2006-10-22 14:07:55 +0200
build_tools/make_build_h 2006-12-16 12:07:50 +0100
@@ -
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 22-Oct-2006 15:13:01
Branch: HEAD Handle: 200610221413
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
first cut for ISDN/CAPI support under FreeBSD/NetBSD via the I4B
CAPI20 API
Summary:
RevisionChanges Path
1.21+87 -33 openpkg-src/asterisk/asterisk.patch
1.28+39 -4 openpkg-src/asterisk/asterisk.spec
1.18+36 -0 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.20 -r1.21 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 19 Oct 2006 05:45:13 -
1.20
+++ openpkg-src/asterisk/asterisk.patch 22 Oct 2006 13:13:00 -
1.21
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-10-19 07:38:26 +0200
Makefile 2006-10-22 14:07:55 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -191,7 +191,7 @@
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-10-19 07:38:26 +0200
agi/Makefile 2006-10-22 14:07:55 +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-19 07:38:26 +0200
app_conference/Makefile 2006-10-22 14:07:55 +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-19 07:38:26 +0200
app_conference/app_conference.h 2006-10-22 14:07:55 +0200
@@ -33,6 +33,7 @@
#include
#include
@@ -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-19 07:38:26 +0200
app_conference/conference.c 2006-10-22 14:07:55 +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/Makefile2006-10-19 07:38:26 +0200
apps/Makefile2006-10-22 14:07:55 +0200
@@ -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-10-19 07:38:26 +0200
asterisk-addons-1.2.5/Makefile 2006-10-22 14:07:55 +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-19 07:38:26 +0200
asterisk-sounds-1.2.1/Makefile 2006-10-22 14:07:55 +0200
@@ -66,7 +66,7 @@
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
for x in sounds/letters/*.gsm; do \
@@ -445,7 +445,7 @@
exit 1; \
Index: asterisk.c
--- asterisk.c.orig 2006-09-26 22:49:21 +0200
-+++ asterisk.c 2006-10-19 07:38:26 +0200
asterisk.c 2006-10-22 14:07:55 +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.orig2006-03-03 18:13:37 +0100
-+++ build_tools/make_build_h 2006-10-19 07:38:26 +0200
build_tools/make_build_h 2006-10-22 14:07:55 +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-19 07:38:26 +0200
build_tools/make_defaults_h 2006-10-22 14:07:55 +0200
@@ -14,7 +14,7 @
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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/asteriskasterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.2.12.1 -> 1.2.13
Summary:
RevisionChanges 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 -
1.19
+++ openpkg-src/asterisk/asterisk.patch 19 Oct 2006 05:45:13 -
1.20
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-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.orig2006-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
#include
@@ -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/Makefile2006-10-13 22:45:33 +0200
apps/Makefile2006-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.orig2006-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
-+
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 13-Oct-2006 22:56:31 Branch: HEAD Handle: 2006101321563000 Modified files: openpkg-src/asteriskasterisk.patch asterisk.spec Log: port to Sun Solaris Summary: RevisionChanges Path 1.19+158 -39openpkg-src/asterisk/asterisk.patch 1.22+4 -2 openpkg-src/asterisk/asterisk.spec patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.patch $ cvs diff -u -r1.18 -r1.19 asterisk.patch --- openpkg-src/asterisk/asterisk.patch 17 Sep 2006 18:03:33 - 1.18 +++ openpkg-src/asterisk/asterisk.patch 13 Oct 2006 20:56:30 - 1.19 @@ -1,6 +1,6 @@ Index: Makefile --- Makefile.orig2006-09-06 22:09:10 +0200 -+++ Makefile 2006-09-17 19:59:40 +0200 Makefile 2006-10-13 22:45:33 +0200 @@ -47,14 +47,14 @@ #K6OPT = -DK6OPT @@ -67,15 +67,20 @@ ASTCFLAGS= -@@ -219,7 +203,6 @@ +@@ -218,21 +202,29 @@ + ID=id ifeq ($(OSARCH),SunOS) - GREP=/usr/xpg4/bin/grep +- GREP=/usr/xpg4/bin/grep - M4=/usr/local/bin/m4 - ID=/usr/xpg4/bin/id - LN=/usr/xpg4/bin/ln - INSTALL=ginstall -@@ -227,12 +210,21 @@ +- ID=/usr/xpg4/bin/id +- LN=/usr/xpg4/bin/ln +- INSTALL=ginstall ++ GREP=$(shell if [ -f /usr/xpg4/bin/grep ]; then echo /usr/xpg4/bin/grep; else echo grep; fi) ++ ID=$(shell if [ -f /usr/xpg4/bin/id ]; then echo /usr/xpg4/bin/grep; else echo id; fi) ++ LN=$(shell if [ -f /usr/xpg4/bin/ln ]; then echo /usr/xpg4/bin/grep; else echo ln; fi) ++ INSTALL=$(INSTALL_PREFIX)/lib/openpkg/shtool install -c + endif INCLUDE+=-Iinclude -I../include ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY @@ -152,9 +157,41 @@ SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ +@@ -702,31 +674,6 @@ + fi + + install: all datafiles bininstall install-subdirs +-@if [ -x /usr/sbin/asterisk-post-install ]; then \ +-/usr/sbin/asterisk-post-install $(DESTDIR) . ; \ +-fi +-@echo " + Asterisk Installation Complete ---+" +-@echo " + +" +-@echo " +YOU MUST READ THE SECURITY DOCUMENT+" +-@echo " + +" +-@echo " + Asterisk has successfully been installed. +" +-@echo " + If you would like to install the sample +" +-@echo " + configuration files (overwriting any +" +-@echo " + existing config files), run: +" +-@echo " + +" +-@echo " + $(MAKE) samples+" +-@echo " + +" +-@echo " +- or -+" +-@echo " + +" +-@echo " + You can go ahead and install the asterisk +" +-@echo " + program documentation now or later run: +" +-@echo " + +" +-@echo " + $(MAKE) progdocs+" +-@echo " + +" +-@echo " + **Note** This requires that you have +" +-@echo " + doxygen installed on your local system+" +-@echo " +---+" +-@$(MAKE) -s oldmodcheck + + upgrade: all bininstall + Index: agi/Makefile --- agi/Makefile.orig2006-03-28 22:22:05 +0200 -+++ agi/Makefile 2006-09-17 19:59:20 +0200 agi/Makefile 2006-10-13 22:45:33 +0200 @@ -20,9 +20,7 @@ LIBS=-lsocket -lnsl ../strcompat.o endif @@ -168,7 +205,7 @@ Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/Makefile 2006-09-17 19:59:20 +0200 app_conference/Makefile 2006-10-13 22:45:33 +0200 @@ -20,10 +20,10 @@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules @@ -210,7 +247,17 @@ # adding -msse -mfpmath=sse has little effect. -@@ -77,8 +78,9 @@ +@@ -72,13 +73,19 @@ + CFLAGS += -DAPP_CONFERENCE_DEBUG + endif + ++OSARCH=$(shell uname -s) ++ifeq ($(OSARCH),SunOS) ++ CFLAGS+=-
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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/asteriskasterisk.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: RevisionChanges 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 - 1.17 +++ openpkg-src/asterisk/asterisk.patch 17 Sep 2006 18:03:33 - 1.18 @@ -1,6 +1,6 @@ Index: Makefile --- Makefile.orig2006-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.orig2006-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 #include @@ -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/Makefile2006-09-16 17:38:48 +0200 apps/Makefile2006-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
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 16-Sep-2006 17:32:25
Branch: HEAD Handle: 2006091616322400
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
add optional Zaptel support for Linux & FreeBSD; this allows one to
use PSTN hardware or at least the ztdummy kernel device which in turn
allows one to use the more robust MeetMe conference application
Summary:
RevisionChanges Path
1.16+43 -32 openpkg-src/asterisk/asterisk.patch
1.14+23 -0 openpkg-src/asterisk/asterisk.spec
1.9 +26 -0 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.15 -r1.16 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 16 Sep 2006 07:53:32 -
1.15
+++ openpkg-src/asterisk/asterisk.patch 16 Sep 2006 15:32:24 -
1.16
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-16 09:51:07 +0200
Makefile 2006-09-16 14:56:22 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -128,7 +128,18 @@
ifeq ($(OSCPU),sun4u)
OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc
endif
-@@ -341,9 +305,9 @@
+@@ -306,6 +270,10 @@
+ endif
+
+ ifndef WITHOUT_ZAPTEL
++ifeq ($(OSARCH),FreeBSD)
++CFLAGS+=-I/usr/local/include
++LIBS+=-L/usr/local/lib
++endif
+
+ ifneq ($(wildcard
$(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard
$(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard
$(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
+@@ -341,9 +309,9 @@
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
@@ -143,7 +154,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-16 09:51:07 +0200
agi/Makefile 2006-09-16 14:55:34 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -157,7 +168,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-16 09:51:07 +0200
app_conference/Makefile 2006-09-16 14:55:34 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -229,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 09:51:07 +0200
app_conference/app_conference.h 2006-09-16 14:55:34 +0200
@@ -33,6 +33,7 @@
#include
#include
@@ -253,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 09:51:07 +0200
app_conference/conference.c 2006-09-16 14:55:34 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -282,7 +293,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile2006-09-16 09:51:07 +0200
apps/Makefile2006-09-16 14:55:34 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -306,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 09:51:07 +0200
asterisk-addons-1.2.4/Makefile 2006-09-16 14:55:34 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -330,7 +341,7 @@
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-16 09:51:07 +0200
asterisk.c 2006-09-16 14:55:34 +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));
@@ -344,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_
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 16-Sep-2006 09:53:32
Branch: HEAD Handle: 2006091608533200
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
fix segfault under FreeBSD
Summary:
RevisionChanges Path
1.15+43 -30 openpkg-src/asterisk/asterisk.patch
1.13+1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.14 -r1.15 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 15 Sep 2006 05:58:26 -
1.14
+++ openpkg-src/asterisk/asterisk.patch 16 Sep 2006 07:53:32 -
1.15
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-15 07:54:50 +0200
Makefile 2006-09-16 09:51:07 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -143,7 +143,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-15 07:54:50 +0200
agi/Makefile 2006-09-16 09:51:07 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -157,7 +157,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-15 07:54:50 +0200
app_conference/Makefile 2006-09-16 09:51:07 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -229,7 +229,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-15 07:54:50 +0200
app_conference/app_conference.h 2006-09-16 09:51:07 +0200
@@ -33,6 +33,7 @@
#include
#include
@@ -253,7 +253,7 @@
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-15 07:54:50 +0200
app_conference/conference.c 2006-09-16 09:51:07 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -282,7 +282,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile2006-09-15 07:54:50 +0200
apps/Makefile2006-09-16 09:51:07 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -306,7 +306,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-15 07:54:50 +0200
asterisk-addons-1.2.4/Makefile 2006-09-16 09:51:07 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -330,7 +330,7 @@
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-15 07:54:50 +0200
asterisk.c 2006-09-16 09:51:07 +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));
@@ -344,7 +344,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-15 07:54:50 +0200
build_tools/make_defaults_h 2006-09-16 09:51:07 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR"${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR"${INSTALL_PATH}${AGI_DIR}"
@@ -356,7 +356,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-15 07:54:50 +0200
cdr/Makefile 2006-09-16 09:51:07 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -372,7 +372,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/Makefile2006-09-15 07:54:50 +0200
channels/Makefile2006-09-16 09:51:07 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_mode
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 15-Sep-2006 07:58:27
Branch: HEAD Handle: 2006091506582601
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
resolve the gethostbyname_r issue the more general way
Summary:
RevisionChanges Path
1.14+37 -40 openpkg-src/asterisk/asterisk.patch
1.12+1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.13 -r1.14 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 13 Sep 2006 05:58:09 -
1.13
+++ openpkg-src/asterisk/asterisk.patch 15 Sep 2006 05:58:26 -
1.14
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-13 07:53:22 +0200
Makefile 2006-09-15 07:54:50 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -143,7 +143,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-13 07:53:22 +0200
agi/Makefile 2006-09-15 07:54:50 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -157,7 +157,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-13 07:53:52 +0200
app_conference/Makefile 2006-09-15 07:54:50 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -229,7 +229,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-13 07:53:22 +0200
app_conference/app_conference.h 2006-09-15 07:54:50 +0200
@@ -33,6 +33,7 @@
#include
#include
@@ -253,7 +253,7 @@
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-13 07:53:22 +0200
app_conference/conference.c 2006-09-15 07:54:50 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -282,7 +282,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile2006-09-13 07:53:22 +0200
apps/Makefile2006-09-15 07:54:50 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -306,7 +306,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-13 07:53:22 +0200
asterisk-addons-1.2.4/Makefile 2006-09-15 07:54:50 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -330,7 +330,7 @@
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-13 07:53:22 +0200
asterisk.c 2006-09-15 07:54:50 +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));
@@ -344,7 +344,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-13 07:53:22 +0200
build_tools/make_defaults_h 2006-09-15 07:54:50 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR"${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR"${INSTALL_PATH}${AGI_DIR}"
@@ -356,7 +356,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-13 07:53:22 +0200
cdr/Makefile 2006-09-15 07:54:50 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -372,7 +372,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/Makefile2006-09-13 07:53:22 +0200
channels/Makefile2006-09-15 07:54:50 +0200
@@ -21,9 +21,7 @@
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 13-Sep-2006 07:58:10
Branch: HEAD Handle: 2006091306580900
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
build against external speex instead of against a local (and older)
copy of speex
Summary:
RevisionChanges Path
1.13+50 -34 openpkg-src/asterisk/asterisk.patch
1.11+1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.12 -r1.13 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 13 Sep 2006 05:39:29 -
1.12
+++ openpkg-src/asterisk/asterisk.patch 13 Sep 2006 05:58:09 -
1.13
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-13 07:30:00 +0200
Makefile 2006-09-13 07:53:22 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -143,7 +143,7 @@
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-13 07:30:00 +0200
agi/Makefile 2006-09-13 07:53:22 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -157,7 +157,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-13 07:30:00 +0200
app_conference/Makefile 2006-09-13 07:53:52 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -199,12 +199,24 @@
# adding -msse -mfpmath=sse has little effect.
-@@ -102,14 +103,13 @@
+@@ -77,8 +78,9 @@
+ #
+
+ ifeq ($(SILDET), 2)
+-OBJS += libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
+-CFLAGS += -Ilibspeex -DSILDET=2
++CFLAGS += -DSILDET=2
++CFLAGS += -I$(INSTALL_PREFIX)/include/speex -I$(INSTALL_PREFIX)/include
++LIBS += -L$(INSTALL_PREFIX)/lib -lspeex -lm
+ endif
+
+ ifeq ($(SILDET), 1)
+@@ -102,14 +104,13 @@
rm -f *.so *.o $(OBJS)
app_conference.so : $(OBJS)
-$(CC) -pg -shared -Xlinker -x -o $@ $(OBJS)
-+$(CC) -shared -Xlinker -x -o $@ $(OBJS)
++$(CC) -shared -Xlinker -x -o $@ $(OBJS) $(LIBS)
vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o
libspeex/smallft.o
$(CC) $(PROFILE) -o $@ $^ -lm
@@ -217,7 +229,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-13 07:31:29 +0200
app_conference/app_conference.h 2006-09-13 07:53:22 +0200
@@ -33,6 +33,7 @@
#include
#include
@@ -226,18 +238,22 @@
/* standard includes */
#include
-@@ -40,8 +41,6 @@
+@@ -40,10 +41,9 @@
#include
#include
-#include
-
#if (SILDET == 2)
- #include "libspeex/speex_preprocess.h"
+-#include "libspeex/speex_preprocess.h"
++#include
++#include
#endif
+
+ //
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-13 07:30:00 +0200
app_conference/conference.c 2006-09-13 07:53:22 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -266,7 +282,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile2006-09-13 07:30:00 +0200
apps/Makefile2006-09-13 07:53:22 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -290,7 +306,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-13 07:30:00 +0200
asterisk-addons-1.2.4/Makefile 2006-09-13 07:53:22 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -314,7 +330,7 @@
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-13 07:30:00 +0200
asterisk.c 2006-09-13 07:53:22 +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_S
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 11-Sep-2006 10:32:19 Branch: HEAD Handle: 2006091109321800 Modified files: openpkg-src/asteriskasterisk.patch asterisk.spec Log: disable too aggressive optimizations in order to try to get the newer version running again Summary: RevisionChanges Path 1.11+62 -31 openpkg-src/asterisk/asterisk.patch 1.9 +1 -1 openpkg-src/asterisk/asterisk.spec patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.patch $ cvs diff -u -r1.10 -r1.11 asterisk.patch --- openpkg-src/asterisk/asterisk.patch 9 Sep 2006 17:35:53 - 1.10 +++ openpkg-src/asterisk/asterisk.patch 11 Sep 2006 08:32:18 - 1.11 @@ -1,6 +1,23 @@ Index: Makefile --- Makefile.orig2006-09-06 22:09:10 +0200 -+++ Makefile 2006-09-09 19:28:53 +0200 Makefile 2006-09-11 10:26:50 +0200 +@@ -47,14 +47,14 @@ + #K6OPT = -DK6OPT + + #Tell gcc to optimize the code +-OPTIMIZE+=-O6 ++#OPTIMIZE+=-O6 + endif + + #Overwite config files on "make samples" + OVERWRITE=y + + #Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 #-pg ++#DEBUG=-g3 #-pg + + #Set NOCRYPTO to yes if you do not want to have crypto support or + #dependencies @@ -110,35 +110,19 @@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE @@ -70,7 +87,7 @@ ifneq ($(PROC),ultrasparc) ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) endif -@@ -252,29 +236,8 @@ +@@ -252,29 +236,9 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -80,6 +97,7 @@ - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp - endif ++ CFLAGS+=-pthread + LIBS+=-pthread MPG123TARG=freebsd - @@ -101,7 +119,7 @@ endif # FreeBSD ifeq ($(OSARCH),NetBSD) -@@ -289,7 +252,7 @@ +@@ -289,7 +253,7 @@ ifeq ($(OSARCH),SunOS) ASTCFLAGS+=-Wcast-align -DSOLARIS @@ -110,9 +128,22 @@ ifeq ($(OSCPU),sun4u) OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc endif +@@ -341,9 +305,9 @@ + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) + ASTCFLAGS+= $(OPTIONS) +-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) +-ASTCFLAGS+= -fomit-frame-pointer +-endif ++#ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) ++#ASTCFLAGS+= -fomit-frame-pointer ++#endif + SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime + + OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ Index: agi/Makefile --- agi/Makefile.orig2006-03-28 22:22:05 +0200 -+++ agi/Makefile 2006-09-09 19:28:53 +0200 agi/Makefile 2006-09-11 10:25:27 +0200 @@ -20,9 +20,7 @@ LIBS=-lsocket -lnsl ../strcompat.o endif @@ -126,7 +157,7 @@ Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/Makefile 2006-09-09 19:28:53 +0200 app_conference/Makefile 2006-09-11 10:25:27 +0200 @@ -20,10 +20,10 @@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules @@ -186,7 +217,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-09 19:28:53 +0200 app_conference/conference.c 2006-09-11 10:25:27 +0200 @@ -568,7 +568,6 @@ conf->memberlist = NULL ; @@ -215,7 +246,7 @@ Index: apps/Makefile --- apps/Makefile.orig 2006-04-30 15:38:22 +0200 -+++ apps/Makefile2006-09-09 19:28:53 +0200 apps/Makefile2006-09-11 10:25:27 +0200 @@ -54,16 +54,11 @@ APPS+=app_osplookup.so endif @@ -239,7 +270,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-09 19:28:53 +0200 asterisk-addons-1.2.4/Makefile 2006-09-11 10:25:27 +0200 @@ -27,17 +27,9 @@ # # MySQL stuff... Autoconf anyone?? @@ -263,7 +294,7 @@ Index: asterisk.c --- asterisk.c.orig 2006-08-2
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 06-Sep-2006 08:38:31
Branch: HEAD Handle: 2006090607383100
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
move astdb into a var directory; add SPYGROUP to conference setup; fix
asterisk.conf to allow daemon mode; add %post/%pre for the usual
daemon restart/stop/cleanup
Summary:
RevisionChanges Path
1.7 +45 -19 openpkg-src/asterisk/asterisk.patch
1.5 +18 -1 openpkg-src/asterisk/asterisk.spec
1.4 +7 -5 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.6 -r1.7 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2006 20:56:15 -
1.6
+++ openpkg-src/asterisk/asterisk.patch 6 Sep 2006 06:38:31 -
1.7
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig2006-06-29 21:23:18 +0200
-+++ Makefile 2006-09-05 22:54:11 +0200
Makefile 2006-09-06 08:25:09 +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.orig2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-05 22:54:11 +0200
agi/Makefile 2006-09-06 08:25:09 +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-05 22:54:40 +0200
app_conference/Makefile 2006-09-06 08:25:09 +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-05 22:54:11 +0200
app_conference/conference.c 2006-09-06 08:25:09 +0200
@@ -618,7 +618,7 @@
// acquire conference mutexes
ast_mutex_lock( &conf->lock ) ;
@@ -198,7 +198,7 @@
pthread_detach( conf->conference_thread ) ;
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile2006-09-05 22:54:11 +0200
apps/Makefile2006-09-06 08:25:09 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -222,7 +222,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-05 22:54:11 +0200
asterisk-addons-1.2.4/Makefile 2006-09-06 08:25:09 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -244,9 +244,35 @@
OSARCH=$(shell uname -s)
+Index: asterisk.c
+--- asterisk.c.orig 2006-08-22 00:34:26 +0200
asterisk.c 2006-09-06 08:31:47 +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));
+ snprintf(ast_config_AST_MONITOR_DIR,
sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
++snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB),
"%s/astdb", v->value);
+ } else if (!strcasecmp(v->name, "astvarlibdir")) {
+ ast_copy_string(ast_config_AST_VAR_DIR, v->value,
sizeof(ast_config_AST_VAR_DIR));
+-snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB),
"%s/astdb", v->value);
+ snprintf(ast_config_AST_KEY_DIR,
sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
+ } else if (!strcasecmp(v->name, "astlogdir")) {
+ 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-06 08:32:28 +0200
+@@ -14,7 +14,7 @@
+ #define AST_LOG_DIR"${INSTALL_PATH}${ASTLOGDIR}"
+ #define AST_AGI_DIR"${INSTALL_PATH}${AGI_DIR}"
+ #define AST_KEY_DIR"${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+-#define AST_DB
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 05-Sep-2006 15:08:38
Branch: HEAD Handle: 2006090514083700
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt
Log:
add Perl API for AGI
Summary:
RevisionChanges Path
1.3 +1 -1 openpkg-src/asterisk/asterisk.patch
1.3 +35 -5 openpkg-src/asterisk/asterisk.spec
1.2 +1 -1 openpkg-src/asterisk/asterisk.txt
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.2 -r1.3 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2006 10:08:40 -
1.2
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2006 13:08:37 -
1.3
@@ -46,7 +46,7 @@
+ASTVARRUNDIR=$(INSTALL_PREFIX)/var/asterisk/run
+ASTMANDIR=$(INSTALL_PREFIX)/man
+MODULES_DIR=$(ASTLIBDIR)/modules
-+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
++AGI_DIR=$(ASTLIBDIR)/agi-bin
ASTCFLAGS=
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.2 -r1.3 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec5 Sep 2006 10:08:40 -
1.2
+++ openpkg-src/asterisk/asterisk.spec5 Sep 2006 13:08:37 -
1.3
@@ -27,6 +27,7 @@
%define V_asterisk_addons 1.2.4
%define V_asterisk_sounds 1.2.1
%define V_app_conference 20051216
+%define V_asterisk_perl0.08
# package information
Name: asterisk
@@ -46,8 +47,9 @@
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: asterisk.txt
-Source5: rc.asterisk
+Source4:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
+Source5: asterisk.txt
+Source6: rc.asterisk
Patch0: asterisk.patch
# build information
@@ -57,6 +59,8 @@
PreReq: OpenPKG, openpkg >= 20040130, mpg123
BuildPreReq: zlib, curl, openssl, ncurses, speex
PreReq: zlib, curl, openssl, ncurses, speex
+BuildPreReq: perl, perl-openpkg
+PreReq: perl
AutoReq: no
AutoReqProv: no
@@ -74,7 +78,8 @@
include any Asterisk support for any telephony hardware. 2. this
package uses a stripped down default configuration which provides an
out-of-the-box VoIP configuration for a small organisation, 3. this
-package includes the addon module "app_conference".
+package includes the addon module "app_conference", 4. this package
+includes the Perl Asterisk::AGI module.
%track
prog asterisk = {
@@ -92,12 +97,18 @@
url = http://www.asterisk.org/download
regex = asterisk-sounds-(__VER__)\.tar\.gz
}
+prog asterisk:agi = {
+version = %{V_asterisk_perl}
+url = http://asterisk.gnuinter.net/files/
+regex = asterisk-perl-(__VER__)\.tar\.gz
+}
%prep
%setup -q
%setup -q -D -T -a 1
%setup -q -D -T -a 2
%setup -q -D -T -a 3
+%setup -q -D -T -a 4
%patch -p0
%{l_shtool} subst \
-e 's;/usr/local/bin/mpg123;%{l_prefix}/bin/mpg123;' \
@@ -120,6 +131,10 @@
INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
) || exit $?
+# build Perl API
+%{l_prefix}/bin/perl-openpkg prepare
+%{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl}
configure build
+
%install
# install program
rm -rf $RPM_BUILD_ROOT
@@ -142,12 +157,27 @@
INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix}
) || 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} \
+-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
+asterisk-perl-%{V_asterisk_perl}/examples/* \
+$RPM_BUILD_ROOT%{l_prefix}/lib/asterisk/agi-bin/
+%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
+
# strip down installation
-strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_p
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec
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: 05-Sep-2006 12:08:41
Branch: HEAD Handle: 2006090511084000
Modified files:
openpkg-src/asteriskasterisk.patch asterisk.spec
Log:
apply fixes from FreeBSD ports and fix a typo in our subst
Summary:
RevisionChanges Path
1.2 +50 -0 openpkg-src/asterisk/asterisk.patch
1.2 +1 -1 openpkg-src/asterisk/asterisk.spec
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
$ cvs diff -u -r1.1 -r1.2 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2006 07:39:33 -
1.1
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2006 10:08:40 -
1.2
@@ -410,3 +410,53 @@
TARGET=stereorize streamplayer
+Index: channels/chan_h323.c
+--- channels/chan_h323.c.orig2006-08-05 07:08:50 +0200
channels/chan_h323.c 2006-09-05 09:43:50 +0200
+@@ -31,6 +31,7 @@
+ * \ingroup channel_drivers
+ */
+
++#include
+ #include
+ #include
+ #include
+Index: channels/chan_skinny.c
+--- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200
channels/chan_skinny.c 2006-09-05 09:43:50 +0200
+@@ -99,7 +99,7 @@
+ #define htolel(x) (x)
+ #define htoles(x) (x)
+ #else
+-#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__)
++#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) ||
defined(__FreeBSD__)
+ #define __bswap_16(x) \
+ x) & 0xff00) >> 8) | \
+ (((x) & 0x00ff) << 8))
+Index: frame.c
+--- frame.c.orig 2006-07-31 06:06:16 +0200
frame.c 2006-09-05 09:43:50 +0200
+@@ -1055,7 +1055,7 @@
+ {
+ switch(buf & TYPE_MASK) {
+ case TYPE_DONTSEND:
+-return 0;
++return 2;
+ break;
+ case TYPE_SILENCE:
+ return 4;
+Index: rtp.c
+--- rtp.c.orig 2006-07-13 20:44:17 +0200
rtp.c2006-09-05 09:43:50 +0200
+@@ -962,8 +962,10 @@
+ rtp->us.sin_port = htons(x);
+ rtp->us.sin_addr = addr;
+ /* If there's rtcp, initialize it as well. */
+-if (rtp->rtcp)
++if (rtp->rtcp) {
+ rtp->rtcp->us.sin_port = htons(x + 1);
++rtp->rtcp->us.sin_addr = addr;
++}
+ /* Try to bind it/them. */
+ if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us,
sizeof(rtp->us))) &&
+ (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
$ cvs diff -u -r1.1 -r1.2 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec5 Sep 2006 07:39:33 -
1.1
+++ openpkg-src/asterisk/asterisk.spec5 Sep 2006 10:08:40 -
1.2
@@ -106,7 +106,7 @@
%{l_shtool} subst \
-e 's;/usr/local/bin/mpg123;%{l_prefix}/bin/mpg123;' \
-e 's;/usr/bin/mpg123;%{l_prefix}/bin/mpg123;' \
-app/apps_mp3.c
+apps/app_mp3.c
%build
# build program
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/asterisk/ asterisk.patch asterisk.spec aste...
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: 05-Sep-2006 09:39:35 Branch: HEAD Handle: 2006090508393300 Added files: openpkg-src/asteriskasterisk.patch asterisk.spec asterisk.txt rc.asterisk Log: first cut for a VoIP-only Asterisk packaging Summary: RevisionChanges Path 1.1 +412 -0 openpkg-src/asterisk/asterisk.patch 1.1 +177 -0 openpkg-src/asterisk/asterisk.spec 1.1 +367 -0 openpkg-src/asterisk/asterisk.txt 1.1 +56 -0 openpkg-src/asterisk/rc.asterisk patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.patch $ cvs diff -u -r0 -r1.1 asterisk.patch --- /dev/null 2006-09-05 09:38:26 +0200 +++ asterisk.patch2006-09-05 09:39:34 +0200 @@ -0,0 +1,412 @@ +Index: Makefile +--- Makefile.orig2006-06-29 21:23:18 +0200 Makefile 2006-09-05 09:10:38 +0200 +@@ -110,35 +110,19 @@ + # Don't use together with -DBUSYDETECT_TONEONLY + BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE + +-ifneq ($(OSARCH),SunOS) +- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk +- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk +- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk +- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk +- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk +- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin +- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin +- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run +- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man +- MODULES_DIR=$(ASTLIBDIR)/modules +- AGI_DIR=$(ASTVARLIBDIR)/agi-bin +-else +- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib +- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib +- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool +- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log +- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk +- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin +- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin +- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run +- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man +- MODULES_DIR=$(ASTLIBDIR)/modules +- AGI_DIR=$(ASTVARLIBDIR)/agi-bin +-endif ++ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk ++ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk ++ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk ++ASTSPOOLDIR=$(INSTALL_PREFIX)/var/asterisk/spool ++ASTLOGDIR=$(INSTALL_PREFIX)/var/asterisk/log ++ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk ++ASTCONFPATH=$(ASTETCDIR)/asterisk.conf ++ASTBINDIR=$(INSTALL_PREFIX)/bin ++ASTSBINDIR=$(INSTALL_PREFIX)/sbin ++ASTVARRUNDIR=$(INSTALL_PREFIX)/var/asterisk/run ++ASTMANDIR=$(INSTALL_PREFIX)/man ++MODULES_DIR=$(ASTLIBDIR)/modules ++AGI_DIR=$(ASTVARLIBDIR)/agi-bin + + ASTCFLAGS= + +@@ -219,7 +203,6 @@ + + ifeq ($(OSARCH),SunOS) + GREP=/usr/xpg4/bin/grep +- M4=/usr/local/bin/m4 + ID=/usr/xpg4/bin/id + LN=/usr/xpg4/bin/ln + INSTALL=ginstall +@@ -232,9 +215,10 @@ + + ifeq ($(findstring BSD,$(OSARCH)),BSD) + PROC=$(shell uname -m) +- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib + endif + ++ASTCFLAGS+=-I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib ++ + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif +@@ -252,29 +236,8 @@ + endif + + ifeq ($(OSARCH),FreeBSD) +- BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) +- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) +- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) +- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) +-ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp +- endif ++ LIBS+=-pthread + MPG123TARG=freebsd +- +- # XXX FreeBSD paths +- PREFIX?=/usr/local +- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk +- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk +- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk +- ASTLOGDIR=$(IN
