From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- net-irc/atheme-services/Manifest | 7 +- .../atheme-services-7.2.10_p2.ebuild | 91 ++++++++++++++++++++++ .../atheme-services-7.2.9-r1.ebuild | 89 --------------------- ...theme-services-7.2.10_p2-configure-logdir.patch | 25 ++++++ .../atheme-services-7.2.9-configure-logdir.patch | 25 ------ .../files/atheme-services-7.2.9-fix-docdir.patch | 13 ---- 6 files changed, 119 insertions(+), 131 deletions(-) create mode 100644 net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild delete mode 100644 net-irc/atheme-services/atheme-services-7.2.9-r1.ebuild create mode 100644 net-irc/atheme-services/files/atheme-services-7.2.10_p2-configure-logdir.patch delete mode 100644 net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch delete mode 100644 net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch (limited to 'net-irc/atheme-services') diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index 193621e2dcb6..e5fd2863f528 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -1,6 +1,5 @@ -AUX atheme-services-7.2.9-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f -AUX atheme-services-7.2.9-fix-docdir.patch 326 BLAKE2B c7df86a38a6d44ccfe3f4bf5685374c74fba7e575d15de30b4711acf2fbf623e419ca016c260174c3478c4aece93fe54515df5cd6286618108fdf3041e69d625 SHA512 62830bc6836406eb780dd60bfd3ac1d013223358aab5fc4fa26906c15c4de71089c4bc2a941776434b086e90722ef611b1d5e21a0599f61ee24b00a60ef502c2 +AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1 -DIST atheme-services-7.2.9.tar.bz2 1179582 BLAKE2B ea8a52cccffae78a317dc060fc6eef4daf398ab5c3d91147aaad48252614df42fd0327ee0cc9eef237dd03d81edde6a64bb0fb498d68039e8424fbab1b92861c SHA512 8852bcf4746ad3b8814e2e7ae8b435c538b442f26f6cf8479087d115c0c4d6877ea864f9e19ccaa9ae93ea8a116cfa53d1f22846fffb783f78bfad8e95fd26f7 -EBUILD atheme-services-7.2.9-r1.ebuild 2184 BLAKE2B c582a4db4d9bfa4dc4687eec61e113cc984e51b10b48b009ff373dbe7fc6bab7b94fcb8cee24f1ae26a3686d94c039e25d3feee3e0450aee7c739dfe461d85fc SHA512 69706eccbd2a9c6d9acf4c307db1de6f91b8ad2b6f408a878451c7d7a8b4fad21107c24d1f16503f5a625a4b25ae803ae2d0a0297ac02c69e9a3c7105cb8bfe4 +DIST atheme-services-7.2.10_p2.tar.xz 21061364 BLAKE2B e02ea3b9b55c0a02bfd354da65ed45318c2f0a5d5d35cabe7984760cfe1683b9856cc779754f1de8861816b5b2d2323c898100697e8d365ffed039e90b42cde6 SHA512 c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48 +EBUILD atheme-services-7.2.10_p2.ebuild 2200 BLAKE2B 7e1927bb0b0da565354df9f7b21a06bc82e800cb98fc91e30064683095be1d286887fa9ae7d0c95c07cfd8af724fb91663071aab841b80f790295e6b3bffb1d4 SHA512 f3a9a674df4f7cc87ba224739eea0ba812f2e9090940ef90809f377f7f85bf3ea094a921a00b34744bcf3e354c0a7937a34f0fe13035a0f6827b45d97d459482 MISC metadata.xml 721 BLAKE2B cab35add2ea8e919feee82480bd106479b29de57733ae46b18ebac83bbefde0f9e9d1479db8f59c4be4d60383805f969378a4a33b36976ac9bcae99ea8e7dd96 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15 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 new file mode 100644 index 000000000000..90d919e53571 --- /dev/null +++ b/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild @@ -0,0 +1,91 @@ +# 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} + 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/atheme-services-7.2.9-r1.ebuild b/net-irc/atheme-services/atheme-services-7.2.9-r1.ebuild deleted file mode 100644 index 5fcdc6534d3a..000000000000 --- a/net-irc/atheme-services/atheme-services-7.2.9-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 flag-o-matic perl-functions user - -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}/atheme-${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cracklib largenet ldap nls +pcre perl profile ssl" -S="${WORKDIR}/atheme-${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} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-fix-docdir.patch - "${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-configure-logdir.patch b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-configure-logdir.patch new file mode 100644 index 000000000000..d57af2d9f445 --- /dev/null +++ b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-configure-logdir.patch @@ -0,0 +1,25 @@ +diff --git a/dist/atheme.conf.example b/dist/atheme.conf.example +index ac3ed54dd..be1c2db50 100644 +--- a/dist/atheme.conf.example ++++ b/dist/atheme.conf.example +@@ -1909,17 +1909,17 @@ ldap { + * This block logs all account and channel registrations and drops, + * and account and channel setting changes to var/account.log. + */ +-logfile "var/account.log" { register; set; }; ++logfile "/var/log/atheme/account.log" { register; set; }; + + /* + * This block logs all command use to var/commands.log. + */ +-logfile "var/commands.log" { commands; }; ++logfile "/var/log/atheme/commands.log" { commands; }; + + /* + * This block logs all security auditing information. + */ +-logfile "var/audit.log" { denycmd; }; ++logfile "/var/log/atheme/audit.log" { denycmd; }; + + /* + * You can log to IRC channels, and even split it by category, too. diff --git a/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch b/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch deleted file mode 100644 index d57af2d9f445..000000000000 --- a/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/dist/atheme.conf.example b/dist/atheme.conf.example -index ac3ed54dd..be1c2db50 100644 ---- a/dist/atheme.conf.example -+++ b/dist/atheme.conf.example -@@ -1909,17 +1909,17 @@ ldap { - * This block logs all account and channel registrations and drops, - * and account and channel setting changes to var/account.log. - */ --logfile "var/account.log" { register; set; }; -+logfile "/var/log/atheme/account.log" { register; set; }; - - /* - * This block logs all command use to var/commands.log. - */ --logfile "var/commands.log" { commands; }; -+logfile "/var/log/atheme/commands.log" { commands; }; - - /* - * This block logs all security auditing information. - */ --logfile "var/audit.log" { denycmd; }; -+logfile "/var/log/atheme/audit.log" { denycmd; }; - - /* - * You can log to IRC channels, and even split it by category, too. diff --git a/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch b/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch deleted file mode 100644 index e7d4bb2695fc..000000000000 --- a/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/extra.mk.in b/extra.mk.in -index 39053e48a..e47b27246 100644 ---- a/extra.mk.in -+++ b/extra.mk.in -@@ -82,7 +82,7 @@ libdir ?= @libdir@ - CFLAGS ?= @CFLAGS@ - INSTALL_LIB ?= @INSTALL_LIB@ - RUNDIR ?= @RUNDIR@ --DOCDIR ?= @DOCDIR@ -+DOCDIR ?= @docdir@ - localstatedir ?= @localstatedir@ - docdir ?= @docdir@ - GREP ?= @GREP@ -- cgit v1.2.3