[Pkg-voip-commits] r10159 - in /kamailio/trunk/debian/patches: ./ upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Wed May 8 08:27:26 UTC 2013
Author: maniac-guest
Date: Wed May 8 08:27:25 2013
New Revision: 10159
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10159
Log:
Added upstream fixes
Added:
kamailio/trunk/debian/patches/upstream/0014-tls-fix-compiler-warning.patch
kamailio/trunk/debian/patches/upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch
kamailio/trunk/debian/patches/upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch
kamailio/trunk/debian/patches/upstream/0020-snmpstats-fix-typo-in-Makefile.patch
kamailio/trunk/debian/patches/upstream/0021-snmpstats-fix-cross-compilation.patch
Modified:
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=10159&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Wed May 8 08:27:25 2013
@@ -11,6 +11,14 @@
upstream/0011-seas-fix-warning-Wunused-result.patch
upstream/0012-auth_diameter-remove-unused-but-set-variable.patch
upstream/0013-auth_diameter-remove-unused-but-set-variable.patch
+upstream/0014-tls-fix-compiler-warning.patch
+upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch
+upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
+upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
+upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
+upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch
+upstream/0020-snmpstats-fix-typo-in-Makefile.patch
+upstream/0021-snmpstats-fix-cross-compilation.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0014-tls-fix-compiler-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0014-tls-fix-compiler-warning.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0014-tls-fix-compiler-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0014-tls-fix-compiler-warning.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,36 @@
+From 56b8856f84aebd86c4e78232f8f2f37fead7b4f3 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Sat, 13 Apr 2013 15:37:18 -0400
+Subject: [PATCH] =?UTF-8?q?tls:=20fix=20compiler=20warning=20=20-=20tls=5Fco?=
+ =?UTF-8?q?nfig.c:61:19:=20warning:=20=E2t.val.s=E2=20is=20used=20uninitiali?=
+ =?UTF-8?q?zed=20in=20this=20function=20[-Wuninitialized]?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ modules/tls/tls_config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c
+index fc4a9c0..0083893 100644
+--- a/modules/tls/tls_config.c
++++ b/modules/tls/tls_config.c
+@@ -58,13 +58,13 @@ static int parse_ipv6(struct ip_addr* ip, cfg_token_t* token,
+ struct ip_addr* ipv6;
+ str ip6_str;
+
+- ip6_str.s = t.val.s;
+ while(1) {
+ ret = cfg_get_token(&t, st, 0);
+ if (ret != 0) goto err;
+ if (t.type == ']') break;
+ if (t.type != CFG_TOKEN_ALPHA && t.type != ':') goto err;
+ }
++ ip6_str.s = t.val.s;
+ ip6_str.len = (int)(long)(t.val.s - ip6_str.s);
+
+ ipv6 = str2ip6(&ip6_str);
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0015-p_usrloc-commenting-out-unused-db_timer_udomain-to-g.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,48 @@
+From 5f9d169e797425b0501de42ba2af196018166c71 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:23:49 -0400
+Subject: [PATCH] p_usrloc: commenting out unused db_timer_udomain() to get
+ rid of compiler warnings
+
+---
+ modules/p_usrloc/udomain.c | 2 ++
+ modules/p_usrloc/udomain.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/modules/p_usrloc/udomain.c b/modules/p_usrloc/udomain.c
+index 73824d7..a1ab4d9 100644
+--- a/modules/p_usrloc/udomain.c
++++ b/modules/p_usrloc/udomain.c
+@@ -589,6 +589,7 @@ done:
+ * \param _d cleaned domain
+ * \return 0 on success, -1 on failure
+ */
++/*
+ int db_timer_udomain(udomain_t* _d)
+ {
+ db_key_t keys[2];
+@@ -611,6 +612,7 @@ int db_timer_udomain(udomain_t* _d)
+ //if (ul_db_layer_delete(_d, NULL, NULL, keys, ops, vals, 2) < 0) { //FIXME
+ return 0;
+ }
++*/
+
+
+
+diff --git a/modules/p_usrloc/udomain.h b/modules/p_usrloc/udomain.h
+index bbdda0f..c46a121 100644
+--- a/modules/p_usrloc/udomain.h
++++ b/modules/p_usrloc/udomain.h
+@@ -95,7 +95,9 @@ void print_udomain(FILE* _f, udomain_t* _d);
+ * \param _d cleaned domain
+ * \return 0 on success, -1 on failure
+ */
++/*
+ int db_timer_udomain(udomain_t* _d);
++*/
+
+
+ /*!
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0016-kamailio-utils-sercmd-remove-unused-but-set-variable.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,34 @@
+From 24e4d3dbd79ccb2e42aabcaaa17e391dc60d36d9 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:13:27 -0400
+Subject: [PATCH] kamailio/utils/sercmd: remove unused but set variable
+ (cherry picked from commit
+ ff94115921a08ba4da29baf2761db47bd0b7f8f5)
+
+---
+ utils/sercmd/sercmd.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c
+index 1e5606b..49b76b5 100644
+--- a/utils/sercmd/sercmd.c
++++ b/utils/sercmd/sercmd.c
+@@ -2158,7 +2158,6 @@ int main(int argc, char** argv)
+ int sock_type;
+ int s;
+ struct binrpc_cmd cmd;
+- int rec;
+ struct id_list* sock_id;
+ char* format;
+ int interactive;
+@@ -2169,7 +2168,6 @@ int main(int argc, char** argv)
+ format=0;
+ line=0;
+ interactive=0;
+- rec=1;
+ s=-1;
+ sock_name=0;
+ port_no=0;
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0017-kamailio-utils-sercmd-remove-unused-but-set-variable.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,34 @@
+From 320bf55cbfea89b145d41c938f75a7bf70f40613 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:15:08 -0400
+Subject: [PATCH] kamailio/utils/sercmd: remove unused but set variable
+ (cherry picked from commit
+ b7a41ef47ad5d7fa90e577673cc2f38ab5ef2237)
+
+---
+ utils/sercmd/sercmd.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c
+index 49b76b5..55ed3d4 100644
+--- a/utils/sercmd/sercmd.c
++++ b/utils/sercmd/sercmd.c
+@@ -2154,7 +2154,6 @@ int main(int argc, char** argv)
+ {
+ int c;
+ char* sock_name;
+- int port_no;
+ int sock_type;
+ int s;
+ struct binrpc_cmd cmd;
+@@ -2170,7 +2169,6 @@ int main(int argc, char** argv)
+ interactive=0;
+ s=-1;
+ sock_name=0;
+- port_no=0;
+ sock_type=UNIXS_SOCK;
+ opterr=0;
+ while((c=getopt(argc, argv, "UVhs:D:R:vf:"))!=-1){
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0018-kamailio-utils-sercmd-remove-unused-but-set-variable.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,41 @@
+From f92eee8eecab6d0fa505011b20a57dea242fa982 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:16:27 -0400
+Subject: [PATCH] kamailio/utils/sercmd: remove unused but set variable
+ (cherry picked from commit
+ 67609608aa4306de9a34a28a3a31880ad0d17e8e)
+
+---
+ utils/sercmd/sercmd.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c
+index 55ed3d4..90dfcb7 100644
+--- a/utils/sercmd/sercmd.c
++++ b/utils/sercmd/sercmd.c
+@@ -2159,14 +2159,12 @@ int main(int argc, char** argv)
+ struct binrpc_cmd cmd;
+ struct id_list* sock_id;
+ char* format;
+- int interactive;
+ char* line;
+ char* l;
+
+ quit=0;
+ format=0;
+ line=0;
+- interactive=0;
+ s=-1;
+ sock_name=0;
+ sock_type=UNIXS_SOCK;
+@@ -2273,7 +2271,6 @@ int main(int argc, char** argv)
+ sock_id=0;
+
+ if (optind>=argc){
+- interactive=1;
+ /*fprintf(stderr, "ERROR: no command specified\n");
+ goto error; */
+ }else{
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0019-snmpstats-Add-disabled-section-in-Makefile-for-compi.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,42 @@
+From f86be5e0aa282dc58680f28d01161437901fa2c8 Mon Sep 17 00:00:00 2001
+From: "Olle E. Johansson" <oej at edvina.net>
+Date: Sat, 6 Apr 2013 22:02:48 +0200
+Subject: [PATCH] snmpstats Add disabled section in Makefile for compilation
+ on Centos systems
+
+Net-SNMP and snmpd can be built with embedded perl and libwrap support. If that's
+the case on your system you need to enable the EMBEDDED_PERL section in the
+Makefile. Maybe this could be enabled automatically.
+(cherry picked from commit 7bbf8fece2cc93c5b1ddd2c3dcc12e8a920dd54d)
+---
+ modules/snmpstats/Makefile | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile
+index f518ba6..0086ef1 100644
+--- a/modules/snmpstats/Makefile
++++ b/modules/snmpstats/Makefile
+@@ -15,6 +15,20 @@ else
+ INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
+ endif
+
++ifeq($(EMBEDDED_PERL),1)
++#
++# Enable this part if you compile on Centos 5 or another system that has a
++# packaged snmpd with embedded perl and libwrap support
++#
++BUILDAGENTLIBS += -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE \
++ -L/usr/local/lib /usr/lib/perl5/5.8.8/i386-linux-thread-multi/auto/DynaLoader/DynaLoader.a \
++ -L/usr/lib/perl5/5.8.8/i386-linux-thread-multi/CORE \
++ -lperl -lresolv -lnsl -ldl -lm -lcrypt -lutil -lpthread -lc \
++ -lwrap \
++ -lsensors \
++ -lrpmdb -lrpm
++endif
++
+ CFLAGS+=
+ auto_gen=
+ NAME=snmpstats.so
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0020-snmpstats-fix-typo-in-Makefile.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0020-snmpstats-fix-typo-in-Makefile.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0020-snmpstats-fix-typo-in-Makefile.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0020-snmpstats-fix-typo-in-Makefile.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,26 @@
+From 70ab195f753956a3f891d992787a76c2c4ff643b Mon Sep 17 00:00:00 2001
+From: "Olle E. Johansson" <oej at edvina.net>
+Date: Sat, 6 Apr 2013 22:04:51 +0200
+Subject: [PATCH] snmpstats fix typo in Makefile. (cherry picked from commit
+ bddf66407ef7521f3d1f1e941b4c1e104e59d1ef)
+
+---
+ modules/snmpstats/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile
+index 0086ef1..2d4af2a 100644
+--- a/modules/snmpstats/Makefile
++++ b/modules/snmpstats/Makefile
+@@ -15,7 +15,7 @@ else
+ INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
+ endif
+
+-ifeq($(EMBEDDED_PERL),1)
++ifeq ($(EMBEDDED_PERL),1)
+ #
+ # Enable this part if you compile on Centos 5 or another system that has a
+ # packaged snmpd with embedded perl and libwrap support
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0021-snmpstats-fix-cross-compilation.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0021-snmpstats-fix-cross-compilation.patch?rev=10159&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0021-snmpstats-fix-cross-compilation.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0021-snmpstats-fix-cross-compilation.patch Wed May 8 08:27:25 2013
@@ -1,0 +1,44 @@
+From 55f7def6b4ed889a27a19164faa0dd7f854fa983 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 25 Apr 2013 14:50:41 -0400
+Subject: [PATCH] snmpstats: fix cross-compilation (cherry picked from commit
+ 5e96920289cbf448ac684d8cb1333d75f65a729a)
+
+---
+ modules/snmpstats/Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile
+index 2d4af2a..2fd7f6c 100644
+--- a/modules/snmpstats/Makefile
++++ b/modules/snmpstats/Makefile
+@@ -3,8 +3,13 @@
+ # WARNING: do not run this directly, it should be run by the master Makefile
+
+ include ../../Makefile.defs
++auto_gen=
++NAME=snmpstats.so
+
++ifeq ($(CROSS_COMPILE),)
+ BUILDER = $(shell which net-snmp-config)
++endif
++
+ ifeq ($(BUILDER),)
+ DEFS +=-I$(LOCALBASE)/include
+ BUILDAGENTLIBS =-L$(LOCALBASE)/lib -lnetsnmpmibs -lnetsnmpagent \
+@@ -29,12 +34,8 @@ BUILDAGENTLIBS += -Wl,-E -Wl,-rpath,/usr/lib/perl5/5.8.8/i386-linux-thread-multi
+ -lrpmdb -lrpm
+ endif
+
+-CFLAGS+=
+-auto_gen=
+-NAME=snmpstats.so
+ LIBS=$(BUILDAGENTLIBS)
+
+-
+ DEFS+=-DKAMAILIO_MOD_INTERFACE
+
+ SERLIBPATH=../../lib
+--
+1.7.10.4
+
More information about the Pkg-voip-commits
mailing list