From bae478b64a6bc9eca66b65bcfa318fc21e7f34bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jan 2023 11:40:40 +0000 Subject: gentoo auto-resync : 21:01:2023 - 11:40:40 --- net-misc/Manifest.gz | Bin 54414 -> 54426 bytes net-misc/ptpd/Manifest | 1 - net-misc/ptpd/ptpd-2.3.1-r1.ebuild | 59 ----------------------------------- net-misc/rsync/Manifest | 4 +-- net-misc/rsync/rsync-3.2.7-r2.ebuild | 10 +++++- net-misc/rsync/rsync-9999.ebuild | 14 ++++++++- 6 files changed, 24 insertions(+), 64 deletions(-) delete mode 100644 net-misc/ptpd/ptpd-2.3.1-r1.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index a215389f0427..401c519ab449 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest index 2f588e9db6b3..13a2d3da6d04 100644 --- a/net-misc/ptpd/Manifest +++ b/net-misc/ptpd/Manifest @@ -3,6 +3,5 @@ AUX ptpd2.confd 61 BLAKE2B 0724014663c4e18dd2205982e4ebb20b6cc5af2eda0d1070515b2 AUX ptpd2.rc 1372 BLAKE2B 071dce26d1343050b212312381a07af6b24d4923d715e4b7c4e065ab67283a3bcf4b350d1c28a9270cb9c03b8e04cffff6b3e422a80460d6210b546b684bd37d SHA512 37af776a265fbabdabed381d98cf50d78a512634fd84ce07466a47a0e96a6b2cccfb762732a043139b6c136eefdc6443ab9a5cba1c30234b6c66acc23e98a5b2 AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f60af653cc71b2bc15d08c73730f326c9311f97ebeff2602b73cdbd55683a2d69cb57d0a63a28a47 SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a DIST ptpd-2.3.1.tar.gz 884161 BLAKE2B 029eeff4ff427aec7a24365bd7f62a4f5d6bfe4bc0a003b0fa8ca1f7581b2395cb96c27bfa59c6333b0354ac0fb12fb11fd24319506c2168e0ff4ddfb3df9117 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4 -EBUILD ptpd-2.3.1-r1.ebuild 1358 BLAKE2B bbd67fb82dabd88f2f0885df34dea7e4a26406a86c5329aa72fa66f93327a842eeb7b0c20aa6f5874157e4acc461ffe1fd1befa37825ed96f7ee331c6985854e SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97 EBUILD ptpd-2.3.1-r2.ebuild 1355 BLAKE2B 79dea132eb4bb53e57377fa0f6f91c94db0dc49dd1cdf06fc386023e297683ae3b40e9c9890b3523e9812b07c1d09bedc5c3b6ed29ac0f5834716b0abf9725cd SHA512 a57208c0546ca61c18bccc3a376ab79a404402315e91e5105274ec145c1421cfa760b3e2a85f18809980337dae3dff687bd75c9cf9e1e0ce31e787a01470e4f8 MISC metadata.xml 1019 BLAKE2B c7befd03b655ee5a0b1864a243bc8bb20db4bd79c2bf86f3eac2508d1fae41007693dee179dfe0a7ae14be00b7d05cae62cfaf41578121745eb36c057bfd94fc SHA512 256f312985bf97cc531cc8f100ff7436bce503c22cbb231c9cba26a708f40a12a97bc3bf0980bcf9c306bfdbec1c628fb0c6caf8d9f678edcde87035eea468af diff --git a/net-misc/ptpd/ptpd-2.3.1-r1.ebuild b/net-misc/ptpd/ptpd-2.3.1-r1.ebuild deleted file mode 100644 index 9c358e02c8f6..000000000000 --- a/net-misc/ptpd/ptpd-2.3.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic systemd - -DESCRIPTION="Precision Time Protocol daemon" -HOMEPAGE="https://github.com/ptpd/ptpd" - -SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" - -LICENSE="BSD" -SLOT="0" -IUSE="debug experimental ntp +pcap snmp slave-only +statistics" -RDEPEND=" - pcap? ( net-libs/libpcap ) - snmp? ( net-analyzer/net-snmp )" -DEPEND="${RDEPEND}" -RDEPEND="${RDEPEND} - ntp? ( net-misc/ntp )" - -S=${WORKDIR}/ptpd-${P} - -src_prepare() { - eapply_user - sed -i -e 's/U64/struct counter64/' src/dep/snmp.c || die "sed failed" - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - econf \ - --enable-daemon \ - $(use_enable snmp) \ - $(use_enable experimental experimental-options) \ - $(use_enable statistics) \ - $(use_enable debug runtime-debug) \ - $(use_enable pcap) \ - $(use_enable slave-only) -} - -src_install() { - emake install DESTDIR="${D}" - - insinto /etc - newins "src/ptpd2.conf.minimal" ptpd2.conf - - newinitd "${FILESDIR}/ptpd2.rc" ptpd2 - newconfd "${FILESDIR}/ptpd2.confd" ptpd2 - - systemd_dounit "${FILESDIR}/ptpd2.service" -} - -pkg_postinst() { - elog "Do not forget to setup correct network interface." - elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs." -} diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index a5ed67fd0587..655d1b6bfad5 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -12,6 +12,6 @@ DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a12982 DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 EBUILD rsync-3.2.4-r3.ebuild 4804 BLAKE2B 9e7ff8580e0bda3e5eb854b68454e38141934fa86d7754d3a2855d6b4c71e3a68444d24b0f910981cd938626418775c1d879d467c13c790e9b4b22d8fe934148 SHA512 35b3bd3648897b0f12b16033e406a8a3d12b49cdfd5b7c330dd115e94b02cc0ccde3b7c3ec0ece06692a7fa20c8ba314ff4e1b8bee3f0d4bf13574a6b7aadaca -EBUILD rsync-3.2.7-r2.ebuild 5235 BLAKE2B 8e6de0f20da48eea915f5a5e438ec3aec66f46f84a04bec815864f22e894fc2f0dcfa13da47083b9783a768923b660efa556176930ff8213c77a4d8977dbb12e SHA512 f68eb35d84bca11a0d05b9248520d3dd1bd068b2e268c51b346920f8d65dbaa909e04a59d68dc8887ce78dbfe9a85e85d84a4ce04407d786ea49d90f3a1ca62f -EBUILD rsync-9999.ebuild 5180 BLAKE2B d53a7a8f6bcb556da145827f387f8364a32b07fe8c83bce3e46636803a07af1228f05a15ba84e32562bc7863fd3a65e3d4f7999dac03af657f2ee80df02fb0e0 SHA512 0e9e86712cf8e15ffa672ee5c3014d75abd3545b4e03c0be4109419a69ec4129840f4f5a503fdcc61ed300e1fa01fc093a268f9b7dec2991e0680f12a02cfff8 +EBUILD rsync-3.2.7-r2.ebuild 5482 BLAKE2B f74f30eaaac6b77a8c7d45b519a5b5021eabfd9525327985718bf284ad3aa66cc914bbb51c30ce327fbbf9b7171dee7ef256f147ca4ffece416c9bcf4c08d660 SHA512 215bedf99964472111b68ca618dd6e26460604639bc9b64338e4296831cbbd54844e2d7fd20e2a183a3f27add8b7622a5bc41ae25f77c6b244293d9924e18924 +EBUILD rsync-9999.ebuild 5482 BLAKE2B f74f30eaaac6b77a8c7d45b519a5b5021eabfd9525327985718bf284ad3aa66cc914bbb51c30ce327fbbf9b7171dee7ef256f147ca4ffece416c9bcf4c08d660 SHA512 215bedf99964472111b68ca618dd6e26460604639bc9b64338e4296831cbbd54844e2d7fd20e2a183a3f27add8b7622a5bc41ae25f77c6b244293d9924e18924 MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14 diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild index fae9369c193c..4dc746f9c96a 100644 --- a/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{9..11} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -125,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 4d23490d778c..4dc746f9c96a 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 PYTHON_COMPAT=( python3_{9..11} ) -inherit prefix python-single-r1 systemd +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -76,6 +76,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -121,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } -- cgit v1.2.3