Merge branch '3.0' into 3.1

rsync/.md5sum

@@ -1,4 +1,4 @@
-3be148772a33224771a8d4d2a028b132  rsync-3.1.0.tar.gz
+43bd6676f0b404326eee2d63be3cdcfe  rsync-3.1.1.tar.gz
 bd6cc8e2c83d5e845af20a30e105fb5f  rsync.driver
 a71995f22768c931c5649a1336d25ffb  rsyncd
 b4e95fa8c8f3ae13cfdf616abd6a3960  rsyncd.conf

rsync/Pkgfile

@@ -1,10 +1,10 @@
 # Description: Utility for incremental file transfers over networks
 # URL:         http://rsync.samba.org
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
-# Depends on:  acl zlib
+# Depends on:  acl
 
 name=rsync
-version=3.1.0
+version=3.1.1
 release=1
 source=(http://rsync.samba.org/ftp/$name/src/$name-$version.tar.gz \
         rsyncd.conf rsyncd rsync.driver)
@@ -16,7 +16,7 @@ build () {
                 --mandir=/usr/man \
                 --with-rsh=ssh \
                 --with-included-popt \
-                --with-included-zlib=no
+                --with-included-zlib
 
     make
     make DESTDIR=$PKG install