diff --git a/705.patch b/705.patch deleted file mode 100644 index 2f0b211..0000000 --- a/705.patch +++ /dev/null @@ -1,33 +0,0 @@ -From efb85fd8db9e8f74eb3ab91ebf44f6ed35e3da5b Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Wed, 15 Jan 2025 15:10:24 +0100 -Subject: [PATCH] Fix FLAG_GOT_DIR_FLIST collission with FLAG_HLINKED - -fixes commit 688f5c379a43 (Refuse a duplicate dirlist.) - -Fixes: https://github.com/RsyncProject/rsync/issues/702 -Fixes: https://github.com/RsyncProject/rsync/issues/697 ---- - rsync.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync.h b/rsync.h -index 9be1297b..479ac484 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -84,7 +84,6 @@ - #define FLAG_DUPLICATE (1<<4) /* sender */ - #define FLAG_MISSING_DIR (1<<4) /* generator */ - #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */ --#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */ - #define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */ - #define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */ - #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ -@@ -93,6 +92,7 @@ - #define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */ - #define FLAG_TIME_FAILED (1<<11)/* generator */ - #define FLAG_MOD_NSEC (1<<12) /* sender/receiver/generator */ -+#define FLAG_GOT_DIR_FLIST (1<<13)/* sender/receiver/generator - dir_flist only */ - - /* These flags are passed to functions but not stored. */ - diff --git a/rsync-3.4.0.tar.gz b/rsync-3.4.0.tar.gz deleted file mode 100644 index d68c7bb..0000000 --- a/rsync-3.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e942f95a44226a012fe822faffa6c7fc38c34047add3a0c941e9bc8b8b93aa4 -size 1167983 diff --git a/rsync-3.4.0.tar.gz.asc b/rsync-3.4.0.tar.gz.asc deleted file mode 100644 index 1dc4b48..0000000 --- a/rsync-3.4.0.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJIBAABCgAyFiEEn+8RLc4ZoNx+iCy4G7JJl6hTX28FAmeGuIAUHGFuZHJld0B0 -cmlkZ2VsbC5uZXQACgkQG7JJl6hTX29nyRAAn8QQ88FiH7auK/Jsw876mHGrvwv6 -U4ny4S7GXaWjmk3gsl8U7U1agst18az39nsKmf4ILo29JuLtMRb3qMrOPCemOJF5 -qKTNQNn0H2qKkyAJQHivtKDxI++ZW0O7dtoEcoMVbuR8S/f1z0xH4cOcP52XnLSa -4/ycwDTS2MC1o5OIoVdgSSyB7/WYwU/b/0DR9ZUpRlPa4M3Six5cOJeu22+XQx9O -MXQ6xHMCzyN52jNs449TrXzFU1cGtliA4ug/FkgXD5Tkdn+Ktrb2oeWk37bDvYx6 -waL5SBGrSiMmDAHHnmRCW+0xWxBe8fR5RgQRiyMmIVIewZmH6PczsB3z8Q6bTwLU -7fhBVd4jX3kxsv7t+VkeVTsw6bAKIw/vDNKnhwpOTLGLkLvVmt+r6OBRXl5CuhT8 -sU3+Jj4cZ7XSPgcAA3P/nVX9Lbrj5iff1/bebIHXcNNh30gMP89PFaVoAr0O/XOm -94pqiLAFPwnzhc8QJN8VRc+ERB6Mjp6aTozLGoDIfLGEs5PUOyY5RC4x6mjUKzla -zu7lCNEJ2U4+nQr33qKBrvPCmz/Ku4bwsqtPbUUVPUsSBmLJdZCcLD7yHbTSYTbG -NRQXZ19pzhGJWYoNZsiobveLK/C3Qgx8ZH3DFw4vqNHVV/sk05zrIT3WC+twagJl -aLNsQ67nthgXqmk= -=6bD5 ------END PGP SIGNATURE----- diff --git a/rsync-3.4.1.tar.gz b/rsync-3.4.1.tar.gz new file mode 100644 index 0000000..1589548 --- /dev/null +++ b/rsync-3.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 +size 1172739 diff --git a/rsync-3.4.1.tar.gz.asc b/rsync-3.4.1.tar.gz.asc new file mode 100644 index 0000000..a5450f2 --- /dev/null +++ b/rsync-3.4.1.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJIBAABCgAyFiEEn+8RLc4ZoNx+iCy4G7JJl6hTX28FAmeIIGUUHGFuZHJld0B0 +cmlkZ2VsbC5uZXQACgkQG7JJl6hTX2+pjg//dRhZGf01aiIFnXsJUqwPCYM7o68X +mBZjw3UjylPyMQd5GhRUtGn1biTkKjbQh5L1YUrbX7afkjnu4nUy4KQ6SbjBI0wf +0roXeXnx+3tCwYke0074b+MBmIVcFgNt6BH+g5gDT0vaMCD7hvM4qVLZvWj3Jb6/ +Ujc1Gq27ZoYTPTzbb0Q7XncACYDxbrIV8FY2pWouFq1SaWPXzqlHzE6HSclXA+M9 +GTai1ggMM2EA0Azqjpq8/40y7ZjkfU3zuFTJKBUpSmCNV1He1pqpCRdhwAhNeV21 +T6BmtgBN9Ibr4twXcHGrBNRypnxd0sPEYHL2q7kJ+WcJ35ukgYOG0aSn/p90SacQ +HKjWF7TMx2l8N2YXmxZOT4MECrMyzDhyJVBp4veDfVQKgr28SscNp63m54Ta6rR9 +Cv5Hlq9kFDBo0csDoGGfRVyrje0qHaEjfSpPesEIMyXuTdAnUFYNlghJ9KCqtCSO ++Yfj6h5pz6cZNRP8SrIQf40mzRpgH2rND22hBWOBvqZFVTQJoM2CHhrJfu9z9IB5 +erZPskT/OxWCNtcE2S/ZAfUzxXAAu2Zb+LYuJcA8mAuk09q0aUiyku2UmFE2vRkb +0Eh2ftNFc+vQBV8ig2yuCqcm3z5rdARGJDu56ZAVlx8JMQmvLfR4zG4VP2JfSMUq +ge9M2zu4k2jNLtk= +=puFB +-----END PGP SIGNATURE----- diff --git a/rsync-patches-3.4.0.tar.gz b/rsync-patches-3.4.0.tar.gz deleted file mode 100644 index f0f5570..0000000 --- a/rsync-patches-3.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51533dc5b9b4293d3499b673df185c93484f3e6fcf2de52f9bf1f07fa3d7cbc1 -size 103831 diff --git a/rsync-patches-3.4.0.tar.gz.asc b/rsync-patches-3.4.0.tar.gz.asc deleted file mode 100644 index 05fedde..0000000 --- a/rsync-patches-3.4.0.tar.gz.asc +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJIBAABCgAyFiEEn+8RLc4ZoNx+iCy4G7JJl6hTX28FAmeGuIAUHGFuZHJld0B0 -cmlkZ2VsbC5uZXQACgkQG7JJl6hTX2/6cg/+LZBcaBsD6AAIDRQeBh5XvGWqZowx -Zb66c52bSJ4WmruG2ccnBsxQLUhwHws/Rxqak7M5bUP11Z54ub+exSXxMVB8yFs7 -KZ1TyQKfiV1TJSspK8LQT6+mndlHAkpXAZWChWrKiQLUC1hrEpqRN+kFGEEqpNAB -+8+dtnGf4x3WQpMRybadvw5WR6y1EgkJbZrqikLgi9edmi9UVE1VWfDoA96yR8eA -d5g9daNSx+QdqlWXt8L3djZG56l+QQhcKb6h/35+wHjaV1PgCq+zDdujn1v34ZtR -7FMdqeEXWudiGU3U1xLay/sz057ZGhVXO7fRmcC4OhBEMTYNyzHO42yz0O3Sxe8j -oK7+qJGqzsyLDtgpsHJFKXG8xBqGNoW/9c6RaJhEQyCgF0VhifE5aWbId7IwlSB3 -IzZuXcuGWUG0EhodNMQjYLxpdWfZexxkExu6Fx7D3RiOx04p5Rgb3EX9dP1tjVkt -iWWVuHE9WI4NO85YXtKNYkRz9jESIhc9m+B7BzWmD/R9/r4OjfY0nlrrE9l9bTWg -lm44bVRofY2SfO8cJgH3wCa4znUUBud7hAgBpKjnOXDEedLtmQOdbbDBvWGj64kS -V9pZ4tSkaZT+ojgHhPAfqLqkQoVlHWs0q9R5PqjCRTWFynzi85rl9ForJXpo7UHU -lJaIYEmTUu5Ub50= -=MYKy ------END PGP SIGNATURE----- - diff --git a/rsync-patches-3.4.1.tar.gz b/rsync-patches-3.4.1.tar.gz new file mode 100644 index 0000000..af7a5c8 --- /dev/null +++ b/rsync-patches-3.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f56566e74cfa0f68337f7957d8681929f9ac4c55d3fb92aec0d743db590c9a88 +size 150445 diff --git a/rsync-patches-3.4.1.tar.gz.asc b/rsync-patches-3.4.1.tar.gz.asc new file mode 100644 index 0000000..7b70cf9 --- /dev/null +++ b/rsync-patches-3.4.1.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJIBAABCgAyFiEEn+8RLc4ZoNx+iCy4G7JJl6hTX28FAmeIIGUUHGFuZHJld0B0 +cmlkZ2VsbC5uZXQACgkQG7JJl6hTX2+7tg/7BxK0Up3zu3dXzO43qgpeI0TaNCUD +9ofs2e1DNQk3JUwN1DQ2qFoszWv1hWhLCPKuLD+UD+fKcvsW6qIcKzJUC47kbJEO +mUch9PT7REi8FnLQQ0uReARACMALvtXewXE6He1ENNGIikPa8HI1VVPuDpscpBYi +2qLHtDHvAlYbkzi7hPCJVOIa60gUQureaXo2tdIvY1zCkwry00g1Gae6wJ9+Qud3 +MlJLIV4kF9yFiB8IOp2eL/ypNmay2iGZlfY/BKqQ97pUZorzwNEIZYJZowmg8aBm +3PfU1Yqp0uUquR4afUrrFo1QZQZw76ttgiUo+OtrdN5cgPYv6HCumtxBV+yp9d/S +Lw93yYZ2HHMx7JWjMmgKCPJqWLcce8iedbUmDgSbItf3TnPGCrFtYTOr5lF2m5qd +eQYm6aP27NsaVoIYGwpcHfu+GJWfdaufnGA8/RyjIhVc2zTGTacONNaJ7BAdGyPc +PkaiDu7QSa/op+fRW/CTYQAYgb3QB3ugXb81F2lR2l2ZV1GuBfa9+LlUtnf+Dt50 +hLI7qlyC/oVCvi51PzumkZ73JCV32yKARV4HBDaOT3TNpqso44xBZPuOv/AsN6tQ +vnGlTokEpemEKAhleOWibQxUatL+n6GMONK1yeWib34g5vI6YGPInC+TjfPGMFr9 +e7DOr/W9ozvxGDU= +=XuUF +-----END PGP SIGNATURE----- diff --git a/rsync.changes b/rsync.changes index 2fd9a7f..a609ce7 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 16 17:26:53 UTC 2025 - Andreas Stieger + +- update to 3.4.1 + * fixed handling of -H flag with conflict in internal flag values + (replaces 705.patch) + * fixed a user after free in logging of failed rename + * fixed build on systems without openat() + * removed dependency on alloca() in bundled popt + ------------------------------------------------------------------- Wed Jan 15 14:53:02 UTC 2025 - Marcus Rueckert diff --git a/rsync.spec b/rsync.spec index 5560647..7e8e2da 100644 --- a/rsync.spec +++ b/rsync.spec @@ -35,7 +35,7 @@ %endif Name: rsync -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: Versatile tool for fast incremental file transfer License: GPL-3.0-or-later @@ -59,7 +59,6 @@ Patch2: rsync-usr-etc.patch Patch3: rsync-run-dir.patch # https://github.com/RsyncProject/rsync/pull/639 Patch5: rsyncd-return-from-list-command-with-0.patch -Patch6: https://patch-diff.githubusercontent.com/raw/RsyncProject/rsync/pull/705.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: c++_compiler