From 801f5049869cdd01db6e713d3adef331f85f062a27acf5290efdec60d9c9800d Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 15 Jan 2025 15:05:00 +0300 Subject: [PATCH] Update rsync --- build/distfiles/.gitignore | 4 +- build/distfiles/rsync-3.3.0.tar.gz.meta4 | 26 ------------- build/distfiles/rsync-3.4.0.tar.gz.meta4 | 37 +++++++++++++++++++ build/distfiles/xxhash-v0.8.2.tar.gz.meta4 | 18 --------- build/distfiles/xxhash-v0.8.3.tar.gz.meta4 | 18 +++++++++ .../net/{rsync-3.3.0.do => rsync-3.4.0.do} | 5 ++- build/skel/security/hashers.do | 2 +- .../{xxhash-v0.8.2.do => xxhash-v0.8.3.do} | 4 +- 8 files changed, 63 insertions(+), 51 deletions(-) delete mode 100644 build/distfiles/rsync-3.3.0.tar.gz.meta4 create mode 100644 build/distfiles/rsync-3.4.0.tar.gz.meta4 delete mode 100644 build/distfiles/xxhash-v0.8.2.tar.gz.meta4 create mode 100644 build/distfiles/xxhash-v0.8.3.tar.gz.meta4 rename build/skel/net/{rsync-3.3.0.do => rsync-3.4.0.do} (84%) rename build/skel/security/{xxhash-v0.8.2.do => xxhash-v0.8.3.do} (90%) diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 05bbfef..8bac69d 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -219,7 +219,7 @@ /remind-05.00.01.tar.gz /RHash-1.4.4.tar.gz /rlwrap-0.46.1.tar.gz -/rsync-3.3.0.tar.gz +/rsync-3.4.0.tar.gz /ruby-3.3.3.tar.gz /scummvm-2.9.0.tar.xz /sdcv-0.5.5.tar.zst @@ -257,7 +257,7 @@ /x264.git/ /xapian-core-1.4.25.tar.xz /xmlto-0.0.26.tar.bz2 -/xxhash-v0.8.2.tar.gz +/xxhash-v0.8.3.tar.gz /zathura-0.5.2.tar.xz /zathura-cb-0.1.10.tar.xz /zathura-djvu-0.2.9.tar.xz diff --git a/build/distfiles/rsync-3.3.0.tar.gz.meta4 b/build/distfiles/rsync-3.3.0.tar.gz.meta4 deleted file mode 100644 index dc21fbf..0000000 --- a/build/distfiles/rsync-3.3.0.tar.gz.meta4 +++ /dev/null @@ -1,26 +0,0 @@ - - - - 160094c64e252650f769159948161f7aafed5167f79dae50b1c52de914293b69 - 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 - a7bbec23962430634de69239edd19c8d6be3edc190371fb78d97b3f6306eaeaf - 8a703b0e20163e07c0798c39d823d7780e298bfb438575e2dfdb4b42616609ca12afa3d49d77b7ac412095575ac56fe0638201c7a2d2e88bc34ad06cb87f8d5d - aa9a20914312d08465dee9aec1cb82307078a11a2a24129e9f42f00ba7a179a6 - 27eaa344b6725e226808d5c5c739e2c9eda8d9f8322279a9370b7822b1c592bec3222f360224331902ff034c0513e36d22e00194e79813e85e61f3e9626c4c0c - df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10 - 7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90 - 76fa8db86b21ccc87ed811102a1521e02d5bd4209888f7c8a8430c30a860626b540bc3a23564903e7041d1b6b9edebce777cecb9cc8d387ce03ec2acdf9e9abe - 0d68bd9d664632352c774b179c83a7c0363a0506d63f79dfbc9721b814a4dcdf - 352039ec9313d0e0191902065bafc70d - - 1153969 - https://download.samba.org/pub/rsync/src/rsync-3.3.0.tar.gz - - diff --git a/build/distfiles/rsync-3.4.0.tar.gz.meta4 b/build/distfiles/rsync-3.4.0.tar.gz.meta4 new file mode 100644 index 0000000..ca940a0 --- /dev/null +++ b/build/distfiles/rsync-3.4.0.tar.gz.meta4 @@ -0,0 +1,37 @@ + + + + 0b5b7e9d05db855c10941cb8ad8251008141b1d7cffed2abbd7bd658c6693060 + ce88fdbc44cbb4522d48b5f8a11ce70b2d4c794612915390a865b478efd05aa1f17a0a4e1d4e698a968994b5e47ef4df16315c93e87398b848fdcef9e8dc71a1 + 04ca6c1b297023834300a0dde30f7eb5d4993bbea75394f4a5fd0859a3a8b50c + d3497ab03161705442facbf86464ee55c7a68641f3dfc9a0eb5d95792b7866c97c51d38de4f9f92c6c8a58add7622157bc76333113e10b4730cb37e2e181d13a + 23c73130994c23283d6d8a9f1f67e4e11ac4d6309113bbfadd80aaec5531f9ad + fc04d7c5f30d108766e017510b961fd131e6d5a2e04bce8b97a29f7c0a4b6a980612079a393c30fd5db4b0597bebac8442586b8e913ed5eda7d132fdedc5ed51 + 4a0e7817e6e71e0173713ddd6b6bc7ee86237d092bd0a8c830a69f9993b76b5712a13a3ca60c7bbf42162cdc837df8783e07f8cd65c32fcb12c35f751043c56b + 8e942f95a44226a012fe822faffa6c7fc38c34047add3a0c941e9bc8b8b93aa4 + db59e5146037842d3e9a0322bf710fafd476162b56ad1ad1d566d660eea09158dcf0b9ee846fed3c7c78671b3205e6dd41ddc3b036100d0f68949a58d11df883 + 99638eb0f99cdb6e84dcf8c86ee693bc911b4a71f5d161571a99545c4fbfe908 + 6ad24ae48bd1460d55616a4fcf15aa75 + + 1167983 + https://download.samba.org/pub/rsync/src/rsync-3.4.0.tar.gz + + diff --git a/build/distfiles/xxhash-v0.8.2.tar.gz.meta4 b/build/distfiles/xxhash-v0.8.2.tar.gz.meta4 deleted file mode 100644 index 09798f6..0000000 --- a/build/distfiles/xxhash-v0.8.2.tar.gz.meta4 +++ /dev/null @@ -1,18 +0,0 @@ - - - - ca1708ea4c238384930907ed5b25caeece54bc24a23f38aeb33abb0ff91ecccf - 4b6f0d0dd7119cb309aff3f658efd3eeba4a26a6c5526489808f3192a0a15abac54298934b069eee57f5152f3586cf2b29d357233e9595be1b9c33c6003cd9c8 - b5e350d8bb9c366c74449fa98b65a950fe67683f0061589c5c44cda92e898953 - a76cd58e46087a21d745d53dfa1506e329825cc54741e4f633816fe361cd3fd622d62e819b5e0b5bb3169032e1b317ae6b92baa5399e564810d0fa6f20f79d55 - 1b6bbdc033c1072b9e8439a1a2d412dc29bf21ed6fe6f43597364b4e64f6993b - 5f2ebce2204a95aaeb379333c72265c46dbc398aa894c288da5ee9d07699eed864f3d0526fc533a3d230f7da5da2b58a24c930b3dce4fefb64e981e1d97b9678 - fc2402095059d57f5bf3345fb0fb2797f51593f7e47dcb242059df1d2343b7d21aec4aec45a01e6f003602ac168c7a5cd389916fdf1e9249a680b249bd025530 - 2de0721e622b5eb38585f165641e0fb05dab07aae31fb1db41d7ae4cb9ac57cd - 3f5945c768fcc34b37202848f6bc2681412e296bb824d6d1493d6d078b51fdb73f79ca4a70555c1bc6d922fba8ef5e5b22ceaf10dc84eebebcf8172c9d8ee2ea - 7d0b02faca9f7fc7ff62197782e6c9843d366c358ad915354c6f4d4459c7068d - 039e1839a93944b5f4af5232958383fd - 1141201 - https://api.github.com/repos/Cyan4973/xxHash/tarball/v0.8.2 - - diff --git a/build/distfiles/xxhash-v0.8.3.tar.gz.meta4 b/build/distfiles/xxhash-v0.8.3.tar.gz.meta4 new file mode 100644 index 0000000..1a96227 --- /dev/null +++ b/build/distfiles/xxhash-v0.8.3.tar.gz.meta4 @@ -0,0 +1,18 @@ + + + + 41d7a72ef3d4f57b9786fe4ed79beb71db3f585c0b631105d9c286622a08446d + 042a6ad72e3fefae55e1b83a99c7292449e762083744943c6f0d4228b862a9f7a2cfba61fc464cb4a72d27a3669bd32447b24e6eee33eb6c3010cc4e00dcf871 + 458bf5389849347531ffd8ac4884c3a668fae84281c56b7b3df2e37320c91eae + a1d2537ff39ca739b5ff7c2b33298467fa4de982a4053f0013db8dbd695144ac6a6d6bf1d7ecfe3528ab3afbb9f76a7135310a98cbf671a34fa3c064e0101de5 + de479177ae3b1f55155d58cbe36e21892125527a808a4970f0b1e6832fed594c + d63152150ac30877e383f87b34cb77c30bb02a5f3143287c77f6aa2df33f6e6871888c35b8009ff5a34e3d9202a90afe63f067a53a58c0488cda7319b19e66f7 + 21431a219fcc7fee90e5c5d94fd92a07857aa6fdc944a6a01349b4a8b1748ec1e487365b2de572ce9ef8dc6dd36f9c48da3d6c159a1accf2886c1577c64f324d + 9889f6b3e6f2ea01a557048ccdfde77b4ac14bb6037cbb487bbd881ddebcc1ed + d854a3d0e4e10f0d8e473b007cc1acb762d234731439b7f79357089f80f3870b01fccf3d20c3037202c85461d478b94fcb945c1fcac4c2becc0e5b6a3a7c44dd + 922d5a6ff23d4c9730a9a04cc420ff24974c61c6adbcecdcdcb19b91e7a002ca + f0de2fa2d6fa849522c05d4b1d4d1416 + 1147640 + https://api.github.com/repos/Cyan4973/xxHash/tarball/v0.8.3 + + diff --git a/build/skel/net/rsync-3.3.0.do b/build/skel/net/rsync-3.4.0.do similarity index 84% rename from build/skel/net/rsync-3.3.0.do rename to build/skel/net/rsync-3.4.0.do index debbfed..21b7102 100644 --- a/build/skel/net/rsync-3.3.0.do +++ b/build/skel/net/rsync-3.4.0.do @@ -3,7 +3,7 @@ sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1" -rdeps=security/xxhash-v0.8.2 +rdeps=security/xxhash-v0.8.3 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc @@ -13,7 +13,8 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh cd $NAME -./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh --with-rrsync >&2 +./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ + --with-included-popt --disable-openssl >&2 make -j$MAKE_JOBS >&2 make install >&2 diff --git a/build/skel/security/hashers.do b/build/skel/security/hashers.do index d569e97..5ac84fb 100644 --- a/build/skel/security/hashers.do +++ b/build/skel/security/hashers.do @@ -6,7 +6,7 @@ hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) deps=" security/b3sum-1.5.0 security/gosha3-v1.0.0 -security/xxhash-v0.8.2 +security/xxhash-v0.8.3 " redo-ifchange $deps "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh diff --git a/build/skel/security/xxhash-v0.8.2.do b/build/skel/security/xxhash-v0.8.3.do similarity index 90% rename from build/skel/security/xxhash-v0.8.2.do rename to build/skel/security/xxhash-v0.8.3.do index 2e4cc6b..dee499e 100644 --- a/build/skel/security/xxhash-v0.8.2.do +++ b/build/skel/security/xxhash-v0.8.3.do @@ -11,14 +11,14 @@ hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH) $TAR xf "$DISTFILES"/$NAME.tar.gz "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh -cd Cyan4973-xxHash-bbb27a5 +cd Cyan4973-xxHash-e626a72 gmake -j$MAKE_JOBS >&2 mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/bin cp -P xxhsum xxh32sum xxh64sum xxh128sum "$SKELBINS"/$ARCH/$NAME-$hsh/bin mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/include mv xxhash.h "$SKELBINS"/$ARCH/$NAME-$hsh/include mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/lib -mv libxxhash.so.0.8.2 libxxhash.so.0 libxxhash.so libxxhash.a \ +mv libxxhash.so.0.8.3 libxxhash.so.0 libxxhash.so libxxhash.a \ "$SKELBINS"/$ARCH/$NAME-$hsh/lib cd "$SKELBINS"/$ARCH -- 2.48.1