rsync: add 3.0.0, fix 2.6.9 SRC_URI (close oebug 4020), unify

4 files changed, 65 insertions, 15 deletions

diff --git a/packages/rsync/files/m4.patch b/packages/rsync/files/m4.patch
new file mode 100644
index 0000000000..9279e0e354
--- /dev/null
+++ b/packages/rsync/files/m4.patch
@@ -0,0 +1,33 @@
+--- /dev/null	2008-03-14 20:41:13.712070199 -0500
++++ rsync-3.0.0/m4/have_type.m4	2008-03-15 03:28:57.000000000 -0500
+@@ -0,0 +1,30 @@
++dnl $Id: have-type.m4 14166 2004-08-26 12:35:42Z joda $
++dnl
++dnl check for existance of a type
++
++dnl AC_HAVE_TYPE(TYPE,INCLUDES)
++AC_DEFUN([AC_HAVE_TYPE], [
++AC_REQUIRE([AC_HEADER_STDC])
++cv=`echo "$1" | sed 'y%./+- %__p__%'`
++AC_MSG_CHECKING(for $1)
++AC_CACHE_VAL([ac_cv_type_$cv],
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++$2]],
++[[$1 foo;]])],
++[eval "ac_cv_type_$cv=yes"],
++[eval "ac_cv_type_$cv=no"]))dnl
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++AC_MSG_RESULT($ac_foo)
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	AC_CHECK_TYPES($1)
++fi
++  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
++fi
++])
diff --git a/packages/rsync/rsync.inc b/packages/rsync/rsync.inc
new file mode 100644
index 0000000000..0fbf1d9781
--- /dev/null
+++ b/packages/rsync/rsync.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "A file-synchronization tool"
+HOMEPAGE = "http://www.samba.org/rsync"
+SECTION = "console/network"
+LICENSE = "GPL"
+PRIORITY = "optional"
+
+inherit autotools
+
+EXTRA_OEMAKE='STRIP=""'
+
+do_install_append() {
+	install -d ${D}/etc
+	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
+}
+
diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb
index ab7ae43428..102f7e8eb8 100644
--- a/packages/rsync/rsync_2.6.9.bb
+++ b/packages/rsync/rsync_2.6.9.bb
@@ -1,17 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "A file-synchronization tool"
-SECTION = "console/network"
-PRIORITY = "optional"
-PR = "r0"
+require rsync.inc
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
-           file://rsyncd.conf"
-
-inherit autotools
+PR = "r1"
 
-do_install_append() {
-	install -d ${D}/etc
-	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
-}
-
-EXTRA_OEMAKE='STRIP=""'
+SRC_URI = "http://rsync.samba.org/ftp/old-versions/rsync/rsync-${PV}.tar.gz \
+           file://rsyncd.conf"
diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb
new file mode 100644
index 0000000000..5e0ca18c46
--- /dev/null
+++ b/packages/rsync/rsync_3.0.0.bb
@@ -0,0 +1,13 @@
+require rsync.inc
+
+DEPENDS += "popt"
+
+PR = "r0"
+
+SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
+           file://m4.patch;patch=1 \
+           file://rsyncd.conf"
+
+do_compile_prepend() {
+        sed -i "s/conf_stop make_stop//" Makefile
+}