Update of /cvsroot/leaf/src/bering-uclibc/contrib/bristuff
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11207/bristuff
Added Files:
bristuff-0.3.0-PRE-1s.tar.gz bristuff-no_ldconfig.patch
bristuff-rediff.patch buildtool.cfg buildtool.mk
Log Message:
asterisk et al.
--- NEW FILE: bristuff-no_ldconfig.patch ---
diff -ur bristuff-0.3.0-PRE-1s.orig/libgsmat-0.0.1/Makefile
bristuff-0.3.0-PRE-1s/libgsmat-0.0.1/Makefile
--- bristuff-0.3.0-PRE-1s.orig/libgsmat-0.0.1/Makefile 2006-04-24
10:18:31.000000000 +0200
+++ bristuff-0.3.0-PRE-1s/libgsmat-0.0.1/Makefile 2006-09-18
14:13:05.444844963 +0200
@@ -63,7 +63,6 @@
if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux
status:" | grep -q "enabled"); then restorecon -v
$(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
( cd $(INSTALL_PREFIX)/usr/lib ; ln -sf libgsmat.so.1 libgsmat.so )
install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib
- /sbin/ldconfig
uninstall:
@echo "Removing Libpri"
@@ -91,7 +90,6 @@
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
$(CC) -shared -Wl,-soname,libgsmat.so.1 -o $@ $(DYNAMIC_OBJS)
- /sbin/ldconfig $(LDCONFIG_FLAGS) .
ln -sf libgsmat.so.1 libgsmat.so
clean:
--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
Server = cvs-contrib-sourceforge
Directory = bristuff
Revision = HEAD
</File>
<File bristuff-0.3.0-PRE-1s.tar.gz>
Server = cvs-contrib-sourceforge
Directory = bristuff
Revision = HEAD
envname = BRISTUFF_SOURCE
</File>
<File bristuff-no_ldconfig.patch>
Server = cvs-contrib-sourceforge
Directory = bristuff
Revision = HEAD
envname = BRISTUFF_PATCH1
</File>
<Package>
<libgsmat>
Version = 0.3.0-PRE-1s
Revision = 1
Help <<EOF
GSM Library (from BRIstuff)
Homepage: http://www.junghanns.net/
LEAF package by __PACKAGER__,__BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Filename = usr/lib/libgsmat.so.1.0
Source = usr/lib/libgsmat.so.1.0
Type = binary
Permissions = 755
</File>
</Contents>
</libgsmat>
</Package>
--- NEW FILE: buildtool.mk ---
include $(MASTERMAKEFILE)
BRISTUFF_DIR:=bristuff-0.3.0-PRE-1s
LIBGSM_DIR:=$(BRISTUFF_DIR)/libgsmat-0.0.1
BRISTUFF_MODULES:=ztgsm qozap cwain zaphfc
BRISTUFF_TARGET_DIR:=$(BT_BUILD_DIR)/bristuff
$(BRISTUFF_DIR)/.source:
zcat $(BRISTUFF_SOURCE) | tar -xvf -
chmod -R u+w $(BRISTUFF_DIR)
cat $(BRISTUFF_PATCH1) | patch -d $(BRISTUFF_DIR) -p1
touch $(BRISTUFF_DIR)/.source
$(BRISTUFF_DIR)/.build: $(BRISTUFF_DIR)/.source
mkdir -p $(BT_STAGING_DIR)/usr/include
mkdir -p $(BT_STAGING_DIR)/usr/lib
mkdir -p $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/
mkdir -p $(BRISTUFF_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/
$(MAKE) -C $(LIBGSM_DIR) INSTALL_PREFIX=$(BRISTUFF_TARGET_DIR) \
PROC=i486 \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
CFLAGS="$(BT_COPT_FLAGS)" \
install
for mod in $(BRISTUFF_MODULES) ; do \
$(MAKE) -C $(BRISTUFF_DIR)/$$mod \
INSTALL_PREFIX=$(BRISTUFF_TARGET_DIR) \
CC=$(TARGET_CC) LD=$(TARGET_LD) \
KINCLUDES=$(BT_LINUX_DIR)/include \
ZAP="-I../../../zaptel/zaptel $(BT_COPT_FLAGS)" \
BUILDVER=linux24 \
all ; \
cp -a -f $(BRISTUFF_DIR)/$$mod/$$mod.o \
$(BRISTUFF_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/ ; \
done
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(BRISTUFF_TARGET_DIR)/usr/lib/*.so.*
-$(BT_STRIP) --strip-unneeded \
$(BRISTUFF_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/*.o
cp -a -f $(BRISTUFF_TARGET_DIR)/usr/include/libgsmat.h
$(BT_STAGING_DIR)/usr/include/
cp -a -f $(BRISTUFF_TARGET_DIR)/usr/lib/libgsmat.*
$(BT_STAGING_DIR)/usr/lib/
cp -a -f
$(BRISTUFF_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/*.o \
$(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/
$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F
$(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map
$(BT_KERNEL_RELEASE)
touch $(BRISTUFF_DIR)/.build
source: $(BRISTUFF_DIR)/.source
build: $(BRISTUFF_DIR)/.build
clean:
-$(MAKE) -C $(LIBGSM_DIR) clean
-for mod in $(BRISTUFF_MODULES) ; do \
$(MAKE) -C $(BRISTUFF_DIR)/$$mod clean ; \
done
rm -f $(BT_STAGING_DIR)/usr/lib/libgsmat.*
rm -f $(BT_STAGING_DIR)/usr/include/libgsmat.h
rm -rf $(BRISTUFF_TARGET_DIR)
rm -f $(BRISTUFF_DIR)/.build
srcclean:
rm -rf $(BRISTUFF_DIR)
--- NEW FILE: bristuff-rediff.patch ---
--- bristuff-0.3.0-PRE-1s.orig/patches/asterisk.patch 2006-08-10
16:14:56.000000000 +0200
+++ bristuff-0.3.0-PRE-1s/patches/asterisk.patch 2006-09-18
09:37:17.258596484 +0200
@@ -2,8 +2,8 @@
--- 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.10
-+1.2.10-BRIstuffed-0.3.0-PRE-1s
+-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
@@ -1631,10 +1631,11 @@
if (cnf->chan) {
cnf->fd = cnf->chan->fds[0]; /* for use by
conf_play() */
} else {
-@@ -823,8 +823,9 @@
+@@ -823,9 +823,10 @@
char exitcontext[AST_MAX_CONTEXT] = "";
char recordingtmp[AST_MAX_EXTENSION] = "";
- int dtmf;
+ int dtmf, opt_waitmarked_timeout = 0;
+ time_t timeout = 0;
+ int dyna_buff = CONF_SIZE;
ZT_BUFFERINFO bi;
- char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
@@ -8525,7 +8526,7 @@
/* Make sure extension exists (or in
overlap dial mode, can exist) */
if ((pri->overlapdial &&
ast_canmatch_extension(NULL, pri->pvts[chanpos]->context,
pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) ||
ast_exists_extension(NULL,
pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1,
pri->pvts[chanpos]->cid_num)) {
-@@ -8464,22 +9293,38 @@
+@@ -8464,23 +9293,39 @@
res =
zt_setlaw(pri->pvts[chanpos]->subs[SUB_REAL].zfd, law);
if (res < 0)
ast_log(LOG_WARNING,
"Unable to set law on channel %d\n", pri->pvts[chanpos]->channel);
@@ -8537,12 +8538,13 @@
+ }
if (res < 0)
ast_log(LOG_WARNING,
"Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
-- if (e->ring.complete ||
!pri->overlapdial)
+- if (e->ring.complete ||
!pri->overlapdial) {
+ if ((pri->nodetype !=
BRI_NETWORK_PTMP) && (pri->nodetype != BRI_NETWORK)) {
+ if (e->ring.complete ||
!pri->overlapdial) {
/* Just announce
proceeding */
+
pri->pvts[chanpos]->proceeding = 1;
pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
-- else {
+- } else {
+ //
pri->pvts[chanpos]->ignoredtmf = 0;
+ } else {
if (pri->switchtype !=
PRI_SWITCH_GR303_TMC)
@@ -13421,7 +13423,7 @@
int pid;
char *stringp;
AGI agi;
-@@ -2041,15 +2117,18 @@
+@@ -2041,16 +2117,19 @@
}
}
#endif
@@ -13434,7 +13436,8 @@
+ agi.audio_out = efd;
+ agi.audio_in = efd2;
res = run_agi(chan, argv[0], &agi, pid, dead);
- close(fds[1]);
+ if (fds[1] != fds[0])
+ close(fds[1]);
if (efd > -1)
close(efd);
+ if (efd2 > -1)
--- NEW FILE: bristuff-0.3.0-PRE-1s.tar.gz ---
(This appears to be a binary file; contents omitted.)
-------------------------------------------------------------------------
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
