[Pkg-voip-commits] [kamailio] 03/06: removed previous upstream patches and old debian patches
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Mon Mar 10 13:09:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository kamailio.
commit 5dfc30dcd950114ea70a991b5880b4896474929f
Author: Victor Seva <vseva at sipwise.com>
Date: Mon Mar 10 11:54:14 2014 +0100
removed previous upstream patches and old debian patches
---
...tect-JAVA_HOME-and-use-proper-libgcj-vers.patch | 33 ---
debian/patches/hardening_flags.patch | 28 ---
debian/patches/multiarch_support.patch | 27 ---
debian/patches/series | 5 -
debian/patches/spelling_errors.patch | 229 ---------------------
...stats-use-share_prefix-for-deploying-MIBS.patch | 33 ---
...uth-Fix-for-SIP-Digest-Segmentation-fault.patch | 100 ---------
...ar_scscf-Fix-memory-corruption-in-build_c.patch | 127 ------------
...ixed-path-for-deploying-mibs-when-net-snm.patch | 27 ---
9 files changed, 609 deletions(-)
diff --git a/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch b/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
deleted file mode 100644
index 55a8465..0000000
--- a/debian/patches/app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63a887eac53c7fb3edcd0dcb815f5bb53fa256b4 Mon Sep 17 00:00:00 2001
-From: Victor Seva <linuxmaniac at torreviejawireless.org>
-Date: Thu, 12 Dec 2013 08:53:59 +0100
-Subject: [PATCH] app_java: detect JAVA_HOME and use proper libgcj versioning
-
----
- modules/app_java/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/modules/app_java/Makefile
-+++ b/modules/app_java/Makefile
-@@ -15,14 +15,17 @@
- DEFS += $(shell pkg-config libgcj-4.4 --cflags)
- LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm
- else
--# for now is hard coded, will resolve this later
--JAVA_HOME ?= /usr/lib/jvm/java-gcj-4.7
--DEFS += $(shell pkg-config libgcj-4.7 --cflags) -I$(JAVA_HOME)/include
--LIBS += $(shell pkg-config libgcj-4.7 --libs) -L$(JAVA_HOME)/lib -ljvm
-+# try to detect JAVA_HOME
-+JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::")
-+DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include
-+LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib -ljvm
-
- ifeq ($(OS), freebsd)
- LIBS+=-pthread
- endif
-+ifeq ($(OS), linux)
-+DEFS += -I$(JAVA_HOME)/include/linux
-+endif
- endif
-
- # disable optimisation for segfaults debugging
diff --git a/debian/patches/hardening_flags.patch b/debian/patches/hardening_flags.patch
deleted file mode 100644
index 7437e1a..0000000
--- a/debian/patches/hardening_flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Do pass hardening {C,CPP,LD}FLAGS
-Author: Tzafrir Cohen <tzafrir at debian.org>
-
-Make sure that the *FLAGS variables set by dpkg-buildflags make it to kamailio:
-* add CPPFLAGS to CFLAGS
-* Don't reset CFLAGS and LDFLAGS
-
---- a/Makefile.defs
-+++ b/Makefile.defs
-@@ -855,8 +855,6 @@ ifeq ($(use_fast_lock), yes)
- found_lock_method=yes
- endif
-
--CFLAGS=
--LDFLAGS=
- C_INCLUDES=
- # setting CFLAGS
- ifeq ($(mode), release)
---- a/Makefile
-+++ b/Makefile
-@@ -563,6 +563,7 @@ config.mak: Makefile.defs
- @echo "# this file is autogenerated by make cfg" >$@
- @$(call mapf2,cfg_save_var,saved_fixed_vars,$(@))
- @$(call mapf2,cfg_save_var2,saved_chg_vars,$(@))
-+ @echo "CFLAGS += $(CPPFLAGS)" >>$@
- @echo "override makefile_defs:=1" >>$@
- @echo "C_DEFS:=\$$(filter-out \$$(DEFS_RM) \$$(extra_defs),\$$(C_DEFS))" \
- "\$$(extra_defs)" >>$@
diff --git a/debian/patches/multiarch_support.patch b/debian/patches/multiarch_support.patch
deleted file mode 100644
index 957f4a2..0000000
--- a/debian/patches/multiarch_support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Use the multiarch libdir
-Author: Victor Seva <linuxmaniac at torreviejawireless.org>
-
-Use the multiarch libdir (rather than the lib64/ schema used by Upstream)
-
---- a/Makefile.defs
-+++ b/Makefile.defs
-@@ -411,15 +411,12 @@
- endif
- $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
-
--LIBDIR ?=
-+LIBDIR ?=
- ifeq ($(LIBDIR),)
--ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
--ifeq ($(ARCHBSZ),64b)
-- LIBDIR = lib64
--else
-- LIBDIR = lib
--endif
-+ ARCH_TRIPLET=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-+ LIBDIR = lib/$(ARCH_TRIPLET)
- endif
-+$(info LIBDIR <$(LIBDIR)>)
-
- # dirs
- cfg_dir = etc/$(MAIN_NAME)/
diff --git a/debian/patches/series b/debian/patches/series
index 4fd1736..097470b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-upstream/0001-snmpstats-use-share_prefix-for-deploying-MIBS.patch
-upstream/0002-ims_auth-Fix-for-SIP-Digest-Segmentation-fault.patch
-upstream/0003-ims_registrar_scscf-Fix-memory-corruption-in-build_c.patch
-upstream/0004-snmpstats-fixed-path-for-deploying-mibs-when-net-snm.patch
-app_java-detect-JAVA_HOME-and-use-proper-libgcj-vers.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
diff --git a/debian/patches/spelling_errors.patch b/debian/patches/spelling_errors.patch
deleted file mode 100644
index 0c1039c..0000000
--- a/debian/patches/spelling_errors.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Description: fix spelling errors on binaries
-Author: Victor Seva <linuxmaniac at torreviejawireless.org>
-
---- a/modules/cdp/diameter_peer.c
-+++ b/modules/cdp/diameter_peer.c
-@@ -417,8 +417,8 @@
- lock_release(shutdownx_lock);
- }
-
-- /* wait for all childs to clean up nicely (acceptor, receiver, timer, workers) */
-- LM_INFO("destroy_diameter_peer(): Terminating all childs...\n");
-+ /* wait for all children to clean up nicely (acceptor, receiver, timer, workers) */
-+ LM_INFO("destroy_diameter_peer(): Terminating all children...\n");
- while(pid_list->tail){
- pid = dp_last_pid();
- if (pid<=0||pid==getpid()){
---- a/modules/ims_auth/authims_mod.c
-+++ b/modules/ims_auth/authims_mod.c
-@@ -108,7 +108,7 @@
- /* fixed parameter storage */
- str scscf_name_str; /**< fixed name of the S-CSCF */
-
--/* used mainly in testing - load balancing with SIPP where we dont want to worry about auth */
-+/* used mainly in testing - load balancing with SIPP where we don't want to worry about auth */
- int ignore_failed_auth = 0;
-
- /*
---- a/modules/ims_auth/authorize.c
-+++ b/modules/ims_auth/authorize.c
-@@ -648,7 +648,7 @@
- LM_ERR("no matching auth vector found - maybe timer expired\n");
-
- if (ignore_failed_auth) {
-- LM_WARN("NB: Ignoring all failed auth - check your config if you dont expect this\n");
-+ LM_WARN("NB: Ignoring all failed auth - check your config if you don't expect this\n");
- ret = AUTH_OK;
- }
-
-@@ -783,7 +783,7 @@
- }
-
- if (ignore_failed_auth) {
-- LM_WARN("NB: Ignoring all failed auth - check your config if you dont expect this\n");
-+ LM_WARN("NB: Ignoring all failed auth - check your config if you don't expect this\n");
- ret = AUTH_OK;
- }
-
---- a/modules/ims_icscf/db.c
-+++ b/modules/ims_icscf/db.c
-@@ -343,7 +343,7 @@
- }
-
- if (res->n == 0) {
-- LM_DBG("DBG:ims_icscf_db_get_capabilities: No Capabilites found... not critical...\n");
-+ LM_DBG("DBG:ims_icscf_db_get_capabilities: No Capabilities found... not critical...\n");
- return 1;
- }
- else {
---- a/modules/ims_isc/mark.c
-+++ b/modules/ims_isc/mark.c
-@@ -155,7 +155,7 @@
- }
- break;
- default:
-- LM_ERR("isc_mark_get: unkown parameter found: %c !\n", x.s[i]);
-+ LM_ERR("isc_mark_get: unknown parameter found: %c !\n", x.s[i]);
- }
- i = j + 1;
- } else
---- a/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml
-+++ b/modules/iptrtpproxy/doc/iptrtpproxy_admin.xml
-@@ -27,7 +27,7 @@
-
- <para>
- This &kamailio; module is written as a light-weight module, there is no
-- dialog managment as in <emphasis>Nathelper</emphasis>. The reason is that such an API
-+ dialog management as in <emphasis>Nathelper</emphasis>. The reason is that such an API
- should be provided by core or a specialized dialog manager module.
- Because such module is not in git, session information may be stored
- in extra attributes of the <emphasis>avp_db</emphasis> module and
---- a/modules/mangler/contact_ops.c
-+++ b/modules/mangler/contact_ops.c
-@@ -369,7 +369,7 @@
- format->rcv_proto=s_sctp;
- break;
- default:
-- BUG("unkown proto %d\n", msg->rcv.proto);
-+ BUG("unknown proto %d\n", msg->rcv.proto);
- }
- }else{
- format->rcv_proto.s=0;
---- a/modules/presence/event_list.c
-+++ b/modules/presence/event_list.c
-@@ -255,7 +255,7 @@
- }
- EvList->ev_count++;
-
-- LM_DBG("succesfully added event: %.*s - len= %d\n",ev->name.len,
-+ LM_DBG("successfully added event: %.*s - len= %d\n",ev->name.len,
- ev->name.s, ev->name.len);
- done:
- free_event_params(parsed_event.params.list, PKG_MEM_TYPE);
---- a/modules/presence/hash.c
-+++ b/modules/presence/hash.c
-@@ -634,7 +634,7 @@
- if(presentity->event->get_rules_doc(&presentity->user, &presentity->domain,
- &xcap_doc)< 0)
- {
-- LM_ERR("failed to retreive xcap document\n");
-+ LM_ERR("failed to retrieve xcap document\n");
- ret= -1;
- goto done;
- }
---- a/modules/pua_mi/mi_func.c
-+++ b/modules/pua_mi/mi_func.c
-@@ -220,7 +220,7 @@
- publ.event= get_event_flag(&event);
- if(publ.event< 0)
- {
-- LM_ERR("unkown event\n");
-+ LM_ERR("unknown event\n");
- return init_mi_tree(400, "Unknown event", 13);
- }
- if(content_type.len!= 1)
-@@ -461,7 +461,7 @@
- subs.event= get_event_flag(&event);
- if(subs.event< 0)
- {
-- LM_ERR("unkown event\n");
-+ LM_ERR("unknown event\n");
- return init_mi_tree(400, "Unknown event", 13);
- }
-
---- a/modules/uid_avp_db/uid_avp_db.c
-+++ b/modules/uid_avp_db/uid_avp_db.c
-@@ -285,7 +285,7 @@
- uri_type_to_str(puri.type, &(load_uri_attrs_cmd->match[2].v.lstr));
-
- if (db_exec(&res, load_uri_attrs_cmd) < 0) {
-- ERR("Error while quering database\n");
-+ ERR("Error while querying database\n");
- return -1;
- }
-
-@@ -307,7 +307,7 @@
- }
-
- if (db_exec(&res, load_user_attrs_cmd) < 0) {
-- ERR("Error while quering database\n");
-+ ERR("Error while querying database\n");
- return -1;
- }
-
---- a/modules/xhttp_pi/xhttp_pi_fnc.c
-+++ b/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -2449,7 +2449,7 @@
- LM_DBG("[%.*s] has flags [%d]\n", key->len, key->s, flags);
- if(flags){
- XHTTP_PI_BUILD_REPLY(ctx,
-- "Unkown validation [%d] for %s.",
-+ "Unknown validation [%d] for %s.",
- table->cols[i].validation, key->s);
- goto done;
- }
---- a/utils/kamctl/kamctl.8
-+++ b/utils/kamctl/kamctl.8
-@@ -43,7 +43,7 @@
-
-
- .TP 16
--.I Access control list (acl) managment commands:
-+.I Access control list (acl) management commands:
- .TP
- .B acl show [<username>]
- Show user membership
-@@ -55,7 +55,7 @@
- Grant user membership(s) (*)
-
- .TP 16
--.I Least cost routes (lcr) managment command:
-+.I Least cost routes (lcr) management command:
- .TP
- .B lcr dump
- Show in memory gateways and routes tables
-@@ -64,7 +64,7 @@
- Reload lcr gateways and routes
-
- .TP 16
--.I Carrierroute tables('cr') managment commands:
-+.I Carrierroute tables('cr') management commands:
- .TP
- .B cr show
- Show tables
-@@ -88,7 +88,7 @@
- Remove a carrier
-
- .TP 16
--.I Remote-Party-ID (RPID) managment commands:
-+.I Remote-Party-ID (RPID) management commands:
- .TP
- .B rpid add <username> <rpid>
- Add rpid for a user (*)
-@@ -100,7 +100,7 @@
- Show rpid of a user
-
- .TP 16
--.I Subscriber managment commands:
-+.I Subscriber management commands:
- .TP
- .B add <username> <password>
- Add a new subscriber (*)
-@@ -130,7 +130,7 @@
- Remove all entres for the given src_ip
-
- .TP 16
--.I Dispatcher managment commands:
-+.I Dispatcher management commands:
- .TP
- .B dispatcher show
- Show dispatcher gateways
-@@ -154,7 +154,7 @@
- Restart phone configured for <uri>
-
- .TP 16
--.I User location('ul') or aliases managment commands:
-+.I User location('ul') or aliases management commands:
- .B ul show [<username>]
- Show in-RAM online users
- .TP
diff --git a/debian/patches/upstream/0001-snmpstats-use-share_prefix-for-deploying-MIBS.patch b/debian/patches/upstream/0001-snmpstats-use-share_prefix-for-deploying-MIBS.patch
deleted file mode 100644
index 2e50ae1..0000000
--- a/debian/patches/upstream/0001-snmpstats-use-share_prefix-for-deploying-MIBS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 620d9309a1bfe5e6f3ea0e93f40f267cd3f5f1bf Mon Sep 17 00:00:00 2001
-From: Daniel-Constantin Mierla <miconda at gmail.com>
-Date: Thu, 9 Jan 2014 19:19:31 +0100
-Subject: [PATCH] snmpstats: use $(share_prefix) for deploying MIBS
-
-(cherry picked from commit 5dde71f7fb9715a18dabfe0beeb152b0821c6fb0)
-
-Conflicts:
- modules/snmpstats/Makefile
----
- modules/snmpstats/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile
-index 0778be1..a26c93e 100644
---- a/modules/snmpstats/Makefile
-+++ b/modules/snmpstats/Makefile
-@@ -14,10 +14,10 @@ ifeq ($(BUILDER),)
- DEFS +=-I$(LOCALBASE)/include
- BUILDAGENTLIBS =-L$(LOCALBASE)/lib -lnetsnmpmibs -lnetsnmpagent \
- -lnetsnmphelpers -lnetsnmp
-- INSTALLMIBDIR = $(cfg-prefix)/share/snmp/mibs
-+ INSTALLMIBDIR = $(share_prefix)/share/snmp/mibs
- else
- BUILDAGENTLIBS = $(shell net-snmp-config --netsnmp-agent-libs)
-- INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
-+ INSTALLMIBDIR = $(share_prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
- endif
-
- ifeq ($(EMBEDDED_PERL),1)
---
-1.8.5.2
-
diff --git a/debian/patches/upstream/0002-ims_auth-Fix-for-SIP-Digest-Segmentation-fault.patch b/debian/patches/upstream/0002-ims_auth-Fix-for-SIP-Digest-Segmentation-fault.patch
deleted file mode 100644
index 1da8084..0000000
--- a/debian/patches/upstream/0002-ims_auth-Fix-for-SIP-Digest-Segmentation-fault.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 67c12f48926c88b265db1501e1d211309bebdc7e Mon Sep 17 00:00:00 2001
-From: Carsten Bock <carsten at ng-voice.com>
-Date: Sat, 11 Jan 2014 01:39:21 +0100
-Subject: [PATCH] ims_auth: Fix for SIP Digest (Segmentation fault) - Fix by
- Marek Bazler (marek.bazler at acision.com)
-
----
- modules/ims_auth/authorize.c | 36 +++++++++++++++++++++++++++---------
- 1 file changed, 27 insertions(+), 9 deletions(-)
-
-diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c
-index 026e3b5..6b9bb13 100644
---- a/modules/ims_auth/authorize.c
-+++ b/modules/ims_auth/authorize.c
-@@ -89,8 +89,7 @@ extern int ignore_failed_auth;
- extern int av_check_only_impu;
-
- auth_hash_slot_t *auth_data; /**< Authentication vector hash table */
--extern int auth_data_hash_size; /**< authentication vector hash table size */
--
-+static int act_auth_data_hash_size = 0; /**< authentication vector hash table size */
-
- static str empty_s = {0, 0};
-
-@@ -192,7 +191,7 @@ void reg_await_timer(unsigned int ticks, void* param) {
- int i;
-
- LM_DBG("Looking for expired/useless at %d\n", ticks);
-- for (i = 0; i < auth_data_hash_size; i++) {
-+ for (i = 0; i < act_auth_data_hash_size; i++) {
- auth_data_lock(i);
- aud = auth_data[i].head;
- while (aud) {
-@@ -704,8 +703,27 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut
- &qop_str,
- qop == QOP_AUTHINT,
- &msg->first_line.u.request.method, &uri, hbody, expected);
-- LM_INFO("UE said: %.*s and we expect %.*s ha1 %.*s (%.*s)\n",
-- response16.len, response16.s, /*av->authorization.len,av->authorization.s,*/32, expected, 32, ha1, msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);
-+ LM_INFO("UE said: %.*s and we expect %.*s ha1 %.*s (%.*s)\n",
-+ response16.len, response16.s,
-+ /*av->authorization.len,av->authorization.s,*/32, expected,
-+ 32, ha1,
-+ msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);
-+ break;
-+ case AUTH_SIP_DIGEST:
-+ case AUTH_DIGEST:
-+ // memcpy of received HA1
-+ memcpy(ha1, av->authorization.s, HASHHEXLEN);
-+ calc_response(ha1, &(av->authenticate),
-+ &nc,
-+ &cnonce,
-+ &qop_str,
-+ qop == QOP_AUTHINT,
-+ &msg->first_line.u.request.method, &uri, hbody, expected);
-+ LM_INFO("UE said: %.*s and we expect %.*s ha1 %.*s (%.*s)\n",
-+ response16.len, response16.s,
-+ 32,expected,
-+ 32,ha1,
-+ msg->first_line.u.request.method.len, msg->first_line.u.request.method.s);
- break;
- default:
- LM_ERR("algorithm %.*s is not handled.\n",
-@@ -902,11 +920,11 @@ int auth_data_init(int size) {
- return 0;
- }
- memset(auth_data, 0, sizeof (auth_hash_slot_t) * size);
-- auth_data_hash_size = size;
- for (i = 0; i < size; i++) {
- auth_data[i].lock = lock_alloc();
- lock_init(auth_data[i].lock);
- }
-+ act_auth_data_hash_size = size;
- return 1;
- }
-
-@@ -915,7 +933,7 @@ int auth_data_init(int size) {
- void auth_data_destroy() {
- int i;
- auth_userdata *aud, *next;
-- for (i = 0; i < auth_data_hash_size; i++) {
-+ for (i = 0; i < act_auth_data_hash_size; i++) {
- auth_data_lock(i);
- lock_destroy(auth_data[i].lock);
- lock_dealloc(auth_data[i].lock);
-@@ -1181,9 +1199,9 @@ void free_auth_userdata(auth_userdata * aud) {
- */
- inline unsigned int get_hash_auth(str private_identity, str public_identity) {
- if (av_check_only_impu)
-- return core_hash(&public_identity, 0, auth_data_hash_size);
-+ return core_hash(&public_identity, 0, act_auth_data_hash_size);
- else
-- return core_hash(&public_identity, 0, auth_data_hash_size);
-+ return core_hash(&public_identity, 0, act_auth_data_hash_size);
- /*
-
-
---
-1.8.5.2
-
diff --git a/debian/patches/upstream/0003-ims_registrar_scscf-Fix-memory-corruption-in-build_c.patch b/debian/patches/upstream/0003-ims_registrar_scscf-Fix-memory-corruption-in-build_c.patch
deleted file mode 100644
index 568f4d2..0000000
--- a/debian/patches/upstream/0003-ims_registrar_scscf-Fix-memory-corruption-in-build_c.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From fc0bad2c005048d73926cbf8637cd8ba10287bd8 Mon Sep 17 00:00:00 2001
-From: Carsten Bock <carsten at ng-voice.com>
-Date: Mon, 13 Jan 2014 12:04:13 +0100
-Subject: [PATCH] ims_registrar_scscf: Fix memory corruption in build_contacts,
- in case no contacts available
-
----
- modules/ims_registrar_scscf/reply.c | 91 +++++++++++++++++++------------------
- 1 file changed, 48 insertions(+), 43 deletions(-)
-
-diff --git a/modules/ims_registrar_scscf/reply.c b/modules/ims_registrar_scscf/reply.c
-index 64b31c3..cfefd5c 100644
---- a/modules/ims_registrar_scscf/reply.c
-+++ b/modules/ims_registrar_scscf/reply.c
-@@ -412,61 +412,66 @@ int build_contact(ucontact_t* c, contact_for_header_t** contact_header) {
- tmp_contact_header->data_len = calc_buf_len(c);
- tmp_contact_header->buf = (char*)shm_malloc(tmp_contact_header->data_len);
-
-- p = tmp_contact_header->buf;
-+ if (tmp_contact_header->data_len) {
-+ p = tmp_contact_header->buf;
-
-- memcpy(p, CONTACT_BEGIN, CONTACT_BEGIN_LEN);
-- p += CONTACT_BEGIN_LEN;
-+ memcpy(p, CONTACT_BEGIN, CONTACT_BEGIN_LEN);
-+ p += CONTACT_BEGIN_LEN;
-
-- fl = 0;
-- while (c) {
-- if (VALID_CONTACT(c, act_time)) {
-- if (fl) {
-- memcpy(p, CONTACT_SEP, CONTACT_SEP_LEN);
-- p += CONTACT_SEP_LEN;
-- } else {
-- fl = 1;
-- }
-+ fl = 0;
-+ while (c) {
-+ if (VALID_CONTACT(c, act_time)) {
-+ if (fl) {
-+ memcpy(p, CONTACT_SEP, CONTACT_SEP_LEN);
-+ p += CONTACT_SEP_LEN;
-+ } else {
-+ fl = 1;
-+ }
-
-- *p++ = '<';
-- memcpy(p, c->c.s, c->c.len);
-- p += c->c.len;
-- *p++ = '>';
-+ *p++ = '<';
-+ memcpy(p, c->c.s, c->c.len);
-+ p += c->c.len;
-+ *p++ = '>';
-+
-+ len = len_q(c->q);
-+ if (len) {
-+ memcpy(p, Q_PARAM, Q_PARAM_LEN);
-+ p += Q_PARAM_LEN;
-+ memcpy(p, q2str(c->q, 0), len);
-+ p += len;
-+ }
-
-- len = len_q(c->q);
-- if (len) {
-- memcpy(p, Q_PARAM, Q_PARAM_LEN);
-- p += Q_PARAM_LEN;
-- memcpy(p, q2str(c->q, 0), len);
-+ memcpy(p, EXPIRES_PARAM, EXPIRES_PARAM_LEN);
-+ p += EXPIRES_PARAM_LEN;
-+ cp = int2str((int) (c->expires - act_time), &len);
-+ memcpy(p, cp, len);
- p += len;
-+
-+ if (c->received.s) {
-+ *p++ = ';';
-+ memcpy(p, rcv_param.s, rcv_param.len);
-+ p += rcv_param.len;
-+ *p++ = '=';
-+ *p++ = '\"';
-+ memcpy(p, c->received.s, c->received.len);
-+ p += c->received.len;
-+ *p++ = '\"';
-+ }
- }
-
-- memcpy(p, EXPIRES_PARAM, EXPIRES_PARAM_LEN);
-- p += EXPIRES_PARAM_LEN;
-- cp = int2str((int) (c->expires - act_time), &len);
-- memcpy(p, cp, len);
-- p += len;
--
-- if (c->received.s) {
-- *p++ = ';';
-- memcpy(p, rcv_param.s, rcv_param.len);
-- p += rcv_param.len;
-- *p++ = '=';
-- *p++ = '\"';
-- memcpy(p, c->received.s, c->received.len);
-- p += c->received.len;
-- *p++ = '\"';
-- }
-+ c = c->next;
- }
-
-- c = c->next;
-- }
-+ memcpy(p, CRLF, CRLF_LEN);
-+ p += CRLF_LEN;
-
-- memcpy(p, CRLF, CRLF_LEN);
-- p += CRLF_LEN;
-+ tmp_contact_header->data_len = p - tmp_contact_header->buf;
-+
-+ LM_DBG("created Contact HF: %.*s\n", tmp_contact_header->data_len, tmp_contact_header->buf);
-+ } else
-+ LM_DBG("No Contact HF created, no contacts.\n");
-
-- tmp_contact_header->data_len = p - tmp_contact_header->buf;
-
-- LM_DBG("created Contact HF: %.*s\n", tmp_contact_header->data_len, tmp_contact_header->buf);
- *contact_header = tmp_contact_header;
- return 0;
- }
---
-1.8.5.2
-
diff --git a/debian/patches/upstream/0004-snmpstats-fixed-path-for-deploying-mibs-when-net-snm.patch b/debian/patches/upstream/0004-snmpstats-fixed-path-for-deploying-mibs-when-net-snm.patch
deleted file mode 100644
index 9b63877..0000000
--- a/debian/patches/upstream/0004-snmpstats-fixed-path-for-deploying-mibs-when-net-snm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ac1f9f9b601f3a6f3e53d55c5a061f35df6524e2 Mon Sep 17 00:00:00 2001
-From: Daniel-Constantin Mierla <miconda at gmail.com>
-Date: Tue, 14 Jan 2014 08:59:17 +0100
-Subject: [PATCH] snmpstats: fixed path for deploying mibs when net-snmp-config
- is used
-
-(cherry picked from commit 777548d79f17a6eb81d241e18b22329e9654e951)
----
- modules/snmpstats/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/snmpstats/Makefile b/modules/snmpstats/Makefile
-index a26c93e..ea986ac 100644
---- a/modules/snmpstats/Makefile
-+++ b/modules/snmpstats/Makefile
-@@ -17,7 +17,7 @@ ifeq ($(BUILDER),)
- INSTALLMIBDIR = $(share_prefix)/share/snmp/mibs
- else
- BUILDAGENTLIBS = $(shell net-snmp-config --netsnmp-agent-libs)
-- INSTALLMIBDIR = $(share_prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
-+ INSTALLMIBDIR = $(basedir)$(shell net-snmp-config --prefix)/share/snmp/mibs
- endif
-
- ifeq ($(EMBEDDED_PERL),1)
---
-1.8.5.2
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git
More information about the Pkg-voip-commits
mailing list