diff options
Diffstat (limited to 'net-misc/rsync')
-rw-r--r-- | net-misc/rsync/Manifest | 6 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.1.2-r1.ebuild | 89 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.1.2-r2.ebuild | 2 | ||||
-rw-r--r-- | net-misc/rsync/rsync-3.1.3_pre1.ebuild (renamed from net-misc/rsync/rsync-3.1.2.ebuild) | 35 |
4 files changed, 22 insertions, 110 deletions
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index a75b89f6be56..ae4fafdb78b3 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -10,7 +10,7 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b -EBUILD rsync-3.1.2-r1.ebuild 2868 BLAKE2B 43895a478b5e451a202c61a9103f0bc0b66c067e8dc52fdb868b7149c651cc85cccd8b2b5564e87097becad079ee806361b4cca53456ab46c09d219b900be589 SHA512 4c0311a250f2ad01016918b0b0c5bd4eaa09953d913e9ee66da53b081d7941312903d3b068ec48710f5ead6f659b0315fe422c729277650c34238106c8afac4a -EBUILD rsync-3.1.2-r2.ebuild 3080 BLAKE2B a78563994b1bcefa55bb71b3ecd66224be4f6d46177f80fcb3597bcfa0944313b7aa4a37c05ee1801a5fca293978cd8fc51c15a8d4b0da2aa9c2d6c32498a605 SHA512 1627518be854536ba26be38dd98cfb2f563ff855625742cbcd6d401252d42f17e2830188dd2de6de3e07404979de922a63b69bb71874773b7cb36c92014a327f -EBUILD rsync-3.1.2.ebuild 2840 BLAKE2B 2ee399fcfa6ed8b11b2446178653d3ae55a4bd2f920f4ca5430f397741f9161ce6ccfd472030e7f008225fa28f9886d92751767be5b2213a5f0706207f9c448a SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1 +DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597 +EBUILD rsync-3.1.2-r2.ebuild 3079 BLAKE2B da170ff573c25a1c84c615bdc28b69070e66df5a53d7d3045451cf9535f98439a25dbf5a0032b08c9c810f67f2631b44b996015427c334c0d23d2afca9fe9967 SHA512 facf9e9db4212fa57602334def44fe56f869da794e2a0c4e3ed896755d86b9704c4a3b3f76141e8c1eb4750744c77c7e4642266dae9ddff7eb4b2ca427b31b7f +EBUILD rsync-3.1.3_pre1.ebuild 2853 BLAKE2B 78f5bf6f8dfb345ddb2c12237eaec6acfcee6137fb8e8105d364e59343d384ecccb51f1a062b9f0bc0f1ea9dbe3e7a1679cd3650320bc7ff0a20e617f8198190 SHA512 2b6653219a8c6e1c9e9bd312e819c7071d509465bda02b87ae475f4ffb9a510be16e8de180d5a32696dca7802153721bfaba65e9b2b43ea048027284677a1e65 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild deleted file mode 100644 index 84bd042e0aae..000000000000 --- a/net-misc/rsync/rsync-3.1.2-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" -[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -if [[ ${PV} != *_pre ]] ; then -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi -IUSE="acl examples iconv ipv6 static stunnel xattr" - -LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) - xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) - >=dev-libs/popt-1.5[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch ) - -S=${WORKDIR}/${P/_/} - -src_configure() { - use static && append-ldflags -static - econf \ - --without-included-popt \ - $(use_enable acl acl-support) \ - $(use_enable xattr xattr-support) \ - $(use_enable ipv6) \ - $(use_enable iconv) \ - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - touch proto.h-tstamp #421625 -} - -src_install() { - emake DESTDIR="${D}" install - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - dodoc NEWS OLDNEWS README 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-client - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_dounit "${FILESDIR}/rsyncd.service" -} - -pkg_postinst() { - if egrep -qis '^[[: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 -} diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild index ba5738ec8f8d..224e0afbccf6 100644 --- a/net-misc/rsync/rsync-3.1.2-r2.ebuild +++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" if [[ ${PV} != *_pre ]] ; then -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="acl examples iconv ipv6 static stunnel xattr" diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.3_pre1.ebuild index 06451278bc6a..a01698246090 100644 --- a/net-misc/rsync/rsync-3.1.2.ebuild +++ b/net-misc/rsync/rsync-3.1.3_pre1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils flag-o-matic prefix systemd +inherit flag-o-matic prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" if [[ ${PV} != *_pre ]] ; then -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="acl examples iconv ipv6 static stunnel xattr" @@ -25,29 +25,30 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S=${WORKDIR}/${P/_/} - -src_prepare() { - epatch_user -} +S="${WORKDIR}/${P/_/}" src_configure() { use static && append-ldflags -static - econf \ - --without-included-popt \ - $(use_enable acl acl-support) \ - $(use_enable xattr xattr-support) \ - $(use_enable ipv6) \ - $(use_enable iconv) \ + 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 xattr xattr-support) + ) + econf "${myeconfargs[@]}" touch proto.h-tstamp #421625 } src_install() { emake DESTDIR="${D}" install + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + dodoc NEWS OLDNEWS README TODO tech_report.tex + insinto /etc newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf @@ -67,10 +68,10 @@ src_install() { if use examples ; then exeinto /usr/share/rsync doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c} fi - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd* systemd_dounit "${FILESDIR}/rsyncd.service" } |