mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
net-misc/rsync: Sync with Gentoo
It's from Gentoo commit 5aa9c9fc176a898f9b64e403b6a313478d23c6bf.
This commit is contained in:
parent
26515bb104
commit
3f4acc43dd
@ -1,25 +0,0 @@
|
||||
diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac
|
||||
--- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100
|
||||
+++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100
|
||||
@@ -1067,21 +1067,6 @@
|
||||
with_included_popt=yes
|
||||
fi
|
||||
|
||||
-if test x"$GCC" = x"yes"; then
|
||||
- if test x"$with_included_popt" != x"yes"; then
|
||||
- # Turn pedantic warnings into errors to ensure an array-init overflow is an error.
|
||||
- CFLAGS="$CFLAGS -pedantic-errors"
|
||||
- else
|
||||
- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to
|
||||
- # turn off pedantic warnings (which will not lose the error for array-init overflow).
|
||||
- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists
|
||||
- # -Wpedantic and use that as a flag.
|
||||
- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in
|
||||
- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
|
||||
- esac
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
AC_MSG_CHECKING([whether to use included libpopt])
|
||||
if test x"$with_included_popt" = x"yes"; then
|
||||
AC_MSG_RESULT($srcdir/popt)
|
||||
@ -1,46 +0,0 @@
|
||||
https://github.com/WayneD/rsync/issues/324
|
||||
https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b
|
||||
|
||||
From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001
|
||||
From: Wayne Davison <wayne@opencoder.net>
|
||||
Date: Sun, 19 Jun 2022 10:02:51 -0700
|
||||
Subject: [PATCH] Include bsd/strings.h if it exists
|
||||
|
||||
Some systems apparently put strlcpy() into a separate bsd/strings.h file
|
||||
without putting the function into a separate library. Thus, configure
|
||||
finds that the function exists for linking but the build does not have
|
||||
the declaration (which rsync only supplies if it is also supplying its
|
||||
own version of the function).
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
rsync.h | 3 +++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 37dbb18a..37241637 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
|
||||
netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
|
||||
sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
|
||||
popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \
|
||||
- zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
|
||||
+ zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \
|
||||
+ bsd/string.h)
|
||||
AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include <netinet/in.h>]])
|
||||
AC_HEADER_MAJOR_FIXED
|
||||
|
||||
diff --git a/rsync.h b/rsync.h
|
||||
index e5aacd25..1cc037c5 100644
|
||||
--- a/rsync.h
|
||||
+++ b/rsync.h
|
||||
@@ -338,6 +338,9 @@ enum delret {
|
||||
# endif
|
||||
# include <string.h>
|
||||
#endif
|
||||
+#ifdef HAVE_BSD_STRING_H
|
||||
+# include <bsd/string.h>
|
||||
+#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
# include <strings.h>
|
||||
#endif
|
||||
@ -1,12 +0,0 @@
|
||||
https://lists.samba.org/archive/rsync-announce/2022/000111.html
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1117,7 +1117,7 @@ else
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
|
||||
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
|
||||
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
|
||||
if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then
|
||||
AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
|
||||
fi
|
||||
@ -27,7 +27,7 @@ else
|
||||
SRC_DIR="src-previews"
|
||||
else
|
||||
SRC_DIR="src"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user