bump seafile-server + components to stable 7.0.5, stable libsearpc
- downgrade to the latest stable seafile-server - switch to a stable libsearpc version - adapt & backport libevhtp patch
This commit is contained in:
		
							parent
							
								
									e84aeea8f1
								
							
						
					
					
						commit
						e54c1770d1
					
				
					 3 changed files with 35 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
 | 
			
		|||
  src = fetchFromGitHub {
 | 
			
		||||
    owner = "haiwen";
 | 
			
		||||
    repo = "libsearpc";
 | 
			
		||||
    rev = "v${version}";
 | 
			
		||||
    #rev = "v3.2-latest";
 | 
			
		||||
    sha256 = "sha256:1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp";
 | 
			
		||||
    #rev = "v${version}";
 | 
			
		||||
    rev = "v3.1-latest";
 | 
			
		||||
    sha256 = "sha256:078r0bgncgadsv4v82kxmq2mvd19grssakjn0syrv61a96vmfyjj";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  patches = [ ./libsearpc.pc.patch ];
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@
 | 
			
		|||
  python27, python27Packages }:
 | 
			
		||||
 | 
			
		||||
  let
 | 
			
		||||
    version = "7.1.0";
 | 
			
		||||
    version = "7.0.5";
 | 
			
		||||
    seafile-server-core = stdenv.mkDerivation rec {
 | 
			
		||||
      name = "seafile-server-core";
 | 
			
		||||
      inherit version;
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +12,7 @@
 | 
			
		|||
        owner = "haiwen";
 | 
			
		||||
        repo = "seafile-server";
 | 
			
		||||
        rev = "v${version}-server";
 | 
			
		||||
        sha256 = "sha256:0hmhd42mlcahlck95ixa74l9i4srv77aa1pjfg22wxdp1x45gim9";
 | 
			
		||||
        sha256 = "sha256:1875qsdcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl";
 | 
			
		||||
      };
 | 
			
		||||
      # patch to work with latest, non-vulnerable libevhtp
 | 
			
		||||
      patches = [
 | 
			
		||||
| 
						 | 
				
			
			@ -36,7 +36,7 @@
 | 
			
		|||
        owner = "haiwen";
 | 
			
		||||
        repo = "seahub";
 | 
			
		||||
        rev = "v${version}-server";
 | 
			
		||||
        sha256 = "sha256:19f9279zqkfy39gs1qfaj0m8asva5jgadh8f0yln8ln4khsrcnk8";
 | 
			
		||||
        sha256 = "sha256:04wy0cj76j8kwgnx6iqja5gpc3q661lcy64qpqf3bzi907bad6xp";
 | 
			
		||||
      };
 | 
			
		||||
      phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
 | 
			
		||||
      installPhase = ''
 | 
			
		||||
| 
						 | 
				
			
			@ -75,7 +75,7 @@
 | 
			
		|||
        owner = "haiwen";
 | 
			
		||||
        repo = "ccnet-server";
 | 
			
		||||
        rev = "v${version}-server";
 | 
			
		||||
        sha256 = "sha256:11r80npg47xbkrak24lsv9f135p1hhmqwnn122nxnyidzs82fvm6";
 | 
			
		||||
        sha256 = "sha256:0mi0d2b4jwg511r0pp2ws9cw8ab6njplwy2a03wn6zi8q8fpjl38";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      buildInputs = [ vala libsearpc libuuid sqlite openssl libevent glib python27 ]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,8 +60,16 @@ index 21f955a..0606b28 100755
 | 
			
		|||
     send_error_reply (req, EVHTP_RES_BADREQ, err_msg);
 | 
			
		||||
 
 | 
			
		||||
     g_free (repo_id);
 | 
			
		||||
@@ -2667,32 +2667,32 @@ upload_file_init (evhtp_t *htp, const char *http_temp_dir)
 | 
			
		||||
     g_free (cluster_shared_dir);
 | 
			
		||||
diff --git a/server/upload-file.c b/server/upload-file.c
 | 
			
		||||
index 8dc6001..5233b50 100755
 | 
			
		||||
--- a/server/upload-file.c
 | 
			
		||||
+++ b/server/upload-file.c
 | 
			
		||||
@@ -2905,38 +2905,38 @@ upload_file_init (evhtp_t *htp, const char *http_temp_dir)
 | 
			
		||||
 
 | 
			
		||||
     cb = evhtp_set_regex_cb (htp, "^/upload/.*", upload_cb, NULL);
 | 
			
		||||
     /* upload_headers_cb() will be called after evhtp parsed all http headers. */
 | 
			
		||||
-    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
 
 | 
			
		||||
     cb = evhtp_set_regex_cb (htp, "^/upload-api/.*", upload_api_cb, NULL);
 | 
			
		||||
-    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
| 
						 | 
				
			
			@ -82,6 +90,10 @@ index 21f955a..0606b28 100755
 | 
			
		|||
 
 | 
			
		||||
     cb = evhtp_set_regex_cb (htp, "^/upload-aj/.*", upload_ajax_cb, NULL);
 | 
			
		||||
-    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
 
 | 
			
		||||
     cb = evhtp_set_regex_cb (htp, "^/update/.*", update_cb, NULL);
 | 
			
		||||
-    evhtp_set_hook(&cb->hooks, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
 
 | 
			
		||||
     cb = evhtp_set_regex_cb (htp, "^/update-api/.*", update_api_cb, NULL);
 | 
			
		||||
| 
						 | 
				
			
			@ -101,7 +113,7 @@ index 21f955a..0606b28 100755
 | 
			
		|||
+    evhtp_callback_set_hook(cb, evhtp_hook_on_headers, upload_headers_cb, NULL);
 | 
			
		||||
 
 | 
			
		||||
     evhtp_set_regex_cb (htp, "^/upload_progress.*", upload_progress_cb, NULL);
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
From b6c41aae74f1eb285a033125f4a5af578c8efbb6 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Ultima1252 <ultima1252@gmail.com>
 | 
			
		||||
Date: Mon, 15 Jan 2018 17:13:57 -0800
 | 
			
		||||
| 
						 | 
				
			
			@ -148,7 +160,16 @@ index c6fef89..78dece3 100644
 | 
			
		|||
 
 | 
			
		||||
 PKG_CHECK_MODULES(SSL, [openssl])
 | 
			
		||||
 AC_SUBST(SSL_CFLAGS)
 | 
			
		||||
@@ -227,6 +229,14 @@ PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
 | 
			
		||||
@@ -189,6 +189,8 @@ ZDB_REQUIRED=2.10
 | 
			
		||||
 CURL_REQUIRED=7.17
 | 
			
		||||
 FUSE_REQUIRED=2.7.3
 | 
			
		||||
 ZLIB_REQUIRED=1.2.0
 | 
			
		||||
+LIBEVHTP_REQUIRED=1.2.16
 | 
			
		||||
+ONIGURUMA_REQUIRED=5.9.2
 | 
			
		||||
 
 | 
			
		||||
 PKG_CHECK_MODULES(SSL, [openssl])
 | 
			
		||||
 AC_SUBST(SSL_CFLAGS)
 | 
			
		||||
@@ -222,6 +224,14 @@ PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_REQUIRED])
 | 
			
		||||
 AC_SUBST(ZLIB_CFLAGS)
 | 
			
		||||
 AC_SUBST(ZLIB_LIBS)
 | 
			
		||||
 
 | 
			
		||||
| 
						 | 
				
			
			@ -160,7 +181,6 @@ index c6fef89..78dece3 100644
 | 
			
		|||
+AC_SUBST(ONIGURUMA_CFLAGS)
 | 
			
		||||
+AC_SUBST(ONIGURUMA_LIBS)
 | 
			
		||||
+
 | 
			
		||||
 if test "x${MYSQL_CONFIG}" = "xdefault_mysql_config"; then
 | 
			
		||||
     PKG_CHECK_MODULES(MYSQL, [mysqlclient], [have_mysql="yes"], [have_mysql="no"])
 | 
			
		||||
     if test "x${have_mysql}" = "xyes"; then
 | 
			
		||||
    if test "x${have_mysql}" = "xyes"; then
 | 
			
		||||
 if test x${compile_python} = xyes; then
 | 
			
		||||
     AM_PATH_PYTHON([2.6])
 | 
			
		||||
     if test "$bwin32" = true; then
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue