[asterisk-commits] bebuild: tag 1.8.7.0-rc2 r336635 - in /tags/1.8.7.0-rc2: ./ apps/ channels/ i...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Sep 19 11:57:44 CDT 2011


Author: bebuild
Date: Mon Sep 19 11:57:40 2011
New Revision: 336635

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336635
Log:
Merge changes related to the release of Asterisk 1.8.7.0-rc2.

Modified:
    tags/1.8.7.0-rc2/   (props changed)
    tags/1.8.7.0-rc2/ChangeLog
    tags/1.8.7.0-rc2/apps/app_meetme.c
    tags/1.8.7.0-rc2/channels/chan_dahdi.c
    tags/1.8.7.0-rc2/configure
    tags/1.8.7.0-rc2/configure.ac
    tags/1.8.7.0-rc2/include/asterisk/autoconfig.h.in
    tags/1.8.7.0-rc2/sounds/Makefile   (props changed)

Propchange: tags/1.8.7.0-rc2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 19 11:57:40 2011
@@ -1,1 +1,2 @@
 /be/branches/C.3:256426
+/branches/1.8:335714,335851,335911

Modified: tags/1.8.7.0-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.0-rc2/ChangeLog?view=diff&rev=336635&r1=336634&r2=336635
==============================================================================
--- tags/1.8.7.0-rc2/ChangeLog (original)
+++ tags/1.8.7.0-rc2/ChangeLog Mon Sep 19 11:57:40 2011
@@ -1,3 +1,54 @@
+2011-09-19  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 1.8.7.0-rc2 Released.
+
+	* r335851 | rmudgett | 2011-09-14 10:53:25 -0500 (Wed, 14 Sep 2011) |
+	11 lines
+
+	Fixed cut-n-paste regression using the wrong variable.
+
+	Fixes the missing DAHDI channels when using the newer chan_dahdi.conf
+	sections for channel configuration.
+
+	(closes issue ASTERISK-18496)
+
+	* r335911 | rmudgett | 2011-09-14 13:21:35 -0500 (Wed, 14 Sep 2011) |
+	13 lines
+
+	Remove unnecessary libpri dependency checks in the configure script.
+
+	Using the --with-pri option with the configure script generated an
+	error
+	about not having PRI_L2_PERSISTENCE if you did not have the absolute
+	latest libpri SVN checkout installed.
+
+	The AST_EXT_LIB_SETUP_DEPENDENT macro in the configure.ac script seems
+	to
+	be for libraries that are dependent upon other libraries and not
+	necessarily for optional/added features within a library.
+
+	(closes issue ASTERISK-18535)
+
+	* r336572 | lmadsen | 2011-09-19 10:41:16 -0500 (Mon, 19 Sep 2011) | 7
+	lines
+
+	Update get_ilbc_source.sh script to work again.
+
+	Recently iLBC support in Asterisk has changed after the acquisition of
+	GIPS
+	by Google. More information about how this may affect you is available
+	in a
+	blog post at:
+
+	  http://blogs.asterisk.org/2011/09/19/ilbc-support-in-asterisk-after-googles-acquisition-of-gips/
+
+	* r335714 | pabelanger | 2011-09-13 16:30:18 -0500 (Tue, 13 Sep 2011)
+	| 4 lines
+
+	Meetme should have 'core' support level
+
+	(closes issue ASTERISK-18542)
+
 2011-09-07  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 1.8.7.0-rc1 Released.

Modified: tags/1.8.7.0-rc2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.0-rc2/apps/app_meetme.c?view=diff&rev=336635&r1=336634&r2=336635
==============================================================================
--- tags/1.8.7.0-rc2/apps/app_meetme.c (original)
+++ tags/1.8.7.0-rc2/apps/app_meetme.c Mon Sep 19 11:57:40 2011
@@ -31,8 +31,7 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
-	<support_level>deprecated</support_level>
-	<replacement>app_confbridge</replacement>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"

Modified: tags/1.8.7.0-rc2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.0-rc2/channels/chan_dahdi.c?view=diff&rev=336635&r1=336634&r2=336635
==============================================================================
--- tags/1.8.7.0-rc2/channels/chan_dahdi.c (original)
+++ tags/1.8.7.0-rc2/channels/chan_dahdi.c Mon Sep 19 11:57:40 2011
@@ -18018,7 +18018,7 @@
 			continue;
 		}
 
-		chans = ast_variable_retrieve(ucfg, cat, "dahdichan");
+		chans = ast_variable_retrieve(cfg, cat, "dahdichan");
 		if (ast_strlen_zero(chans)) {
 			/* Section is useless without a dahdichan value present. */
 			continue;

Modified: tags/1.8.7.0-rc2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.0-rc2/configure.ac?view=diff&rev=336635&r1=336634&r2=336635
==============================================================================
--- tags/1.8.7.0-rc2/configure.ac (original)
+++ tags/1.8.7.0-rc2/configure.ac Mon Sep 19 11:57:40 2011
@@ -408,26 +408,6 @@
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_L2_PERSISTENCE], [ISDN Layer 2 persistence option], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_MWI], [ISDN PRI Message Waiting Indication], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_MCID], [ISDN PRI Malicious Call ID], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_WAITING], [ISDN PRI call waiting supplementary service], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_AOC_EVENTS], [ISDN PRI advice of charge supplementary service events], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_TRANSFER], [ISDN PRI call transfer supplementary service], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_CCSS], [ISDN PRI call completion supplementary service], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_HANGUP_FIX], [ISDN PRI hangup fix], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_SUBADDR], [ISDN PRI subaddressing], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_HOLD], [ISDN PRI call hold], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_REROUTING], [ISDN PRI call rerouting and call deflection], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_SETUP_KEYPAD], [ISDN PRI keypad facility in SETUP], [PRI], [pri])
-# ------------------------------------v
-# TODO: The code can be changed to always include these features now.
-# These features will always be present if pri_connected_line_update is available.
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
-AST_EXT_LIB_SETUP_DEPENDENT([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
-# ------------------------------------^
 AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
 AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
 AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])

Modified: tags/1.8.7.0-rc2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.0-rc2/include/asterisk/autoconfig.h.in?view=diff&rev=336635&r1=336634&r2=336635
==============================================================================
--- tags/1.8.7.0-rc2/include/asterisk/autoconfig.h.in (original)
+++ tags/1.8.7.0-rc2/include/asterisk/autoconfig.h.in Mon Sep 19 11:57:40 2011
@@ -557,59 +557,6 @@
 /* Define to 1 if you have the ISDN PRI library. */
 #undef HAVE_PRI
 
-/* Define to 1 if you have the ISDN PRI advice of charge supplementary service
-   events library. */
-#undef HAVE_PRI_AOC_EVENTS
-
-/* Define to 1 if you have the ISDN PRI call hold library. */
-#undef HAVE_PRI_CALL_HOLD
-
-/* Define to 1 if you have the ISDN PRI call rerouting and call deflection
-   library. */
-#undef HAVE_PRI_CALL_REROUTING
-
-/* Define to 1 if you have the ISDN PRI call waiting supplementary service
-   library. */
-#undef HAVE_PRI_CALL_WAITING
-
-/* Define to 1 if you have the ISDN PRI call completion supplementary service
-   library. */
-#undef HAVE_PRI_CCSS
-
-/* Define to 1 if you have the ISDN PRI hangup fix library. */
-#undef HAVE_PRI_HANGUP_FIX
-
-/* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
-#undef HAVE_PRI_INBANDDISCONNECT
-
-/* Define to 1 if you have the ISDN Layer 2 persistence option library. */
-#undef HAVE_PRI_L2_PERSISTENCE
-
-/* Define to 1 if you have the ISDN PRI Malicious Call ID library. */
-#undef HAVE_PRI_MCID
-
-/* Define to 1 if you have the ISDN PRI Message Waiting Indication library. */
-#undef HAVE_PRI_MWI
-
-/* Define to 1 if you have the ISDN progress with cause library. */
-#undef HAVE_PRI_PROG_W_CAUSE
-
-/* Define to 1 if you have the ISDN reverse charge library. */
-#undef HAVE_PRI_REVERSE_CHARGE
-
-/* Define to 1 if you have the ISDN service messages library. */
-#undef HAVE_PRI_SERVICE_MESSAGES
-
-/* Define to 1 if you have the ISDN PRI keypad facility in SETUP library. */
-#undef HAVE_PRI_SETUP_KEYPAD
-
-/* Define to 1 if you have the ISDN PRI subaddressing library. */
-#undef HAVE_PRI_SUBADDR
-
-/* Define to 1 if you have the ISDN PRI call transfer supplementary service
-   library. */
-#undef HAVE_PRI_TRANSFER
-
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
@@ -822,16 +769,16 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_CR_UID
 
-/* Define to 1 if `uid' is a member of `struct ucred'. */
+/* Define to 1 if `uid' is member of `struct ucred'. */
 #undef HAVE_STRUCT_UCRED_UID
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1106,11 +1053,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1130,6 +1077,11 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
+
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+   second argument and the buffer pointer as the third, as on System V before
+   release 3. */
+#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1166,49 +1118,53 @@
 /* Define to a type of the same size as fd_set.fds_bits[[0]] */
 #undef TYPEOF_FD_SET_FDS_BITS
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
+/* Define to 1 if running on Darwin. */
+#undef _DARWIN_UNLIMITED_SELECT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define to 1 if running on Darwin. */
-#undef _DARWIN_UNLIMITED_SELECT
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Propchange: tags/1.8.7.0-rc2/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 19 11:57:40 2011
@@ -1,2 +1,3 @@
 /be/branches/C.3/sounds/Makefile:256426
+/branches/1.8/sounds/Makefile:335714,335851,335911
 /trunk/sounds/Makefile:270974




More information about the asterisk-commits mailing list