librsync: 0.9.7 -> 2.2.1

4 files changed, 18 insertions, 53 deletions

diff --git a/librsync/.footprint b/librsync/.footprint
index 51f4c4759..cf89770e6 100644
--- a/librsync/.footprint
+++ b/librsync/.footprint
@@ -1,13 +1,11 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/librsync-config.h
 -rw-r--r--	root/root	usr/include/librsync.h
+-rw-r--r--	root/root	usr/include/librsync_export.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/librsync.a
--rwxr-xr-x	root/root	usr/lib/librsync.la
-lrwxrwxrwx	root/root	usr/lib/librsync.so -> librsync.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib/librsync.so.1 -> librsync.so.1.0.2
--rwxr-xr-x	root/root	usr/lib/librsync.so.1.0.2
+lrwxrwxrwx	root/root	usr/lib/librsync.so -> librsync.so.2
+lrwxrwxrwx	root/root	usr/lib/librsync.so.2 -> librsync.so.2.2.1
+-rwxr-xr-x	root/root	usr/lib/librsync.so.2.2.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man3/
diff --git a/librsync/.signature b/librsync/.signature
index 1d4a652d9..4722dba21 100644
--- a/librsync/.signature
+++ b/librsync/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RGJ6h1fjMTWHRsMwt1m33c+6xhZZ18NdUEMxviItrJiVuOKGn78A2eNBr4r529tmK3IHuySw8U5LSY6r6kwfA8=
-SHA256 (Pkgfile) = 524144dc0b5490e536d8fda798fe2939f1f3c067898e7bd14529b6c9ef506bd5
-SHA256 (.footprint) = 3e832baa5247014b98147510ccc38d146b1565f1ddc7258fa7f2bd073f5af06d
-SHA256 (librsync-0.9.7.tar.gz) = 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
-SHA256 (librsync.patch) = 3e9af018401b964512274c67d6b7bf427222cf9a40f280d3b5b531fdcb32410b
+RWSE3ohX2g5d/Yvo4SZuDLJIOrSeG1Uv3+xaei5tt1rwWtQGBMkCyy1wE1hlNCU0Cysv5mYQEgaN4XZgjRgy6zuIJ4ab4JWEwQc=
+SHA256 (Pkgfile) = 363d4878e571a9d6c02bb37fb075a36861acd691d28f8708ea7958c35a6917fb
+SHA256 (.footprint) = 03a8844b2f8f2f474d1d21b63efb47d1a18cd656a932d5e84c0677c6d4c744a6
+SHA256 (librsync-v2.2.1.tar.gz) = b5ab8e2092b82b7d7bb9c1dd52e6a77083a89f8ad9b9309da611f490d0b49a71
diff --git a/librsync/Pkgfile b/librsync/Pkgfile
index d16571921..402b8f91e 100644
--- a/librsync/Pkgfile
+++ b/librsync/Pkgfile
@@ -1,24 +1,23 @@
 # Description: Library for delta compression of streams
 # URL: http://librsync.sourceforge.net/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager: Simon Glossner, viper at hometux dot de
-# Depends on: popt
+# Depends on: popt cmake
 
 name=librsync
-version=0.9.7
-release=2
-source=(http://download.sourceforge.net/${name}/${name}-${version}.tar.gz
-  librsync.patch)
+version=2.2.1
+release=1
+source=(https://github.com/$name/$name/archive/v$version/$name-v$version.tar.gz)
 
 build() {
     cd $name-$version
 
-    patch -p1 < $SRC/librsync.patch
+    mkdir build
+    cd build
 
-    ./configure \
-      --prefix=/usr \
-      --enable-shared \
-      --mandir=/usr/share/man
+    cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DCMAKE_BUILD_TYPE=Release
 
     make
     make DESTDIR=$PKG install
diff --git a/librsync/librsync.patch b/librsync/librsync.patch
deleted file mode 100644
index 16ea49e82..000000000
--- a/librsync/librsync.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nru librsync-0.9.7/mdfour.h librsync-0.9.7-new/mdfour.h
---- librsync-0.9.7/mdfour.h	2004-02-08 00:17:57.000000000 +0100
-+++ librsync-0.9.7-new/mdfour.h	2007-07-26 21:50:26.000000000 +0200
-@@ -24,7 +24,7 @@
- #include "types.h"
- 
- struct rs_mdfour {
--    int                 A, B, C, D;
-+    unsigned int        A, B, C, D;
- #if HAVE_UINT64
-     uint64_t            totalN;
- #else
-diff -Nru librsync-0.9.7/patch.c librsync-0.9.7-new/patch.c
---- librsync-0.9.7/patch.c	2004-09-17 23:35:50.000000000 +0200
-+++ librsync-0.9.7-new/patch.c	2007-07-26 21:50:06.000000000 +0200
-@@ -214,12 +214,12 @@
-     void            *buf, *ptr;
-     rs_buffers_t    *buffs = job->stream;
- 
--    len = job->basis_len;
--    
-     /* copy only as much as will fit in the output buffer, so that we
-      * don't have to block or store the input. */
--    if (len > buffs->avail_out)
-+    if (job->basis_len > buffs->avail_out)
-         len = buffs->avail_out;
-+    else
-+        len = job->basis_len;
- 
-     if (!len)
-         return RS_BLOCKED;