Merge branch 'release-5.0.3-1'

3 files changed, 11 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 585c08d451a0..e30c8a142b35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Dec 19 16:40:55 UTC 2015
 pkgbase = ccnet
 	pkgdesc = A framework for writing networked applications in C.
-	pkgver = 5.0.2
+	pkgver = 5.0.3
 	pkgrel = 1
 	url = https://github.com/haiwen/ccnet/
 	arch = i686
@@ -13,18 +15,15 @@ pkgbase = ccnet
 	depends = libevent
 	depends = libzdb
 	depends = libsearpc>=3.0.7
-	depends = jansson
 	depends = libldap
 	depends = python2
 	options = !makeflags
-	source = ccnet-v5.0.2-server.tar.gz::https://github.com/haiwen/ccnet/archive/v5.0.2-server.tar.gz
+	source = ccnet-v5.0.3-server.tar.gz::https://github.com/haiwen/ccnet/archive/v5.0.3-server.tar.gz
 	source = https://raw.githubusercontent.com/haiwen/ccnet/master/COPYRIGHT
 	source = libccnet.pc.patch
-	source = autoconfiguration-for-libjansson.patch
-	sha256sums = e734ac1a243c073456b4ef82fac412a63b5731f4fddb45bf27170ff45d29f11b
+	sha256sums = d9912fc2ca7ea1c41f58c8f461cc02c6d650d5d59f79b8337a987478306eb175
 	sha256sums = c07aeccf581c255e60acbddcc6af90290e0d6354e6ec0ee1987b82845d3d57ac
 	sha256sums = 66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f
-	sha256sums = 382b1da33e2b6c0ebab8d3921d92b7417fa11d969ad822cd43aee499fd7b3d94
 
 pkgname = ccnet
 
diff --git a/PKGBUILD b/PKGBUILD
index 07266a439613..d6fd3135de85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,29 @@
 # Maintainer: Edvinas Valatka <edacval@gmail.com>
 
 pkgname=ccnet
-pkgver=5.0.2
+pkgver=5.0.3
 pkgrel=1
 pkgdesc="A framework for writing networked applications in C."
 arch=('i686' 'x86_64' 'armv7h' 'armv6h')
 url="https://github.com/haiwen/ccnet/"
 license=('GPL3')
-depends=('libevent' 'libzdb' 'libsearpc>=3.0.7' 'jansson' 'libldap' 'python2')
+depends=('libevent' 'libzdb' 'libsearpc>=3.0.7' 'libldap' 'python2')
 makedepends=('vala' 'pacman>=4.1')
 options=('!makeflags')
 
 source=("${pkgname}-v${pkgver}-server.tar.gz::https://github.com/haiwen/${pkgname}/archive/v${pkgver}-server.tar.gz"
     "https://raw.githubusercontent.com/haiwen/ccnet/master/COPYRIGHT"
-    "libccnet.pc.patch"
-    "autoconfiguration-for-libjansson.patch")
+    "libccnet.pc.patch")
 
 prepare () {
     cd "$srcdir/$pkgname-$pkgver-server"
     patch -p1 -i $srcdir/libccnet.pc.patch
-    patch -p1 -i $srcdir/autoconfiguration-for-libjansson.patch
 }
 
 build () {
     cd "$srcdir/$pkgname-$pkgver-server"
     ./autogen.sh
-    CFLAGS="$CFLAGS -lpthread" ./configure --enable-server --enable-ldap --prefix=/usr PYTHON=/usr/bin/python2
+    ./configure --enable-server --enable-ldap --prefix=/usr --disable-compile-demo PYTHON=/usr/bin/python2
     make -j1
 }
 
@@ -34,7 +32,6 @@ package () {
     cd "$srcdir/$pkgname-$pkgver-server"
     make DESTDIR="$pkgdir" install
 }
-sha256sums=('e734ac1a243c073456b4ef82fac412a63b5731f4fddb45bf27170ff45d29f11b'
+sha256sums=('d9912fc2ca7ea1c41f58c8f461cc02c6d650d5d59f79b8337a987478306eb175'
             'c07aeccf581c255e60acbddcc6af90290e0d6354e6ec0ee1987b82845d3d57ac'
-            '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f'
-            '382b1da33e2b6c0ebab8d3921d92b7417fa11d969ad822cd43aee499fd7b3d94')
+            '66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f')
diff --git a/autoconfiguration-for-libjansson.patch b/autoconfiguration-for-libjansson.patch
deleted file mode 100644
index 21774ff6e32c..000000000000
--- a/autoconfiguration-for-libjansson.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d7ebba9..3c1be4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -241,6 +241,7 @@ APPINDICATOR_REQUIRED=0.0.7
- GLIB_REQUIRED=2.16.0
- GTK_REQUIRED=2.16.0
- SEARPC_REQUIRED=1.0
-+JANSSON_REQUIRED=2.2.1
- ZDB_REQUIRED=2.10
- LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- SEARPC_REQUIRED=1.0
-@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED])
- AC_SUBST(SEARPC_CFLAGS)
- AC_SUBST(SEARPC_LIBS)
- 
-+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
-+AC_SUBST(JANSSON_CFLAGS)
-+AC_SUBST(JANSSON_LIBS)
-+
- PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED])
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
-diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am
-index b8e745f..1321dfc 100644
---- a/net/daemon/Makefile.am
-+++ b/net/daemon/Makefile.am
-@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \
- 
- ccnet_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
-            @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
--           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
-+           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
- 
- 
- ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
-@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs)
- 
- ccnet_test_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
- 	@GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
--	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
-+	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
- 
- ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@
- 
-diff --git a/net/server/Makefile.am b/net/server/Makefile.am
-index da98420..867a1ff 100644
---- a/net/server/Makefile.am
-+++ b/net/server/Makefile.am
-@@ -103,7 +103,7 @@ ccnet_server_LDADD = @LIBEVENT_LIBS@ $(top_builddir)/lib/libccnetd.la \
-            @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ -lsqlite3 \
- 	       -lpthread \
-            @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \
--	  	   @LDAP_LIBS@
-+	  	   @LDAP_LIBS@ @JANSSON_LIBS@
- 
- 
- ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined