diff options
-rw-r--r-- | meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch | 28 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync_3.2.7.bb (renamed from meta/recipes-devtools/rsync/rsync_3.2.5.bb) | 2 |
3 files changed, 20 insertions, 46 deletions
diff --git a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch index 474d82db22..8895adad74 100644 --- a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch +++ b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 785c0072c80c2f6e0839478453cf65fdeac15da0 Mon Sep 17 00:00:00 2001 | 1 | From 651425fced0691d9063fe417388ba6ca1c38c40b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 29 Aug 2022 19:53:28 -0700 | 3 | Date: Mon, 29 Aug 2022 19:53:28 -0700 |
4 | Subject: [PATCH] Add missing prototypes to function declarations | 4 | Subject: [PATCH] Add missing prototypes to function declarations |
@@ -15,6 +15,7 @@ Fixes errors like | |||
15 | 15 | ||
16 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032858.html] | 16 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032858.html] |
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | |||
18 | --- | 19 | --- |
19 | checksum.c | 2 +- | 20 | checksum.c | 2 +- |
20 | exclude.c | 2 +- | 21 | exclude.c | 2 +- |
@@ -29,23 +30,23 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 10 files changed, 12 insertions(+), 13 deletions(-) | 30 | 10 files changed, 12 insertions(+), 13 deletions(-) |
30 | 31 | ||
31 | diff --git a/checksum.c b/checksum.c | 32 | diff --git a/checksum.c b/checksum.c |
32 | index fb8c0a0..174c28c 100644 | 33 | index 60de365..67a9e16 100644 |
33 | --- a/checksum.c | 34 | --- a/checksum.c |
34 | +++ b/checksum.c | 35 | +++ b/checksum.c |
35 | @@ -629,7 +629,7 @@ int sum_end(char *sum) | 36 | @@ -778,7 +778,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list) |
36 | return csum_len_for_type(cursum_type, 0); | ||
37 | } | 37 | } |
38 | #endif | ||
38 | 39 | ||
39 | -void init_checksum_choices() | 40 | -void init_checksum_choices() |
40 | +void init_checksum_choices(void) | 41 | +void init_checksum_choices(void) |
41 | { | 42 | { |
42 | #ifdef SUPPORT_XXH3 | 43 | #if defined SUPPORT_XXH3 || defined USE_OPENSSL |
43 | char buf[32816]; | 44 | struct name_num_item *nni; |
44 | diff --git a/exclude.c b/exclude.c | 45 | diff --git a/exclude.c b/exclude.c |
45 | index adc82e2..79f5a82 100644 | 46 | index ffe55b1..a85ea76 100644 |
46 | --- a/exclude.c | 47 | --- a/exclude.c |
47 | +++ b/exclude.c | 48 | +++ b/exclude.c |
48 | @@ -358,7 +358,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) | 49 | @@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) |
49 | memcpy(partial_string_buf, s_start, partial_string_len); | 50 | memcpy(partial_string_buf, s_start, partial_string_len); |
50 | } | 51 | } |
51 | 52 | ||
@@ -53,9 +54,9 @@ index adc82e2..79f5a82 100644 | |||
53 | +void free_implied_include_partial_string(void) | 54 | +void free_implied_include_partial_string(void) |
54 | { | 55 | { |
55 | if (partial_string_buf) { | 56 | if (partial_string_buf) { |
56 | free(partial_string_buf); | 57 | if (partial_string_len) |
57 | diff --git a/hlink.c b/hlink.c | 58 | diff --git a/hlink.c b/hlink.c |
58 | index 66810a3..6511dfb 100644 | 59 | index 20291f2..5c26a6b 100644 |
59 | --- a/hlink.c | 60 | --- a/hlink.c |
60 | +++ b/hlink.c | 61 | +++ b/hlink.c |
61 | @@ -117,8 +117,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count) | 62 | @@ -117,8 +117,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count) |
@@ -82,7 +83,7 @@ index a1a7245..4eae062 100644 | |||
82 | 83 | ||
83 | /* statistical data */ | 84 | /* statistical data */ |
84 | diff --git a/log.c b/log.c | 85 | diff --git a/log.c b/log.c |
85 | index 44344e2..991e359 100644 | 86 | index e4ba1cc..8482b71 100644 |
86 | --- a/log.c | 87 | --- a/log.c |
87 | +++ b/log.c | 88 | +++ b/log.c |
88 | @@ -131,7 +131,7 @@ static void logit(int priority, const char *buf) | 89 | @@ -131,7 +131,7 @@ static void logit(int priority, const char *buf) |
@@ -95,7 +96,7 @@ index 44344e2..991e359 100644 | |||
95 | int options = LOG_PID; | 96 | int options = LOG_PID; |
96 | 97 | ||
97 | diff --git a/main.c b/main.c | 98 | diff --git a/main.c b/main.c |
98 | index 9ebfbea..affa244 100644 | 99 | index d2a7b9b..c50af45 100644 |
99 | --- a/main.c | 100 | --- a/main.c |
100 | +++ b/main.c | 101 | +++ b/main.c |
101 | @@ -244,7 +244,7 @@ void read_del_stats(int f) | 102 | @@ -244,7 +244,7 @@ void read_del_stats(int f) |
@@ -168,6 +169,3 @@ index bbba7b2..61f8dc9 100644 | |||
168 | { | 169 | { |
169 | uLong flags; | 170 | uLong flags; |
170 | 171 | ||
171 | -- | ||
172 | 2.37.2 | ||
173 | |||
diff --git a/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch b/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch index 1d9c4bfe48..f11f13dd48 100644 --- a/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch +++ b/meta/recipes-devtools/rsync/files/0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e64a58387db46239902b610871a0eb81626e99ff Mon Sep 17 00:00:00 2001 | 1 | From e6321b0b456fca987b48d5ec7aba7e2826128e5f Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggert <eggert@cs.ucla.edu> | 2 | From: Paul Eggert <eggert@cs.ucla.edu> |
3 | Date: Thu, 18 Aug 2022 07:46:28 -0700 | 3 | Date: Thu, 18 Aug 2022 07:46:28 -0700 |
4 | Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure' | 4 | Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure' |
@@ -6,37 +6,16 @@ Subject: [PATCH] Turn on -pedantic-errors at the end of 'configure' | |||
6 | Problem reported by Khem Raj in: | 6 | Problem reported by Khem Raj in: |
7 | https://lists.gnu.org/r/autoconf-patches/2022-08/msg00009.html | 7 | https://lists.gnu.org/r/autoconf-patches/2022-08/msg00009.html |
8 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032862.html] | 8 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032862.html] |
9 | |||
9 | --- | 10 | --- |
10 | configure.ac | 35 ++++++++++++++++++++--------------- | 11 | configure.ac | 20 ++++++++++++++++++++ |
11 | 1 file changed, 20 insertions(+), 15 deletions(-) | 12 | 1 file changed, 20 insertions(+) |
12 | 13 | ||
13 | diff --git a/configure.ac b/configure.ac | 14 | diff --git a/configure.ac b/configure.ac |
14 | index d185b2d3..7e9514f7 100644 | 15 | index a2c9955..afabef0 100644 |
15 | --- a/configure.ac | 16 | --- a/configure.ac |
16 | +++ b/configure.ac | 17 | +++ b/configure.ac |
17 | @@ -1071,21 +1071,6 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then | 18 | @@ -1437,6 +1437,26 @@ case "$CC" in |
18 | with_included_popt=yes | ||
19 | fi | ||
20 | |||
21 | -if test x"$GCC" = x"yes"; then | ||
22 | - if test x"$with_included_popt" != x"yes"; then | ||
23 | - # Turn pedantic warnings into errors to ensure an array-init overflow is an error. | ||
24 | - CFLAGS="$CFLAGS -pedantic-errors" | ||
25 | - else | ||
26 | - # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to | ||
27 | - # turn off pedantic warnings (which will not lose the error for array-init overflow). | ||
28 | - # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists | ||
29 | - # -Wpedantic and use that as a flag. | ||
30 | - case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in | ||
31 | - *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; | ||
32 | - esac | ||
33 | - fi | ||
34 | -fi | ||
35 | - | ||
36 | AC_MSG_CHECKING([whether to use included libpopt]) | ||
37 | if test x"$with_included_popt" = x"yes"; then | ||
38 | AC_MSG_RESULT($srcdir/popt) | ||
39 | @@ -1444,6 +1429,26 @@ case "$CC" in | ||
40 | ;; | 19 | ;; |
41 | esac | 20 | esac |
42 | 21 | ||
@@ -63,6 +42,3 @@ index d185b2d3..7e9514f7 100644 | |||
63 | AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) | 42 | AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) |
64 | AC_OUTPUT | 43 | AC_OUTPUT |
65 | 44 | ||
66 | -- | ||
67 | 2.37.1 | ||
68 | |||
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.5.bb b/meta/recipes-devtools/rsync/rsync_3.2.7.bb index 0bbbac7ace..e52699d24f 100644 --- a/meta/recipes-devtools/rsync/rsync_3.2.5.bb +++ b/meta/recipes-devtools/rsync/rsync_3.2.7.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ | |||
17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ | 17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ |
18 | file://0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch \ | 18 | file://0001-Turn-on-pedantic-errors-at-the-end-of-configure.patch \ |
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba" | 20 | SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" |
21 | 21 | ||
22 | # -16548 required for v3.1.3pre1. Already in v3.1.3. | 22 | # -16548 required for v3.1.3pre1. Already in v3.1.3. |
23 | CVE_CHECK_IGNORE += " CVE-2017-16548 " | 23 | CVE_CHECK_IGNORE += " CVE-2017-16548 " |