Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8fb00ea252c05669a7471db2cdc9be8ab278fdb3..061af4173deaea3ed97352f69b496b96dbf6a9fb 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -251,7 +251,7 @@
 * rp-pppoe-3.8
 * rrdtool-1.2.15
 * rssdler-0.4.0a
-* rsync-2.6.9
+* rsync-3.0.4
 * rtorrent-0.7.9
 * samba-3.2.6
 * sane-1.0.19

diff --git a/lfs/rsync b/lfs/rsync
index dcb9ab49b618459fcfd4c4c1bef64ec82c657b0b..02753d946bca716f2c7aa4826df380d10b3eb824 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.9
+VER        = 3.0.4
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 996d8d8831dbca17910094e56dcb5942
+$(DL_FILE)_MD5 = 2b2d159c9bd1b5f8adfd8b13da3a1f3f
 
 install : $(TARGET)