Changeset 3279

Show
Ignore:
Timestamp:
07/19/07 02:31:03 (1 year ago)
Author:
wbx
Message:

some more cleanup of zaptel package
sync with asterisk upstream
fix misdnuser package

this commit is sponsored by ClubMate?, which keeps my eyes open.

@ms: verified to work with our beronet card... no oops anymore :}

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/asterisk-12/Makefile

    r3239 r3279  
    88 
    99PKG_NAME:=              asterisk 
    10 PKG_VERSION:=           1.2.21.1 
    11 PKG_RELEASE:=           2 
    12 PKG_MD5SUM:=            c0b86be1fcb84bdb54a8946e765ab0fd 
     10PKG_VERSION:=           1.2.22 
     11PKG_RELEASE:=           1 
     12PKG_MD5SUM:=            1e0f25a9914c1fc8c9339a1a414119be 
    1313MASTER_SITES:=          http://ftp.digium.com/pub/asterisk/old-releases/ \ 
    1414                        ftp://ftp.digium.com/pub/asterisk/old-releases/ 
    …… 
    6565MAKE_FLAGS+=            WITHOUT_ZAPTEL=1 
    6666endif 
    67 ifneq (${FWRT_PACKAGE_ASTERISK_12_MISDN},) 
    68 MAKE_FLAGS+=            WITH_MISDN=1 
     67ifeq (${FWRT_PACKAGE_ASTERISK_12_CHAN_MISDN},) 
     68MAKE_FLAGS+=            WITHOUT_MISDN=1 
    6969endif 
    7070INSTALL_STYLE:=         auto 

  • trunk/freewrt/package/asterisk-12/patches/patch-channels_Makefile

    r3220 r3279  
    33        substitute crappy static paths with the right variable 
    44 
    5 --- asterisk-1.2.21.1.orig/channels/Makefile   2007-03-26 12:21:56.000000000 +0200 
    6 +++ asterisk-1.2.21.1/channels/Makefile        2007-07-16 07:02:44.000000000 +0200 
    7 @@ -83,7 +83,7 @@ ifneq ($(wildcard h323/libchanh323.a),) 
     5--- asterisk-1.2.22.orig/channels/Makefile     2007-07-11 19:15:11.000000000 +0200 
     6+++ asterisk-1.2.22/channels/Makefile  2007-07-19 00:48:12.000000000 +0200 
     7@@ -87,7 +87,7 @@ ifneq ($(wildcard h323/libchanh323.a),) 
    88   CHANNEL_LIBS+=chan_h323.so 
    99 endif 
    1010  
    1111-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),) 
    12 +ifeq ($(WITH_MISDN),1) 
     12+ifneq ($(WITHOUT_MISDN),1) 
    1313   CHANNEL_LIBS+=chan_misdn.so 
    1414   CFLAGS+=-Imisdn   
    1515 endif 
    16 @@ -245,7 +245,7 @@ misdn/chan_misdn_lib.a: 
     16@@ -249,7 +249,7 @@ misdn/chan_misdn_lib.a: 
    1717        make CROSS_COMPILE_TARGET=$(CROSS_COMPILE_TARGET) -C misdn 
    1818  

  • trunk/freewrt/package/asterisk-12/patches/patch-channels_misdn_Makefile

    r2114 r3279  
    33        make misdn support build correctly 
    44 
    5 --- asterisk-1.2.15.orig/channels/misdn/Makefile       2006-08-17 23:57:19.000000000 +0200 
    6 +++ asterisk-1.2.15/channels/misdn/Makefile    2007-02-28 19:25:08.000000000 +0100 
    7 @@ -18,11 +18,11 @@ all: chan_misdn_lib.a  
     5--- asterisk-1.2.22.orig/channels/misdn/Makefile       2007-03-26 12:21:56.000000000 +0200 
     6+++ asterisk-1.2.22/channels/misdn/Makefile    2007-07-19 00:48:12.000000000 +0200 
     7@@ -21,11 +21,11 @@ all: chan_misdn_lib.a  
    88  
    99  

  • trunk/freewrt/package/asterisk-12/patches/patch-dns_c

    r1815 r3279  
    11$FreeWRT$ 
    2 --- asterisk-1.2.14.orig/dns.c 2005-11-29 19:24:39.000000000 +0100 
    3 +++ asterisk-1.2.14/dns.c      2007-01-28 15:36:08.000000000 +0100 
    4 @@ -175,7 +175,13 @@ static int dns_parse_answer(void *contex 
     2--- asterisk-1.2.22.orig/dns.c 2007-07-16 22:46:58.000000000 +0200 
     3+++ asterisk-1.2.22/dns.c      2007-07-19 01:09:18.000000000 +0200 
     4@@ -234,10 +234,16 @@ static int dns_parse_answer(void *contex 
    55  
    66 #if defined(res_ninit) 
    77 #define HAS_RES_NINIT 
    8 -#else 
    98+#endif 
    109+ 
    …… 
    1312+#endif 
    1413+ 
     14 #if defined(res_ndestroy) 
     15 #define HAS_RES_NDESTROY 
     16 #endif 
     17-#else 
    1518+#ifndef HAS_RES_NINIT 
    1619 AST_MUTEX_DEFINE_STATIC(res_lock); 

  • trunk/freewrt/package/asterisk-12/patches/patch-utils_c

    r1815 r3279  
    11$FreeWRT$ 
    2 --- asterisk-1.2.14.orig/utils.c       2006-10-31 07:18:36.000000000 +0100 
    3 +++ asterisk-1.2.14/utils.c    2007-01-28 18:32:11.000000000 +0100 
    4 @@ -835,7 +835,6 @@ uint64_t strtoq(const char *nptr, char * 
     2--- asterisk-1.2.22.orig/utils.c       2007-02-26 01:34:31.000000000 +0100 
     3+++ asterisk-1.2.22/utils.c    2007-07-19 00:48:12.000000000 +0200 
     4@@ -837,7 +837,6 @@ uint64_t strtoq(const char *nptr, char * 
    55 } 
    66 #endif /* !HAVE_STRTOQ */ 
    …… 
    1010 /* Alternative method of getting load avg on Linux only */ 
    1111 int getloadavg(double *list, int nelem) 
    12 @@ -869,7 +868,6 @@ int getloadavg(double *list, int nelem) 
     12@@ -871,7 +870,6 @@ int getloadavg(double *list, int nelem) 
    1313        return -1; 
    1414 } 

  • trunk/freewrt/package/misdnuser/Makefile

    r2988 r3279  
    99PKG_NAME:=              mISDNuser 
    1010PKG_VERSION:=           1.1.4 
    11 PKG_RELEASE:=           1 
     11PKG_RELEASE:=           2 
    1212PKG_MD5SUM:=            9bfbafce0230d12f14c43e764aab9c8b 
    1313MASTER_SITES:=          http://www.misdn.org/downloads/releases/ 
    …… 
    1717include ${TOPDIR}/mk/package.mk 
    1818 
    19 $(eval $(call PKG_template,MISDNUSER,mISDNuser,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
     19$(eval $(call PKG_template,MISDNUSER,misdnuser,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2020 
    2121BUILD_STYLE:=           auto 

  • trunk/freewrt/package/misdnuser/ipkg/misdnuser.control

    r2114 r3279  
    11Package: misdnuser 
    22Priority: optional 
    3 Section: misc 
     3Section: telephony 
    44Description: The Modular ISDN Stack