backport chan_modem fixes from v1-2

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7129 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e1073e5c..37caadb19 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* Asterisk 1.2.0 released.
+	
 2005-11-16  Jeremy McNamara <jj@nufone.net>
 
 	* apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
@@ -10,7 +14,8 @@
 2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* channels/Makefile: don't build chan_modem and sub-modules by default
-
+	* configs/modules.conf.sample: explicitly 'noload' chan_modem.so and submodules, in case old versions exist
+	
 	* res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
 
 	* apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763)
diff --git a/channels/Makefile b/channels/Makefile
index 82844f1e5..a4139bba2 100755
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -61,7 +61,9 @@ endif
 ifneq (${OSARCH},Darwin)
   ifneq (${OSARCH},SunOS)
     ifneq (${OSARCH},CYGWIN)
-      CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so 
+# the ISDN4Linux channel driver is probably broken on all modern kernels,
+# but if you wish to try to use it, uncomment the line below
+#      CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so 
     endif
   endif
 endif
diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
index bf8d00677..418433688 100755
--- a/configs/modules.conf.sample
+++ b/configs/modules.conf.sample
@@ -31,10 +31,14 @@ noload => pbx_kdeconsole.so
 ;
 noload => app_intercom.so
 ;
-; Explicitly load the chan_modem.so early on to be sure
-; it loads before any of the chan_modem_* 's afte rit
+; The 'modem' channel driver and its subdrivers are
+; obsolete, don't load them.
+;
+noload => chan_modem.so
+noload => chan_modem_aopen.so
+noload => chan_modem_bestdata.so
+noload => chan_modem_i4l.so
 ;
-;load => chan_modem.so
 load => res_musiconhold.so
 ;
 ; Load either OSS or ALSA, not both
@@ -47,4 +51,3 @@ noload => chan_alsa.so
 ; exported to modules loaded after them.
 ;
 [global]
-;chan_modem.so=yes