bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update asterisk to v1.2.14 (closes: #1097), thanks to zandbelt.

Browse Source 
- add app-meetme
 - put res-crypto in a separate package
 - fix asterisk-mini dependency on asterisk


git-svn-id: svn://svn.openwrt.org/openwrt/packages@5938 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2006-12-30 18:15:19 +00:00
parent e60625e31a
commit bc0ed84180
30 changed files with 427 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
net/asterisk/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk PKG_NAME:=asterisk
PKG_VERSION:=1.2.1 PKG_VERSION:=1.2.14
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ftp.digium.com/pub/asterisk/old-releases/ ftp://ftp.digium.com/pub/asterisk/old-releases/ PKG_SOURCE_URL:=http://ftp.digium.com/pub/asterisk/old-releases/ ftp://ftp.digium.com/pub/asterisk/old-releases/
PKG_MD5SUM:=04657086791e80f319c0d728af705001 PKG_MD5SUM:=2ce03466b99e0b9471e6c791ed14a5f2
PKG_CAT:=zcat PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -31,13 +31,13 @@ define Package/asterisk/Default
protocols, and can interoperate with almost all standards-based telephony \\\ protocols, and can interoperate with almost all standards-based telephony \\\
equipment using relatively inexpensive hardware. equipment using relatively inexpensive hardware.
URL:=http://www.asterisk.org/ URL:=http://www.asterisk.org/
SUBMENU:=asterisk (Complete Open Source PBX)
endef endef
define Package/asterisk define Package/asterisk
$(call Package/asterisk/Default) $(call Package/asterisk/Default)
DEPENDS:=+libncurses +libpthread DEPENDS:=+libncurses +libpthread
TITLE:=Complete open source PBX TITLE:=Complete Open Source PBX
MENU:=1
endef endef
define Package/asterisk/conffiles define Package/asterisk/conffiles
@ -66,11 +66,13 @@ endef
define Package/asterisk-mini define Package/asterisk-mini
$(call Package/asterisk/Default) $(call Package/asterisk/Default)
DEPENDS:=asterisk DEPENDS:=+libncurses +libpthread
TITLE:=Minimal open source PBX PROVIDES:=asterisk
TITLE:=Minimal Open Source PBX
DESCRIPTION+=\\\ DESCRIPTION+=\\\
\\\ \\\
This package contains only the following modules: \\\ This package contains only the following modules: \\\
- app_dial\\\
- chan_iax2\\\ - chan_iax2\\\
- chan_local\\\ - chan_local\\\
- chan_sip\\\ - chan_sip\\\
@ -101,6 +103,78 @@ define Package/asterisk-mini/conffiles
/etc/asterisk/sip.conf /etc/asterisk/sip.conf
endef endef
define Package/asterisk-mysql
$(call Package/asterisk/Default)
DEPENDS:=asterisk +libmysqlclient
TITLE:=MySQL support
DESCRIPTION+=\\\
\\\
This package contains MySQL support modules for Asterisk.
endef
define Package/asterisk-mysql/conffiles
/etc/asterisk/cdr_mysql.conf
endef
define Package/asterisk-pgsql
$(call Package/asterisk/Default)
DEPENDS:=asterisk +libpq
TITLE:=PostgreSQL support
DESCRIPTION+=\\\
\\\
This package contains PostgreSQL support modules for Asterisk.
endef
define Package/asterisk-pgsql/conffiles
/etc/asterisk/cdr_pgsql.conf
endef
define Package/asterisk-sqlite
$(call Package/asterisk/Default)
DEPENDS:=asterisk +libsqlite2
TITLE:=SQLite modules
DESCRIPTION+=\\\
\\\
This package contains SQLite support modules for Asterisk.
endef
define Package/asterisk-sounds
$(call Package/asterisk)
MENU:=0
DEPENDS:=asterisk
TITLE:=Sound files
DESCRIPTION+=\\\
\\\
This package contains sound files for Asterisk.
endef
define Package/asterisk-voicemail
$(call Package/asterisk/Default)
DEPENDS:=asterisk
TITLE:=Voicemail support
DESCRIPTION+=\\\
\\\
This package contains voicemail related modules for Asterisk.
endef
define Package/asterisk-voicemail/conffiles
/etc/asterisk/voicemail.conf
endef
define Package/asterisk-app-meetme
$(call Package/asterisk/Default)
DEPENDS:=asterisk +zaptel-libtonezone
TITLE:=MeetMe Confererencing support
DESCRIPTION+=\\\
\\\
This package provides the application MeetMe and conferencing support to \\\
Asterisk.
endef
define Package/asterisk-app-meetme/conffiles
/etc/asterisk/meetme.conf
endef
define Package/asterisk-chan-bluetooth define Package/asterisk-chan-bluetooth
$(call Package/asterisk/Default) $(call Package/asterisk/Default)
DEPENDS:=asterisk +bluez-libs DEPENDS:=asterisk +bluez-libs
@ -209,72 +283,27 @@ define Package/asterisk-res-agi
Asterisk. Asterisk.
endef endef
define Package/asterisk-mysql define Package/asterisk-res-crypto
$(call Package/asterisk/Default) $(call Package/asterisk/Default)
DEPENDS:=asterisk +libmysqlclient DEPENDS:=asterisk +libopenssl
TITLE:=MySQL support TITLE:=Cryptographic Digital Signatures support
DESCRIPTION+=\\\ DESCRIPTION+=\\\
\\\ \\\
This package contains MySQL support modules for Asterisk. This package provides Cryptographic Digital Signatures support to \\\
Asterisk.
endef endef
define Package/asterisk-mysql/conffiles
/etc/asterisk/cdr_mysql.conf
endef
define Package/asterisk-pgsql
$(call Package/asterisk/Default)
DEPENDS:=asterisk +libpq
TITLE:=PostgreSQL support
DESCRIPTION+=\\\
\\\
This package contains PostgreSQL support modules for Asterisk.
endef
define Package/asterisk-pgsql/conffiles
/etc/asterisk/cdr_pgsql.conf
endef
define Package/asterisk-sqlite
$(call Package/asterisk/Default)
DEPENDS:=asterisk +libsqlite2
TITLE:=SQLite modules
DESCRIPTION+=\\\
\\\
This package contains SQLite support modules for Asterisk.
endef
define Package/asterisk-sounds
$(call Package/asterisk)
MENU:=0
DEPENDS:=asterisk
TITLE:=Sound files
DESCRIPTION+=\\\
\\\
This package contains sound files for Asterisk.
endef
define Package/asterisk-voicemail
$(call Package/asterisk/Default)
DEPENDS:=asterisk
TITLE:=Voicemail support
DESCRIPTION+=\\\
\\\
This package contains voicemail related modules for Asterisk.
endef
define Package/asterisk-voicemail/conffiles
/etc/asterisk/voicemail.conf
endef
ifneq ($(SDK),) ifneq ($(SDK),)
# Make sure the options below are enabled when building with the SDK # Make sure the options below are enabled when building with the SDK
CONFIG_PACKAGE_asterisk-mysql:=m CONFIG_PACKAGE_asterisk-mysql:=m
CONFIG_PACKAGE_asterisk-pgsql:=m CONFIG_PACKAGE_asterisk-pgsql:=m
CONFIG_PACKAGE_asterisk-sqlite:=m CONFIG_PACKAGE_asterisk-sqlite:=m
CONFIG_PACKAGE_asterisk-app-meetme:=m
CONFIG_PACKAGE_asterisk-chan-bluetooth:=m CONFIG_PACKAGE_asterisk-chan-bluetooth:=m
CONFIG_PACKAGE_asterisk-chan-h323:=m CONFIG_PACKAGE_asterisk-chan-h323:=m
CONFIG_PACKAGE_asterisk-codec-speex:=m CONFIG_PACKAGE_asterisk-codec-speex:=m
CONFIG_PACKAGE_asterisk-res-crypto:=m
endif endif
EXTRA_CFLAGS:= -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include EXTRA_CFLAGS:= -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
@ -294,6 +323,9 @@ endif
ifneq ($(CONFIG_PACKAGE_asterisk-sqlite),) ifneq ($(CONFIG_PACKAGE_asterisk-sqlite),)
EXTRA_CDR_MODULES+= cdr_sqlite.so EXTRA_CDR_MODULES+= cdr_sqlite.so
endif endif
ifneq ($(CONFIG_PACKAGE_asterisk-app-meetme),)
EXTRA_APP_MODULES+= app_meetme.so
endif
ifneq ($(CONFIG_PACKAGE_asterisk-chan-bluetooth),) ifneq ($(CONFIG_PACKAGE_asterisk-chan-bluetooth),)
EXTRA_CHAN_MODULES+= chan_bluetooth.so EXTRA_CHAN_MODULES+= chan_bluetooth.so
endif endif
@ -308,6 +340,9 @@ ifneq ($(CONFIG_PACKAGE_asterisk-codec-speex),)
EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex
EXTRA_CODEC_MODULES+= codec_speex.so EXTRA_CODEC_MODULES+= codec_speex.so
endif endif
ifneq ($(CONFIG_PACKAGE_asterisk-res-crypto),)
EXTRA_RES_MODULES+= res_crypto.so
endif
define Build/Configure define Build/Configure
endef endef
@ -375,6 +410,7 @@ define Package/asterisk/install
rm -f codec_lpc10.so ; \ rm -f codec_lpc10.so ; \
rm -f pbx_dundi.so ; \ rm -f pbx_dundi.so ; \
rm -f res_agi.so ; \ rm -f res_agi.so ; \
rm -f res_crypto.so ; \
) )
(cd $(1)/etc/asterisk; \ (cd $(1)/etc/asterisk; \
rm -f *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \ rm -f *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
@ -455,6 +491,13 @@ define Package/asterisk-voicemail/install
$(CP) $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ $(CP) $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(1)/usr/lib/asterisk/sounds/
endef endef
define Package/asterisk-app-meetme/install
$(INSTALL_DIR) $(1)/etc/asterisk
$(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/meetme.conf.sample $(1)/etc/asterisk/meetme.conf
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/app_meetme.so $(1)/usr/lib/asterisk/modules/
endef
define Package/asterisk-chan-bluetooth/install define Package/asterisk-chan-bluetooth/install
$(INSTALL_DIR) $(1)/etc/asterisk $(INSTALL_DIR) $(1)/etc/asterisk
$(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/bluetooth.conf $(1)/etc/asterisk/bluetooth.conf $(INSTALL_DATA) $(PKG_BUILD_DIR)/configs/bluetooth.conf $(1)/etc/asterisk/bluetooth.conf
@ -512,13 +555,18 @@ define Package/asterisk-res-agi/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/res/res_agi.so $(1)/usr/lib/asterisk/modules/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/res/res_agi.so $(1)/usr/lib/asterisk/modules/
endef endef
define Package/asterisk-res-crypto/install
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(INSTALL_BIN) $(PKG_BUILD_DIR)/res/res_crypto.so $(1)/usr/lib/asterisk/modules/
endef
$(eval $(call BuildPackage,asterisk)) $(eval $(call BuildPackage,asterisk))
$(eval $(call BuildPackage,asterisk-mini))
$(eval $(call BuildPackage,asterisk-mysql)) $(eval $(call BuildPackage,asterisk-mysql))
$(eval $(call BuildPackage,asterisk-pgsql)) $(eval $(call BuildPackage,asterisk-pgsql))
$(eval $(call BuildPackage,asterisk-sqlite)) $(eval $(call BuildPackage,asterisk-sqlite))
$(eval $(call BuildPackage,asterisk-voicemail))
$(eval $(call BuildPackage,asterisk-sounds)) $(eval $(call BuildPackage,asterisk-sounds))
$(eval $(call BuildPackage,asterisk-voicemail))
$(eval $(call BuildPackage,asterisk-app-meetme))
$(eval $(call BuildPackage,asterisk-chan-bluetooth)) $(eval $(call BuildPackage,asterisk-chan-bluetooth))
$(eval $(call BuildPackage,asterisk-chan-h323)) $(eval $(call BuildPackage,asterisk-chan-h323))
$(eval $(call BuildPackage,asterisk-chan-mgcp)) $(eval $(call BuildPackage,asterisk-chan-mgcp))
@ -528,3 +576,5 @@ $(eval $(call BuildPackage,asterisk-codec-lpc10))
$(eval $(call BuildPackage,asterisk-codec-speex)) $(eval $(call BuildPackage,asterisk-codec-speex))
$(eval $(call BuildPackage,asterisk-pbx-dundi)) $(eval $(call BuildPackage,asterisk-pbx-dundi))
$(eval $(call BuildPackage,asterisk-res-agi)) $(eval $(call BuildPackage,asterisk-res-agi))
$(eval $(call BuildPackage,asterisk-res-crypto))
$(eval $(call BuildPackage,asterisk-mini))

8
net/asterisk/patches/asterisk-1.0.7-chan_iax2-tmp_path.patch → net/asterisk/patches/01-chan_iax2-tmp_path.patch
View File

@ -1,7 +1,7 @@
diff -ruN asterisk-1.0.7-old/channels/chan_iax2.c asterisk-1.0.7-new/channels/chan_iax2.c diff -Nru asterisk-1.2.14.org/channels/chan_iax2.c asterisk-1.2.14/channels/chan_iax2.c
--- asterisk-1.0.7-old/channels/chan_iax2.c 2005-10-25 02:06:35.000000000 +0200 --- asterisk-1.2.14.org/channels/chan_iax2.c 2006-12-09 16:45:37.000000000 +0100
+++ asterisk-1.0.7-new/channels/chan_iax2.c 2005-10-25 04:35:11.000000000 +0200 +++ asterisk-1.2.14/channels/chan_iax2.c 2006-12-27 08:46:38.000000000 +0100
@@ -960,7 +960,7 @@ @@ -1191,7 +1191,7 @@
last++; last++;
else else
last = s; last = s;

8
net/asterisk/patches/asterisk-1.0.7-dns.patch → net/asterisk/patches/02-dns.patch
View File

@ -1,7 +1,7 @@
diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c diff -Nru asterisk-1.2.14.org/dns.c asterisk-1.2.14/dns.c
--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200 --- asterisk-1.2.14.org/dns.c 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100 +++ asterisk-1.2.14/dns.c 2006-12-27 08:50:05.000000000 +0100
@@ -153,7 +153,13 @@ @@ -175,7 +175,13 @@
#if defined(res_ninit) #if defined(res_ninit)
#define HAS_RES_NINIT #define HAS_RES_NINIT

14
net/asterisk/patches/03-Makefile-astdb.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Nru asterisk-1.2.14.org/db1-ast/Makefile asterisk-1.2.14/db1-ast/Makefile
--- asterisk-1.2.14.org/db1-ast/Makefile 2006-04-30 16:27:56.000000000 +0200
+++ asterisk-1.2.14/db1-ast/Makefile 2006-12-27 08:52:14.000000000 +0100
@@ -32,8 +32,8 @@
$(LIBDB): $(OBJS)
rm -f $@
- ar cq $@ $(OBJS)
- ranlib $@
+ $(AR) cq $@ $(OBJS)
+ $(RANLIB) $@
$(LIBDBSO): $(SHOBJS)
$(CC) -Wl,-O1 -Wl,--version-script=libdb.map -Wl,-soname=$(LIBDBSO) -shared -o $@ $^

12
net/asterisk/patches/asterisk-1.0.7-Makefile-codecs-lpc10.patch → net/asterisk/patches/04-Makefile-codecs-lpc10.patch
View File

@ -1,7 +1,7 @@
diff -ruN asterisk-1.0.7-old/codecs/lpc10/Makefile asterisk-1.0.7-new/codecs/lpc10/Makefile diff -Nru asterisk-1.2.14.org/codecs/lpc10/Makefile asterisk-1.2.14/codecs/lpc10/Makefile
--- asterisk-1.0.7-old/codecs/lpc10/Makefile 2004-08-31 18:33:00.000000000 +0200 --- asterisk-1.2.14.org/codecs/lpc10/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.0.7-new/codecs/lpc10/Makefile 2005-03-19 17:38:06.000000000 +0100 +++ asterisk-1.2.14/codecs/lpc10/Makefile 2006-12-27 08:54:16.000000000 +0100
@@ -31,6 +31,7 @@ @@ -34,6 +34,7 @@
ifneq ($(PROC),ppc) ifneq ($(PROC),ppc)
ifneq ($(PROC),x86_64) ifneq ($(PROC),x86_64)
ifneq ($(PROC),alpha) ifneq ($(PROC),alpha)
@ -9,7 +9,7 @@ diff -ruN asterisk-1.0.7-old/codecs/lpc10/Makefile asterisk-1.0.7-new/codecs/lpc
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
#This works for even old (2.96) versions of gcc and provides a small boost either way. #This works for even old (2.96) versions of gcc and provides a small boost either way.
#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
@@ -46,6 +47,7 @@ @@ -53,6 +54,7 @@
endif endif
endif endif
endif endif
@ -17,7 +17,7 @@ diff -ruN asterisk-1.0.7-old/codecs/lpc10/Makefile asterisk-1.0.7-new/codecs/lpc
LIB = $(LIB_TARGET_DIR)/liblpc10.a LIB = $(LIB_TARGET_DIR)/liblpc10.a
@@ -62,7 +64,7 @@ @@ -69,7 +71,7 @@
$(LIB): $(OBJ) $(LIB): $(OBJ)
$(AR) cr $@ $(OBJ) $(AR) cr $@ $(OBJ)

14
net/asterisk/patches/05-Makefile-stdtime.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Nru asterisk-1.2.14.org/stdtime/Makefile asterisk-1.2.14/stdtime/Makefile
--- asterisk-1.2.14.org/stdtime/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/stdtime/Makefile 2006-12-27 08:56:14.000000000 +0100
@@ -3,8 +3,8 @@
all: libtime.a
libtime.a: $(OBJS)
- ar rv $@ $(OBJS)
- ranlib $@
+ $(AR) rv $@ $(OBJS)
+ $(RANLIB) $@
install:

51
net/asterisk/patches/asterisk-1.0.9-chan_bluetooth.patch → net/asterisk/patches/06-chan_bluetooth.patch
View File

@ -1,24 +1,7 @@
diff -ruN asterisk-1.0.9-old/channels/Makefile asterisk-1.0.9-new/channels/Makefile diff -Nru asterisk-1.2.14.org/channels/chan_bluetooth.c asterisk-1.2.14/channels/chan_bluetooth.c
--- asterisk-1.0.9-old/channels/Makefile 2005-08-22 20:42:22.000000000 +0200 --- asterisk-1.2.14.org/channels/chan_bluetooth.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.0.9-new/channels/Makefile 2005-08-22 21:12:14.000000000 +0200 +++ asterisk-1.2.14/channels/chan_bluetooth.c 2006-12-27 09:04:03.000000000 +0100
@@ -202,6 +202,13 @@ @@ -0,0 +1,3599 @@
chan_h323.so: chan_h323.o h323/libchanh323.a
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
+#
+# Asterisk Bluetooth Support
+# http://www.crazygreek.co.uk/content/chan_bluetooth
+#
+chan_bluetooth.so: chan_bluetooth.o
+ $(CC) $(SOLINK) -o $@ $< $(EXTRA_LDFLAGS) -lbluetooth
+
#chan_modem.so : chan_modem.o
# $(CC) -rdynamic -shared -Xlinker -x -o $@ $<
diff -ruN asterisk-1.0.9-old/channels/chan_bluetooth.c asterisk-1.0.9-new/channels/chan_bluetooth.c
--- asterisk-1.0.9-old/channels/chan_bluetooth.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.0.9-new/channels/chan_bluetooth.c 2005-09-06 22:51:30.000000000 +0200
@@ -0,0 +1,3598 @@
+/* +/*
+ * Asterisk -- A telephony toolkit for Linux. + * Asterisk -- A telephony toolkit for Linux.
+ * + *
@ -125,6 +108,7 @@ diff -ruN asterisk-1.0.9-old/channels/chan_bluetooth.c asterisk-1.0.9-new/channe
+#include <asterisk/options.h> +#include <asterisk/options.h>
+#include <asterisk/cli.h> +#include <asterisk/cli.h>
+#include <asterisk/callerid.h> +#include <asterisk/callerid.h>
+#include <asterisk/version.h>
+#include <sys/socket.h> +#include <sys/socket.h>
+#include <sys/signal.h> +#include <sys/signal.h>
+#include <sys/time.h> +#include <sys/time.h>
@ -3153,7 +3137,7 @@ diff -ruN asterisk-1.0.9-old/channels/chan_bluetooth.c asterisk-1.0.9-new/channe
+ struct ast_variable * v; + struct ast_variable * v;
+ char * cat; + char * cat;
+ +
+ cfg = ast_load(BLT_CONFIG_FILE); + cfg = ast_config_load(BLT_CONFIG_FILE);
+ +
+ if (!cfg) { + if (!cfg) {
+ ast_log(LOG_NOTICE, "Unable to load Bluetooth config: %s. Bluetooth disabled\n", BLT_CONFIG_FILE); + ast_log(LOG_NOTICE, "Unable to load Bluetooth config: %s. Bluetooth disabled\n", BLT_CONFIG_FILE);
@ -3617,9 +3601,26 @@ diff -ruN asterisk-1.0.9-old/channels/chan_bluetooth.c asterisk-1.0.9-new/channe
+} +}
+ +
+ +
diff -ruN asterisk-1.0.9-old/configs/bluetooth.conf asterisk-1.0.9-new/configs/bluetooth.conf diff -Nru asterisk-1.2.14.org/channels/Makefile asterisk-1.2.14/channels/Makefile
--- asterisk-1.0.9-old/configs/bluetooth.conf 1970-01-01 01:00:00.000000000 +0100 --- asterisk-1.2.14.org/channels/Makefile 2006-08-17 23:57:19.000000000 +0200
+++ asterisk-1.0.9-new/configs/bluetooth.conf 2005-09-06 22:51:38.000000000 +0200 +++ asterisk-1.2.14/channels/Makefile 2006-12-27 09:03:53.000000000 +0100
@@ -249,6 +249,13 @@
#chan_modem.so : chan_modem.o
# $(CC) -rdynamic -shared -Xlinker -x -o $@ $<
+#
+# Asterisk Bluetooth Support
+# http://www.crazygreek.co.uk/content/chan_bluetooth
+#
+chan_bluetooth.so: chan_bluetooth.o
+ $(CC) $(SOLINK) -o $@ $< $(EXTRA_LDFLAGS) -lbluetooth
+
install: all
for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
diff -Nru asterisk-1.2.14.org/configs/bluetooth.conf asterisk-1.2.14/configs/bluetooth.conf
--- asterisk-1.2.14.org/configs/bluetooth.conf 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.14/configs/bluetooth.conf 2006-12-27 09:03:53.000000000 +0100
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+[general] +[general]
+; Channel we listen on as a HS (Headset) +; Channel we listen on as a HS (Headset)

6
net/asterisk/patches/asterisk-1.2.0-app_mysql.patch → net/asterisk/patches/07-app_mysql.patch
View File

@ -1,6 +1,6 @@
diff -ruN asterisk-1.2.0-old/apps/app_sql_mysql.c asterisk-1.2.0-new/apps/app_sql_mysql.c diff -Nru asterisk-1.2.14.org/apps/app_sql_mysql.c asterisk-1.2.14/apps/app_sql_mysql.c
--- asterisk-1.2.0-old/apps/app_sql_mysql.c 1970-01-01 01:00:00.000000000 +0100 --- asterisk-1.2.14.org/apps/app_sql_mysql.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.0-new/apps/app_sql_mysql.c 2005-06-07 18:36:28.000000000 +0200 +++ asterisk-1.2.14/apps/app_sql_mysql.c 2006-12-27 09:00:04.000000000 +0100
@@ -0,0 +1,445 @@ @@ -0,0 +1,445 @@
+/* +/*
+ * Asterisk -- A telephony toolkit for Linux. + * Asterisk -- A telephony toolkit for Linux.

56
net/asterisk/patches/asterisk-1.2.0-cdr_mysql.patch → net/asterisk/patches/08-cdr_mysql.patch
View File

@ -1,31 +1,6 @@
diff -ruN asterisk-1.2.0-old/configs/cdr_mysql.conf.sample asterisk-1.2.0-new/configs/cdr_mysql.conf.sample diff -Nru asterisk-1.2.14.org/cdr/cdr_mysql.c asterisk-1.2.14/cdr/cdr_mysql.c
--- asterisk-1.2.0-old/configs/cdr_mysql.conf.sample 1970-01-01 01:00:00.000000000 +0100 --- asterisk-1.2.14.org/cdr/cdr_mysql.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.0-new/configs/cdr_mysql.conf.sample 2005-01-21 02:43:20.000000000 +0100 +++ asterisk-1.2.14/cdr/cdr_mysql.c 2006-12-27 09:02:18.000000000 +0100
@@ -0,0 +1,21 @@
+;
+; Note - if the database server is hosted on the same machine as the
+; asterisk server, you can achieve a local Unix socket connection by
+; setting hostname=localhost
+;
+; port and sock are both optional parameters. If hostname is specified
+; and is not "localhost", then cdr_mysql will attempt to connect to the
+; port specified or use the default port. If hostname is not specified
+; or if hostname is "localhost", then cdr_mysql will attempt to connect
+; to the socket file specified by sock or otherwise use the default socket
+; file.
+;
+;[global]
+;hostname=database.host.name
+;dbname=asteriskcdrdb
+;table=cdr
+;password=password
+;user=asteriskcdruser
+;port=3306
+;sock=/tmp/mysql.sock
+;userfield=1
diff -ruN asterisk-1.2.0-old/cdr/cdr_mysql.c asterisk-1.2.0-new/cdr/cdr_mysql.c
--- asterisk-1.2.0-old/cdr/cdr_mysql.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.0-new/cdr/cdr_mysql.c 2005-12-04 20:10:59.000000000 +0100
@@ -0,0 +1,493 @@ @@ -0,0 +1,493 @@
+/* +/*
+ * Asterisk -- A telephony toolkit for Linux. + * Asterisk -- A telephony toolkit for Linux.
@ -520,3 +495,28 @@ diff -ruN asterisk-1.2.0-old/cdr/cdr_mysql.c asterisk-1.2.0-new/cdr/cdr_mysql.c
+{ +{
+ return ASTERISK_GPL_KEY; + return ASTERISK_GPL_KEY;
+} +}
diff -Nru asterisk-1.2.14.org/configs/cdr_mysql.conf.sample asterisk-1.2.14/configs/cdr_mysql.conf.sample
--- asterisk-1.2.14.org/configs/cdr_mysql.conf.sample 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.14/configs/cdr_mysql.conf.sample 2006-12-27 09:02:18.000000000 +0100
@@ -0,0 +1,21 @@
+;
+; Note - if the database server is hosted on the same machine as the
+; asterisk server, you can achieve a local Unix socket connection by
+; setting hostname=localhost
+;
+; port and sock are both optional parameters. If hostname is specified
+; and is not "localhost", then cdr_mysql will attempt to connect to the
+; port specified or use the default port. If hostname is not specified
+; or if hostname is "localhost", then cdr_mysql will attempt to connect
+; to the socket file specified by sock or otherwise use the default socket
+; file.
+;
+;[global]
+;hostname=database.host.name
+;dbname=asteriskcdrdb
+;table=cdr
+;password=password
+;user=asteriskcdruser
+;port=3306
+;sock=/tmp/mysql.sock
+;userfield=1

13
net/asterisk/patches/09-compat-getloadavg.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Nru asterisk-1.2.14.org/include/asterisk/compat.h asterisk-1.2.14/include/asterisk/compat.h
--- asterisk-1.2.14.org/include/asterisk/compat.h 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/include/asterisk/compat.h 2006-12-27 09:07:28.000000000 +0100
@@ -75,7 +75,9 @@
#define HAVE_STRTOQ
#ifdef _BSD_SOURCE
+#ifndef __UCLIBC__
#define HAVE_GETLOADAVG
+#endif /* __UCLIBC__ */
#endif
#ifdef __linux__

42
net/asterisk/patches/10-Makefile-apps.patch Normal file
View File

@ -0,0 +1,42 @@
diff -Nru asterisk-1.2.14.org/apps/Makefile asterisk-1.2.14/apps/Makefile
--- asterisk-1.2.14.org/apps/Makefile 2006-04-30 15:38:22.000000000 +0200
+++ asterisk-1.2.14/apps/Makefile 2006-12-27 09:08:57.000000000 +0100
@@ -45,7 +45,7 @@
#APPS+=app_rpt.so
ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+ifneq ($(wildcard $(STAGING_DIR)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so
endif
endif # WITHOUT_ZAPTEL
@@ -83,6 +83,9 @@
#CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information
+CFLAGS += $(EXTRA_CFLAGS)
+APPS += $(EXTRA_APP_MODULES)
+
all: $(APPS)
clean:
@@ -102,14 +105,17 @@
app_curl.so: app_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
+app_sql_mysql.so: app_sql_mysql.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lmysqlclient
+
app_sql_postgres.o: app_sql_postgres.c
$(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
app_sql_postgres.so: app_sql_postgres.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lpq
app_sql_odbc.so: app_sql_odbc.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lodbc
ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o

10
net/asterisk/patches/asterisk-1.2.0-Makefile-cdr.patch → net/asterisk/patches/11-Makefile-cdr.patch
View File

@ -1,7 +1,7 @@
diff -ruN asterisk-1.2.0-old/cdr/Makefile asterisk-1.2.0-new/cdr/Makefile diff -Nru asterisk-1.2.14.org/cdr/Makefile asterisk-1.2.14/cdr/Makefile
--- asterisk-1.2.0-old/cdr/Makefile 2005-11-14 01:45:07.000000000 +0100 --- asterisk-1.2.14.org/cdr/Makefile 2006-11-16 21:29:28.000000000 +0100
+++ asterisk-1.2.0-new/cdr/Makefile 2005-12-04 22:22:43.000000000 +0100 +++ asterisk-1.2.14/cdr/Makefile 2006-12-27 09:10:57.000000000 +0100
@@ -107,6 +107,9 @@ @@ -111,6 +111,9 @@
MODS+=cdr_sqlite.so MODS+=cdr_sqlite.so
endif endif
@ -11,7 +11,7 @@ diff -ruN asterisk-1.2.0-old/cdr/Makefile asterisk-1.2.0-new/cdr/Makefile
all: depend $(MODS) all: depend $(MODS)
install: all install: all
@@ -123,16 +126,19 @@ @@ -127,16 +130,19 @@
endif endif
cdr_odbc.so: cdr_odbc.o cdr_odbc.so: cdr_odbc.o

40
net/asterisk/patches/12-Makefile-channels.patch Normal file
View File

@ -0,0 +1,40 @@
diff -Nru asterisk-1.2.14.org/channels/Makefile asterisk-1.2.14/channels/Makefile
--- asterisk-1.2.14.org/channels/Makefile 2006-08-17 23:57:19.000000000 +0200
+++ asterisk-1.2.14/channels/Makefile 2006-12-27 09:12:28.000000000 +0100
@@ -110,7 +110,7 @@
endif
ifndef WITHOUT_ZAPTEL
-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),)
+ifneq ($(wildcard $(STAGING_DIR)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
ifeq (${OSARCH},NetBSD)
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
endif
@@ -151,6 +151,9 @@
#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
+CFLAGS += $(EXTRA_CFLAGS)
+CHANNEL_LIBS += $(EXTRA_CHAN_MODULES)
+
all: depend $(CHANNEL_LIBS)
clean:
@@ -158,7 +161,7 @@
rm -f busy.h ringtone.h gentone gentone-ulaw
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
ifneq ($(wildcard .depend),)
include .depend
@@ -204,7 +207,7 @@
$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
chan_zap.so: chan_zap.o
- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone
+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) $(EXTRA_LDFLAGS) -ltonezone
chan_sip.so: chan_sip.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_sip.o ${CYGSOLIB}

22
net/asterisk/patches/asterisk-1.2.0-Makefile-codecs-gsm.patch → net/asterisk/patches/13-Makefile-codecs-gsm.patch
View File

@ -1,16 +1,16 @@
diff -ruN asterisk-1.2.0-old/codecs/gsm/Makefile asterisk-1.2.0-new/codecs/gsm/Makefile diff -Nru asterisk-1.2.14.org/codecs/gsm/Makefile asterisk-1.2.14/codecs/gsm/Makefile
--- asterisk-1.2.0-old/codecs/gsm/Makefile 2005-11-08 04:31:45.000000000 +0100 --- asterisk-1.2.14.org/codecs/gsm/Makefile 2006-07-24 19:05:56.000000000 +0200
+++ asterisk-1.2.0-new/codecs/gsm/Makefile 2005-12-04 13:31:50.000000000 +0100 +++ asterisk-1.2.14/codecs/gsm/Makefile 2006-12-27 09:14:51.000000000 +0100
@@ -236,6 +236,8 @@ @@ -241,6 +241,8 @@
ifneq ($(shell uname -m),armv4l) ifneq ($(shell uname -m),armv4l)
ifneq ($(shell uname -m),sparc64) ifneq ($(shell uname -m),sparc64)
ifneq (${PROC},arm) ifneq (${PROC},arm)
+ifneq (${PROC},mipsel) +ifneq (${PROC},mipsel)
+ifneq (${PROC},mips) +ifneq (${PROC},mips)
ifneq ($(shell uname -m), parisc)
ifneq ($(shell uname -m),s390)
GSM_SOURCES+= $(SRC)/k6opt.s GSM_SOURCES+= $(SRC)/k6opt.s
endif @@ -255,6 +257,8 @@
endif
@@ -246,6 +247,8 @@
endif endif
endif endif
endif endif
@ -19,16 +19,16 @@ diff -ruN asterisk-1.2.0-old/codecs/gsm/Makefile asterisk-1.2.0-new/codecs/gsm/M
TOAST_SOURCES = $(SRC)/toast.c \ TOAST_SOURCES = $(SRC)/toast.c \
$(SRC)/toast_lin.c \ $(SRC)/toast_lin.c \
@@ -299,6 +301,8 @@ @@ -308,6 +312,8 @@
ifneq ($(shell uname -m), alpha) ifneq ($(shell uname -m), alpha)
ifneq ($(shell uname -m), sparc64) ifneq ($(shell uname -m), sparc64)
ifneq ($(shell uname -m), armv4l) ifneq ($(shell uname -m), armv4l)
+ifneq (${PROC}, mipsel) +ifneq (${PROC}, mipsel)
+ifneq (${PROC}, mips) +ifneq (${PROC}, mips)
ifneq ($(shell uname -m), parisc)
ifneq ($(shell uname -m),s390)
GSM_OBJECTS+= $(SRC)/k6opt.o GSM_OBJECTS+= $(SRC)/k6opt.o
endif @@ -321,6 +327,8 @@
endif
@@ -308,6 +311,8 @@
endif endif
endif endif
endif endif

13
net/asterisk/patches/14-Makefile-codecs.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Nru asterisk-1.2.14.org/codecs/Makefile asterisk-1.2.14/codecs/Makefile
--- asterisk-1.2.14.org/codecs/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/codecs/Makefile 2006-12-27 09:15:57.000000000 +0100
@@ -72,6 +72,9 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
codec_g726.so
+CFLAGS += $(EXTRA_CFLAGS)
+CODECS += $(EXTRA_CODEC_MODULES)
+
all: depend $(CODECS)
clean:

29
net/asterisk/patches/asterisk-1.2.0-Makefile.patch → net/asterisk/patches/15-Makefile.patch
View File

@ -1,7 +1,7 @@
diff -ruN asterisk-1.2.0-old/Makefile asterisk-1.2.0-new/Makefile diff -Nru asterisk-1.2.14.org/Makefile asterisk-1.2.14/Makefile
--- asterisk-1.2.0-old/Makefile 2005-11-16 21:23:53.000000000 +0100 --- asterisk-1.2.14.org/Makefile 2006-12-11 22:55:43.000000000 +0100
+++ asterisk-1.2.0-new/Makefile 2005-12-04 23:01:16.000000000 +0100 +++ asterisk-1.2.14/Makefile 2006-12-27 09:16:50.000000000 +0100
@@ -341,16 +339,6 @@ @@ -356,16 +356,6 @@
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
cryptostub.o cryptostub.o
@ -18,21 +18,20 @@ diff -ruN asterisk-1.2.0-old/Makefile asterisk-1.2.0-new/Makefile
ifeq ($(OSARCH),Linux) ifeq ($(OSARCH),Linux)
LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd
else else
@@ -401,7 +389,9 @@ @@ -420,8 +410,6 @@
HAVEDOT=no HAVEDOT=no
endif endif
+ifneq ($(NOCRYPTO),yes) -LIBS+=-lssl
LIBS+=-lssl -
+endif _all: all
@echo " +--------- Asterisk Build Complete ---------+"
INSTALL=install @echo " + Asterisk has successfully been built, but +"
@@ -447,12 +435,12 @@
@@ -430,12 +420,12 @@ cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
cd editline && unset CFLAGS LIBS && ./configure ; \
editline/libedit.a: FORCE editline/libedit.a: FORCE
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE) $(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure + cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE) $(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure
$(MAKE) -C editline libedit.a $(MAKE) -C editline libedit.a
@ -43,7 +42,7 @@ diff -ruN asterisk-1.2.0-old/Makefile asterisk-1.2.0-new/Makefile
else \ else \
echo "You need to do a cvs update -d not just cvs update"; \ echo "You need to do a cvs update -d not just cvs update"; \
exit 1; \ exit 1; \
@@ -513,7 +503,7 @@ @@ -530,7 +518,7 @@
fi fi
rm -f include/asterisk/build.h.tmp rm -f include/asterisk/build.h.tmp
$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c

6
net/asterisk/patches/asterisk-1.2.0-Makefile-pbx.patch → net/asterisk/patches/16-Makefile-pbx.patch
View File

@ -1,6 +1,6 @@
diff -ruN asterisk-1.2.0-old/pbx/Makefile asterisk-1.2.0-new/pbx/Makefile diff -Nru asterisk-1.2.14.org/pbx/Makefile asterisk-1.2.14/pbx/Makefile
--- asterisk-1.2.0-old/pbx/Makefile 2005-11-01 22:53:30.000000000 +0100 --- asterisk-1.2.14.org/pbx/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.0-new/pbx/Makefile 2005-12-04 19:23:48.000000000 +0100 +++ asterisk-1.2.14/pbx/Makefile 2006-12-27 09:17:58.000000000 +0100
@@ -38,6 +38,9 @@ @@ -38,6 +38,9 @@
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o

44
net/asterisk/patches/17-Makefile-res.patch Normal file
View File

@ -0,0 +1,44 @@
diff -Nru asterisk-1.2.14.org/res/Makefile asterisk-1.2.14/res/Makefile
--- asterisk-1.2.14.org/res/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/res/Makefile 2006-12-27 09:18:45.000000000 +0100
@@ -55,7 +55,7 @@
CFLAGS+=
ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+ifneq ($(wildcard $(STAGING_DIR)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
CFLAGS+=-DZAPATA_MOH
endif
endif # WITHOUT_ZAPTEL
@@ -69,6 +69,9 @@
CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
endif
+CFLAGS += $(EXTRA_CFLAGS)
+MODS += $(EXTRA_RES_MODULES)
+
all: depend $(MODS)
install: all
@@ -89,7 +92,7 @@
fi
res_crypto.so: res_crypto.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) $(CRYPTO_LIBS)
clean:
rm -f *.so *.o .depend
@@ -109,6 +112,12 @@
res_config_odbc.so: res_config_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${CYG_RES_CONFIG_ODBC_LIB}
+res_config_mysql.so: res_config_mysql.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lmysqlclient -lz
+
+res_sqlite.so: res_sqlite.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lsqlite
+
ifneq ($(wildcard .depend),)
include .depend
endif

12
net/asterisk/patches/asterisk-1.2.0-res_mysql.patch → net/asterisk/patches/18-res_mysql.patch
View File

@ -1,6 +1,6 @@
diff -ruN asterisk-1.2.0-old/configs/res_mysql.conf.sample asterisk-1.2.0-new/configs/res_mysql.conf.sample diff -Nru asterisk-1.2.14.org/configs/res_mysql.conf.sample asterisk-1.2.14/configs/res_mysql.conf.sample
--- asterisk-1.2.0-old/configs/res_mysql.conf.sample 1970-01-01 01:00:00.000000000 +0100 --- asterisk-1.2.14.org/configs/res_mysql.conf.sample 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.0-new/configs/res_mysql.conf.sample 2004-12-03 15:33:44.000000000 +0100 +++ asterisk-1.2.14/configs/res_mysql.conf.sample 2006-12-27 09:19:45.000000000 +0100
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+; +;
+; Sample configuration for res_config_mysql.c +; Sample configuration for res_config_mysql.c
@ -17,9 +17,9 @@ diff -ruN asterisk-1.2.0-old/configs/res_mysql.conf.sample asterisk-1.2.0-new/co
+;dbpass = mypass +;dbpass = mypass
+;dbport = 3306 +;dbport = 3306
+;dbsock = /tmp/mysql.sock +;dbsock = /tmp/mysql.sock
diff -ruN asterisk-1.2.0-old/res/res_config_mysql.c asterisk-1.2.0-new/res/res_config_mysql.c diff -Nru asterisk-1.2.14.org/res/res_config_mysql.c asterisk-1.2.14/res/res_config_mysql.c
--- asterisk-1.2.0-old/res/res_config_mysql.c 1970-01-01 01:00:00.000000000 +0100 --- asterisk-1.2.14.org/res/res_config_mysql.c 1970-01-01 01:00:00.000000000 +0100
+++ asterisk-1.2.0-new/res/res_config_mysql.c 2005-10-13 21:43:54.000000000 +0200 +++ asterisk-1.2.14/res/res_config_mysql.c 2006-12-27 09:19:45.000000000 +0100
@@ -0,0 +1,675 @@ @@ -0,0 +1,675 @@
+/* +/*
+ * Asterisk -- A telephony toolkit for Linux. + * Asterisk -- A telephony toolkit for Linux.

6
net/asterisk/patches/asterisk-1.2.1-Makefile-codecs-ilbc.patch → net/asterisk/patches/19-Makefile-codecs-ilbc.patch
View File

@ -1,6 +1,6 @@
diff -ruN asterisk-1.2.1-old/codecs/ilbc/Makefile asterisk-1.2.1-new/codecs/ilbc/Makefile diff -Nru asterisk-1.2.14.org/codecs/ilbc/Makefile asterisk-1.2.14/codecs/ilbc/Makefile
--- asterisk-1.2.1-old/codecs/ilbc/Makefile 2005-11-29 19:24:39.000000000 +0100 --- asterisk-1.2.14.org/codecs/ilbc/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.1-new/codecs/ilbc/Makefile 2005-12-16 19:24:36.000000000 +0100 +++ asterisk-1.2.14/codecs/ilbc/Makefile 2006-12-27 09:21:07.000000000 +0100
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
ARCH=$(PROC) ARCH=$(PROC)
-CFLAGS+=-Wall -O3 -funroll-loops -CFLAGS+=-Wall -O3 -funroll-loops

46
net/asterisk/patches/asterisk-1.2.1-chan_h323.patch → net/asterisk/patches/20-chan_h323.patch
View File

@ -1,26 +1,6 @@
diff -ruN asterisk-1.2.1-old/channels/Makefile asterisk-1.2.1-new/channels/Makefile diff -Nru asterisk-1.2.14.org/channels/h323/Makefile asterisk-1.2.14/channels/h323/Makefile
--- asterisk-1.2.1-old/channels/Makefile 2006-05-07 13:06:06.000000000 +0200 --- asterisk-1.2.14.org/channels/h323/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.1-new/channels/Makefile 2006-05-07 15:26:00.000000000 +0200 +++ asterisk-1.2.14/channels/h323/Makefile 2006-12-27 09:22:09.000000000 +0100
@@ -15,6 +15,7 @@
#
CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
+CXXLIBS=-lstdc++
ifneq (${OSARCH},CYGWIN)
# if you really, really want to use these drivers, uncomment the line below
@@ -230,7 +231,7 @@
ifeq (${OSARCH},Linux)
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
- $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
+ $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CXXLIBS)
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
diff -ruN asterisk-1.2.1-old/channels/h323/Makefile asterisk-1.2.1-new/channels/h323/Makefile
--- asterisk-1.2.1-old/channels/h323/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.1-new/channels/h323/Makefile 2006-05-07 13:18:46.000000000 +0200
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
touch $(SOURCES) touch $(SOURCES)
@ -30,3 +10,23 @@ diff -ruN asterisk-1.2.1-old/channels/h323/Makefile asterisk-1.2.1-new/channels/
Makefile.ast: FORCE Makefile.ast: FORCE
@echo H323CFLAGS = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp @echo H323CFLAGS = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp
diff -Nru asterisk-1.2.14.org/channels/Makefile asterisk-1.2.14/channels/Makefile
--- asterisk-1.2.14.org/channels/Makefile 2006-08-17 23:57:19.000000000 +0200
+++ asterisk-1.2.14/channels/Makefile 2006-12-27 09:22:09.000000000 +0100
@@ -15,6 +15,7 @@
#
CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
+CXXLIBS=-lstdc++
ifneq (${OSARCH},CYGWIN)
# if you really, really want to use these drivers, uncomment the line below
@@ -228,7 +229,7 @@
ifeq (${OSARCH},Linux)
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
- $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
+ $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CXXLIBS)
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat

14
net/asterisk/patches/asterisk-1.0.7-Makefile-astdb.patch
View File

@ -1,14 +0,0 @@
diff -ruN asterisk-1.0.7-old/db1-ast/Makefile asterisk-1.0.7-new/db1-ast/Makefile
--- asterisk-1.0.7-old/db1-ast/Makefile 2004-08-31 18:33:00.000000000 +0200
+++ asterisk-1.0.7-new/db1-ast/Makefile 2005-03-19 17:38:06.000000000 +0100
@@ -32,8 +32,8 @@
$(LIBDB): $(OBJS)
rm -f $@
- ar cq $@ $(OBJS)
- ranlib $@
+ $(AR) cq $@ $(OBJS)
+ $(RANLIB) $@
$(LIBDBSO): $(SHOBJS)
$(CC) -Wl,-O1 -Wl,--version-script=libdb.map -Wl,-soname=$(LIBDBSO) -shared -o $@ $^

14
net/asterisk/patches/asterisk-1.0.7-Makefile-stdtime.patch
View File

@ -1,14 +0,0 @@
diff -ruN asterisk-1.0.7-old/stdtime/Makefile asterisk-1.0.7-new/stdtime/Makefile
--- asterisk-1.0.7-old/stdtime/Makefile 2003-11-05 07:19:41.000000000 +0100
+++ asterisk-1.0.7-new/stdtime/Makefile 2005-03-19 17:38:06.000000000 +0100
@@ -3,8 +3,8 @@
all: libtime.a
libtime.a: $(OBJS)
- ar rv $@ $(OBJS)
- ranlib $@
+ $(AR) rv $@ $(OBJS)
+ $(RANLIB) $@
install:

34
net/asterisk/patches/asterisk-1.2.0-Makefile-apps.patch
View File

@ -1,34 +0,0 @@
diff -ruN asterisk-1.2.0-old/apps/Makefile asterisk-1.2.0-new/apps/Makefile
--- asterisk-1.2.0-old/apps/Makefile 2005-11-11 01:32:45.000000000 +0100
+++ asterisk-1.2.0-new/apps/Makefile 2005-12-04 19:26:20.000000000 +0100
@@ -83,6 +83,9 @@
#CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information
+CFLAGS += $(EXTRA_CFLAGS)
+APPS += $(EXTRA_APP_MODULES)
+
all: $(APPS)
clean:
@@ -102,14 +105,17 @@
app_curl.so: app_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
+app_sql_mysql.so: app_sql_mysql.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lmysqlclient
+
app_sql_postgres.o: app_sql_postgres.c
- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ $(CC) -pipe $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
app_sql_postgres.so: app_sql_postgres.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lpq
app_sql_odbc.so: app_sql_odbc.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lodbc
look: look.c
$(CC) -pipe -O6 -g look.c -o look -lncurses

22
net/asterisk/patches/asterisk-1.2.0-Makefile-channels.patch
View File

@ -1,22 +0,0 @@
diff -ruN asterisk-1.2.0-old/channels/Makefile asterisk-1.2.0-new/channels/Makefile
--- asterisk-1.2.0-old/channels/Makefile 2005-12-04 04:48:40.000000000 +0100
+++ asterisk-1.2.0-new/channels/Makefile 2005-12-04 23:30:19.000000000 +0100
@@ -155,6 +155,9 @@
#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
+CFLAGS += $(EXTRA_CFLAGS)
+CHANNEL_LIBS += $(EXTRA_CHAN_MODULES)
+
all: depend $(CHANNEL_LIBS)
clean:
@@ -162,7 +165,7 @@
rm -f busy.h ringtone.h gentone gentone-ulaw
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
ifneq ($(wildcard .depend),)
include .depend

13
net/asterisk/patches/asterisk-1.2.0-Makefile-codecs.patch
View File

@ -1,13 +0,0 @@
diff -ruN asterisk-1.2.0-old/codecs/Makefile asterisk-1.2.0-new/codecs/Makefile
--- asterisk-1.2.0-old/codecs/Makefile 2005-11-08 05:13:18.000000000 +0100
+++ asterisk-1.2.0-new/codecs/Makefile 2005-12-04 19:24:53.000000000 +0100
@@ -72,6 +72,9 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
codec_g726.so
+CFLAGS += $(EXTRA_CFLAGS)
+CODECS += $(EXTRA_CODEC_MODULES)
+
all: depend $(CODECS)
clean:

26
net/asterisk/patches/asterisk-1.2.0-Makefile-res.patch
View File

@ -1,26 +0,0 @@
diff -ruN asterisk-1.2.0-old/res/Makefile asterisk-1.2.0-new/res/Makefile
--- asterisk-1.2.0-old/res/Makefile 2005-11-16 21:49:44.000000000 +0100
+++ asterisk-1.2.0-new/res/Makefile 2005-12-04 19:18:15.000000000 +0100
@@ -69,6 +69,9 @@
CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
endif
+CFLAGS += $(EXTRA_CFLAGS)
+MODS += $(EXTRA_RES_MODULES)
+
all: depend $(MODS)
install: all
@@ -112,6 +112,12 @@
res_config_odbc.so: res_config_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${CYG_RES_CONFIG_ODBC_LIB}
+res_config_mysql.so: res_config_mysql.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lmysqlclient -lz
+
+res_sqlite.so: res_sqlite.o
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(EXTRA_LDFLAGS) -lsqlite
+
ifneq ($(wildcard .depend),)
include .depend
endif

20
net/asterisk/patches/asterisk-1.2.0-chan_bluetooth.patch
View File

@ -1,20 +0,0 @@
diff -ruN asterisk-1.2.0-old/channels/chan_bluetooth.c asterisk-1.2.0-new/channels/chan_bluetooth.c
--- asterisk-1.2.0-old/channels/chan_bluetooth.c 2005-12-04 04:48:40.000000000 +0100
+++ asterisk-1.2.0-new/channels/chan_bluetooth.c 2005-12-04 23:07:19.000000000 +0100
@@ -104,6 +104,7 @@
#include <asterisk/options.h>
#include <asterisk/cli.h>
#include <asterisk/callerid.h>
+#include <asterisk/version.h>
#include <sys/socket.h>
#include <sys/signal.h>
#include <sys/time.h>
@@ -3133,7 +3133,7 @@
struct ast_variable * v;
char * cat;
- cfg = ast_load(BLT_CONFIG_FILE);
+ cfg = ast_config_load(BLT_CONFIG_FILE);
if (!cfg) {
ast_log(LOG_NOTICE, "Unable to load Bluetooth config: %s. Bluetooth disabled\n", BLT_CONFIG_FILE);

13
net/asterisk/patches/asterisk-1.2.0-compat-getloadavg.patch
View File

@ -1,13 +0,0 @@
diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100
+++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100
@@ -75,7 +75,9 @@
#define HAVE_STRTOQ
#ifdef _BSD_SOURCE
+#ifndef __UCLIBC__
#define HAVE_GETLOADAVG
+#endif /* __UCLIBC__ */
#endif
#ifdef __linux__

11
net/asterisk/patches/asterisk-1.2.1-Makefile-versionnum.patch
View File

@ -1,11 +0,0 @@
--- asterisk-1.2.1/Makefile.orig 2005-12-09 10:22:06.000000000 +0100
+++ asterisk-1.2.1/Makefile 2005-12-09 10:28:46.000000000 +0100
@@ -322,8 +322,6 @@
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
- else
- ASTERISKVERSIONNUM=000000
endif
endif