[Pkg-voip-commits] r9793 - in /kamailio/trunk/debian: control patches/series patches/upstream/lua.patch rules
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Mon Jun 11 07:17:45 UTC 2012
Author: maniac-guest
Date: Mon Jun 11 07:17:44 2012
New Revision: 9793
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9793
Log:
fix lua module built. Added again
Added:
kamailio/trunk/debian/patches/upstream/lua.patch
Modified:
kamailio/trunk/debian/control
kamailio/trunk/debian/patches/series
kamailio/trunk/debian/rules
Modified: kamailio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/control?rev=9793&op=diff
==============================================================================
--- kamailio/trunk/debian/control (original)
+++ kamailio/trunk/debian/control Mon Jun 11 07:17:44 2012
@@ -17,6 +17,7 @@
libgeoip-dev (>= 1.4.5),
libjson0-dev,
libldap2-dev,
+ liblua5.1-0-dev,
libmemcache-dev,
libmysqlclient-dev,
libncurses5-dev,
@@ -46,7 +47,7 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser
Replaces: openser
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-python-modules, kamailio-redis-modules
+Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-python-modules, kamailio-redis-modules, kamailio-lua-modules
Description: very fast and configurable SIP proxy
Kamailio is a very fast and flexible SIP (RFC3261)
proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -132,6 +133,19 @@
This package provides the memcached module, an interface to the memcached
server, a high-performance, distributed memory object caching system.
+Package: kamailio-lua-modules
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
+Description: contains the app_lua module
+ Kamailio is a very fast and flexible SIP (RFC3261)
+ proxy server. Written entirely in C, Kamailio can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the app_lua module, an extension allowing to
+ execute embedded Lua applications within configuration file.
+
Package: kamailio-python-modules
Architecture: any
Multi-Arch: same
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9793&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Mon Jun 11 07:17:44 2012
@@ -8,6 +8,7 @@
upstream/0008-modules_k-auth_radius-fixed-typo-in-README.patch
upstream/0009-rtpproxy-handle-UPDATE-in-rtpproxy_manage.patch
upstream/0010-modules_k-registrar-Fixed-memory-leak-in-reg_fetch_c.patch
+upstream/lua.patch
multiarch_support.patch
no_INSTALL_file.patch
spelling-errors.patch
Added: kamailio/trunk/debian/patches/upstream/lua.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/lua.patch?rev=9793&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/lua.patch (added)
+++ kamailio/trunk/debian/patches/upstream/lua.patch Mon Jun 11 07:17:44 2012
@@ -1,0 +1,72 @@
+X-Git-Url: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blobdiff_plain;f=modules%2Fapp_lua%2FMakefile;h=7e407a508566eec07760c863dbce03313d15e72f;hp=11e29a8e610d6767b29ec8f92bfba7dcf359d866;hb=master;hpb=558dea003f05078699fb41d66d51d2999b2d7cf2
+
+diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile
+index 11e29a8..7e407a5 100644
+--- a/modules/app_lua/Makefile
++++ b/modules/app_lua/Makefile
+@@ -1,6 +1,4 @@
+-# $Id: Makefile 2 2005-06-13 16:47:24Z bogdan_iancu $
+-#
+-# print example module makefile
++# $Id$
+ #
+ #
+ # WARNING: do not run this directly, it should be run by the master Makefile
+@@ -16,30 +14,39 @@ ifeq ($(BUILDER),)
+ LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
+ ifeq ($(LUA51),)
+ DEFS+=-I/usr/include/lua
+- LIBS= -llua
++ LIBS= -llua -lm
+ else
+ DEFS+=-I/usr/include/lua5.1
+- LIBS= -llua5.1
++ LIBS= -llua5.1 -lm
+ endif
+ else
+- LUANAME=lua
+- LUALIBS = $(shell pkg-config --silence-errors --libs ${LUANAME})
++ LUAVER=XX
++ LUALIBS = $(shell pkg-config --silence-errors --libs lua)
+ ifeq ($(LUALIBS),)
+- LUANAME=lua5.1
+- LUALIBS = $(shell pkg-config --silence-errors --libs ${LUANAME})
++ LUALIBS = $(shell pkg-config --silence-errors --libs lua5.1)
++ ifneq ($(LUALIBS),)
++ LUAVER=51
++ endif
++ else
++ LUAVER=5X
+ endif
+- ifeq ($(LUALIBS),)
++ ifeq ($(LUAVER),XX)
+ LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1)
+ ifeq ($(LUA51),)
+ DEFS+=-I/usr/include/lua
+- LIBS= -llua
++ LIBS= -llua -lm
+ else
+ DEFS+=-I/usr/include/lua5.1
+- LIBS= -llua5.1
++ LIBS= -llua5.1 -lm
+ endif
+ else
+- DEFS+= $(shell pkg-config --cflags ${LUANAME})
+- LIBS = $(shell pkg-config --libs ${LUANAME})
++ ifeq ($(LUAVER),51)
++ DEFS+= $(shell pkg-config --cflags lua5.1 | sed -e "s/\\\\/'/" -e "s/\\\\\"/\"'/")
++ LIBS = $(shell pkg-config --libs lua5.1)
++ else
++ DEFS+= $(shell pkg-config --cflags lua)
++ LIBS = $(shell pkg-config --libs lua)
++ endif
+ endif
+ endif
+ else
+@@ -51,6 +58,5 @@ DEFS+=-DOPENSER_MOD_INTERFACE
+
+ SERLIBPATH=../../lib
+ SER_LIBS+=$(SERLIBPATH)/kcore/kcore
+-LIBS+=-lm
+
+ include ../../Makefile.modules
Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9793&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Mon Jun 11 07:17:44 2012
@@ -20,7 +20,7 @@
# extra modules to skip, because they are not compilable now
# - regardless if they go to the main kamailio package or to some module package,
# they will be excluded from compile and install of all
-EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa rls iptrtpproxy mi_xmlrpc purple lua
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa rls iptrtpproxy mi_xmlrpc purple
#EXTRA_EXCLUDED_MODULES=
# module groups that are packaged in seperate packages
@@ -30,7 +30,7 @@
PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
ldap xml perl utils memcached \
snmpstats carrierroute xmpp cpl python geoip\
- sqlite json redis
+ sqlite json redis lua
# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
More information about the Pkg-voip-commits
mailing list