debdiff kamailio_4.2.0-1.dsc kamailio_4.2.0-1.1.dsc
diff -Nru kamailio-4.2.0/debian/changelog kamailio-4.2.0/debian/changelog
--- kamailio-4.2.0/debian/changelog 2014-10-21 22:17:18.000000000 +0100
+++ kamailio-4.2.0/debian/changelog 2014-11-13 10:48:35.000000000 +0000
@@ -1,3 +1,14 @@
+kamailio (4.2.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS on mipsel and mips.
+ Add mips/mipsel arch in debian/control.
+ Disable the Mono module on mips in debian/rules (like it is on ia64).
+ Add fix-mips.patch Patch by Dejan Latinovic <dejan.latino...@imgtec.com>
+ Closes: #767500.
+
+ -- Anibal Monsalve Salazar <ani...@debian.org> Thu, 13 Nov 2014 10:48:28
+0000
+
kamailio (4.2.0-1) unstable; urgency=medium
* [8774ae4] Imported Upstream version 4.2.0
diff -Nru kamailio-4.2.0/debian/control kamailio-4.2.0/debian/control
--- kamailio-4.2.0/debian/control 2014-10-21 22:17:18.000000000 +0100
+++ kamailio-4.2.0/debian/control 2014-10-31 08:33:57.000000000 +0000
@@ -23,7 +23,7 @@
libldap2-dev,
liblua5.1-0-dev,
libmemcached-dev,
- libmono-2.0-dev [!ia64],
+ libmono-2.0-dev [!ia64 !mips],
libmysqlclient-dev,
libncurses5-dev,
libpcre3-dev,
@@ -51,7 +51,7 @@
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-voip/kamailio.git
Package: kamailio
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: adduser, python, ${misc:Depends}, ${shlibs:Depends}
@@ -94,7 +94,7 @@
Package: kamailio-dbg
Priority: extra
Section: debug
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -107,7 +107,7 @@
modules. You only need to install it if you need to debug Kamailio.
Package: kamailio-geoip-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -120,7 +120,7 @@
use GeoIP API within configuration file.
Package: kamailio-sqlite-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -133,7 +133,7 @@
This package provides the SQLite database driver for Kamailio.
Package: kamailio-json-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -146,7 +146,7 @@
and the JSON-RPC client over netstrings.
Package: kamailio-memcached-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -160,7 +160,7 @@
server, a high-performance, distributed memory object caching system.
Package: kamailio-lua-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -173,7 +173,7 @@
execute embedded Lua applications within configuration file.
Package: kamailio-mono-modules
-Architecture: amd64 armel i386 powerpc ppc64 s390x
+Architecture: amd64 armel i386 powerpc ppc64 s390x mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -186,7 +186,7 @@
execute embedded Mono applications within configuration file.
Package: kamailio-python-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -202,7 +202,7 @@
execute embedded Python applications within configuration file.
Package: kamailio-redis-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -214,7 +214,7 @@
This package provides the Redis NOSQL database driver for Kamailio.
Package: kamailio-mysql-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -229,7 +229,7 @@
This package provides the MySQL database driver for Kamailio.
Package: kamailio-postgres-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -244,7 +244,7 @@
This package provides the PostgreSQL database driver for Kamailio.
Package: kamailio-cpl-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -257,7 +257,7 @@
Kamailio, turning Kamailio into a CPL server (storage and interpreter).
Package: kamailio-radius-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -271,7 +271,7 @@
RADIUS server.
Package: kamailio-unixodbc-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -283,7 +283,7 @@
This package provides the unixODBC database driver for Kamailio.
Package: kamailio-presence-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -297,7 +297,7 @@
external triggered presence and XCAP support.
Package: kamailio-perl-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -310,7 +310,7 @@
the perlvdb database driver for Kamailio.
Package: kamailio-snmpstats-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}),
@@ -326,7 +326,7 @@
as an AgentX subagent which connects to a master agent.
Package: kamailio-xmpp-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -338,7 +338,7 @@
This package provides the SIP to XMPP IM translator module for Kamailio.
Package: kamailio-xml-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -355,7 +355,7 @@
- xmlops module for XPath operations in configuration file
Package: kamailio-carrierroute-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -368,7 +368,7 @@
solution for routing, balancing and blacklisting.
Package: kamailio-berkeley-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: db-util (>= 4.6.19),
@@ -385,7 +385,7 @@
in files, no additional server is necessary.
Package: kamailio-berkeley-bin
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -399,7 +399,7 @@
install kamailio-berkeley-modules and not this package directly.
Package: kamailio-ldap-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -413,7 +413,7 @@
directory.
Package: kamailio-ims-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
@@ -426,7 +426,7 @@
to run as an IMS core.
Package: kamailio-utils-modules
-Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x
+Architecture: amd64 armel i386 ia64 powerpc ppc64 s390x mips mipsel
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
diff -Nru kamailio-4.2.0/debian/patches/fix-mips.patch
kamailio-4.2.0/debian/patches/fix-mips.patch
--- kamailio-4.2.0/debian/patches/fix-mips.patch 1970-01-01
01:00:00.000000000 +0100
+++ kamailio-4.2.0/debian/patches/fix-mips.patch 2014-11-13
10:48:25.000000000 +0000
@@ -0,0 +1,51 @@
+Date: Thu, 30 Oct 2014 12:46:42 +0000
+From: Dejan Latinovic <dejan.latino...@imgtec.com>
+Subject: fix for kamailio
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767500
+
+package kamailio FTBFS on mipsel with an error:
+> gcc: error: unrecognized command line option '-minline-all-stringops'
+
+https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=mipsel&ver=4.2.0-1&stamp=1414487406
+
+The patch below fixes this issue.
+
+Index: kamailio-4.2.0/Makefile.defs
+===================================================================
+--- kamailio-4.2.0.orig/Makefile.defs
++++ kamailio-4.2.0/Makefile.defs
+@@ -1360,12 +1360,13 @@ ifeq ($(CC_NAME), gcc)
+ CFLAGS= -mips2 $(CC_OPT) -funroll-loops
$(PROFILE)
+ #if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+- CFLAGS+=-minline-all-stringops
-ftree-vectorize \
+- -fno-strict-overflow
++ CFLAGS+=-ftree-vectorize
-fno-strict-overflow
++ # not supported on mips: -minline-all-stringops
+ else
+ #if gcc 4.0+
+ ifeq ($(CC_SHORTVER), 4.x)
+- CFLAGS+=-minline-all-stringops
-ftree-vectorize
++ CFLAGS+=-ftree-vectorize
++ # not supported on mips: -minline-all-stringops
+ else
+ #if gcc 3.4+
+ ifeq ($(CC_SHORTVER), 3.4)
+@@ -1405,12 +1406,13 @@ ifeq ($(CC_NAME), gcc)
+ CFLAGS= -mips64 $(CC_OPT) -funroll-loops
$(PROFILE)
+ #if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+- CFLAGS+=-minline-all-stringops
-ftree-vectorize \
+- -fno-strict-overflow
++ CFLAGS+=-ftree-vectorize
-fno-strict-overflow
++ # not supported on mips64: -minline-all-stringops
+ else
+ #if gcc 4.0+
+ ifeq ($(CC_SHORTVER), 4.x)
+- CFLAGS+=-minline-all-stringops
-ftree-vectorize
++ CFLAGS+=-ftree-vectorize
++ # not supported on mips64: -minline-all-stringops
+ else
+ #if gcc 3.4+
+ ifeq ($(CC_SHORTVER), 3.4)
diff -Nru kamailio-4.2.0/debian/patches/series
kamailio-4.2.0/debian/patches/series
--- kamailio-4.2.0/debian/patches/series 2014-10-21 22:17:18.000000000
+0100
+++ kamailio-4.2.0/debian/patches/series 2014-10-31 08:09:45.000000000
+0000
@@ -2,3 +2,4 @@
no_INSTALL_file.patch
fix_export.patch
default_fifo.patch
+fix-mips.patch
diff -Nru kamailio-4.2.0/debian/rules kamailio-4.2.0/debian/rules
--- kamailio-4.2.0/debian/rules 2014-10-21 22:17:18.000000000 +0100
+++ kamailio-4.2.0/debian/rules 2014-10-31 08:07:55.000000000 +0000
@@ -50,6 +50,8 @@
override EXCLUDED_MODULES += mono
else ifeq ($(DEB_HOST_ARCH),sparc)
override EXCLUDED_MODULES += mono
+else ifeq ($(DEB_HOST_ARCH),mips)
+ override EXCLUDED_MODULES += mono
else
override PACKAGE_GROUPS+= mono
endif
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
