commit: 2abd7603ecab79ebc5284d6bc56258ed490d2ff8 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Jun 19 21:31:46 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 20 05:03:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abd7603
net-misc/rsync: Fix implicit declaration build failure Upstream-issue: https://github.com/WayneD/rsync/issues/324 Upstream-commit: 3592ac3c025d ("Include bsd/strings.h if it exists") Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25982 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/rsync/files/rsync-3.2.4-strlcpy.patch | 46 +++++++ net-misc/rsync/rsync-3.2.4-r3.ebuild | 174 +++++++++++++++++++++++++ 2 files changed, 220 insertions(+) diff --git a/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch new file mode 100644 index 000000000000..d5a02f0e3159 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.4-strlcpy.patch @@ -0,0 +1,46 @@ +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 <wa...@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/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild new file mode 100644 index 000000000000..d4fb6dbdd9a5 --- /dev/null +++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != 3.2.4 ]]; then + # Make sure we revert the autotools hackery applied in 3.2.4. + die "Please use rsync-9999.ebuild as a basis for version bumps" +fi + +WANT_LIBTOOL=none + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/"; +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git"; + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + fi + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4 ) + ssl? ( dev-libs/openssl:0= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( dev-libs/xxhash ) + zstd? ( >=app-arch/zstd-1.4 ) + >=dev-libs/popt-1.5 + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-unsigned-char-checksum.patch + # https://github.com/WayneD/rsync/issues/324 + "${FILESDIR}"/${P}-strlcpy.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + eautoconf -o configure.sh + eautoheader && touch config.h.in +} + +src_configure() { + # Force enable IPv6 on musl - upstream bug: + # https://bugzilla.samba.org/show_bug.cgi?id=10715 + use elibc_musl && use ipv6 && append-cppflags -DINET6 + + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable ipv6) + $(use_enable lz4) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + python_fix_shebang support/ + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +}
