Module: sip-router Branch: pd/websocket Commit: 6d751215160cddb96dd16b33bd668d573a61b3d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d751215...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Tue Jul 3 16:57:50 2012 +0100

pkg/kamailio/(centos|fedora): Tweaked .spec and .appl files to add WebSocket support

---

pkg/kamailio/centos/6/kamailio-build.appl | 8 +++++--- pkg/kamailio/centos/6/kamailio.appl | 3 ++- pkg/kamailio/fedora/16/kamailio-build.appl | 8 +++++--- pkg/kamailio/fedora/16/kamailio.appl | 3 ++- pkg/kamailio/fedora/16/kamailio.spec | 16 ++++++++-------- pkg/kamailio/fedora/17/kamailio-build.appl | 8 +++++--- pkg/kamailio/fedora/17/kamailio.appl | 3 ++- 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index d3faee1..d4b23b5 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -8,18 +8,20 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp - flex # kamailio - - gcc # kamailio + - gcc + - git - glib2-devel # kamailio-purple - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -27,7 +29,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl index 2e6980d..5462ead 100644 --- a/pkg/kamailio/centos/6/kamailio.appl +++ b/pkg/kamailio/centos/6/kamailio.appl @@ -17,12 +17,13 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index 1193dc3..141375a 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -8,7 +8,7 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio @@ -16,7 +16,8 @@ packages: - expat-devel # kamailio-xmpp - flex # kamailio - GeoIP-devel # kamailio-GeoIP - - gcc # kamailio + - gcc + - git - glib-devel # kamailio-purple - hiredis-devel # kamailio-redis - json-c-devel # kamailio-json @@ -24,6 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -32,7 +34,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index f65ecd2..ec7ede0 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -21,13 +21,14 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 95f13e4..675dbbb 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -351,15 +351,15 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops"\ %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops" %endif

@@ -373,8 +373,8 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops"

mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -388,8 +388,8 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops"

mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index 4b194d4..9b1c1ef 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -8,7 +8,7 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio @@ -16,7 +16,8 @@ packages: - expat-devel # kamailio-xmpp - flex # kamailio - GeoIP-devel # kamailio-GeoIP - - gcc # kamailio + - gcc + - git - glib-devel # kamailio-purple - hiredis-devel # kamailio-redis - json-c-devel # kamailio-json @@ -24,6 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -32,7 +34,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index e71964a..70a850d 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -21,13 +21,14 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl