Browse Source

package/librsync: security bump to version 2.0.0

Removed patch applied upstream, switched to cmake-package following
upstream removal of autoconf.

Short summary of changes:

version 1.0.1
- switched from autoconf to cmake

version 1.0.0:
- fixed CVE-2014-8242
- project moved to github

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit b860bd83b22429175542f885fdd1fc52d770eeb2)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bernd Kuhls 8 years ago
parent
commit
3196246a9b

+ 0 - 37
package/librsync/0001-fix-build-with-clang.patch

@@ -1,37 +0,0 @@
-From 1175b1cd102ee15512185c7983868e5746959da0 Mon Sep 17 00:00:00 2001
-From: Adam Schubert <feartohell@seznam.cz>
-Date: Mon, 11 May 2015 04:25:45 +0200
-Subject: [PATCH] Fix build under clang
-
-Downloaded from upstream commit:
-https://github.com/librsync/librsync/commit/1175b1cd102ee15512185c7983868e5746959da0.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
----
- delta.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/delta.c b/delta.c
-index 19498f9..72afdf6 100644
---- a/delta.c
-+++ b/delta.c
-@@ -126,12 +126,12 @@ static rs_result rs_delta_s_scan(rs_job_t *job);
- static rs_result rs_delta_s_flush(rs_job_t *job);
- static rs_result rs_delta_s_end(rs_job_t *job);
- void rs_getinput(rs_job_t *job);
--inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
--inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
--inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
--inline rs_result rs_appendflush(rs_job_t *job);
--inline rs_result rs_processmatch(rs_job_t *job);
--inline rs_result rs_processmiss(rs_job_t *job);
-+static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len);
-+static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len);
-+static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
-+static inline rs_result rs_appendflush(rs_job_t *job);
-+static inline rs_result rs_processmatch(rs_job_t *job);
-+static inline rs_result rs_processmiss(rs_job_t *job);
- 
- /**
-  * \brief Get a block of data if possible, and see if it matches.

+ 1 - 1
package/librsync/Config.in

@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBRSYNC
 	  remote file synchronization that was popularized by the
 	  remote file synchronization that was popularized by the
 	  rsync utility and is used in rproxy.
 	  rsync utility and is used in rproxy.
 
 
-	  http://sourceforge.net/projects/librsync/
+	  https://github.com/librsync/librsync

+ 1 - 1
package/librsync/librsync.hash

@@ -1,2 +1,2 @@
 # Locally computed:
 # Locally computed:
-sha256  6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6  librsync-0.9.7.tar.gz
+sha256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169  librsync-v2.0.0.tar.gz

+ 3 - 3
package/librsync/librsync.mk

@@ -4,11 +4,11 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-LIBRSYNC_VERSION = 0.9.7
-LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
+LIBRSYNC_VERSION = v2.0.0
+LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION))
 LIBRSYNC_LICENSE = LGPLv2.1+
 LIBRSYNC_LICENSE = LGPLv2.1+
 LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
 
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))