| 1 |
commit: 7a1ecd6cc46b1f97eef4b3d79c1bb03d41c133d0 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 21:41:18 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 21:42:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1ecd6c |
| 7 |
|
| 8 |
net-misc/rsync: Don't be so pedantic. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/883215 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/rsync/files/rsync-3.2.4-notpedantic.patch | 25 ++++++++++++++++++++++ |
| 14 |
net-misc/rsync/rsync-3.2.4-r3.ebuild | 1 + |
| 15 |
2 files changed, 26 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..9d081ab52c5b |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch |
| 22 |
@@ -0,0 +1,25 @@ |
| 23 |
+diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac |
| 24 |
+--- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100 |
| 25 |
++++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100 |
| 26 |
+@@ -1067,21 +1067,6 @@ |
| 27 |
+ with_included_popt=yes |
| 28 |
+ fi |
| 29 |
+ |
| 30 |
+-if test x"$GCC" = x"yes"; then |
| 31 |
+- if test x"$with_included_popt" != x"yes"; then |
| 32 |
+- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. |
| 33 |
+- CFLAGS="$CFLAGS -pedantic-errors" |
| 34 |
+- else |
| 35 |
+- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to |
| 36 |
+- # turn off pedantic warnings (which will not lose the error for array-init overflow). |
| 37 |
+- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists |
| 38 |
+- # -Wpedantic and use that as a flag. |
| 39 |
+- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in |
| 40 |
+- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; |
| 41 |
+- esac |
| 42 |
+- fi |
| 43 |
+-fi |
| 44 |
+- |
| 45 |
+ AC_MSG_CHECKING([whether to use included libpopt]) |
| 46 |
+ if test x"$with_included_popt" = x"yes"; then |
| 47 |
+ AC_MSG_RESULT($srcdir/popt) |
| 48 |
|
| 49 |
diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild |
| 50 |
index 41447f110e95..05ce39b226b0 100644 |
| 51 |
--- a/net-misc/rsync/rsync-3.2.4-r3.ebuild |
| 52 |
+++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild |
| 53 |
@@ -70,6 +70,7 @@ PATCHES=( |
| 54 |
"${FILESDIR}"/${P}-unsigned-char-checksum.patch |
| 55 |
# https://github.com/WayneD/rsync/issues/324 |
| 56 |
"${FILESDIR}"/${P}-strlcpy.patch |
| 57 |
+ "${FILESDIR}"/${P}-notpedantic.patch |
| 58 |
) |
| 59 |
|
| 60 |
pkg_setup() { |
Archives