From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- net-irc/Manifest.gz | Bin 9168 -> 9168 bytes net-irc/anope/Manifest | 13 +- net-irc/anope/anope-1.8.7-r2.ebuild | 119 --------------- net-irc/anope/anope-2.0.6.ebuild | 159 +++++++++++++++++++++ net-irc/anope/files/anope-1.8.7-ldflags-fix.patch | 47 ------ .../anope/files/anope-1.8.7-libdir-gentoo.patch | 91 ------------ net-irc/anope/files/anope-1.8.7-mariadb.patch | 109 -------------- net-irc/anope/files/anope-conf.d | 8 -- net-irc/anope/files/anope-conf.d-v2 | 9 ++ net-irc/anope/files/pid-patch.diff | 11 -- net-irc/anope/files/pid-patch.patch | 18 +++ net-irc/anope/metadata.xml | 15 ++ net-irc/ircii/Manifest | 2 + net-irc/ircii/ircii-20190117.ebuild | 36 +++++ 14 files changed, 244 insertions(+), 393 deletions(-) delete mode 100644 net-irc/anope/anope-1.8.7-r2.ebuild create mode 100644 net-irc/anope/anope-2.0.6.ebuild delete mode 100644 net-irc/anope/files/anope-1.8.7-ldflags-fix.patch delete mode 100644 net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch delete mode 100644 net-irc/anope/files/anope-1.8.7-mariadb.patch delete mode 100644 net-irc/anope/files/anope-conf.d create mode 100644 net-irc/anope/files/anope-conf.d-v2 delete mode 100644 net-irc/anope/files/pid-patch.diff create mode 100644 net-irc/anope/files/pid-patch.patch create mode 100644 net-irc/ircii/ircii-20190117.ebuild (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index f6aef9b46ef0..194796508a3e 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index abd425e93592..8e5ebf3579c7 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -1,9 +1,6 @@ -AUX anope-1.8.7-ldflags-fix.patch 1715 BLAKE2B bd7b8edf033720a9bc3f89b663c6164589f2637d5a2f89ea3ac4fc371ea2477ce04b134ba60bdad9e3045645cb1221b63c75f2b29f4ba9d523592876d1374dc5 SHA512 f92b8ff3d6c7d4cd9a56aa4cdcf98b9c1da93aa8a6a00e2e0a09e7a4facf937878b7abda32b698dbb19781863263e2eb21fbc8b5adfd4619898dacf34920fe23 -AUX anope-1.8.7-libdir-gentoo.patch 2584 BLAKE2B 8065df63bad292290dad78ac168a81b26f5ee8269e6899769cde77e00ce66447de27f5b54b18181d338e0bbaac74cb859c059988e7e94faa0262fe0075ef842a SHA512 50d80ac51e781b97b7db0ba9e8dbf20de1471c29d603ae14ba907d562de977be3242226d4e71edbec6a497856a87f41eb05bcc19e7a2854ff4dc37365c3a0089 -AUX anope-1.8.7-mariadb.patch 3452 BLAKE2B a09300b7e118c088c7ccb7b38e159b87ff05a4af5c478dc7a34bbd21bb8af886ebd793fcf760a3f168ad616960f10c071012c44954bbc89653da3072235c9a54 SHA512 4f0172a0113601be01117585d75ecc59c5fc36a9dc21b49faba525b0af5145d1180b0bddfd3ca8685b4ed7ef4eaeb14921a6940979c0d8a3c66a57e0a77c388b -AUX anope-conf.d 209 BLAKE2B 042e99052c0372ac1c6d1a3f004e7c5ccfab78d2b7a3bcc3ca814a6853337d3bf1f2ce776fac9c9c2f5f88906d439c73465636a03df9cb6539a733183aaa7542 SHA512 9de9f1be029af784c57c6b02122de62900a9381259f30420fdcfba13b12c3500a298b71e09d83f143b3fe2696e4e428f98fc75b6db055ece18ff2f45d13031cc +AUX anope-conf.d-v2 352 BLAKE2B 38bacb495ff0be9e8f8cc635bdd9eb1927b6d120bcb65ddfbc436da2b0292ee1dc52c750094d8ee24c23d503050a176db309b5025a0f5b4655354e10aa089c19 SHA512 6e8af033c85a1e102b00934d1c2d0d01f25c6e3ed0c2775e9e3fa5f8e3ee33c8803eb49ded5a73501c7f3940ba234270009f69f89314f0dd77534ee3a5694d54 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c -AUX pid-patch.diff 450 BLAKE2B 0cf9f4f2f237d0769ecc77e3103419f5ac0f2c8b58ebdd55b7dce4134a71a2f6280e8571d92de2a6ec458df2fb292963cbc18f54d63faf3693740f1bd9f04948 SHA512 eae4208a3014a6e4d787b19395606f96d9d9d382dc25985e63a40f0e488b6596112acffbe554ac7226daa8b87d090be6fd11d0bf22f1edd41e5dcd21f62df6ed -DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 -EBUILD anope-1.8.7-r2.ebuild 3425 BLAKE2B 91d045a802046c607c5dd34f09d25e4ec20c52993c1c69587663883bc910e53a352cddba29cd6aeeb8586f614a4c6b900d7ca21aff5f792d670d9241acbfabc1 SHA512 f2c22af87982e0e0a89214a4d5a138671a269d67cc648497f75f410bba10dbebebad9f7394a12a63355c75d1f782d05e8a2c5aa3910605f32c20029dc2ca4b1b -MISC metadata.xml 269 BLAKE2B 8394b29778013bb47c9f09e92fc75e7913477eff8f29436fdbf0251472651edbc7856a6f41a0ed204f45877ae35df2e5379fa676c868ffe8bfc3b705fe1f6006 SHA512 6a40d97233c3ed6f0bba926eeecc4930ca63d113bd9a9554a98caf236a2d3970f6ceea2a2d1a8e42839494566e8caa657e95dd248a88f555cac60f2a19febae2 +AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f +DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b +EBUILD anope-2.0.6.ebuild 5472 BLAKE2B 9eb30e33b088cc841ead1f0678da659dc34eefa949105bff0ae1736dd2569d6a14c8ed31908ab4bf864b40b1664e7688d12b12ab884922a4b7c44f6b89cce259 SHA512 8ab01aac403162946f3cae74b07c128bf04fd63b1ec7ae5f8491cc52575caa5abe4380ba05e2f644f493effe6de15bfbea6e7494893ad5c6ee6ba08b37930948 +MISC metadata.xml 1305 BLAKE2B 681d4017f00d2513f7709f4b26ac16267dcddae92d685cf43660b1117206a96f6e831bc768e03dbd8eff19082c86e643d04330a9d0378756b6f9f1c7ee95ad4f SHA512 82be3f2cb514543d6696037b0c6a90da8a6b06813dfde77cfb37c8c40b312ccf9e79ec637113bdd2d0bffa57a8fc539fe0a14941371bb8ed0d71399b34c343b9 diff --git a/net-irc/anope/anope-1.8.7-r2.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild deleted file mode 100644 index 82224833f9bb..000000000000 --- a/net-irc/anope/anope-1.8.7-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools eutils multilib versionator user - -DESCRIPTION="Anope IRC Services" -HOMEPAGE="http://www.anope.org" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql" - -DEPEND="mysql? ( virtual/mysql )" -RDEPEND="${DEPEND}" - -pkg_pretend() { - local replaced_version - for replaced_version in ${REPLACING_VERSIONS} ; do - if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then - eerror "It looks like you have an older version of Anope installed." - eerror "To upgrade, shut down Anope and copy your databases to" - eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope" - eerror "You can do this by:" - eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope" - eerror "# chown anope:anope ${ROOT}var/lib/anope" - eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope" - eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope" - die "Please move your anope database files from /opt/anope/data" - fi - done -} - -pkg_setup() { - enewgroup anope - enewuser anope -1 -1 -1 anope -} - -src_prepare() { - epatch "${FILESDIR}/pid-patch.diff" - epatch "${FILESDIR}/${P}-ldflags-fix.patch" - epatch "${FILESDIR}/${P}-libdir-gentoo.patch" - epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119 - eautoconf -} - -src_configure() { - local myconf - if ! use mysql; then - myconf="${myconf} --without-mysql" - fi - - econf \ - ${myconf} \ - --with-bindir=/usr/bin/ \ - --with-datadir=/var/lib/anope \ - --with-libdir=/usr/$(get_libdir)/anope/ \ - --with-rungroup=anope \ - --with-permissions=077 - - sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed" -} - -src_install() { - keepdir /var/log/anope /var/lib/anope/backups - fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups - - local baselibdir - baselibdir="${D}/usr/$(get_libdir)/anope" - - dodir /usr/$(get_libdir)/anope/{lang,modules} - emake DATDEST="${baselibdir}" \ - BINDEST="${D}/usr/bin" \ - MODULE_PATH="${baselibdir}/modules" \ - install - - newinitd "${FILESDIR}/anope-init.d" anope - newconfd "${FILESDIR}/anope-conf.d" anope - - dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf - use mysql && dodoc data/tables.sql - - insinto /etc/anope - newins data/example.conf services.conf -} - -pkg_preinst() { - if has_version net-irc/anope ; then - local directory - directory="${ROOT}"var/lib/anope/pre-update - elog "Making a backup of your databases to ${directory}" - if [ ! -d "${directory}" ]; then - mkdir -p "${directory}" || die "failed to create backup directory" - chown anope:anope "${directory}"/../ || die "failed to chown data directory" - fi - # don't die otherwise merge will fail if there are no existing databases - cp "${ROOT}"/var/lib/anope/*.db "${directory}" - fi -} - -pkg_postinst() { - echo - 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." - - if use mysql; then - echo - ewarn "!!! ATTENTION !!!" - ewarn "Be sure to read Changes.mysql to update your MySQL" - ewarn "tables or anope will break after restart" - ewarn "!!! ATTENTION !!!" - echo - einfo "The mysql script for updating the tables is located in the" - einfo "/usr/share/doc/${PF} directory" - fi -} diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild new file mode 100644 index 000000000000..dfdba26b54f7 --- /dev/null +++ b/net-irc/anope/anope-2.0.6.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils user + +DESCRIPTION="Anope IRC Services" +HOMEPAGE="https://anope.org" +SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mysql sqlite pcre posix gnutls ssl tre ldap anope_modules_sql_auth + anope_modules_sql_log anope_modules_sql_oper anope_modules_ldap_auth + anope_modules_ldap_oper anope_modules_irc2sql anope_modules_chanstats + anope_modules_cs_fantasy_stats anope_modules_cs_fantasy_top" + +REQUIRED_USE=" + anope_modules_sql_auth? ( || ( mysql sqlite ) ) + anope_modules_sql_oper? ( mysql ) + anope_modules_sql_log? ( mysql ) + anope_modules_cs_fantasy_stats? ( anope_modules_chanstats mysql ) + anope_modules_cs_fantasy_top? ( anope_modules_chanstats mysql ) + anope_modules_chanstats? ( mysql ) + anope_modules_irc2sql? ( mysql ) + anope_modules_ldap_auth? ( ldap ) + anope_modules_ldap_oper? ( ldap )" + +BDEPEND="sys-devel/gettext" +DEPEND="${BDEPEND} + 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 )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/pid-patch.patch" ) + +S="${WORKDIR}/${P}-source" + +pkg_pretend() { + local replaced_version + for replaced_version in ${REPLACING_VERSIONS} ; do + if ver_test ${replaced_version} -lt 1.8.7 && [[ -f ${ROOT}/opt/anope/data/nick.db ]]; then + eerror "It looks like you have an older version of Anope installed." + eerror "To upgrade, shut down Anope and copy your databases to" + eerror "${ROOT}/var/lib/anope and your configuration to ${ROOT}/etc/anope" + eerror "You can do this by:" + eerror "# mkdir -p ${ROOT}/var/lib/anope ${ROOT}/etc/anope" + eerror "# chown anope:anope ${ROOT}/var/lib/anope" + eerror "# mv ${ROOT}/opt/anope/data/*.db ${ROOT}var/lib/anope" + eerror "# mv ${ROOT}/opt/anope/data/services.conf ${ROOT}etc/anope" + die "Please move your anope database files from /opt/anope/data" + fi + done +} + +pkg_setup() { + enewgroup anope + enewuser anope -1 -1 -1 anope +} + +src_prepare() { + anope_use_extra() { + local useflag=$1 + local modulefile=$2 + if use $useflag; then + ln -s "extra/${modulefile}" "modules/" || \ + die "Failed to use ${modulefile}" + fi + } + + anope_use_extra mysql "m_mysql.cpp" + anope_use_extra sqlite "m_sqlite.cpp" + anope_use_extra ssl "m_ssl_openssl.cpp" + anope_use_extra gnutls "m_ssl_gnutls.cpp" + anope_use_extra posix "m_regex_posix.cpp" + anope_use_extra pcre "m_regex_pcre.cpp" + anope_use_extra tre "m_regex_tre.cpp" + anope_use_extra ldap "m_ldap.cpp" + anope_use_extra anope_modules_sql_auth "m_sql_authentication.cpp" + anope_use_extra anope_modules_sql_log "m_sql_log.cpp" + anope_use_extra anope_modules_sql_oper "m_sql_oper.cpp" + anope_use_extra anope_modules_ldap_auth "m_ldap_authentication.cpp" + anope_use_extra anope_modules_ldap_oper "m_ldap_oper.cpp" + anope_use_extra anope_modules_chanstats "stats/m_chanstats.cpp" + anope_use_extra anope_modules_cs_fantasy_top "stats/cs_fantasy_top.cpp" + anope_use_extra anope_modules_cs_fantasy_stats "stats/cs_fantasy_stats.cpp" + anope_use_extra anope_modules_irc2sql "stats/irc2sql/irc2sql.cpp" + anope_use_extra anope_modules_irc2sql "stats/irc2sql/irc2sql.h" + anope_use_extra anope_modules_irc2sql "stats/irc2sql/tables.cpp" + anope_use_extra anope_modules_irc2sql "stats/irc2sql/utils.cpp" + + # Avoid a silly sandbox error - tries to delete /usr/lib/modules + sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die + + cmake-utils_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-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}/anope-init.d" "${PN}" + cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die + sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \ + "${T}/anope-conf.d-v2" || die + 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 -R anope:anope /etc/anope + fperms -R 0700 /etc/anope + fperms 0755 /var/log/anope + fperms -R 0750 /var/lib/anope +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]] ; then + local directory + directory="${ROOT}"/var/lib/anope/pre-update + elog "Making a backup of your databases to ${directory}" + if [ ! -d "${directory}" ]; then + mkdir -p "${directory}" || die "failed to create backup directory" + chown anope:anope "${directory}"/../ || die "failed to chown data directory" + fi + # don't die otherwise merge will fail if there are no existing databases + cp "${ROOT}"/var/lib/anope/*.db "${directory}" + fi +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + 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 + fi +} diff --git a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch b/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch deleted file mode 100644 index 98500509693b..000000000000 --- a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -aurp a/src/core/Makefile b/src/core/Makefile ---- a/src/core/Makefile 2010-10-10 19:55:31.396999906 +0000 -+++ b/src/core/Makefile 2010-10-10 19:53:54.877001245 +0000 -@@ -24,7 +24,7 @@ distclean: spotless - $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< - - .o.s: -- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} - @$(TOUCH) $*.s - - subs: -diff -aurp a/src/modules/Makefile b/src/modules/Makefile ---- a/src/modules/Makefile 2010-10-10 19:55:32.486000023 +0000 -+++ b/src/modules/Makefile 2010-10-10 19:54:07.240000026 +0000 -@@ -27,7 +27,7 @@ distclean: spotless - $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< - - .o.s: -- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} - @$(TOUCH) $*.s - - subs: -diff -aurp a/src/protocol/Makefile b/src/protocol/Makefile ---- a/src/protocol/Makefile 2010-10-10 19:55:33.605002302 +0000 -+++ b/src/protocol/Makefile 2010-10-10 19:54:19.271997806 +0000 -@@ -24,7 +24,7 @@ distclean: clean spotless - $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< - - .o.s: -- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} - @$(TOUCH) $*.s - - subs: ---- a/src/tools/Makefile 2011-12-28 20:00:00.646427623 +0000 -+++ b/src/tools/Makefile 2011-12-28 20:00:41.030430806 +0000 -@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' - 'RUNGROUP=${RUNGROUP}' - - .c.o: -- $(CC) $(CFLAGS) -I../include/ $< -o $* -+ $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $* - - all: ${OBJS} - diff --git a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch b/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch deleted file mode 100644 index 7a86d0f517b9..000000000000 --- a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- configure.in -+++ configure.in -@@ -286,6 +286,15 @@ - ]) - - AC_SUBST(DATDEST) -+ -+AC_ARG_WITH(libdir, [ --with-libdir=libdir Specify the location of the services lib folder], [ -+ AC_DEFINE_UNQUOTED(LIB_DIR,"$withval","services lib dir") -+ AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir") -+ DATDEST=$withval -+ MODULE_PATH=${withval}/modules/ -+]) -+ -+AC_SUBST(LIB_PATH) - AC_SUBST(MODULE_PATH) - - AC_CONFIG_FILES( \ ---- src/Makefile -+++ src/Makefile -@@ -115,10 +115,6 @@ - ln $(BINDEST)/services $(BINDEST)/listnicks - ln $(BINDEST)/services $(BINDEST)/listchans - (cd ../lang ; $(MAKE) install) -- $(CP) ../data/* $(DATDEST) -- $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen -- test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups -- test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs - @if [ "$(MODULE_PATH)" ] ; then \ - test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \ - test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \ ---- include/sysconf.h.in -+++ include/sysconf.h.in -@@ -96,6 +96,9 @@ - /* "Module dir" */ - #undef MODULE_PATH - -+/* "Lib dir" */ -+#undef LIB_DIR -+ - /* "Has mysql/mysql.h" */ - #undef MYSQL_HEADER_PREFIX - ---- include/config.h -+++ include/config.h -@@ -22,10 +22,10 @@ - /******* General configuration *******/ - - /* Name of configuration file (in Services directory) */ --#define SERVICES_CONF "services.conf" -+#define SERVICES_CONF "/etc/anope/services.conf" - - /* Name of log file (in Services directory) */ --#define LOG_FILENAME "services.log" -+#define LOG_FILENAME "/var/log/anope/services.log" - - /* Maximum amount of data from/to the network to buffer (bytes). */ - #define NET_BUFSIZE 65536 ---- src/log.c -+++ src/log.c -@@ -33,7 +33,7 @@ - - /* fix bug 577 */ - strftime(timestamp, sizeof(timestamp), "%Y%m%d", tm); -- snprintf(name, count, "logs/%s.%s", log_filename, timestamp); -+ snprintf(name, count, "%s.%s", log_filename, timestamp); - curday = tm->tm_yday; - - return 1; ---- src/modules.c -+++ src/modules.c -@@ -2846,7 +2846,7 @@ - - - #ifndef _WIN32 -- snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir); -+ snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", LIB_DIR); - #else - snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime"); - #endif ---- src/language.c -+++ src/language.c -@@ -71,7 +71,7 @@ - alog("debug: Loading language %d from file `languages/%s'", - index, filename); - } -- snprintf(buf, sizeof(buf), "languages/%s", filename); -+ snprintf(buf, sizeof(buf), "%s/languages/%s", LIB_DIR, filename); - #ifndef _WIN32 - if (!(f = fopen(buf, "r"))) { - #else diff --git a/net-irc/anope/files/anope-1.8.7-mariadb.patch b/net-irc/anope/files/anope-1.8.7-mariadb.patch deleted file mode 100644 index 98a1b3634b6a..000000000000 --- a/net-irc/anope/files/anope-1.8.7-mariadb.patch +++ /dev/null @@ -1,109 +0,0 @@ -Author: Adam -Date: 2012-01-11 -Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes - mariadb's services.h to be #include-ed improperly. - -diff --git a/src/Makefile b/src/Makefile -index 739c918..a9a2ee2 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ - 'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' - - .c.o: -- $(CC) $(CFLAGS) -I../include/ -c $< -+ $(CC) -I../include/ $(CFLAGS) -c $< - - all: services - -diff --git a/src/core/Makefile b/src/core/Makefile -index 4ec2754..32c049f 100644 ---- a/src/core/Makefile -+++ b/src/core/Makefile -@@ -21,7 +21,7 @@ install: - distclean: spotless - - .c.o: -- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< -+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - .o.s: - $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub -index 9fbadf3..d93e6d5 100644 ---- a/src/core/Makefile.sub -+++ b/src/core/Makefile.sub -@@ -16,7 +16,7 @@ module: $(OBJECTS) so - distclean: spotless - - .c.o: -- $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< -+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - so: - $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} -diff --git a/src/modules/Makefile b/src/modules/Makefile -index cafbe45..bde65b3 100644 ---- a/src/modules/Makefile -+++ b/src/modules/Makefile -@@ -24,7 +24,7 @@ install: - distclean: spotless - - .c.o: -- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< -+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - .o.s: - $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub -index 7697249..b7c244f 100644 ---- a/src/modules/Makefile.sub -+++ b/src/modules/Makefile.sub -@@ -16,7 +16,7 @@ module: $(OBJECTS) so - distclean: spotless - - .c.o: -- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< -+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - so: - $(CC) ${SHARED} ../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${PROFILE} -diff --git a/src/protocol/Makefile b/src/protocol/Makefile -index ab837e4..d962d8b 100644 ---- a/src/protocol/Makefile -+++ b/src/protocol/Makefile -@@ -21,7 +21,7 @@ install: - distclean: clean spotless - - .c.o: -- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< -+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - .o.s: - $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} -diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub -index a2d6a41..d93e6d5 100644 ---- a/src/protocol/Makefile.sub -+++ b/src/protocol/Makefile.sub -@@ -16,7 +16,7 @@ module: $(OBJECTS) so - distclean: spotless - - .c.o: -- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< -+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< - - so: - $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} -diff --git a/src/tools/Makefile b/src/tools/Makefile -index 4dffbf0..87bd0ae 100644 ---- a/src/tools/Makefile -+++ b/src/tools/Makefile -@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ - 'RUNGROUP=${RUNGROUP}' - - .c.o: -- $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $* -+ $(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $* - - all: ${OBJS} - diff --git a/net-irc/anope/files/anope-conf.d b/net-irc/anope/files/anope-conf.d deleted file mode 100644 index ddcae9856e0c..000000000000 --- a/net-irc/anope/files/anope-conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# user to run ultimate-ircd as -ANOPE_USER="anope" - -# Additional commandline parameters -ANOPE_OPTS="" diff --git a/net-irc/anope/files/anope-conf.d-v2 b/net-irc/anope/files/anope-conf.d-v2 new file mode 100644 index 000000000000..fbe7c3c5017a --- /dev/null +++ b/net-irc/anope/files/anope-conf.d-v2 @@ -0,0 +1,9 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# user to run ultimate-ircd as +ANOPE_USER="anope" + +# Additional commandline parameters +ANOPE_OPTS="--confdir=/etc/anope --logdir=/var/log/anope --dbdir=/var/lib/anope" +ANOPE_OPTS="${ANOPE_OPTS} --localedir=/usr/share/locale --modulesdir=%LIBDIR%" diff --git a/net-irc/anope/files/pid-patch.diff b/net-irc/anope/files/pid-patch.diff deleted file mode 100644 index c92e1216be9c..000000000000 --- a/net-irc/anope/files/pid-patch.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- data/example.conf.orig 2008-12-14 20:37:22.000000000 +0000 -+++ data/example.conf 2008-12-14 20:37:43.000000000 +0000 -@@ -285,7 +285,7 @@ HostServName "HostServ" "vHost Server" - # PIDFile [REQUIRED] - # Specifies the name of the file containing Services' process ID. - --PIDFile services.pid -+PIDFile /var/run/anope/services.pid - - # MOTDFile [REQUIRED] - # Specifies the name of the Message of the Day file. diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/pid-patch.patch new file mode 100644 index 000000000000..ddf661ba9803 --- /dev/null +++ b/net-irc/anope/files/pid-patch.patch @@ -0,0 +1,18 @@ +--- a/data/example.conf 2017-03-30 17:00:24.000000000 -0400 ++++ a/data/example.conf 2019-02-06 15:16:20.088469043 -0500 +@@ -231,13 +231,13 @@ + * The filename containing the Services process ID. The path is relative to the + * services root directory. + */ +- pid = "data/services.pid" ++ pid = "/run/anope/services.pid" + + /* + * The filename containing the Message of the Day. The path is relative to the + * services root directory. + */ +- motd = "conf/services.motd" ++ motd = "/etc/anope/services.motd" + } + + /* diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml index 52f9787ecc7e..7a4bd9256ef0 100644 --- a/net-irc/anope/metadata.xml +++ b/net-irc/anope/metadata.xml @@ -4,5 +4,20 @@ Anope IRC Services anope + anope/anope + + Authorize through SQL + Additional log target in SQL + Allows granting users services operator privileges from SQL + Authorize through LDAP + Dynamically ties users to Anope opertypes via LDAP + Stores channel statistics in a mysql database + Channel Statistics + Enables the STATS and GSTATS commands + Enables the (G)TOP and (G)TOP10 commands + Add support for POSIX Compatible Regular Expressions + Provide SSL services using OpenSSL + Use dev-libs/tre for regular expressions + diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest index 381049c70b92..c91e18e22a04 100644 --- a/net-irc/ircii/Manifest +++ b/net-irc/ircii/Manifest @@ -3,7 +3,9 @@ AUX ircii-manpage-path.patch 514 BLAKE2B 09723e9e2d80654c9ca05535b8e14e833af7ed4 DIST ircii-20110228.tar.bz2 558483 BLAKE2B 52c83503bf258aaf27635d5ac525da61894486681069f7ff56d571f387567ba964976770b1a1e647aae1b0b18416ccc37c7498bc7cfca5c1c26247796638654e SHA512 df27f098ad9c134335b7d97a25a07ef5fd9d14063b2e079a707a472d2582a1451d7697f3123508296c76afdb78257ad6dc358a2ec5af584ab53872c765b01782 DIST ircii-20111115.tar.bz2 555731 BLAKE2B 8715b5d84cbca98005b3c3bf426f632737be2f4a121f673c3d7d76a5f4204c603594779c15a9fe5e886fb33b96cfc149f690508b546752cd4f7c4f9ad8aaf36a SHA512 6f282debbd27865414a2ef9148b23373f83a051b2917432d9fdc2f153c111f8e592286d42a5ad34fd0cdc155e39938094e140910fbf38be494e3ed3da4cd0b6e DIST ircii-20170704.tar.bz2 596535 BLAKE2B 780b9bc74e80d622df3686d3234ce69c62c0d9ae43322addfc545de76854ba30ec25546921cff449556f9e6b14b7dc00f3b15437789bea8bfa9b3df44d5b7e6c SHA512 a0cdc5603fab040fa2f7d2b3d7a564e9eeac4b402329cba5c6f1a97aa6e587a53ffc4141420dde97dc2cadf22581e74058a0357c6b4b0d0b03f5dea7fa8cbc3a +DIST ircii-20190117.tar.bz2 606327 BLAKE2B f7ee5c98f6106f07fec8feb0840aba87a052e5927c5e591f34ea28a9a017fb64c711983e472ae001465cbe29b6b9d88ab65d67c4bb303b9e01dde853aba66bf4 SHA512 08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4 EBUILD ircii-20110228.ebuild 888 BLAKE2B c29034ccfbfe54ce2cd8a359a8e183f9d227c9f6ed5af79dcf0ad7f7129b19be749df82398bbcab88694935ab8f10db202c582cbe8f65dd1817254b054ac3c0e SHA512 91465b9c564e7f7b978e46cb73e10c837bc77823c3451e117bb34bf112296ec11c2b2e079dec0b01a08b816d92858b701b3ea22cd307593a971b82682ef2d13c EBUILD ircii-20111115.ebuild 837 BLAKE2B 9d74447a3a83019a40c731a323b4e77c911250126b693d8cd05b001c01c6ae8637f1813fcba324a6fb7c1892d7976d1d405d32c50e64cc9c59ffadd6b6aa3b60 SHA512 5914ab46ca20f9f5b7db8b26163ac43c62b941f782ad03fe6eba5b5b68968e794116a31ca18b48115ece1df42369c57d4a826b4dee08f6fac72cd38e61af04d7 EBUILD ircii-20170704.ebuild 870 BLAKE2B 06f2ae579c3a2f0b9f347b546c80d893a6b850cb62fa3aec9e2a2ee93c4933ece8e190fa107f032828ebf233919841be74551fb5cb1182f986ba382c6be236db SHA512 9a756069168dff3cf1b53301ade184b0cabe7c6e8f24450f7e136b62ad66181efcf87f45b68d26c33cd0817405b53c97ba7a8e502f5382d147e010df9bb6bbe6 +EBUILD ircii-20190117.ebuild 867 BLAKE2B 34b20772b4cbd78bb0b8546299a03795e5c6453d1dfb81e186cd2c8561a303422e3342d29ea78103425247961e78ee88a66a99410b31e411815befc8a8ff06b1 SHA512 967861f7906f912452855b738d5c0d03e69ebb776f7a9dac26ce60c78ce1d19e6527273e6b9c860736ac5f25a3189fe0a63d052ce5f3c08373efd456b25a7374 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c diff --git a/net-irc/ircii/ircii-20190117.ebuild b/net-irc/ircii/ircii-20190117.ebuild new file mode 100644 index 000000000000..03366ecd3a1a --- /dev/null +++ b/net-irc/ircii/ircii-20190117.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms" +SRC_URI="https://ircii.warped.com/${P}.tar.bz2 + https://ircii.warped.com/old/${P}.tar.bz2" +HOMEPAGE="http://eterna.com.au/ircii/" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="ipv6" + +DEPEND="sys-libs/ncurses:0= + virtual/libiconv" +# This and irc-client both install /usr/bin/irc #247987 +RDEPEND="${DEPEND} + !net-irc/irc-client" + +PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" ) + +src_configure() { + tc-export CC + econf $(use_enable ipv6) +} + +src_install() { + emake -j1 DESTDIR="${D}" install + + dodoc ChangeLog INSTALL NEWS README \ + doc/Copyright doc/crypto doc/VERSIONS doc/ctcp +} -- cgit v1.2.3