[oe-commits] org.oe.dev rsync: add 3.0.0, fix 2.6.9 SRC_URI (close oebug 4020), unify

[xjqian commit]

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: c9bc09f719d390cef8cdc142b6bd68816982cb48
ViewMTN: http://monotone.openembedded.org/revision/info/c9bc09f719d390cef8cdc142b6bd68816982cb48
Files:
1
packages/rsync/rsync_2.6.9.bb
packages/rsync/rsync_3.0.0.bb
packages/rsync/files/m4.patch
packages/rsync/rsync.inc
Diffs:

#
# mt diff -r92176a70805253c8cd3be1b6954ea745442bc0b5 -rc9bc09f719d390cef8cdc142b6bd68816982cb48
#
#
#
# rename "packages/rsync/rsync_2.6.9.bb"
#     to "packages/rsync/rsync_3.0.0.bb"
# 
# add_file "packages/rsync/files/m4.patch"
#  content [245afc71ea7cc5ebb23be0e75cad1ede3d35eae6]
# 
# add_file "packages/rsync/rsync.inc"
#  content [05519dd3aa6db6db1269bd00ca5f86cb5352a580]
# 
# add_file "packages/rsync/rsync_2.6.9.bb"
#  content [c04a11b738d476c5a38376838a0c9a42a41cc5b4]
# 
# patch "packages/rsync/rsync_3.0.0.bb"
#  from [501be3705f610a3e0ce2de4a50854fe1cc789668]
#    to [ba379f6151654dbc3c4ca392b8176867756a9d19]
#
============================================================
--- packages/rsync/files/m4.patch	245afc71ea7cc5ebb23be0e75cad1ede3d35eae6
+++ packages/rsync/files/m4.patch	245afc71ea7cc5ebb23be0e75cad1ede3d35eae6
@@ -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
++])
============================================================
--- packages/rsync/rsync.inc	05519dd3aa6db6db1269bd00ca5f86cb5352a580
+++ packages/rsync/rsync.inc	05519dd3aa6db6db1269bd00ca5f86cb5352a580
@@ -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
+}
+
============================================================
--- packages/rsync/rsync_2.6.9.bb	c04a11b738d476c5a38376838a0c9a42a41cc5b4
+++ packages/rsync/rsync_2.6.9.bb	c04a11b738d476c5a38376838a0c9a42a41cc5b4
@@ -0,0 +1,6 @@
+require rsync.inc
+
+PR = "r1"
+
+SRC_URI = "http://rsync.samba.org/ftp/old-versions/rsync/rsync-${PV}.tar.gz \
+           file://rsyncd.conf"
============================================================
--- packages/rsync/rsync_2.6.9.bb	501be3705f610a3e0ce2de4a50854fe1cc789668
+++ packages/rsync/rsync_3.0.0.bb	ba379f6151654dbc3c4ca392b8176867756a9d19
@@ -1,17 +1,13 @@
-LICENSE = "GPL"
-DESCRIPTION = "A file-synchronization tool"
-SECTION = "console/network"
-PRIORITY = "optional"
+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"
 
-inherit autotools
-
-do_install_append() {
-	install -d ${D}/etc
-	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
+do_compile_prepend() {
+        sed -i "s/conf_stop make_stop//" Makefile
 }
-
-EXTRA_OEMAKE='STRIP=""'