From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- net-irc/atheme-services/Manifest | 3 +- .../atheme-services-7.2.10_p2-r2.ebuild | 94 ++++++++++++++++++++++ .../atheme-services-7.2.10_p2.ebuild | 92 --------------------- ...-7.2.10_p2-fix-backtrace-compat-detection.patch | 12 +++ 4 files changed, 108 insertions(+), 93 deletions(-) create mode 100644 net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild delete mode 100644 net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild create mode 100644 net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch (limited to 'net-irc/atheme-services') diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index e9a914c0b75a..8dfb0e23e4f9 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1,5 +1,6 @@ AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f +AUX atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch 377 BLAKE2B 068127c36f21614cf8322fcd550c4c1bb5aecc9f692796da960a0544ede5572ddce64b8cca2b2243c2ba0296f78d1dcde8bed92100c55679d69cf3ed9e66645a SHA512 d70e3df0662f0a4e20af45ccfde94a61acf3102d55d1432597a732e93c1bafd2fbec0e37b4d74125147adfc8506c96f3da2564ca6e7155c56916a6abf1e46de7 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1 DIST atheme-services-7.2.10_p2.tar.xz 21061364 BLAKE2B e02ea3b9b55c0a02bfd354da65ed45318c2f0a5d5d35cabe7984760cfe1683b9856cc779754f1de8861816b5b2d2323c898100697e8d365ffed039e90b42cde6 SHA512 c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48 -EBUILD atheme-services-7.2.10_p2.ebuild 2213 BLAKE2B abd040d824e75d3db7ac86eed9b8e60b0a2dc5963ed31bd485cdd0b30699bcc2478543f8123dc3b4722806327dde01c3f56cca48029752ece2c7280a1be4a5b7 SHA512 ee4cce046f792b685c854f9f3ed4ba849a5a13048658cd4fa1acf753fbf0aa6ca758b43016429fa1ae0d9bffbdc96c106b04733e1adce610adea1e0268f04878 +EBUILD atheme-services-7.2.10_p2-r2.ebuild 2287 BLAKE2B cf9e63e6511c708a0cac4c06f7f70ddd00fc06306b5cee1c8fe4e14c0c49199205e79b41397b8996148ef8aa454b200e64fdbca2aadd532987d3556031eed05d SHA512 2c6873981b724e7256efead03c9b7ce01b699ffae2b0d8c7c28c0e2bfb2fb1a6d18c12f34f7d5899f6014590aaee4f676bda471f7ad2e65d82bb5f570988a7bb MISC metadata.xml 721 BLAKE2B cab35add2ea8e919feee82480bd106479b29de57733ae46b18ebac83bbefde0f9e9d1479db8f59c4be4d60383805f969378a4a33b36976ac9bcae99ea8e7dd96 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15 diff --git a/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild b/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild new file mode 100644 index 000000000000..820dfd3bd2f6 --- /dev/null +++ b/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic perl-functions + +MY_PN="atheme" +MY_PV="7.2.10-r2" + +DESCRIPTION="A portable and secure set of open-source and modular IRC services" +HOMEPAGE="https://github.com/atheme/atheme" +SRC_URI="https://github.com/atheme/atheme/releases/download/v${MY_PV}/${MY_PN}-v${MY_PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cracklib largenet ldap nls +pcre perl profile ssl" +S="${WORKDIR}/${MY_PN}-v${MY_PV}" + +RDEPEND=" + acct-group/atheme-services + acct-user/atheme-services + >=dev-libs/libmowgli-2.1.0:2 + cracklib? ( sys-libs/cracklib ) + ldap? ( net-nds/openldap ) + perl? ( dev-lang/perl ) + pcre? ( dev-libs/libpcre ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND}" +# 'dev-vcs/git' required as per bug #665802 +BDEPEND=" + dev-vcs/git + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-configure-logdir.patch + "${FILESDIR}"/${P}-fix-backtrace-compat-detection.patch) + +src_configure() { + # perl scriping module support is also broken in 7.0.0. Yay for QA failures. + econf \ + --sysconfdir="${EPREFIX}"/etc/${PN} \ + --localstatedir="${EPREFIX}"/var \ + --enable-fhs-paths \ + --disable-warnings \ + --enable-contrib \ + $(use_enable largenet large-net) \ + $(use_with cracklib) \ + $(use_with ldap) \ + $(use_enable nls) \ + $(use_enable profile) \ + $(use_with pcre) \ + $(use_with perl) \ + $(use_enable ssl) +} + +src_compile() { + emake V=1 +} + +src_install() { + default + + insinto /etc/${PN} + for conf in dist/*.example; do + # The .cron file isn't meant to live in /etc/${PN}, so only + # install a .example version. + [[ ${conf} == *cron* ]] && continue + + local confdest=${conf##*/} + newins ${conf} ${confdest%.example} + done + + fowners -R 0:${PN} /etc/${PN} + keepdir /var/{lib,log}/atheme + fowners ${PN}:${PN} /var/{lib,log}/atheme + fperms -R go-w,o-rx /etc/${PN} + fperms 750 /etc/${PN} /var/{lib,log}/atheme + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + mv "${ED}"/usr/bin/{,atheme-}dbverify || die + + # contributed scripts and such: + docinto contrib + dodoc contrib/*.{c,pl,php,py,rb} + + use perl && perl_domodule -r contrib/Atheme{,.pm} + + rm "${ED}/usr/share/doc/${PF}/WINDOWS" || die + + # Bug #454840 #520490 + rm -rf "${ED}/var/run" || die +} diff --git a/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild b/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild deleted file mode 100644 index 370851d3ea41..000000000000 --- a/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic perl-functions user - -MY_PN="atheme" -MY_PV="7.2.10-r2" - -DESCRIPTION="A portable and secure set of open-source and modular IRC services" -HOMEPAGE="https://github.com/atheme/atheme" -SRC_URI="https://github.com/atheme/atheme/releases/download/v${MY_PV}/${MY_PN}-v${MY_PV}.tar.xz -> ${PN}-${PV}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cracklib largenet ldap nls +pcre perl profile ssl" -S="${WORKDIR}/${MY_PN}-v${MY_PV}" - -RDEPEND=">=dev-libs/libmowgli-2.1.0:2 - cracklib? ( sys-libs/cracklib ) - ldap? ( net-nds/openldap ) - perl? ( dev-lang/perl ) - pcre? ( dev-libs/libpcre ) - ssl? ( dev-libs/openssl:0= )" -DEPEND="${RDEPEND} - dev-vcs/git - virtual/pkgconfig" - -PATCHES=("${FILESDIR}"/${P}-configure-logdir.patch) - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/atheme ${PN} -} - -src_configure() { - # perl scriping module support is also broken in 7.0.0. Yay for QA failures. - econf \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --localstatedir="${EPREFIX}"/var \ - --enable-fhs-paths \ - --disable-warnings \ - --enable-contrib \ - $(use_enable largenet large-net) \ - $(use_with cracklib) \ - $(use_with ldap) \ - $(use_enable nls) \ - $(use_enable profile) \ - $(use_with pcre) \ - $(use_with perl) \ - $(use_enable ssl) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - - insinto /etc/${PN} - for conf in dist/*.example; do - # The .cron file isn't meant to live in /etc/${PN}, so only - # install a .example version. - [[ ${conf} == *cron* ]] && continue - - local confdest=${conf##*/} - newins ${conf} ${confdest%.example} - done - - fowners -R 0:${PN} /etc/${PN} - keepdir /var/{lib,log}/atheme - fowners ${PN}:${PN} /var/{lib,log}/atheme - fperms -R go-w,o-rx /etc/${PN} - fperms 750 /etc/${PN} /var/{lib,log}/atheme - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - mv "${ED}"/usr/bin/{,atheme-}dbverify || die - - # contributed scripts and such: - docinto contrib - dodoc contrib/*.{c,pl,php,py,rb} - - use perl && perl_domodule -r contrib/Atheme{,.pm} - - rm "${ED%/}/usr/share/doc/${PF}/WINDOWS" || die - - # Bug #454840 #520490 - rm -rf "${ED%/}/var/run" || die -} diff --git a/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch new file mode 100644 index 000000000000..b6f448163aac --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch @@ -0,0 +1,12 @@ +diff --git a/modules/contrib/backtrace.c b/modules/contrib/backtrace.c +index 8c4eeb2..064e88e 100644 +--- a/modules/contrib/backtrace.c ++++ b/modules/contrib/backtrace.c +@@ -1,6 +1,6 @@ + #include "atheme-compat.h" + +-#if defined( __linux__) || defined(__Linux__) ++#if (defined( __linux__) || defined(__Linux__)) && defined(__GLIBC__) + #include + + DECLARE_MODULE_V1 -- cgit v1.2.3