diff options
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/libjunbound/make-linux.sh | 19 | ||||
| -rw-r--r-- | src/native/libjunbound/unbound.patch | 52 |
2 files changed, 37 insertions, 34 deletions
diff --git a/src/native/libjunbound/make-linux.sh b/src/native/libjunbound/make-linux.sh index 6f8a36e..991eb17 100644 --- a/src/native/libjunbound/make-linux.sh +++ b/src/native/libjunbound/make-linux.sh @@ -10,16 +10,13 @@ mkdir -p $prefix cd $out -expat=expat-2.0.1 -ldns=ldns-1.6.11 -unbound=unbound-1.4.14 +expat=expat-2.1.0 +unbound=unbound-1.5.1 -wget -nc http://downloads.sourceforge.net/project/expat/expat/2.0.1/$expat.tar.gz -wget -nc http://nlnetlabs.nl/downloads/ldns/$ldns.tar.gz +wget -nc http://downloads.sourceforge.net/project/expat/expat/2.1.0/$expat.tar.gz wget -nc http://unbound.net/downloads/$unbound.tar.gz tar -xzvf $expat.tar.gz -tar -xzvf $ldns.tar.gz tar -xzvf $unbound.tar.gz cd $out/$expat @@ -27,18 +24,12 @@ cd $out/$expat make make install -cd $out/$ldns -./configure --with-pic --prefix=$prefix -make -make install - cd $out/$unbound patch -p 1 -i $out/../../unbound.patch -./configure --with-pic --prefix=$prefix --with-libexpat=$prefix --with-ldns=$prefix +./configure --with-pic --prefix=$prefix --with-libexpat=$prefix make make install cd $out -gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I$JAVA_HOME/include -Wl,-Bstatic -L$prefix/lib -lunbound -lldns -I$prefix/include -Wl,-Bdynamic -lcrypto +gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I$JAVA_HOME/include -Wl,-Bstatic -L$prefix/lib -lunbound -I$prefix/include -Wl,-Bdynamic -lcrypto -lssl strip libjunbound.so - diff --git a/src/native/libjunbound/unbound.patch b/src/native/libjunbound/unbound.patch index a1ae9f9..cc9aba6 100644 --- a/src/native/libjunbound/unbound.patch +++ b/src/native/libjunbound/unbound.patch @@ -1,28 +1,31 @@ ---- unbound-1.4.12-orig/libunbound/context.h 2009-02-05 10:48:02.000000000 +0100 -+++ unbound-1.4.12/libunbound/context.h 2011-12-13 23:19:23.706773580 +0100 -@@ -234,7 +234,7 @@ - * @param cbarg: user arg for async queries. - * @return new ctx_query or NULL for malloc failure. - */ --struct ctx_query* context_new(struct ub_ctx* ctx, char* name, int rrtype, -+struct ctx_query* context_create(struct ub_ctx* ctx, char* name, int rrtype, - int rrclass, ub_callback_t cb, void* cbarg); - - /** ---- unbound-1.4.12-orig/libunbound/context.c 2009-10-08 19:05:53.000000000 +0200 -+++ unbound-1.4.12/libunbound/context.c 2011-12-13 23:19:26.042744210 +0100 -@@ -124,7 +124,7 @@ +diff -u -r unbound-1.5.1-orig/libunbound/context.c unbound-1.5.1/libunbound/context.c +--- unbound-1.5.1-orig/libunbound/context.c 2014-02-07 14:28:39.000000000 +0100 ++++ unbound-1.5.1/libunbound/context.c 2015-02-09 11:55:02.000000000 +0100 +@@ -125,7 +125,7 @@ } struct ctx_query* --context_new(struct ub_ctx* ctx, char* name, int rrtype, int rrclass, -+context_create(struct ub_ctx* ctx, char* name, int rrtype, int rrclass, +-context_new(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, ++context_create(struct ub_ctx* ctx, const char* name, int rrtype, int rrclass, ub_callback_t cb, void* cbarg) { struct ctx_query* q = (struct ctx_query*)calloc(1, sizeof(*q)); ---- unbound-1.4.12-orig/libunbound/libunbound.c 2010-07-07 15:13:36.000000000 +0200 -+++ unbound-1.4.12/libunbound/libunbound.c 2011-12-13 23:19:20.758810633 +0100 -@@ -564,7 +564,7 @@ +diff -u -r unbound-1.5.1-orig/libunbound/context.h unbound-1.5.1/libunbound/context.h +--- unbound-1.5.1-orig/libunbound/context.h 2014-02-07 14:28:39.000000000 +0100 ++++ unbound-1.5.1/libunbound/context.h 2015-02-09 11:54:44.000000000 +0100 +@@ -241,7 +241,7 @@ + * @param cbarg: user arg for async queries. + * @return new ctx_query or NULL for malloc failure. + */ +-struct ctx_query* context_new(struct ub_ctx* ctx, const char* name, int rrtype, ++struct ctx_query* context_create(struct ub_ctx* ctx, const char* name, int rrtype, + int rrclass, ub_callback_t cb, void* cbarg); + + /** +diff -u -r unbound-1.5.1-orig/libunbound/libunbound.c unbound-1.5.1/libunbound/libunbound.c +--- unbound-1.5.1-orig/libunbound/libunbound.c 2014-11-04 10:11:59.000000000 +0100 ++++ unbound-1.5.1/libunbound/libunbound.c 2015-02-09 11:55:20.000000000 +0100 +@@ -634,7 +634,7 @@ } /* create new ctx_query and attempt to add to the list */ lock_basic_unlock(&ctx->cfglock); @@ -31,7 +34,16 @@ if(!q) return UB_NOMEM; /* become a resolver thread for a bit */ -@@ -624,7 +624,7 @@ +@@ -687,7 +687,7 @@ + } + + /* create new ctx_query and attempt to add to the list */ +- q = context_new(ctx, name, rrtype, rrclass, (ub_callback_t)callback, ++ q = context_create(ctx, name, rrtype, rrclass, (ub_callback_t)callback, + mydata); + if(!q) + return UB_NOMEM; +@@ -733,7 +733,7 @@ } /* create new ctx_query and attempt to add to the list */ |