From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Mar 2011 10:31:10 +0000 (+0100)
Subject: rsync: New package.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca81edda794ccfbc3457cb8e4a4778885e9f8bd2;p=ipfire-3.x.git

rsync: New package.

This is requires by git.
---

diff --git a/pkgs/rsync/patches/rsync-3.0.7-buf-overflow.patch b/pkgs/rsync/patches/rsync-3.0.7-buf-overflow.patch
new file mode 100644
index 000000000..2c6b19553
--- /dev/null
+++ b/pkgs/rsync/patches/rsync-3.0.7-buf-overflow.patch
@@ -0,0 +1,39 @@
+index 7139b10..fef15aa 100644
+--- a/flist.c
++++ b/flist.c
+@@ -1640,21 +1640,29 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+ 	}
+ 
+ 	p = fbuf + len;
+-	if (len != 1 || *fbuf != '/')
++	if (len == 1 && *fbuf == '/')
++		remainder = MAXPATHLEN - 1;
++	else if (len < MAXPATHLEN-1) {
+ 		*p++ = '/';
+-	*p = '\0';
+-	remainder = MAXPATHLEN - (p - fbuf);
++		*p = '\0';
++		remainder = MAXPATHLEN - (len + 1);
++	} else
++		remainder = 0;
+ 
+ 	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
+ 		char *dname = d_name(di);
+ 		if (dname[0] == '.' && (dname[1] == '\0'
+ 		    || (dname[1] == '.' && dname[2] == '\0')))
+ 			continue;
+-		if (strlcpy(p, dname, remainder) >= remainder) {
++		unsigned name_len = strlcpy(p, dname, remainder);
++		if (name_len >= remainder) {
++			char save = fbuf[len];
++			fbuf[len] = '\0';
+ 			io_error |= IOERR_GENERAL;
+ 			rprintf(FERROR_XFER,
+-				"cannot send long-named file %s\n",
+-				full_fname(fbuf));
++				"filename overflows max-path len by %u: %s/%s\n",
++				name_len - remainder + 1, fbuf, dname);
++			fbuf[len] = save;
+ 			continue;
+ 		}
+ 		if (dname[0] == '\0') {
diff --git a/pkgs/rsync/rsync.nm b/pkgs/rsync/rsync.nm
new file mode 100644
index 000000000..cec57fd4d
--- /dev/null
+++ b/pkgs/rsync/rsync.nm
@@ -0,0 +1,75 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = rsync
+PKG_VER        = 3.0.7
+PKG_REL        = 1
+
+PKG_MAINTAINER =
+PKG_GROUP      = Applications/Internet
+PKG_URL        = http://rsync.samba.org/
+PKG_LICENSE    = GPLv3+
+PKG_SUMMARY    = A program for synchronizing files over a network.
+
+PKG_BUILD_DEPS+= autoconf libacl-devel libattr-devel popt-devel
+
+define PKG_DESCRIPTION
+	Rsync uses a reliable algorithm to bring remote and host files into
+	sync very quickly. Rsync is fast because it just sends the differences
+	in the files over the network instead of sending the complete
+	files. Rsync is often used as a very powerful mirroring process or
+	just as a more capable replacement for the rcp command. A technical
+	report which describes the rsync algorithm is included in this
+	package.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+PKG_OBJECTS   += $(PKG_NAME)-patches-$(PKG_VER).tar.gz
+
+define STAGE_PREPARE_CMDS
+	cd $(DIR_SRC) && $(DO_EXTRACT) \
+		$(DIR_DL)/$(PKG_NAME)-patches-$(PKG_VER).tar.gz
+
+	cd $(DIR_APP) && chmod -x support/*
+
+	cd $(DIR_APP) && patch -Np1 -i patches/acls.diff
+	cd $(DIR_APP) && patch -Np1 -i patches/xattrs.diff
+	cd $(DIR_APP) && patch -Np1 -i patches/copy-devices.diff
+
+	cd $(DIR_APP) && rm -fr autum4te.cache
+	cd $(DIR_APP) && autoconf
+	cd $(DIR_APP) && autoheader
+endef
+
+STAGE_BUILD_TARGETS = proto all
+
+STAGE_INSTALL_TARGETS += INSTALLCMD="install -p" INSTALLMAN="install -p"
+
+define STAGE_INSTALL_CMDS
+	-mkdir -pv $(BUILDROOT)/etc/xinetd.d
+	install -p -m 644 $(DIR_SOURCE)/rsync.xinetd \
+		$(BUILDROOT)/etc/xinetd.d/rsync
+endef
diff --git a/pkgs/rsync/rsync.xinetd b/pkgs/rsync/rsync.xinetd
new file mode 100644
index 000000000..d4b591e3a
--- /dev/null
+++ b/pkgs/rsync/rsync.xinetd
@@ -0,0 +1,14 @@
+# default: off
+# description: The rsync server is a good addition to an ftp server, as it \
+#	allows crc checksumming etc.
+service rsync
+{
+	disable	= yes
+	flags		= IPv6
+	socket_type     = stream
+	wait            = no
+	user            = root
+	server          = /usr/bin/rsync
+	server_args     = --daemon
+	log_on_failure  += USERID
+}