summaryrefslogtreecommitdiffstats
path: root/ftp
diff options
context:
space:
mode:
authorPavel Vinogradov2022-04-17 16:58:18 -0400
committerPavel Vinogradov2022-04-17 19:02:50 -0400
commite9dd6808e0b49f1620d38025bbb8f2e392300f12 (patch)
tree5369cff5d7f70943557bab3229254e3a1cdaf9e9 /ftp
parentda379d15dc71c267b0bfc38a0efb9da4867e84d6 (diff)
ftp/rsync: version 3.2.4, SECURITY_PATCH++
Diffstat (limited to 'ftp')
-rwxr-xr-xftp/rsync/BUILD5
-rwxr-xr-xftp/rsync/DEPENDS2
-rwxr-xr-xftp/rsync/DETAILS4
-rw-r--r--ftp/rsync/HISTORY7
-rwxr-xr-xftp/rsync/PRE_BUILD4
-rw-r--r--ftp/rsync/patches/configure.patch27
6 files changed, 43 insertions, 6 deletions
diff --git a/ftp/rsync/BUILD b/ftp/rsync/BUILD
index 1dce478cc1..9dcc0c38ab 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 &&
LDFLAGS=${LDFLAGS//-s /-Wl,--strip-debug } &&
LDFLAGS=${LDFLAGS/%-s/-Wl,--strip-debug} &&
-default_build &&
-make_normal
+default_build
diff --git a/ftp/rsync/DEPENDS b/ftp/rsync/DEPENDS
index 7ed7f82d10..89cf1666de 100755
--- a/ftp/rsync/DEPENDS
+++ b/ftp/rsync/DEPENDS
@@ -1,3 +1,5 @@
+depends zlib "--without-included-zlib" &&
+
optional_depends popt \
"--without-included-popt" \
"--with-included-popt" \
diff --git a/ftp/rsync/DETAILS b/ftp/rsync/DETAILS
index 71d03388ef..e5fce3b895 100755
--- a/ftp/rsync/DETAILS
+++ b/ftp/rsync/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=3.2.3
- SECURITY_PATCH=3
+ VERSION=3.2.4
+ SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY
index fdae9741ea..9f11bcf453 100644
--- a/ftp/rsync/HISTORY
+++ b/ftp/rsync/HISTORY
@@ -1,3 +1,10 @@
+2022-04-17 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 3.2.4, SECURITY_PATCH++, (CVE-2018-25032)
+ * BUILD: enabled parallel building
+ * DEPENDS: added zlib
+ * PRE_BUILD, patches/configure.patch: added patch to disable -pedantic-errors
+ and fix building with external popt
+
2021-09-19 Florian Franzmann <bwlf@bandrate.org>
* TRIGGERS: add trigger for openssl
diff --git a/ftp/rsync/PRE_BUILD b/ftp/rsync/PRE_BUILD
new file mode 100755
index 0000000000..005bf6d040
--- /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 0000000000..0988c6db96
--- /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