From 7d7cc3f0fa58454952dec67b110b41d503bca422 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Dec 2024 06:30:40 +0000 Subject: gentoo auto-resync : 30:12:2024 - 06:30:40 --- net-irc/atheme-services/Manifest | 3 +- .../atheme-services-7.2.12-r4.ebuild | 92 --------------------- .../atheme-services-7.2.12-r5.ebuild | 93 ++++++++++++++++++++++ ...e-account-fix-assertion-macro-return-type.patch | 37 +++++++++ 4 files changed, 132 insertions(+), 93 deletions(-) delete mode 100644 net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild create mode 100644 net-irc/atheme-services/atheme-services-7.2.12-r5.ebuild create mode 100644 net-irc/atheme-services/files/atheme-services-7.2.12-libathemecore-account-fix-assertion-macro-return-type.patch (limited to 'net-irc/atheme-services') diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index 17e616690685..5f40194f81c2 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1,6 +1,7 @@ AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f +AUX atheme-services-7.2.12-libathemecore-account-fix-assertion-macro-return-type.patch 1399 BLAKE2B 5026d337bd6a798c00ee5bd3d4a36e0dcf6c82a890cbe4dbb4914d5710aacd0203079cd626b63ea047e2df24a287b244509f1396bd182719d88c6d73cdf4354c SHA512 7fada5c5684d760bc789efd28b8f6d619f5718167b3e296c871274faea43727670f6ba72cd599cb2fb9f6750249e9c7c70f08095d7b34343df70454d7312c66e AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1 AUX atheme-services.service 298 BLAKE2B 5f21b2eaa0abf8debc722a34e7e7ab4156bae0769438b8bd77221302dcbe64133aff04278ee76321114ade17c8701f9a67dee09d8b8230d2aa3e1ce884b675da SHA512 1f0910b489deb3df5933651a630c98ce775592bd8a970335100970c449af07781f6f467e3d028ed8c9ca14037f9e3e03cd86624defa613332387c4042684925c DIST atheme-services-7.2.12.tar.xz 1072992 BLAKE2B f9e1cb175c1e2f38b5d53eba8f3d391e421baaff7eb76f38b10ba02b258472ccf9b69a7a278ff05c4f620b6fe6e48362618c02d245ed5d9c5acd4bede91ac093 SHA512 0d276b9a0c96f72a739090c5b2c732ab6c000f801cbb86347b5670def56f36fb82d70fb4cb68a1d942b9765c054bc136a6b0cecc0573cf8f59076f8b91fc6bf6 -EBUILD atheme-services-7.2.12-r4.ebuild 2266 BLAKE2B 08a9106d04a57580846f1fc28e4457f604bfb1e36edbe0086b94b04ef073a283610b61e2f9aa88ff7e468e631c5f775d483398b1c0ac4a81be6fd1084e308071 SHA512 bc5504d18b8dd72af974e5b42c63ffe229a8c9ce74d324a4cd30d551778c001ae46c8c56f77aa96fa0de267ac7831bb2065a10fe8059ff70da9d9958a8207434 +EBUILD atheme-services-7.2.12-r5.ebuild 2354 BLAKE2B f97c9e27be5bc5e1608432a32beb6f45d9d7b9ef96692d52787e01b943c91ec0e15c6abc9da27eab0923465f554337b8b112cd20a69682a3745a5d58a5af811b SHA512 de09cac6c208c3ea55995899ec6a3ef120115bc0402b9c359f31d18b879c5abd4cdb6688f45e678d3665b685781a584dfb6d1cb0626a136b1a29f160d0590407 MISC metadata.xml 830 BLAKE2B 79210e18e81cf7fa5299029b17b9819b39706558d58a002701c1c84fd37fa2d4022aa46448aee9558d8778bf4568ecd6c6cee7101d01f911fb260d96810e085e SHA512 3471aeabc100a3de474b0c49c0b115169b6e2b6d17a3d5e2aefafc4471b553d79857199913ae98b67d52cced875b9992dc5e983a31ce408788ed77baab79688f diff --git a/net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild b/net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild deleted file mode 100644 index 335443e95737..000000000000 --- a/net-irc/atheme-services/atheme-services-7.2.12-r4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit perl-functions systemd - -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${PV}/${PN}-v${PV}.tar.xz -> ${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" -IUSE="cracklib largenet ldap nls +pcre perl profile ssl" -S="${WORKDIR}/${PN}-v${PV}" - -RDEPEND=" - acct-group/atheme-services - acct-user/atheme-services - >=dev-libs/libmowgli-2.1.0:2 - virtual/libcrypt:= - 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}"/${PN}-7.2.10_p2-configure-logdir.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 - systemd_dounit "${FILESDIR}"/${PN}.service - - # 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.12-r5.ebuild b/net-irc/atheme-services/atheme-services-7.2.12-r5.ebuild new file mode 100644 index 000000000000..fdcf9d3dbdbc --- /dev/null +++ b/net-irc/atheme-services/atheme-services-7.2.12-r5.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-functions systemd + +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${PV}/${PN}-v${PV}.tar.xz -> ${P}.tar.xz" + +S="${WORKDIR}/${PN}-v${PV}" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64" +IUSE="cracklib largenet ldap nls +pcre perl profile ssl" + +RDEPEND=" + acct-group/atheme-services + acct-user/atheme-services + >=dev-libs/libmowgli-2.1.0:2 + virtual/libcrypt:= + 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}"/${PN}-7.2.10_p2-configure-logdir.patch + "${FILESDIR}"/${PN}-7.2.12-libathemecore-account-fix-assertion-macro-return-type.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 + systemd_dounit "${FILESDIR}"/${PN}.service + + # 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.12-libathemecore-account-fix-assertion-macro-return-type.patch b/net-irc/atheme-services/files/atheme-services-7.2.12-libathemecore-account-fix-assertion-macro-return-type.patch new file mode 100644 index 000000000000..26cc3829346c --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services-7.2.12-libathemecore-account-fix-assertion-macro-return-type.patch @@ -0,0 +1,37 @@ +From a0410c301293736a09b52763d25893019ede3e3a Mon Sep 17 00:00:00 2001 +From: Aaron Jones +Date: Mon, 25 Nov 2024 05:31:26 +0000 +Subject: [PATCH] libathemecore/account: fix assertion macro return + types/values + +--- + libathemecore/account.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libathemecore/account.c b/libathemecore/account.c +index 80233ade2..985cf9ff6 100644 +--- a/libathemecore/account.c ++++ b/libathemecore/account.c +@@ -1631,7 +1631,7 @@ chanacs_t *chanacs_find_host_by_user(mychan_t *mychan, user_t *u, unsigned int l + mowgli_node_t *n; + chanacs_t *ca; + +- return_val_if_fail(mychan != NULL && u != NULL, 0); ++ return_val_if_fail(mychan != NULL && u != NULL, NULL); + + for (n = next_matching_host_chanacs(mychan, u, mychan->chanacs.head); n != NULL; n = next_matching_host_chanacs(mychan, u, n->next)) + { +@@ -1779,8 +1779,8 @@ chanacs_t *chanacs_open(mychan_t *mychan, myentity_t *mt, const char *hostmask, + chanacs_t *ca; + + /* wrt the second assert: only one of mu or hostmask can be not-NULL --nenolod */ +- return_val_if_fail(mychan != NULL, false); +- return_val_if_fail((mt != NULL && hostmask == NULL) || (mt == NULL && hostmask != NULL), false); ++ return_val_if_fail(mychan != NULL, NULL); ++ return_val_if_fail((mt != NULL && hostmask == NULL) || (mt == NULL && hostmask != NULL), NULL); + + if (mt != NULL) + { +-- +2.45.2 + -- cgit v1.2.3