# HG changeset patch # User Michael Schloh von Bennewitz # Date 1332446566 -3600 # Node ID 751f89d647ed09055326cf216ee9941c687c31c7 # Parent 633675dc493ca83b5f84e0f765963cdb2600451e Correct, reduce, and improve buildconf, and update to new vendor version. diff -r 633675dc493c -r 751f89d647ed kamailio/kamailio.spec --- a/kamailio/kamailio.spec Thu Mar 22 20:53:42 2012 +0100 +++ b/kamailio/kamailio.spec Thu Mar 22 21:02:46 2012 +0100 @@ -1,6 +1,6 @@ ## ## kamailio.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2011 Michael Schloh von Bennewitz +## Copyright (c) 2012 Michael Schloh von Bennewitz ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,8 +31,8 @@ Class: PLUS Group: VoIP License: GPL -Version: 3.1.5 -Release: 20111001 +Version: 3.2.2 +Release: 20120208 # package options %option with_cons yes @@ -48,6 +48,7 @@ %option with_mysql no %option with_osp no %option with_pgsql no +%option with_sqlite no %option with_odbc no %option with_geoip no %option with_lua no @@ -211,10 +212,28 @@ %{l_shtool} subst \ -e 's;\(-keyout.*\);\1 || true;' \ modules/tls/sip-router_cert.sh + %{l_shtool} subst \ + -e 's;^#! */bin/bash;#! %{l_prefix}/bin/bash;' \ + -e 's; /\(etc/kamailio\); %{l_prefix}/\1;' \ + -e 's;-f /usr/local/etc/kamailio/kamctlrc;false;' \ + -e 's; /usr/local/etc/kamailio/kamctlrc;unleash-betty-boop;' \ + -e 's;-f ~/.kamctlrc;false;g' \ + -e 's;-f ./kamctlrc;false;g' \ + -e 's;\(ETCDIR="\)/usr/local/\(etc/kamailio"\);\1%{l_prefix}/\2;' \ + -e 's;PATH=\$PATH:/usr/local/sbin;PATH=%{l_prefix}/sbin:$PATH;' \ + -e 's;\(MYLIBDIR="\)/usr/local/\(lib/kamailio/kamctl"\);\1%{l_prefix}/\2;' \ + utils/kamctl/kam*ctl + %{l_shtool} subst \ + -e 's;/var/run/\(kamailio.pid\);%{l_prefix}/var/kamailio/\1;g' \ + utils/kamctl/kamctl.base \ + utils/kamctl/kamctlrc + %{l_shtool} subst \ + -e 's;\(#include.*\)memcache\.h;\1libmemcached/memcached.h;' \ + modules_k/memcached/memcached.h %build # select modules - modslist='acc alias_db auth auth_identity avp avpops avp_db benchmark blst call_control cfgutils cfg_db cfg_rpc counters cpl-c ctl db_text db_flatstore db_ops debugger dialog dialplan dispatcher diversion domain domainpolicy drouting eval exec enum fifo gflags group htable identity imc kex lcr malloc_test mangler matrix maxfwd mi_datagram mi_fifo mi_rpc mediaproxy mqueue msilo mtree nathelper nat_traversal options path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route presence presence_conference presence_dialoginfo presence_mwi presence_xml privacy pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp pv qos ratelimit regex registrar rr rls rtimer rtpproxy sanity seas siptrace siputils sl sms speeddial sqlops sst statistics textops textopsx timer tm tmx topoh uac uac_redirect uri uri_db userblacklist usrloc utils xcap xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp' + modslist='acc alias_db auth auth_identity avp avpops avp_db benchmark blst call_control cfgutils cfg_db cfg_rpc counters cpl-c ctl db_text db_flatstore db_ops debugger dialog dialplan dispatcher diversion domain domainpolicy drouting eval exec enum fifo gflags group htable imc kex lcr malloc_test mangler matrix maxfwd mi_datagram mi_fifo mi_rpc mediaproxy mqueue msilo mtree nathelper nat_traversal options path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route presence presence_b2b presence_conference presence_dialoginfo presence_mwi presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp pv qos ratelimit regex registrar rr rls rtimer rtpproxy sanity sdpops seas sipcapture siptrace siputils sl sms speeddial sqlops sst statistics textops textopsx timer tm tmx topoh uac uac_redirect uri uri_db userblacklist usrloc utils xcap xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp' %if "%{with_ssl}" == "yes" modslist="$modslist tls" %endif @@ -245,6 +264,9 @@ %if "%{with_pgsql}" == "yes" modslist="$modslist db_postgres" %endif +%if "%{with_sqlite}" == "yes" + modslist="$modslist db_sqlite" +%endif %if "%{with_odbc}" == "yes" modslist="$modslist db_unixodbc" %endif @@ -262,6 +284,9 @@ %{l_make} %{l_mflags} \ CC="%{l_cc}" \ FLAVOUR=kamailio \ + DESTDIR=$RPM_BUILD_ROOT \ + INSTALL="%{l_shtool} install -c" \ + TAR="tar" \ %if "%{with_sctp}" == "yes" SCTP=1 \ %endif @@ -316,7 +341,7 @@ rm -rf $RPM_BUILD_ROOT # select modules - modslist='acc alias_db auth auth_identity avp avpops avp_db benchmark blst call_control cfgutils cfg_db cfg_rpc counters cpl-c ctl db_text db_flatstore db_ops debugger dialog dialplan dispatcher diversion domain domainpolicy drouting eval exec enum fifo gflags group htable identity imc kex lcr malloc_test mangler matrix maxfwd mi_datagram mi_fifo mi_rpc mediaproxy mqueue msilo mtree nathelper nat_traversal options path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route presence presence_conference presence_dialoginfo presence_mwi presence_xml privacy pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp pv qos ratelimit regex registrar rr rls rtimer rtpproxy sanity seas siptrace siputils sl sms speeddial sqlops sst statistics textops textopsx timer tm tmx topoh uac uac_redirect uri uri_db userblacklist usrloc utils xcap xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp' + modslist='acc alias_db auth auth_identity avp avpops avp_db benchmark blst call_control cfgutils cfg_db cfg_rpc counters cpl-c ctl db_text db_flatstore db_ops debugger dialog dialplan dispatcher diversion domain domainpolicy drouting eval exec enum fifo gflags group htable imc kex lcr malloc_test mangler matrix maxfwd mi_datagram mi_fifo mi_rpc mediaproxy mqueue msilo mtree nathelper nat_traversal options path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route presence presence_b2b presence_conference presence_dialoginfo presence_mwi presence_reginfo presence_xml pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp pv qos ratelimit regex registrar rr rls rtimer rtpproxy sanity sdpops seas sipcapture siptrace siputils sl sms speeddial sqlops sst statistics textops textopsx timer tm tmx topoh uac uac_redirect uri uri_db userblacklist usrloc utils xcap xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp' %if "%{with_ssl}" == "yes" modslist="$modslist tls" %endif @@ -362,24 +387,13 @@ # install program, utils, and modules %{l_make} %{l_mflags} \ - INSTALL="%{l_shtool} install -c" \ - INSTALL_CFG="%{l_shtool} install -c" \ - INSTALL_BIN="%{l_shtool} install -c" \ - INSTALL_SCRIPT="%{l_shtool} install -c" \ - INSTALL_MODULES="%{l_shtool} install -c" \ - INSTALL_LIB="%{l_shtool} install -c" \ - INSTALL_DOC="%{l_shtool} install -c" \ - INSTALL_MAN="%{l_shtool} install -c" \ - INSTALL_SHARE="%{l_shtool} install -c" \ - basedir=$RPM_BUILD_ROOT \ - prefix=%{l_prefix} \ - doc-dir=share/kamailio/doc \ - man-dir=man \ - data-dir=share/kamailio \ include_modules="$modslist" \ skip_modules="" \ install + # pare unused documentation + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/kamailio/docmodules* + # strip down installation strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true diff -r 633675dc493c -r 751f89d647ed kamailio/rc.kamailio --- a/kamailio/rc.kamailio Thu Mar 22 20:53:42 2012 +0100 +++ b/kamailio/rc.kamailio Thu Mar 22 21:02:46 2012 +0100 @@ -34,12 +34,12 @@ %start -u @l_susr@ rcService kamailio enable yes || exit 0 rcService kamailio active yes && exit 0 - @l_prefix@/sbin/kamailioctl start + @l_prefix@/sbin/kamctl start %stop -u @l_susr@ rcService kamailio enable yes || exit 0 rcService kamailio active no && exit 0 - @l_prefix@/sbin/kamailioctl stop + @l_prefix@/sbin/kamctl stop rm -f $kamailio_pidfile 2>/dev/null || true sleep 2