diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/ejabberd/0004-correct-include.patch | |
parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
download | buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ejabberd/0004-correct-include.patch')
-rw-r--r-- | package/ejabberd/0004-correct-include.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/package/ejabberd/0004-correct-include.patch b/package/ejabberd/0004-correct-include.patch new file mode 100644 index 0000000000..fd1dee2850 --- /dev/null +++ b/package/ejabberd/0004-correct-include.patch @@ -0,0 +1,56 @@ +From 705a9ad229de49cd9cce226a2025716902455663 Mon Sep 17 00:00:00 2001 +From: Philipp Huebner <debalance@debian.org> +Date: Wed, 20 Jan 2016 08:13:21 -0500 +Subject: [PATCH] correct include + +This part of the code was moved into it's own project and was packaged +separately by me. To make the build process work, this small fix is +necessary. +--- + src/mod_sip.erl | 2 +- + src/mod_sip_proxy.erl | 2 +- + src/mod_sip_registrar.erl | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mod_sip.erl b/src/mod_sip.erl +index c8c9533..7f188a0 100644 +--- a/src/mod_sip.erl ++++ b/src/mod_sip.erl +@@ -38,7 +38,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl +index bf297bc..d8b65cd 100644 +--- a/src/mod_sip_proxy.erl ++++ b/src/mod_sip_proxy.erl +@@ -40,7 +40,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(SIGN_LIFETIME, 300). %% in seconds. + +diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl +index 44091ed..4d2ec82 100644 +--- a/src/mod_sip_registrar.erl ++++ b/src/mod_sip_registrar.erl +@@ -37,7 +37,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(CALL_TIMEOUT, timer:seconds(30)). + -define(DEFAULT_EXPIRES, 3600). +-- +2.5.0 + |