add rsync client

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1217 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 83 insertions, 1 deletions

diff --git a/package/Config.in b/package/Config.in
index d1b281661..7e2b3e43a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -67,6 +67,7 @@ source "package/pptpd/Config.in"
 source "package/quagga/Config.in"
 source "package/radvd/Config.in"
 source "package/robocfg/Config.in"
+source "package/rsync/Config.in"
 source "package/ser/Config.in"
 source "package/shat/Config.in"
 source "package/siproxd/Config.in"
diff --git a/package/Makefile b/package/Makefile
index f9768de47..96bee7b4a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -86,6 +86,7 @@ package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_READLINE) += readline
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
+package-$(BR2_PACKAGE_RSYNC) += rsync
 package-$(BR2_PACKAGE_SABLEVM) += sablevm
 package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath
 package-$(BR2_PACKAGE_SCREEN) += screen
@@ -151,6 +152,7 @@ openswan-compile: gmp-compile
 osiris-compile: openssl-compile
 portmap-compile: tcp_wrappers-compile
 postgresql-compile: zlib-compile
+rsync-compile: popt-compile
 screen-compile: ncurses-compile
 siproxd-compile: libosip2-compile
 sipsak-compile: openssl-compile
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 2f95d6aee..6d6b6064b 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -32,7 +32,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --program-suffix="" \
 		  --prefix=/usr \
 		  --exec-prefix=/usr \
-		  --bindir=/usr/sbin \
+		  --bindir=/usr/bin \
 		  --datadir=/usr/share \
 		  --includedir=/usr/include \
 		  --infodir=/usr/share/info \
diff --git a/package/rsync/Config.in b/package/rsync/Config.in
new file mode 100644
index 000000000..f2849533b
--- /dev/null
+++ b/package/rsync/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_RSYNC
+	tristate "rsync"
+	select BR2_PACKAGE_LIBPOPT
+	default m if CONFIG_DEVEL
+	help
+
+	utility that provides fast incremental file transfer
+
+	http://rsync.samba.org
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
new file mode 100644
index 000000000..0cad9c7d2
--- /dev/null
+++ b/package/rsync/Makefile
@@ -0,0 +1,63 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rsync
+PKG_VERSION:=2.6.5
+PKG_RELEASE:=0
+PKG_MD5SUM:=3691cdf1540d0649ba679edce6bae8fc
+
+PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,RSYNC,rsync,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/bin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_RSYNC):
+	install -d -m0755 $(IDIR_RSYNC)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_RSYNC)/usr/bin
+	$(RSTRIP) $(IDIR_RSYNC)
+	$(IPKG_BUILD) $(IDIR_RSYNC) $(PACKAGE_DIR)
diff --git a/package/rsync/ipkg/rsync.control b/package/rsync/ipkg/rsync.control
new file mode 100644
index 000000000..55b4d7d13
--- /dev/null
+++ b/package/rsync/ipkg/rsync.control
@@ -0,0 +1,7 @@
+Package: rsync
+Priority: optional
+Section: net
+Maintainer: OpenWrt Developers <bugs@openwrt.org>
+Source:  http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rsync/
+Depends: libpopt
+Description: utility that provides fast incremental file transfer