From ff24f981b3a1c80276da21cdbf0fb3aa17af14ba Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 24 Oct 2020 06:34:27 +0000 Subject: net-irc/anope: bump to 2.0.9 Fixes a regression in 2.0.8 with MySQL usage. See: https://github.com/anope/anope/compare/2.0.8...2.0.9 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James --- net-irc/anope/Manifest | 2 +- net-irc/anope/anope-2.0.8.ebuild | 152 --------------------------------------- net-irc/anope/anope-2.0.9.ebuild | 152 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 153 deletions(-) delete mode 100644 net-irc/anope/anope-2.0.8.ebuild create mode 100644 net-irc/anope/anope-2.0.9.ebuild (limited to 'net-irc/anope') diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index 7f9843c097ec..1e406ccf6b6b 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -1,2 +1,2 @@ DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65 -DIST anope-2.0.8.tar.gz 1808747 BLAKE2B f4413fdd151498c7521df175b88cc693a00de8ee3960962f79affd8cb821d428f12145dcc444c75e5940ea80ea22591048c313d7cda32570ed7a941e37e27334 SHA512 ddb42a453d72327d2256e5963f720bb310a7524c01661a0a136f18c539813649889e9fb764077c86e0854de8e3da095ebabb1ba53a0538d679bd42ea6403823b +DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0 diff --git a/net-irc/anope/anope-2.0.8.ebuild b/net-irc/anope/anope-2.0.8.ebuild deleted file mode 100644 index d7c7c0caf699..000000000000 --- a/net-irc/anope/anope-2.0.8.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Anope IRC Services" -HOMEPAGE="https://anope.org/ https://github.com/anope/anope/" -SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="gnutls ldap mysql pcre sql sqlite ssl tre" -REQUIRED_USE="sql? ( || ( mysql sqlite ) )" - -BDEPEND="sys-devel/gettext" -DEPEND=" - acct-group/anope - acct-user/anope - mysql? ( dev-db/mysql-connector-c:0= ) - ssl? ( dev-libs/openssl:0= ) - gnutls? ( - net-libs/gnutls:0= - dev-libs/libgcrypt:0= - ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) - sqlite? ( dev-db/sqlite:3 ) - tre? ( dev-libs/tre ) - virtual/libintl -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch" - "${FILESDIR}/${PN}-2.0.7-example.conf-user.patch" -) - -src_prepare() { - anope_enable_mod() { - local modulefile=${1} - ln -s "extra/${modulefile}" "modules/" || \ - die "Failed to use ${modulefile}" - } - - # These all require MySQL specifically - if use mysql ; then - anope_enable_mod "m_mysql.cpp" - anope_enable_mod "stats/irc2sql/irc2sql.cpp" - anope_enable_mod "stats/irc2sql/irc2sql.h" - anope_enable_mod "stats/irc2sql/tables.cpp" - anope_enable_mod "stats/irc2sql/utils.cpp" - anope_enable_mod "stats/m_chanstats.cpp" - anope_enable_mod "stats/cs_fantasy_top.cpp" - anope_enable_mod "stats/cs_fantasy_stats.cpp" - anope_enable_mod "m_sql_log.cpp" - anope_enable_mod "m_sql_oper.cpp" - fi - - use sqlite && anope_enable_mod "m_sqlite.cpp" - - # Any SQL implementation - if use sql ; then - anope_enable_mod "m_sql_authentication.cpp" - fi - - if use ldap ; then - anope_enable_mod "m_ldap.cpp" - anope_enable_mod "m_ldap_authentication.cpp" - anope_enable_mod "m_ldap_oper.cpp" - fi - - use gnutls && anope_enable_mod "m_ssl_gnutls.cpp" - use pcre && anope_enable_mod "m_regex_pcre.cpp" - use ssl && anope_enable_mod "m_ssl_openssl.cpp" - use tre && anope_enable_mod "m_regex_tre.cpp" - - # Unconditional modules - anope_enable_mod "m_regex_posix.cpp" - - # Avoid a silly sandbox error - tries to delete /usr/lib/modules - sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die - - # Copy anope.conf for fixup to comply w/ prefix - cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die - - # Look in the right place for modules - sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \ - "${T}/anope-conf.d-v2" || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBIN_DIR="libexec/anope" - -DDB_DIR="../var/lib/anope" - -DDOC_DIR="share/doc/${PF}" - -DLIB_DIR="$(get_libdir)/anope" - -DLOCALE_DIR="share/locale" - -DCONF_DIR="/etc/anope" - -DLOGS_DIR="../var/log/anope/" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}/anope-init.d" "${PN}" - newconfd "${T}/anope-conf.d-v2" "${PN}" - - dosym ../libexec/anope/services /usr/bin/services - dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp - - keepdir /var/log/anope /var/lib/anope/backups - fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups - - dodoc -r docs/* data/example.conf - - insinto /etc/anope - newins data/example.conf services.conf - - fowners anope:anope /var/log/anope - fowners anope:anope /var/lib/anope/backups/ -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - # Only tell them about this on a fresh install. - elog - ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration." - ewarn "Edit /etc/anope/services.conf to configure Anope." - elog - else - # We're replacing some versions. Find out which. - local ver - for ver in "${REPLACING_VERSIONS}" ; do - if ver_test ${ver} -lt 2.0.7 ; then - # In this version, we introduced correct FHS structure - # We need the users to make some changes to their services.conf - ewarn "Please modify your services.conf to include the following directive:" - ewarn "in options{}, please include user=\"anope\" and group=\"anope\"" - ewarn "This is needed because Anope now starts as root and drops down." - ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options" - fi - done - fi -} diff --git a/net-irc/anope/anope-2.0.9.ebuild b/net-irc/anope/anope-2.0.9.ebuild new file mode 100644 index 000000000000..d7c7c0caf699 --- /dev/null +++ b/net-irc/anope/anope-2.0.9.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Anope IRC Services" +HOMEPAGE="https://anope.org/ https://github.com/anope/anope/" +SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="gnutls ldap mysql pcre sql sqlite ssl tre" +REQUIRED_USE="sql? ( || ( mysql sqlite ) )" + +BDEPEND="sys-devel/gettext" +DEPEND=" + acct-group/anope + acct-user/anope + mysql? ( dev-db/mysql-connector-c:0= ) + ssl? ( dev-libs/openssl:0= ) + gnutls? ( + net-libs/gnutls:0= + dev-libs/libgcrypt:0= + ) + ldap? ( net-nds/openldap ) + pcre? ( dev-libs/libpcre ) + sqlite? ( dev-db/sqlite:3 ) + tre? ( dev-libs/tre ) + virtual/libintl +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch" + "${FILESDIR}/${PN}-2.0.7-example.conf-user.patch" +) + +src_prepare() { + anope_enable_mod() { + local modulefile=${1} + ln -s "extra/${modulefile}" "modules/" || \ + die "Failed to use ${modulefile}" + } + + # These all require MySQL specifically + if use mysql ; then + anope_enable_mod "m_mysql.cpp" + anope_enable_mod "stats/irc2sql/irc2sql.cpp" + anope_enable_mod "stats/irc2sql/irc2sql.h" + anope_enable_mod "stats/irc2sql/tables.cpp" + anope_enable_mod "stats/irc2sql/utils.cpp" + anope_enable_mod "stats/m_chanstats.cpp" + anope_enable_mod "stats/cs_fantasy_top.cpp" + anope_enable_mod "stats/cs_fantasy_stats.cpp" + anope_enable_mod "m_sql_log.cpp" + anope_enable_mod "m_sql_oper.cpp" + fi + + use sqlite && anope_enable_mod "m_sqlite.cpp" + + # Any SQL implementation + if use sql ; then + anope_enable_mod "m_sql_authentication.cpp" + fi + + if use ldap ; then + anope_enable_mod "m_ldap.cpp" + anope_enable_mod "m_ldap_authentication.cpp" + anope_enable_mod "m_ldap_oper.cpp" + fi + + use gnutls && anope_enable_mod "m_ssl_gnutls.cpp" + use pcre && anope_enable_mod "m_regex_pcre.cpp" + use ssl && anope_enable_mod "m_ssl_openssl.cpp" + use tre && anope_enable_mod "m_regex_tre.cpp" + + # Unconditional modules + anope_enable_mod "m_regex_posix.cpp" + + # Avoid a silly sandbox error - tries to delete /usr/lib/modules + sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die + + # Copy anope.conf for fixup to comply w/ prefix + cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die + + # Look in the right place for modules + sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \ + "${T}/anope-conf.d-v2" || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBIN_DIR="libexec/anope" + -DDB_DIR="../var/lib/anope" + -DDOC_DIR="share/doc/${PF}" + -DLIB_DIR="$(get_libdir)/anope" + -DLOCALE_DIR="share/locale" + -DCONF_DIR="/etc/anope" + -DLOGS_DIR="../var/log/anope/" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}/anope-init.d" "${PN}" + newconfd "${T}/anope-conf.d-v2" "${PN}" + + dosym ../libexec/anope/services /usr/bin/services + dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp + + keepdir /var/log/anope /var/lib/anope/backups + fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups + + dodoc -r docs/* data/example.conf + + insinto /etc/anope + newins data/example.conf services.conf + + fowners anope:anope /var/log/anope + fowners anope:anope /var/lib/anope/backups/ +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + # Only tell them about this on a fresh install. + elog + ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration." + ewarn "Edit /etc/anope/services.conf to configure Anope." + elog + else + # We're replacing some versions. Find out which. + local ver + for ver in "${REPLACING_VERSIONS}" ; do + if ver_test ${ver} -lt 2.0.7 ; then + # In this version, we introduced correct FHS structure + # We need the users to make some changes to their services.conf + ewarn "Please modify your services.conf to include the following directive:" + ewarn "in options{}, please include user=\"anope\" and group=\"anope\"" + ewarn "This is needed because Anope now starts as root and drops down." + ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options" + fi + done + fi +} -- cgit v1.2.3-65-gdbad