public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2736 from matejc/updateseafile

Browse Source 
seafile: update client, ccnet, libsearpc and shared
This commit is contained in:
Domen Kožar
2014-05-25 15:37:17 +02:00
parent 908f2f8fe0 116ab5f0c1
commit 17371176ee
7 changed files with 11 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
View File

@@ -1,72 +0,0 @@
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

8
pkgs/tools/networking/ccnet/default.nix
View File

@@ -2,18 +2,16 @@
stdenv.mkDerivation rec
{
version = "1.4.0";
seafileVersion = "2.1.1";
version = "1.4.2";
seafileVersion = "3.0.4";
name = "ccnet-${version}";
src = fetchurl
{
url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz";
sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0";
sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q";
};
patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ];
buildInputs = [ which automake autoconf pkgconfig libtool vala python ];
propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];

10
pkgs/tools/networking/ccnet/libccnet.pc.patch
View File

@@ -1,10 +0,0 @@
From: Aaron Lindsay <aaron@aclindsay.com>
--- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500
+++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500
@@ -1,4 +1,4 @@
-prefix=(DESTDIR)@prefix@
+prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@