update asterisk 1.2.x to 1.2.24, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8739 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
2007-09-11 06:37:56 +00:00
parent 48578bc336
commit 7ad5b78d24
6 changed files with 561 additions and 461 deletions

View File

@ -1,10 +1,10 @@
diff -Nru asterisk-1.2.14.org/dns.c asterisk-1.2.14/dns.c
--- asterisk-1.2.14.org/dns.c 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/dns.c 2006-12-27 08:50:05.000000000 +0100
@@ -175,7 +175,13 @@
#if defined(res_ninit)
#define HAS_RES_NINIT
diff -Nru asterisk-1.2.24.org/dns.c asterisk-1.2.24/dns.c
--- asterisk-1.2.24.org/dns.c 2007-07-16 22:46:58.000000000 +0200
+++ asterisk-1.2.24/dns.c 2007-09-04 18:53:32.000000000 +0200
@@ -237,7 +237,13 @@
#if defined(res_ndestroy)
#define HAS_RES_NDESTROY
#endif
-#else
+#endif
+

View File

@ -1,15 +1,26 @@
diff -Nru asterisk-1.2.14.org/channels/h323/Makefile asterisk-1.2.14/channels/h323/Makefile
--- asterisk-1.2.14.org/channels/h323/Makefile 2005-11-29 19:24:39.000000000 +0100
+++ asterisk-1.2.14/channels/h323/Makefile 2006-12-27 09:22:09.000000000 +0100
@@ -30,7 +30,7 @@
diff -Nru asterisk-1.2.24.org/channels/Makefile asterisk-1.2.24/channels/Makefile
--- asterisk-1.2.24.org/channels/h323/Makefile 2007-03-06 16:17:16.000000000 +0100
+++ asterisk-1.2.24/channels/h323/Makefile 2007-09-04 18:37:58.000000000 +0200
@@ -21,9 +21,8 @@
OPENH323DIR=$(HOME)/openh323
endif
-clean:
- rm -f *.so *.o .depend
-
+include $(OPENH323DIR)/openh323u.mak
+
$(SOURCES):: $(SOURCES:.cxx=.cpp)
ln -f $< $@
@@ -31,7 +30,6 @@
touch $(SOURCES)
libchanh323.a: $(OBJS)
- ar crv $@ $(OBJS)
+ $(AR) crv $@ $(OBJS)
- include $(OPENH323DIR)/openh323u.mak
ar crv $@ $(OBJS)
Makefile.ast: FORCE
@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