diff options
Diffstat (limited to 'meta/recipes-devtools/rsync')
-rw-r--r-- | meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/rsync/rsync_3.3.0.bb (renamed from meta/recipes-devtools/rsync/rsync_3.2.7.bb) | 2 |
3 files changed, 10 insertions, 12 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 8895adad74..2379de84f2 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 651425fced0691d9063fe417388ba6ca1c38c40b Mon Sep 17 00:00:00 2001 | 1 | From 2beb35c34c45320144f37b12ef4d72fb8734280e 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,7 +15,6 @@ 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 | |||
19 | --- | 18 | --- |
20 | checksum.c | 2 +- | 19 | checksum.c | 2 +- |
21 | exclude.c | 2 +- | 20 | exclude.c | 2 +- |
@@ -30,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
30 | 10 files changed, 12 insertions(+), 13 deletions(-) | 29 | 10 files changed, 12 insertions(+), 13 deletions(-) |
31 | 30 | ||
32 | diff --git a/checksum.c b/checksum.c | 31 | diff --git a/checksum.c b/checksum.c |
33 | index 60de365..67a9e16 100644 | 32 | index cb21882..736818b 100644 |
34 | --- a/checksum.c | 33 | --- a/checksum.c |
35 | +++ b/checksum.c | 34 | +++ b/checksum.c |
36 | @@ -778,7 +778,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list) | 35 | @@ -779,7 +779,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list) |
37 | } | 36 | } |
38 | #endif | 37 | #endif |
39 | 38 | ||
@@ -43,7 +42,7 @@ index 60de365..67a9e16 100644 | |||
43 | #if defined SUPPORT_XXH3 || defined USE_OPENSSL | 42 | #if defined SUPPORT_XXH3 || defined USE_OPENSSL |
44 | struct name_num_item *nni; | 43 | struct name_num_item *nni; |
45 | diff --git a/exclude.c b/exclude.c | 44 | diff --git a/exclude.c b/exclude.c |
46 | index ffe55b1..a85ea76 100644 | 45 | index 87edbcf..ae0de2f 100644 |
47 | --- a/exclude.c | 46 | --- a/exclude.c |
48 | +++ b/exclude.c | 47 | +++ b/exclude.c |
49 | @@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) | 48 | @@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) |
@@ -96,10 +95,10 @@ index e4ba1cc..8482b71 100644 | |||
96 | int options = LOG_PID; | 95 | int options = LOG_PID; |
97 | 96 | ||
98 | diff --git a/main.c b/main.c | 97 | diff --git a/main.c b/main.c |
99 | index d2a7b9b..c50af45 100644 | 98 | index 0c60b86..4bc664a 100644 |
100 | --- a/main.c | 99 | --- a/main.c |
101 | +++ b/main.c | 100 | +++ b/main.c |
102 | @@ -244,7 +244,7 @@ void read_del_stats(int f) | 101 | @@ -246,7 +246,7 @@ void read_del_stats(int f) |
103 | stats.deleted_files += stats.deleted_specials = read_varint(f); | 102 | stats.deleted_files += stats.deleted_specials = read_varint(f); |
104 | } | 103 | } |
105 | 104 | ||
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index 92ed1f4419..0c9ce8b8e3 100644 --- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 81700d1a0e51391028c761cc8ef1cd660084d114 Mon Sep 17 00:00:00 2001 | 1 | From f446686c26c499e15ef17d495a93cfbc20e16090 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 | 3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 |
4 | Subject: [PATCH] rsync: remove upstream's rebuild logic | 4 | Subject: [PATCH] rsync: remove upstream's rebuild logic |
@@ -8,16 +8,15 @@ generally overcomplicated, and we ensure that autoreconf is invoked if required. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | Makefile.in | 54 ----------------------------------------------------- | 12 | Makefile.in | 54 ----------------------------------------------------- |
14 | 1 file changed, 54 deletions(-) | 13 | 1 file changed, 54 deletions(-) |
15 | 14 | ||
16 | diff --git a/Makefile.in b/Makefile.in | 15 | diff --git a/Makefile.in b/Makefile.in |
17 | index 3cde955..d963a70 100644 | 16 | index a1253e5..a084935 100644 |
18 | --- a/Makefile.in | 17 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
20 | @@ -190,60 +190,6 @@ gensend: gen | 19 | @@ -192,60 +192,6 @@ gensend: gen |
21 | fi | 20 | fi |
22 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true | 21 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true |
23 | 22 | ||
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.7.bb b/meta/recipes-devtools/rsync/rsync_3.3.0.bb index 130581a785..b42026331d 100644 --- a/meta/recipes-devtools/rsync/rsync_3.2.7.bb +++ b/meta/recipes-devtools/rsync/rsync_3.3.0.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ | |||
16 | file://determism.patch \ | 16 | file://determism.patch \ |
17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ | 17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" | 19 | SRC_URI[sha256sum] = "7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90" |
20 | 20 | ||
21 | inherit autotools-brokensep | 21 | inherit autotools-brokensep |
22 | 22 | ||