Update of /cvsroot/leaf/src/bering-uclibc/contrib/asterisk
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11207/asterisk
Added Files:
asterisk-1.2.12.1.tar.gz asterisk-CVE-2006-2898.patch
asterisk-fhs.patch asterisk-includes.patch
asterisk-no_getloadavg.patch asterisk-no_march.patch
asterisk-no_res_ninit.patch asterisk.init bristuff.patch
buildtool.cfg buildtool.mk
Log Message:
asterisk et al.
--- NEW FILE: asterisk-1.2.12.1.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: asterisk-no_march.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## nomarch.dpatch by Kilian Krause <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't optimize for i686 anywhere
## -- upstream will move to configure with 1.4
@DPATCH@
diff -urNad asterisk-1.2.0.dfsg~/Makefile asterisk-1.2.0.dfsg/Makefile
--- asterisk-1.2.0.dfsg~/Makefile 2005-11-19 19:30:42.000000000 +0000
+++ asterisk-1.2.0.dfsg/Makefile 2005-11-19 19:30:51.000000000 +0000
@@ -227,10 +227,6 @@
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
-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
-
ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char
endif
--- NEW FILE: asterisk-no_res_ninit.patch ---
diff -ur asterisk-1.2.11.orig/dns.c asterisk-1.2.11/dns.c
--- asterisk-1.2.11.orig/dns.c 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.11/dns.c 2006-09-17 22:34:04.658551187 +0200
@@ -173,7 +173,7 @@
return 0;
}
-#if defined(res_ninit)
+#if (defined(res_ninit) && !defined(__UCLIBC__))
#define HAS_RES_NINIT
#else
AST_MUTEX_DEFINE_STATIC(res_lock);
--- NEW FILE: bristuff.patch ---
diff -urN asterisk-1.2.10.orig/.version asterisk-1.2.10/.version
--- asterisk-1.2.10.orig/.version 2006-07-14 23:29:33.000000000 +0200
+++ asterisk-1.2.10/.version 2006-07-31 14:13:27.000000000 +0200
@@ -1 +1 @@
-1.2.12.1
+1.2.12.1-BRIstuffed-0.3.0-PRE-1s
diff -urN asterisk-1.2.10.orig/HARDWARE asterisk-1.2.10/HARDWARE
--- asterisk-1.2.10.orig/HARDWARE 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.10/HARDWARE 2006-07-31 14:13:08.000000000 +0200
@@ -37,6 +37,19 @@
* Wildcard TE410P - Quad T1/E1 switchable interface. Supports PRI and
RBS signalling, as well as PPP, FR, and HDLC data modes.
+-- Junghanns.NET (Primary author of BRIstuff)
+ http://www.junghanns.net
+
+ * quadBRI PCI ISDN - 4port BRI ISDN interface, supports NT and TE mode
+
+ * octoBRI PCI ISDN - 8port BRI ISDN interface, supports NT and TE mode
[...14768 lines suppressed...]
+
+char *key()
+{
+ return ASTERISK_GPL_KEY;
+}
diff -urN asterisk-1.2.10.orig/rtp.c asterisk-1.2.10/rtp.c
--- asterisk-1.2.10.orig/rtp.c 2006-07-13 20:44:17.000000000 +0200
+++ asterisk-1.2.10/rtp.c 2006-07-31 14:16:56.000000000 +0200
@@ -445,6 +445,11 @@
struct rtpPayloadType rtpPT;
len = sizeof(sin);
+
+ /* XXX SYMPTON CURE, DIRTY FIX, CHECK, BEGIN */
+ if (!rtp)
+ return &null_frame;
+ /* XXX SYMPTON CURE, DIRTY FIX, CHECK, END */
/* Cache where the header will go */
res = recvfrom(rtp->s, rtp->rawdata + AST_FRIENDLY_OFFSET,
sizeof(rtp->rawdata) - AST_FRIENDLY_OFFSET,
--- NEW FILE: asterisk-no_getloadavg.patch ---
diff -ur asterisk-1.2.11.orig/utils.c asterisk-1.2.11/utils.c
--- asterisk-1.2.11.orig/utils.c 2006-07-12 15:54:10.000000000 +0200
+++ asterisk-1.2.11/utils.c 2006-09-17 23:16:22.181775910 +0200
@@ -834,7 +834,7 @@
}
#endif /* !HAVE_STRTOQ */
-#ifndef HAVE_GETLOADAVG
+#if (!defined(HAVE_GETLOADAVG) || defined(__UCLIBC__))
#ifdef linux
/* Alternative method of getting load avg on Linux only */
int getloadavg(double *list, int nelem)
--- NEW FILE: buildtool.mk ---
include $(MASTERMAKEFILE)
ASTERISK_DIR:=asterisk-1.2.12.1
ASTERISK_TARGET_DIR:=$(BT_BUILD_DIR)/asterisk
$(ASTERISK_DIR)/.source:
zcat $(ASTERISK_SOURCE) | tar -xvf -
cat $(ASTERISK_PATCH1) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH2) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH3) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH4) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH5) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH6) | patch -d $(ASTERISK_DIR) -p1
cat $(ASTERISK_PATCH7) | patch -d $(ASTERISK_DIR) -p1
cat $(BRISTUFF_DIR)/patches/asterisk.patch | patch -d $(ASTERISK_DIR)
-p1
touch $(ASTERISK_DIR)/.source
$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
cd $(ASTERISK_DIR)/editline; ./configure \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_TARGET_NAME)
touch $(ASTERISK_DIR)/.configured
$(ASTERISK_DIR)/.build: $(ASTERISK_DIR)/.configured
mkdir -p $(BT_STAGING_DIR)/etc/init.d
mkdir -p $(BT_STAGING_DIR)/usr/share
mkdir -p $(BT_STAGING_DIR)/var/lib/asterisk
$(MAKE) -C $(ASTERISK_DIR) \
CROSS_ARCH=Linux \
CROSS_COMPILE=$(BT_STAGING_DIR)/usr/bin/ \
CROSS_COMPILE_TARGET=$(BT_STAGING_DIR) \
CROSS_PROC=$(ARCH) \
OPTIMIZE="$(BT_COPT_FLAGS)" \
OPTIONS=-DLOW_MEMORY \
DEBUG= \
DESTDIR=$(ASTERISK_TARGET_DIR) install samples
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) \
$(ASTERISK_TARGET_DIR)/usr/lib/asterisk/modules/*.so
-$(BT_STRIP) $(BT_STRIP_BINOPTS) \
$(ASTERISK_TARGET_DIR)/usr/sbin/*
cp -a -f $(ASTERISK_INIT) \
$(BT_STAGING_DIR)/etc/init.d/asterisk
cp -a -f $(ASTERISK_TARGET_DIR)/etc/asterisk \
$(BT_STAGING_DIR)/etc
cp -a -f $(ASTERISK_TARGET_DIR)/usr/lib/asterisk \
$(BT_STAGING_DIR)/usr/lib
cp -a -f $(ASTERISK_TARGET_DIR)/usr/share/asterisk \
$(BT_STAGING_DIR)/usr/share
cp -a -f $(ASTERISK_TARGET_DIR)/usr/sbin/asterisk \
$(ASTERISK_TARGET_DIR)/usr/sbin/smsq \
$(ASTERISK_TARGET_DIR)/usr/sbin/stereorize \
$(ASTERISK_TARGET_DIR)/usr/sbin/streamplayer \
$(BT_STAGING_DIR)/usr/sbin/
cp -a -f $(ASTERISK_TARGET_DIR)/var/lib/asterisk/keys \
$(BT_STAGING_DIR)/var/lib/asterisk
touch $(ASTERISK_DIR)/.build
source: $(ASTERISK_DIR)/.source
build: $(ASTERISK_DIR)/.build
clean:
-$(MAKE) -C $(ASTERISK_DIR) clean
rm -rf $(BT_STAGING_DIR)/usr/lib/asterisk
rm -rf $(BT_STAGING_DIR)/usr/share/asterisk
rm -rf $(BT_STAGING_DIR)/usr/include/asterisk
rm -rf $(BT_STAGING_DIR)/etc/asterisk
rm -f $(BT_STAGING_DIR)/etc/init.d/asterisk
rm -rf $(BT_STAGING_DIR)/var/lib/asterisk
rm -f $(BT_STAGING_DIR)/usr/sbin/asterisk
rm -f $(BT_STAGING_DIR)/usr/sbin/smsq
rm -f $(BT_STAGING_DIR)/usr/sbin/stereorize
rm -f $(BT_STAGING_DIR)/usr/sbin/streamplayer
rm -rf $(ASTERISK_TARGET_DIR)
rm -f $(ASTERISK_DIR)/.build
rm -f $(ASTERISK_DIR)/.configured
srcclean:
rm -rf $(ASTERISK_DIR)
--- NEW FILE: asterisk-includes.patch ---
diff -ur asterisk-1.2.11.orig/Makefile asterisk-1.2.11/Makefile
--- asterisk-1.2.11.orig/Makefile 2006-06-29 21:23:18.000000000 +0200
+++ asterisk-1.2.11/Makefile 2006-09-17 22:16:19.520664737 +0200
@@ -356,16 +356,6 @@
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
cryptostub.o
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
- OBJS+= poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
- OBJS+= dlfcn.o
- ASTCFLAGS+=-DDLFCNCOMPAT
-endif
-
ifeq ($(OSARCH),Linux)
LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd
else
--- NEW FILE: asterisk-fhs.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## ast_data_dir.dpatch by Mark Purcell <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch to make Asterisk conform with the Linux File System Hierarchy
Standard (FHS)
## DP: Places read-only architecture-independent data under /usr/share/asterisk
(autoconf --datadir)
## DP: not /var/lib/asterisk
## -- is applied upstream for 1.2
@DPATCH@
diff -urNad asterisk-1.2.7.1.dfsg/asterisk.c
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/asterisk.c
--- asterisk-1.2.7.1.dfsg/asterisk.c 2006-05-13 18:14:15.970288503 +0300
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/asterisk.c 2006-05-13
18:14:16.228355957 +0300
@@ -216,6 +216,7 @@
char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
@@ -1882,6 +1883,7 @@
ast_copy_string(ast_config_AST_MODULE_DIR, AST_MODULE_DIR,
sizeof(ast_config_AST_MODULE_DIR));
snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR)
- 1, "%s/monitor", ast_config_AST_SPOOL_DIR);
ast_copy_string(ast_config_AST_VAR_DIR, AST_VAR_DIR,
sizeof(ast_config_AST_VAR_DIR));
+ ast_copy_string(ast_config_AST_DATA_DIR, AST_DATA_DIR,
sizeof(ast_config_AST_DATA_DIR));
ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR,
sizeof(ast_config_AST_LOG_DIR));
ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR,
sizeof(ast_config_AST_AGI_DIR));
ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
@@ -1918,6 +1920,8 @@
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, "astdatadir")) {
+ ast_copy_string(ast_config_AST_DATA_DIR, v->value,
sizeof(ast_config_AST_DATA_DIR));
} else if (!strcasecmp(v->name, "astlogdir")) {
ast_copy_string(ast_config_AST_LOG_DIR, v->value,
sizeof(ast_config_AST_LOG_DIR));
} else if (!strcasecmp(v->name, "astagidir")) {
diff -urNad asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h
--- asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h 2005-06-20
20:26:08.000000000 +0300
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/build_tools/make_defaults_h
2006-05-13 18:14:16.228355957 +0300
@@ -11,6 +11,7 @@
#define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
#define AST_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}"
#define AST_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
+#define AST_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
#define AST_KEY_DIR "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
@@ -19,7 +20,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
-#define AST_SOUNDS "${INSTALL_PATH}${ASTVARLIBDIR}/sounds"
-#define AST_IMAGES "${INSTALL_PATH}${ASTVARLIBDIR}/images"
+#define AST_SOUNDS "${INSTALL_PATH}${ASTDATADIR}/sounds"
+#define AST_IMAGES "${INSTALL_PATH}${ASTDATADIR}/images"
END
diff -urNad asterisk-1.2.7.1.dfsg/channels/chan_iax2.c
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/channels/chan_iax2.c
--- asterisk-1.2.7.1.dfsg/channels/chan_iax2.c 2006-03-31 22:11:26.000000000
+0300
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/channels/chan_iax2.c 2006-05-13
18:27:17.074963284 +0300
@@ -1367,7 +1367,7 @@
cur = cur->next;
}
/* Now that we've freed them, load the new ones */
- snprintf(dir, sizeof(dir), "%s/firmware/iax", (char
*)ast_config_AST_VAR_DIR);
+ snprintf(dir, sizeof(dir), "%s/firmware/iax", (char
*)ast_config_AST_DATA_DIR);
fwd = opendir(dir);
if (fwd) {
while((de = readdir(fwd))) {
diff -urNad asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample
--- asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample 2005-11-29
20:24:39.000000000 +0200
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/configs/musiconhold.conf.sample
2006-05-13 18:14:16.228355957 +0300
@@ -4,7 +4,7 @@
[default]
mode=quietmp3
-directory=/var/lib/asterisk/mohmp3
+directory=/usr/share/asterisk/mohmp3
; valid mode options:
; quietmp3 -- default
diff -urNad asterisk-1.2.7.1.dfsg/file.c
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/file.c
--- asterisk-1.2.7.1.dfsg/file.c 2006-01-10 00:07:26.000000000 +0200
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/file.c 2006-05-13
18:14:16.228355957 +0300
@@ -313,7 +313,7 @@
} else {
char tmp[AST_CONFIG_MAX_PATH] = "";
- snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR,
"sounds");
+ snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_DATA_DIR,
"sounds");
fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
fn = malloc(fnsize);
if (fn)
diff -urNad asterisk-1.2.7.1.dfsg/image.c
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/image.c
--- asterisk-1.2.7.1.dfsg/image.c 2006-03-24 16:48:11.000000000 +0200
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/image.c 2006-05-13
18:14:16.228355957 +0300
@@ -108,9 +108,9 @@
snprintf(buf, len, "%s.%s", filename, ext);
} else {
if (preflang && strlen(preflang))
- snprintf(buf, len, "%s/%s/%s-%s.%s",
ast_config_AST_VAR_DIR, "images", filename, preflang, ext);
+ snprintf(buf, len, "%s/%s/%s-%s.%s",
ast_config_AST_DATA_DIR, "images", filename, preflang, ext);
else
- snprintf(buf, len, "%s/%s/%s.%s",
ast_config_AST_VAR_DIR, "images", filename, ext);
+ snprintf(buf, len, "%s/%s/%s.%s",
ast_config_AST_DATA_DIR, "images", filename, ext);
}
}
diff -urNad asterisk-1.2.7.1.dfsg/include/asterisk.h
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/include/asterisk.h
--- asterisk-1.2.7.1.dfsg/include/asterisk.h 2005-11-30 05:37:37.000000000
+0200
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/include/asterisk.h 2006-05-13
18:14:16.228355957 +0300
@@ -29,6 +29,7 @@
extern char ast_config_AST_SPOOL_DIR[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_MONITOR_DIR[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_VAR_DIR[AST_CONFIG_MAX_PATH];
+extern char ast_config_AST_DATA_DIR[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_LOG_DIR[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_AGI_DIR[AST_CONFIG_MAX_PATH];
extern char ast_config_AST_DB[AST_CONFIG_MAX_PATH];
diff -urNad asterisk-1.2.7.1.dfsg/Makefile
/tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/Makefile
--- asterisk-1.2.7.1.dfsg/Makefile 2006-04-12 00:58:47.000000000 +0300
+++ /tmp/dpep.um4nZ3/asterisk-1.2.7.1.dfsg/Makefile 2006-05-13
18:26:34.253802810 +0300
@@ -110,6 +110,7 @@
ifneq ($(OSARCH),SunOS)
ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
+ ASTDATADIR=$(INSTALL_PREFIX)/usr/share/asterisk
ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
@@ -117,10 +118,10 @@
ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run/asterisk
ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+ AGI_DIR=$(ASTDATADIR)/agi-bin
else
ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
@@ -136,6 +137,7 @@
MODULES_DIR=$(ASTLIBDIR)/modules
AGI_DIR=$(ASTVARLIBDIR)/agi-bin
endif
+FIRMWARE_DIR=$(ASTDATADIR)/firmware
ASTCFLAGS=
@@ -542,38 +544,38 @@
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig
$(DESTDIR)/usr/lib/pkgconfig; fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
else \
echo "No description for $$x"; \
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
for x in sounds/dictate/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
else \
echo "No description for $$x"; \
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
for x in sounds/letters/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
else \
echo "No description for $$x"; \
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
for x in sounds/phonetic/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
else \
echo "No description for $$x"; \
exit 1; \
@@ -581,16 +583,16 @@
done
for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-*
sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-*
sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-*
sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds
; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
else \
echo "No description for $$x"; \
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/images
for x in images/*.jpg; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
done
mkdir -p $(DESTDIR)$(AGI_DIR)
@@ -626,6 +628,7 @@
mkdir -p $(DESTDIR)$(ASTETCDIR)
mkdir -p $(DESTDIR)$(ASTBINDIR)
mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
+ mkdir -p $(DESTDIR)$(ASTDATADIR)
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
@@ -648,12 +651,12 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+ mkdir -p $(DESTDIR)$(FIRMWARE_DIR)
+ mkdir -p $(DESTDIR)$(FIRMWARE_DIR)/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
$(INSTALL) -m 644 keys/freeworlddialup.pub
$(DESTDIR)$(ASTVARLIBDIR)/keys
@@ -662,7 +665,7 @@
$(INSTALL) -m 644 contrib/scripts/autosupport.8
$(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8
$(DESTDIR)$(ASTMANDIR)/man8
if [ -d contrib/firmware/iax ]; then \
- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin
$(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin
$(DESTDIR)$(FIRMWARE_DIR)/iax/iaxy.bin; \
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
@@ -764,10 +767,10 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
for x in sounds/demo-*; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds
; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
else \
echo "No description for $$x"; \
exit 1; \
@@ -781,11 +784,11 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail;
do \
- cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >>
$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+ cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >>
$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
done
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone;
do \
- cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >>
$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+ cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >>
$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
done
webvmail:
--- NEW FILE: asterisk-CVE-2006-2898.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 99_CVE-2006-2898.dpatch by Joey Schulze <[EMAIL PROTECTED]>
##
## DP: Bug in the IAX2 channel allows remote attackers to craft
## DP: a denial of service.
@DPATCH@
diff -urNad asterisk-1.2.10.dfsg~/channels/chan_iax2.c
asterisk-1.2.10.dfsg/channels/chan_iax2.c
--- asterisk-1.2.10.dfsg~/channels/chan_iax2.c 2006-07-12 16:23:59.000000000
+0100
+++ asterisk-1.2.10.dfsg/channels/chan_iax2.c 2006-07-27 08:17:52.000000000
+0100
@@ -6531,7 +6531,7 @@
if (iaxdebug && (res >= sizeof(*fh)))
iax_showframe(NULL, fh, 1, &sin, res - sizeof(*fh));
#endif
- if (ntohs(mh->callno) & IAX_FLAG_FULL) {
+ if ((res >= sizeof(*fh)) && ntohs(mh->callno) & IAX_FLAG_FULL) {
if (res < sizeof(*fh)) {
ast_log(LOG_WARNING, "Rejecting packet from '%s.%d'
that is flagged as a full frame but is too short\n", ast_inet_ntoa(iabuf,
sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port));
return 1;
--- NEW FILE: asterisk.init ---
#! /bin/sh
# $Id: asterisk,v 1.3 2005/11/17 22:30:01 Gregory Boehnlein <[EMAIL PROTECTED]>
#
# asterisk start the asterisk PBX
#
# Thu Nov 17 2005 Gregory Boehnlein <[EMAIL PROTECTED]>
# - Updated Version to 1.3
# - Reversed behavior of LD_ASSUME_KERNEL=2.4.1
# - Added detailed failure messages
#
# Sun Jul 18 2004 Gregory Boehnlein <[EMAIL PROTECTED]>
# - Updated Version to 1.2
# - Added test for safe_asterisk
# - Changed "stop gracefully" to "stop now"
# - Added support for -U and -G command line options
# - Modified "reload" to call asterisk -rx 'reload'
RCDLINKS="2,S95 3,S95 4,S95 5,S95 0,K11 1,K11 6,K11"
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=asterisk
DESC="Asterisk PBX"
# Full path to asterisk binary
DAEMON=/usr/sbin/asterisk
# Full path to safe_asterisk script
SAFE_ASTERISK=/usr/sbin/safe_asterisk
# Uncomment this ONLY if you know what you are doing.
# export LD_ASSUME_KERNEL=2.4.1
# Uncomment the following and set them to the user/groups that you
# want to run Asterisk as. NOTE: this requires substantial work to
# be sure that Asterisk's environment has permission to write the
# files required for its operation, including logs, its comm
# socket, the asterisk database, etc.
#AST_USER="asterisk"
#AST_GROUP="asterisk"
if ! [ -x $DAEMON ] ; then
echo "ERROR: /usr/sbin/asterisk not found"
exit 0
fi
if ! [ -d /etc/asterisk ] ; then
echo "ERROR: /etc/asterisk directory not found"
exit 0
fi
set -e
case "$1" in
start)
echo -n "Starting $DESC: "
if [ -f $SAFE_ASTERISK ] ; then
DAEMON=$SAFE_ASTERISK
fi
if [ $AST_USER ] ; then
ASTARGS="-U $AST_USER"
fi
if [ $AST_GROUP ] ; then
ASTARGS="`echo $ASTARGS` -G $AST_GROUP"
fi
start-stop-daemon --start --exec $DAEMON -- $ASTARGS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
$DAEMON -rx 'stop now' > /dev/null 2> /dev/null && echo -n "$NAME"
echo "."
exit 0
;;
reload)
echo "Reloading $DESC configuration files."
$DAEMON -rx 'reload' > /dev/null 2> /dev/null
;;
restart|force-reload)
$DAEMON -rx 'restart gracefully' > /dev/null 2> /dev/null && echo -n
"$NAME"
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
exit 1
;;
esac
exit 0
--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
</File>
<File asterisk-1.2.12.1.tar.gz>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_SOURCE
</File>
<File asterisk-includes.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH1
</File>
<File asterisk-no_res_ninit.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH2
</File>
<File asterisk-no_getloadavg.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH3
</File>
# Debian patch from asterisk_1.2.11.dfsg-1
<File asterisk-fhs.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH4
</File>
# Debian patch from asterisk_1.2.11.dfsg-1
<File asterisk-no_march.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH5
</File>
# Debian patch from asterisk_1.2.11.dfsg-1
<File asterisk-CVE-2006-2898.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH6
</File>
<File bristuff.patch>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_PATCH7
</File>
<File asterisk.init>
Server = cvs-contrib-sourceforge
Directory = asterisk
Revision = HEAD
envname = ASTERISK_INIT
</File>
<Package>
<asterisk>
Version = 1.2.12.1
Revision = 1
Help <<EOF
Asterisk PBX (with BRIstuff)
Homepage: http://www.asterisk.org/
Requires: lpthread, ncurses, libm, libssl, libcrpto
LEAF package by __PACKAGER__,__BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Filename = etc/init.d/asterisk
Source = etc/init.d/asterisk
Type = binary
Permissions = 755
</File>
<File>
Filename = usr/lib/asterisk/modules/
Source = usr/lib/asterisk/modules/*.so
Type = binary
Permissions = 755
</File>
<File>
Filename = usr/sbin/asterisk
Source = usr/sbin/asterisk
Type = binary
Permissions = 755
</File>
<File>
Filename = usr/sbin/smsq
Source = usr/sbin/smsq
Type = binary
Permissions = 755
</File>
<File>
Filename = usr/sbin/stereorize
Source = usr/sbin/stereorize
Type = binary
Permissions = 755
</File>
<File>
Filename = usr/sbin/streamplayer
Source = usr/sbin/streamplayer
Type = binary
Permissions = 755
</File>
<File>
Filename = etc/asterisk/
Type = local
</File>
<File>
Filename = var/lib/asterisk/keys/
Type = local
</File>
<File>
Filename = var/lib/asterisk
Type = directory
</File>
<File>
Filename = var/spool/asterisk
Type = directory
</File>
<File>
Filename = var/run/asterisk
Type = directory
</File>
<File>
Filename = var/log/asterisk/cdr-csv
Type = directory
</File>
<File>
Filename = usr/share/asterisk/mohmp3
Type = directory
</File>
<File>
Filename =
usr/share/asterisk/firmware/iax/iaxy.bin
Source =
usr/share/asterisk/firmware/iax/iaxy.bin
Type = binary
</File>
</Contents>
</asterisk>
<astsmpls>
Version = 1.2.12.1
Revision = 1
Help <<EOF
Sample config for the Asterisk PBX
Homepage: http://www.asterisk.org/
LEAF package by __PACKAGER__,__BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Filename = etc/asterisk/
Source = etc/asterisk/*
Type = binary
</File>
<File>
Filename = var/lib/asterisk/keys/
Source = var/lib/asterisk/keys/*
Type = binary
</File>
</Contents>
</astsmpls>
<astsnds>
Version = 1.2.12.1
Revision = 1
Help <<EOF
Sounds for the Asterisk PBX
Homepage: http://www.asterisk.org/
LEAF package by __PACKAGER__,__BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Filename = usr/share/asterisk/sounds
Source = usr/share/asterisk/sounds/*
Type = binary
</File>
</Contents>
</astsnds>
</Package>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
