diff options
| author | Pavel Vinogradov | 2022-09-10 17:35:23 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2022-09-10 17:42:22 -0400 |
| commit | 7c728ac6e7a7c0f221024ba459a8e6bc71894c9e (patch) | |
| tree | 616da086e4ac447cfcf6010d10e3f5afd8b2462b /ftp | |
| parent | 4da7cdd352db836a5f029c10e4684919249801d4 (diff) | |
ftp/rsync: version 3.2.6
Diffstat (limited to 'ftp')
| -rwxr-xr-x | ftp/rsync/DETAILS | 2 | ||||
| -rw-r--r-- | ftp/rsync/HISTORY | 4 | ||||
| -rwxr-xr-x | ftp/rsync/PRE_BUILD | 4 | ||||
| -rw-r--r-- | ftp/rsync/patches/configure.patch | 27 |
4 files changed, 5 insertions, 32 deletions
diff --git a/ftp/rsync/DETAILS b/ftp/rsync/DETAILS index 9f04d99935..22c2ebf4f4 100755 --- a/ftp/rsync/DETAILS +++ b/ftp/rsync/DETAILS @@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" SOURCE_IGNORE=volatile FORCE_DOWNLOAD=1 else - VERSION=3.2.5 + VERSION=3.2.6 SECURITY_PATCH=5 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY index c22c8fc515..a747f187b1 100644 --- a/ftp/rsync/HISTORY +++ b/ftp/rsync/HISTORY @@ -1,3 +1,7 @@ +2022-09-10 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.2.6 + * PRE_BUILD, patches/configure.patch: removed, fixed by upstream + 2022-08-15 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 3.2.5, SECURITY_PATCH++, (CVE-2022-29154) diff --git a/ftp/rsync/PRE_BUILD b/ftp/rsync/PRE_BUILD deleted file mode 100755 index 005bf6d040..0000000000 --- a/ftp/rsync/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd "${SOURCE_DIRECTORY}" && - -apply_patch_dir patches diff --git a/ftp/rsync/patches/configure.patch b/ftp/rsync/patches/configure.patch deleted file mode 100644 index 0988c6db96..0000000000 --- a/ftp/rsync/patches/configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 |