1 |
diff -Naurp asterisk-11.14.0/configure.ac asterisk-11.14.0.oden/configure.ac |
2 |
--- asterisk-11.14.0/configure.ac 2014-11-19 15:45:32.000000000 +0100 |
3 |
+++ asterisk-11.14.0.oden/configure.ac 2014-11-19 15:45:43.000000000 +0100 |
4 |
@@ -1920,7 +1920,7 @@ AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_con |
5 |
AST_EXT_TOOL_CHECK([NEON], [neon-config]) |
6 |
|
7 |
AST_EXT_TOOL_CHECK([NEON29], [neon-config], , [--libs], |
8 |
-[#include <ne_auth.h>], |
9 |
+[#include <neon/ne_auth.h>], |
10 |
[#ifndef NE_AUTH_NTLM |
11 |
#error Need libneon >= 0.29.0 |
12 |
#endif]) |
13 |
diff -Naurp asterisk-11.14.0/res/res_calendar_caldav.c asterisk-11.14.0.oden/res/res_calendar_caldav.c |
14 |
--- asterisk-11.14.0/res/res_calendar_caldav.c 2014-05-10 00:28:40.000000000 +0200 |
15 |
+++ asterisk-11.14.0.oden/res/res_calendar_caldav.c 2014-11-19 15:45:43.000000000 +0100 |
16 |
@@ -32,11 +32,11 @@ |
17 |
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 413587 $") |
18 |
|
19 |
#include <libical/ical.h> |
20 |
-#include <ne_session.h> |
21 |
-#include <ne_uri.h> |
22 |
-#include <ne_request.h> |
23 |
-#include <ne_auth.h> |
24 |
-#include <ne_redirect.h> |
25 |
+#include <neon/ne_session.h> |
26 |
+#include <neon/ne_uri.h> |
27 |
+#include <neon/ne_request.h> |
28 |
+#include <neon/ne_auth.h> |
29 |
+#include <neon/ne_redirect.h> |
30 |
#include <libxml/xmlmemory.h> |
31 |
#include <libxml/parser.h> |
32 |
|
33 |
diff -Naurp asterisk-11.14.0/res/res_calendar_ews.c asterisk-11.14.0.oden/res/res_calendar_ews.c |
34 |
--- asterisk-11.14.0/res/res_calendar_ews.c 2014-10-12 09:42:00.000000000 +0200 |
35 |
+++ asterisk-11.14.0.oden/res/res_calendar_ews.c 2014-11-19 15:45:43.000000000 +0100 |
36 |
@@ -29,15 +29,15 @@ |
37 |
|
38 |
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 425287 $") |
39 |
|
40 |
-#include <ne_request.h> |
41 |
-#include <ne_session.h> |
42 |
-#include <ne_uri.h> |
43 |
-#include <ne_socket.h> |
44 |
-#include <ne_auth.h> |
45 |
-#include <ne_xml.h> |
46 |
-#include <ne_xmlreq.h> |
47 |
-#include <ne_utils.h> |
48 |
-#include <ne_redirect.h> |
49 |
+#include <neon/ne_request.h> |
50 |
+#include <neon/ne_session.h> |
51 |
+#include <neon/ne_uri.h> |
52 |
+#include <neon/ne_socket.h> |
53 |
+#include <neon/ne_auth.h> |
54 |
+#include <neon/ne_xml.h> |
55 |
+#include <neon/ne_xmlreq.h> |
56 |
+#include <neon/ne_utils.h> |
57 |
+#include <neon/ne_redirect.h> |
58 |
|
59 |
#include "asterisk/module.h" |
60 |
#include "asterisk/calendar.h" |
61 |
diff -Naurp asterisk-11.14.0/res/res_calendar_exchange.c asterisk-11.14.0.oden/res/res_calendar_exchange.c |
62 |
--- asterisk-11.14.0/res/res_calendar_exchange.c 2014-05-10 00:28:40.000000000 +0200 |
63 |
+++ asterisk-11.14.0.oden/res/res_calendar_exchange.c 2014-11-19 15:45:43.000000000 +0100 |
64 |
@@ -32,11 +32,11 @@ |
65 |
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 413587 $") |
66 |
|
67 |
#include <libical/ical.h> |
68 |
-#include <ne_session.h> |
69 |
-#include <ne_uri.h> |
70 |
-#include <ne_request.h> |
71 |
-#include <ne_auth.h> |
72 |
-#include <ne_redirect.h> |
73 |
+#include <neon/ne_session.h> |
74 |
+#include <neon/ne_uri.h> |
75 |
+#include <neon/ne_request.h> |
76 |
+#include <neon/ne_auth.h> |
77 |
+#include <neon/ne_redirect.h> |
78 |
#include <iksemel.h> |
79 |
|
80 |
#include "asterisk/module.h" |
81 |
diff -Naurp asterisk-11.14.0/res/res_calendar_icalendar.c asterisk-11.14.0.oden/res/res_calendar_icalendar.c |
82 |
--- asterisk-11.14.0/res/res_calendar_icalendar.c 2014-05-10 00:28:40.000000000 +0200 |
83 |
+++ asterisk-11.14.0.oden/res/res_calendar_icalendar.c 2014-11-19 15:45:43.000000000 +0100 |
84 |
@@ -31,11 +31,11 @@ |
85 |
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 413587 $") |
86 |
|
87 |
#include <libical/ical.h> |
88 |
-#include <ne_session.h> |
89 |
-#include <ne_uri.h> |
90 |
-#include <ne_request.h> |
91 |
-#include <ne_auth.h> |
92 |
-#include <ne_redirect.h> |
93 |
+#include <neon/ne_session.h> |
94 |
+#include <neon/ne_uri.h> |
95 |
+#include <neon/ne_request.h> |
96 |
+#include <neon/ne_auth.h> |
97 |
+#include <neon/ne_redirect.h> |
98 |
|
99 |
#include "asterisk/module.h" |
100 |
#include "asterisk/calendar.h" |