mirror of
https://git.yoctoproject.org/poky
synced 2026-03-15 11:49:39 +01:00
73d1967498
0001-Add-missing-prototypes-to-function-declarations.patch makefile-no-rebuild.patch refreshed for 3.3.0 Changelog: ========== - Fixed a bug with '--sparse --inplace' where a trailing gap in the source file would not clear out the trailing data in the destination file. - Fixed an buffer overflow in the checksum2 code if SHA1 is being used for the checksum2 algorithm. - Fixed an issue when rsync is compiled using '_FORTIFY_SOURCE' so that the extra tests don't complain about a strlcpy() limit value (which was too large, even though it wasn't possible for the larger value to cause an overflow). - Add a backtick to the list of characters that the filename quoting needs to escape using backslashes. - Fixed a string-comparison issue in the internal handling of '--progress' (a locale such as tr_TR.utf-8 needed the internal triggering of '--info' options to use upper-case flag names to ensure that they match). - Make sure that a local transfer marks the sender side as trusted. - Change the argv handling to work with a newer popt library -- one that likes to free more data than it used to. - Rsync now calls 'OpenSSL_add_all_algorithms()' when compiled against an older openssl library. - Fixed a problem in the daemon auth for older protocols (29 and before) if the openssl library is being used to compute MD4 checksums. - Fixed 'rsync -VV' on Cygwin -- it needed a flush of stdout. - Fixed an old stats bug that counted devices as symlinks. (From OE-Core rev: 2c3b75a1f3b6d3177603b8982d61c5b8ba73aef0) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
80 lines
2.6 KiB
Diff
80 lines
2.6 KiB
Diff
From f446686c26c499e15ef17d495a93cfbc20e16090 Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@intel.com>
|
|
Date: Tue, 12 Apr 2016 15:51:54 +0100
|
|
Subject: [PATCH] rsync: remove upstream's rebuild logic
|
|
|
|
Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and
|
|
generally overcomplicated, and we ensure that autoreconf is invoked if required.
|
|
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
---
|
|
Makefile.in | 54 -----------------------------------------------------
|
|
1 file changed, 54 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index a1253e5..a084935 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -192,60 +192,6 @@ gensend: gen
|
|
fi
|
|
rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true
|
|
|
|
-aclocal.m4: $(srcdir)/m4/*.m4
|
|
- aclocal -I $(srcdir)/m4
|
|
-
|
|
-configure.sh config.h.in: configure.ac aclocal.m4
|
|
- @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
|
|
- @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
|
|
- autoconf -o configure.sh
|
|
- autoheader && touch config.h.in
|
|
- @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
|
|
- echo "configure.sh is unchanged."; \
|
|
- rm configure.sh.old; \
|
|
- else \
|
|
- echo "configure.sh has CHANGED."; \
|
|
- fi
|
|
- @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
|
|
- echo "config.h.in is unchanged."; \
|
|
- rm config.h.in.old; \
|
|
- else \
|
|
- echo "config.h.in has CHANGED."; \
|
|
- fi
|
|
- @if test -f configure.sh.old || test -f config.h.in.old; then \
|
|
- if test "$(MAKECMDGOALS)" = reconfigure; then \
|
|
- echo 'Continuing with "make reconfigure".'; \
|
|
- else \
|
|
- echo 'You may need to run:'; \
|
|
- echo ' make reconfigure'; \
|
|
- exit 1; \
|
|
- fi \
|
|
- fi
|
|
-
|
|
-.PHONY: reconfigure
|
|
-reconfigure: configure.sh
|
|
- ./config.status --recheck
|
|
- ./config.status
|
|
-
|
|
-.PHONY: restatus
|
|
-restatus:
|
|
- ./config.status
|
|
-
|
|
-Makefile: Makefile.in config.status configure.sh config.h.in
|
|
- @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
|
|
- @./config.status
|
|
- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
|
|
- echo "Makefile is unchanged."; \
|
|
- rm Makefile.old; \
|
|
- else \
|
|
- if test "$(MAKECMDGOALS)" = reconfigure; then \
|
|
- echo 'Continuing with "make reconfigure".'; \
|
|
- else \
|
|
- echo "Makefile updated -- rerun your make command."; \
|
|
- exit 1; \
|
|
- fi \
|
|
- fi
|
|
-
|
|
stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
|
|
sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
|
|
|