summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-03-17 13:26:54 +0100
committerConrad Kostecki <conikost@gentoo.org>2024-03-18 21:00:23 +0100
commit662cead49f4f2a551879b69ef9d967d54660d232 (patch)
tree2860a804694a85219884753354510cd622dfeead /net-misc
parentdev-util/perf: remove unused patch (diff)
downloadgentoo-662cead49f4f2a551879b69ef9d967d54660d232.tar.gz
gentoo-662cead49f4f2a551879b69ef9d967d54660d232.tar.bz2
gentoo-662cead49f4f2a551879b69ef9d967d54660d232.zip
net-misc/rsync: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/35799 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-notpedantic.patch25
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-strlcpy.patch46
-rw-r--r--net-misc/rsync/files/rsync-3.2.4-unsigned-char-checksum.patch12
3 files changed, 0 insertions, 83 deletions
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 <wayne@opencoder.net>
-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 <netinet/in.h>]])
- 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 <string.h>
- #endif
-+#ifdef HAVE_BSD_STRING_H
-+# include <bsd/string.h>
-+#endif
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
- #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