Upgrade to 1.4.0, add separate configure function, add libjansson patch

0001-Add-autoconfiguration-for-libjansson.patch

@@ -0,0 +1,72 @@
+From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001
+From: Aaron Lindsay <aaron@aclindsay.com>
+Date: Wed, 15 Jan 2014 13:49:40 -0500
+Subject: [PATCH] Add autoconfiguration for libjansson
+
+---
+ configure.ac           | 5 +++++
+ net/daemon/Makefile.am | 4 ++--
+ net/server/Makefile.am | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64e74b5..0911671 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0
+ ZDB_REQUIRED=2.10
+ LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
+ SEARPC_REQUIRED=1.0
++JANSSON_REQUIRED=2.2.1
+ CURL_REQUIRED=7.17
+ 
+ PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
+@@ -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)
++
+ if test x${compile_python} = xyes; then
+    AM_PATH_PYTHON([2.6])
+ 
+diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am
+index 35d1a3c..0e28c6a 100644
+--- a/net/daemon/Makefile.am
++++ b/net/daemon/Makefile.am
+@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \
+ 
+ ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \
+            @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @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 = -levent $(top_builddir)/lib/libccnetd.la \
+ 	@GLIB2_LIBS@ @GOBJECT_LIBS@  -lssl @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 d587f48..b048936 100644
+--- a/net/server/Makefile.am
++++ b/net/server/Makefile.am
+@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \
+            @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @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
+-- 
+1.8.5.2
+

PKGBUILD

@@ -4,11 +4,11 @@
 pkgname=ccnet
 
 # The version number for the software
-pkgver=1.3.8 #Should match `grep "PACKAGE_VERSION" ccnet/Makefile`
+pkgver=1.4.0
-_seafilever=2.0.8
+_seafilever=2.1.1
 
 #The release number for the arch package, as fixes are added to the PKGBUILD, the release number will increase
-pkgrel=2
+pkgrel=1
 
 # The description of the package, should be about 80 characters long (one line)
 pkgdesc="A framework for writing networked applications in C."
@@ -23,7 +23,7 @@ url="https://github.com/haiwen/ccnet/"
 license=('custom')
 
 # Packages that your software needs to run. If the dependancy requires a minimum version number use the >= operator
-depends=('libevent>=2.0' 'libzdb>=2.10.2' 'libsearpc>=1.1.0')
+depends=('libevent>=2.0' 'libzdb>=2.10.2' 'libsearpc>=1.2.1')
 
 # Packages that must be installed to build the software, but at not necessary to run it
 makedepends=('vala>=0.8' 'pacman>=4.1')
@@ -39,26 +39,39 @@ options=
 
 source=("https://github.com/haiwen/ccnet/archive/v${_seafilever}.tar.gz"
 	"https://raw.github.com/haiwen/ccnet/master/COPYRIGHT"
-	"libccnet.pc.patch")
+	"libccnet.pc.patch"
-sha256sums=('61ba6601fd64cdf3788d45b7b1047e2f7840c8c01cf49bde4af2bd437a106744'
+	"0001-Add-autoconfiguration-for-libjansson.patch")
+sha256sums=('6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0'
 	'7abb45e3e313d37337b088411fa249171f58186ebf951c19ea2bf1390927a0f3'
-	'66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f')
+	'66c3b02c3981db6a80819e0ae103bedadf8dfdf81405a7f75a9cba714acf973f'
+	'72f8f8fd79c0b570335240e4ef53357bb70f25477b66beddaa445ee27d350674')
+
+configure_ccnet() {
+	./autogen.sh
+	CFLAGS="-lpthread" ./configure --enable-server --prefix=/usr PYTHON=/usr/bin/python2
+}
+
+pkgver() {
+	cd "$srcdir/$pkgname-$_seafilever"
+	configure_ccnet &> /dev/null
+	grep "PACKAGE_VERSION" Makefile | sed 's/PACKAGE_VERSION.*=[ \t]\+\([0-9\.]\+\)[ \t]*/\1/g'
+}
 
 prepare () {
-	cd "$srcdir/ccnet-$_seafilever"
+	cd "$srcdir/$pkgname-$_seafilever"
 	patch -p1 -i $srcdir/libccnet.pc.patch
+	patch -p1 -i $srcdir/0001-Add-autoconfiguration-for-libjansson.patch
 }
 
 build () {
-	cd "$srcdir/ccnet-$_seafilever"
+	cd "$srcdir/$pkgname-$_seafilever"
-	./autogen.sh
+	configure_ccnet
-	CFLAGS="-lpthread" ./configure --enable-server --prefix=/usr PYTHON=/usr/bin/python2
 	make -j1
 }
 
 package () {
 	#install library and header files
-	cd "$srcdir/ccnet-$_seafilever"
+	cd "$srcdir/$pkgname-$_seafilever"
 	make DESTDIR="$pkgdir/" install
 
 	#copy license over