commit: 20283aed92beeec8b846ba4ab74e6675219303cd Author: Dennis Eisele <kernlpanic <AT> dennis-eisele <DOT> de> AuthorDate: Wed Jul 16 20:38:49 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 17 00:00:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20283aed
net-misc/rsync-bpc: fix build issue on rsync-bpc-3.1.3.0-r1 By adding the former patch again that differs from that of rsync-bpc-3.1.3.0_p20250706 the patch can successfully be applied again. Closes: https://bugs.gentoo.org/960290 Signed-off-by: Dennis Eisele <kernlpanic <AT> dennis-eisele.de> Part-of: https://github.com/gentoo/gentoo/pull/43029 Closes: https://github.com/gentoo/gentoo/pull/43029 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/rsync-bpc-3.1.3.0-r1-fix-gettimeofday-error.patch | 13 +++++++++++++ net-misc/rsync-bpc/rsync-bpc-3.1.3.0-r1.ebuild | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/net-misc/rsync-bpc/files/rsync-bpc-3.1.3.0-r1-fix-gettimeofday-error.patch b/net-misc/rsync-bpc/files/rsync-bpc-3.1.3.0-r1-fix-gettimeofday-error.patch new file mode 100644 index 000000000000..55bfa728f2c4 --- /dev/null +++ b/net-misc/rsync-bpc/files/rsync-bpc-3.1.3.0-r1-fix-gettimeofday-error.patch @@ -0,0 +1,13 @@ +--- rsync-bpc-3.1.3.0/configure.ac.old 2025-02-21 20:05:47.000000000 -0600 ++++ rsync-bpc-3.1.3.0/configure.ac 2025-02-21 20:02:27.000000000 -0600 +@@ -852,7 +852,9 @@ + + AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h> +-#include <unistd.h>]], [[struct timeval tv; exit(gettimeofday(&tv, NULL));]])],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=no])]) ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif]], [[struct timeval tv; return gettimeofday(&tv, NULL);]])],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=no])]) + if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then + AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg]) + fi diff --git a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0-r1.ebuild b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0-r1.ebuild index 92f5ff36c1e4..d05ebbf1e291 100644 --- a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0-r1.ebuild +++ b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0-r1.ebuild @@ -17,7 +17,7 @@ RDEPEND="virtual/ssh" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-fix-gettimeofday-error.patch" #874666 + "${FILESDIR}/${PN}-3.1.3.0-r1-fix-gettimeofday-error.patch" #874666 ) src_prepare() {
