Merge pull request #2724 from signalwire/khomp

[mod_khomp] Remove from tree

Author: andywolk

LICENSE

@@ -1484,18 +1484,6 @@ Copyright: 2010 Ilnitskiy Mixim ([email protected])
  2010 Georgiewskiy Yuriy ([email protected])
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_khomp/*
-Copyright: 2007-2010 Khomp Ind. & Com.
-License: MPL-1.1 or LGPL-2.1+
-
-Files: src/mod/endpoints/mod_khomp/mod_khomp.cpp
-Copyright: 2005-2014, Anthony Minessale II <[email protected]>
-License: MPL-1.1
-
-Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-Copyright: 1998 Doug Rabson
-License: BSD-2-clause
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1

build/modules.conf.in

@@ -71,7 +71,6 @@ dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
 #endpoints/mod_h323
-#endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
 endpoints/mod_rtc

build/modules.conf.most

@@ -70,7 +70,6 @@ dialplans/mod_dialplan_xml
 directories/mod_ldap
 #endpoints/mod_alsa
 #endpoints/mod_h323
-#endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
 endpoints/mod_rtc

conf/vanilla/autoload_configs/modules.conf.xml

@@ -41,7 +41,6 @@
     <!-- <load module="mod_woomera"/> -->
     <!-- <load module="mod_freetdm"/> -->
     <!-- <load module="mod_skinny"/> -->
-    <!-- <load module="mod_khomp"/>   -->
     <load module="mod_rtc"/>
     <!-- <load module="mod_rtmp"/>   -->
     <load module="mod_verto"/>

configure.ac

@@ -1079,7 +1079,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
 fi
 
 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
-# Untested modules : mod_osp mod_opal mod_h323 mod_khomp 
+# Untested modules : mod_osp mod_opal mod_h323
 #                    mod_erlang_event mod_snmp mod_perl mod_java mod_managed
 #
 #saved_CFLAGS="$CFLAGS"
@@ -2160,7 +2160,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/directories/mod_ldap/Makefile
 		src/mod/endpoints/mod_alsa/Makefile
 		src/mod/endpoints/mod_h323/Makefile
-		src/mod/endpoints/mod_khomp/Makefile
 		src/mod/endpoints/mod_loopback/Makefile
 		src/mod/endpoints/mod_opal/Makefile
 		src/mod/endpoints/mod_reference/Makefile

debian/bootstrap.sh

@@ -43,7 +43,6 @@ avoid_mods=(
   codecs/mod_siren
   codecs/mod_skel_codec
   endpoints/mod_h323
-  endpoints/mod_khomp
   endpoints/mod_opal
   endpoints/mod_reference
   event_handlers/mod_smpp

debian/control-modules

@@ -365,10 +365,6 @@ Description: mod_h323
  Adds mod_h323.
 Build-Depends: libopenh323-dev | libh323plus-dev, libpt-dev
 
-Module: endpoints/mod_khomp
-Description: mod_khomp
- Adds mod_khomp.
-
 Module: endpoints/mod_loopback
 Description: mod_loopback
  Adds mod_loopback.

debian/copyright

@@ -1484,18 +1484,6 @@ Copyright: 2010 Ilnitskiy Mixim ([email protected])
  2010 Georgiewskiy Yuriy ([email protected])
 License: MPL-1.1
 
-Files: src/mod/endpoints/mod_khomp/*
-Copyright: 2007-2010 Khomp Ind. & Com.
-License: MPL-1.1 or LGPL-2.1+
-
-Files: src/mod/endpoints/mod_khomp/mod_khomp.cpp
-Copyright: 2005-2014, Anthony Minessale II <[email protected]>
-License: MPL-1.1
-
-Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-Copyright: 1998 Doug Rabson
-License: BSD-2-clause
-
 Files: src/mod/languages/mod_java/modjava.c
 Copyright: 2007, Damjan Jovanovic <d a m j a n d o t j o v a t g m a i l d o t c o m>
 License: MPL-1.1

debian/license-reconcile.yml

@@ -149,18 +149,6 @@ Rules:
    Matches: const\schar\s\*\scopyright\s;
    Copyright: 1999-2009 Erik de Castro Lopo <[email protected]>
    Justification: prevent false-psitive copyright detection
-  -
-   Glob: src/mod/endpoints/mod_khomp/*
-   Matches: The\scontents\sof\sthis\sfile\sare\ssubject\sto\sthe\sMozilla\sPublic\sLicense\sVersion\s1.1
-   Matches: Alternatively,\sthe\scontents\sof\sthis\sfile\smay\sbe\sused\sunder\sthe\sterms\sof\sthe
-   Matches: GNU\sLesser\sGeneral\sPublic\sLicense\s2\.1.\slicense\s\(the\s.LGPL.\sLicense\),\sin\swhich
-   Matches: version\s2\.1\sof\sthe\sLicense,\sor\s\(at\syour\soption\)\sany\slater\sversion.
-   License: MPL-1.1 or LGPL-2.1+
-  -
-   Glob: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
-   Matches: Original\scopyright\sfollows[:]
-   Matches: Copyright\s\(c\)\s1998\sDoug\sRabson
-   Copyright: 1998 Doug Rabson
   -
    Glob: libs/esl/getopt/getopt_long.c
    Matches: This\scode\sis\sderived\sfrom\ssoftware\scontributed\sto\sThe\sNetBSD\sFoundation

freeswitch.spec

@@ -747,14 +747,6 @@ PostgreSQL native support for FreeSWITCH.
 #%description endpoint-h323
 #H.323 endpoint support for FreeSWITCH open source telephony platform
 
-#%package endpoint-khomp
-#Summary:        khomp endpoint support for FreeSWITCH open source telephony platform
-#Group:          System/Libraries
-#Requires:       %{name} = %{version}-%{release}
-#
-#%description endpoint-khomp
-#Khomp hardware endpoint support for FreeSWITCH open source telephony platform.
-
 %package endpoint-rtmp
 Summary:        RTPM Endpoint support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -1300,7 +1292,7 @@ ENDPOINTS_MODULES=" \
 			endpoints/mod_loopback endpoints/mod_rtmp \
 			endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia"
 
-## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_h323 endpoints/mod_khomp 
+## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_h323
 
 ######################################################################################################################
 #
@@ -2009,9 +2001,6 @@ fi
 #%files endpoint-h323
 #%{MODINSTDIR}/mod_h323.so*
 
-#%files endpoint-khomp
-#%{MODINSTDIR}/mod_khomp.so*
-
 %files endpoint-rtmp
 %{MODINSTDIR}/mod_rtmp.so*