New commits:
commit e9dd6808e0b49f1620d38025bbb8f2e392300f12
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>
ftp/rsync: version 3.2.4, SECURITY_PATCH++
diff --git a/ftp/rsync/BUILD b/ftp/rsync/BUILD
index 1dce478..9dcc0c3 100755
--- a/ftp/rsync/BUILD
+++ b/ftp/rsync/BUILD
@@ -1,5 +1,3 @@
-make_single &&
-
# LDFLAGS containing "-s" calls gcc and/or ld with "-s" which means
--strip-all
# with current (2.36) binutils and perhaps earlier versions this causes
# relocation entries in the .rela.plt section of type R_X86_64_IRELATIV to be
@@ -14,5 +12,4 @@ make_single &&
diff --git a/ftp/rsync/PRE_BUILD b/ftp/rsync/PRE_BUILD
new file mode 100755
index 0000000..005bf6d
--- /dev/null
+++ b/ftp/rsync/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/ftp/rsync/patches/configure.patch
b/ftp/rsync/patches/configure.patch
new file mode 100644
index 0000000..0988c6d
--- /dev/null
+++ b/ftp/rsync/patches/configure.patch
@@ -0,0 +1,27 @@
+diff --git a/configure.sh b/configure.sh
+--- a/configure.sh
++++ b/configure.sh
+@@ -9969,20 +9969,17 @@ if test x"$ac_cv_header_popt_popt_h" = x"yes"; then
+ # might conflict with the system popt.
+ with_included_popt=yes
+ elif test x"$ac_cv_header_popt_h" != x"yes"; then
+- with_included_popt=yes
++ with_included_popt=no
+ 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
++ if test x"$with_included_popt" = x"yes"; then
+ # 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" ;;
++ *-Wpedantic*) CFLAGS="$CFLAGS -Wno-pedantic" ;;
+ esac
+ fi
+ fi
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e9dd6808e0b49f1620d38025bbb8f2e392300f12),
Pavel Vinogradov, 04/17/2022