From 2c18b7f7fb2885d27960657c60906ef0bac0681e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2024 00:49:58 +0000 Subject: gentoo auto-resync : 19:03:2024 - 00:49:58 --- net-misc/rsync/Manifest | 3 -- net-misc/rsync/files/rsync-3.2.4-notpedantic.patch | 25 ------------ net-misc/rsync/files/rsync-3.2.4-strlcpy.patch | 46 ---------------------- .../files/rsync-3.2.4-unsigned-char-checksum.patch | 12 ------ 4 files changed, 86 deletions(-) delete mode 100644 net-misc/rsync/files/rsync-3.2.4-notpedantic.patch delete mode 100644 net-misc/rsync/files/rsync-3.2.4-strlcpy.patch delete mode 100644 net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch (limited to 'net-misc/rsync') diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 83b0ad11b840..512c0c28f70c 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,6 +1,3 @@ -AUX rsync-3.2.4-notpedantic.patch 1063 BLAKE2B 99ed8e887c5f3c64ff6c34e1b9dc7ca9841961547654fa35dd52b0f60d1bb61459a63d832618bf262103d75ecd3cb0574f28dc2cbd227ad3820dc02e3981bb54 SHA512 ce0c2f98b2e04b8aaef711ad73dd1125d1dbaff3fa4a62e8bc0d70d844a02296d78fedab99c353a0830d8eb59d306bff748599f58d432df49755d4f8270dfd7d -AUX rsync-3.2.4-strlcpy.patch 1715 BLAKE2B 4159391589cc6eba7c6719b15d32d33e68ff5a15765b3377e1e53975c2d7c9413ac99e178d0e6a796d347aab4bf43b3f7a788a434ea36bc35adb916a39394ca4 SHA512 b097b253624fa67feb32f3cb6412fadbd731ec659791010310824ef0c83209a9d228706e84eca72614c0e3ce7a3ccbd4250dafad20dc2113b20d79135573fa9a -AUX rsync-3.2.4-unsigned-char-checksum.patch 610 BLAKE2B eb6803c673bb38907738e5475e9469c07555d96769cc86baad43f806cd6a823c5aa9d890c63096b5c229402315cdd90d76d93687ddc1a7d17360ff739afc9596 SHA512 a8f8eb0568139893e2f3f36feb1cebfb5fcf3b1fd807459bce635d61f2582e960c55b0bb4c8914a6579ad0eb7e4322d2ce3480598d425e256fb6a73efbc9315e AUX rsync-3.2.7-flist-memcmp-ub.patch 773 BLAKE2B 9a30609a0bf09298dc2b1daeae7dcf3ba173d1d2431c077d612be03a3a531bf59b16d1846a8f7c467ef2ca576e01f0fe512067a04f834a9ca3d387e389b5d6e8 SHA512 4212d704d9b4b1a0d2d2cfca48ae91d29b90111ce4256ec8f9779d0778fe2bbb4a33b95e8a32ef181e1ab0ac2d1ea330e724a46f078826b39d2e09d374be6730 AUX rsync-3.2.7-fortify-source-3.patch 1947 BLAKE2B c907e4ddc07693d8a6292f32782831953eee8711148c2e9aa5623dc5615474b59f25e309302c103a6c4a4177b18291a00983a62fa77c7faee04731114634c65d SHA512 b2bd012f318b1816a299a766c28a64cfc86307e4e1b047098f2a0334d775513f83724cdfa33ce567120c9b4fbbf9f6b8e0bbad0d434ac2444afff39fb5fa41da AUX rsync-3.2.7-ipv6-configure-c99.patch 1001 BLAKE2B 1ddb96eecef82a056af00ae221b9f5bc26284863a1ce63ae423e0b14979cfd57eb18f966f7572315e495ae25e4762da4115def7f04e32fe90cbc2b7a522805c0 SHA512 19a10798b8460741b8a3341a210d1828e1daeae707ad8cc910e4aa003e8bba405466a6cc64465294bd4eda81f1f876410a395e5012c3872cfce025f7ed0eec94 diff --git a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch b/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch deleted file mode 100644 index 9d081ab52c5b..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-notpedantic.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN rsync-3.2.4.orig/configure.ac rsync-3.2.4/configure.ac ---- rsync-3.2.4.orig/configure.ac 2022-12-01 22:26:34.856659562 +0100 -+++ rsync-3.2.4/configure.ac 2022-12-01 22:31:43.849290989 +0100 -@@ -1067,21 +1067,6 @@ - with_included_popt=yes - fi - --if test x"$GCC" = x"yes"; then -- if test x"$with_included_popt" != x"yes"; then -- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" -- else -- # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to -- # turn off pedantic warnings (which will not lose the error for array-init overflow). -- # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists -- # -Wpedantic and use that as a flag. -- case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -- esac -- fi --fi -- - AC_MSG_CHECKING([whether to use included libpopt]) - if test x"$with_included_popt" = x"yes"; then - AC_MSG_RESULT($srcdir/popt) diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch deleted file mode 100644 index d5a02f0e3159..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/WayneD/rsync/issues/324 -https://github.com/WayneD/rsync/commit/3592ac3c025da23b2dd291561ec6113940b9c11b - -From 3592ac3c025da23b2dd291561ec6113940b9c11b Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Sun, 19 Jun 2022 10:02:51 -0700 -Subject: [PATCH] Include bsd/strings.h if it exists - -Some systems apparently put strlcpy() into a separate bsd/strings.h file -without putting the function into a separate library. Thus, configure -finds that the function exists for linking but the build does not have -the declaration (which rsync only supplies if it is also supplying its -own version of the function). ---- - configure.ac | 3 ++- - rsync.h | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 37dbb18a..37241637 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ - netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \ - sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \ - popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \ -- zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h) -+ zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \ -+ bsd/string.h) - AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include ]]) - AC_HEADER_MAJOR_FIXED - -diff --git a/rsync.h b/rsync.h -index e5aacd25..1cc037c5 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -338,6 +338,9 @@ enum delret { - # endif - # include - #endif -+#ifdef HAVE_BSD_STRING_H -+# include -+#endif - #ifdef HAVE_STRINGS_H - # include - #endif diff --git a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch b/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch deleted file mode 100644 index 18e56c31ce2a..000000000000 --- a/net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://lists.samba.org/archive/rsync-announce/2022/000111.html ---- a/configure.ac -+++ b/configure.ac -@@ -1117,7 +1117,7 @@ else - fi - - AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) - if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then - AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type]) - fi -- cgit v1.2.3