public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2018-05-12 20:24 Robin H. Johnson
  0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2018-05-12 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     278a9bb52b5298b1b5a91353d12644df97c75afb
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 12 15:29:10 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 12 20:19:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278a9bb5

net-misc/rsync: remove unused patches

(cherry picked from commit e1a20f4114d41d76ef0681456001de6356f13d43)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/8369

 .../rsync/files/rsync-3.1.2-CVE-2017-16548.patch   | 17 ----------
 .../files/rsync-3.1.2-CVE-2017-17433-fixup.patch   | 33 ------------------
 .../rsync/files/rsync-3.1.2-CVE-2017-17433.patch   | 39 ----------------------
 .../files/rsync-3.1.2-CVE-2017-17434-part1.patch   | 22 ------------
 .../files/rsync-3.1.2-CVE-2017-17434-part2.patch   | 33 ------------------
 5 files changed, 144 deletions(-)

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
deleted file mode 100644
index d06607cf772..00000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
-
-diff --git a/xattrs.c b/xattrs.c
-index 68305d7..4867e6f 100644
---- a/xattrs.c
-+++ b/xattrs.c
-@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
- 			out_of_memory("receive_xattr");
- 		name = ptr + dget_len + extra_len;
- 		read_buf(f, name, name_len);
-+		if (name_len < 1 || name[name_len-1] != '\0') {
-+			rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
-+			exit_cleanup(RERR_FILEIO);
-+		}
- 		if (dget_len == datum_len)
- 			read_buf(f, ptr, dget_len);
- 		else {

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
deleted file mode 100644
index 0cc9b8256dd..00000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800)
-Subject: Fix issue with earlier path-check (fixes "make check")
-X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
-
-Fix issue with earlier path-check (fixes "make check")
----
-
-diff --git a/receiver.c b/receiver.c
-index 9c46242..75cb00d 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+		if (DEBUG_GTE(RECV, 1))
-+			rprintf(FINFO, "recv_files(%s)\n", fname);
-+
-+		if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')
-+		 && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
- 			rprintf(FERROR, "attempt to hack rsync failed.\n");
- 			exit_cleanup(RERR_PROTOCOL);
- 		}
- 
--		if (DEBUG_GTE(RECV, 1))
--			rprintf(FINFO, "recv_files(%s)\n", fname);
--
- #ifdef SUPPORT_XATTRS
- 		if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- 		 && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
deleted file mode 100644
index 0ab8de1fce3..00000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 2 Nov 2017 23:44:19 -0700
-Subject: [PATCH] Check fname in recv_files sooner.
-
----
- receiver.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
-+		if (daemon_filter_list.head
-+		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+			rprintf(FERROR, "attempt to hack rsync failed.\n");
-+			exit_cleanup(RERR_PROTOCOL);
-+		}
-+
- 		if (DEBUG_GTE(RECV, 1))
- 			rprintf(FINFO, "recv_files(%s)\n", fname);
- 
-@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
- 
- 		cleanup_got_literal = 0;
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
--			rprintf(FERROR, "attempt to hack rsync failed.\n");
--			exit_cleanup(RERR_PROTOCOL);
--		}
--
- 		if (read_batch) {
- 			int wanted = redoing
- 				   ? we_want_redo(ndx)

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
deleted file mode 100644
index aeb8c2ee33c..00000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:26:03 -0800
-Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
-
----
- receiver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
- 				break;
- 			}
- 			if (!fnamecmp || (daemon_filter_list.head
--			  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
-+			  && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
- 				fnamecmp = fname;
- 				fnamecmp_type = FNAMECMP_FNAME;
- 			}

diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
deleted file mode 100644
index 5b94efa0c1a..00000000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:05:42 -0800
-Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
-
----
- rsync.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: rsync-3.1.2/rsync.c
-===================================================================
---- rsync-3.1.2.orig/rsync.c
-+++ rsync-3.1.2/rsync.c
-@@ -50,6 +50,7 @@ extern int flist_eof;
- extern int file_old_total;
- extern int keep_dirlinks;
- extern int make_backups;
-+extern int sanitize_paths;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- #ifdef ICONV_OPTION
-@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
- 	if (iflags & ITEM_XNAME_FOLLOWS) {
- 		if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- 			exit_cleanup(RERR_PROTOCOL);
-+
-+		if (sanitize_paths) {
-+			sanitize_path(buf, buf, "", 0, SP_DEFAULT);
-+			len = strlen(buf);
-+		}
- 	} else {
- 		*buf = '\0';
- 		len = -1;


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2020-04-13 17:49 Ben Kohler
  0 siblings, 0 replies; 6+ messages in thread
From: Ben Kohler @ 2020-04-13 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0c12dac408baef40524b3e9da28811a66d9376ed
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 17:35:58 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 17:49:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c12dac4

net-misc/rsync: update rsyncd.conf example for new repo path

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-misc/rsync/files/rsyncd.conf-3.0.9-r1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
index 20dcf3afdc1..e3c55fd53d3 100644
--- a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
+++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1
@@ -10,6 +10,6 @@ read only = yes
 
 # Simple example for enabling your own local rsync server
 #[gentoo-portage]
-#	path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
-#	comment = Gentoo Portage tree
+#	path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo
+#	comment = Gentoo ebuild repository
 #	exclude = /distfiles /packages


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2021-03-07 11:09 Mikle Kolyada
  0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2021-03-07 11:09 UTC (permalink / raw
  To: gentoo-commits

commit:     4fb88d18341987413acb551edec2e3e936676d1f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 11:09:25 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 11:09:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb88d18

net-misc/rsync: Drop unused file

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-misc/rsync/files/rsyncd.service | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service
deleted file mode 100644
index a2c1de0add1..00000000000
--- a/net-misc/rsync/files/rsyncd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=rsync daemon
-After=networking.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rsync --daemon --no-detach
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2021-11-08  1:19 Mike Gilbert
  0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2021-11-08  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a81d4c4da78b07828fa9a152d00bb20e0fe289a4
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 01:18:06 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 01:18:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81d4c4d

net-misc/rsync: backport another cross-compile fix

Bug: https://bugs.gentoo.org/732084
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/rsync/files/rsync-3.2.3-cross.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch
index 1f23627853b..c61090b7c40 100644
--- a/net-misc/rsync/files/rsync-3.2.3-cross.patch
+++ b/net-misc/rsync/files/rsync-3.2.3-cross.patch
@@ -105,3 +105,25 @@ index 3fd7e5d5..e469981b 100644
  	AC_LANG(C)
  	if test x"$CXX_OK" = x"yes"; then
  	    # AC_MSG_RESULT() is called below.
+From 7d830ff52ff7b01f528f39aa27b1ab36ea8c1356 Mon Sep 17 00:00:00 2001
+From: Andrew Aladjev <aladjev.andrew@gmail.com>
+Date: Sun, 7 Nov 2021 22:45:49 +0300
+Subject: [PATCH] improved cross compilation detection (#252)
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fbdd17d8..9e7338cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -264,7 +264,7 @@ if test x"$enable_simd" != x"no"; then
+     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
+     if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then
+ 	AC_LANG(C++)
+-	if test x"$host_cpu" = x"$build_cpu"; then
++	if test x"$host" = x"$build"; then
+ 	    AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],
+ 		[CXX_OK=yes],[CXX_OK=no])
+ 	else


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2022-10-30  9:40 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-30  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     339057afef6d53cd247531371bfe9063103572ea
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 27 17:18:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:39:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339057af

net-misc/rsync: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27982
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../rsync/files/rsync-3.2.5-pedantic-errors.patch  | 53 ----------------------
 1 file changed, 53 deletions(-)

diff --git a/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch b/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch
deleted file mode 100644
index 33afbd954a12..000000000000
--- a/net-misc/rsync/files/rsync-3.2.5-pedantic-errors.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/WayneD/rsync/commit/9a3449a3980421f84ac55498ba565bc112b20d6c
-
-In particular, avoids attr configure test failing.
-
-From 9a3449a3980421f84ac55498ba565bc112b20d6c Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayne@opencoder.net>
-Date: Thu, 18 Aug 2022 17:33:54 -0700
-Subject: [PATCH] Stop enabling -pedantic-errors.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1071,21 +1071,6 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then
-     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)
-
---- a/configure.sh
-+++ b/configure.sh
-@@ -9982,14 +9982,14 @@ 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"
-+	CFLAGS="$CFLAGS "
-     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" ;;
-+	    *-Wpedantic*) CFLAGS="$CFLAGS  -Wno-pedantic" ;;
- 	esac
-     fi
- fi


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/
@ 2024-03-18 20:00 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2024-03-18 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     662cead49f4f2a551879b69ef9d967d54660d232
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 17 12:26:54 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 20:00:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662cead4

net-misc/rsync: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/35799
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 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 ------
 3 files changed, 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-03-18 20:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30  9:40 [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-03-18 20:00 Conrad Kostecki
2021-11-08  1:19 Mike Gilbert
2021-03-07 11:09 Mikle Kolyada
2020-04-13 17:49 Ben Kohler
2018-05-12 20:24 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox