Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
Date: Thu, 30 Dec 2021 10:39:42
Message-Id: 1640860775.883377500a40fca29a1b47eaf25eb8879e340833.grobian@gentoo
1 commit: 883377500a40fca29a1b47eaf25eb8879e340833
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 30 10:39:24 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 30 10:39:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88337750
7
8 net-misc/rsync-3.2.3-r5: fix IPv6 support using musl
9
10 Closes: https://bugs.gentoo.org/609694
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 net-misc/rsync/rsync-3.2.3-r5.ebuild | 6 +++++-
15 net-misc/rsync/rsync-9999.ebuild | 6 +++++-
16 2 files changed, 10 insertions(+), 2 deletions(-)
17
18 diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild
19 index 684a8e105cd7..7f996c540050 100644
20 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild
21 +++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild
22 @@ -10,7 +10,7 @@ fi
23
24 WANT_LIBTOOL=none
25
26 -inherit autotools prefix systemd
27 +inherit autotools flag-o-matic prefix systemd
28
29 DESCRIPTION="File transfer program to keep remote files into sync"
30 HOMEPAGE="https://rsync.samba.org/"
31 @@ -47,6 +47,10 @@ src_prepare() {
32 }
33
34 src_configure() {
35 + # Force enable IPv6 on musl - upstream bug:
36 + # https://bugzilla.samba.org/show_bug.cgi?id=10715
37 + use elibc_musl && use ipv6 && append-cppflags -DINET6
38 +
39 local myeconfargs=(
40 --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
41 --without-included-popt
42
43 diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
44 index 8c91d4f3a17a..0da8ff82f683 100644
45 --- a/net-misc/rsync/rsync-9999.ebuild
46 +++ b/net-misc/rsync/rsync-9999.ebuild
47 @@ -3,7 +3,7 @@
48
49 EAPI=7
50
51 -inherit prefix systemd
52 +inherit flag-o-matic prefix systemd
53
54 DESCRIPTION="File transfer program to keep remote files into sync"
55 HOMEPAGE="https://rsync.samba.org/"
56 @@ -59,6 +59,10 @@ src_prepare() {
57 }
58
59 src_configure() {
60 + # Force enable IPv6 on musl - upstream bug:
61 + # https://bugzilla.samba.org/show_bug.cgi?id=10715
62 + use elibc_musl && use ipv6 && append-cppflags -DINET6
63 +
64 local myeconfargs=(
65 --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
66 --without-included-popt